diff options
104 files changed, 410 insertions, 448 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c690a6a5296..1a067824a1d 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,112 @@ +Fri Nov 19 19:13:13 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + 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 <mhengstmengel@remedy.nl> * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.mpc: @@ -6,7 +115,7 @@ Fri Nov 19 19:59:42 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> Fri Nov 19 19:47:42 UTC 2010 Marijke Hengstmengel <mhengstmengel@remedy.nl> * connectors/ami4ccm/tests/InterMulti/Sender/InterMultiA_conn_i.cpp: - Fixed typo. + Fixed typo. Fri Nov 19 09:54:59 UTC 2010 Marcel Smit <msmit@remedy.nl> diff --git a/CIAO/MPC/config/dds4ccm_ndds_ts_defaults.mpb b/CIAO/MPC/config/dds4ccm_ndds_ts_defaults.mpb deleted file mode 100644 index b2dadb9d991..00000000000 --- a/CIAO/MPC/config/dds4ccm_ndds_ts_defaults.mpb +++ /dev/null @@ -1,18 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : dds4ccm { - Define_Custom(DDS4CCMTypeSupport) { - automatic_in = 0 - output_follows_input = 0 - libpath = $(ACE_ROOT)/lib - command = $(TAO_IDL) - dependent = $(TAO_IDL_DEP) - keyword idl_flags = commandflags - commandflags += -Gts - inputext = TypeSupport.idl - generic_pre_extension = TypeSupport - generic_outputext = .idl - } -} - diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb index 1f886ca9abb..dacae8778f5 100644 --- a/CIAO/MPC/config/dds4ccm_ts_default.mpb +++ b/CIAO/MPC/config/dds4ccm_ts_default.mpb @@ -15,14 +15,12 @@ feature(dds4ccm_splice) : dds4ccm, splice_ts_defaults { } } -feature(dds4ccm_ndds) : dds4ccm, ndds_ts_defaults, dds4ccm_ndds_ts_defaults, nddslib, typecode { +feature(dds4ccm_ndds) : dds4ccm, ndds_ts_defaults, nddslib, typecode { Define_Custom(DDSGenerator) : NDDSTypeSupport { - commandflags -= -corba <%input_noext%>C.h - commandflags += -typeSequenceSuffix RTISeq -enableEscapeChar -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT) -corba <%input_noext%>TypeSupportC.h + commandflags += -typeSequenceSuffix RTISeq -enableEscapeChar -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT) keyword dds_ts_flags = commandflags } - Define_Custom(DDS4CCMGenerator) : DDS4CCMTypeSupport { - } + dynamicflags += NDDS_USER_DLL_EXPORT verbatim(gnuace, macros) { @@ -45,8 +43,6 @@ feature(!dds4ccm_ndds) { Define_Custom(NDDSDummyTypeSupport) { keyword ndds_ts_flags } - Define_Custom(DDS4CCMGenerator) { - } } feature(!dds4ccm_splice) { diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc index 5fc1846d0ef..7b98b536556 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc +++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc @@ -16,10 +16,6 @@ project (DDS_Hello_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=HELLO_BASE_STUB_Export - DDS4CCMGenerator_Files { - Hello_Base.idl - } - DDSGenerator_Files { Hello_Base.idl } diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc index 200d7feba52..fc193c65cd7 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc @@ -8,8 +8,8 @@ project (Large_Deployment_stub) : ciaoidldefaults, \ idlflags += -Gxhst \ -Wb,export_macro=LARGE_DEPLOYMENT_COMMON_STUB_Export \ - -Wb,export_include=Large_Deployment_Common_stub_export.h - + -Wb,export_include=Large_Deployment_Common_stub_export.h + IDL_Files { Common.idl @@ -17,10 +17,6 @@ project (Large_Deployment_stub) : ciaoidldefaults, \ opendds_ts_flags += --export=LARGE_DEPLOYMENT_COMMON_STUB_Export - DDS4CCMGenerator_Files { - Common.idl - } - DDSGenerator_Files { Common.idl } diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc index 4b7ab8f3841..7685f3e6f08 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc @@ -16,10 +16,6 @@ project (DDS_Quoter_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=QUOTER_BASE_STUB_Export - DDS4CCMGenerator_Files { - Quoter_Base.idl - } - DDSGenerator_Files { Quoter_Base.idl } diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl index d6add777d95..459384fc6e9 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl @@ -21,7 +21,6 @@ struct ShapeType { long y; long shapesize; }; -typedef sequence<ShapeType> ShapeTypeSeq; #pragma keylist ShapeType color #pragma DCPS_DATA_TYPE "Attributes" @@ -33,7 +32,7 @@ struct Attributes { string color; //@key float speed; }; -typedef sequence<Attributes> AttributesSeq; +typedef sequence<ShapeType> ShapeTypeSeq; #pragma keylist Attributes shape color diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc index e2a6ad4cbaf..3d715321623 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc @@ -14,10 +14,6 @@ project (DDS_Shapes_Base_stub) : taoidldefaults, dds4ccm_ts_default { Shapes_Base.idl } - DDS4CCMGenerator_Files { - Shapes_Base.idl - } - opendds_ts_flags += --export=SHAPES_BASE_STUB_Export DDSGenerator_Files { diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl index 184c4a58a93..65ef73946e8 100644 --- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl +++ b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl @@ -13,9 +13,150 @@ #pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_Event_Connector_T.h" #pragma dds4ccm impl "connectors/dds4ccm/impl/DDS_State_Connector_T.h" +/** + * Typed DDS apis defined in IDL, CIAO specific extension + */ +module DDS_Entity <typename T, sequence<T> 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); + }; +}; + module CCM_DDS { module Typed <typename T, sequence<T> TSeq> { + alias DDS_Entity<T, TSeq> 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, diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc index 67076f7e595..663cfe3f090 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/Base/Latency_Base.mpc @@ -1,6 +1,6 @@ // $Id$ -project (DDS_Latency_Base_plain_stub) : taoidldefaults, ndds_ts_defaults, typecode, nddslib { +project (DDS_Latency_Base_plain_stub) : taoidldefaults, dds4ccm_ts_default { sharedname = DDS_Latency_Base_plain_stub dynamicflags += LATENCY_BASE_STUB_BUILD_DLL libout = ../lib @@ -14,7 +14,9 @@ project (DDS_Latency_Base_plain_stub) : taoidldefaults, ndds_ts_defaults, typeco Latency_Base.idl } - NDDSTypeSupport_Files { + opendds_ts_flags += --export=LATENCY_BASE_STUB_Export + + DDSGenerator_Files { Latency_Base.idl } 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 index e23acc14bb6..b82ae41524e 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp @@ -329,7 +329,7 @@ void HelloListener::on_data_available(::DDS::DataReader *reader) for(;;) { ::DDS::SampleInfoSeq info; - ::LatencyTestSeq sample_req; + ::LatencyTestRTISeq sample_req; ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info); if (retcode == DDS_RETCODE_NO_DATA) { 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 index 7b08c4b5791..6ece715ee1b 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp @@ -614,7 +614,7 @@ void HelloListener::on_data_available(DDSDataReader *reader) for(;;) { ::DDS::SampleInfoSeq info; - ::LatencyTestSeq sample_req; + ::LatencyTestRTISeq sample_req; ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info); if (retcode == DDS_RETCODE_NO_DATA) { 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 index 27e46ec6b8b..213853915b6 100644 --- 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 @@ -575,7 +575,7 @@ void HelloListener::on_data_available(DDSDataReader *reader) for(;;) { ::DDS::SampleInfoSeq info; - ::LatencyTestSeq sample_req; + ::LatencyTestRTISeq sample_req; ::DDS::ReturnCode_t const retcode = test_reader->take(sample_req, info); if (retcode == DDS_RETCODE_NO_DATA) { diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc index e0a6bcb9e90..216124ffbac 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/Base/Throughput_Base.mpc @@ -1,6 +1,6 @@ // $Id$ -project (DDS_Throughput_Base_stub_plain) : taoidldefaults, ndds_ts_defaults, typecode, nddslib { +project (DDS_Throughput_Base_stub_plain) : taoidldefaults, dds4ccm_ts_default { sharedname = DDS_Throughput_Base_stub dynamicflags += THROUGHPUT_BASE_STUB_BUILD_DLL libout = ../lib @@ -14,7 +14,9 @@ project (DDS_Throughput_Base_stub_plain) : taoidldefaults, ndds_ts_defaults, typ Throughput_Base.idl } - NDDSTypeSupport_Files { + opendds_ts_flags += --export=THROUGHPUT_BASE_STUB_Export + + DDSGenerator_Files { Throughput_Base.idl } 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 index b0476faa5c7..d1860fec7af 100644 --- 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 @@ -16,10 +16,6 @@ project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=PERF_KEYED_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Perf_Keyed_Test_Base.idl - } - DDSGenerator_Files { Perf_Keyed_Test_Base.idl } 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 index 53ff5d7a5bf..0dab0d18f04 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_LatencyTT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=LATENCYTT_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - LatencyTT_Test_Base.idl - } - DDSGenerator_Files { LatencyTT_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc index 79a954afd45..0814281894a 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.mpc @@ -16,10 +16,6 @@ project (DDS_Throughput_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=THROUGHPUT_BASE_STUB_Export - DDS4CCMGenerator_Files { - Throughput_Base.idl - } - DDSGenerator_Files { Throughput_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 index 527760a69ab..a56341adf6a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc @@ -16,10 +16,6 @@ project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=CSL_DEADLINETEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CSL_DeadlineTest_Base.idl - } - DDSGenerator_Files { CSL_DeadlineTest_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc index 6fa2b3d482f..64370bb98f5 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc @@ -16,10 +16,6 @@ project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=CSL_QOSTEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CSL_QoSTest_Base.idl - } - DDSGenerator_Files { CSL_QoSTest_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 index a0f77cfd1e7..a947325e8fe 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc @@ -16,10 +16,6 @@ project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=CSL_SRTEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CSL_SRTest_Base.idl - } - DDSGenerator_Files { CSL_SRTest_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 index 197a17bd0b4..f8ceac4c176 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc @@ -16,10 +16,6 @@ project (DDS_CSL_USTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=CSL_USTEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CSL_USTest_Base.idl - } - DDSGenerator_Files { CSL_USTest_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 index ec54e85c243..0a62f5f8ad7 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.mpc @@ -16,10 +16,6 @@ project (CoherentUpdate_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=COHERENT_UPDATE_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CoherentUpdate_Test_Base.idl - } - DDSGenerator_Files { CoherentUpdate_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc index 21dced98ba2..e5c6877d383 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.mpc @@ -16,10 +16,6 @@ project (CoherentWrite_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CoherentWrite_Test_Base.idl - } - DDSGenerator_Files { CoherentWrite_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc index e099043e012..e848cec34d2 100644 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc +++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.mpc @@ -18,11 +18,6 @@ project (DiffDir_stub) : taoidldefaults, \ opendds_ts_flags += --export=DIFFDIR_COMMON_STUB_Export - DDS4CCMGenerator_Files { - DiffDir.idl - gendir = Connector - } - DDSGenerator_Files { DiffDir.idl gendir = Connector 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 index 07325194377..32f3ed4c4f6 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.mpc @@ -16,10 +16,6 @@ project (CFT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CFT_Test_Base.idl - } - DDSGenerator_Files { CFT_Test_Base.idl } 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 index 2fc04204077..5b9359894e3 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_CFTLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_LISTEN_EVENT_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CFTLE_Test_Base.idl - } - DDSGenerator_Files { CFTLE_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 index cede89ecdc9..af07641daea 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.mpc @@ -16,10 +16,6 @@ project (CFT_Exception_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=CFT_EXCEPTION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Exception_Test_Base.idl - } - DDSGenerator_Files { Exception_Test_Base.idl } 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 index 347a010c09c..991be65e286 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.mpc @@ -16,10 +16,6 @@ project(CFT_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - ReadGet_Test_Base.idl - } - DDSGenerator_Files { ReadGet_Test_Base.idl } 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 index e21f2ea5f75..af88f24a777 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_CFTLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=CONTENTFILTEREDTOPIC_LISTEN_STATE_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - CFTLS_Test_Base.idl - } - DDSGenerator_Files { CFTLS_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc index 71394b447d4..22a4d431a35 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.mpc @@ -16,10 +16,6 @@ project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=WRITER_BASE_STUB_Export - DDS4CCMGenerator_Files { - Writer_Base.idl - } - DDSGenerator_Files { Writer_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc index b7338ee74bb..43d595c83d2 100644 --- a/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc +++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived.mpc @@ -15,10 +15,6 @@ project (Derived_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=NOMODULE_COMMON_STUB_Export - DDS4CCMGenerator_Files { - Derived.idl - } - DDSGenerator_Files { Derived.idl } diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl index 35229360f09..49650259655 100644 --- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.idl @@ -24,14 +24,17 @@ interface fooB void send (in long value); }; -connector MyEvent : DerivedTypeConnector::DDS_Event -{ - provides fooA my_foo; -}; - -connector MyState : DerivedTypeConnector::DDS_State -{ - provides fooB my_foo; +// @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/DoubleNestedModule/Base/DNM_Base.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc index eade766cdda..4cb85ab2f3f 100755 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.mpc @@ -16,10 +16,6 @@ project (DDS_DNM_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=DOUBLE_NESTED_MODULE_BASE_STUB_Export - DDS4CCMGenerator_Files { - DNM_Base.idl - } - DDSGenerator_Files { DNM_Base.idl } 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 index 664556a204d..7da18f7d1e6 100644 --- 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 @@ -16,10 +16,6 @@ project (DDS_ECT_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=EVENT_CONNECTION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Event_Connection_Test_Base.idl - } - DDSGenerator_Files { Event_Connection_Test_Base.idl } 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 index 73981fdaedf..1cb4a8bf5c8 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc @@ -16,10 +16,6 @@ project (DDS_FSS_Event_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export - DDS4CCMGenerator_Files { - FSS_Event_Base.idl - } - DDSGenerator_Files { FSS_Event_Base.idl } 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 index dff4f3f151c..c84a5728ff6 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc @@ -16,10 +16,6 @@ project (DDS_FSS_State_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export - DDS4CCMGenerator_Files { - FSS_State_Base.idl - } - DDSGenerator_Files { FSS_State_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 index 1688fe03b76..0090ff44ab1 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.mpc @@ -16,10 +16,6 @@ project (GCE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=GET_COMPONENT_EVENT_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - GCE_Test_Base.idl - } - DDSGenerator_Files { GCE_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 index 6360b0137ac..286be6ed200 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.mpc @@ -16,10 +16,6 @@ project (GCS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=GET_COMPONENT_STATE_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - GCS_Test_Base.idl - } - DDSGenerator_Files { GCS_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 index ae817fb1bdb..e86dc197785 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_Getter_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=GETTER_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Getter_Test_Base.idl - } - DDSGenerator_Files { Getter_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc index 69c211a6f8a..4bf6cd7416a 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc @@ -20,10 +20,6 @@ project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, dds4ccm_ts_default { Writer_Base.idl } - DDS4CCMGenerator_Files { - Writer_Base.idl - } - Source_Files { } } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc index dcd12aeb164..0512a1052a7 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_Keyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=KEYED_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Keyed_Test_Base.idl - } - DDSGenerator_Files { Keyed_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc index 6a780f91631..04b2a40e092 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc @@ -16,10 +16,6 @@ project (DDS_KeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=WRITER_BASE_STUB_Export - DDS4CCMGenerator_Files { - Writer_Base.idl - } - DDSGenerator_Files { Writer_Base.idl } 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 index f77ea8ec099..8141cf1fe3b 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.mpc @@ -16,10 +16,6 @@ project (RG_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=RG_LATEBINDING_BASE_STUB_Export - DDS4CCMGenerator_Files { - RG_LateBinding_Base.idl - } - DDSGenerator_Files { RG_LateBinding_Base.idl } 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 index 7e3387f069b..f690d652080 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.mpc @@ -16,10 +16,6 @@ project (WU_LateBindingBase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=WU_LATEBINDING_BASE_STUB_Export - DDS4CCMGenerator_Files { - WU_LateBinding_Base.idl - } - DDSGenerator_Files { WU_LateBinding_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc index 1006a1fd57f..a34427b4a9e 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_LMBM_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - LMBM_Test_Base.idl - } - DDSGenerator_Files { LMBM_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc index a9bb4e85964..a160043900b 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_LNE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - LNE_Test_Base.idl - } - DDSGenerator_Files { LNE_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc index 5ab62fb1c52..9d87ead6d76 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_LOBO_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - LOBO_Test_Base.idl - } - DDSGenerator_Files { LOBO_Test_Base.idl } 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 index e0165a086f5..3e7ed41408c 100644 --- 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 @@ -16,10 +16,6 @@ project (DDS_EMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=EVENT_MEMLEAKDETECTION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Event_MemLeakDetection_Test_Base.idl - } - DDSGenerator_Files { Event_MemLeakDetection_Test_Base.idl } 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 index 77afede4f70..2fb0c7e095f 100644 --- 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 @@ -16,10 +16,6 @@ project (DDS_SMLDT_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=STATE_MEMLEAKDETECTION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - State_MemLeakDetection_Test_Base.idl - } - DDSGenerator_Files { State_MemLeakDetection_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl index c53a2b7f7e8..d7f7c0137f3 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl @@ -21,7 +21,6 @@ struct ShapeType { long y; long shapesize; }; -typedef sequence<ShapeType> ShapeTypeSeq; #pragma keylist ShapeType color #pragma DCPS_DATA_TYPE "Attributes" @@ -33,7 +32,7 @@ struct Attributes { string color; //@key float speed; }; -typedef sequence<Attributes> AttributesSeq; +typedef sequence<ShapeType> ShapeTypeSeq; #pragma keylist Attributes shape color diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc index b1f356e3cf7..61da73079b7 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.mpc @@ -16,10 +16,6 @@ project (DDS_MultiTopic_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=MULTITOPIC_BASE_STUB_Export - DDS4CCMGenerator_Files { - MultiTopic_Base.idl - } - DDSGenerator_Files { MultiTopic_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc index 99f8b502bc6..9a40a67f6a0 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc @@ -11,6 +11,13 @@ project (DDS_CCM_Example_MT_idl_gen) : taoidldefaults, anytypecode, dds4ccm_ts_d IDL_Files { ccm_dds_mt.idl } + + opendds_ts_flags += --export=CCM_DDS_MT_STUB_Export + ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl + + DDSGenerator_Files { + ccm_dds_mt.idl + } } project(DDS_MultiTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm { @@ -46,8 +53,8 @@ project(DDS_MultiTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm { } 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 + 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 += .. @@ -98,9 +105,9 @@ project(DDS_MultiTopic_Connector_stub) : ccm_stub, dds4ccm_base { } project(DDS_MultiTopic_Connector_exec) : ciao_executor, dds4ccm_impl { - after += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_stub + 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 + libs += DDS_MultiTopic_Connector_stub DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Base_stub libpaths += ../lib libout = ../lib includes += .. @@ -124,12 +131,12 @@ project(DDS_MultiTopic_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_MultiTopic_Connector_svnt) : ciao_servant, dds4ccm_impl { - after += DDS_MultiTopic_Connector_lem_stub DDS_MultiTopic_Connector_exec DDS_MultiTopic_Connector_stub + 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 + DDS_MultiTopic_Connector_exec libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl index e61f7d74d43..5e4c8c0bd7c 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl @@ -28,6 +28,7 @@ module CCM_DDS_MT module Typed_MT<typename T, sequence<T> TSeq> { alias CCM_DDS::Typed<T, TSeq> DDS_Typed; + alias DDS_Entity<T, TSeq> DDS_Typed_Entity; // @todo to be removed // DDS MT Connector // ------------------ connector DDS_MT_Event : CCM_DDS::DDS_TopicBase { diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc index 663cc66f144..81d106dffe1 100644 --- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc +++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule.mpc @@ -6,7 +6,7 @@ project (NoModule_stub) : taoidldefaults, dds4ccm_ts_default { idlflags += -SS -Sci \ -Wb,stub_export_macro=NOMODULE_COMMON_STUB_Export \ - -Wb,stub_export_include=NoModule_Common_stub_export.h + -Wb,stub_export_include=NoModule_Common_stub_export.h IDL_Files { idlflags += -Gxhst @@ -15,10 +15,6 @@ project (NoModule_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=NOMODULE_COMMON_STUB_Export - DDS4CCMGenerator_Files { - NoModule.idl - } - DDSGenerator_Files { NoModule.idl } diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc index 3e54fdd0f9d..4cbca890fc0 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc @@ -16,10 +16,6 @@ project (DDS_NonChangeableBase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=NONCHANGEABLE_BASE_STUB_Export - DDS4CCMGenerator_Files { - NonChangeable_Base.idl - } - DDSGenerator_Files { NonChangeable_Base.idl } 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 index eaacb682b86..ac63c4728f0 100644 --- 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 @@ -16,10 +16,6 @@ project (OIT_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=ON_INCONSISTENT_TOPIC_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - OIT_Test_Base.idl - } - DDSGenerator_Files { OIT_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl index b3c425f3ea3..762ea18dd01 100644 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.idl @@ -5,6 +5,7 @@ #include "OFM_Base.idl" #if defined __TAO_IDL + #include <ccm_dds.idl> #endif diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc index 32b14fb67e3..66a5f7449f6 100644 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc @@ -15,10 +15,6 @@ project (OFM_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=OFM_CONNECTOR_BASE_STUB_Export - DDS4CCMGenerator_Files { - OFM_Base.idl - } - DDSGenerator_Files { OFM_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc index 0bbe421be68..b5b88b6e41c 100755 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc @@ -15,10 +15,6 @@ project (OneFile_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=ONEFILE_CONNECTOR_BASE_STUB_Export - DDS4CCMGenerator_Files { - OneFile_Base.idl - } - DDSGenerator_Files { OneFile_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl index 88dca4431bd..7bf2d71a5ef 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl +++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.idl @@ -155,6 +155,8 @@ module CCM_DDS_PSAT module Typed_PSAT<typename T, sequence<T> TSeq> { alias CCM_DDS::Typed<T, TSeq> DDS_Typed; + alias DDS_Entity<T, TSeq> DDS_Typed_Entity; // @todo, remove again + local interface PSAT_BufferControl { void release_buffer(in T datum) diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc index ac7b0ee3ca2..04a2fb82273 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc @@ -16,10 +16,6 @@ project (DDS_CCM_Example_PSAT_type_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=PSAT_TYPE_STUB_Export - DDS4CCMGenerator_Files { - psat_type.idl - } - DDSGenerator_Files { psat_type.idl } @@ -43,14 +39,10 @@ project (DDS_CCM_Example_PSAT_idl_gen) : taoidldefaults, anytypecode, dds4ccm_ts opendds_ts_flags += --export=CCM_DDS_PSAT_STUB_Export ndds_ts_flags += -I $(CIAO_ROOT)/connectors/dds4ccm/idl - + DDSGenerator_Files { ccm_dds_psat.idl } - - DDS4CCMGenerator_Files { - ccm_dds_psat.idl - } } project (DDS_CCM_Example_PSAT_stub) : anytypecode, dds4ccm_stub, ccm_stub, dds4ccm_ts_default { @@ -59,10 +51,10 @@ project (DDS_CCM_Example_PSAT_stub) : anytypecode, dds4ccm_stub, ccm_stub, dds4c dynamicflags += CCM_DDS_PSAT_STUB_BUILD_DLL libout = lib includes += -I $(CIAO_ROOT)/connectors/dds4ccm/idl - + IDL_Files { } - + Source_Files { ccm_dds_psat.cxx ccm_dds_psatC.cpp @@ -77,7 +69,7 @@ project (DDS_CCM_Example_PSAT_stub) : anytypecode, dds4ccm_stub, ccm_stub, dds4c ccm_dds_psatSupport.h ccm_dds_psat_stub_export.h } - + Inline_Files { ccm_dds_psatC.inl } @@ -117,9 +109,9 @@ project(PSAT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { project(PSAT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { after += PSAT_Connector_lem_gen \ DDS_PSAT_Connector_stub \ - DDS_CCM_Example_PSAT_stub + DDS_CCM_Example_PSAT_stub libs += DDS_CCM_Example_PSAT_stub \ - DDS_PSAT_Connector_stub + DDS_PSAT_Connector_stub libpaths += lib libout = lib includes += .. @@ -172,12 +164,12 @@ project(DDS_PSAT_Connector_stub) : ccm_stub, dds4ccm_base { project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl { after += DDS_CCM_Example_PSAT_type_stub \ PSAT_Connector_lem_stub \ - DDS_PSAT_Connector_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 + DDS_CCM_Example_PSAT_stub libpaths += lib libout = lib includes += .. @@ -204,12 +196,12 @@ project(DDS_PSAT_Connector_exec) : ciao_executor, dds4ccm_impl { project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl { after += PSAT_Connector_lem_stub \ DDS_PSAT_Connector_exec \ - DDS_PSAT_Connector_skel + 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 + DDS_PSAT_Connector_exec libpaths += lib libout = lib includes += .. diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc index c21546e6b36..92d5ca21790 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc @@ -16,10 +16,6 @@ project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=PSL_DEADLINETEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - PSL_DeadlineTest_Base.idl - } - DDSGenerator_Files { PSL_DeadlineTest_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc index 052c7e16bac..260ab4213cf 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc @@ -16,10 +16,6 @@ project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=PSL_SAMPLELOST_BASE_STUB_Export - DDS4CCMGenerator_Files { - PSL_SampleLost_Base.idl - } - DDSGenerator_Files { PSL_SampleLost_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc index a066e24f40d..d8125682fb4 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.mpc @@ -16,10 +16,6 @@ project (PortUsage_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_def opendds_ts_flags += --export=PORTUSAGE_EVENT_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - PortUsage_Test_Base.idl - } - DDSGenerator_Files { PortUsage_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc index 409f857aaaa..550d0bd01c4 100755 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.mpc @@ -16,10 +16,6 @@ project (QosProfile_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=COHERENT_WRITE_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - QosProfile_Test_Base.idl - } - DDSGenerator_Files { QosProfile_Test_Base.idl } 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 index f833f122c50..cbf25b65e1f 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.mpc @@ -16,10 +16,6 @@ project(QC_Different_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Different_Test_Base.idl - } - DDSGenerator_Files { Different_Test_Base.idl } 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 index 97ed13d0c1d..ca08e0faa86 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_QCLE_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=QUERY_CONDITION_LISTEN_EVENT_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - QCLE_Test_Base.idl - } - DDSGenerator_Files { QCLE_Test_Base.idl } 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 index 5ad5480c51d..eeb0924eafa 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.mpc @@ -16,10 +16,6 @@ project(QC_ReadGet_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - ReadGet_Test_Base.idl - } - DDSGenerator_Files { ReadGet_Test_Base.idl } 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 index 9530d0381d2..3fc6115838c 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_QCLS_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=QUERY_CONDITION_LISTEN_STATE_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - QCLS_Test_Base.idl - } - DDSGenerator_Files { QCLS_Test_Base.idl } 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 index 32f043876d9..16fa59d6046 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_QCTL_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=QUERY_CONDITION_TWO_LISTENERS_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - QCTL_Test_Base.idl - } - DDSGenerator_Files { QCTL_Test_Base.idl } 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 index 518d5395d8c..0db482de683 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.mpc @@ -16,10 +16,6 @@ project(QC_QCTQ_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - QCTQ_Test_Base.idl - } - DDSGenerator_Files { QCTQ_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc index 2af528be5d3..d1cba8fd39a 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_Reader_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=READER_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Reader_Test_Base.idl - } - DDSGenerator_Files { Reader_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc index d2c140d3fdb..ba5d711fbb6 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc @@ -16,10 +16,6 @@ project (DDS_SL_Disabled_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=SL_DISABLED_BASE_STUB_Export - DDS4CCMGenerator_Files { - SL_Disabled_Base.idl - } - DDSGenerator_Files { SL_Disabled_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc index c22c6b2a273..ad7b7a6ddb4 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc @@ -16,10 +16,6 @@ project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=SL_MANYBYMANY_BASE_STUB_Export - DDS4CCMGenerator_Files { - SL_ManyByMany_Base.idl - } - DDSGenerator_Files { SL_ManyByMany_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc index b2e52566d84..1936e7fa060 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc @@ -16,10 +16,6 @@ project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=SL_ONEBYONE_BASE_STUB_Export - DDS4CCMGenerator_Files { - SL_OneByOne_Base.idl - } - DDSGenerator_Files { SL_OneByOne_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc index dd01ffa1021..166889cf4bc 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc @@ -16,10 +16,6 @@ project (DDS_SCABase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=SETCONNECTORATTRIBUTE_BASE_STUB_Export - DDS4CCMGenerator_Files { - SetConnectorAttribute_Base.idl - } - DDSGenerator_Files { SetConnectorAttribute_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc index a8cf9298ad2..1a4aed690a3 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc @@ -16,10 +16,6 @@ project (DDS_SharedDP_DDBase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=BASE_STUB_Export - DDS4CCMGenerator_Files { - Base.idl - } - DDSGenerator_Files { Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc index 0e661ec7915..4378a77b3a0 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc @@ -16,10 +16,6 @@ project (DDS_SharedDPBase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=BASE_STUB_Export - DDS4CCMGenerator_Files { - Base.idl - } - DDSGenerator_Files { Base.idl } 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 index d1ca08840f5..82d78bb09c9 100644 --- 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 @@ -16,10 +16,6 @@ project (DDS_SCT_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=STATE_CONNECTION_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - State_Connection_Test_Base.idl - } - DDSGenerator_Files { State_Connection_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 index 7ad07f40d05..302d973e6ca 100755 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.mpc @@ -16,10 +16,6 @@ project (TopicName_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=TOPICNAME_EVENT_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - TopicName_Test_Base.idl - } - DDSGenerator_Files { TopicName_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc index 41fc233af67..d51a26e5b86 100755 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc @@ -16,10 +16,6 @@ project (DDS_TwoTopics_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=TWOTOPICS_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - TwoTopics_Base.idl - } - DDSGenerator_Files { TwoTopics_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc index b4a98d4a19b..9d2b4c48423 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc @@ -16,10 +16,6 @@ project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=GOODBYE_NAMESPACE_STUB_Export - DDS4CCMGenerator_Files { - HelloGoodbye.idl - } - DDSGenerator_Files { HelloGoodbye.idl } diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc index bf5895a33b2..c4f92576db2 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc @@ -16,10 +16,6 @@ project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=HELLO_NAMESPACE_STUB_Export - DDS4CCMGenerator_Files { - HelloGoodbye.idl - } - DDSGenerator_Files { HelloGoodbye.idl } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc index e22ebbd85f7..384ea4117a4 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc @@ -16,10 +16,6 @@ project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=UNKEYED_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - Unkeyed_Test_Base.idl - } - DDSGenerator_Files { Unkeyed_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc index a22380684d5..58a0f1a3012 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc @@ -16,10 +16,6 @@ project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=WRITER_BASE_STUB_Export - DDS4CCMGenerator_Files { - Writer_Base.idl - } - DDSGenerator_Files { Writer_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc index 9250e1c230e..8191f040a80 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc @@ -16,10 +16,6 @@ project (DDS_Updater_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=UPDATER_BASE_STUB_Export - DDS4CCMGenerator_Files { - Updater_Base.idl - } - DDSGenerator_Files { Updater_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 index 1d2c5b937cf..5d96c062799 100755 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.mpc @@ -16,10 +16,6 @@ project (UCC_Test_Base_stub) : taoidldefaults, dds4ccm_ts_default { opendds_ts_flags += --export=USERDATA_COPY_COUNT_TEST_BASE_STUB_Export - DDS4CCMGenerator_Files { - UCC_Test_Base.idl - } - DDSGenerator_Files { UCC_Test_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc index 1b44e488ade..6c79d25bd85 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc @@ -17,10 +17,6 @@ project (DDS_VTopic_Base_stub) : taoidldefaults, \ opendds_ts_flags += --export=VTOPIC_BASE_STUB_Export - DDS4CCMGenerator_Files { - VTopic_Base.idl - } - DDSGenerator_Files { VTopic_Base.idl } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc index 3e6d3098b2a..84ec15fdbc8 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc @@ -17,10 +17,6 @@ project (DDS_VTopics_Base_stub) : taoidldefaults, \ opendds_ts_flags += --export=VTOPICS_BASE_STUB_Export - DDS4CCMGenerator_Files { - VTopics_Base.idl - } - DDSGenerator_Files { VTopics_Base.idl } 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 index f8375833968..d4a13a946f2 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Deployment/descriptors/Plan.cdp @@ -124,7 +124,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_ShapeType_conn_DDS_Event_Impl</string> + <string>create_Shapes_ShapeType_conn_DDS_Event_Impl</string> </value> </value> </execParameter> @@ -135,7 +135,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_ShapeType_conn_DDS_Event_Servant</string> + <string>create_Shapes_ShapeType_conn_DDS_Event_Servant</string> </value> </value> </execParameter> 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 index cae83d78d47..54d154923b6 100644 --- 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 @@ -7,15 +7,18 @@ #include <Components.idl> -component Control_comp +module Shapes { - uses Control_obj control; + 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; + 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_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp_exec.cpp index 4462d11f272..91093f8d73e 100644 --- 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 @@ -10,7 +10,7 @@ #define MIN_SIZE 5 -namespace CIAO_Control_comp_Impl +namespace CIAO_Shapes_Control_comp_Impl { //============================================================ // pulse_Generator @@ -121,11 +121,11 @@ namespace CIAO_Control_comp_Impl } } } - ::Control_obj_var control = + ::Shapes::Control_obj_var control = this->ciao_context_->get_connection_control (); if (! ::CORBA::is_nil (control)) { - if (control->setSize (this->current_size_) == ::RETURN_ERROR) + 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"))); @@ -137,7 +137,7 @@ namespace CIAO_Control_comp_Impl this->current_size_)); } if (control->setLocation (this->current_x_, - this->current_y_) == ::RETURN_ERROR) + this->current_y_) == ::Shapes::RETURN_ERROR) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Control_comp_exec_i::tick : ") ACE_TEXT ("Setting shapes location\n"))); @@ -252,7 +252,7 @@ namespace CIAO_Control_comp_Impl ::Components::SessionContext_ptr ctx) { this->ciao_context_ = - ::CCM_Control_comp_Context::_narrow (ctx); + ::Shapes::CCM_Control_comp_Context::_narrow (ctx); if ( ::CORBA::is_nil (this->ciao_context_.in ())) { 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 index f324d362bf6..4f8a4b6c367 100644 --- 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 @@ -16,7 +16,7 @@ #include "tao/LocalObject.h" -namespace CIAO_Control_comp_Impl +namespace CIAO_Shapes_Control_comp_Impl { class Control_comp_exec_i; @@ -96,7 +96,7 @@ namespace CIAO_Control_comp_Impl //@} private: - ::CCM_Control_comp_Context_var ciao_context_; + ::Shapes::CCM_Control_comp_Context_var ciao_context_; ::CORBA::ULong rate_; 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 index e787f8675e5..1360f9c08c5 100644 --- 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 @@ -5,9 +5,12 @@ #include "Shapes_ShapeType_conn.idl" -component Receiver_comp +module Shapes { - port ShapeType_conn::DDS_Listen info_out; + 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_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.cpp index e28011da90f..1c6ee6aecab 100644 --- 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 @@ -3,7 +3,7 @@ #include "Shapes_Receiver_comp_exec.h" -namespace CIAO_Receiver_comp_Impl +namespace CIAO_Shapes_Receiver_comp_Impl { //============================================================ @@ -11,9 +11,9 @@ namespace CIAO_Receiver_comp_Impl //============================================================ info_out_data_listener_exec_i::info_out_data_listener_exec_i ( - ::CCM_Receiver_comp_Context_ptr ctx) + ::Shapes::CCM_Receiver_comp_Context_ptr ctx) : ciao_context_ ( - ::CCM_Receiver_comp_Context::_duplicate (ctx)) + ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx)) { } @@ -21,7 +21,7 @@ namespace CIAO_Receiver_comp_Impl { } - // Operations from ::ShapeType_conn::Listener + // Operations from ::Shapes::ShapeType_conn::Listener void info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum, @@ -47,9 +47,9 @@ namespace CIAO_Receiver_comp_Impl //============================================================ info_out_status_exec_i::info_out_status_exec_i ( - ::CCM_Receiver_comp_Context_ptr ctx) + ::Shapes::CCM_Receiver_comp_Context_ptr ctx) : ciao_context_ ( - ::CCM_Receiver_comp_Context::_duplicate (ctx)) + ::Shapes::CCM_Receiver_comp_Context::_duplicate (ctx)) { } @@ -88,7 +88,7 @@ namespace CIAO_Receiver_comp_Impl // Component attributes and port operations. - ::ShapeType_conn::CCM_Listener_ptr + ::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 ())) @@ -98,13 +98,13 @@ namespace CIAO_Receiver_comp_Impl tmp, info_out_data_listener_exec_i ( this->ciao_context_.in ()), - ::ShapeType_conn::CCM_Listener::_nil ()); + ::Shapes::ShapeType_conn::CCM_Listener::_nil ()); this->ciao_info_out_data_listener_ = tmp; } return - ::ShapeType_conn::CCM_Listener::_duplicate ( + ::Shapes::ShapeType_conn::CCM_Listener::_duplicate ( this->ciao_info_out_data_listener_.in ()); } @@ -135,7 +135,7 @@ namespace CIAO_Receiver_comp_Impl ::Components::SessionContext_ptr ctx) { this->ciao_context_ = - ::CCM_Receiver_comp_Context::_narrow (ctx); + ::Shapes::CCM_Receiver_comp_Context::_narrow (ctx); if ( ::CORBA::is_nil (this->ciao_context_.in ())) { 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 index 088d71f3fb3..1fa320fef30 100644 --- 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 @@ -16,7 +16,7 @@ #include "tao/LocalObject.h" -namespace CIAO_Receiver_comp_Impl +namespace CIAO_Shapes_Receiver_comp_Impl { /** @@ -27,15 +27,15 @@ namespace CIAO_Receiver_comp_Impl //============================================================ class SHAPES_RECEIVER_COMP_EXEC_Export info_out_data_listener_exec_i - : public virtual ::ShapeType_conn::CCM_Listener, + : public virtual ::Shapes::ShapeType_conn::CCM_Listener, public virtual ::CORBA::LocalObject { public: info_out_data_listener_exec_i ( - ::CCM_Receiver_comp_Context_ptr ctx); + ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_data_listener_exec_i (void); - // Operations and attributes from ::ShapeType_conn::Listener + // Operations and attributes from ::Shapes::ShapeType_conn::Listener virtual void on_one_data (const ::ShapeType & datum, @@ -46,7 +46,7 @@ namespace CIAO_Receiver_comp_Impl const ::CCM_DDS::ReadInfoSeq & infos); private: - ::CCM_Receiver_comp_Context_var ciao_context_; + ::Shapes::CCM_Receiver_comp_Context_var ciao_context_; }; //============================================================ @@ -59,7 +59,7 @@ namespace CIAO_Receiver_comp_Impl { public: info_out_status_exec_i ( - ::CCM_Receiver_comp_Context_ptr ctx); + ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_status_exec_i (void); // Operations and attributes from ::CCM_DDS::PortStatusListener @@ -73,7 +73,7 @@ namespace CIAO_Receiver_comp_Impl const ::DDS::SampleLostStatus & status); private: - ::CCM_Receiver_comp_Context_var ciao_context_; + ::Shapes::CCM_Receiver_comp_Context_var ciao_context_; }; //============================================================ @@ -96,7 +96,7 @@ namespace CIAO_Receiver_comp_Impl //@{ /** Component attributes and port operations. */ - virtual ::ShapeType_conn::CCM_Listener_ptr + virtual ::Shapes::ShapeType_conn::CCM_Listener_ptr get_info_out_data_listener (void); virtual ::CCM_DDS::CCM_PortStatusListener_ptr @@ -120,8 +120,8 @@ namespace CIAO_Receiver_comp_Impl //@} private: - ::CCM_Receiver_comp_Context_var ciao_context_; - ::ShapeType_conn::CCM_Listener_var ciao_info_out_data_listener_; + ::Shapes::CCM_Receiver_comp_Context_var ciao_context_; + ::Shapes::ShapeType_conn::CCM_Listener_var ciao_info_out_data_listener_; ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; }; 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 index 4bda9f4f073..56e73042ddd 100644 --- 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 @@ -6,11 +6,14 @@ #include "Shapes_ShapeType_conn.idl" #include "Shapes_Control_obj.idl" -component Sender_comp +module Shapes { - port ShapeType_conn::DDS_Write info_write; + component Sender_comp + { + port ShapeType_conn::DDS_Write info_write; - provides Control_obj control; + 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_exec.cpp b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.cpp index 648c06f3cff..67245f517e7 100644 --- 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 @@ -3,7 +3,7 @@ #include "Shapes_Sender_comp_exec.h" -namespace CIAO_Sender_comp_Impl +namespace CIAO_Shapes_Sender_comp_Impl { //============================================================ @@ -11,10 +11,10 @@ namespace CIAO_Sender_comp_Impl //============================================================ control_exec_i::control_exec_i ( - ::CCM_Sender_comp_Context_ptr ctx, + ::Shapes::CCM_Sender_comp_Context_ptr ctx, Sender_comp_exec_i &callback) : ciao_context_ ( - ::CCM_Sender_comp_Context::_duplicate (ctx)), + ::Shapes::CCM_Sender_comp_Context::_duplicate (ctx)), callback_ (callback) { } @@ -23,15 +23,15 @@ namespace CIAO_Sender_comp_Impl { } - // Operations from ::Control_obj + // Operations from ::Shapes::Control_obj - ::ReturnStatus + ::Shapes::ReturnStatus control_exec_i::setSize (::CORBA::UShort size) { return this->callback_.setSize (size); } - ::ReturnStatus + ::Shapes::ReturnStatus control_exec_i::setLocation (::CORBA::UShort x, ::CORBA::UShort y) { @@ -56,14 +56,14 @@ namespace CIAO_Sender_comp_Impl } // Supported operations and attributes. - ::ReturnStatus + ::Shapes::ReturnStatus Sender_comp_exec_i::setSize (::CORBA::UShort size) { this->square_.shapesize = size; return this->update_square (); } - ::ReturnStatus + ::Shapes::ReturnStatus Sender_comp_exec_i::setLocation (::CORBA::UShort x, ::CORBA::UShort y) { @@ -72,16 +72,16 @@ namespace CIAO_Sender_comp_Impl return this->update_square (); } - ::ReturnStatus + ::Shapes::ReturnStatus Sender_comp_exec_i::update_square () { - ::ShapeType_conn::Writer_var writer = + ::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 ::RETURN_ERROR; + return ::Shapes::RETURN_ERROR; } try @@ -105,12 +105,12 @@ namespace CIAO_Sender_comp_Impl ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), this->square_.color.in ())); } - return ::RETURN_OK; + return ::Shapes::RETURN_OK; } // Component attributes and port operations. - ::CCM_Control_obj_ptr + ::Shapes::CCM_Control_obj_ptr Sender_comp_exec_i::get_control (void) { if ( ::CORBA::is_nil (this->ciao_control_.in ())) @@ -121,13 +121,13 @@ namespace CIAO_Sender_comp_Impl control_exec_i ( this->ciao_context_.in (), *this), - ::CCM_Control_obj::_nil ()); + ::Shapes::CCM_Control_obj::_nil ()); this->ciao_control_ = tmp; } return - ::CCM_Control_obj::_duplicate ( + ::Shapes::CCM_Control_obj::_duplicate ( this->ciao_control_.in ()); } @@ -138,7 +138,7 @@ namespace CIAO_Sender_comp_Impl ::Components::SessionContext_ptr ctx) { this->ciao_context_ = - ::CCM_Sender_comp_Context::_narrow (ctx); + ::Shapes::CCM_Sender_comp_Context::_narrow (ctx); if ( ::CORBA::is_nil (this->ciao_context_.in ())) { @@ -155,7 +155,7 @@ namespace CIAO_Sender_comp_Impl void Sender_comp_exec_i::ccm_activate (void) { - ::ShapeType_conn::Writer_var writer = + ::Shapes::ShapeType_conn::Writer_var writer = this->ciao_context_->get_connection_info_write_data (); if (::CORBA::is_nil (writer.in ())) { @@ -189,7 +189,7 @@ namespace CIAO_Sender_comp_Impl void Sender_comp_exec_i::ccm_passivate (void) { - ::ShapeType_conn::Writer_var writer = + ::Shapes::ShapeType_conn::Writer_var writer = this->ciao_context_->get_connection_info_write_data (); if (::CORBA::is_nil (writer.in ())) { 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 index 4f002182580..7dc6bfa3b17 100644 --- 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 @@ -16,7 +16,7 @@ #include "tao/LocalObject.h" -namespace CIAO_Sender_comp_Impl +namespace CIAO_Shapes_Sender_comp_Impl { class Sender_comp_exec_i; //============================================================ @@ -24,26 +24,26 @@ namespace CIAO_Sender_comp_Impl //============================================================ class SHAPES_SENDER_COMP_EXEC_Export control_exec_i - : public virtual ::CCM_Control_obj, + : public virtual ::Shapes::CCM_Control_obj, public virtual ::CORBA::LocalObject { public: control_exec_i ( - ::CCM_Sender_comp_Context_ptr ctx, + ::Shapes::CCM_Sender_comp_Context_ptr ctx, Sender_comp_exec_i &callback); virtual ~control_exec_i (void); - // Operations and attributes from ::Control_obj + // Operations and attributes from ::Shapes::Control_obj virtual - ::ReturnStatus setSize (::CORBA::UShort size); + ::Shapes::ReturnStatus setSize (::CORBA::UShort size); virtual - ::ReturnStatus setLocation (::CORBA::UShort x, + ::Shapes::ReturnStatus setLocation (::CORBA::UShort x, ::CORBA::UShort y); private: - ::CCM_Sender_comp_Context_var ciao_context_; + ::Shapes::CCM_Sender_comp_Context_var ciao_context_; Sender_comp_exec_i &callback_; }; @@ -67,7 +67,7 @@ namespace CIAO_Sender_comp_Impl //@{ /** Component attributes and port operations. */ - virtual ::CCM_Control_obj_ptr + virtual ::Shapes::CCM_Control_obj_ptr get_control (void); //@} @@ -85,21 +85,21 @@ namespace CIAO_Sender_comp_Impl //@{ /** User defined operations */ - ::ReturnStatus setSize (::CORBA::UShort size); + ::Shapes::ReturnStatus setSize (::CORBA::UShort size); - ::ReturnStatus setLocation (::CORBA::UShort x, - ::CORBA::UShort y); + ::Shapes::ReturnStatus setLocation (::CORBA::UShort x, + ::CORBA::UShort y); //@} private: - ::CCM_Sender_comp_Context_var ciao_context_; - ::CCM_Control_obj_var ciao_control_; + ::Shapes::CCM_Sender_comp_Context_var ciao_context_; + ::Shapes::CCM_Control_obj_var ciao_control_; ::DDS::InstanceHandle_t instance_handle_; ShapeType square_; - ::ReturnStatus update_square (void); + ::Shapes::ReturnStatus update_square (void); }; extern "C" SHAPES_SENDER_COMP_EXEC_Export ::Components::EnterpriseComponent_ptr 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 index c6d13bdea03..aa2f6e6e318 100644 --- 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 @@ -7,11 +7,14 @@ #pragma ciao lem "Shapes_Control_objE.idl" -interface Control_obj +module Shapes { - ReturnStatus setSize (in unsigned short size); - ReturnStatus setLocation (in unsigned short x, - in unsigned short y); + 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_ShapeType_conn.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.idl index 13f9b0e4b7f..cae43eba9ed 100644 --- 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 @@ -10,7 +10,13 @@ #pragma ciao lem "Shapes_ShapeType_connE.idl" -module ::CCM_DDS::Typed < ::ShapeType, ::ShapeTypeSeq> ShapeType_conn; +// @todo, moved outside of Shapes, needed if we are 100% dds compliant +typedef sequence<ShapeType> ShapeTypeSeq; + +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_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl index 62ecaba5459..b0938ca88b6 100755 --- 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 @@ -16,7 +16,6 @@ struct ShapeType { long y; long shapesize; }; -typedef sequence<ShapeType> ShapeTypeSeq; #pragma keylist ShapeType_msg color 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 index e29fc30de2e..61b953bb215 100644 --- 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 @@ -19,11 +19,6 @@ project (Shapes_ShapeType_msg_stub) : taoidldefaults, dds4ccm_ts_default, Shapes opendds_ts_flags += --export=SHAPES_BASE_MSG_Export - DDS4CCMGenerator_Files { - Shapes_ShapeType_msg.idl - gendir = GeneratedCode - } - DDSGenerator_Files { Shapes_ShapeType_msg.idl gendir = GeneratedCode 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 index cdf3181fb71..cb44c82cdca 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_defn.idl @@ -3,10 +3,13 @@ #ifndef SHAPES_DEFN_IDL_ #define SHAPES_DEFN_IDL_ -enum ReturnStatus +module Shapes { - RETURN_OK, - RETURN_ERROR + enum ReturnStatus + { + RETURN_OK, + RETURN_ERROR + }; }; #endif /* SHAPES_DEFN_IDL_ */ |