ChangeLogTag: Mon May 1 21:54:05 UTC 2006 Iliyan Jeliazkov <iliyan@ociweb.com>

3 files changed, 33 insertions, 21 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index be693f41ff1..59d3916c1e5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,11 +1,25 @@
+Mon May  1 21:54:05 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/ORB_Local_Config/Bunch/Test.cpp:
+
+          Modified the test not to require the ability to fully
+          instantiate TAO_CORBANAME_Parser, etc. which is a class in
+          another library and it is not declared so that it is "visible"
+          outside of it. The test does not require that in order to be
+          functional - using the base class ACE_Service_Object.
+
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
+
+          Added some more logging.
+
 Mon May  1 20:03:59 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * tao/Makefile.am:
-        
+
           Regenerated.
 
         * tao/tao.mpc:
-        
+
           Fix typo.
 
 Mon May  1 19:39:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
diff --git a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
index 04e607eb94e..f08a37ca040 100644
--- a/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bunch/Test.cpp
@@ -5,11 +5,13 @@
 #  undef ACE_NDEBUG
 #endif
 
-#include "tao/CORBANAME_Parser.h"
+// The following is required to be able to access
+// ace_svc_desc_TAO_*_Parser, below
 #include "tao/CORBALOC_Parser.h"
-#include "tao/IIOP_Factory.h"
+#include "tao/CORBANAME_Parser.h"
 
 #include "ace/ARGV.h"
+#include "ace/Service_Config.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tests, server, "$Id$")
@@ -37,12 +39,12 @@ testCompatibility (int , ACE_TCHAR *[])
     // This uses the same default ACE_Service_Repository
     ACE_Service_Gestalt_Test one;
 
-    TAO_CORBANAME_Parser* p20 =
-      ACE_Dynamic_Service<TAO_CORBANAME_Parser>::instance (&one, "CORBANAME_Parser");
+    ACE_Service_Object* p20 =
+      ACE_Dynamic_Service<ACE_Service_Object>::instance (&one, "CORBANAME_Parser");
     ACE_ASSERT ((p20 != 0));
 
-    TAO_CORBALOC_Parser* p21 =
-      ACE_Dynamic_Service<TAO_CORBALOC_Parser>::instance (&one, "CORBALOC_Parser");
+    ACE_Service_Object* p21 =
+      ACE_Dynamic_Service<ACE_Service_Object>::instance (&one, "CORBALOC_Parser");
     ACE_ASSERT ((p21 != 0));
 
     ACE_DEBUG ((LM_DEBUG, "\tglobal.services_count () -> %d\n",
@@ -52,20 +54,12 @@ testCompatibility (int , ACE_TCHAR *[])
     // Exiting this scope should fini all services ...
   }
 
-  TAO_CORBANAME_Parser* p20 =
-    ACE_Dynamic_Service<TAO_CORBANAME_Parser>::instance ("CORBANAME_Parser");
-  ACE_ASSERT ((p20 == 0));
-
-  TAO_CORBALOC_Parser* p21 =
-    ACE_Dynamic_Service<TAO_CORBALOC_Parser>::instance ("CORBALOC_Parser");
-  ACE_ASSERT ((p21 == 0));
-
-
-
-  p20 = ACE_Dynamic_Service<TAO_CORBANAME_Parser>::instance (&glob, "CORBANAME_Parser");
+  ACE_Service_Object* p20 =
+    ACE_Dynamic_Service<ACE_Service_Object>::instance (&glob, "CORBANAME_Parser");
   ACE_ASSERT ((p20 == 0));
 
-  p21 =ACE_Dynamic_Service<TAO_CORBALOC_Parser>::instance (&glob, "CORBALOC_Parser");
+  ACE_Service_Object* p21 =
+    ACE_Dynamic_Service<ACE_Service_Object>::instance (&glob, "CORBALOC_Parser");
   ACE_ASSERT ((p21 == 0));
 
   return 0;
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
index 83f62b11545..5ab676754c5 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp
@@ -60,7 +60,8 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
   for (int attempts_left=5; co == 0 && attempts_left > 0; --attempts_left)
   {
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) Delaying the client to give the server a chance to start ...\n"));
-    ACE_OS::sleep (5);
+    ACE_OS::sleep (7);
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client is ready to proceed.\n"));
 
     ACE_TRY
     {
@@ -71,6 +72,9 @@ Client_Worker::test_main (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
     {
       if (!attempts_left)
         ACE_RE_THROW;
+      else
+        ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client is retrying.\n"));
+
     }
     ACE_ENDTRY;
   }