Removed leftover references to Paper Airplanes.

3 files changed, 18 insertions, 15 deletions

diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index e78110f1e48..683c16b0158 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "nestea_server_i.h"
+#include "ace/file_connector.h"
 
 ACE_RCSID(ImplRepo, nestea_server, "$Id$")
 
@@ -9,7 +10,7 @@ main (int argc, char *argv[])
 {
   Nestea_Server_i server;
 
-  ACE_DEBUG ((LM_DEBUG, "\n\tPaper Nestea Server\n\n"));
+  ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n"));
   TAO_TRY
     {
       if (server.init (argc, argv, TAO_TRY_ENV) == -1)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index bb1f5982972..bea9ed3e111 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -6,7 +6,9 @@
 
 ACE_RCSID(ImplRepo, nestea_server_i, "$Id$")
 
-Nestea_Server_i::Nestea_Server_i (void)
+const char *NESTEA_DATA_FILENAME = "nestea.dat";
+
+Nestea_Server_i::Nestea_Server_i (const char *filename)
   : server_impl_ (0),
     ior_output_file_ (0),
     ir_helper_ (0),
@@ -16,6 +18,12 @@ Nestea_Server_i::Nestea_Server_i (void)
   // Nothing
 }
 
+Nestea_Server_i::~Nestea_Server_i (void)
+{
+  delete this->ir_helper_;
+  delete this->server_impl_;
+}
+
 int
 Nestea_Server_i::parse_args (void)
 {
@@ -59,7 +67,7 @@ Nestea_Server_i::parse_args (void)
 }
 
 int
-Nestea_Server_i::init (int argc, char** argv, CORBA::Environment& TAO_IN_ENV)
+Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &TAO_IN_ENV)
 {
   char poa_name[] = "nestea_server";
 
@@ -80,7 +88,7 @@ Nestea_Server_i::init (int argc, char** argv, CORBA::Environment& TAO_IN_ENV)
       if (retval != 0)
         return retval;
 
-      ACE_NEW_RETURN (this->server_impl_, Nestea_i (this->use_ir_), -1);
+      ACE_NEW_RETURN (this->server_impl_, Nestea_i (NESTEA_DATA_FILENAME, this->use_ir_), -1);
 
       CORBA::String_var server_str  =
         this->orb_manager_.activate_under_child_poa ("server",
@@ -167,9 +175,3 @@ Nestea_Server_i::run (CORBA::Environment& env)
 
   return 0;
 }
-
-Nestea_Server_i::~Nestea_Server_i (void)
-{
-  delete this->ir_helper_;
-  delete this->server_impl_;
-}
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index d62bd9e0fc3..887e2c54512 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -11,7 +11,7 @@
 //
 // = DESCRIPTION
 //    Server that sets up the ORB and handles the registration and execution
-//    of the Paper Nestea Server.
+//    of the Nestea Bookshelf Server.
 //
 // = AUTHORS
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
@@ -28,15 +28,15 @@
 class Nestea_Server_i
 {
   // = TITLE
-  //   Paper Nestea Server Implementation Class
+  //   Nestea Bookshelf Server Implementation Class
   //
   // = DESCRIPTION
-  //   Sets up everything necessary to get the Paper Nestea Server 
+  //   Sets up everything necessary to get the Nestea Bookshelf Server 
   //   running.
   //   
 public:
   // = Initialization and termination methods.
-  Nestea_Server_i (void);
+  Nestea_Server_i (const char *filename = "nestea.dat");
   // Default constructor
 
   ~Nestea_Server_i (void);
@@ -62,7 +62,7 @@ private:
   // The ORB manager.
 
   Nestea_i *server_impl_;
-  // The Paper Nestea Server Implementation.  
+  // The Nestea Bookshelf Server Implementation.  
 
   FILE *ior_output_file_;
   // File where the IOR of the server object is stored.