Wed Apr 7 12:12:13 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl:
        * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h:
        * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl:
          Moved templated connector to the namespace of the connector.

        * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml:
          Removed this file since we don't need it in this test.

        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl:
          Moved templated connector to the namespace of the connector.

7 files changed, 25 insertions, 92 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 6b278fdc228..3f7683a4d7f 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Wed Apr  7 12:12:13 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl:
+        * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h:
+        * connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl:
+          Moved templated connector to the namespace of the connector.
+
+        * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml:
+          Removed this file since we don't need it in this test.
+
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl:
+          Moved templated connector to the namespace of the connector.
+
 Wed Apr  7 11:09:09 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/On_Inconsistent_Topic/*:
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
index ab3613476a6..ca0ced47bd1 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.idl
@@ -14,7 +14,7 @@ module QosProfile_Test
 {
   component QosProfileComponent
   {
-    port CCM_DDS::QosProfileTest::DDS_Write info_write;
+    port QosProfileTestConn::DDS_Write info_write;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
index 317f5059179..5db3b8868b3 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component_exec.h
@@ -42,7 +42,7 @@ namespace CIAO_QosProfile_Test_QosProfileComponent_Impl
 
   private:
     ::QosProfile_Test::CCM_QosProfileComponent_Context_var context_;
-    ::CCM_DDS::QosProfileTest::Writer_var writer_;
+    ::QosProfile_Test::QosProfileTestConn::Writer_var writer_;
   };
 
   extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
index aeeea8e21e8..3d5412a78b8 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.idl
@@ -5,8 +5,8 @@
  * @author Marcel Smit <msmit@remedy.nl>
  */
 
-#ifndef COHERENT_WRITE_TEST_CONNECTOR_IDL_
-#define COHERENT_WRITE_TEST_CONNECTOR_IDL_
+#ifndef QOS_PROFILE_TEST_CONNECTOR_IDL_
+#define QOS_PROFILE_TEST_CONNECTOR_IDL_
 
 #include  <Components.idl>
 #include "Base/QosProfile_Test_Base.idl"
@@ -14,16 +14,12 @@
 
 #pragma ciao lem "Connector/QosProfile_Test_ConnectorE.idl"
 
-module CCM_DDS
-{
-  module ::CCM_DDS::Typed < ::QosProfileTest, ::QosProfileTestSeq> QosProfileTest;
-};
-
 module QosProfile_Test
 {
-  connector QosProfile_Test_Connector : ::CCM_DDS::QosProfileTest::DDS_Event
+  module ::CCM_DDS::Typed < ::QosProfileTest, ::QosProfileTestSeq> QosProfileTestConn;
+  connector QosProfile_Test_Connector : QosProfileTestConn::DDS_Event
   {
   };
 };
 
-#endif /* QosProfile_Test_CONNECTOR_IDL_ */
+#endif /* QOS_PROFILE_TEST_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp
index a03aa8911bd..47cae28de74 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp
@@ -123,17 +123,6 @@
     <source/>
     <implementation xmi:idref="QosProfile_Test_ConnectorComponentImplementation" />
     <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Wrong_Library#Wrong_Profile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
       <name>topic_name</name>
       <value>
         <type>
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 571930e854d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-
-Description
-XML QoS Profile 
-
-The QoS configuration of the DDS entities in the generated example is 
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the enviroment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the 
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="QueryFilter_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter 
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="QueryFilter_Profile" is_default_qos="true">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>10</sec>
-            <nanosec>0</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
index 27c690f0635..53f741205e2 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.idl
@@ -14,14 +14,12 @@
 
 #pragma ciao lem "Connector/SetConnectorAttribute_ConnectorE.idl"
 
-module CCM_DDS
-{
-  module ::CCM_DDS::Typed < ::SetConnectorAttributeTest, ::SetConnectorAttributeTestSeq> SetConnectorAttributeTest;
-};
-
 module SetConnectorAttribute
 {
-  connector SetConnectorAttribute_Connector : ::CCM_DDS::SetConnectorAttributeTest::DDS_Event
+  module ::CCM_DDS::Typed
+    < ::SetConnectorAttributeTest, ::SetConnectorAttributeTestSeq>
+    SetConnectorAttributeTestConn;
+  connector SetConnectorAttribute_Connector : SetConnectorAttributeTestConn::DDS_Event
   {
   };
 };