ChangeLogTag:Wed Dec 03 18:11:39 UTC 2008 Trevor Fields <fields_t@ociweb.com>

8 files changed, 43 insertions, 24 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d48d62f5ad5..6bbbed735eb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Wed Dec 03 18:11:39 UTC 2008  Trevor Fields  <fields_t@ociweb.com>
+
+        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h:
+        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp:
+        Compilation fixes.
+
+        * configure.ac:
+        * orbsvcs/tests/InterfaceRepo/Makefile.am:
+        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am:
+        Add test to be built by autoconf.
+
 Wed Dec  3 09:22:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 9e0e2bac9b4..1fbc4c6a22e 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -481,6 +481,7 @@ if test $tao_build_tests = yes; then
     orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Makefile
     orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile
     orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile
+    orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile
     orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile
     orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile
     orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
index e253128e9f7..b1c414b33e7 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp
@@ -6,18 +6,20 @@
 GoodDay::GoodDay (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
+  if (TAO_Requires_IFR_Client_Initializer == -1)
+  {
+    ACE_ERROR((LM_ERROR, ACE_TEXT("IFR Client failed to load\n")));
+  }
 }
 
 char *
 GoodDay::get_string (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
 GoodDay::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
 }
@@ -25,7 +27,6 @@ GoodDay::shutdown (void)
 
 ::Test::GoodDay::RoughWeek *
 GoodDay::this_week (void)
-  ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   // Not actually used.
   return 0;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
index 02478d9c076..37e56f48233 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
@@ -21,14 +21,11 @@ public:
   GoodDay (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * get_string (void);
 
-  virtual void shutdown (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown (void);
 
-  virtual ::Test::GoodDay::RoughWeek * this_week (void)
-    ACE_THROW_SPEC ((::CORBA::SystemException));
+  virtual ::Test::GoodDay::RoughWeek * this_week (void);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am
index 5036887139e..6bbf5b89144 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Makefile.am
@@ -18,7 +18,7 @@ TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
-## Makefile.IFR_Self_Reursive_IDL_Idl.am
+## Makefile.IFR_Self_Recursive_IDL_Idl.am
 
 BUILT_SOURCES = \
   TestC.cpp \
@@ -46,7 +46,7 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 noinst_HEADERS = \
   Test.idl
 
-## Makefile.IFR_Self_Reursive_IDL_Server.am
+## Makefile.IFR_Self_Recursive_IDL_Server.am
 
 if BUILD_EXCEPTIONS
 
@@ -74,7 +74,7 @@ server_LDADD = \
 
 endif BUILD_EXCEPTIONS
 
-## Makefile.IFR_Self_Reursive_IDL_Client.am
+## Makefile.IFR_Self_Recursive_IDL_Client.am
 
 if BUILD_EXCEPTIONS
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
index b6df698f4d8..69c98cebb82 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/client.cpp
@@ -25,9 +25,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
+                           ACE_TEXT("usage:  %s ")
+                           ACE_TEXT("-k <ior> ")
+                           ACE_TEXT("\n"),
                            argv [0]),
                           -1);
       }
@@ -53,6 +53,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if ( ! CORBA::is_nil (ifd.in()))
       {
         CORBA::InterfaceDef::FullInterfaceDescription *id = ifd->describe_interface();
+        if ( id == 0 )
+        {
+          ACE_ERROR ((LM_ERROR,
+                             ACE_TEXT("Null interface description returned\n")));
+        }
+
       }
       Test::GoodDay_var goodday =
         Test::GoodDay::_narrow(tmp.in ());
@@ -60,7 +66,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (CORBA::is_nil (goodday.in ()))
         {
           ACE_ERROR ((LM_DEBUG,
-                             "Nil Test::GoodDay reference <%s>\n",
+                             ACE_TEXT("Nil Test::GoodDay reference <%s>\n"),
                              ior));
         }
       else
@@ -69,7 +75,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         CORBA::String_var the_string =
           goodday->get_string ();
 
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) - string returned <%s>\n"),
                     the_string.in ()));
       }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
index 0a7bd0125ab..0e2399a8d78 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/server.cpp
@@ -12,7 +12,7 @@ int object_to_output = 1;
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv);
+  ACE_Get_Opt get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -25,9 +25,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
+                           ACE_TEXT("usage:  %s ")
+                           ACE_TEXT("-o <iorfile>")
+                           ACE_TEXT("\n"),
                            argv [0]),
                           -1);
       }
@@ -51,7 +51,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
+                           ACE_TEXT(" (%P|%t) Panic: nil RootPOA\n")),
                           1);
 
       PortableServer::POAManager_var poa_manager =
@@ -78,7 +78,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s\n",
+                           ACE_TEXT("Cannot open output file for writing IOR: %s\n"),
                            ior_output_file),
                            1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
@@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->run ();
 
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t) server - event loop finished\n")));
 
       root_poa->destroy (1, 1);
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
index 87ede64065f..771e756d881 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
@@ -16,6 +16,7 @@ SUBDIRS = \
         Bug_3495_Regression \
         IDL3_Test \
         IFR_Inheritance_Test \
+        IFR_Self_Recursive_IDL_Test \
         IFR_Test \
         Latency_Test \
         Persistence_Test