Sun Feb 24 19:44:37 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 77 insertions, 93 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index cf3ccfe5977..b75880ed28a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,33 @@
+Sun Feb 24 19:44:37 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp:
+        * orbsvcs/IFR_Service/IFR_Service.cpp:
+          No need to pass in empty orb name
+
+        * orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp:
+          Small code simplification
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h:
+          Doxygen change
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp:
+          Layout change
+
+        * orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp:
+          Use true instead of 1
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+          Use LM_DEBUG with ACE_DEBUG
+
+        * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl:
+          Just check whether the spawn worked or not instead of trying to
+          check for the existince of the executable. The tests did fail on
+          OpenVMS and VxWorks
+
 Fri Feb 22 18:27:39 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * tests/Bug_2935_Regression/middle.cpp:
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index 23f3d0f39db..d0a9ae82f5d 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -30,9 +30,7 @@ IFR_Service::init (int argc,
   int result;
   try
     {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    0);
+      this->orb_ = CORBA::ORB_init (argc, argv);
 
       result = this->my_ifr_server_.init_with_orb (argc,
                                                    argv,
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
index a4e95b568e4..87cc3001423 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Server.cpp
@@ -51,9 +51,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   try
     {
-      int rc;
-
-      rc = service.init (argc, argv);
+      int rc = service.init (argc, argv);
       if (rc == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Failed to initialize the Telecom Log Service.\n"),
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index 66964651c06..5750f4c7dbd 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -29,9 +29,7 @@ Event_Logging_Service::~Event_Logging_Service (void)
 void
 Event_Logging_Service::init_ORB (int& argc, char *argv [])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                "");
+  this->orb_ = CORBA::ORB_init (argc, argv);
 
   CORBA::Object_var poa_object =
     this->orb_->resolve_initial_references("RootPOA");
@@ -162,8 +160,7 @@ Event_Logging_Service::init (int argc, char *argv[])
       name.length (1);
       name[0].id = CORBA::string_dup (this->service_name_);
 
-      this->naming_->rebind (name,
-                             obj.in ());
+      this->naming_->rebind (name, obj.in ());
     }
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 24f70ef42d3..daf1519ff84 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -53,7 +53,7 @@ class TAO_Event_Serv_Export TAO_CEC_ConsumerAdmin
 public:
   /**
    * constructor. If <supplier_set> is nil then it builds one using
-   * the <event_channel> argument.
+   * the @a event_channel argument.
    * In any case it assumes ownership.
    */
   TAO_CEC_ConsumerAdmin (TAO_CEC_EventChannel* event_channel);
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index de916724b81..c8400b43e42 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -122,8 +122,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
     }
   catch (CORBA::SystemException& sysex)
     {
-      control->system_exception (this,
-                                 sysex);
+      control->system_exception (this, sysex);
     }
   catch (const CORBA::Exception&)
     {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
index 5dd94dbdbb0..93f65b6b6c8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -45,7 +45,7 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id)
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0)
     {
-      return 1;
+      return true;
     }
 
   return this->TAO_InterfaceDef_i::is_a_i (interface_id);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index f88b302514b..3d7e4bf886c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -458,7 +458,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
   if (!ssl_endpoint->credentials_set ())
     {
       if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_ERROR,
+        ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) Initializing SSLIOP_Endpoint \n")
                     ));
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
index bff7dd8e2c4..1d3f28cbae2 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/run_test.pl
@@ -9,35 +9,26 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-my $exec_extn="";
-if ($^O eq "MSWin32") {
-  $exec_extn=".exe";
-}
-$ifr_service= "$ENV{ACE_ROOT}/bin/IFR_Service";
-if (! -e $ifr_service . $exec_extn ) {
-    $ifr_service= "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/IFR_Service";
-    if (! -e $ifr_service . $exec_extn ) {
-      $ifr_service = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/Release/IFR_Service";
-      if (! -e $ifr_service . $exec_extn ) {
-            print STDERR "ERROR: IFR_Service not found.\n";
-            exit 1;
-        }
-    }
-}
-$iorfile = PerlACE::LocalFile ("ifr.ior");
+$iorfilebase = "ifr.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 print STDERR "\n\n==== Running Recursive Array length corruption test\n";
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::ProcessVX ("../../../IFR_Service/IFR_Service", "-o $iorfilebase");
 }
 else {
-    $SV = new PerlACE::Process ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", "-o $iorfile");
 }
 
 print STDERR "Starting IFR Service\n";
-$SV->Spawn ();
+$ifspawn = $SV->Spawn ();
+if ($ifspawn != 0) {
+    print STDERR "ERROR: Can't spawn IFR Service $ifspawn\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/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
index 259a742dfbf..0a98b1acc98 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/run_test.pl
@@ -9,35 +9,27 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-my $exec_extn="";
-if ($^O eq "MSWin32") {
-  $exec_extn=".exe";
-}
-$ifr_service= "$ENV{ACE_ROOT}/bin/IFR_Service";
-if (! -e $ifr_service . $exec_extn ) {
-    $ifr_service= "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/IFR_Service";
-    if (! -e $ifr_service . $exec_extn ) {
-      $ifr_service = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/Release/IFR_Service";
-      if (! -e $ifr_service . $exec_extn ) {
-            print STDERR "ERROR: IFR_Service not found.\n";
-            exit 1;
-        }
-    }
-}
-$iorfile = PerlACE::LocalFile ("ifr.ior");
+
+$iorfilebase = "ifr.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 print STDERR "\n\n==== Running Forward Declared ValueType Definition test\n";
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::ProcessVX ("../../../IFR_Service/IFR_Service", "-o $iorfilebase");
 }
 else {
-    $SV = new PerlACE::Process ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", "-o $iorfile");
 }
 
 print STDERR "Starting IFR Service\n";
-$SV->Spawn ();
+$ifspawn = $SV->Spawn ();
+if ($ifspawn != 0) {
+    print STDERR "ERROR: Can't spawn IFR Service $ifspawn\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/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
index 45107822a57..a4fa0b151cc 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/run_test.pl
@@ -9,35 +9,26 @@ use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::Run_Test;
 
 $status = 0;
-my $exec_extn="";
-if ($^O eq "MSWin32") {
-  $exec_extn=".exe";
-}
-$ifr_service= "$ENV{ACE_ROOT}/bin/IFR_Service";
-if (! -e $ifr_service . $exec_extn ) {
-    $ifr_service= "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/IFR_Service";
-    if (! -e $ifr_service . $exec_extn ) {
-      $ifr_service = "$ENV{TAO_ROOT}/orbsvcs/IFR_Service/Release/IFR_Service";
-      if (! -e $ifr_service . $exec_extn ) {
-            print STDERR "ERROR: IFR_Service not found.\n";
-            exit 1;
-        }
-    }
-}
-$iorfile = PerlACE::LocalFile ("ifr.ior");
+$iorfilebase = "ifr.ior";
+$iorfile = PerlACE::LocalFile ("$iorfilebase");
 unlink $iorfile;
 
 print STDERR "\n\n==== Running Forward Declared ValueType Definition test\n";
 
 if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::ProcessVX ("../../../IFR_Service/IFR_Service", "-o $iorfilebase");
 }
 else {
-    $SV = new PerlACE::Process ("$ifr_service", "-o $iorfile");
+    $SV = new PerlACE::Process (""../../../IFR_Service/IFR_Service", "-o $iorfile");
 }
 
 print STDERR "Starting IFR Service\n";
-$SV->Spawn ();
+$ifspawn = $SV->Spawn ();
+if ($ifspawn != 0) {
+    print STDERR "ERROR: Can't spawn IFR Service $ifspawn\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/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
index d934af27a35..e69a89a3611 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3200_Regression/run_test.pl
@@ -38,7 +38,7 @@ $CL2 = new PerlACE::Process ("$ENV{ACE_ROOT}/bin/tao_ifr",
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
index acae6656f7f..df64868be2d 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/run_test.pl
@@ -14,22 +14,6 @@ $ifr_iorfile= "if_repo.ior";
 $test_idl = PerlACE::LocalFile ("test.idl");
 $includes = "-I ../../../..  -I ../../../../orbsvcs";
 
-# find the tao_ifr executable.
-# Its placement is dependent upon the OS and if MPC generated makefiles are used.
-my $exec_extn="";
-if ($^O eq "MSWin32") {
-  $exec_extn=".exe";
-}
-
-$tao_ifr = "$ENV{ACE_ROOT}/bin/tao_ifr";
-if (! -e $tao_ifr . $exec_extn ) {
-    $tao_ifr = "../../../../orbsvcs/IFR_Service/tao_ifr";
-        if (! -e $tao_ifr . $exec_extn ) {
-            print STDERR "ERROR: tao_ifr compiler not found.\n";
-            exit 1;
-    }
-}
-
 for ($i = 0; $i <= $#ARGV; $i++) {
     if ($ARGV[$i] eq "-d") {
         $debug = "-d";
@@ -39,14 +23,18 @@ for ($i = 0; $i <= $#ARGV; $i++) {
     }
 }
 
-$TAO_IFR = new PerlACE::Process ($tao_ifr);
+$TAO_IFR = new PerlACE::Process ("../../../../orbsvcs/IFR_Service/tao_ifr");
 $IFR     = new PerlACE::Process ("../../../../orbsvcs/IFR_Service/IFR_Service", " -o $ifr_iorfile");
 $CL      = new PerlACE::Process ("IDL3_Test", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile"
                                  . " $debug");
 
 unlink $ifr_iorfile;
 
-$IFR->Spawn ();
+$ifspawn = $IFR->Spawn ();
+if ($ifspawn != 0) {
+    print STDERR "ERROR: Can't spawn IFR Service $ifspawn\n";
+    exit 1;
+}
 
 if (PerlACE::waitforfile_timed ($ifr_iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
     print STDERR "ERROR: cannot find file <$ifr_iorfile>\n";
@@ -70,7 +58,7 @@ if ($client != 0) {
     $status = 1;
 }
 
-$server = $IFR->TerminateWaitKill (5);
+$server = $IFR->TerminateWaitKill (15);
 
 if ($server != 0) {
     print STDERR "ERROR: IFR returned $server\n";