Wed Nov 25 10:54:24 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp:
          Resolved some errors.

        * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl:
        * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl:
          No need to wait 60 seconds.

        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
          Optimized logging.

3 files changed, 74 insertions, 51 deletions

diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
index 837915b6832..8019f0b08a5 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/SenderOnly.cdp
@@ -1,18 +1,19 @@
 <Deployment:DeploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+                          xmlns:Deployment="http://www.omg.org/Deployment"
+                          xmlns:xmi="http://www.omg.org/XMI"
+                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                          xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
   <label>Hello_DDS_Deployment_1</label>
   <UUID>Hello_DDS_Deployment_1</UUID>
-
+  
   <!-- Implementations declarations -->
-
-  <implementation xmi:id="Hello_SenderConnectorComponentImplementation">
-    <name>Hello_ConnectorComponentImplementation</name>
+  
+  <!-- Home implementation -->
+  <implementation xmi:id="SenderComponentImplementation">
+    <name>SenderComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
-    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
+    <artifact xmi:idref="Sender_ExecArtifact" />
+    <artifact xmi:idref="Sender_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
       <name>component factory</name>
@@ -21,7 +22,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_Hello_Connector_Impl</string>
+          <string>create_Hello_Sender_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -32,7 +33,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_Hello_Connector_Servant</string>
+          <string>create_Hello_Sender_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -43,7 +44,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_Connector_svnt</string>
+          <string>Sender_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -54,16 +55,17 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Hello_Connector_exec</string>
+          <string>Sender_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
-  <implementation xmi:id="Hello_SenderComponentImplementation">
-    <name>Hello_SenderComponentImplementation</name>
+  
+  <implementation xmi:id="Hello_ConnectorComponentImplementation">
+    <name>Hello_ConnectorComponentImplementation</name>
     <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
+    <artifact xmi:idref="Hello_Connector_ExecArtifact" />
+    <artifact xmi:idref="Hello_Connector_SvntArtifact" />
     <execParameter>
       <!-- entrypoint as exec parameter (see 10.6.1) -->
       <name>component factory</name>
@@ -72,7 +74,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_Sender_Impl</string>
+          <string>create_Hello_Hello_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -83,7 +85,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_Sender_Servant</string>
+          <string>create_Hello_Hello_Connector_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -94,7 +96,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Sender_svnt</string>
+          <string>Hello_Connector_svnt</string>
         </value>
       </value>
     </execParameter>
@@ -105,67 +107,94 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>Sender_exec</string>
+          <string>Hello_Connector_exec</string>
         </value>
       </value>
     </execParameter>
   </implementation>
-
-  <instance xmi:id="Hello_SenderComponentInstance">
-    <name>Hello_SenderComponent</name>
+  <instance xmi:id="SenderComponentInstance">
+    <name>SenderComponent</name>
     <node>SenderNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Hello_SenderComponentImplementation" />
+    <implementation xmi:idref="SenderComponentImplementation" />
+    <configProperty>
+      <name>expected_samples</name>
+      <value>
+        <type>
+          <kind>tk_long</kind>
+        </type>
+        <value>
+          <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>Sender</string>
+          <string>Sender1</string>
         </value>
       </value>
     </configProperty>
   </instance>
-
-  <instance xmi:id="Hello_SenderConnectorComponentInstance">
-    <name>Hello_SenderConnectorComponent</name>
+  <instance xmi:id="Hello_ConnectorComponentInstance">
+    <name>Hello_ConnectorComponent2</name>
     <node>SenderNode</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="Hello_SenderConnectorComponentImplementation" />
+    <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>SenderConnector</string>
+          <string>Hello</string>
         </value>
       </value>
     </configProperty>
   </instance>
-
+  
   <connection>
     <name>info_write_data</name>
     <internalEndpoint>
       <portName>info_in_data</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Hello_SenderComponentImplementation" />
+      <instance xmi:idref="SenderComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
       <portName>supplier_data</portName>
       <provider>true</provider>
       <kind>Facet</kind>
-      <instance xmi:idref="Hello_SenderConnectorComponentInstance" />
+      <instance xmi:idref="Hello_ConnectorComponentInstance" />
     </internalEndpoint>
   </connection>
 
   <!-- Artifacts declarations -->
+  <artifact xmi:id="Hello_Connector_ExecArtifact">
+    <name>Hello_Connector_exec</name>
+    <source/>
+    <node/>
+    <location>DDS_Hello_Connector_exec</location>
+  </artifact>
+  <artifact xmi:id="Hello_Connector_SvntArtifact">
+    <name>Hello_Connector_svnt</name>
+    <source/>
+    <node/>
+    <location>DDS_Hello_Connector_svnt</location>
+  </artifact>
+  <artifact xmi:id="Hello_Connector_StubArtifact">
+    <name>Hello_Connector_stub</name>
+    <source/>
+    <node/>
+    <location>DDS_Hello_Connector_stub</location>
+  </artifact>
   <artifact xmi:id="Sender_ExecArtifact">
     <name>Sender_exec</name>
     <source/>
@@ -178,17 +207,11 @@
     <node/>
     <location>Sender_svnt</location>
   </artifact>
-  <artifact xmi:id="Hello_Connector_ExecArtifact">
-    <name>Hello_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Hello_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Hello_Connector_SvntArtifact">
-    <name>Hello_Connector_svnt</name>
+  <artifact xmi:id="Sender_StubArtifact">
+    <name>Sender_stub</name>
     <source/>
     <node/>
-    <location>DDS_Hello_Connector_svnt</location>
+    <location>Sender_stub</location>
   </artifact>
-
+  
 </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
index 0cba98a04fa..54c246c7595 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
@@ -204,8 +204,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
+print "Sleeping 5 seconds to allow task to complete\n";
+sleep (5);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
index 3ab6ed68c9d..a139ab4bd9f 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
@@ -204,8 +204,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 60 seconds to allow task to complete\n";
-sleep (60);
+print "Sleeping 5 seconds to allow task to complete\n";
+sleep (5);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";