8 files changed, 0 insertions, 428 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/README b/TAO/orbsvcs/tests/Notify/Lanes/README
deleted file mode 100644
index d9d9005e7f6..00000000000
--- a/TAO/orbsvcs/tests/Notify/Lanes/README
+++ /dev/null
@@ -1,58 +0,0 @@
-RT Notification test to verify lane support
-===========================================
-This test makes sure that events are send according to the lanes
-configured on the evnt channel.
-
-Description:
-===========
-
-notify.conf:
------------
-The notify.conf file specifies the Test Filter Factory to be used by
-the RT Notification library.
-The Test Filter factory create special filter objects. these objects
-check if the correct lane is being used for invocations.
-
-
-supplier.conf:
--------------
-
-An event channel is created with 4 lanes. The lowest priority lane (0 in
-continuous mapping) is used to handle the administrative invocations
-by the driver program. 3 other lanes are used to handle 3 different
-event flow "paths" in the event channel.
-
-3 Periodic suppliers are created. Each supplier is configured to
-operate in its lane.
-
-consumer.conf:
-------------
-
-An RT POA is created with 4 lanes (identical to the one setup on the
-eventchannel).
-
-3 Periodic consumers and created and activated in the local RT POA.
-
-Expected Result:
-==============
-if a request reaches a Lane that it was not supposed to, an
-error message is printed. otherwise some housekeeping messages are
-generated when the test runs.
-
-
-Running the test on 1 host:
--------------------------
-$> perl run_test.pl
-
-
-Running the test distributed:
--------------------------
-
-on Host1:
-$1> perl run_test_notify.pl
-
-on Host2:
-$2> perl run_test_supplier.pl
-
-on Host3:
-$3> perl run_test_consumer.pl
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf b/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
deleted file mode 100644
index 98c0f0ed303..00000000000
--- a/TAO/orbsvcs/tests/Notify/Lanes/consumer.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
-#
-# Uncomment this line to use SCHED_FIFO
-#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-#
-dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
-##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
-dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
-#
-dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
-#
-dynamic TAO_Notify_Tests_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Filter_Command_Factory () ""
-#
-dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
-#
-##------- Init the Application Object ----------
-static Command_Builder "Application -Init"
-#
-##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
-#
-##--------- Consumer Admin 1 -------------
-static Command_Builder "ConsumerAdmin -Create ca1 ec1 -AND_OP"
-#
-##--------- Consumer 1 , connected to CA 1 --------
-static Command_Builder "PeriodicConsumer -Create c1 -Admin ca1 -POA poa_1 -Proxy c1_proxy -MaxCount 5 -Check_Priority"
-static Command_Builder "PeriodicConsumer -Subscription c1 +Path1"
-#
-static Command_Builder "Filter -CreateFilter f_c1 ff"
-static Command_Builder "Filter -Add_Constraint f_c1 'PoolId = 1'"
-static Command_Builder "Filter -Add_Constraint f_c1 'LaneId = 1'"
-#
-#static Command_Builder "Filter -Add_Filter f_c1 c1_proxy"
-#
-##--------- Consumer 2 , connected to CA 1 --------
-static Command_Builder "PeriodicConsumer -Create c2 -Admin ca1 -POA poa_1 -Proxy c2_proxy -MaxCount 5 -Check_Priority"
-static Command_Builder "PeriodicConsumer -Subscription c2 +Path2"
-#
-static Command_Builder "Filter -CreateFilter f_c2 ff"
-static Command_Builder "Filter -Add_Constraint f_c2 'PoolId = 1'"
-static Command_Builder "Filter -Add_Constraint f_c2 'LaneId = 2'"
-#
-#static Command_Builder "Filter -Add_Filter f_c2 c2_proxy"
-#
-##--------- Consumer 3 , connected to CA 1 --------
-static Command_Builder "PeriodicConsumer -Create c3 -Admin ca1 -POA poa_1 -Proxy c3_proxy -MaxCount 5 -Check_Priority"
-#
-static Command_Builder "PeriodicConsumer -Subscription c3 +Path3"
-#
-static Command_Builder "Filter -CreateFilter f_c3 ff"
-static Command_Builder "Filter -Add_Constraint f_c3 'PoolId = 1'"
-static Command_Builder "Filter -Add_Constraint f_c3 'LaneId = 3'"
-#
-static Command_Builder "Filter -Add_Filter f_c3 c3_proxy"
-#
-##------- Run---------
-static Command_Builder "Application -SignalPeer"
-static Command_Builder "Application -Run"
-static Command_Builder "Application -WaitForEvents"
-static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/notify.conf b/TAO/orbsvcs/tests/Notify/Lanes/notify.conf
deleted file mode 100644
index 85d6b72357e..00000000000
--- a/TAO/orbsvcs/tests/Notify/Lanes/notify.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
-#
-# Uncomment this line to use SCHED_FIFO
-#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"         
-#
-dynamic TAO_Notify_FilterFactory Service_Object* TAO_RT_NotifyTests_Filter:_make_TAO_Notify_Tests_RT_Test_FilterFactory () ""        
-dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""         
-
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
deleted file mode 100755
index 7d47e3d10ad..00000000000
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../../bin";
-use PerlACE::Run_Test;
-
-$experiment_timeout = 60;
-$startup_timeout = 60;
-$notify_conf = PerlACE::LocalFile ("notify.conf");
-$notify_ior = PerlACE::LocalFile ("notify.ior");
-$naming_ior = PerlACE::LocalFile ("naming.ior");
-$supplier_ior = PerlACE::LocalFile ("supplier.ior");
-$supplier_conf = PerlACE::LocalFile ("supplier.conf");
-$consumer_conf = PerlACE::LocalFile ("consumer.conf");
-$status = 0;
-
-$Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
-                                "-o $naming_ior");
-
-$Notification = new PerlACE::Process ("../../../Notify_Service/Notify_Service");
-
-$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf";
-#$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf -ORBDebugLevel 1";
-
-$Supplier = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
-
-$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
-#$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf -ORBDebugLevel 1";
-
-$Consumer = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
-
-$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
-#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
-
-unlink $naming_ior;
-$Naming->Spawn ();
-
-if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
-  print STDERR "ERROR: waiting for the naming service to start\n";
-  $Naming->Kill ();
-  exit 1;
-}
-
-unlink $notify_ior;
-$Notification->Arguments ($Notify_Args);
-$args = $Notification->Arguments ();
-print STDERR "Running Notification with arguments: $args\n";
-$Notification->Spawn ();
-
-if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
-  print STDERR "ERROR: waiting for the notify service to start\n";
-  $Notification->Kill ();
-  $Naming->Kill ();
-  exit 1;
-}
-
-unlink $supplier_ior;
-$Supplier->Arguments ($Supplier_Args);
-$args = $Supplier->Arguments ();
-print STDERR "Running Supplier with arguments: $args\n";
-$Supplier->Spawn ();
-
-if (PerlACE::waitforfile_timed ($supplier_ior, $startup_timeout) == -1) {
-  print STDERR "ERROR: waiting for the supplier to start\n";
-  $Supplier->Kill ();
-  $Notification->Kill ();
-  $Naming->Kill ();
-  exit 1;
-}
-
-$Consumer->Arguments ($Consumer_Args);
-$args = $Consumer->Arguments ();
-print STDERR "Running Consumer with arguments: $args\n";
-$status = $Consumer->SpawnWaitKill ($experiment_timeout);
-
-if ($status != 0)
-  {
-    print STDERR "ERROR: Consumer returned $status\n";
-    $Supplier->Kill ();
-    $Notification->Kill ();
-    $Naming->Kill ();
-    exit 1;
-  }
-
-$Supplier->Kill ();
-unlink $supplier_ior;
-
-$Notification->Kill ();
-unlink $notify_ior;
-
-$Naming->Kill ();
-unlink $naming_ior;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test_consumer.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test_consumer.pl
deleted file mode 100755
index a0dbfbe696f..00000000000
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test_consumer.pl
+++ /dev/null
@@ -1,44 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../../bin";
-use PerlACE::Run_Test;
-
-$experiment_timeout = 600;
-$startup_timeout = 600;
-$notify_conf = PerlACE::LocalFile ("notify.conf");
-$notify_ior = PerlACE::LocalFile ("notify.ior");
-$naming_ior = PerlACE::LocalFile ("naming.ior");
-$supplier_ior = PerlACE::LocalFile ("supplier.ior");
-$supplier_conf = PerlACE::LocalFile ("supplier.conf");
-$consumer_conf = PerlACE::LocalFile ("consumer.conf");
-$status = 0;
-
-$Consumer = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
-
-#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf";
-$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$supplier_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
-
-if (PerlACE::waitforfile_timed ($supplier_ior, $startup_timeout) == -1) {
-  print STDERR "ERROR: waiting for the supplier to start\n";
-  $Supplier->Kill ();
-  exit 1;
-}
-
-$Consumer->Arguments ($Consumer_Args);
-$args = $Consumer->Arguments ();
-print STDERR "Running Consumer with arguments: $args\n";
-$status = $Consumer->SpawnWaitKill ($experiment_timeout);
-
-if ($status != 0)
-  {
-    print STDERR "ERROR: Consumer returned $status\n";
-    exit 1;
-  }
-
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test_notify.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test_notify.pl
deleted file mode 100755
index 28289b96e22..00000000000
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test_notify.pl
+++ /dev/null
@@ -1,48 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../../bin";
-use PerlACE::Run_Test;
-
-$experiment_timeout = 600;
-$startup_timeout = 600;
-$notify_conf = PerlACE::LocalFile ("notify.conf");
-$notify_ior = PerlACE::LocalFile ("notify.ior");
-$naming_ior = PerlACE::LocalFile ("naming.ior");
-$status = 0;
-
-$Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
-                                "-o $naming_ior");
-
-$Notification = new PerlACE::Process ("../../../Notify_Service/Notify_Service");
-
-#$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf";
-$Notify_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $notify_ior -ORBSvcConf $notify_conf -ORBDebugLevel 1";
-
-unlink $naming_ior;
-$Naming->Spawn ();
-
-if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
-  print STDERR "ERROR: waiting for the naming service to start\n";
-  $Naming->Kill ();
-  exit 1;
-}
-
-unlink $notify_ior;
-$Notification->Arguments ($Notify_Args);
-$args = $Notification->Arguments ();
-print STDERR "Running Notification with arguments: $args\n";
-$status = $Notification->SpawnWaitKill ($experiment_timeout);
-
-
-$Notification->Kill ();
-unlink $notify_ior;
-
-$Naming->Kill ();
-unlink $naming_ior;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test_supplier.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test_supplier.pl
deleted file mode 100755
index 38c7449268d..00000000000
--- a/TAO/orbsvcs/tests/Notify/Lanes/run_test_supplier.pl
+++ /dev/null
@@ -1,46 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../../bin";
-use PerlACE::Run_Test;
-
-$experiment_timeout = 600;
-$startup_timeout = 600;
-$notify_ior = PerlACE::LocalFile ("notify.ior");
-$naming_ior = PerlACE::LocalFile ("naming.ior");
-$supplier_ior = PerlACE::LocalFile ("supplier.ior");
-$supplier_conf = PerlACE::LocalFile ("supplier.conf");
-$consumer_conf = PerlACE::LocalFile ("consumer.conf");
-$status = 0;
-
-$Supplier = new PerlACE::Process ("../Driver/Notify_Tests_Driver");
-
-#$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf";
-$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $supplier_ior -ORBSvcConf $supplier_conf -ORBDebugLevel 1";
-
-if (PerlACE::waitforfile_timed ($notify_ior, $startup_timeout) == -1) {
-  print STDERR "ERROR: waiting for the notify service to start\n";
-  exit 1;
-}
-
-unlink $supplier_ior;
-$Supplier->Arguments ($Supplier_Args);
-$args = $Supplier->Arguments ();
-print STDERR "Running Supplier with arguments: $args\n";
-$status = $Supplier->SpawnWaitKill ($experiment_timeout);
-
-if ($status != 0)
-  {
-    print STDERR "ERROR: Supplier returned $status\n";
-    $Supplier->Kill ();
-    exit 1;
-  }
-
-$Supplier->Kill ();
-unlink $supplier_ior;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf b/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
deleted file mode 100644
index 78ecd334aa8..00000000000
--- a/TAO/orbsvcs/tests/Notify/Lanes/supplier.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-## $Id$
-## This file has the following configuration:
-## EventChannel ec1 with 1 Thread
-## SupplierAdmim sa1 with 1 Thread
-## SupplierAdmin sa2
-##
-## Supplier s1 has 1 Thread and is connected to sa1
-## Supplier s2 is connected to sa1
-##
-## Supplier s3 is connected to sa2
-##
-#
-##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"         
-#
-# Uncomment this line to use SCHED_FIFO
-#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-#
-dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
-##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
-dynamic TAO_Notify_Tests_EventChannel_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_EventChannel_Command_Factory () ""
-dynamic TAO_Notify_Tests_SupplierAdmin_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_SupplierAdmin_Command_Factory () ""
-#
-dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Supplier_Command_Factory () ""
-dynamic TAO_Notify_Tests_Filter_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Filter_Command_Factory () ""
-#
-##------- Init the Application Object ----------
-static Command_Builder "Application -Init"
-#
-##------- Create Event Channel ---------------
-static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory"
-static Command_Builder "EventChannel -Set_QoS ec1 -Lanes 4 -Lane 0 1 0 -Lane 1 1 0 -Lane 2 1 0 -Lane 3 1 0"
-static Command_Builder "Filter -CreateFactory ff ec1"
-#
-### --- Create Supplier Admin 1 ----
-static Command_Builder "SupplierAdmin -Create sa1 ec1 -AND_OP"
-#
-### --- Create Supplier s1 connected to sa1. -----
-static Command_Builder "PeriodicSupplier -Create s1 -Admin sa1 -Proxy s1_proxy -EventType Path1 -Priority 1 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
-#
-static Command_Builder "Filter -CreateFilter f1 ff"
-static Command_Builder "Filter -Add_Constraint f1 'PoolId = 1'"
-static Command_Builder "Filter -Add_Constraint f1 'LaneId = 1'"
-#static Command_Builder "Filter -Add_Filter f1 s1_proxy"
-#
-### --- Create Supplier s2 connected to sa1 ----
-static Command_Builder "PeriodicSupplier -Create s2 -Admin sa1 -Proxy s2_proxy -EventType Path2 -Priority 2 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
-#
-static Command_Builder "Filter -CreateFilter f2 ff"
-static Command_Builder "Filter -Add_Constraint f2 'PoolId = 1'"
-static Command_Builder "Filter -Add_Constraint f2 'LaneId = 2'"
-#static Command_Builder "Filter -Add_Filter f2 s2_proxy"
-#
-### --- Create Supplier s3 connected to sa2 ----
-static Command_Builder "PeriodicSupplier -Create s3 -Admin sa1 -Proxy s3_proxy -EventType Path3 -Priority 3 -Period 10000 -ExecTime 10000 -Phase 0 -Iter 5 -Load 1 "
-static Command_Builder "Filter -CreateFilter f3 ff"
-static Command_Builder "Filter -Add_Constraint f3 'PoolId = 1'"
-static Command_Builder "Filter -Add_Constraint f3 'LaneId = 3'"
-#static Command_Builder "Filter -Add_Filter f3 s3_proxy"
-#
-##--------- Run -------------
-static Command_Builder "Application -WaitToStart"
-static Command_Builder "Application -Run"
-static Command_Builder "Application -WaitForEvents"
-static Command_Builder "Application -Shutdown"