Merged revisions 81185,81187-81188,81192-81196,81198,81200-81203,81205,81211-81213 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/TAO ........ r81185 | johnnyw | 2008-04-01 01:56:12 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 06:55:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81187 | johnnyw | 2008-04-01 02:26:20 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 07:26:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81188 | johnnyw | 2008-04-01 02:34:51 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 07:34:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81192 | johnnyw | 2008-04-01 03:47:01 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 08:46:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81193 | johnnyw | 2008-04-01 03:50:15 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 08:48:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81194 | johnnyw | 2008-04-01 05:26:25 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 10:25:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81195 | johnnyw | 2008-04-01 07:40:56 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 12:40:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81196 | johnnyw | 2008-04-01 07:51:53 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 12:51:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81198 | johnnyw | 2008-04-01 07:57:33 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 12:57:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81200 | johnnyw | 2008-04-01 08:03:30 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 12:59:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81201 | johnnyw | 2008-04-01 08:13:30 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 13:13:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81202 | johnnyw | 2008-04-01 08:18:04 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 13:17:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81203 | vzykov | 2008-04-01 09:17:09 -0500 (Tue, 01 Apr 2008) | 1 line ChangeLogTag: Tue Apr 1 14:11:00 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com> ........ r81205 | johnnyw | 2008-04-01 09:57:36 -0500 (Tue, 01 Apr 2008) | 1 line Tue Apr 1 14:57:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> ........ r81211 | vzykov | 2008-04-02 06:36:47 -0500 (Wed, 02 Apr 2008) | 1 line ChangeLogTag: Wed Apr 2 11:33:48 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com> ........ r81212 | vzykov | 2008-04-02 06:51:24 -0500 (Wed, 02 Apr 2008) | 1 line ChangeLogTag: Wed Apr 2 11:47:45 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com> ........ r81213 | mesnier_p | 2008-04-02 07:16:40 -0500 (Wed, 02 Apr 2008) | 1 line `head -1 ChangeLog` ........
author: iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2008-04-02 19:55:50 +0000
committer: iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2008-04-02 19:55:50 +0000
commit: f22146ace4f8ceb206b272479a7a619a27b425ba (patch)
tree: 106f19a3e49f71f16f7d5b41763a13cb224acebd
parent: 0a5abebfc459b048b83007ee7b7121437e96c222 (diff)
download: ATCD-f22146ace4f8ceb206b272479a7a619a27b425ba.tar.gz
132 files changed, 1282 insertions, 350 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d51f8c34494..3b27b81a3d4 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,236 @@
+Wed Apr  2 12:13:50 UTC 2008  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tests/DSI_AMI_Gateway/client.cpp:
+
+          Reworded exception handlers to avoid having the nightly build
+          scoreboard detect expected exceptions as errors. This resolves
+          bug 2879.
+
+Wed Apr  2 11:47:45 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tests/Collocated_Forwarding/Server_ORBInitializer.h:
+        * tests/Collocated_Forwarding/Server_Request_Interceptor.h:
+        * tests/Collocated_Forwarding/test_i.h:
+
+          Added Id svn keyword to those headers.
+
+Wed Apr  2 11:33:48 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+          Fixed a warning.
+
+        * tests/Collocated_Forwarding/Collocated_Forwarding.mpc:
+          Added avoids_minimum_corba, avoids_corba_e_compact, and
+          avoids_corba_e_micro.
+
+Tue Apr  1 14:57:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocated_Forwarding/run_test.pl:
+          VxWorks updates
+
+        * tests/Collocated_Forwarding/Collocated_Forwarding.mpc:
+          Simplified
+
+Tue Apr  1 14:11:00 UTC 2008  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Fixed a memory leak that was happening because a forward
+          reference was duplicated twice.
+
+        * tests/Collocated_Forwarding/Server_ORBInitializer.h:
+        * tests/Collocated_Forwarding/Server_Request_Interceptor.h:
+        * tests/Collocated_Forwarding/test.idl:
+        * tests/Collocated_Forwarding/server.cpp:
+        * tests/Collocated_Forwarding/test_i.cpp:
+        * tests/Collocated_Forwarding/Collocated_Forwarding.mpc:
+        * tests/Collocated_Forwarding/Server_ORBInitializer.cpp:
+        * tests/Collocated_Forwarding/Server_Request_Interceptor.cpp:
+        * tests/Collocated_Forwarding/run_test.pl:
+        * tests/Collocated_Forwarding/test_i.h:
+          Added a new test for collocated forwarding case.
+          For details see Bug#3276.
+
+        * tests/Bug_3276_Regression/client.cpp:
+        * tests/Bug_3276_Regression/Servant_Locator.cpp:
+        * tests/Bug_3276_Regression/Manager.cpp:
+          Changed main to ACE_TMAIN.
+
+Tue Apr  1 13:17:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Load_Balancing/run_test.pl:
+        * examples/Logging/run_test.pl:
+        * examples/TypeCode_Creation/run_test.pl:
+          Improved these scripts
+
+Tue Apr  1 13:13:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/AMH/Sink_Server/run_test.pl:
+        * examples/Buffered_AMI/run_test.pl:
+        * examples/OBV/Typed_Events/run_test.pl:
+          Improved these scripts
+
+Tue Apr  1 12:59:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/AnySeq.pidl
+        * tao/AnyTypeCode/Dynamic.pidl
+        * tao/AnyTypeCode/Dynamic_Parameter.pidl
+        * tao/AnyTypeCode/ValueModifier.pidl
+        * tao/AnyTypeCode/Visibility.pidl
+        * tao/BiDir_GIOP/BiDirPolicy.pidl
+        * tao/CharSeq.pidl
+        * tao/CSD_Framework/CSD_Framework.pidl
+        * tao/DoubleSeq.pidl
+        * tao/EndpointPolicy/EndpointPolicyType.pidl
+        * tao/FloatSeq.pidl
+        * tao/GIOP.pidl
+        * tao/IFR_Client/IFR_Base.pidl
+        * tao/IFR_Client/IFR_Basic.pidl
+        * tao/IFR_Client/IFR_Components.pidl
+        * tao/IFR_Client/IFR_Extended.pidl
+        * tao/IIOP.pidl
+        * tao/IIOP_Endpoints.pidl
+        * tao/ImR_Client/ImplRepo.pidl
+        * tao/ImR_Client/ServerObject.pidl
+        * tao/IORInterceptor/IORInfo.pidl
+        * tao/IORInterceptor/IORInterceptor.pidl
+        * tao/IORManipulation/IOR.pidl
+        * tao/IORTable/IORTable.pidl
+        * tao/LongDoubleSeq.pidl
+        * tao/LongLongSeq.pidl
+        * tao/LongSeq.pidl
+        * tao/Messaging/Messaging.pidl
+        * tao/Messaging/Messaging_No_Impl.pidl
+        * tao/Messaging/Messaging_RT_Policy.pidl
+        * tao/Messaging/Messaging_SyncScope_Policy.pidl
+        * tao/Messaging/Messaging_Types.pidl
+        * tao/Messaging/Pollable.pidl
+        * tao/Messaging_PolicyValue.pidl
+        * tao/Messaging_SyncScope.pidl
+        * tao/Object_Key.pidl
+        * tao/orb_types.pidl
+        * tao/ParameterMode.pidl
+        * tao/PI/ClientRequestInfo.pidl
+        * tao/PI/ClientRequestInterceptor.pidl
+        * tao/PI/Interceptor.pidl
+        * tao/PI/InvalidSlot.pidl
+        * tao/PI/ORBInitializer.pidl
+        * tao/PI/ORBInitInfo.pidl
+        * tao/PI/PIForwardRequest.pidl
+        * tao/PI/RequestInfo.pidl
+        * tao/PI_Server/ServerRequestInfo.pidl
+        * tao/PI_Server/ServerRequestInterceptor.pidl
+        * tao/PortableInterceptor.pidl
+        * tao/PortableServer/POA.pidl
+        * tao/PortableServer/PortableServer.pidl
+        * tao/PortableServer/PS_Forward.pidl
+        * tao/PortableServer/ServantActivator.pidl
+        * tao/PortableServer/ServantLocator.pidl
+        * tao/PortableServer/ServantManager.pidl
+        * tao/RTCORBA/RTCORBA.pidl
+        * tao/RTPortableServer/RTPortableServer.pidl
+        * tao/RTScheduling/RTScheduler.pidl
+        * tao/Services.pidl
+        * tao/ShortSeq.pidl
+        * tao/Strategies/COIOP_Endpoints.pidl
+        * tao/Strategies/sciop_endpoints.pidl
+        * tao/Strategies/uiop_endpoints.pidl
+        * tao/StringSeq.pidl
+        * tao/TimeBase.pidl
+        * tao/UShortSeq.pidl
+        * tao/WCharSeq.pidl
+        * tao/WStringSeq.pidl
+          Updated regeneration instructions
+
+Tue Apr  1 12:57:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Logging/run_test.pl:
+        * examples/OBV/Typed_Events/run_test.pl:
+          Improved these scripts
+
+Tue Apr  1 12:51:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/PluggableUDP/tests/Performance/run_test.pl:
+        * examples/PluggableUDP/tests/Performance/run_test_ipv6.pl:
+        * examples/PluggableUDP/tests/SimplePerformance/run_test.pl:
+        * examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl:
+        * tests/DIOP/run_test.pl:
+          Improved these scripts
+
+Tue Apr  1 12:40:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/DSI_AMI_Gateway/run_exception_test.pl:
+        * tests/DSI_AMI_Gateway/run_test.pl:
+        * tests/DSI_Gateway/run_exception_test.pl:
+        * tests/DSI_Gateway/run_test.pl:
+          Improved these scripts
+
+Tue Apr  1 10:25:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/RTScheduling/Scheduling_Interceptor/run_test.pl:
+        * tests/AMH_Exceptions/run_test.pl:
+        * tests/AMH_Oneway/run_test.pl:
+        * tests/TransportCurrent/Framework/run_test.pl:
+          Improved these scripts
+
+Tue Apr  1 08:48:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/BiDir_CORBALOC/run_test.pl:
+        * orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl:
+        * orbsvcs/tests/Event/Mcast/Complex/run_test.pl:
+        * orbsvcs/tests/Event/Mcast/Simple/run_test.pl:
+        * orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl:
+        * orbsvcs/tests/Interoperable_Naming/run_test.pl:
+        * orbsvcs/tests/Redundant_Naming/run_test.pl:
+        * orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl:
+        * orbsvcs/tests/Simple_Naming/run_test.pl:
+        * orbsvcs/tests/Simple_Naming/run_test_ffp.pl:
+        * orbsvcs/tests/Simple_Naming/run_test_ipv6.pl:
+        * orbsvcs/tests/Trading/run_test.pl:
+          Improved these scripts
+
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable/server.cpp:
+          No need to specify empty orb name
+
+Tue Apr  1 08:46:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Advanced/ch_18/run_test.pl:
+        * examples/Callback_Quoter/run_test.pl:
+        * examples/ior_corbaloc/run_test.pl:
+        * examples/Logging/run_test.pl:
+        * examples/Quoter/run_test.pl:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl:
+        * examples/RTScheduling/MIF_Scheduler/run_test.pl:
+          Improved these scripts
+
+Tue Apr  1 07:34:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/AMH/Sink_Server/run_test.pl:
+        * examples/Load_Balancing/run_test.pl:
+        * examples/PluggableUDP/tests/Performance/run_test.pl:
+        * examples/PluggableUDP/tests/Performance/run_test_ipv6.pl:
+          Updated to support VxWorks
+
+Tue Apr  1 07:26:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * utils/nslist/run_test.pl:
+          Also test nsdel
+
+Tue Apr  1 06:55:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/CSD_Strategy/ThreadPool2/ClientApp.cpp:
+          Layout changes
+
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.cpp:
+          Removed not needed semi colon
+
+        * examples/Simple/bank/run_test.pl:
+        * examples/Simple/echo/run_test.pl:
+        * examples/Simple/grid/run_test.pl:
+        * examples/Simple/time-date/run_test.pl:
+        * examples/Simple/time/run_test.pl:
+          Updated to support VxWorks
+
 Mon Mar 31 18:20:01 UTC 2008  Ciju John  <johnc at ociweb dot com>
 
         * tests/Oneway_Send_Timeouts/Client.cpp:
diff --git a/TAO/examples/AMH/Sink_Server/run_test.pl b/TAO/examples/AMH/Sink_Server/run_test.pl
index ecae14d123d..a308538e90f 100755
--- a/TAO/examples/AMH/Sink_Server/run_test.pl
+++ b/TAO/examples/AMH/Sink_Server/run_test.pl
@@ -11,9 +11,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-# Amount of delay (in seconds) between starting a server and a client.
-$sleeptime = 8;
-
 # Amount of delay (in milliseconds) that the sink-server delays a client reply.
 $reply_delay_time = 11;
 
@@ -21,29 +18,41 @@ $reply_delay_time = 11;
 $iterations = 100;
 
 # File used to pass AMH server ior to its clients.
-$iorfile = PerlACE::LocalFile("amh.ior");
+$iorbase = "amh.ior";
+$iorfile = PerlACE::LocalFile("$iorbase");
 
 unlink $iorfile;
 
 $delay_time = $reply_delay_time*1000; #convert to microseconds
+if (PerlACE::is_vxworks_test()) {
+$AMH = new PerlACE::ProcessVX ("st_server", "-ORBsvcconf st_server" .
+                             "$PerlACE::svcconf_ext".
+                             " -o $iorbase -s $delay_time");
+}
+else {
 $AMH = new PerlACE::Process ("st_server", "-ORBsvcconf st_server" .
                              "$PerlACE::svcconf_ext".
                              " -o $iorfile -s $delay_time");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -n $iterations");
 
 print STDERR "\n    Starting AMH Sink Server with $reply_delay_time milliseconds delayed response: \n\n";
 
 # Run the AMH server.
-$AMH->Spawn ();
+$amh_server = $AMH->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+if ($amh_server != 0) {
+    print STDERR "ERROR: server returned $amh_server";
+    exit 1;
+}
+
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: File containing AMH Server ior,".
         " <$iorfile>, cannot be found\n";
     $AMH->Kill ();
     exit 1;
 }
 
-
 # Run client.
 print STDERR "\n     Client making $iterations calls to server: \n";
 $evt_per_sec = 1000/$reply_delay_time;
@@ -51,7 +60,7 @@ print STDERR "\n(Expect less than $evt_per_sec Events/sec) \n\n";
 $client = $CL->SpawnWaitKill (300);
 
 # Clean up.
-$amhserver= $AMH->TerminateWaitKill (5);
+$amhserver= $AMH->TerminateWaitKill (15);
 
 if ($amhserver != 0) {
     print STDERR "ERROR: AMH Server returned $amhserver\n";
diff --git a/TAO/examples/Advanced/ch_18/run_test.pl b/TAO/examples/Advanced/ch_18/run_test.pl
index 6ccc991c9b4..f167dafbaec 100755
--- a/TAO/examples/Advanced/ch_18/run_test.pl
+++ b/TAO/examples/Advanced/ch_18/run_test.pl
@@ -13,7 +13,7 @@ require Process;
 $status = 0;
 
 # amount of delay between starting servers and client
-$sleeptime = 5;
+$sleeptime = 15;
 
 
 
diff --git a/TAO/examples/Buffered_AMI/run_test.pl b/TAO/examples/Buffered_AMI/run_test.pl
index 7a8774a5fdc..c463024e5a7 100755
--- a/TAO/examples/Buffered_AMI/run_test.pl
+++ b/TAO/examples/Buffered_AMI/run_test.pl
@@ -8,16 +8,27 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("ami.ior");
+$iorbase = "ami.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 $status = 0;
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
index 42a35f0c15d..3aecc88f933 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
@@ -18,14 +18,13 @@ ClientApp::~ClientApp()
 int
 ClientApp::run(int argc, char* argv[])
 {
-  CORBA::ORB_var orb
-    = CORBA::ORB_init(argc, argv, "");
+  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
   // Parse the command-line args for this application.
   // * Raises -1 if problems are encountered.
   // * Returns 1 if the usage statement was explicitly requested.
   // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
+  int const result = this->parse_args(argc, argv);
   if (result != 0)
     {
       return result;
@@ -73,7 +72,6 @@ ClientApp::run(int argc, char* argv[])
       {
         ACE_DEBUG((LM_DEBUG,
                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-
       }
     }
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
index 461047110cc..140f298ef06 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
@@ -67,7 +67,7 @@ Foo_i::op4(CORBA::Long value)
 void
 Foo_i::op5(void)
 {
-  ++this->count_op5_;;
+  ++this->count_op5_;
 }
 
 
diff --git a/TAO/examples/Callback_Quoter/run_test.pl b/TAO/examples/Callback_Quoter/run_test.pl
index 753d937ed1b..d77fd8d7ae2 100755
--- a/TAO/examples/Callback_Quoter/run_test.pl
+++ b/TAO/examples/Callback_Quoter/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::Run_Test;
 
 $status = 0;
 $ns_ior = PerlACE::LocalFile ("NameService.ior");
-$sleeptime = 5;
+$sleeptime = 15;
 
 unlink $ns_ior;
 
diff --git a/TAO/examples/Load_Balancing/run_test.pl b/TAO/examples/Load_Balancing/run_test.pl
index 1f2adf26cc2..86daf078c2c 100755
--- a/TAO/examples/Load_Balancing/run_test.pl
+++ b/TAO/examples/Load_Balancing/run_test.pl
@@ -11,25 +11,32 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 8;
-
 # File used to pass load balancing service ior to its clients.
-$iorfile = PerlACE::LocalFile("lb.ior");
+$iorbase = "lb.ior";
+$iorfile = PerlACE::LocalFile("$iorbase");
 
 unlink $iorfile;
 
-$LB = new PerlACE::Process ("load_balancer", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $LB = new PerlACE::ProcessVX ("load_balancer", "-o $iorbase");
+}
+else {
+  $LB = new PerlACE::Process ("load_balancer", "-o $iorfile");
+}
 $SV = new PerlACE::Process ("server", "-i file://$iorfile");
 $CL = new PerlACE::Process ("client", "-i file://$iorfile -n 10");
 
 print STDERR "\n    Starting Load Balancing Server and Identity Server \n\n";
 
 # Run the load balancing server.
-$LB->Spawn ();
+$lbserver = $LB->Spawn ();
+
+if ($lbserver != 0) {
+    print STDERR "ERROR: load_balancer returned $lbserver\n";
+    exit 1;
+}
 
-if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: File containing Load Balancing Service ior,".
         " <$iorfile>, cannot be found\n";
     $LB->Kill ();
@@ -40,7 +47,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
 # balancing server.
 
 $SV->Spawn ();
-sleep ($sleeptime);
+sleep ($PerlACE::wait_interval_for_process_creation);
 
 
 # Run tests, i.e., run client with different command line options.
@@ -64,14 +71,14 @@ if ($client != 0) {
 }
 
 # Clean up.
-$loadbalancer= $LB->TerminateWaitKill (5);
+$loadbalancer= $LB->TerminateWaitKill (15);
 
 if ($loadbalancer != 0) {
     print STDERR "ERROR: load balancer returned $loadbalancer\n";
     $status = 1;
 }
 
-$server = $SV->TerminateWaitKill (5);
+$server = $SV->TerminateWaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/examples/Logging/run_test.pl b/TAO/examples/Logging/run_test.pl
index f28823a5db7..3d2195c015d 100755
--- a/TAO/examples/Logging/run_test.pl
+++ b/TAO/examples/Logging/run_test.pl
@@ -13,13 +13,23 @@ use PerlACE::Run_Test;
 $status = 0;
 
 # amount of delay between running the servers
-$sleeptime = 7;
+$sleeptime = 15;
 
-$SV = new PerlACE::Process ("Logging_Service");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("Logging_Service");
+}
+else {
+  $SV = new PerlACE::Process ("Logging_Service");
+}
 $CL = new PerlACE::Process ("Logging_Test");
 
 # Start the service
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 # Give the service time to settle
 sleep $sleeptime;
diff --git a/TAO/examples/OBV/Typed_Events/run_test.pl b/TAO/examples/OBV/Typed_Events/run_test.pl
index 480c02bab34..7ca8eb0cc39 100755
--- a/TAO/examples/OBV/Typed_Events/run_test.pl
+++ b/TAO/examples/OBV/Typed_Events/run_test.pl
@@ -10,14 +10,25 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("obv.ior");
+$iorbase = "obv.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-f $iorfile");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: timed out waiting for file <$iorfile>\n";
@@ -32,7 +43,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->TerminateWaitKill (5); 
+$server = $SV->TerminateWaitKill (15); 
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl
index b890a3d36e0..344296fdfa5 100755
--- a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl
+++ b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl
@@ -9,14 +9,26 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:12345 -o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
+  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:12345 -o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:12345 -o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBEndpoint diop://:12346");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
index 20a5be99c68..e1066e6e2a6 100755
--- a/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
+++ b/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl
@@ -9,14 +9,26 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-ORBEndpoint diop://[::1]:12345 -o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
+  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:12345 -o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://[::1]:12345 -o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBEndpoint diop://[::1]:12346");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl
index 409b87c8380..dbf8873c127 100755
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test.pl
@@ -9,12 +9,24 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
-$SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:12345 -o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
+  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:12345 -o $iorfile");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://:12345 -o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl
index 6c69f62cd7d..96cbc767fdb 100755
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/run_test_ipv6.pl
@@ -9,12 +9,24 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
-$SV = new PerlACE::Process ("server", "-ORBEndpoint diop://[::1]:12345 -o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $TARGETHOSTNAME = $ENV{'ACE_RUN_VX_TGTHOST'};
+  $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint diop://$TARGETHOSTNAME:12345 -o $iorfile");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-ORBEndpoint diop://[::1]:12345 -o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl
index 4b66ee656c0..9372a1cba4e 100755
--- a/TAO/examples/Quoter/run_test.pl
+++ b/TAO/examples/Quoter/run_test.pl
@@ -19,7 +19,7 @@ $num_threads = 4;
 
 # amount of delay between running the servers
 
-$sleeptime = 8;
+$sleeptime = 15;
 
 # other variables
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl
index 81195657379..b1d3ed98a7c 100755
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl
@@ -10,9 +10,6 @@ use PerlACE::Run_Test;
 
 PerlACE::add_lib_path ('..');
 
-# amount of delay between running the servers
-
-$sleeptime = 2;
 $status = 0;
 
 $nsior = PerlACE::LocalFile ("ns.ior");
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl b/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl
index 81195657379..b1d3ed98a7c 100755
--- a/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl
@@ -10,9 +10,6 @@ use PerlACE::Run_Test;
 
 PerlACE::add_lib_path ('..');
 
-# amount of delay between running the servers
-
-$sleeptime = 2;
 $status = 0;
 
 $nsior = PerlACE::LocalFile ("ns.ior");
diff --git a/TAO/examples/Simple/bank/run_test.pl b/TAO/examples/Simple/bank/run_test.pl
index 83f573b963b..2fdd418880b 100755
--- a/TAO/examples/Simple/bank/run_test.pl
+++ b/TAO/examples/Simple/bank/run_test.pl
@@ -10,11 +10,17 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("bank.ior");
+$iorbase = "bank.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-f $iorfile -x");
 
 $SV->Spawn ();
@@ -32,7 +38,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_shutdown);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/examples/Simple/echo/run_test.pl b/TAO/examples/Simple/echo/run_test.pl
index df08c722c8a..3fa7dbdb7b3 100755
--- a/TAO/examples/Simple/echo/run_test.pl
+++ b/TAO/examples/Simple/echo/run_test.pl
@@ -9,11 +9,17 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("echo.ior");
+$iorbase = "echo.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-f $iorfile -x");
 
 $SV->Spawn ();
@@ -31,7 +37,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_shutdown);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/examples/Simple/grid/run_test.pl b/TAO/examples/Simple/grid/run_test.pl
index 3cbc3ac23b9..07586418a05 100755
--- a/TAO/examples/Simple/grid/run_test.pl
+++ b/TAO/examples/Simple/grid/run_test.pl
@@ -9,11 +9,17 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("grid.ior");
+$iorbase = "grid.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345");
 
 $SV->Spawn ();
@@ -31,7 +37,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_shutdown);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl
index e2e360517a0..f286bcf7c90 100755
--- a/TAO/examples/Simple/time-date/run_test.pl
+++ b/TAO/examples/Simple/time-date/run_test.pl
@@ -15,24 +15,14 @@ $conf = PerlACE::LocalFile ("client" . "$PerlACE::svcconf_ext");
 # Remove the file before starting the test.
 unlink $iorfile;
 
-sub add_path {
-  my($name)  = shift;
-  my($value) = shift;
-  if (defined $ENV{$name}) {
-    $ENV{$name} .= ':' . $value
-  }
-  else {
-    $ENV{$name} = $value;
-  }
-}
-
-# Set the library path for the client to be able to load
-# the Time_Date library.
-add_path('LD_LIBRARY_PATH', '.');
-add_path('LIBPATH', '.');
-add_path('SHLIB_PATH', '.');
+PerlACE::add_lib_path ('.');
 
-$SV = new PerlACE::Process ("server");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server");
+}
+else {
+  $SV = new PerlACE::Process ("server");
+}
 $CL = new PerlACE::Process ("client", "-f $iorfile -ORBSvcConf $conf");
 
 $SV->Spawn ();
diff --git a/TAO/examples/Simple/time/run_test.pl b/TAO/examples/Simple/time/run_test.pl
index cb07a8a8293..932ca9958eb 100755
--- a/TAO/examples/Simple/time/run_test.pl
+++ b/TAO/examples/Simple/time/run_test.pl
@@ -9,11 +9,17 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("time.ior");
+$iorbase = "time.ior";
+$iorfile = PerlACE::LocalFile ("$iorbase");
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
+if (PerlACE::is_vxworks_test()) {
+  $SV = new PerlACE::ProcessVX ("server", "-o $iorbase");
+}
+else {
+  $SV = new PerlACE::Process ("server", "-o $iorfile");
+}
 $CL = new PerlACE::Process ("client", "-f $iorfile -x");
 
 $SV->Spawn ();
@@ -31,7 +37,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->WaitKill ($PerlACE::wait_interval_for_process_shutdown);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/examples/TypeCode_Creation/run_test.pl b/TAO/examples/TypeCode_Creation/run_test.pl
index a29704d58c1..ebc1ba39a45 100755
--- a/TAO/examples/TypeCode_Creation/run_test.pl
+++ b/TAO/examples/TypeCode_Creation/run_test.pl
@@ -10,7 +10,12 @@ use PerlACE::Run_Test;
 
 $status = 0;
 
-$CL = new PerlACE::Process ("create_tc");
+if (PerlACE::is_vxworks_test()) {
+  $CL = new PerlACE::ProcessVX ("create_tc");
+}
+else {
+  $CL = new PerlACE::Process ("create_tc");
+}
 
 $client = $CL->SpawnWaitKill (60);
 
diff --git a/TAO/examples/ior_corbaloc/run_test.pl b/TAO/examples/ior_corbaloc/run_test.pl
index 31ef6777eae..60f4eefde24 100755
--- a/TAO/examples/ior_corbaloc/run_test.pl
+++ b/TAO/examples/ior_corbaloc/run_test.pl
@@ -16,10 +16,6 @@ $TARGETHOSTNAME = "localhost";
 
 $status = 0;
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 8;
-
 @iorfile = ("ns1.ior",
             "ns2.ior",
             "ns2.ior" );
@@ -73,7 +69,7 @@ for($i=0; $i <= $#NS; $i++){
   
   $NS[$i]->Spawn ();
   
-  if (PerlACE::waitforfile_timed ($iorfile[$i], $sleeptime) == -1) {
+  if (PerlACE::waitforfile_timed ($iorfile[$i], $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find IOR file <$iorfile[$i]>\n";
     $NS[$i]->Kill (); 
     exit 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 7cca1701be9..1cdd3716cb5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -404,9 +404,7 @@ main (int argc,
 {
   try
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA");
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index bd3aa1f3a80..d28dfb7195f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -143,8 +143,7 @@ main (int argc,
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0);
+                                            argv);
 
       int result =
         parse_args (argc,
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
index a36b64c7d16..8a020f784de 100755
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl
@@ -12,10 +12,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
-
 # Variables for command-line arguments to client and server
 # executables.
 $ns_orb_port = 12002 + PerlACE::uniqueid ();
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
index c73c1bf63d5..2ba360f8f35 100755
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl
@@ -12,10 +12,6 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 use Cwd;
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
-
 $quiet = 0;
 $debug_level = '0';
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
index af01ab928c4..99454685e65 100755
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl
@@ -83,7 +83,7 @@ sub run_ec
         return 1;
     }
 
-    if (PerlACE::waitforfile_timed ($ior_file, $sleeptime) == -1)
+    if (PerlACE::waitforfile_timed ($ior_file, $PerlACE::wait_interval_for_process_creation) == -1)
     {
         print STDERR "ERROR: cannot find IOR file <$ior_file>\n";
         $ps[$ec_id]->Kill ();
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
index cf961d98b05..6e88729bf68 100755
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl
@@ -96,7 +96,7 @@ sub run_ec
         return 1;
     }
 
-    if (PerlACE::waitforfile_timed ($ior_file, $sleeptime) == -1)
+    if (PerlACE::waitforfile_timed ($ior_file, $PerlACE::wait_interval_for_process_creation) == -1)
     {
         print STDERR "ERROR: cannot find IOR file <$ior_file>\n";
         $ps[$ec_id]->Kill ();
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
index 68fb571a57a..557d11fcf8d 100755
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl
@@ -17,9 +17,6 @@ use POSIX;
 # Configuration parameters
 ###############################################################
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
 # Number of Event Channel/Application pairs that will be started up.
 $number_of_applications = 3;
 
@@ -73,7 +70,7 @@ sub run_ec
         return 1;
     }
 
-    if (PerlACE::waitforfile_timed ($ior_file, $sleeptime) == -1)
+    if (PerlACE::waitforfile_timed ($ior_file, $PerlACE::wait_interval_for_process_creation) == -1)
     {
         print STDERR "ERROR: cannot find IOR file <$ior_file>\n";
         $ps[$ec_id]->Kill ();
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
index 2f8e0d95465..004562a192a 100755
--- a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
@@ -11,10 +11,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-# Amount of delay (in seconds) between starting a server and a client 
-# to allow proper server initialization.
-$sleeptime = 8;
-
 # Variables for command-line arguments to client and server
 # executables
 $iorfile = PerlACE::LocalFile ("ns.ior");
@@ -29,7 +25,7 @@ unlink $iorfile;
 
 $NS->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
     $NS->Kill ();
     exit 1;
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
index 04148bca479..2f4666a846e 100755
--- a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl
@@ -14,10 +14,6 @@ use Cwd;
 
 $startdir = getcwd();
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
-
 $quiet = 0;
 
 # check for -q flag
@@ -77,7 +73,7 @@ unlink $iorfile1;
 
 $NS1->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile1, $sleeptime) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile1, $PerlACE::wait_interval_for_process_creation) == -1) {
   print STDERR "ERROR: cannot find IOR file <$iorfile1>\n";
   $NS1->Kill ();
   exit 1;
@@ -91,7 +87,7 @@ unlink $iorfile2;
 
 $NS2->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile2, $sleeptime) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1) {
   print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
   $NS2->Kill ();
   exit 1;
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
index 5946b5226f5..8344453d3e5 100755
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl
@@ -12,10 +12,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
-
 # The default host name.
 $TARGETHOSTNAME = "localhost";
 
@@ -64,7 +60,7 @@ sub name_server
         exit 1;
     }
 
-    if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+    if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
         print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
         $NS->Kill (); 
         exit 1;
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index f23b6766fd1..1faec988917 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -16,10 +16,6 @@ use Cwd;
 ## Save the starting directory
 $startdir = getcwd();
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
-
 $quiet = 0;
 
 # check for -q flag
@@ -48,7 +44,7 @@ sub name_server
 
     $NS->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+    if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
         print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
         $NS->Kill (); 
         exit 1;
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
index b6e0d62ae1a..fc085c22c60 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
@@ -12,10 +12,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
-
 $quiet = 0;
 
 # check for -q flag
@@ -42,7 +38,7 @@ sub name_server
 
     $NS->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+    if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
         print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
         $NS->Kill (); 
         exit 1;
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
index 29e726d8072..129a20a081a 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl
@@ -16,10 +16,6 @@ use Cwd;
 ## Save the starting directory
 $startdir = getcwd();
 
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 10;
-
 $quiet = 0;
 
 # check for -q flag
@@ -48,7 +44,7 @@ sub name_server
 
     $NS->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+    if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
         print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
         $NS->Kill (); 
         exit 1;
diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl
index c930e6be798..3833d042af7 100755
--- a/TAO/orbsvcs/tests/Trading/run_test.pl
+++ b/TAO/orbsvcs/tests/Trading/run_test.pl
@@ -10,7 +10,6 @@ use PerlACE::Run_Test;
 
 $ior = PerlACE::LocalFile ("trading.ior");
 $ready_file = PerlACE::LocalFile ("export_test_ready");
-$sleeptime = 20;
 $port = PerlACE::random_port();
 
 unlink $ior;
@@ -30,7 +29,7 @@ if ($TS->Spawn () == -1) {
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($ior, $sleeptime) == -1) {
+if (PerlACE::waitforfile_timed ($ior, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: waiting for trading service IOR file\n";
     $TS->Kill ();
     exit 1;
diff --git a/TAO/tao/AnyTypeCode/AnySeq.pidl b/TAO/tao/AnyTypeCode/AnySeq.pidl
index 7d125d431d0..5a65b39d975 100644
--- a/TAO/tao/AnyTypeCode/AnySeq.pidl
+++ b/TAO/tao/AnyTypeCode/AnySeq.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 /**
- * This file was used to generate the code in AnySeq*.*
+ * This file is used to generate the code in AnySeq*.*
  * The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/AnyTypeCode/Dynamic.pidl b/TAO/tao/AnyTypeCode/Dynamic.pidl
index 13ff084dd8a..5632bb195fb 100644
--- a/TAO/tao/AnyTypeCode/Dynamic.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in DynamicC.* The command
+ *   This file is used to generate the code in DynamicC.* The command
  *   used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
index 0d69d6c54ff..473aa511d3b 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in Dynamic_ParameterC.* The command
+ *   This file is used to generate the code in Dynamic_ParameterC.* The command
  *   used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/AnyTypeCode/ValueModifier.pidl b/TAO/tao/AnyTypeCode/ValueModifier.pidl
index e5e8981c404..8da4757546b 100644
--- a/TAO/tao/AnyTypeCode/ValueModifier.pidl
+++ b/TAO/tao/AnyTypeCode/ValueModifier.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in ValueModifierC.* The command
+ *   This file is used to generate the code in ValueModifierC.* The command
  *   used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/AnyTypeCode/Visibility.pidl b/TAO/tao/AnyTypeCode/Visibility.pidl
index 6b2b5b645d9..ae2fe70e747 100644
--- a/TAO/tao/AnyTypeCode/Visibility.pidl
+++ b/TAO/tao/AnyTypeCode/Visibility.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in VisibiltyC.* The command
+ *   This file is used to generate the code in VisibiltyC.* The command
  *   used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
index bc167979213..c308d68635a 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -1,7 +1,7 @@
 // $Id$
 
 /**
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * BiDirPolicy*.* The command used to generate code
  * is:
  *
diff --git a/TAO/tao/CSD_Framework/CSD_Framework.pidl b/TAO/tao/CSD_Framework/CSD_Framework.pidl
index 9161ca09d93..9d209da25bf 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework.pidl
+++ b/TAO/tao/CSD_Framework/CSD_Framework.pidl
@@ -6,7 +6,7 @@
  *
  * @brief Pre-compiled IDL source for the CSD_Framework module.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * CSD_FrameworkC.{h,inl,cpp}, using the following command:
  *
  * $ACE_ROOT/bin/tao_idl \
diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl
index 53c848a8e7e..03058f2e665 100644
--- a/TAO/tao/CharSeq.pidl
+++ b/TAO/tao/CharSeq.pidl
@@ -5,7 +5,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in CharSeqC.*
+ *   This file is used to generate the code in CharSeqC.*
  */
 
 #ifndef TAO_CORBA_CHAR_SEQ_IDL
diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl
index cc3107b663b..edb040ad366 100644
--- a/TAO/tao/DoubleSeq.pidl
+++ b/TAO/tao/DoubleSeq.pidl
@@ -3,7 +3,7 @@
 // $Id$
 
 /**
- *   This file was used to generate the code in DoubleSeqC.*
+ *   This file is used to generate the code in DoubleSeqC.*
  *   The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl b/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
index 3f0cc03b936..6cd707fa432 100644
--- a/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
+++ b/TAO/tao/EndpointPolicy/EndpointPolicyType.pidl
@@ -6,7 +6,7 @@
  *
  * This file contains idl definition for EndpointPolicy type.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * EndpointPolicyTypeC.* The command used to generate code is:
  * tao_idl
  *          -o orig -GA \
diff --git a/TAO/tao/FloatSeq.pidl b/TAO/tao/FloatSeq.pidl
index 3793e28d898..4da2570cbd2 100644
--- a/TAO/tao/FloatSeq.pidl
+++ b/TAO/tao/FloatSeq.pidl
@@ -3,7 +3,7 @@
 // $Id$
 
 /**
- *   This file was used to generate the code in FloatSeqC.*
+ *   This file is used to generate the code in FloatSeqC.*
  *   The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index a830165b05e..4b07774724d 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -9,7 +9,7 @@
 //
 // = DESCRIPTION
 //   Some new data types included for GIOP 1.2
-//   This file was used to generate the code in
+//   This file is used to generate the code in
 //   GIOP*.* The command used to generate code
 //   is:
 //
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index b29f21ce5b9..407f2043036 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -5,7 +5,7 @@
  *
  * $Id$
  *
- * This file was used to generate the code in IFR_BaseC.{h,i,cpp}.
+ * This file is used to generate the code in IFR_BaseC.{h,i,cpp}.
  * The original file Interface.idl was split into four pieces, to
  * keep the generated files to a manageable size and reduce build
  * time. This IDL file contains the abstract base interfaces of
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index 8269d222908..434b0b6c3fe 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -5,7 +5,7 @@
  *
  * $Id$
  *
- * This file was used to generate the code in IFR_BasicC.{h,inl,cpp}.
+ * This file is used to generate the code in IFR_BasicC.{h,inl,cpp}.
  * The original file Interface.idl was split into four pieces, to
  * keep the generated files to a manageable size and reduce build
  * time. This IDL file contains the concrete base interfaces of
@@ -343,7 +343,7 @@ module CORBA
                                     in VersionSpec version,
                                     in IDLType type,
                                     in AttributeMode mode );
-                                    
+
     OperationDef create_operation ( in RepositoryId id,
                                     in Identifier name,
                                     in VersionSpec version,
@@ -398,7 +398,7 @@ module CORBA
   {
   };
 
-  interface ExtAbstractInterfaceDef : AbstractInterfaceDef, 
+  interface ExtAbstractInterfaceDef : AbstractInterfaceDef,
                                       InterfaceAttrExtension
   {
   };
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 7883959772f..01911d6416c 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -5,7 +5,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in IFR_ComponentsC.{h,inl,cpp}.
+ *   This file is used to generate the code in IFR_ComponentsC.{h,inl,cpp}.
  *   The original file Interface.idl was split into four pieces, to
  *   keep the generated files to a manageable size and reduce build
  *   time. This IDL file contains all the interfaces and other data
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index f8bb6813244..20fcfe642d1 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -5,7 +5,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in IFR_ExtendedC.{h,i,cpp}.
+ *   This file is used to generate the code in IFR_ExtendedC.{h,i,cpp}.
  *   The original file Interface.idl was split into four pieces, to
  *   keep the generated files to a manageable size and reduce build
  *   time. This IDL file contains all the interfaces and other data
diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl
index cb5d6606a9d..0b9a667d403 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -4,7 +4,7 @@
 
 /**
  *
- *   This file was used to generate the code in
+ *   This file is used to generate the code in
  *   IIOP*.* The command used to generate code
  *   is:
  *
diff --git a/TAO/tao/IIOP_Endpoints.pidl b/TAO/tao/IIOP_Endpoints.pidl
index 72819ca75d4..198da806ddd 100644
--- a/TAO/tao/IIOP_Endpoints.pidl
+++ b/TAO/tao/IIOP_Endpoints.pidl
@@ -9,7 +9,7 @@
  * used for transmission of IIOP endpoints.  See IIOP_Profile.*
  * for more details.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * IIOP_EndpointsC.* The command used to generate code
  * is:
  *
diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl
index 48adfe9d342..a9b684fc5e9 100644
--- a/TAO/tao/IORInterceptor/IORInfo.pidl
+++ b/TAO/tao/IORInterceptor/IORInfo.pidl
@@ -16,7 +16,7 @@
  * has been created to remove the dependency from the rest of module
  * PortableInterceptor.
  *
- * This file was used to generate the code in IORInfoC.*
+ * This file is used to generate the code in IORInfoC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
index 255079acff1..f1ce8fa18fe 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.pidl
+++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl
@@ -16,7 +16,7 @@
  * has been created to remove the dependency from the rest of module
  * PortableInterceptor.
  *
- * This file was used to generate the code in IORInterceptorC.*
+ * This file is used to generate the code in IORInterceptorC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/IORManipulation/IOR.pidl b/TAO/tao/IORManipulation/IOR.pidl
index 62d1e006697..6484f6e5c1e 100644
--- a/TAO/tao/IORManipulation/IOR.pidl
+++ b/TAO/tao/IORManipulation/IOR.pidl
@@ -5,7 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the TAO_IOP namespace.
  *
- * This file was used to generate the code in IORC.{h,cpp}.
+ * This file is used to generate the code in IORC.{h,cpp}.
  *
  * To regenerate the code use:
  *
diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl
index 67ca4308b17..fe64b37e992 100644
--- a/TAO/tao/IORTable/IORTable.pidl
+++ b/TAO/tao/IORTable/IORTable.pidl
@@ -8,7 +8,7 @@
  *
  * @brief Pre-compiled IDL source for the IORTable module.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * IORTable{C}.{h,cpp}
  *
  *   The command used to generate code from this file is:
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index 010899bda14..dbbabe5f789 100644
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- * This file was used to generate the code in ImplRepo{A,C,S}.{h,inl,cpp}
+ * This file is used to generate the code in ImplRepo{A,C,S}.{h,inl,cpp}
  *
  * The command used to generate code from this file is:
  *
diff --git a/TAO/tao/ImR_Client/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.pidl
index 25439fc14cd..a22c1b3ea65 100644
--- a/TAO/tao/ImR_Client/ServerObject.pidl
+++ b/TAO/tao/ImR_Client/ServerObject.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- * This file was used to generate the code in ServerObject{A,C,S}.{h,inl,cpp}
+ * This file is used to generate the code in ServerObject{A,C,S}.{h,inl,cpp}
  *
  * The command used to generate code from this file is:
  *
diff --git a/TAO/tao/LongDoubleSeq.pidl b/TAO/tao/LongDoubleSeq.pidl
index ee8573c87ab..3e5b6d208e9 100644
--- a/TAO/tao/LongDoubleSeq.pidl
+++ b/TAO/tao/LongDoubleSeq.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 /**
- * This file was used to generate the code in LongDoubleSeq*.*
+ * This file is used to generate the code in LongDoubleSeq*.*
  * The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/LongLongSeq.pidl b/TAO/tao/LongLongSeq.pidl
index 21f4d8d909f..2b9eae61e45 100644
--- a/TAO/tao/LongLongSeq.pidl
+++ b/TAO/tao/LongLongSeq.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 /**
- * This file was used to generate the code in LongLongSeq*.*
+ * This file is used to generate the code in LongLongSeq*.*
  * The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/LongSeq.pidl b/TAO/tao/LongSeq.pidl
index be5548f2ae6..7414de40bbc 100644
--- a/TAO/tao/LongSeq.pidl
+++ b/TAO/tao/LongSeq.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 /**
- * This file was used to generate the code in LongSeq*.*
+ * This file is used to generate the code in LongSeq*.*
  * The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl
index 4dcc816a853..b2be7f2ff03 100644
--- a/TAO/tao/Messaging/Messaging.pidl
+++ b/TAO/tao/Messaging/Messaging.pidl
@@ -6,17 +6,7 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in Messaging{C,S,S_T}.{h,i,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -GA -Ssi
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
- *        Messaging.pidl
+ * This file is used to generate the code in Messaging{C,S}.{h,cpp}
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl
index 44b70574cfa..45b171441b7 100644
--- a/TAO/tao/Messaging/Messaging_No_Impl.pidl
+++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl
@@ -6,32 +6,9 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * Messaging_No_Impl{C}.{h,cpp} and as the name implies is not
  * implemented in TAO, yet.
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -GA -Sci -SS
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
- *        Messaging_No_Impl.pidl
- *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging_No_Impl{C}.{h,cpp} .
- *   patch < diffs/Messaging_No_Impl.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging_No_Impl{C}.{h,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging_No_Impl.diff
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
index 80b0b229961..9ff676d7ac4 100644
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
@@ -6,20 +6,8 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * Messaging_RT_Policy{C}.{h,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -GA -Sci -SS
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Messaging_RT_Policy.pidl
- *
- *   The generated files are ready to use
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
index 5007decf337..39cf160f15c 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
@@ -6,20 +6,8 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * Messaging_SyncScope_Policy{C}.{h,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -GA -Sci
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
- *        Messaging_SyncScope_Policy.pidl
- *
- *   The generated files are ready to use
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Messaging_Types.pidl b/TAO/tao/Messaging/Messaging_Types.pidl
index ef0163ec8a7..8b616b03853 100644
--- a/TAO/tao/Messaging/Messaging_Types.pidl
+++ b/TAO/tao/Messaging/Messaging_Types.pidl
@@ -6,19 +6,7 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in
- * Messaging__Types{C}.{h,cpp} and as the name implies is not
- * implemented in TAO, yet.
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *        -o orig -Gp -Gd -GA -Sci -SS
- *        -Wb,export_macro=TAO_Messaging_Export
- *        -Wb,export_include=messaging_export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h" -I$(TAO_ROOT)
- *        Messaging_No_Impl.pidl
+ * This file is used to generate the code in Messaging__Types{C}.{h,cpp}
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging/Pollable.pidl b/TAO/tao/Messaging/Pollable.pidl
index 5441f0ff041..24217c692cd 100644
--- a/TAO/tao/Messaging/Pollable.pidl
+++ b/TAO/tao/Messaging/Pollable.pidl
@@ -6,17 +6,7 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in Pollable{C,S,S_T}.{h,inl,cpp}
- *
- * The command used to generate code from this file is:
- *
- *   tao_idl
- *     -o orig -St -Sa -Gp -Gd -SS -Sci
- *     -Wb,export_macro=TAO_Export
- *     -Wb,pre_include="ace/pre.h"
- *     -Wb,post_include="ace/post.h"
- *     Pollable.pidl
- *
+ * This file is used to generate the code in Pollable{C,S}.{h,cpp}
  */
 //=============================================================================
 
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index 17c568c8c04..4756d5b1dc6 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -4,7 +4,7 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in Messaging_PolicyValueC.{h,cpp}
+ * This file is used to generate the code in Messaging_PolicyValueC.{h,cpp}
  *
  * The command used to generate code from this file is:
  *
diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl
index af498458ab4..789cd58af73 100644
--- a/TAO/tao/Messaging_SyncScope.pidl
+++ b/TAO/tao/Messaging_SyncScope.pidl
@@ -4,7 +4,7 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in Messaging_SyncScopeC.{h,inl,cpp}
+ * This file is used to generate the code in Messaging_SyncScopeC.{h,inl,cpp}
  *
  * The command used to generate code from this file is:
  *
diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl
index 0654d873600..0cfdffbaedf 100644
--- a/TAO/tao/Object_Key.pidl
+++ b/TAO/tao/Object_Key.pidl
@@ -2,7 +2,7 @@
 
 // TAO specific IDL definition of an octet sequence that we use to represent
 // Object keys inside the POA.
-//   This file was used to generate the code in Object_KeyC.*
+//   This file is used to generate the code in Object_KeyC.*
 //   The command used to generate code is:
 //
 //     tao_idl
diff --git a/TAO/tao/PI/ClientRequestInfo.pidl b/TAO/tao/PI/ClientRequestInfo.pidl
index 5a0a2dd8e52..8f1f809d0bc 100644
--- a/TAO/tao/PI/ClientRequestInfo.pidl
+++ b/TAO/tao/PI/ClientRequestInfo.pidl
@@ -7,7 +7,7 @@
  *
  * @brief Pre-compiled ClientRequestInfo
  *
- * This file was used to generate the code in ClientRequestInfoC.*
+ * This file is used to generate the code in ClientRequestInfoC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI/ClientRequestInterceptor.pidl b/TAO/tao/PI/ClientRequestInterceptor.pidl
index e1ecefc69e0..f9d7e11e2df 100644
--- a/TAO/tao/PI/ClientRequestInterceptor.pidl
+++ b/TAO/tao/PI/ClientRequestInterceptor.pidl
@@ -13,7 +13,7 @@
  * The following is from orbos/99-12-02 Portable Interceptors spec,
  * the full IDL is downloadable from orbos/99-12-02.
  *
- * This file was used to generate the code in ClientRequestInterceptorC.*
+ * This file is used to generate the code in ClientRequestInterceptorC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI/Interceptor.pidl b/TAO/tao/PI/Interceptor.pidl
index 2f794c52bed..39426e3989d 100644
--- a/TAO/tao/PI/Interceptor.pidl
+++ b/TAO/tao/PI/Interceptor.pidl
@@ -8,7 +8,7 @@
  * @brief Pre-compiled IDL source for the Interceptor
  * components in the ORB.
  *
- * This file was used to generate the code in InterceptorC.*
+ * This file is used to generate the code in InterceptorC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI/InvalidSlot.pidl b/TAO/tao/PI/InvalidSlot.pidl
index d0090a4fd82..e6a48b4932c 100644
--- a/TAO/tao/PI/InvalidSlot.pidl
+++ b/TAO/tao/PI/InvalidSlot.pidl
@@ -7,7 +7,7 @@
  *
  * @brief Pre-compiled InvalidSlot
  *
- * This file was used to generate the code in InvalidSlotC.*
+ * This file is used to generate the code in InvalidSlotC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI/ORBInitInfo.pidl b/TAO/tao/PI/ORBInitInfo.pidl
index b53e6dbfe4c..6851cd48737 100644
--- a/TAO/tao/PI/ORBInitInfo.pidl
+++ b/TAO/tao/PI/ORBInitInfo.pidl
@@ -7,7 +7,7 @@
  *
  * @brief Pre-compiled IDL source for the ORBInitInfo
  *
- * This file was used to generate the code in ORBInitInfoC.*
+ * This file is used to generate the code in ORBInitInfoC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI/ORBInitializer.pidl b/TAO/tao/PI/ORBInitializer.pidl
index 765177ab437..c9f141c4c0e 100644
--- a/TAO/tao/PI/ORBInitializer.pidl
+++ b/TAO/tao/PI/ORBInitializer.pidl
@@ -8,7 +8,7 @@
  * @brief ORBInitializer part of the PortableInterceptor part of the CORBA
  * spec
  *
- * This file was used to generate the code in ORBInitializerC.*
+ * This file is used to generate the code in ORBInitializerC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI/PIForwardRequest.pidl b/TAO/tao/PI/PIForwardRequest.pidl
index a494521edcf..7f2b9a0f847 100644
--- a/TAO/tao/PI/PIForwardRequest.pidl
+++ b/TAO/tao/PI/PIForwardRequest.pidl
@@ -8,7 +8,7 @@
  * @brief Pre-compiled IDL source for the PortableInterceptor
  * components in the ORB.
  *
- * This file was used to generate the code in PIForwardRequestC.*
+ * This file is used to generate the code in PIForwardRequestC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl
index 558b6654de4..a304171c9ea 100644
--- a/TAO/tao/PI/RequestInfo.pidl
+++ b/TAO/tao/PI/RequestInfo.pidl
@@ -7,7 +7,7 @@
  *
  * @brief Pre-compiled RequestInfo
  *
- * This file was used to generate the code in RequestInfoC.*
+ * This file is used to generate the code in RequestInfoC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.pidl b/TAO/tao/PI_Server/ServerRequestInfo.pidl
index 505c714c50d..cc4520de1cb 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.pidl
@@ -7,7 +7,7 @@
  *
  * @brief Pre-compiled RequestInfo
  *
- * This file was used to generate the code in ServerRequestInfoC.*
+ * This file is used to generate the code in ServerRequestInfoC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
index d660db2e46c..ad9a7d658fb 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
@@ -8,7 +8,7 @@
  * @brief Pre-compiled IDL source for the PortableInterceptor
  * components in the ORB.
  *
- * This file was used to generate the code in ServerRequestInterceptorC.*
+ * This file is used to generate the code in ServerRequestInterceptorC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/ParameterMode.pidl b/TAO/tao/ParameterMode.pidl
index f288ce58325..c61e9f7819c 100644
--- a/TAO/tao/ParameterMode.pidl
+++ b/TAO/tao/ParameterMode.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in ParameterModeC.* The command
+ *   This file is used to generate the code in ParameterModeC.* The command
  *   used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 5dda30b0323..206b349dc38 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -18,7 +18,7 @@
  *    - addition of the Interceptor::destroy() method
  *    - move of CodecFactory and Codec interfaces to the IOP module
  *
- * This file was used to generate the code in PortableInterceptorC.*
+ * This file is used to generate the code in PortableInterceptorC.*
  * The command used to generate code is:
  *
  *  tao_idl
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
index 7fd09191dd4..184c4c28692 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp
@@ -52,6 +52,7 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall (
     }
 #else
   ACE_UNUSED_ARG (forward_obj);
+  ACE_UNUSED_ARG (is_forwarded);
 #endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/
 }
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 91c3d86e308..c8ce36d03ee 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -382,7 +382,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
   // calling operation's mem-space.
   if (req.collocated() && req.pi_reply_status () == PortableInterceptor::LOCATION_FORWARD)
     {
-      forward_to = CORBA::Object::_duplicate (req.forward_location ());
+      forward_to = req.forward_location ();
       result = TAO_Adapter::DS_FORWARD;
     }
 #endif
diff --git a/TAO/tao/PortableServer/POA.pidl b/TAO/tao/PortableServer/POA.pidl
index 48cae64313f..db3cfe8f3a1 100644
--- a/TAO/tao/PortableServer/POA.pidl
+++ b/TAO/tao/PortableServer/POA.pidl
@@ -5,7 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * PortableServerC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
@@ -140,17 +140,13 @@ module PortableServer
     ThreadPolicy create_thread_policy (in ThreadPolicyValue value);
 #endif
 #       if  ! defined (CORBA_E_MICRO)
-    LifespanPolicy create_lifespan_policy (
-        in LifespanPolicyValue value
-      );
+    LifespanPolicy create_lifespan_policy (in LifespanPolicyValue value);
 
     IdUniquenessPolicy  create_id_uniqueness_policy (
-        in IdUniquenessPolicyValue value
-      );
+        in IdUniquenessPolicyValue value);
 
     IdAssignmentPolicy  create_id_assignment_policy (
-        in IdAssignmentPolicyValue value
-      );
+        in IdAssignmentPolicyValue value);
 #endif
 #       if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) && !defined (TAO_HAS_MINIMUM_POA)
     ImplicitActivationPolicy create_implicit_activation_policy (
diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl
index 4c61a6ac1d9..eaaf75180e5 100644
--- a/TAO/tao/PortableServer/PS_Forward.pidl
+++ b/TAO/tao/PortableServer/PS_Forward.pidl
@@ -5,7 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * PS_ForwardC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 4d90a9b3273..ccdc8cb587d 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -5,7 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * PortableServerC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl
index a371c377ed0..6874b5694cd 100644
--- a/TAO/tao/PortableServer/ServantActivator.pidl
+++ b/TAO/tao/PortableServer/ServantActivator.pidl
@@ -5,7 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * ServantActivatorC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
diff --git a/TAO/tao/PortableServer/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl
index acdc7ad6894..676fa68feff 100644
--- a/TAO/tao/PortableServer/ServantLocator.pidl
+++ b/TAO/tao/PortableServer/ServantLocator.pidl
@@ -5,7 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * ServantLocatorC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
diff --git a/TAO/tao/PortableServer/ServantManager.pidl b/TAO/tao/PortableServer/ServantManager.pidl
index 991328ac24d..6eace36b098 100644
--- a/TAO/tao/PortableServer/ServantManager.pidl
+++ b/TAO/tao/PortableServer/ServantManager.pidl
@@ -5,7 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * ServantManagerC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index 1ffe417bbb2..e6fdfad7650 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -18,7 +18,7 @@
  *     3.  Added RT_ORB::create_tcp_protocol_properties which seems
  *         to come and go from the formal specification, but is needed.
  *
- *   This file was used to generate the code in RTCORBAC.{h,inl,cpp}.
+ *   This file is used to generate the code in RTCORBAC.{h,inl,cpp}.
  *   The steps to regenerate the code are as follows:
  *
  *   1. Run the tao_idl compiler on the pidl file.  The command used for
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl
index 9f9c13651d1..0eb40328919 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl
@@ -5,7 +5,7 @@
  *
  * @brief Pre-compiled IDL source for the RTPortableServer module.
  *
- * This file was used to generate the code in RTPortableServerC.{h,cpp}
+ * This file is used to generate the code in RTPortableServerC.{h,cpp}
  * The steps to regenerate the code are as follows:
  *
  *   1. Run the tao_idl compiler on the pidl file.  The command used for
diff --git a/TAO/tao/RTScheduling/RTScheduler.pidl b/TAO/tao/RTScheduling/RTScheduler.pidl
index 2e821ec8160..e578c205b88 100644
--- a/TAO/tao/RTScheduling/RTScheduler.pidl
+++ b/TAO/tao/RTScheduling/RTScheduler.pidl
@@ -9,7 +9,7 @@
 //
 // = DESCRIPTION
 //   Some new data types included for GIOP 1.2
-//   This file was used to generate the code in
+//   This file is used to generate the code in
 //   RTScheduler*.* The command used to generate code
 //   is:
 //
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
index a20166a5c8a..2543927025e 100644
--- a/TAO/tao/Services.pidl
+++ b/TAO/tao/Services.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 //
-//   This file was used to generate the code in ServicesC.*
+//   This file is used to generate the code in ServicesC.*
 //   The command used to generate code is:
 //
 //     tao_idl
diff --git a/TAO/tao/ShortSeq.pidl b/TAO/tao/ShortSeq.pidl
index ca11d10c026..4418ccabb62 100644
--- a/TAO/tao/ShortSeq.pidl
+++ b/TAO/tao/ShortSeq.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 /**
- * This file was used to generate the code in ShortSeq*.*
+ * This file is used to generate the code in ShortSeq*.*
  * The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/Strategies/COIOP_Endpoints.pidl b/TAO/tao/Strategies/COIOP_Endpoints.pidl
index e68dcb8b690..8b6d0ddd3ab 100644
--- a/TAO/tao/Strategies/COIOP_Endpoints.pidl
+++ b/TAO/tao/Strategies/COIOP_Endpoints.pidl
@@ -9,7 +9,7 @@
  * used for transmission of COIOP endpoints.  See COIOP_Profile.*
  * for more details.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * COIOP_EndpointsC.* The command used to generate code
  * is:
  *
diff --git a/TAO/tao/Strategies/sciop_endpoints.pidl b/TAO/tao/Strategies/sciop_endpoints.pidl
index 40f9c29a639..5690d2c96af 100644
--- a/TAO/tao/Strategies/sciop_endpoints.pidl
+++ b/TAO/tao/Strategies/sciop_endpoints.pidl
@@ -9,7 +9,7 @@
  * used for transmission of SCIOP Endpoints.  See SCIOP_Profile.*
  * for more details.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * sciop_endpoints.* The command used to generate code
  * is:
  *
diff --git a/TAO/tao/Strategies/uiop_endpoints.pidl b/TAO/tao/Strategies/uiop_endpoints.pidl
index 96e6411328b..c53508edd92 100644
--- a/TAO/tao/Strategies/uiop_endpoints.pidl
+++ b/TAO/tao/Strategies/uiop_endpoints.pidl
@@ -8,7 +8,7 @@
  * used for transmission of UIOP Endpoints.  See UIOP_Profile.* for
  * more details.
  *
- * This file was used to generate the code in
+ * This file is used to generate the code in
  * uiop_endpoints.* The command used to generate code
  * is:
  *
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
index 79f53269a99..34fc64e515b 100644
--- a/TAO/tao/StringSeq.pidl
+++ b/TAO/tao/StringSeq.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 //
-//   This file was used to generate the code in StringSeqC.*
+//   This file is used to generate the code in StringSeqC.*
 //   The command used to generate code is:
 //
 //     tao_idl
diff --git a/TAO/tao/TimeBase.pidl b/TAO/tao/TimeBase.pidl
index eb85bf0b8ca..57542a333b4 100644
--- a/TAO/tao/TimeBase.pidl
+++ b/TAO/tao/TimeBase.pidl
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in TimeBase{C,S,S_T}.{h,i,cpp}
+ * This file is used to generate the code in TimeBase{C,S,S_T}.{h,i,cpp}
  *
  * The command used to generate code from this file is:
  *
diff --git a/TAO/tao/UShortSeq.pidl b/TAO/tao/UShortSeq.pidl
index 2a966767ae0..1dbfd99aa37 100644
--- a/TAO/tao/UShortSeq.pidl
+++ b/TAO/tao/UShortSeq.pidl
@@ -4,7 +4,7 @@
 
 // ================================================================
 /**
- * This file was used to generate the code in UShortSeq*.*
+ * This file is used to generate the code in UShortSeq*.*
  * The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/WCharSeq.pidl b/TAO/tao/WCharSeq.pidl
index 46a0b156c43..1407d0dee94 100644
--- a/TAO/tao/WCharSeq.pidl
+++ b/TAO/tao/WCharSeq.pidl
@@ -3,7 +3,7 @@
 // $Id$
 
 /**
- *   This file was used to generate the code in WCharSeqC.*
+ *   This file is used to generate the code in WCharSeqC.*
  *   The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/WStringSeq.pidl b/TAO/tao/WStringSeq.pidl
index 99a5c3d8ae7..2af1d0d14f3 100644
--- a/TAO/tao/WStringSeq.pidl
+++ b/TAO/tao/WStringSeq.pidl
@@ -3,7 +3,7 @@
 // $Id$
 
 /**
- *   This file was used to generate the code in WStringSeqC.*
+ *   This file is used to generate the code in WStringSeqC.*
  *   The command used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tao/orb_types.pidl b/TAO/tao/orb_types.pidl
index 21bf5cd006c..d64d938a863 100644
--- a/TAO/tao/orb_types.pidl
+++ b/TAO/tao/orb_types.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- *   This file was used to generate the code in orb_typesC.* The command
+ *   This file is used to generate the code in orb_typesC.* The command
  *   used to generate code is:
  *
  *     tao_idl
diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl
index fa1caabcef2..725a1a5f4eb 100755
--- a/TAO/tests/AMH_Exceptions/run_test.pl
+++ b/TAO/tests/AMH_Exceptions/run_test.pl
@@ -11,9 +11,6 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 use PerlACE::TestTarget;
 
-# Amount of delay (in seconds) between starting a server and a client.
-$sleeptime = $PerlACE::wait_interval_for_process_creation;
-
 my $target = PerlACE::TestTarget::create_target($PerlACE::TestConfig) || die "Create target failed\n";
 my $host = new PerlACE::TestTarget;
 
@@ -29,7 +26,6 @@ if (PerlACE::is_vxworks_test()) {
 }
 else {
     $AMH = $target->CreateProcess ("server", "");
-#    $AMH = new PerlACE::Process ("server", "");
 }
 
 $CL = $host->CreateProcess ("client", "");
@@ -37,8 +33,7 @@ $CL = $host->CreateProcess ("client", "");
 # Run the AMH server.
 $AMH->Spawn ();
 
-#if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-if ($target->WaitForFileTimed ($iorfile, $sleeptime) == -1) {
+if ($target->WaitForFileTimed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: File containing AMH Server ior,".
         " <$iorfile>, cannot be found\n";
     $AMH->Kill ();
@@ -63,7 +58,6 @@ if ($amhserver != 0) {
 }
 
 $target->GetStderrLog();
-#unlink $iorfile;
 $host->DeleteFile($iorbase);
 $target->DeleteFile ($iorfile);
 exit $status;
diff --git a/TAO/tests/AMH_Oneway/run_test.pl b/TAO/tests/AMH_Oneway/run_test.pl
index 6c986fc5fe4..13006761906 100755
--- a/TAO/tests/AMH_Oneway/run_test.pl
+++ b/TAO/tests/AMH_Oneway/run_test.pl
@@ -10,9 +10,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-# Amount of delay (in seconds) between starting a server and a client.
-$sleeptime = $PerlACE::wait_interval_for_process_creation;
-
 # File used to pass AMH server ior to its clients.
 # This file name is hard-coded in the server.cpp and client.cpp files
 $iorfile = PerlACE::LocalFile("test.ior");
@@ -35,7 +32,7 @@ if ($sv != 0) {
    exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: File containing AMH Server ior,".
         " <$iorfile>, cannot be found\n";
     $AMH->Kill ();
diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp
index 35d3167fd10..78b73ffa0d5 100644
--- a/TAO/tests/Bug_3276_Regression/Manager.cpp
+++ b/TAO/tests/Bug_3276_Regression/Manager.cpp
@@ -31,7 +31,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -55,7 +55,9 @@ main (int argc, char *argv[])
 
       if (proxy_ior != 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "Writing the servant locator object ref out to file %s\n", proxy_ior));
+          ACE_DEBUG ((LM_DEBUG,
+                      "Writing the servant locator object ref out to file %s\n",
+                      proxy_ior));
           output_file = ACE_OS::fopen (proxy_ior, "w");
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +81,9 @@ main (int argc, char *argv[])
       // If the proxy_ior exists, output the ior to it
       if (control_ior != 0)
         {
-          ACE_DEBUG ((LM_DEBUG, "Writing the root poa servant server IOR out to file %s\n", control_ior));
+          ACE_DEBUG ((LM_DEBUG,
+                      "Writing the root poa servant server IOR out to file %s\n",
+                      control_ior));
           output_file = ACE_OS::fopen (control_ior, "w");
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp b/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
index 580776adf3e..697deb9ea8f 100644
--- a/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
+++ b/TAO/tests/Bug_3276_Regression/Servant_Locator.cpp
@@ -5,8 +5,6 @@
 #include "testC.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID(Forwarding, Servant_Locator, "$Id$")
-
 PortableServer::Servant
 Servant_Locator::preinvoke (const PortableServer::ObjectId & /* oid */,
                             PortableServer::POA_ptr /* poa_ptr */,
diff --git a/TAO/tests/Bug_3276_Regression/client.cpp b/TAO/tests/Bug_3276_Regression/client.cpp
index c0fb9eb32ab..e2ef060d28c 100644
--- a/TAO/tests/Bug_3276_Regression/client.cpp
+++ b/TAO/tests/Bug_3276_Regression/client.cpp
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
@@ -84,7 +84,8 @@ main (int argc, char *argv[])
           if (m == TAO_INVOCATION_LOCATION_FORWARD_MINOR_CODE &&
               ex.completed () == CORBA::COMPLETED_NO)
             {
-              ACE_DEBUG ((LM_DEBUG, "TRANSIENT caught in client as it was expected.\n"));
+              ACE_DEBUG ((LM_DEBUG,
+                          "TRANSIENT caught in client as it was expected.\n"));
             }
           else
             {
diff --git a/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc b/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc
new file mode 100644
index 00000000000..55cd8c54a5a
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc
@@ -0,0 +1,24 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    idlflags += -Gd -Sorb
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, iormanip, pi_server, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  after += *idl
+  Source_Files {
+    test_i.cpp
+    testC.cpp
+    testS.cpp
+    Server_ORBInitializer.cpp
+    Server_Request_Interceptor.cpp
+    server.cpp
+  }
+  IDL_Files {
+  }
+}
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
new file mode 100644
index 00000000000..76548d1dc1f
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp
@@ -0,0 +1,53 @@
+// -*- C++ -*-
+
+#include "Server_ORBInitializer.h"
+#include "tao/ORB_Constants.h"
+
+ACE_RCSID (Collocated_Forwarding,
+           Server_ORBInitializer,
+           "$Id$")
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "Server_Request_Interceptor.h"
+
+Server_ORBInitializer::Server_ORBInitializer (CORBA::ULong request_pass_count)
+  : request_pass_count_ (request_pass_count)
+  , server_interceptor_ ()
+{
+}
+
+void
+Server_ORBInitializer::pre_init (
+    PortableInterceptor::ORBInitInfo_ptr)
+{
+}
+
+void
+Server_ORBInitializer::post_init (
+    PortableInterceptor::ORBInitInfo_ptr info)
+{
+  PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
+  // Install the server request interceptor.
+  ACE_NEW_THROW_EX (interceptor,
+                    Server_Request_Interceptor (this->request_pass_count_),
+                    CORBA::NO_MEMORY (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO::VMCID,
+                        ENOMEM),
+                      CORBA::COMPLETED_NO));
+
+  this->server_interceptor_ = interceptor;
+
+  info->add_server_request_interceptor (interceptor);
+}
+
+PortableInterceptor::ServerRequestInterceptor_ptr
+Server_ORBInitializer::server_interceptor (void)
+{
+  return
+    PortableInterceptor::ServerRequestInterceptor::_duplicate (
+      this->server_interceptor_.in ());
+}
+
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
new file mode 100644
index 00000000000..625c8d4debe
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h
@@ -0,0 +1,65 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef TAO_SERVER_ORB_INITIALIZER_H
+#define TAO_SERVER_ORB_INITIALIZER_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/LocalObject.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "tao/PI/PI.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+// Forward declaration.
+class Server_Request_Interceptor;
+
+/// Server side ORB initializer.
+class Server_ORBInitializer :
+  public virtual PortableInterceptor::ORBInitializer,
+  public virtual TAO_Local_RefCounted_Object
+{
+public:
+
+  /// Constructor.
+  Server_ORBInitializer (CORBA::ULong request_pass_count);
+
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
+
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
+
+  /// Return the created server request interceptor.  Only valid after
+  /// post_init(), i.e. ORB_init(), has been called.
+  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+
+private:
+
+  /// How much requests to pass thru before forwarding.
+  CORBA::ULong request_pass_count_;
+
+  /// Pointer to the server request interceptor.  ORB is responsible
+  /// for storage.
+  PortableInterceptor::ServerRequestInterceptor_var server_interceptor_;
+};
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_SERVER_ORB_INITIALIZER_H */
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
new file mode 100644
index 00000000000..2602da3ff9e
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp
@@ -0,0 +1,99 @@
+// -*- C++ -*-
+
+#include "Server_Request_Interceptor.h"
+#include "tao/PI_Server/PI_Server.h"
+#include "tao/ORB_Constants.h"
+#include "tao/CDR.h"
+#include "testS.h"
+
+ACE_RCSID (Collocated_Forwarding,
+           Server_Request_Interceptor,
+           "$Id$")
+
+//static const CORBA::ULong expected_version = 5;
+
+Server_Request_Interceptor::Server_Request_Interceptor (CORBA::ULong request_pass_count)
+  : request_pass_count_ (request_pass_count)
+  , request_count_ (0)
+  , to_ (CORBA::Object::_nil ())
+{
+}
+
+void
+Server_Request_Interceptor::forward (
+  CORBA::Object_ptr to)
+{
+  if (CORBA::is_nil (to))
+    throw CORBA::INV_OBJREF (
+      CORBA::SystemException::_tao_minor_code (
+        TAO::VMCID,
+        EINVAL),
+      CORBA::COMPLETED_NO);
+
+  char *argv[] = {NULL};
+  int   argc = 0;
+
+  // Fetch the ORB having been initialized in main()
+  CORBA::ORB_var orb =
+    CORBA::ORB_init (argc, argv, "Server ORB");
+
+  CORBA::String_var s_to = orb->object_to_string (to);
+
+  this->to_ = orb->string_to_object (s_to.in ());
+}
+
+char *
+Server_Request_Interceptor::name (void)
+{
+  return CORBA::string_dup ("Server_Request_Interceptor");
+}
+
+void
+Server_Request_Interceptor::destroy (void)
+{
+  CORBA::release (this->to_);
+}
+
+void
+Server_Request_Interceptor::receive_request_service_contexts (
+    PortableInterceptor::ServerRequestInfo_ptr)
+{
+  this->request_count_++;
+}
+
+void
+Server_Request_Interceptor::receive_request (
+    PortableInterceptor::ServerRequestInfo_ptr)
+{
+  if (this->request_count_ == this->request_pass_count_)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "SERVER: Request %d will be forwarded "
+                  "to object 'to'\nSERVER: via "
+                  "receive_request_service_contexts().\n",
+                  this->request_count_));
+
+      // Throw forward exception
+      throw PortableInterceptor::ForwardRequest (this->to_);
+    }
+
+  return;
+}
+
+void
+Server_Request_Interceptor::send_reply (
+    PortableInterceptor::ServerRequestInfo_ptr)
+{
+}
+
+void
+Server_Request_Interceptor::send_exception (
+    PortableInterceptor::ServerRequestInfo_ptr)
+{
+}
+
+void
+Server_Request_Interceptor::send_other (
+    PortableInterceptor::ServerRequestInfo_ptr)
+{
+}
diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
new file mode 100644
index 00000000000..375f7860ac6
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h
@@ -0,0 +1,84 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef SERVER_REQUEST_INTERCEPTOR_H
+#define SERVER_REQUEST_INTERCEPTOR_H
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "testC.h"
+#include "tao/LocalObject.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+/**
+ * @class Server_Request_Interceptor
+ *
+ * @brief Simple concrete server request interceptor.
+ */
+class Server_Request_Interceptor
+  : public virtual Collocated_ForwardRequestTest::ServerRequestInterceptor,
+    public virtual TAO_Local_RefCounted_Object
+{
+public:
+
+  /// Constructor.
+  Server_Request_Interceptor (CORBA::ULong request_pass_count);
+
+  /// Set the references to which requests will be forwarded.
+  virtual void forward (CORBA::Object_ptr to);
+
+  /**
+   * @name Methods Required by the Server Request Interceptor
+   * Interface
+   *
+   * These are methods that must be implemented since they are pure
+   * virtual in the abstract base class.  They are the canonical
+   * methods required for all server request interceptors.
+   */
+  //@{
+  /// Return the name of this ServerRequestinterceptor.
+  virtual char * name (void);
+
+  virtual void destroy (void);
+
+  virtual void receive_request_service_contexts (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+
+  virtual void receive_request (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+
+  virtual void send_reply (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+
+  virtual void send_exception (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+
+  virtual void send_other (
+      PortableInterceptor::ServerRequestInfo_ptr ri);
+  //@}
+
+private:
+
+  /// How much requests to pass thru before forwarding.
+  CORBA::ULong request_pass_count_;
+
+  /// The number of requests intercepted by this interceptor.
+  CORBA::ULong request_count_;
+
+  /// References to the object used in this test.
+  CORBA::Object_ptr to_;
+};
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#endif  /* SERVER_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/Collocated_Forwarding/run_test.pl b/TAO/tests/Collocated_Forwarding/run_test.pl
new file mode 100755
index 00000000000..b0ded7ffed9
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/run_test.pl
@@ -0,0 +1,41 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;  
+ 
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::Run_Test;
+
+print "Run server with direct collocation strategy\n";
+
+if (PerlACE::is_vxworks_test()) {
+  $SV2 = new PerlACE::ProcessVX ("server", "-d -ORBCollocationStrategy direct");
+}
+else {
+  $SV2 = new PerlACE::Process ("server", "-d -ORBCollocationStrategy direct");
+}
+
+$server2 = $SV2->SpawnWaitKill (15);
+if ($server2 != 0) {
+    print STDERR "Server with direct collocation strategy return status = $server2\n";
+    exit 1;
+}
+
+print "Run server with pass thru collocation strategy\n";
+
+if (PerlACE::is_vxworks_test()) {
+  $SV1 = new PerlACE::ProcessVX ("server", "");
+}
+else {
+  $SV1 = new PerlACE::Process ("server", "");
+}
+
+$server1 = $SV1->SpawnWaitKill (15);
+if ($server1 != 0) {
+    print STDERR "Server with thru poa collocation strategy return status = $server1\n";
+    exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/Collocated_Forwarding/server.cpp b/TAO/tests/Collocated_Forwarding/server.cpp
new file mode 100644
index 00000000000..b9622ad2521
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/server.cpp
@@ -0,0 +1,171 @@
+// -*- C++ -*-
+
+#include "ace/Get_Opt.h"
+#include "test_i.h"
+#include "ace/OS_NS_stdio.h"
+
+#if TAO_HAS_INTERCEPTORS
+
+#include "Server_ORBInitializer.h"
+#include "Server_Request_Interceptor.h"
+#include "tao/IORManipulation/IORManipulation.h"
+#include "tao/ORBInitializer_Registry.h"
+
+ACE_RCSID (Collocated_Forwarding,
+           server,
+           "$Id$")
+
+const CORBA::ULong passes_before_forward = 6;
+
+bool direct_collocation = false;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "d");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':
+        direct_collocation = true;
+        break;
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Usage:  %s "
+                           "-d\n",
+                           argv[0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+void test_colocal (Collocated_ForwardRequestTest::test_ptr server)
+{
+  CORBA::ULong number = 0;
+  for (int i = 1; i <= 10; ++i)
+    {
+      ACE_DEBUG ((LM_INFO,
+                  "CLIENT: Issuing colocal request %d.\n",
+                  i));
+      CORBA::ULong retval =
+        server->collocated_call ();
+
+      number += retval;
+    }
+
+  if (number != 15)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "(%P|%t) ERROR: Did not forward to new location\n"));
+      ACE_OS::abort ();
+    }
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      Server_ORBInitializer *temp_initializer = 0;
+      ACE_NEW_RETURN (temp_initializer,
+                      Server_ORBInitializer (passes_before_forward),
+                      -1);  // No exceptions yet!
+      PortableInterceptor::ORBInitializer_var orb_initializer =
+        temp_initializer;
+
+      PortableInterceptor::register_orb_initializer (orb_initializer.in ());
+
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "Server ORB");
+
+      if (::parse_args (argc, argv) != 0)
+        return -1;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      test_i servant1 (1, direct_collocation, orb.in ());
+      test_i servant2 (2, direct_collocation, orb.in ());
+
+      PortableServer::ObjectId_var oid1 =
+        root_poa->activate_object (&servant1);
+
+      PortableServer::ObjectId_var oid2 =
+        root_poa->activate_object (&servant2);
+
+      CORBA::Object_var obj1 =
+        root_poa->servant_to_reference (&servant1);
+
+      CORBA::Object_var obj2 =
+        root_poa->servant_to_reference (&servant2);
+
+      poa_manager->activate ();
+
+      // Set the forward references in the server request interceptor.
+      PortableInterceptor::ServerRequestInterceptor_var
+        server_interceptor = temp_initializer->server_interceptor ();
+
+      Collocated_ForwardRequestTest::ServerRequestInterceptor_var interceptor =
+        Collocated_ForwardRequestTest::ServerRequestInterceptor::_narrow (
+          server_interceptor.in ());
+
+      if (CORBA::is_nil (interceptor.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%P|%t) Could not obtain reference to "
+                           "server request interceptor.\n"),
+                          -1);
+
+      if (direct_collocation)
+        {
+          servant1.forward (obj2.in (), passes_before_forward);
+        }
+      else
+        {
+          interceptor->forward (obj2.in ());
+        }
+
+      // Run co-local test
+      {
+        Collocated_ForwardRequestTest::test_var server =
+          Collocated_ForwardRequestTest::test::_narrow (obj1.in ());
+        test_colocal (server.in ());
+      }
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+
+      ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return -1;
+    }
+
+  return 0;
+}
+
+#else
+
+int
+ACE_TMAIN(int, ACE_TCHAR *[])
+{
+  return 0;
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tests/Collocated_Forwarding/test.idl b/TAO/tests/Collocated_Forwarding/test.idl
new file mode 100644
index 00000000000..b141b4afb32
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/test.idl
@@ -0,0 +1,20 @@
+// -*- IDL -*-
+//$Id$
+
+#include "tao/PortableInterceptor.pidl"
+#include "tao/PI_Server/PI_Server_include.pidl"
+
+module Collocated_ForwardRequestTest
+{
+  interface test
+  {
+    short collocated_call ();
+  };
+
+  local interface ServerRequestInterceptor
+    : PortableInterceptor::ServerRequestInterceptor
+  {
+    /// Set the references to which requests will be forwarded.
+    void forward (in Object to);
+  };
+};
diff --git a/TAO/tests/Collocated_Forwarding/test_i.cpp b/TAO/tests/Collocated_Forwarding/test_i.cpp
new file mode 100644
index 00000000000..a76b0fb8cff
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/test_i.cpp
@@ -0,0 +1,54 @@
+// -*- C++ -*-
+
+#include "test_i.h"
+#include "tao/PortableServer/ForwardRequestC.h"
+
+ACE_RCSID (Collocated_Forwarding,
+           test_i,
+           "$Id$")
+
+test_i::test_i (CORBA::Short id,
+                bool direct,
+                CORBA::ORB_ptr orb)
+  : id_ (id)
+  , direct_ (direct)
+  , orb_ (CORBA::ORB::_duplicate (orb))
+  , to_ (CORBA::Object::_nil ())
+  , request_pass_count_ (0)
+  , request_count_ (0)
+{
+}
+
+void
+test_i::forward (CORBA::Object_ptr to,
+                 CORBA::ULong request_pass_count)
+{
+  this->to_ = CORBA::Object::_duplicate (to);
+  this->request_pass_count_ = request_pass_count;
+}
+
+CORBA::Short
+test_i::collocated_call (void)
+{
+  this->request_count_++;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "Collocated call is executed in object with id %d.\n",
+              this->id_));
+
+  if (!CORBA::is_nil (this->to_.in ()))
+    {
+      if (this->request_count_ == this->request_pass_count_)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "SERVER: Request %d will be forwarded "
+                      "to object 'to'\nSERVER: via collocated_call().\n",
+                      this->request_count_));
+
+          // Throw forward exception
+          throw PortableServer::ForwardRequest (this->to_.in ());
+        }
+    }
+
+  return this->id_;
+}
diff --git a/TAO/tests/Collocated_Forwarding/test_i.h b/TAO/tests/Collocated_Forwarding/test_i.h
new file mode 100644
index 00000000000..e261a71ef2f
--- /dev/null
+++ b/TAO/tests/Collocated_Forwarding/test_i.h
@@ -0,0 +1,53 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef TEST_I_H
+#define TEST_I_H
+
+#include "testS.h"
+
+/**
+ * @class test_i
+ *
+ * @brief Simple test class.
+ *
+ * This class implements the "test" interface used in this test.
+ */
+class test_i : public virtual POA_Collocated_ForwardRequestTest::test
+{
+public:
+
+  /// Constructor.
+  test_i (CORBA::Short id,
+          bool direct,
+          CORBA::ORB_ptr orb);
+
+  /// A way to setup forwarding in case of direct collocation.
+  void forward (CORBA::Object_ptr to,
+                CORBA::ULong request_pass_count);
+
+  /// Return the number assigned to this object.
+  virtual CORBA::Short collocated_call (void);
+
+private:
+
+  /// Id of this instance.
+  CORBA::Short id_;
+
+  /// An indication to throwing forward request exception.
+  bool direct_;
+
+  /// Pseudo-reference to the ORB.
+  CORBA::ORB_var orb_;
+
+  /// A place where to forward.
+  CORBA::Object_var to_;
+
+  /// How much requests to pass thru before forwarding.
+  CORBA::ULong request_pass_count_;
+
+  /// The number of requests intercepted by this interceptor.
+  CORBA::ULong request_count_;
+};
+
+#endif  /* TEST_I_H */
diff --git a/TAO/tests/DIOP/run_test.pl b/TAO/tests/DIOP/run_test.pl
index bfd22c0f235..2efa6f781e5 100755
--- a/TAO/tests/DIOP/run_test.pl
+++ b/TAO/tests/DIOP/run_test.pl
@@ -30,7 +30,12 @@ else {
 
 $CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 10 -ORBdebuglevel $ORBdebuglevel");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: could not find file <$iorfile>\n";
diff --git a/TAO/tests/DSI_AMI_Gateway/client.cpp b/TAO/tests/DSI_AMI_Gateway/client.cpp
index 4aa2aebab3f..cfa44654d4c 100644
--- a/TAO/tests/DSI_AMI_Gateway/client.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/client.cpp
@@ -161,7 +161,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
   catch (const test_exception& ex)
     {
-      ex._tao_print_exception ("Client: exception caught - ");
+      if (test_user_exception == 1)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Client: caught expected user exception: %s\n",
+                    ex._name()));
+      else
+        ex._tao_print_exception ("Client: exception caught - ");
 
       ACE_DEBUG ((LM_DEBUG,
                   "error code: %d\n"
@@ -171,13 +176,18 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   ex.error_message.in (),
                   ex.status_message.in ()));
 
-      return 0;
+      return test_user_exception == 1 ? 0 : 1;
     }
   catch (const CORBA::NO_PERMISSION& ex)
     {
-      ex._tao_print_exception ("Client: exception caught - ");
+      if (test_system_exception == 1)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Client: caught expected system exception: %s\n",
+                    ex._name()));
+      else
+        ex._tao_print_exception ("Client: exception caught - ");
 
-      return 0;
+      return test_system_exception == 1 ? 0 : 1;
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl b/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl
index 464925e2e43..079821ca82a 100755
--- a/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl
+++ b/TAO/tests/DSI_AMI_Gateway/run_exception_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$svfile = PerlACE::LocalFile ("server.ior");
+$svbase = "server.ior";
+$svfile = PerlACE::LocalFile ("$svbase");
 $gwfile = PerlACE::LocalFile ("gateway.ior");
 
 unlink $svfile;
@@ -16,11 +17,21 @@ unlink $gwfile;
 
 $status = 0;
 
-$SV = new PerlACE::Process ("server", "-o $svfile");
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o $svbase");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-o $svfile");
+}
 $GW = new PerlACE::Process ("gateway", "-k file://$svfile -o $gwfile");
 $CL = new PerlACE::Process ("client", "-k file://$gwfile -u");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($svfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$svfile>\n";
diff --git a/TAO/tests/DSI_AMI_Gateway/run_test.pl b/TAO/tests/DSI_AMI_Gateway/run_test.pl
index 4af61a63e44..92c223bebb0 100755
--- a/TAO/tests/DSI_AMI_Gateway/run_test.pl
+++ b/TAO/tests/DSI_AMI_Gateway/run_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$svfile = PerlACE::LocalFile ("server.ior");
+$svbase = "server.ior";
+$svfile = PerlACE::LocalFile ("$svbase");
 $gwfile = PerlACE::LocalFile ("gateway.ior");
 
 unlink $svfile;
@@ -17,7 +18,7 @@ unlink $gwfile;
 $status = 0;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+    $SV = new PerlACE::ProcessVX ("server", "-o $svbase");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $svfile");
@@ -25,7 +26,12 @@ else {
 $GW = new PerlACE::Process ("gateway", "-k file://$svfile -o $gwfile");
 $CL = new PerlACE::Process ("client", "-k file://$gwfile -x -i 100");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($svfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$svfile>\n";
diff --git a/TAO/tests/DSI_Gateway/run_exception_test.pl b/TAO/tests/DSI_Gateway/run_exception_test.pl
index 436e69b1710..eb335020b81 100755
--- a/TAO/tests/DSI_Gateway/run_exception_test.pl
+++ b/TAO/tests/DSI_Gateway/run_exception_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$svfile = PerlACE::LocalFile ("server.ior");
+$svbase = "server.ior";
+$svfile = PerlACE::LocalFile ("$svbase");
 $gwfile = PerlACE::LocalFile ("gateway.ior");
 
 unlink $svfile;
@@ -16,11 +17,21 @@ unlink $gwfile;
 
 $status = 0;
 
-$SV = new PerlACE::Process ("server", "-o $svfile");
+if (PerlACE::is_vxworks_test()) {
+    $SV = new PerlACE::ProcessVX ("server", "-o $svbase");
+}
+else {
+    $SV = new PerlACE::Process ("server", "-o $svfile");
+}
 $GW = new PerlACE::Process ("gateway", "-k file://$svfile -o $gwfile");
 $CL = new PerlACE::Process ("client", "-k file://$gwfile -u");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($svfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$svfile>\n";
diff --git a/TAO/tests/DSI_Gateway/run_test.pl b/TAO/tests/DSI_Gateway/run_test.pl
index 7e9421a8825..49bd8b9c602 100755
--- a/TAO/tests/DSI_Gateway/run_test.pl
+++ b/TAO/tests/DSI_Gateway/run_test.pl
@@ -8,7 +8,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
-$svfile = PerlACE::LocalFile ("server.ior");
+$svbase = "server.ior";
+$svfile = PerlACE::LocalFile ("$svbase");
 $gwfile = PerlACE::LocalFile ("gateway.ior");
 
 unlink $svfile;
@@ -17,7 +18,7 @@ unlink $gwfile;
 $status = 0;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
+    $SV = new PerlACE::ProcessVX ("server", "-o $svbase");
 }
 else {
     $SV = new PerlACE::Process ("server", "-o $svfile");
@@ -25,7 +26,12 @@ else {
 $GW = new PerlACE::Process ("gateway", "-k file://$svfile -o $gwfile");
 $CL = new PerlACE::Process ("client", "-k file://$gwfile -x -i 100");
 
-$SV->Spawn ();
+$server = $SV->Spawn ();
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($svfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$svfile>\n";
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
index 0f3e9b2e022..8b28cefd074 100755
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl
@@ -10,17 +10,17 @@ use PerlACE::Run_Test;
 
 # amount of delay between running the servers
 
-$sleeptime = 2;
 $status = 0;
-$iorfile = PerlACE::LocalFile("test.ior");
+$iorbase = "test.ior";
+$iorfile = PerlACE::LocalFile("$iorbase");
 
 unlink $iorfile;
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("Scheduler_Interceptor_Server", "-f test.ior");
+    $SV = new PerlACE::ProcessVX ("Scheduler_Interceptor_Server", "-f $iorbase");
 }
 else {
-    $SV = new PerlACE::Process ("Scheduler_Interceptor_Server", "-f test.ior");
+    $SV = new PerlACE::Process ("Scheduler_Interceptor_Server", "-f $iorfile");
 }
 $CL = new PerlACE::Process ("Scheduler_Interceptor_Client", "-f $iorfile");
 
@@ -43,7 +43,7 @@ if ($sender != 0) {
     $status = 1;
 }
 
-$receiver = $SV->TerminateWaitKill (5);
+$receiver = $SV->TerminateWaitKill (15);
 
 if ($receiver != 0) {
     print STDERR "ERROR: receiver returned $receiver\n";
diff --git a/TAO/tests/TransportCurrent/Framework/run_test.pl b/TAO/tests/TransportCurrent/Framework/run_test.pl
index 5a1a57145cc..e7122b83a1b 100755
--- a/TAO/tests/TransportCurrent/Framework/run_test.pl
+++ b/TAO/tests/TransportCurrent/Framework/run_test.pl
@@ -11,17 +11,6 @@ use PerlACE::Run_Test;
 
 PerlACE::add_lib_path ('../lib');
 
-sub add_path {
-    my($name)  = shift;
-    my($value) = shift;
-    if (defined $ENV{$name}) {
-        $ENV{$name} .= $Config{'path_sep'} . $value
-        }
-    else {
-        $ENV{$name} = $value;
-    }
-}
-
 my $status = 0;
 my $confmod = "";
 
diff --git a/TAO/utils/nslist/run_test.pl b/TAO/utils/nslist/run_test.pl
index 701ed23daf0..03ec8687d87 100755
--- a/TAO/utils/nslist/run_test.pl
+++ b/TAO/utils/nslist/run_test.pl
@@ -21,6 +21,7 @@ my $NS = new PerlACE::Process ("../../orbsvcs/Naming_Service/Naming_Service");
 my $CL = new PerlACE::Process ("../../orbsvcs/tests/Simple_Naming/client");
 my $LS = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/nslist");
 my $AD = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/nsadd");
+my $DL = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/nsdel");
 my $status = 0;
 
 # We want the nslist and nsadd executables to be found exactly in the path
@@ -80,6 +81,16 @@ sub nsadd
     }
 }
 
+sub nsdel
+{
+    $DL->Arguments("-ORBInitRef NameService=file://$iorfile @_");
+    my $ret = $DL->SpawnWaitKill (60);
+    if ($ret != 0) {
+        print STDERR "ERROR: nsdel returned $ret\n";
+        $status = 1;
+    }
+}
+
 name_server ();
 
 print STDOUT "nslist of starting NS content\n";
@@ -99,6 +110,16 @@ nsadd ("--newcontext --name level1_context/new_lvl2_context/autoadded_lvl3/new_l
 print STDOUT "nsadd of a new object at level 4\n";
 nsadd ("--ior file://ns.ior --name level1_context/new_lvl2_context/autoadded_lvl3/new_lvl4_context/new_obj");
 
+print STDOUT "nslist after adding NS content\n";
+nslist ();
+
+print STDOUT "nsdel of the object at level 4\n";
+print STDOUT "Expected to warn about possibly orphaned naming context.\n";
+nsdel ("--name level1_context/new_lvl2_context/autoadded_lvl3/new_lvl4_context/new_obj");
+
+print STDOUT "nsdel of the naming context new_lvl4_context using --destroy\n";
+nsdel ("--name level1_context/new_lvl2_context/autoadded_lvl3/new_lvl4_context --destroy");
+
 print STDOUT "nslist of ending NS content\n";
 nslist ();
author	iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2008-04-02 19:55:50 +0000
committer	iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2008-04-02 19:55:50 +0000
commit	f22146ace4f8ceb206b272479a7a619a27b425ba (patch)
tree	106f19a3e49f71f16f7d5b41763a13cb224acebd
parent	0a5abebfc459b048b83007ee7b7121437e96c222 (diff)
download	ATCD-f22146ace4f8ceb206b272479a7a619a27b425ba.tar.gz