ChangeLogTag: Tue Dec 2 14:34:51 2003 Dale Wilson <wilson_d@ociweb.com>

11 files changed, 127 insertions, 100 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bc09fc82808..7a2cb5cb0dd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Tue Dec  2 14:34:51 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp:
+          Disable duplicate registration of HEARTBEAT_ENABLED policy factory.
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+          create_member uses the supplied criteria.
+
+        * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp:
+          Build warnings.
+
+        * orbsvcs/tests/FT_App/run_test_basic.pl:
+        * orbsvcs/tests/FT_App/run_test_demo.pl:
+        * orbsvcs/tests/FT_App/run_test_detector.pl:
+        * orbsvcs/tests/FT_App/run_test_fault_consumer.pl:
+        * orbsvcs/tests/FT_App/run_test_notifier.pl:
+        * orbsvcs/tests/FT_App/run_test_rmnotifier.pl:
+        * orbsvcs/tests/FT_App/run_test_rmregistry.pl:
+          Identify error messages as coming from the test script.
+
 Tue Dec  2 09:59:17 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 0cedc9c6d86..e7725a2b4e1 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -43,10 +43,13 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+#if 0 // @@ client registers this.  Is the client's policy factory ok in a server?
   // Register the FTCORBA policy factories.
 
   PortableInterceptor::PolicyFactory_ptr temp_factory =
     PortableInterceptor::PolicyFactory::_nil ();
+
+
   PortableInterceptor::PolicyFactory_var policy_factory;
 
   // This policy factory is used for all FTCORBA related policies.
@@ -62,6 +65,7 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
 
   policy_factory = temp_factory;
 
+
   // Bind the same policy factory to all FTCORBA related policy
   // types since a single policy factory is used to create each of
   // the different types of FTCORBA policies.
@@ -74,6 +78,7 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
   ACE_CHECK;
   // Transfer ownership of the policy factory to the registry.
   (void) policy_factory._retn ();
+#endif
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 5234a0fe6fb..7a8d2584098 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -584,10 +584,12 @@ void TAO::PG_Object_Group::create_member (
       const PortableGroup::FactoryInfo & factory_info = (*factories)[factory_pos];
       if (factory_info.the_location == the_location)
       {
+        // @@ should we merge the_criteria with factory_info.the_criteria?
+
         PortableGroup::GenericFactory::FactoryCreationId_var fcid;
         CORBA::Object_var member = factory_info.the_factory->create_object (
           type_id,
-          factory_info.the_criteria,
+          the_criteria,
           fcid. out()
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 160f83c6580..5e81d2379dc 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -21,12 +21,12 @@
 
 #include <ace/Get_Opt.h>
 
-
 TAO::Object_Group_Creator::Object_Group_Creator ()
-  : registry_ (0)
-  , replication_manager_ (0)
-  , have_replication_manager_ (0)
+  : orb_(CORBA::ORB::_nil ())
+  , registry_ (PortableGroup::FactoryRegistry::_nil ())
+  , replication_manager_ (FT::ReplicationManager::_nil ())
   , detector_infos_ (0)
+  , have_replication_manager_ (0)
 {
 }
 
@@ -46,7 +46,7 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
   int result = 0;
   this->orb_ = CORBA::ORB::_duplicate (orb);
 
-  if (CORBA::is_nil (this->registry_))
+  if (CORBA::is_nil (this->registry_.in ()))
   {
     ///////////////////////////////
     // Find the ReplicationManager
@@ -57,14 +57,14 @@ int TAO::Object_Group_Creator::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
       this->replication_manager_ = ::FT::ReplicationManager::_narrow (rm_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      if (!CORBA::is_nil (this->replication_manager_))
+      if (!CORBA::is_nil (this->replication_manager_.in ()))
       {
         this->have_replication_manager_ = 1;
         // empty criteria
         ::PortableGroup::Criteria criteria;
         this->registry_ = this->replication_manager_->get_factory_registry (criteria  ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        if (!CORBA::is_nil (this->registry_))
+        if (!CORBA::is_nil (this->registry_.in ()))
         {
           this->detector_infos_ = this->registry_->list_factories_by_role (FT::FAULT_DETECTOR_ROLE_NAME, this->detector_type_id_.out ()
               ACE_ENV_ARG_PARAMETER)
@@ -258,7 +258,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
         factory_creation_id.out ()
         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
-      if ( !CORBA::is_nil (created_obj) )
+      if ( !CORBA::is_nil (created_obj.in ()) )
       {
 // that which was first shall now be last        if (nFact == 0)
         {
@@ -267,7 +267,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
 
         // try to create a detector, but don't worry if it doesn't happen
         (void) create_detector_for_replica (
-          created_obj,
+          created_obj.in (),
           role,
           type_id.in (),
           group_id,
@@ -275,7 +275,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-        const char * replica_ior = orb_->object_to_string (created_obj ACE_ENV_ARG_PARAMETER );
+        const char * replica_ior = orb_->object_to_string (created_obj.in () ACE_ENV_ARG_PARAMETER );
         ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
 
@@ -329,7 +329,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
         {
           group = this->replication_manager_->add_member (group,
                             info.the_location,
-                            created_obj
+                            created_obj.in ()
                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Object::_nil ());
         }
@@ -352,7 +352,7 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
       role
       ));
 
-    const char * group_iogr = orb_->object_to_string (group ACE_ENV_ARG_PARAMETER );
+    const char * group_iogr = orb_->object_to_string (group.in () ACE_ENV_ARG_PARAMETER );
     ACE_CHECK_RETURN (CORBA::Object::_nil ());
   }
 
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_basic.pl b/TAO/orbsvcs/tests/FT_App/run_test_basic.pl
index c94f2305411..baa3fd93649 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_basic.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_basic.pl
@@ -35,7 +35,7 @@ $SV1->Spawn ();
 print "waiting for replica 1's IOR\n" if ($debug);
 
 if (PerlACE::waitforfile_timed ($replica1_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find replica 1 file <$replica1_ior>\n";
+    print STDERR "TEST ERROR: cannot find replica 1 file <$replica1_ior>\n";
     $SV1->Kill (); $SV1->TimedWait (1);
     exit 1;
 }
@@ -45,7 +45,7 @@ $SV2->Spawn ();
 
 print "waiting for replica 2's IOR\n" if ($debug);
 if (PerlACE::waitforfile_timed ($replica2_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find replica 2 file <$replica2_ior>\n";
+    print STDERR "TEST ERROR: cannot find replica 2 file <$replica2_ior>\n";
     $SV1->Kill (); $SV1->TimedWait (1);
     $SV2->Kill (); $SV2->TimedWait (1);
     exit 1;
@@ -56,7 +56,7 @@ print "\nTest: Starting client " . $CL->CommandLine . "\n" if ($debug);
 $client = $CL->SpawnWaitKill (60);
 
 if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
+    print STDERR "TEST ERROR: client returned $client\n";
     $status = 1;
 }
 
@@ -67,7 +67,7 @@ print "wait for server 2.\n" if ($debug);
 $server = $SV2->WaitKill (60);
 
 if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
+    print STDERR "TEST ERROR: server returned $server\n";
     $status = 1;
 }
 
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_demo.pl b/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
index ddff9b8259e..63993520963 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_demo.pl
@@ -210,7 +210,7 @@ $RM->Spawn ();
 
 print "TEST: waiting for registry's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($rm_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$rm_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$rm_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     exit 1;
 }
@@ -222,7 +222,7 @@ $NOT->Spawn ();
 
 print "TEST: waiting for FaultNotifier's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($notifier_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$notifier_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$notifier_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait (1);
     exit 1;
@@ -236,7 +236,7 @@ $DET1->Spawn ();
 
 print "TEST: waiting for FaultDetector's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($detector1_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$detector1_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$detector1_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait (1);
     $DET1->Kill (); $DET1->TimedWait (1);
@@ -250,7 +250,7 @@ $DET2->Spawn ();
 
 print "TEST: waiting for FaultDetector's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($detector2_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$detector2_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$detector2_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait (1);
     $DET1->Kill (); $DET1->TimedWait (1);
@@ -267,7 +267,7 @@ $FAC1->Spawn ();
 
 print "TEST: waiting for factory 1's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($factory1_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$factory1_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$factory1_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait (1);
     $DET1->Kill (); $DET1->TimedWait (1);
@@ -281,7 +281,7 @@ $FAC2->Spawn ();
 
 print "TEST: waiting for factory 2's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($factory2_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$factory2_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$factory2_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait (1);
     $DET1->Kill (); $DET1->TimedWait (1);
@@ -296,7 +296,7 @@ $FAC3->Spawn ();
 
 print "TEST: waiting for factory 3's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($factory3_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$factory3_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$factory3_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait (1);
     $DET1->Kill (); $DET1->TimedWait (1);
@@ -316,7 +316,7 @@ $OGC->Spawn ();
 print "\nTEST: wait for object group creator.\n" if ($verbose);
 $config = $OGC->WaitKill (30);
 if ($config != 0) {
-    print STDERR "ERROR: Object Group Creator returned $config\n";
+    print STDERR "TEST ERROR: Object Group Creator returned $config\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait (1);
     $DET1->Kill (); $DET1->TimedWait (1);
@@ -334,7 +334,7 @@ print "\nTEST: Starting client using first group of hobbits " . $CL1->CommandLin
 $client = $CL1->SpawnWaitKill (60);
 
 if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
+    print STDERR "TEST ERROR: client returned $client\n";
     $status = 1;
 }
 
@@ -342,7 +342,7 @@ print "\nTEST: Starting client using group of elves " . $CL2->CommandLine . "\n"
 $client2 = $CL2->SpawnWaitKill (60);
 
 if ($client2 != 0) {
-    print STDERR "ERROR: client returned $client2\n";
+    print STDERR "TEST ERROR: client returned $client2\n";
     $status = 1;
 }
 
@@ -350,7 +350,7 @@ print "\nTEST: Starting client using second group of hobbits " . $CL3->CommandLi
 $client3 = $CL3->SpawnWaitKill (60);
 
 if ($client3 != 0) {
-    print STDERR "ERROR: client returned $client3\n";
+    print STDERR "TEST ERROR: client returned $client3\n";
     $status = 1;
 }
 
@@ -360,42 +360,42 @@ if ($client3 != 0) {
 print "\nTEST: wait for factory 1.\n" if ($verbose);
 $factory1 = $FAC1->WaitKill (30);
 if ($factory1 != 0) {
-    print STDERR "ERROR: replica returned $factory 1\n";
+    print STDERR "TEST ERROR: replica returned $factory 1\n";
     $status = 1;
 }
 
 print "\nTEST: wait for factory 2.\n" if ($verbose);
 $factory2 = $FAC2->WaitKill (30);
 if ($factory2 != 0) {
-    print STDERR "ERROR: factory 2 returned $factory2\n";
+    print STDERR "TEST ERROR: factory 2 returned $factory2\n";
     $status = 1;
 }
 
 print "\nTEST: wait for factory 3.\n" if ($verbose);
 $factory3 = $FAC3->WaitKill (30);
 if ($factory3 != 0) {
-    print STDERR "ERROR: factory 3 returned $factory3\n";
+    print STDERR "TEST ERROR: factory 3 returned $factory3\n";
     $status = 1;
 }
 
 print "\nTEST: wait for FaultDetectorFactory 1.\n" if ($verbose);
 $detector1 = $DET1->WaitKill (30);
 if ($detector1 != 0) {
-    print STDERR "ERROR: FaultDetectorFactory returned $detector1\n";
+    print STDERR "TEST ERROR: FaultDetectorFactory returned $detector1\n";
     $status = 1;
 }
 
 print "\nTEST: wait for FaultDetectorFactory 2.\n" if ($verbose);
 $detector2 = $DET2->WaitKill (30);
 if ($detector2 != 0) {
-    print STDERR "ERROR: FaultDetectorFactory returned $detector2\n";
+    print STDERR "TEST ERROR: FaultDetectorFactory returned $detector2\n";
     $status = 1;
 }
 
 print "\nTEST: shutting down the replication manager.\n" if ($verbose);
 $controller = $RMC->SpawnWaitKill (300);
 if ($controller != 0) {
-    print STDERR "ERROR: replication manager controller returned $controller\n";
+    print STDERR "TEST ERROR: replication manager controller returned $controller\n";
     $status = 1;
 }
 
@@ -403,14 +403,14 @@ print "\nTEST: wait for ReplicationManager.\n" if ($verbose);
 #$RM->Kill ();
 $repmgr = $RM->WaitKill (30);
 if ($repmgr != 0) {
-    print STDERR "ERROR: ReplicationManager returned $repmgr\n";
+    print STDERR "TEST ERROR: ReplicationManager returned $repmgr\n";
     $status = 1;
 }
 
 print "\nTEST: wait for FaultNotifier.\n" if ($verbose);
 $notifier = $NOT->WaitKill (30);
 if ($notifier != 0) {
-    print STDERR "ERROR: FaultNotifier returned $notifier\n";
+    print STDERR "TEST ERROR: FaultNotifier returned $notifier\n";
     $status = 1;
 }
 
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_detector.pl b/TAO/orbsvcs/tests/FT_App/run_test_detector.pl
index 855d31c7299..404730c74ad 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_detector.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_detector.pl
@@ -140,7 +140,7 @@ $REP1->Spawn ();
 
 print "TEST: waiting for replica 1's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica1_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$replica1_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica1_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     exit 1;
 }
@@ -150,7 +150,7 @@ $REP2->Spawn ();
 
 print "TEST: waiting for replica 2's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica2_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$replica2_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica2_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     exit 1;
@@ -161,7 +161,7 @@ $DET->Spawn ();
 
 print "TEST: waiting for detector's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($detector_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$detector_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$detector_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     $DET->Kill (); $DET2->TimedWait(1);
@@ -173,7 +173,7 @@ $NOT->Spawn ();
 
 print "TEST: waiting for notifier's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($notifier_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$notifier_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$notifier_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     $DET->Kill (); $DET2->TimedWait(1);
@@ -185,35 +185,35 @@ print "\nTEST: starting client." . $CL->CommandLine . "\n" if ($verbose);
 $client = $CL->SpawnWaitKill (60);
 
 if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
+    print STDERR "TEST ERROR: client returned $client\n";
     $status = 1;
 }
 
 print "\nTEST: wait for replica 1.\n" if ($verbose);
 $replica1 = $REP1->WaitKill (60);
 if ($replica1 != 0) {
-    print STDERR "ERROR: replica returned $replica1\n";
+    print STDERR "TEST ERROR: replica returned $replica1\n";
     $status = 1;
 }
 
 print "\nTEST: wait for replica 2.\n" if ($verbose);
 $replica2 = $REP2->WaitKill (60);
 if ($replica2 != 0) {
-    print STDERR "ERROR: replica returned $replica2\n";
+    print STDERR "TEST ERROR: replica returned $replica2\n";
     $status = 1;
 }
 
 print "\nTEST: wait for detector factory to leave.\n" if ($verbose);
 $detector = $DET->WaitKill (60);
 if ($detector != 0) {
-    print STDERR "ERROR: detector returned $detector\n";
+    print STDERR "TEST ERROR: detector returned $detector\n";
     $status = 1;
 }
 
 print "\nTEST: wait for notifier to leave.\n" if ($verbose);
 $notifier = $NOT->WaitKill (60);
 if ($notifier != 0) {
-    print STDERR "ERROR: notifier returned $notifier\n";
+    print STDERR "TEST ERROR: notifier returned $notifier\n";
     $status = 1;
 }
 
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_fault_consumer.pl b/TAO/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
index dff2a49d23f..60fc401cd72 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_fault_consumer.pl
@@ -159,7 +159,7 @@ $REP1->Spawn ();
 
 print "TEST: waiting for replica 1's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica1_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$replica1_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica1_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     exit 1;
 }
@@ -169,7 +169,7 @@ $REP2->Spawn ();
 
 print "TEST: waiting for replica 2's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica2_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$replica2_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica2_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     exit 1;
@@ -180,7 +180,7 @@ $DET->Spawn ();
 
 print "TEST: waiting for detector's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($detector_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$detector_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$detector_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     $DET->Kill (); $DET->TimedWait(1);
@@ -192,7 +192,7 @@ $NOT->Spawn ();
 
 print "TEST: waiting for notifier's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($notifier_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$notifier_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$notifier_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     $DET->Kill (); $DET->TimedWait(1);
@@ -205,7 +205,7 @@ $CONS->Spawn ();
 
 print "TEST: waiting for READY.FILE from fault consumer\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($ready_file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ready_file>\n";
+    print STDERR "TEST ERROR: cannot find file <$ready_file>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     $DET->Kill (); $DET->TimedWait(1);
@@ -218,42 +218,42 @@ print "\nTEST: starting client " . $CL->CommandLine . "\n" if ($verbose);
 $client = $CL->SpawnWaitKill (60);
 
 if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
+    print STDERR "TEST ERROR: client returned $client\n";
     $status = 1;
 }
 
 print "\nTEST: wait for replica 1.\n" if ($verbose);
 $replica1 = $REP1->WaitKill (5);
 if ($replica1 != 0) {
-    print STDERR "ERROR: replica returned $replica1\n";
+    print STDERR "TEST ERROR: replica returned $replica1\n";
     $status = 1;
 }
 
 print "\nTEST: wait for replica 2.\n" if ($verbose);
 $replica2 = $REP2->WaitKill (5);
 if ($replica2 != 0) {
-    print STDERR "ERROR: replica returned $replica2\n";
+    print STDERR "TEST ERROR: replica returned $replica2\n";
     $status = 1;
 }
 
 print "\nTEST: wait for detector factory to leave.\n" if ($verbose);
 $detector = $DET->WaitKill (20);
 if ($detector != 0) {
-    print STDERR "ERROR: detector returned $detector\n";
+    print STDERR "TEST ERROR: detector returned $detector\n";
     $status = 1;
 }
 
 print "\nTEST: wait for notifier to leave.\n" if ($verbose);
 $notifier = $NOT->WaitKill (20);
 if ($notifier != 0) {
-    print STDERR "ERROR: notifier returned $notifier\n";
+    print STDERR "TEST ERROR: notifier returned $notifier\n";
     $status = 1;
 }
 
 print "\nTEST: wait for fault consumer to leave.\n" if ($verbose);
 $consumer = $CONS->WaitKill (20);
 if ($consumer != 0) {
-    print STDERR "ERROR: fault consumer returned $consumer\n";
+    print STDERR "TEST ERROR: fault consumer returned $consumer\n";
     $status = 1;
 }
 
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_notifier.pl b/TAO/orbsvcs/tests/FT_App/run_test_notifier.pl
index 3d853e86187..e3f1b14d1dd 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_notifier.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_notifier.pl
@@ -152,7 +152,7 @@ $REP1->Spawn ();
 
 print "TEST: waiting for replica 1's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica1_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$replica1_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica1_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     exit 1;
 }
@@ -162,7 +162,7 @@ $REP2->Spawn ();
 
 print "TEST: waiting for replica 2's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica2_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$replica2_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica2_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     exit 1;
@@ -173,7 +173,7 @@ $DET->Spawn ();
 
 print "TEST: waiting for detector's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($detector_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$detector_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$detector_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     $DET->Kill (); $DET2->TimedWait(1);
@@ -185,7 +185,7 @@ $NOT->Spawn ();
 
 print "TEST: waiting for notifier's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($notifier_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$notifier_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$notifier_ior>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     $DET->Kill (); $DET2->TimedWait(1);
@@ -198,7 +198,7 @@ $ANA->Spawn ();
 
 print "TEST: waiting for READY.FILE from analyzer\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($ready_file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ready_file>\n";
+    print STDERR "TEST ERROR: cannot find file <$ready_file>\n";
     $REP1->Kill (); $REP1->TimedWait (1);
     $REP2->Kill (); $REP2->TimedWait (1);
     $DET->Kill (); $DET2->TimedWait(1);
@@ -211,42 +211,42 @@ print "\nTEST: starting client " . $CL->CommandLine . "\n" if ($verbose);
 $client = $CL->SpawnWaitKill (60);
 
 if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
+    print STDERR "TEST ERROR: client returned $client\n";
     $status = 1;
 }
 
 print "\nTEST: wait for replica 1.\n" if ($verbose);
 $replica1 = $REP1->WaitKill (5);
 if ($replica1 != 0) {
-    print STDERR "ERROR: replica returned $replica1\n";
+    print STDERR "TEST ERROR: replica returned $replica1\n";
     $status = 1;
 }
 
 print "\nTEST: wait for replica 2.\n" if ($verbose);
 $replica2 = $REP2->WaitKill (5);
 if ($replica2 != 0) {
-    print STDERR "ERROR: replica returned $replica2\n";
+    print STDERR "TEST ERROR: replica returned $replica2\n";
     $status = 1;
 }
 
 print "\nTEST: wait for detector factory to leave.\n" if ($verbose);
 $detector = $DET->WaitKill (20);
 if ($detector != 0) {
-    print STDERR "ERROR: detector returned $detector\n";
+    print STDERR "TEST ERROR: detector returned $detector\n";
     $status = 1;
 }
 
 print "\nTEST: wait for notifier to leave.\n" if ($verbose);
 $notifier = $NOT->WaitKill (20);
 if ($notifier != 0) {
-    print STDERR "ERROR: notifier returned $notifier\n";
+    print STDERR "TEST ERROR: notifier returned $notifier\n";
     $status = 1;
 }
 
 print "\nTEST: wait for analyzer to leave.\n" if ($verbose);
 $analyzer = $ANA->WaitKill (20);
 if ($analyzer != 0) {
-    print STDERR "ERROR: analyzer returned $analyzer\n";
+    print STDERR "TEST ERROR: analyzer returned $analyzer\n";
     $status = 1;
 }
 
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_rmnotifier.pl b/TAO/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
index b6b32ce30d3..cc05541e7e6 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_rmnotifier.pl
@@ -162,7 +162,7 @@ $RM->Spawn ();
 
 print "TEST: waiting for registry's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($rm_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$rm_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$rm_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     exit 1;
 }
@@ -174,7 +174,7 @@ $NOT->Spawn ();
 
 print "TEST: waiting for notifier's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($notifier_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$notifier_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$notifier_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait(1);
     exit 1;
@@ -187,7 +187,7 @@ $DET->Spawn ();
 
 print "TEST: waiting for detector's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($detector_ior, 20) == -1) {
-    print STDERR "ERROR: cannot find file <$detector_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$detector_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait(1);
     $DET->Kill (); $DET2->TimedWait(1);
@@ -201,7 +201,7 @@ $REP1->Spawn ();
 
 print "TEST: waiting for replica 1's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica1_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$replica1_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica1_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait(1);
     $DET->Kill (); $DET->TimedWait(1);
@@ -216,7 +216,7 @@ $REP2->Spawn ();
 
 print "TEST: waiting for replica 2's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica2_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$replica2_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica2_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait(1);
     $DET->Kill (); $DET->TimedWait(1);
@@ -232,7 +232,7 @@ $ANA->Spawn ();
 
 print "TEST: waiting for READY.FILE from analyzer\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($ready_file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ready_file>\n";
+    print STDERR "TEST ERROR: cannot find file <$ready_file>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $NOT->Kill (); $NOT->TimedWait(1);
     $DET->Kill (); $DET->TimedWait(1);
@@ -250,42 +250,42 @@ print "\nTEST: starting client " . $CL->CommandLine . "\n" if ($verbose);
 $client = $CL->SpawnWaitKill (60);
 
 if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
+    print STDERR "TEST ERROR: client returned $client\n";
     $status = 1;
 }
 
 print "\nTEST: wait for replica 1.\n" if ($verbose);
 $replica1 = $REP1->WaitKill (5);
 if ($replica1 != 0) {
-    print STDERR "ERROR: replica returned $replica1\n";
+    print STDERR "TEST ERROR: replica returned $replica1\n";
     $status = 1;
 }
 
 print "\nTEST: wait for replica 2.\n" if ($verbose);
 $replica2 = $REP2->WaitKill (5);
 if ($replica2 != 0) {
-    print STDERR "ERROR: replica returned $replica2\n";
+    print STDERR "TEST ERROR: replica returned $replica2\n";
     $status = 1;
 }
 
 print "\nTEST: wait for detector factory to leave.\n" if ($verbose);
 $detector = $DET->WaitKill (20);
 if ($detector != 0) {
-    print STDERR "ERROR: detector returned $detector\n";
+    print STDERR "TEST ERROR: detector returned $detector\n";
     $status = 1;
 }
 
 print "\nTEST: wait for analyzer to leave.\n" if ($verbose);
 $analyzer = $ANA->WaitKill (20);
 if ($analyzer != 0) {
-    print STDERR "ERROR: analyzer returned $analyzer\n";
+    print STDERR "TEST ERROR: analyzer returned $analyzer\n";
     $status = 1;
 }
 
 print "\nTEST: shutting down the replication manager.\n" if ($verbose);
 $controller = $RMC->SpawnWaitKill (300);
 if ($controller != 0) {
-    print STDERR "ERROR: replication manager controller returned $controller\n";
+    print STDERR "TEST ERROR: replication manager controller returned $controller\n";
     $status = 1;
 }
 
@@ -293,14 +293,14 @@ print "\nTEST: wait for ReplicationManager.\n" if ($verbose);
 #$RM->Kill ();
 $repmgr = $RM->WaitKill (30);
 if ($repmgr != 0) {
-    print STDERR "ERROR: ReplicationManager returned $repmgr\n";
+    print STDERR "TEST ERROR: ReplicationManager returned $repmgr\n";
     $status = 1;
 }
 
 print "\nTEST: wait for notifier to leave.\n" if ($verbose);
 $notifier = $NOT->WaitKill (20);
 if ($notifier != 0) {
-    print STDERR "ERROR: notifier returned $notifier\n";
+    print STDERR "TEST ERROR: notifier returned $notifier\n";
     $status = 1;
 }
 
diff --git a/TAO/orbsvcs/tests/FT_App/run_test_rmregistry.pl b/TAO/orbsvcs/tests/FT_App/run_test_rmregistry.pl
index 9cb98e106b4..5facd17d085 100755
--- a/TAO/orbsvcs/tests/FT_App/run_test_rmregistry.pl
+++ b/TAO/orbsvcs/tests/FT_App/run_test_rmregistry.pl
@@ -201,7 +201,7 @@ $RM->Spawn ();
 
 print "TEST: waiting for registry's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($rm_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$rm_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$rm_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     exit 1;
 }
@@ -215,7 +215,7 @@ $FAC1->Spawn ();
 
 print "TEST: waiting for factory 1's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($factory1_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$factory1_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$factory1_ior>\n";
     $RM->Kill (); $RM->TimedWait (1);
     $FAC1->Kill (); $FAC1->TimedWait (1);
     exit 1;
@@ -226,7 +226,7 @@ $FAC2->Spawn ();
 
 print "TEST: waiting for factory 2's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($factory2_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$factory2_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$factory2_ior>\n";
     $FAC1->Kill (); $FAC1->TimedWait (1);
     $RM->Kill (); $RM->TimedWait (1);
     $FAC2->Kill (); $FAC2->TimedWait (1);
@@ -238,7 +238,7 @@ $FAC3->Spawn ();
 
 print "TEST: waiting for factory 3's IOR\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($factory3_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$factory3_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$factory3_ior>\n";
     $FAC1->Kill (); $FAC1->TimedWait (1);
     $FAC2->Kill (); $FAC2->TimedWait (1);
     $RM->Kill (); $RM->TimedWait (1);
@@ -254,27 +254,27 @@ $CTR->Spawn ();
 
 print "TEST: waiting for Replica IOR files from object group creator\n" if ($verbose);
 if (PerlACE::waitforfile_timed ($replica1_ior, 5) == -1){
-    print STDERR "ERROR: cannot find file <$replica1_ior>\n";
+    print STDERR "TEST ERROR: cannot find file <$replica1_ior>\n";
     $status = 1;
 }
 elsif (PerlACE::waitforfile_timed ($replica2_ior, 5) == -1){
-    print STDERR "ERROR: cannot find file <$replica2_ior> \n";
+    print STDERR "TEST ERROR: cannot find file <$replica2_ior> \n";
     $status = 1;
 }
 elsif (PerlACE::waitforfile_timed ($replica3_ior, 5) == -1){
-    print STDERR "ERROR: cannot find file <$replica3_ior> \n";
+    print STDERR "TEST ERROR: cannot find file <$replica3_ior> \n";
     $status = 1;
 }
 elsif (PerlACE::waitforfile_timed ($replica4_ior, 5) == -1){
-    print STDERR "ERROR: cannot find file <$replica4_ior> \n";
+    print STDERR "TEST ERROR: cannot find file <$replica4_ior> \n";
     $status = 1;
 }
 elsif (PerlACE::waitforfile_timed ($replica5_ior, 5) == -1){
-    print STDERR "ERROR: cannot find file <$replica5_ior> \n";
+    print STDERR "TEST ERROR: cannot find file <$replica5_ior> \n";
     $status = 1;
 }
 elsif (PerlACE::waitforfile_timed ($replica6_ior, 5) == -1){
-    print STDERR "ERROR: cannot find file <$replica6_ior> \n";
+    print STDERR "TEST ERROR: cannot find file <$replica6_ior> \n";
     $status = 1;
 }
 
@@ -290,7 +290,7 @@ if($status != 0){
 print "\nTEST: wait for object group creator.\n" if ($verbose);
 $config = $CTR->WaitKill (5);
 if ($config != 0) {
-    print STDERR "ERROR: configuration manager returned $config\n";
+    print STDERR "TEST ERROR: configuration manager returned $config\n";
     $FAC3->Kill (); $FAC3->TimedWait (1);
     $FAC2->Kill (); $FAC2->TimedWait (1);
     $FAC1->Kill (); $FAC1->TimedWait (1);
@@ -306,7 +306,7 @@ print "\nTEST: starting client " . $CL1->CommandLine . "\n" if ($verbose);
 $client = $CL1->SpawnWaitKill (60);
 
 if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
+    print STDERR "TEST ERROR: client returned $client\n";
     $status = 1;
 }
 
@@ -314,7 +314,7 @@ print "\nTEST: starting client again " . $CL2->CommandLine . "\n" if ($verbose);
 $client2 = $CL2->SpawnWaitKill (60);
 
 if ($client2 != 0) {
-    print STDERR "ERROR: client returned $client2\n";
+    print STDERR "TEST ERROR: client returned $client2\n";
     $status = 1;
 }
 
@@ -322,7 +322,7 @@ print "\nTEST: starting client, one more time with feeling " . $CL3->CommandLine
 $client3 = $CL3->SpawnWaitKill (60);
 
 if ($client3 != 0) {
-    print STDERR "ERROR: client returned $client3\n";
+    print STDERR "TEST ERROR: client returned $client3\n";
     $status = 1;
 }
 
@@ -332,28 +332,28 @@ if ($client3 != 0) {
 print "\nTEST: wait for factory 1.\n" if ($verbose);
 $factory1 = $FAC1->WaitKill (30);
 if ($factory1 != 0) {
-    print STDERR "ERROR: replica returned $factory 1\n";
+    print STDERR "TEST ERROR: replica returned $factory 1\n";
     $status = 1;
 }
 
 print "\nTEST: wait for factory 2.\n" if ($verbose);
 $factory2 = $FAC2->WaitKill (30);
 if ($factory2 != 0) {
-    print STDERR "ERROR: factory 2 returned $factory2\n";
+    print STDERR "TEST ERROR: factory 2 returned $factory2\n";
     $status = 1;
 }
 
 print "\nTEST: wait for factory 3.\n" if ($verbose);
 $factory3 = $FAC3->WaitKill (30);
 if ($factory3 != 0) {
-    print STDERR "ERROR: factory 3 returned $factory3\n";
+    print STDERR "TEST ERROR: factory 3 returned $factory3\n";
     $status = 1;
 }
 
 print "\nTEST: shutting down the replication manager.\n" if ($verbose);
 $controller = $RMC->SpawnWaitKill (300);
 if ($controller != 0) {
-    print STDERR "ERROR: replication manager controller returned $controller\n";
+    print STDERR "TEST ERROR: replication manager controller returned $controller\n";
     $status = 1;
 }
 
@@ -361,7 +361,7 @@ print "\nTEST: wait for ReplicationManager.\n" if ($verbose);
 #$RM->Kill ();
 $repmgr = $RM->WaitKill (30);
 if ($repmgr != 0) {
-    print STDERR "ERROR: ReplicationManager returned $repmgr\n";
+    print STDERR "TEST ERROR: ReplicationManager returned $repmgr\n";
     $status = 1;
 }