Wed Nov 18 14:50:19 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp:
        * connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp:
        * connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp:
        * connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp:
        * connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp:
        * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp:
        * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp:
          Changed to meet the latest version of the DDS implementation.

        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl:
        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp:
        * 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/Sender/Unkeyed_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp:
          Renamed some incorrect methods/values.

14 files changed, 57 insertions, 80 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp
index 67c04639a4c..bc522533cc7 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp
@@ -546,7 +546,7 @@
       <instance xmi:idref="SenderComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
@@ -562,7 +562,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
@@ -577,7 +577,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
@@ -592,7 +592,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
@@ -607,7 +607,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
@@ -622,7 +622,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
@@ -641,7 +641,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
@@ -656,7 +656,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
@@ -671,7 +671,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
@@ -686,7 +686,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
@@ -701,7 +701,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
@@ -720,7 +720,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
@@ -735,7 +735,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
@@ -750,7 +750,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
@@ -765,7 +765,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
@@ -780,7 +780,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp
index 9d14c550587..1384fd2a0e8 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Receivers.cdp
@@ -587,7 +587,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
@@ -602,7 +602,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
@@ -617,7 +617,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
@@ -632,7 +632,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
@@ -647,7 +647,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
@@ -666,7 +666,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
@@ -681,7 +681,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
@@ -696,7 +696,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
@@ -711,7 +711,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
@@ -726,7 +726,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
@@ -745,7 +745,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceOne" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceOne" />
@@ -760,7 +760,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceTwo" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceTwo" />
@@ -775,7 +775,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceThree" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceThree" />
@@ -790,7 +790,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFour" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFour" />
@@ -805,7 +805,7 @@
       <instance xmi:idref="Hello_ReceiverComponentInstanceFive" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstanceFive" />
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp
index 1e48d10b8a3..07c33f48527 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_Senders.cdp
@@ -532,7 +532,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceOne" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceOne" />
@@ -547,7 +547,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceTwo" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceTwo" />
@@ -562,7 +562,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceThree" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceThree" />
@@ -577,7 +577,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceFour" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceFour" />
@@ -592,7 +592,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceFive" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceFive" />
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp
index 4384bdf7d1c..eca3a52e570 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/5_to_1.cdp
@@ -678,7 +678,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceOne" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceOne" />
@@ -693,7 +693,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceTwo" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceTwo" />
@@ -708,7 +708,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceThree" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceThree" />
@@ -723,7 +723,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceFour" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceFour" />
@@ -738,7 +738,7 @@
       <instance xmi:idref="Hello_SenderComponentInstanceFive" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstanceFive" />
@@ -754,7 +754,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
@@ -770,7 +770,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
@@ -786,7 +786,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp
index 83a4b30a6d2..e7c929f5be3 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/DeploymentPlan.cdp
@@ -268,7 +268,7 @@
       <instance xmi:idref="SenderComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ConnectorComponentInstance" />
@@ -283,7 +283,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ConnectorComponentInstance" />
@@ -298,7 +298,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ConnectorComponentInstance" />
@@ -313,7 +313,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ConnectorComponentInstance" />
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp
index d3eb0d63459..a865c501464 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp
@@ -169,7 +169,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_control</portName>
+      <portName>push_consumer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_ConnectorComponentInstance" />
@@ -184,7 +184,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_status</portName>
+      <portName>push_consumer_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ConnectorComponentInstance" />
@@ -199,7 +199,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_out_data_listener</portName>
+      <portName>push_consumer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Hello_ConnectorComponentInstance" />
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
index a058e6620dc..837915b6832 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
@@ -158,7 +158,7 @@
       <instance xmi:idref="Hello_SenderComponentImplementation" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>info_in_data</portName>
+      <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
index fc12392916f..0c86e2938b4 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.idl
@@ -26,17 +26,4 @@ module Keyed_Test
   };
 };
 
-/*
-For future use: IDL3 plus
-#include <dds4ccm/idl/dds4ccm_Connector_Base.idl3p>
-#include <dds4ccm/idl/dds4ccm_Port_RawListen.idl3p>
-
-module Keyed_Test
-{
-  component Receiver
-  {
-    port CCM_DDS::DDS_RawListen <Shape_Info> info;
-  };
-};
-*/
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
index 36ca3a2edeb..2b86d6ca34e 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.cpp
@@ -174,7 +174,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl
       }
     for(CORBA::ULong i = 0; i < keyedtest_infos->length(); ++i)
       {
-        CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ")
+        CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
               ACE_TEXT ("Number <%d> : received keyedtest_info for <%C> at %u\n"),
             i,
             keyedtest_infos[i].key.in (),
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
index 3295652e90a..86f5d864b4a 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
@@ -175,7 +175,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
       }
     for(CORBA::ULong i = 0; i < keyedtest_infos->length(); ++i)
       {
-        CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ")
+        CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
               ACE_TEXT ("Number <%d> : received keyedtest_info for <%C> at %u\n"),
             i,
             keyedtest_infos[i].key.in (),
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
index b5cd2c73cba..fd56a0bf4b8 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.idl
@@ -24,14 +24,4 @@ module Unkeyed_Test
   };
 };
 
-/*
-For future use: IDL3 plus
-module Unkeyed_Test
-{
-  component Sender
-  {
-    port CCM_DDS::DDS_Write <Shape_Info> info;
-  };
-};
-*/
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
index 3f4c1d1f657..2e5b1befa22 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.cpp
@@ -199,7 +199,7 @@ namespace CIAO_Unkeyed_Test_Sender_Impl
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shape_Sender_Impl (void)
+  create_Unkeyed_Test_Sender_Impl (void)
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
index b3215516c41..10ba597d1c1 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender_exec.h
@@ -83,7 +83,7 @@ namespace CIAO_Unkeyed_Test_Sender_Impl
   };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Shape_Sender_Impl (void);
+  create_Unkeyed_Test_Sender_Impl (void);
 }
 
 #endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp
index 16dd0dde25e..c8061c77baf 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/Plan.cdp
@@ -122,7 +122,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Shape_Sender_Impl</string>
+          <string>create_Unkeyed_Test_Sender_Impl</string>
         </value>
       </value>
     </execParameter>