Wed May 12 10:13:15 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl:
        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.idl:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.idl:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl:
        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl:
        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl:
        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h:
        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl:
        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h:
        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.idl:
        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl:
        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h:
        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.idl:
        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.h:
        * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp:
          Instantiate the Typed CCM_DDS module inside the module of this test. This
          way the IDL type and all CCM_DDS typed interfaces are all in the
          module.

7 files changed, 9 insertions, 16 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
index a5894738606..19f4ef12391 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.idl
@@ -14,16 +14,9 @@
 
 #pragma ciao lem "Connector/Writer_ConnectorE.idl"
 
-module CCM_DDS
-{
-  module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTest;
-};
-
 module Writer
 {
-  connector Writer_Connector : ::CCM_DDS::WriterTest::DDS_Event
-  {
-  };
+  module ::CCM_DDS::Typed < ::WriterTest, ::WriterTestSeq> WriterTestConnector;
 };
 
 #endif /* Writer_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
index e42f3efc798..c0a984b68fd 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.idl
@@ -14,7 +14,7 @@ module Writer
 {
   component Receiver
   {
-    port CCM_DDS::WriterTest::DDS_Listen info_out;
+    port WriterTestConnector::DDS_Listen info_out;
     attribute unsigned short iterations;
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
index fd1e853f12a..7d29f92716d 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.cpp
@@ -74,7 +74,7 @@ namespace CIAO_Writer_Receiver_Impl
   }
 
   // Port operations.
-  ::CCM_DDS::WriterTest::CCM_Listener_ptr
+  ::Writer::WriterTestConnector::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new WriterTest RAW listener\n")));
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
index d1f941be18c..6df60e67c59 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h
@@ -19,7 +19,7 @@
 namespace CIAO_Writer_Receiver_Impl
 {
   class RECEIVER_EXEC_Export WriterTest_Listener_exec_i
-    : public virtual ::CCM_DDS::WriterTest::CCM_Listener,
+    : public virtual ::Writer::WriterTestConnector::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -52,7 +52,7 @@ namespace CIAO_Writer_Receiver_Impl
     virtual void iterations (::CORBA::UShort iterations);
 
     // Port operations.
-    virtual ::CCM_DDS::WriterTest::CCM_Listener_ptr
+    virtual ::Writer::WriterTestConnector::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
index eebc31419e2..e34fa5d405c 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
@@ -16,7 +16,7 @@ module Writer
 {
   component Sender
   {
-    port CCM_DDS::WriterTest::DDS_Write info_write;
+    port WriterTestConnector::DDS_Write info_write;
     attribute unsigned short rate;
     attribute unsigned short iterations;
     attribute unsigned short keys;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
index ead020fedfe..bf11d1c138b 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.h
@@ -75,7 +75,7 @@ namespace CIAO_Writer_Sender_Impl
     void start (void);
     void stop (void);
 
-    CCM_DDS::WriterTest::Writer_var writer_;
+    ::Writer::WriterTestConnector::Writer_var writer_;
 
     pulse_Generator * ticker_;
     ::Writer::CCM_Sender_Context_var context_;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
index 88c24d90338..a44fb1f0683 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
@@ -71,7 +71,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Writer_Writer_Connector_Impl</string>
+          <string>create_Writer_WriterTestConnector_DDS_Event_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -82,7 +82,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Writer_Writer_Connector_Servant</string>
+          <string>create_Writer_WriterTestConnector_DDS_Event_Servant</string>
         </value>
       </value>
     </execParameter>