Splitted the implementation from the Server object.

4 files changed, 293 insertions, 192 deletions

diff --git a/TAO/tests/Quoter/QuoterFactoryFinder.cpp b/TAO/tests/Quoter/QuoterFactoryFinder.cpp
index 2e92a975d65..7106eca6da9 100644
--- a/TAO/tests/Quoter/QuoterFactoryFinder.cpp
+++ b/TAO/tests/Quoter/QuoterFactoryFinder.cpp
@@ -14,149 +14,78 @@
 //
 // ============================================================================
 
-#include "ace/Get_Opt.h"
 #include "tao/corba.h"
 #include "QuoterFactoryFinder.h"
 
 static const char usage [] = 
 "[-? |\n[-O[RBport] ORB port number]]";
 
-// Constructor
-QuoterFactoryFinder_i::QuoterFactoryFinder_i (void)
+QuoterFactoryFinder_Server::QuoterFactoryFinder_Server () 
 {
-  TAO_TRY 
-    {
-      // Get a reference to the ORB.
-      CORBA::ORB_var orb_var = TAO_ORB_Core_instance ()->orb ();
-      TAO_CHECK_ENV;
-
-      // Get the Naming Service object reference.
-      CORBA::Object_var namingObj_var = 
-        orb_var->resolve_initial_references ("NameService");
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (namingObj_var.in ())) 
-        ACE_ERROR ((LM_ERROR,
-                   " (%P|%t) Unable get the Naming Service.\n"));
-
-      // Narrow the object reference to a Naming Context.
-      CosNaming::NamingContext_var namingContext_var =
-        CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Get the IDL_Quoter naming context.
-      CosNaming::Name quoterContextName (1);  // max = 1 
-      quoterContextName.length (1);
-      quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
-
-      CORBA::Object_var quoterNamingObj_var = 
-        namingContext_var->resolve (quoterContextName, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      quoterNamingContext_var_ = 
-        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           TAO_TRY_ENV);
-       
-      // Bind the QuoterFactory Finder to the IDL_Quoter naming
-      // context.
-      CosNaming::Name quoterFactoryFinderName_ (1);
-      quoterFactoryFinderName_.length (1);
-      quoterFactoryFinderName_[0].id = CORBA::string_dup ("QuoterFactoryFinder");
-
-      this->quoterNamingContext_var_->bind (quoterFactoryFinderName_,
-                                            (CORBA::Object *) this,
-                                            TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
-    }
-  TAO_ENDTRY;
 }
 
-// Destructor.
-QuoterFactoryFinder_i::~QuoterFactoryFinder_i (void)
+QuoterFactoryFinder_Server::~QuoterFactoryFinder_Server () 
 {
 }
 
-
-CosLifeCycle::Factories *
-QuoterFactoryFinder_i::find_factories (const CosLifeCycle::Key &factory_key,
-                                       CORBA::Environment &_env_there)
+QuoterFactoryFinder_Server::init (int argc, char *argv[], CORBA::Environment& env)
 {
-  CORBA::Environment env_here;
+  if (this->orb_manager_.init (argc,
+                               argv,
+                               env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "%p\n", 
+                       "init"),
+                      -1);
 
-  // fill in the name of the Quoter Factory
-  // CosNaming::Name factoryName (1);  // max = 1 
-  // factoryName.length (1);
-  // factoryName[0].id = CORBA::string_dup ("quoter_factory");
-  // or
-  CosNaming::Name factoryName = (CosNaming::Name) factory_key;
+  // Copy them, because parse_args expects them there.
+  this->argc_ = argc;
+  this->argv_ = argv;
 
-  // Try to get a reference to a Quoter Factory
-  CORBA::Object_var quoterFactoryObject_var =  
-    quoterNamingContext_var_->resolve (factoryName, env_here);
-  
-  // see if there is an exception, if yes then throw the NoFactory exception
-  if (env_here.exception () != 0) {
+  this->parse_args ();
 
-    // throw a NoFactory exception  
-    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-    return 0;
-  }
+  // Activate the object.
+  CORBA::String_var str  =
+    this->orb_manager_.activate (&this->quoterFactoryFinder_Impl_,
+                                 env);
 
-  // Check if it is a valid Quoter Factory reference
-  if (CORBA::is_nil (quoterFactoryObject_var.in())) {
+/*  ACE_DEBUG ((LM_DEBUG,
+              "The IOR is: <%s>\n",
+              str.in ()));
 
-    // throw a NoFactory exception  
-    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-    return 0;
+  if (this->ior_output_file_)
+  {
+    ACE_OS::fprintf (this->ior_output_file_, "%s", str.in ());
+    ACE_OS::fclose (this->ior_output_file_);
   }
+   
+  if (this->use_naming_service_)
+    return this->init_naming_service (env);
 
-  // were able to get a reference to Quoter Factory
-  else { 
-
-    // create a sequence of factories object
-    CosLifeCycle::Factories *factories_ptr = new CosLifeCycle::Factories (1);      
-
-    // See if there is an exception, if yes then throw the NoFactory
-    // exception.
-    if (env_here.exception () != 0) 
-    {
-      // Throw a NoFactory exception.
-      _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-      return 0;
-    }
-
-    // using the Naming Service only one reference is available
-    factories_ptr->length (1);      
-
-    // Check if it is a valid Quoter Factory reference.
-    if (CORBA::is_nil (quoterFactoryObject_var.in ())) 
-    {
-      // throw a NoFactory exception.
-      _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
-      return 0;
-    }
-
-    // insert the object reference 
-    (*factories_ptr)[0] = quoterFactoryObject_var;
+  */
+  return 0;
+}
 
-    ACE_DEBUG ((LM_DEBUG,"Have reference to a Quoter Factory.\n"));
-    return factories_ptr;
-  }
+int
+QuoterFactoryFinder_Server::run (CORBA::Environment& env)
+{
+  if (orb_manager_.orb()->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "run"),
+                      -1);
+  return 0;
 }
 
+
 // Function get_options.
 
-static u_int
-get_options (int argc, char *argv [])
+unsigned int
+QuoterFactoryFinder_Server::parse_args ()
 {
   // We need the 'O' in get_opt () because we also want to have ORB
   // parameters, they all start with 'O'.
-  ACE_Get_Opt get_opt (argc, argv, "O?");
+  ACE_Get_Opt get_opt (this->argc_, this->argv_, "O?");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -165,25 +94,25 @@ get_options (int argc, char *argv [])
       case '?':
         ACE_DEBUG ((LM_DEBUG,
                     "Usage: %s %s\n",
-                    argv[0], usage));
+                    this->argv_[0], usage));
         ACE_OS::exit (0);
         break;
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%s: unknown arg, -%c\n"
                            "Usage: %s %s\n",
-                           argv[0], char (opt),
-                           argv[0],
+                           this->argv_[0], char (opt),
+                           this->argv_[0],
                            usage),
                           1);
       }
 
-  if (argc != get_opt.optind)
+  if (this->argc_ != get_opt.optind)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%s: too many arguments\n"
                        "Usage: %s %s\n",
-                       argv[0],
-                       argv[0],
+                       this->argv_[0],
+                       this->argv_[0],
                        usage),
                       1);
   return 0;
@@ -194,68 +123,32 @@ get_options (int argc, char *argv [])
 int
 main (int argc, char *argv [])
 {
+  QuoterFactoryFinder_Server quoterFactoryFinder_server;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n\tIDL_Quoter:QuoterFactoryFinder \n \n"));
   TAO_TRY
     {
-      // Initialize ORB.
-
-      // @@ Can you please replace all this with the TAO_ORB_Manager?
-      CORBA::ORB_ptr orb_ptr = CORBA::ORB_init (argc,
-                                                argv,
-                                                "internet",
-                                                TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Connect to the RootPOA.
-      CORBA::Object_var poa_object =
-        orb_ptr->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 (),
-                                      TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_TRY_ENV);
-
-      TAO_CHECK_ENV;
-
-      // Get the Options.
-      if (get_options (argc, argv))
-        ACE_OS::exit (-1);
-
-      // Instantiate the QuoterFactoryFinder.
-      QuoterFactoryFinder_i *quoterFactoryFinder_i_ptr_;
-      ACE_NEW_RETURN (quoterFactoryFinder_i_ptr_,
-                      QuoterFactoryFinder_i (),
-                      -1);
-
-  
-      ACE_DEBUG ((LM_DEBUG,
-                  "Quoter Factory Finder is instantiated.\n"));
-
-      // The POA Manager has to be activated before starting the ORB
-      // event loop.
-      poa_manager->activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Run the ORB.
-      if (orb_ptr->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "CORBA::ORB::run"),
-                          -1);
-      TAO_CHECK_ENV;
+      if (quoterFactoryFinder_server.init (argc,argv,TAO_TRY_ENV) == -1)
+        return 1;
+      else
+        {
+          quoterFactoryFinder_server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
     }
-  TAO_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      TAO_TRY_ENV.print_exception ("SYS_EX");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
+      return -1;
+    }
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
+      return -1;
     }
   TAO_ENDTRY;
-
   return 0;
 }
diff --git a/TAO/tests/Quoter/QuoterFactoryFinder.h b/TAO/tests/Quoter/QuoterFactoryFinder.h
index 6283466993e..531286ae079 100644
--- a/TAO/tests/Quoter/QuoterFactoryFinder.h
+++ b/TAO/tests/Quoter/QuoterFactoryFinder.h
@@ -6,37 +6,53 @@
 //    QuoterFactoryFinder.cpp
 //
 // = DESCRIPTION
-//   Factory Finder for the Quoter example
+//   Server for the Quoter Factory Finder 
 //
 // = AUTHOR
 //    Michael Kircher (mk1@cs.wustl.edu)
 //
 // ============================================================================
 
-#include "quoterS.h"
+#include "ace/Get_Opt.h"
+#include "tao/tao.h"
+#include "QuoterFactoryFinder_Impl.h"
 
 #if !defined (QUOTER_FACTORY_FINDER_H)
 #define QUOTER_FACTORY_FINDER_H
 
-class QuoterFactoryFinder_i : public POA_Stock::QuoterFactoryFinder 
+class QuoterFactoryFinder_Server
 {
   // = TILE
-  //   A CosLifeCycle conforming Factory Finder for the Quoter
-  //   example. It uses the Naming Service to find a fitting factory.
+  //   Server object for the Quoter Factory Finder
 
 public:
-  QuoterFactoryFinder_i (void);
-  ~QuoterFactoryFinder_i (void);
+  QuoterFactoryFinder_Server (void);
+  // Default constructor
 
-  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key & factory_key,
-                                                    CORBA::Environment &_tao_environment);
-  // Returns a squence of Factories if factories matching the
-  // factory_key were found. If no factory was found, then the
-  // NoFactory exception, defined in CosLifeCycle, is raised.
+  ~QuoterFactoryFinder_Server (void);
+  // Destructor
+
+  int init (int argc, char *argv[], CORBA::Environment& env);
+  // Initialize the Quoter_Server state - parsing arguments and ...
+
+  int run (CORBA::Environment& env);
+  // Run the orb 
+
+  unsigned int parse_args ();
+  // parse the passed parameters
 
 private:
-  CosNaming::NamingContext_var quoterNamingContext_var_;    
-  // Hold a reference to the Quoter example naming context.
+  TAO_ORB_Manager orb_manager_;
+  // instance of the ORB Manager
+
+  QuoterFactoryFinder_i quoterFactoryFinder_Impl_;
+  // instance of the Quoter Factory Finder
+
+  int argc_;
+  // Number of commandline arguments.
+
+  char **argv_;
+  // commandline arguments.
 };
 
 #endif /* QUOTER_FACTORY_FINDER_H */
diff --git a/TAO/tests/Quoter/QuoterFactoryFinder_Impl.cpp b/TAO/tests/Quoter/QuoterFactoryFinder_Impl.cpp
new file mode 100644
index 00000000000..6782d3d4967
--- /dev/null
+++ b/TAO/tests/Quoter/QuoterFactoryFinder_Impl.cpp
@@ -0,0 +1,150 @@
+// $Id$
+
+// ============================================================================
+//
+// = FILENAME
+//    QuoterFactoryFinder_Impl.cpp
+//
+// = DESCRIPTION
+//    A Factory Finder for the Quoter example. This example conforms
+//    to the CosLifeCycle Factory Finder notion.
+//
+// = AUTHOR
+//    Michael Kircher (mk1@cs.wustl.edu)
+//
+// ============================================================================
+
+#include "ace/Get_Opt.h"
+#include "tao/corba.h"
+#include "QuoterFactoryFinder_Impl.h"
+
+static const char usage [] = 
+"[-? |\n[-O[RBport] ORB port number]]";
+
+// Constructor
+QuoterFactoryFinder_i::QuoterFactoryFinder_i (void)
+{
+  TAO_TRY 
+    {
+      // Get a reference to the ORB.
+      CORBA::ORB_var orb_var = TAO_ORB_Core_instance ()->orb ();
+      TAO_CHECK_ENV;
+
+      // Get the Naming Service object reference.
+      CORBA::Object_var namingObj_var = 
+        orb_var->resolve_initial_references ("NameService");
+      TAO_CHECK_ENV;
+
+      if (CORBA::is_nil (namingObj_var.in ())) 
+        ACE_ERROR ((LM_ERROR,
+                   " (%P|%t) Unable get the Naming Service.\n"));
+
+      // Narrow the object reference to a Naming Context.
+      CosNaming::NamingContext_var namingContext_var =
+        CosNaming::NamingContext::_narrow (namingObj_var.in (),
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Get the IDL_Quoter naming context.
+      CosNaming::Name quoterContextName (1);  // max = 1 
+      quoterContextName.length (1);
+      quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
+
+      CORBA::Object_var quoterNamingObj_var = 
+        namingContext_var->resolve (quoterContextName, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      quoterNamingContext_var_ = 
+        CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
+                                           TAO_TRY_ENV);
+       
+      // Bind the QuoterFactory Finder to the IDL_Quoter naming
+      // context.
+      CosNaming::Name quoterFactoryFinderName_ (1);
+      quoterFactoryFinderName_.length (1);
+      quoterFactoryFinderName_[0].id = CORBA::string_dup ("QuoterFactoryFinder");
+
+      this->quoterNamingContext_var_->bind (quoterFactoryFinderName_,
+                                            (CORBA::Object *) this,
+                                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("SYS_EX");
+    }
+  TAO_ENDTRY;
+}
+
+// Destructor.
+QuoterFactoryFinder_i::~QuoterFactoryFinder_i (void)
+{
+}
+
+
+CosLifeCycle::Factories *
+QuoterFactoryFinder_i::find_factories (const CosLifeCycle::Key &factory_key,
+                                       CORBA::Environment &_env_there)
+{
+  CORBA::Environment env_here;
+
+  // fill in the name of the Quoter Factory
+  // CosNaming::Name factoryName (1);  // max = 1 
+  // factoryName.length (1);
+  // factoryName[0].id = CORBA::string_dup ("quoter_factory");
+  // or
+  CosNaming::Name factoryName = (CosNaming::Name) factory_key;
+
+  // Try to get a reference to a Quoter Factory
+  CORBA::Object_var quoterFactoryObject_var =  
+    quoterNamingContext_var_->resolve (factoryName, env_here);
+  
+  // see if there is an exception, if yes then throw the NoFactory exception
+  if (env_here.exception () != 0) {
+
+    // throw a NoFactory exception  
+    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+    return 0;
+  }
+
+  // Check if it is a valid Quoter Factory reference
+  if (CORBA::is_nil (quoterFactoryObject_var.in())) {
+
+    // throw a NoFactory exception  
+    _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+    return 0;
+  }
+
+  // were able to get a reference to Quoter Factory
+  else { 
+
+    // create a sequence of factories object
+    CosLifeCycle::Factories *factories_ptr = new CosLifeCycle::Factories (1);      
+
+    // See if there is an exception, if yes then throw the NoFactory
+    // exception.
+    if (env_here.exception () != 0) 
+    {
+      // Throw a NoFactory exception.
+      _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
+    }
+
+    // using the Naming Service only one reference is available
+    factories_ptr->length (1);      
+
+    // Check if it is a valid Quoter Factory reference.
+    if (CORBA::is_nil (quoterFactoryObject_var.in ())) 
+    {
+      // throw a NoFactory exception.
+      _env_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
+    }
+
+    // insert the object reference 
+    (*factories_ptr)[0] = quoterFactoryObject_var;
+
+    ACE_DEBUG ((LM_DEBUG,"Have reference to a Quoter Factory.\n"));
+    return factories_ptr;
+  }
+}
diff --git a/TAO/tests/Quoter/QuoterFactoryFinder_Impl.h b/TAO/tests/Quoter/QuoterFactoryFinder_Impl.h
new file mode 100644
index 00000000000..0a8e82524ca
--- /dev/null
+++ b/TAO/tests/Quoter/QuoterFactoryFinder_Impl.h
@@ -0,0 +1,42 @@
+// $Id$
+
+// ============================================================================
+//
+// = FILENAME
+//    QuoterFactoryFinder_Impl.h
+//
+// = DESCRIPTION
+//   Factory Finder for the Quoter example
+//
+// = AUTHOR
+//    Michael Kircher (mk1@cs.wustl.edu)
+//
+// ============================================================================
+
+#include "quoterS.h"
+
+#if !defined (QUOTER_FACTORY_FINDER_IMPL_H)
+#define QUOTER_FACTORY_FINDER_IMPL_H
+
+class QuoterFactoryFinder_i : public POA_Stock::QuoterFactoryFinder 
+{
+  // = TILE
+  //   A CosLifeCycle conforming Factory Finder for the Quoter
+  //   example. It uses the Naming Service to find a fitting factory.
+
+public:
+  QuoterFactoryFinder_i (void);
+  ~QuoterFactoryFinder_i (void);
+
+  virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key & factory_key,
+                                                    CORBA::Environment &_tao_environment);
+  // Returns a squence of Factories if factories matching the
+  // factory_key were found. If no factory was found, then the
+  // NoFactory exception, defined in CosLifeCycle, is raised.
+
+private:
+  CosNaming::NamingContext_var quoterNamingContext_var_;    
+  // Hold a reference to the Quoter example naming context.
+};
+
+#endif /* QUOTER_FACTORY_FINDER_IMPL_H */