ChangeLogTag: Mon Jun 13 18:00:05 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>

20 files changed, 37 insertions, 21 deletions

diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
index 0515ecbd0db..7e1c32ee057 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf
@@ -1,2 +1,4 @@
+## $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
index a747c353448..c58381f28ec 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf
@@ -1,3 +1,5 @@
+## $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
index 540f585bbd0..1154c82070a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 #    DeleteFile($file) or die "Could not delete $file";
 #}
 
-$NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile";
 
 $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
index 0515ecbd0db..18d4f90968b 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
index 5d3fb306395..7d4bd7e216f 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 #    DeleteFile($file) or die "Could not delete $file";
 #}
 
-$NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile";
 
 $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
index 7ba4be37cda..393c5812cb4 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl
@@ -44,7 +44,7 @@ $supplier->DeleteFile ($consumer_ior);
 $consumer->DeleteFile ($naming_ior);
 $consumer->DeleteFile ($consumer_ior);
 
-$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile");
 
 $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
index 766d4286349..3a759aeb3b2 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
@@ -44,7 +44,7 @@ $supplier->DeleteFile ($consumer_ior);
 $consumer->DeleteFile ($naming_ior);
 $consumer->DeleteFile ($consumer_ior);
 
-$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                               "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile");
 
 $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
index 276d14817fd..3ca61b9dda4 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl
@@ -60,7 +60,7 @@ $sup->DeleteFile ($reliorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
 $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
index 716e97cb155..520c3289059 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl
@@ -60,7 +60,7 @@ $sup->DeleteFile ($reliorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
 $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver");
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
index 8774d46bf67..6b0f5032ee3 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
@@ -30,7 +30,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase);
 $nm_service->DeleteFile($iorbase);
 $collocated->DeleteFile($iorbase);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBdebuglevel $debug_level -o $nm_service_iorfile");
 
 $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
index 865a3a106ca..009ac28cfad 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
@@ -32,7 +32,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase);
 $nm_service->DeleteFile($iorbase);
 $collocated->DeleteFile($iorbase);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBdebuglevel $debug_level -o $nm_service_iorfile");
 
 $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver",
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
index 61456d1a199..aff8be2188f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf
@@ -1,2 +1,4 @@
-dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""         
+# $Id$
+
+dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
 
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
index 9a2e6577459..7348bd02884 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ".
             "-IORoutput $nfs_nfsiorfile ".
             "-ORBSvcConf $nfs_nfsconffile";
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
index 9d339a00db7..0e1050e731a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl
@@ -85,9 +85,9 @@ $con->DeleteFile ($supiorfile);
 $con->DeleteFile ($chighdat);
 $sup->DeleteFile ($shighdat);
 
-$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service",
+$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/Notify_Service");
+$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification");
 $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ".
             "-IORoutput $nfs_nfsiorfile ".
             "-ORBSvcConf $nfs_nfsconffile";
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
index 0515ecbd0db..18d4f90968b 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf
@@ -1,2 +1,4 @@
+# $Id$
+
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_CosNotification_Serv:_make_TAO_CosNotify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
index a747c353448..4c20b15d32f 100644
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf
@@ -1,3 +1,5 @@
+# $Id$
+
 dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () ""
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
index c3429f9f78a..be792c12a4a 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl
@@ -58,18 +58,18 @@ my $nt_service = PerlACE::TestTarget::create_target (2) || die "Create target 2
 my $nm_ior = "naming.ior";
 my $nt_ior = "notify.ior";
 
-my $nt_service_nt_conf = $nt_service->LocalFile($nt_conf); 
+my $nt_service_nt_conf = $nt_service->LocalFile($nt_conf);
 my $nm_service_nm_ior  = $nm_service->LocalFile($nm_ior);
 my $nt_service_nm_ior  = $nt_service->LocalFile($nm_ior);
-my $nt_service_nt_ior  = $nt_service->LocalFile($nt_ior); 
+my $nt_service_nt_ior  = $nt_service->LocalFile($nt_ior);
 $nm_service->DeleteFile($nm_ior);
 $nt_service->DeleteFile($nm_ior);
 $nt_service->DeleteFile($nt_ior);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                                      "-ORBDebugLevel $debug_level -o $nm_service_nm_ior");
 
-$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/Notify_Service",
+$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification",
                                      "-ORBInitRef NameService=file://$nt_service_nm_ior ".
                                      "-IORoutput $nt_service_nt_ior ".
                                      "-ORBSvcConf $nt_service_nt_conf ".
diff --git a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
index b6bc4c2b26e..4ea15e40ba8 100755
--- a/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
+++ b/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl
@@ -81,9 +81,9 @@ $nt_service_ntconffile = $nt_service->LocalFile($notify_conf);
 $high_path_hpconffile = $high_path->LocalFile($high_path_conf);
 $other_path_opconffile = $other_path->LocalFile($other_paths_conf);
 
-$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service",
+$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming",
                                      "-o $nm_service_nmiorfile $debug");
-$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/Notify_Service",
+$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification",
                                      "-ORBInitRef NameService=file://$nt_service_nmiorfile ".
                                      "-IORoutput $nt_service_ntiorfile ".
                                      "-ORBSvcConf $nt_service_ntconffile $debug");