Mon Feb 22 13:48:38 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl
        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
        * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
          Updated rti typesupport to ndds typesupport, everywhere we talk
          about ndds

44 files changed, 92 insertions, 44 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index d00bbedb510..2d24b04829d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,51 @@
+Mon Feb 22 13:48:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
+        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
+        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl
+        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
+        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
+        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
+        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
+        * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
+        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
+        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
+        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
+        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
+        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
+        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
+        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
+        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
+        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
+        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
+        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
+        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
+        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
+        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
+        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
+        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
+        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
+        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
+        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
+        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
+        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
+        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
+        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
+        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+          Updated rti typesupport to ndds typesupport, everywhere we talk
+          about ndds
+
 Mon Feb 22 13:39:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
index aea20cea024..007fb579243 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
@@ -8,7 +8,7 @@
 #ifndef HELLO_BASE_IDL
 #define HELLO_BASE_IDL
 
-#pragma rti typesupport "Base/Hello_BaseSupport.h"
+#pragma ndds typesupport "Base/Hello_BaseSupport.h"
 
 #pragma DCPS_DATA_TYPE "DDSHello"
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
index e01519154a6..908cb977ab4 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
@@ -8,7 +8,7 @@
 #ifndef QUOTER_BASE_IDL
 #define QUOTER_BASE_IDL
 
-#pragma rti typesupport "Base/Quoter_BaseSupport.h"
+#pragma ndds typesupport "Base/Quoter_BaseSupport.h"
 
 module Quoter
 {
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
index 56dbacb0f05..55f3af89daf 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
@@ -8,7 +8,7 @@
 #ifndef SHAPES_BASE_IDL
 #define SHAPES_BASE_IDL
 
-#pragma rti typesupport "Base/Shapes_BaseSupport.h"
+#pragma ndds typesupport "Base/Shapes_BaseSupport.h"
 
 struct ShapeType {
   string color; //@key
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
index 1abca1e5d11..01ada988648 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef PERF_KEYED_TEST_BASE_IDL
 #define PERF_KEYED_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/Perf_Keyed_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/Perf_Keyed_Test_BaseSupport.h"
 
 // Flag used to indicate message is used for initialization only
 const unsigned long INITIALIZE_SIZE = 1234;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl
index 6923e1690e2..737864b741c 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef LATENCY_TEST_BASE_IDL
 #define LATENCY_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/Latency_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/Latency_Test_BaseSupport.h"
 
 const short MAX_DATA_SEQUENCE_LENGTH = 8192;
 typedef sequence<octet> OctetSeq;
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
index 9698460adbe..b828a207ed8 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
@@ -8,7 +8,7 @@
 #ifndef CSL_DEADLINETEST_BASE_IDL
 #define CSL_DEADLINETEST_BASE_IDL
 
-#pragma rti typesupport "Base/CSL_DeadlineTest_BaseSupport.h"
+#pragma ndds typesupport "Base/CSL_DeadlineTest_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
index edbb08027b7..ac1d1683816 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
@@ -8,7 +8,7 @@
 #ifndef CSL_QOSTEST_BASE_IDL
 #define CSL_QOSTEST_BASE_IDL
 
-#pragma rti typesupport "Base/CSL_QoSTest_BaseSupport.h"
+#pragma ndds typesupport "Base/CSL_QoSTest_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
index 30a6327cf3f..e3d334d49c3 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
@@ -8,7 +8,7 @@
 #ifndef CSL_SRTEST_BASE_IDL
 #define CSL_SRTEST_BASE_IDL
 
-#pragma rti typesupport "Base/CSL_SRTest_BaseSupport.h"
+#pragma ndds typesupport "Base/CSL_SRTest_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
index 56cdc8c1229..d1980afbac4 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
@@ -8,7 +8,7 @@
 #ifndef CSL_USTEST_BASE_IDL
 #define CSL_USTEST_BASE_IDL
 
-#pragma rti typesupport "Base/CSL_USTest_BaseSupport.h"
+#pragma ndds typesupport "Base/CSL_USTest_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
index 5a7de4ceb84..db4905ab610 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
@@ -8,7 +8,7 @@
 #ifndef WRITER_BASE_IDL
 #define WRITER_BASE_IDL
 
-#pragma rti typesupport "Base/Writer_BaseSupport.h"
+#pragma ndds typesupport "Base/Writer_BaseSupport.h"
 
 struct WriterTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
index 9669a06ac81..bbddf1366ce 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef EVENT_CONNECTION_TEST_BASE_IDL
 #define EVENT_CONNECTION_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/Event_Connection_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/Event_Connection_Test_BaseSupport.h"
 
 struct Event_ConnectionTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
index 7b381b349dc..3606e7a2a3b 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
@@ -8,7 +8,7 @@
 #ifndef FIXED_SIZE_STRUCT_EVENT_BASE_IDL
 #define FIXED_SIZE_STRUCT_EVENT_BASE_IDL
 
-#pragma rti typesupport "Base/FSS_Event_BaseSupport.h"
+#pragma ndds typesupport "Base/FSS_Event_BaseSupport.h"
 
 struct FixedStructSizeTest {
   long one;
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
index a6b00f85efa..8f9420c456a 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
@@ -13,7 +13,7 @@
 #include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/FSS_Event_ConnectorE.idl"
-#pragma rti typesupport "Base/FSS_Event_BaseSupport.h"
+#pragma ndds typesupport "Base/FSS_Event_BaseSupport.h"
 
 module FSS_Event
 {
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
index acca2873052..3b882b7e31b 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
@@ -8,7 +8,7 @@
 #ifndef FIXED_SIZE_STRUCT_STATE_BASE_IDL
 #define FIXED_SIZE_STRUCT_STATE_BASE_IDL
 
-#pragma rti typesupport "Base/FSS_State_Base_BaseSupport.h"
+#pragma ndds typesupport "Base/FSS_State_Base_BaseSupport.h"
 
 struct FixedStructSizeTest {
   long one;
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
index 177d5377b64..3d10bf9cceb 100644
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
@@ -13,7 +13,7 @@
 #include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/FSS_State_ConnectorE.idl"
-#pragma rti typesupport "Base/FSS_State_BaseSupport.h"
+#pragma ndds typesupport "Base/FSS_State_BaseSupport.h"
 
 module FSS_State
 {
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
index a00aa18a83d..5c3bcc779fd 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef GETTER_TEST_BASE_IDL
 #define GETTER_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/Getter_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/Getter_Test_BaseSupport.h"
 #pragma opendds typesupport "Base/Getter_Test_BaseTypeSupportC.h"
 
 #pragma DCPS_DATA_TYPE "GetterTest"
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
index 6331a4b9f48..82801a020ae 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
@@ -8,7 +8,7 @@
 #ifndef WRITER_BASE_IDL
 #define WRITER_BASE_IDL
 
-#pragma rti typesupport "Base/Writer_BaseSupport.h"
+#pragma ndds typesupport "Base/Writer_BaseSupport.h"
 
 struct WriterTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
index b9450a17bb0..ef05630a31e 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef KEYED_TEST_BASE_IDL
 #define KEYED_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/Keyed_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/Keyed_Test_BaseSupport.h"
 
 struct KeyedTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
index 5a7de4ceb84..db4905ab610 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
@@ -8,7 +8,7 @@
 #ifndef WRITER_BASE_IDL
 #define WRITER_BASE_IDL
 
-#pragma rti typesupport "Base/Writer_BaseSupport.h"
+#pragma ndds typesupport "Base/Writer_BaseSupport.h"
 
 struct WriterTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
index 5f88fa99832..dfa83eb4c61 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef LISTEN_MANY_BY_MANY_TEST_BASE_IDL
 #define LISTEN_MANY_BY_MANY_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/LMBM_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/LMBM_Test_BaseSupport.h"
 
 struct ListenManyByManyTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
index 42735f8a048..6fb7559eb8f 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef LISTEN_NOT_ENABLED_TEST_BASE_IDL
 #define LISTEN_NOT_ENABLED_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/LNE_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/LNE_Test_BaseSupport.h"
 
 struct ListenNotEnabledTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
index 54ca2928841..5260399276e 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef LISTEN_ONE_BY_ONE_TEST_BASE_IDL
 #define LISTEN_ONE_BY_ONE_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/LOBO_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/LOBO_Test_BaseSupport.h"
 
 struct ListenOneByOneTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
index b497cf89cdb..1508ad78921 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
@@ -8,7 +8,7 @@
 #ifndef NONCHANGEABLE_BASE_IDL
 #define NONCHANGEABLE_BASE_IDL
 
-#pragma rti typesupport "Base/NonChangeable_BaseSupport.h"
+#pragma ndds typesupport "Base/NonChangeable_BaseSupport.h"
 
 struct NonChangeableTest {
   string key;
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
index ca517e987c2..148b50ead6b 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
@@ -3,7 +3,7 @@
 #ifndef CONNECTORSTATUSLISTENER_TEST_BASE_IDL
 #define CONNECTORSTATUSLISTENER_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/ConnectorStatusListener_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/ConnectorStatusListener_Test_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
index 9257a7275f2..0442b012395 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
@@ -8,7 +8,7 @@
 #ifndef PSL_DEADLINETEST_BASE_IDL
 #define PSL_DEADLINETEST_BASE_IDL
 
-#pragma rti typesupport "Base/PSL_DeadlineTest_BaseSupport.h"
+#pragma ndds typesupport "Base/PSL_DeadlineTest_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
index bb4449b65ae..629779106dd 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
@@ -8,7 +8,7 @@
 #ifndef PSL_SAMPLELOST_BASE_IDL
 #define PSL_SAMPLELOST_BASE_IDL
 
-#pragma rti typesupport "Base/PSL_SampleLost_BaseSupport.h"
+#pragma ndds typesupport "Base/PSL_SampleLost_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
index e3350a431b3..85739cbedc6 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef QUERY_FILTER_TEST_BASE_IDL
 #define QUERY_FILTER_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/QueryFilter_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/QueryFilter_Test_BaseSupport.h"
 
 struct QueryFilterTest {
   string symbol; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
index 5bf854d0566..e6390261dfc 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef READER_TEST_BASE_IDL
 #define READER_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/Reader_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/Reader_Test_BaseSupport.h"
 
 struct ReaderTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
index 957dc6e0e8a..30c652b7c9f 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
@@ -8,7 +8,7 @@
 #ifndef SL_DISABLED_BASE_IDL
 #define SL_DISABLED_BASE_IDL
 
-#pragma rti typesupport "Base/SL_Disabled_BaseSupport.h"
+#pragma ndds typesupport "Base/SL_Disabled_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
index df03bcd2fbd..dcf046718a4 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
@@ -8,7 +8,7 @@
 #ifndef SL_MANYBYMANY_BASE_IDL
 #define SL_MANYBYMANY_BASE_IDL
 
-#pragma rti typesupport "Base/SL_ManyByMany_BaseSupport.h"
+#pragma ndds typesupport "Base/SL_ManyByMany_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
index 1f05ed630b7..2c1f11e1068 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
@@ -8,7 +8,7 @@
 #ifndef SL_ONEBYONE_BASE_IDL
 #define SL_ONEBYONE_BASE_IDL
 
-#pragma rti typesupport "Base/SL_OneByOne_BaseSupport.h"
+#pragma ndds typesupport "Base/SL_OneByOne_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
index 47ff4e0f17e..ee64e289c16 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
@@ -8,7 +8,7 @@
 #ifndef SETCONNECTORATTRIBUTE_BASE_IDL
 #define SETCONNECTORATTRIBUTE_BASE_IDL
 
-#pragma rti typesupport "Base/SetConnectorAttribute_BaseSupport.h"
+#pragma ndds typesupport "Base/SetConnectorAttribute_BaseSupport.h"
 
 struct SetConnectorAttributeTest {
   string key;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
index e78c24dbb01..1726cbb00b1 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
@@ -8,7 +8,7 @@
 #ifndef BASE_IDL
 #define BASE_IDL
 
-#pragma rti typesupport "Base/BaseSupport.h"
+#pragma ndds typesupport "Base/BaseSupport.h"
 
 struct SharedDPTest1 {
   string key1;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
index ab0e4f6ffaa..a1e539029f7 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
@@ -8,7 +8,7 @@
 #ifndef BASE_IDL
 #define BASE_IDL
 
-#pragma rti typesupport "Base/BaseSupport.h"
+#pragma ndds typesupport "Base/BaseSupport.h"
 
 struct SharedDPTest {
   string key;
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
index b9fc6c50ec5..93c221b118d 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef STATE_CONNECTION_TEST_BASE_IDL
 #define STATE_CONNECTION_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/State_Connection_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/State_Connection_Test_BaseSupport.h"
 
 struct State_ConnectionTest {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
index fd4c08222d8..838c79d4fa7 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
@@ -8,7 +8,7 @@
 #ifndef TWOTOPICS_BASE_IDL
 #define TWOTOPICS_BASE_IDL
 
-#pragma rti typesupport "Base/TwoTopics_BaseSupport.h"
+#pragma ndds typesupport "Base/TwoTopics_BaseSupport.h"
 
 struct HelloTopic {
   string hello; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
index 5396b65ea38..584b9d684f6 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
@@ -13,7 +13,7 @@
 #include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/TwoTopics_ConnectorE.idl"
-#pragma rti typesupport "Base/TwoTopics_BaseSupport.h"
+#pragma ndds typesupport "Base/TwoTopics_BaseSupport.h"
 
 module TT_Connector
 {
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
index d5601df2126..4e1fffa994c 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
@@ -15,8 +15,8 @@
 #include "connectors/dds4ccm/idl/ccm_dds.idl"
 
 #pragma ciao lem "Connector/ConnectorE.idl"
-#pragma rti typesupport "Hello/HelloGoodbyeSupport.h"
-#pragma rti typesupport "Goodbye/HelloGoodbyeSupport.h"
+#pragma ndds typesupport "Hello/HelloGoodbyeSupport.h"
+#pragma ndds typesupport "Goodbye/HelloGoodbyeSupport.h"
 
 module Hello
 {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
index 7e496b570d1..9938aba2067 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
@@ -8,7 +8,7 @@
 #ifndef UNKEYED_TEST_BASE_IDL
 #define UNKEYED_TEST_BASE_IDL
 
-#pragma rti typesupport "Base/Unkeyed_Test_BaseSupport.h"
+#pragma ndds typesupport "Base/Unkeyed_Test_BaseSupport.h"
 
 struct UnkeyedTest {
   string key;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
index 3c25291104e..29af435017c 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
@@ -8,7 +8,7 @@
 #ifndef WRITER_BASE_IDL
 #define WRITER_BASE_IDL
 
-#pragma rti typesupport "Base/Writer_BaseSupport.h"
+#pragma ndds typesupport "Base/Writer_BaseSupport.h"
 
 typedef sequence<octet> Octet_Seq;
 
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
index 5d18c253c68..1f6805b69f5 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
@@ -8,7 +8,7 @@
 #ifndef UPDATER_BASE_IDL
 #define UPDATER_BASE_IDL
 
-#pragma rti typesupport "Base/Updater_BaseSupport.h"
+#pragma ndds typesupport "Base/Updater_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
index 448cfcb73db..886f6a47324 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
@@ -8,7 +8,7 @@
 #ifndef VTOPIC_BASE_IDL
 #define VTOPIC_BASE_IDL
 
-#pragma rti typesupport "Base/VTopic_BaseSupport.h"
+#pragma ndds typesupport "Base/VTopic_BaseSupport.h"
 
 struct TestTopic {
   string key; //@key
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
index 65e5d652ec4..89a8f92a67e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
@@ -8,7 +8,7 @@
 #ifndef VTOPICS_BASE_IDL
 #define VTOPICS_BASE_IDL
 
-#pragma rti typesupport "Base/VTopics_BaseSupport.h"
+#pragma ndds typesupport "Base/VTopics_BaseSupport.h"
 
   struct TestTopic {
     string key; //@key