Tue Nov 10 20:00:17 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp:
        * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp:
          Made deployable again.

        * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl:
        * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl:
        * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl:
          Improved cleanup of ior files.

5 files changed, 128 insertions, 363 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp
index 1c39265b2a7..d3eb0d63459 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/ReceiverOnly.cdp
@@ -9,20 +9,20 @@
   <!-- Implementations declarations -->
 
   <!-- Home implementation -->
-  <implementation xmi:id="Hello_ReceiverHomeImplementation">
-    <name>Hello_ReceiverHomeImplementation</name>
+  <implementation xmi:id="ReceiverComponentImplementation">
+    <name>ReceiverComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Hello_Receiver_ExecArtifact" />
-    <artifact xmi:idref="Hello_Receiver_SvntArtifact" />
+    <artifact xmi:idref="Receiver_ExecArtifact" />
+    <artifact xmi:idref="Receiver_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
+      <name>component factory</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_ReceiverHome_Impl</string>
+          <string>create_Hello_Receiver_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -33,7 +33,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_ReceiverHome_Servant</string>
+          <string>create_Hello_Receiver_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -44,7 +44,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_Receiver_svnt</string>
+          <string>Receiver_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -55,26 +55,26 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_Receiver_exec</string>
+          <string>Receiver_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
-
-  <implementation xmi:id="Hello_ReceiverConnectorHomeImplementation">
-    <name>Hello_ReceiverConnectorHomeImplementation</name>
+  
+  <implementation xmi:id="Hello_ConnectorComponentImplementation">
+    <name>Hello_ConnectorComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Hello_ReceiverConnector_ExecArtifact" />
-    <artifact xmi:idref="Hello_ReceiverConnector_SvntArtifact" />
+    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
+    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
+      <name>component factory</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_ReceiverConnectorHome_Impl</string>
+          <string>create_Hello_Hello_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -85,7 +85,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_ReceiverConnectorHome_Servant</string>
+          <string>create_Hello_Hello_Connector_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -96,7 +96,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_ReceiverConnector_svnt</string>
+          <string>Hello_Connector_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -107,276 +107,141 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_ReceiverConnector_exec</string>
+          <string>Hello_Connector_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
-
-  <implementation xmi:id="Hello_ReceiverComponentImplementation">
-    <name>Hello_ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Receiver_ExecArtifact" />
-    <artifact xmi:idref="Hello_Receiver_SvntArtifact" />
-  </implementation>
-
-
-  <implementation xmi:id="Hello_ReceiverConnectorComponentImplementation">
-    <name>Hello_ReceiverConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_ReceiverConnector_ExecArtifact" />
-    <artifact xmi:idref="Hello_ReceiverConnector_SvntArtifact" />
-  </implementation>
-
-  <instance xmi:id="Hello_ReceiverHomeInstance">
-    <name>Hello_ReceiverHome</name>
+  <instance xmi:id="ReceiverComponentInstance">
+    <name>ReceiverComponent</name>
     <node>ReceiverNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Hello_ReceiverHomeImplementation" />
+    <implementation xmi:idref="ReceiverComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <name>expected_samples</name>
       <value>
         <type>
-          <kind>tk_string</kind>
+          <kind>tk_long</kind>
         </type>
         <value>
-          <string>ReceiverHome.ior</string>
+          <long>100</long>
         </value>
       </value>
     </configProperty>
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
+      <name>name</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>ReceiverHome</string>
+          <string>Receiver1</string>
         </value>
       </value>
     </configProperty>
   </instance>
-
-
-  <instance xmi:id="Hello_ReceiverConnectorHomeInstance">
-    <name>Hello_ReceiverConnectorHome</name>
+  <instance xmi:id="Hello_ConnectorComponentInstance">
+    <name>Hello_ConnectorComponent2</name>
     <node>ReceiverNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorHomeImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnectorHome.ior</string>
-        </value>
-      </value>
-    </configProperty>
+    <implementation xmi:idref="Hello_ConnectorComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
+      <name>topic_name</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>ReceiverConnectorHome</string>
+          <string>Hello</string>
         </value>
       </value>
     </configProperty>
   </instance>
 
-  <instance xmi:id="Hello_ReceiverComponentInstance">
-    <name>Hello_ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_ReceiverConnectorComponentInstance">
-    <name>Hello_ReceiverConnectorComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_ReceiverConnectorComponentImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnector.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ReceiverConnector</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>ccm_dds_string_reader</name>
-    <internalEndpoint>
-      <portName>read_message_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>receiver_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
   <connection>
-    <name>ccm_dds_listenercontrol</name>
+    <name>_listenercontrol</name>
     <internalEndpoint>
-      <portName>read_message_control</portName>
+      <portName>info_out_data_control</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
+      <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>receiver_control</portName>
+      <portName>info_out_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
+      <instance xmi:idref="Hello_ConnectorComponentInstance" />
     </internalEndpoint>
   </connection>
-
   <connection>
-    <name>ccm_dds_string_rawlistner</name>
+    <name>_portstatuslistener</name>
     <internalEndpoint>
-      <portName>read_message_listener</portName>
+      <portName>info_out_status</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
+      <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>receiver_listener</portName>
+      <portName>info_out_status</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
+      <instance xmi:idref="Hello_ConnectorComponentInstance" />
     </internalEndpoint>
   </connection>
-
   <connection>
-    <name>dds_datareader</name>
-    <internalEndpoint>
-      <portName>read_message_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
-    </internalEndpoint>
+    <name>_rawlistner</name>
     <internalEndpoint>
-      <portName>receiver_dds_entity</portName>
+      <portName>info_out_data_listener</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>ccm_dds_portstatuslistener</name>
-    <internalEndpoint>
-      <portName>read_message_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_ReceiverComponentInstance" />
+      <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>receiver_status</portName>
+      <portName>info_out_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_ReceiverConnectorComponentInstance" />
+      <instance xmi:idref="Hello_ConnectorComponentInstance" />
     </internalEndpoint>
   </connection>
 
   <!-- Artifacts declarations -->
-  <artifact xmi:id="Hello_Receiver_ExecArtifact">
-    <name>Hello_Receiver_exec</name>
+  <artifact xmi:id="Hello_Connector_ExecArtifact">
+    <name>Hello_Connector_exec</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Receiver_exec</location>
+    <location>DDS_Hello_Connector_exec</location>
   </artifact>
-  <artifact xmi:id="Hello_Receiver_SvntArtifact">
-    <name>Hello_Receiver_svnt</name>
+  <artifact xmi:id="Hello_Connector_SvntArtifact">
+    <name>Hello_Connector_svnt</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Receiver_svnt</location>
+    <location>DDS_Hello_Connector_svnt</location>
   </artifact>
-
-  <artifact xmi:id="Hello_ReceiverConnector_ExecArtifact">
-    <name>Hello_ReceiverConnector_exec</name>
+  <artifact xmi:id="Hello_Connector_StubArtifact">
+    <name>Hello_Connector_stub</name>
+    <source/>
+    <node/>
+    <location>DDS_Hello_Connector_stub</location>
+  </artifact>
+  <artifact xmi:id="Receiver_ExecArtifact">
+    <name>Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>Receiver_exec</location>
+  </artifact>
+  <artifact xmi:id="Receiver_SvntArtifact">
+    <name>Receiver_svnt</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Receiver_Connector_exec</location>
+    <location>Receiver_svnt</location>
   </artifact>
-  <artifact xmi:id="Hello_ReceiverConnector_SvntArtifact">
-    <name>Hello_ReceiverConnector_svnt</name>
+  <artifact xmi:id="Receiver_StubArtifact">
+    <name>Receiver_stub</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Receiver_Connector_svnt</location>
+    <location>Receiver_stub</location>
   </artifact>
 
 </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
index 0bddb56ed13..0ef3315892f 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
@@ -8,21 +8,20 @@
 
   <!-- Implementations declarations -->
 
-  <!-- Home implementation -->
-  <implementation xmi:id="Hello_SenderHomeImplementation">
-    <name>Hello_SenderHomeImplementation</name>
+  <implementation xmi:id="Hello_SenderConnectorComponentImplementation">
+    <name>Hello_ConnectorComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Hello_Sender_ExecArtifact" />
-    <artifact xmi:idref="Hello_Sender_SvntArtifact" />
+    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
+    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
+      <name>component factory</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_SenderHome_Impl</string>
+          <string>create_Hello_Hello_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -33,7 +32,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_SenderHome_Servant</string>
+          <string>create_Hello_Hello_Connector_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -44,7 +43,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_Sender_svnt</string>
+          <string>Hello_Connector_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -55,27 +54,25 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_Sender_exec</string>
+          <string>Hello_Connector_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
-
-
-  <implementation xmi:id="Hello_SenderConnectorHomeImplementation">
-    <name>Hello_SenderConnectorHomeImplementation</name>
+  <implementation xmi:id="Hello_SenderComponentImplementation">
+    <name>Hello_SenderComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Hello_SenderConnector_ExecArtifact" />
-    <artifact xmi:idref="Hello_SenderConnector_SvntArtifact" />
+    <artifact xmi:idref="Sender_ExecArtifact" />
+    <artifact xmi:idref="Sender_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>home factory</name>
+      <name>component factory</name>
       <value>
         <type>
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_SenderConnectorHome_Impl</string>
+          <string>create_Hello_Sender_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -86,7 +83,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_DDS_SenderConnectorHome_Servant</string>
+          <string>create_Hello_Sender_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -97,7 +94,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_SenderConnector_svnt</string>
+          <string>Sender_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -108,88 +105,12 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_SenderConnector_exec</string>
+          <string>Sender_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
 
-  <implementation xmi:id="Hello_SenderComponentImplementation">
-    <name>Hello_SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_Sender_ExecArtifact" />
-    <artifact xmi:idref="Hello_Sender_SvntArtifact" />
-  </implementation>
-
-
-  <implementation xmi:id="Hello_SenderConnectorComponentImplementation">
-    <name>Hello_SenderConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Hello_SenderConnector_ExecArtifact" />
-    <artifact xmi:idref="Hello_SenderConnector_SvntArtifact" />
-  </implementation>
-
-  <instance xmi:id="Hello_SenderHomeInstance">
-    <name>Hello_SenderHome</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_SenderHomeImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderHome.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderHome</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance xmi:id="Hello_SenderConnectorHomeInstance">
-    <name>Hello_SenderConnectorHome</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Hello_SenderConnectorHomeImplementation" />
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorHome.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.RegisterNaming</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>SenderConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
   <instance xmi:id="Hello_SenderComponentInstance">
     <name>Hello_SenderComponent</name>
     <node>SenderNode</node>
@@ -197,17 +118,6 @@
     <source/>
     <implementation xmi:idref="Hello_SenderComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_SenderHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
       <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
       <value>
         <type>
@@ -238,17 +148,6 @@
     <source/>
     <implementation xmi:idref="Hello_SenderConnectorComponentImplementation" />
     <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_SenderConnectorHome</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
       <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
       <value>
         <type>
@@ -273,31 +172,15 @@
   </instance>
 
   <connection>
-    <name>string_writer_connection</name>
-    <internalEndpoint>
-      <portName>push_data_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>sender_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>dds_data_writer_connection</name>
+    <name>info_write_data</name>
     <internalEndpoint>
-      <portName>push_data_dds_entity</portName>
+      <portName>info_in_data</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentInstance" />
+      <instance xmi:idref="Hello_SenderComponentImplementation" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>sender_dds_entity</portName>
+      <portName>info_in_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
@@ -305,30 +188,29 @@
   </connection>
 
   <!-- Artifacts declarations -->
-  <artifact xmi:id="Hello_Sender_ExecArtifact">
-    <name>Hello_Sender_exec</name>
+  <artifact xmi:id="Sender_ExecArtifact">
+    <name>Sender_exec</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Sender_exec</location>
+    <location>Sender_exec</location>
   </artifact>
-  <artifact xmi:id="Hello_Sender_SvntArtifact">
-    <name>Hello_Sender_svnt</name>
+  <artifact xmi:id="Sender_SvntArtifact">
+    <name>Sender_svnt</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Sender_svnt</location>
+    <location>Sender_svnt</location>
   </artifact>
-
-  <artifact xmi:id="Hello_SenderConnector_ExecArtifact">
-    <name>Hello_SenderConnector_exec</name>
+  <artifact xmi:id="Hello_Connector_ExecArtifact">
+    <name>Hello_Connector_exec</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Sender_Connector_exec</location>
+    <location>DDS_Hello_Connector_exec</location>
   </artifact>
-  <artifact xmi:id="Hello_SenderConnector_SvntArtifact">
-    <name>Hello_SenderConnector_svnt</name>
+  <artifact xmi:id="Hello_Connector_SvntArtifact">
+    <name>Hello_Connector_svnt</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Sender_Connector_svnt</location>
+    <location>DDS_Hello_Connector_svnt</location>
   </artifact>
 
 </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
index 1f8db2303df..9bf25536809 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
@@ -18,7 +18,7 @@ $ns_running = 0;
 
 $daemons = 2;
 @ports = ( 60001, 60002 );
-@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
+@iorfiles = ( "Sender.ior", "Receiver.ior" );
 @nodenames = ( "SenderNode", "ReceiverNode" );
 
 $status = 0;
@@ -41,8 +41,26 @@ sub delete_ior_files {
         unlink $iorfiles[$i];
     }
     unlink PerlACE::LocalFile ("EM.ior");
-    unlink PerlACE::LocalFile ("Receiver.ior");
-    unlink PerlACE::LocalFile ("Sender.ior");
+    unlink PerlACE::LocalFile ("ReceiverOne.ior");
+    unlink PerlACE::LocalFile ("ReceiverTwo.ior");
+    unlink PerlACE::LocalFile ("ReceiverThree.ior");
+    unlink PerlACE::LocalFile ("ReceiverFour.ior");
+    unlink PerlACE::LocalFile ("ReceiverFive.ior");
+    unlink PerlACE::LocalFile ("SenderOne.ior");
+    unlink PerlACE::LocalFile ("SenderTwo.ior");
+    unlink PerlACE::LocalFile ("SenderThree.ior");
+    unlink PerlACE::LocalFile ("SenderFour.ior");
+    unlink PerlACE::LocalFile ("SenderFive.ior");
+    unlink PerlACE::LocalFile ("ReceiverConnectorOne.ior");
+    unlink PerlACE::LocalFile ("ReceiverConnectorTwo.ior");
+    unlink PerlACE::LocalFile ("ReceiverConnectorThree.ior");
+    unlink PerlACE::LocalFile ("ReceiverConnectorFour.ior");
+    unlink PerlACE::LocalFile ("ReceiverConnectorFive.ior");
+    unlink PerlACE::LocalFile ("SenderConnectorOne.ior");
+    unlink PerlACE::LocalFile ("SenderConnectorTwo.ior");
+    unlink PerlACE::LocalFile ("SenderConnectorThree.ior");
+    unlink PerlACE::LocalFile ("SenderConnectorFour.ior");
+    unlink PerlACE::LocalFile ("SenderConnectorFive.ior");
     unlink PerlACE::LocalFile ("DAM.ior");
     unlink PerlACE::LocalFile ("ns.ior");
 }
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
index 4e2c56a9be3..3961ab12218 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
@@ -18,7 +18,7 @@ $ns_running = 0;
 
 $daemons = 1;
 @ports = ( 60001 );
-@iorfiles = ( "NodeApp1.ior" );
+@iorfiles = ( "Receiver.ior" );
 @nodenames = ( "ReceiverNode" );
 
 $status = 0;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
index c30d966db64..0803e2de1d8 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
@@ -18,7 +18,7 @@ $ns_running = 0;
 
 $daemons = 1;
 @ports = ( 60001 );
-@iorfiles = ( "NodeApp1.ior" );
+@iorfiles = ( "Sender.ior" );
 @nodenames = ( "SenderNode" );
 
 $status = 0;