Wed Apr 7 14:08:23 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc:
          Removed unnecessary define.

        * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml:
          Corrected previous commit.

4 files changed, 59 insertions, 2 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 541418f4bc0..71d96f22521 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,7 +1,16 @@
+Wed Apr  7 14:08:23 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc:
+          Removed unnecessary define.
+
+        * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml:
+          Corrected previous commit.
+
 Wed Apr  7 13:46:12 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * ciao/Servants/Connector_Servant_Impl_Base.cpp:
-        
+
           Commented out an unused argument.
 
 Wed Apr  7 12:12:13 UTC 2010  Marcel Smit  <msmit@remedy.nl>
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
index bccfb52811b..0b454ea7df6 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
@@ -95,7 +95,7 @@ project(QosProfile_Test_Component_exec) : ciao_executor, dds4ccm_base {
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = COMPONENT_EXEC_BUILD_DLL READER_STARTER_STUB_BUILD_DLL
+  dynamicflags   = COMPONENT_EXEC_BUILD_DLL
 
   IDL_Files {
   }
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp
index 47cae28de74..a03aa8911bd 100644
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp
@@ -123,6 +123,17 @@
     <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
new file mode 100644
index 00000000000..7ee62500559
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml
@@ -0,0 +1,37 @@
+<dds 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 name="QosProfile_Library">
+    <qos_profile name="QosProfile_Profile" is_default_qos="true">
+      <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>
+      <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