Wed Mar 25 11:21:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl
        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl
        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
        * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl
        * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
        * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp
        * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
        * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
          Don't change log/trace levels in the scripts

17 files changed, 30 insertions, 106 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index b89078d027c..619dd273a4b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Mar 25 11:21:27 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
+        * connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl
+        * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
+        * connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp
+        * connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
+        * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
+          Don't change log/trace levels in the scripts
+
 Wed Mar 24 10:35:55 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/impl/dds/DomainParticipant.cpp:
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
index 90de4395350..7adaac62e2d 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_pub.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
index c196308730d..f210522bace 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_pub3.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
index 9c34ed8fedb..7e84b92407a 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_pub_BE.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
index 21f430bd5d0..62fc97da27d 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_sub.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
index 8ce4dbd85c8..26a273dd7b7 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_sub.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
index a5b08f0a8bb..8fa41296ab7 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_sub.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
index fe020962693..d178bdf4359 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_sub_BE.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
index c0ea51d4d5c..943d0e31404 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl
index 7ef102e0f86..8f7d39bd3e4 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_pub.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl
index 10a8eea167c..fbbc4747ce9 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl
@@ -44,13 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan_sub.cdp";
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
index 0434f62670a..79120863d4b 100755
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
@@ -42,13 +42,6 @@ $tg_naming = 0;
 $tg_exe_man = 0;
 $tg_executor = 0;
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 $status = 0;
 $cdp_file = "Plan_sub.cdp";
 $cdp_file_two = "Plan_pub.cdp";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl
index 0434f62670a..79120863d4b 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/LatencyTT/descriptors/run_test.pl
@@ -42,13 +42,6 @@ $tg_naming = 0;
 $tg_exe_man = 0;
 $tg_executor = 0;
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 $status = 0;
 $cdp_file = "Plan_sub.cdp";
 $cdp_file_two = "Plan_pub.cdp";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
index eeb1eedb608..de88ce62b8b 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_pub.cdp
@@ -6,7 +6,7 @@
   <label>Throughput_Depl_2</label>
   <UUID>Throughput_Depl_2</UUID>
 
-  
+
   <implementation xmi:id="Throughput_ConnectorComponentImplementation">
     <name>Throughput_ConnectorComponentImplementation</name>
     <source/>
@@ -110,8 +110,8 @@
       </value>
     </execParameter>
   </implementation>
-  
-  
+
+
   <implementation xmi:id="SenderComponentImplementation">
     <name>SenderComponentImplementation</name>
     <source/>
@@ -187,7 +187,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>HelloTest_Library#ThroughputQoS</string>
+          <string>HelloTest_Library#ThroughputPartQoS</string>
         </value>
       </value>
     </configProperty>
@@ -263,7 +263,7 @@
       </value>
     </configProperty>
     <configProperty>
-      <!-- Specifies how long (in ms) to sleep after writing a specific--> 
+      <!-- Specifies how long (in ms) to sleep after writing a specific-->
       <!-- effort specified by start_load and incr_load -->
       <name>recover_time</name>
       <value>
@@ -336,7 +336,7 @@
       <instance xmi:idref="Throughput_Sec_ConnectorComponentInstance" />
     </internalEndpoint>
   </connection>
-  
+
   <connection>
     <name>connector_status_sender</name>
     <deployRequirement>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp
index e8b2d2f9c4f..46ac1bc409e 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/Plan_sub.cdp
@@ -161,8 +161,8 @@
       </value>
     </execParameter>
   </implementation>
-  
-  
+
+
   <instance xmi:id="ReceiverComponentInstance">
     <name>ReceiverComponent</name>
     <node>ReceiverNode</node>
@@ -194,7 +194,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>HelloTest_Library#ThroughputQoS</string>
+          <string>HelloTest_Library#ThroughputPartQoS</string>
         </value>
       </value>
     </configProperty>
@@ -309,7 +309,7 @@
       <instance xmi:idref="Throughput_Sec_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
-  
+
   <artifact xmi:id="Throughput_Connector_ExecArtifact">
     <name>Throughput_Connector_exec</name>
     <source/>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
index 10e75fd1c13..3eee53ba374 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/descriptors/run_test.pl
@@ -42,13 +42,6 @@ $tg_naming = 0;
 $tg_exe_man = 0;
 $tg_executor = 0;
 
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
 $status = 0;
 $cdp_file = "Plan_sub.cdp";
 $cdp_file_two = "Plan_pub.cdp";
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
index 0fdbd60f439..3ca8a0ee149 100755
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
@@ -44,11 +44,6 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan.cdp";
 
-# $ENV {'CIAO_TRACE_ENABLE'} = 1;
-# $ENV {'DANCE_TRACE_ENABLE'} = 1;
-# $ENV {'CIAO_LOG_LEVEL'} = 10;
-# $ENV {'DANCE_LOG_LEVEL'} = 10;
-
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";