Modified so FT_Naming_Service would be in a separate independent directory.

17 files changed, 256 insertions, 94 deletions

diff --git a/TAO/orbsvcs/Naming_Service/FT_Naming_Main.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp
index 4086db3d9a4..40f3a831ee1 100644
--- a/TAO/orbsvcs/Naming_Service/FT_Naming_Main.cpp
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Main.cpp
@@ -11,14 +11,14 @@
 class Naming_Svc_Shutdown : public Shutdown_Functor
 {
 public:
-  Naming_Svc_Shutdown (TAO_Naming_Service& ns);
+  Naming_Svc_Shutdown (TAO_FT_Naming_Service& ns);
 
   void operator() (int which_signal);
 private:
-  TAO_Naming_Service& ns_;
+  TAO_FT_Naming_Service& ns_;
 };
 
-Naming_Svc_Shutdown::Naming_Svc_Shutdown (TAO_Naming_Service& ns)
+Naming_Svc_Shutdown::Naming_Svc_Shutdown (TAO_FT_Naming_Service& ns)
   : ns_(ns)
 {
 }
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
new file mode 100644
index 00000000000..2f4c8031621
--- /dev/null
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
@@ -0,0 +1,198 @@
+// $Id$
+
+#include "FT_Naming_Service.h"
+#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h"
+#include "orbsvcs/Naming/Persistent_Naming_Context_Factory.h"
+#include "orbsvcs/Daemon_Utilities.h"
+#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
+#include "ace/Task.h"
+
+// Default Constructor.
+TAO_FT_Naming_Service::TAO_FT_Naming_Service (void)
+  : time_ (0),
+    num_threads_ (1)
+{
+}
+
+// Constructor taking command-line arguments.
+TAO_FT_Naming_Service::TAO_FT_Naming_Service (int argc, ACE_TCHAR* argv[])
+  : time_ (0),
+    num_threads_ (1)
+{
+  this->init (argc, argv);
+}
+
+
+// Initialize the state of the TAO_FT_Naming_Service object
+int
+TAO_FT_Naming_Service::init (int argc, ACE_TCHAR* argv[])
+{
+  try
+    {
+      // Check if -ORBDaemon is specified and if so, daemonize at this moment,
+      // -ORBDaemon in the ORB core is faulty, see bugzilla 3335
+      TAO_Daemon_Utility::check_for_daemon (argc, argv);
+
+      // Initialize the ORB
+      this->orb_ = CORBA::ORB_init (argc, argv);
+
+      // Parse the args for '-t' option. If '-t' option is passed, do
+      // the needful and then remove the option from the list of
+      // arguments.
+      this->parse_args (argc, argv);
+
+      // This function call initializes the naming service and returns
+      // '-1' in case of an exception.
+      int const result = this->my_naming_server_.init_with_orb (argc,
+                                                                argv,
+                                                                this->orb_.in ());
+
+      if (result == -1)
+        return result;
+
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("TAO_FT_Naming_Service::init");
+      return -1;
+    }
+
+  return 0;
+}
+
+int
+TAO_FT_Naming_Service::parse_args (int &argc, ACE_TCHAR* argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-t:n:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    {
+      switch (c)
+        {
+        case 't':
+          {
+            int const time = ACE_OS::atoi (get_opts.opt_arg ());
+            if (time >= 0)
+              this->time_ = time;
+
+            // Remove the option '-t' from argv []
+            // to avoid any confusion that might result.
+            for (int i = get_opts.opt_ind (); i != argc; ++i)
+              argv [i-2 ] = argv [i];
+
+            // Decrement the value of argc to reflect the removal
+            // of '-t' option.
+            argc = argc - 2;
+            break;
+          }
+        case 'n':
+          {
+            int const nt = ACE_OS::atoi (get_opts.opt_arg ());
+            if (nt >= 1)
+              this->num_threads_ = nt;
+
+            // Remove the option '-n' from argv []
+            // to avoid any confusion that might result.
+            for (int i = get_opts.opt_ind (); i != argc; ++i)
+              argv [i-2 ] = argv [i];
+
+            // Decrement the value of argc to reflect the removal
+            // of '-n' option.
+            argc = argc - 2;
+            break;
+          }
+
+        case '?':
+        default:
+          // Don't do anything. The TAO_Naming_Server::parse_args ()
+          // takes care of indicating an error in case of error.
+          break;
+        }
+    }
+  return 0;
+}
+
+// Run the ORB event loop.
+
+class ORB_Runner : public ACE_Task_Base
+{
+public:
+  ORB_Runner (CORBA::ORB_ptr o, long t)
+    : orb_(CORBA::ORB::_duplicate (o)),
+      time_(t)
+  {}
+
+  int svc (void)
+  {
+  if (!CORBA::is_nil (orb_.in ()))
+    {
+      if (time_ == 0)
+        {
+          this->orb_->run ();
+        }
+      else
+        {
+          ACE_Time_Value tv (time_);
+          this->orb_->run (tv);
+        }
+    }
+
+  return 0;
+  }
+
+private:
+  CORBA::ORB_var orb_;
+  long time_;
+};
+
+int
+TAO_FT_Naming_Service::run (void)
+{
+  ORB_Runner runner (this->orb_.in(), time_);
+  if (this->num_threads_ == 1)
+    return runner.svc();
+  else
+    {
+      runner.activate ( THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED,
+                        this->num_threads_);
+      runner.wait();
+    }
+  return 0;
+}
+
+void
+TAO_FT_Naming_Service::shutdown (void)
+{
+  if (!CORBA::is_nil (orb_.in ()))
+    {
+      this->orb_->shutdown (0);
+    }
+}
+
+int
+TAO_FT_Naming_Service::fini (void)
+{
+  this->my_naming_server_.fini();
+
+  try
+  {
+    // destroy implies shutdown
+    if (!CORBA::is_nil (orb_.in ()))
+      {
+        this->orb_->destroy ();
+      }
+  }
+  catch (const CORBA::Exception& ex)
+  {
+    ex._tao_print_exception ("TAO_FT_Naming_Service::fini");
+    return -1;
+  }
+  return 0;
+}
+
+// Destructor.
+TAO_FT_Naming_Service::~TAO_FT_Naming_Service (void)
+{
+}
diff --git a/TAO/orbsvcs/Naming_Service/FT_Naming_Service.h b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h
index 3d77b0e0de5..82fda26b6e9 100644
--- a/TAO/orbsvcs/Naming_Service/FT_Naming_Service.h
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h
@@ -17,11 +17,9 @@
 #ifndef TAO_FT_NAMING_SERVICE_H
 #define TAO_FT_NAMING_SERVICE_H
 
-#include /**/ "Naming_Service.h"
-
 #include "tao/ORB.h"
+#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h"
 
-class TAO_Naming_Server;
 
 /**
  * @class TAO_FT_Naming_Service
@@ -29,10 +27,8 @@ class TAO_Naming_Server;
  * @brief Defines a class that encapsulates the implementation of the
  * Fault Tolerant Naming Service.
  *
- * This class overrides the create_naming_server factory method inherited
- * from <TAO_Naming_Service>.
  */
-class TAO_FT_Naming_Service : public TAO_Naming_Service
+class TAO_FT_Naming_Service
 {
 public:
   /// Default Constructor.
@@ -41,12 +37,39 @@ public:
   /// Constructor taking the command-line arguments.
   TAO_FT_Naming_Service (int argc, ACE_TCHAR* argv[]);
 
-  /// Factory method to create a server object for the naming service
-  virtual TAO_Naming_Server* create_naming_server ();
+  /// Initialize the Naming Service with the arguments.
+  virtual int init (int argc, ACE_TCHAR* argv[]);
+
+  /// The opposite of init().
+  virtual int fini (void);
+
+  /// Run the TAO_Naming_Service.
+  virtual int run (void);
+
+  /// Shut down the TAO_Naming_Service; you must still call fini().
+  virtual void shutdown (void);
 
   /// Destructor.
   virtual ~TAO_FT_Naming_Service (void);
 
+protected:
+
+  /// Parse the command line arguments to find
+  /// the timeout period.
+  int parse_args (int &argc, ACE_TCHAR* argv[]);
+
+  /// The ORB.
+  CORBA::ORB_var orb_;
+
+  /// Naming Server instance.
+  TAO_FT_Naming_Server my_naming_server_;
+
+  /// After how long the server should stop listening to requests (in
+  /// seconds).
+  long time_;
+
+  /// Number of threads for running the ORB. Default is 1
+  int num_threads_;
 };
 
 #endif /* TAO_FT_NAMING_SERVICE_H */
diff --git a/TAO/orbsvcs/Naming_Service/FT_Naming_Service.mpc b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc
index b6e7c882db0..66dea515391 100644
--- a/TAO/orbsvcs/Naming_Service/FT_Naming_Service.mpc
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.mpc
@@ -9,6 +9,5 @@ project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, naming_serv,
   Source_Files {
     FT_Naming_Main.cpp
     FT_Naming_Service.cpp
-    Naming_Service.cpp
   }
 }
diff --git a/TAO/orbsvcs/Naming_Service/README.FT_Naming b/TAO/orbsvcs/FT_Naming_Service/README
index c499e7198d5..c499e7198d5 100644
--- a/TAO/orbsvcs/Naming_Service/README.FT_Naming
+++ b/TAO/orbsvcs/FT_Naming_Service/README
diff --git a/TAO/orbsvcs/Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/FT_Naming_Service.cpp
deleted file mode 100644
index 913c39088f8..00000000000
--- a/TAO/orbsvcs/Naming_Service/FT_Naming_Service.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "FT_Naming_Service.h"
-#include "orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h"
-#include "orbsvcs/Naming/Persistent_Naming_Context_Factory.h"
-
-// Default Constructor.
-TAO_FT_Naming_Service::TAO_FT_Naming_Service (void)
-{
-}
-
-// Constructor taking command-line arguments.
-TAO_FT_Naming_Service::TAO_FT_Naming_Service (int argc, ACE_TCHAR* argv[])
-  : TAO_Naming_Service (argc, argv)
-{
-}
-
-
-
-/// Create a server object for the naming service
-TAO_Naming_Server*
-TAO_FT_Naming_Service::create_naming_server ()
-{
-  return new (ACE_nothrow) TAO_FT_Naming_Server ();
-}
-
-
-// Destructor.
-TAO_FT_Naming_Service::~TAO_FT_Naming_Service (void)
-{
-}
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 73682314357..bcf1ae6a551 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -10,16 +10,14 @@
 
 // Default Constructor.
 TAO_Naming_Service::TAO_Naming_Service (void)
-  : my_naming_server_ (0),
-    time_ (0),
+  : time_ (0),
     num_threads_ (1)
 {
 }
 
 // Constructor taking command-line arguments.
 TAO_Naming_Service::TAO_Naming_Service (int argc, ACE_TCHAR* argv[])
-  : my_naming_server_(0),
-    time_ (0),
+  : time_ (0),
     num_threads_ (1)
 {
   this->init (argc, argv);
@@ -44,20 +42,9 @@ TAO_Naming_Service::init (int argc, ACE_TCHAR* argv[])
       // arguments.
       this->parse_args (argc, argv);
 
-      // Factory method used to construct a naming server to be used in
-      // creation and initialization of the naming service components.
-      this->my_naming_server_ = this->create_naming_server ();
-
-      // For some reason we are unable to create a naming server.
-      if (this->my_naming_server_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                          ACE_TEXT ("TAO_Naming_Service::init -- ")
-                          ACE_TEXT ("Unable to create a Naming_Server. Exiting.\n")),
-                          -1);
-
       // This function call initializes the naming service and returns
       // '-1' in case of an exception.
-      int const result = this->my_naming_server_->init_with_orb (argc,
+      int const result = this->my_naming_server_.init_with_orb (argc,
                                                                 argv,
                                                                 this->orb_.in ());
 
@@ -187,7 +174,7 @@ TAO_Naming_Service::shutdown (void)
 int
 TAO_Naming_Service::fini (void)
 {
-  this->my_naming_server_->fini();
+  this->my_naming_server_.fini();
 
   try
   {
@@ -205,18 +192,7 @@ TAO_Naming_Service::fini (void)
   return 0;
 }
 
-/// Factory method used to create a server object for the naming service
-TAO_Naming_Server*
-TAO_Naming_Service::create_naming_server ()
-{
-  // Default behavior is to use the Naming_Server located in orbsvcs\orbsvcs\Naming
-  return new (ACE_nothrow) TAO_Naming_Server;
-}
-
-
 // Destructor.
 TAO_Naming_Service::~TAO_Naming_Service (void)
 {
-  // Invoke destructor of naming server which was created using the factory method
-  delete this->my_naming_server_;
 }
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index abcf7df0516..3690c97c3d6 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -20,7 +20,7 @@
 #include /**/ "ace/pre.h"
 #include "tao/ORB.h"
 
-class TAO_Naming_Server;
+#include "orbsvcs/Naming/Naming_Server.h"
 
 /**
  * @class TAO_Naming_Service
@@ -52,9 +52,6 @@ public:
   /// Shut down the TAO_Naming_Service; you must still call fini().
   virtual void shutdown (void);
 
-  /// Factory method to create a server object for the naming service
-  virtual TAO_Naming_Server* create_naming_server ();
-
   /// Destructor.
   virtual ~TAO_Naming_Service (void);
 
@@ -68,7 +65,7 @@ protected:
   CORBA::ORB_var orb_;
 
   /// Naming Server instance.
-  TAO_Naming_Server* my_naming_server_;
+  TAO_Naming_Server my_naming_server_;
 
   /// After how long the server should stop listening to requests (in
   /// seconds).
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/README b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/README
index ba1c835824b..afce384d873 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/README
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/README
@@ -29,7 +29,7 @@ Failover Test
 	mkdir GroupService
 
 2) Start primary tao_ft_naming process
-	$TAO_ROOT/orbsvcs/Naming_Service/tao_ft_naming --primary \
+	$TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming --primary \
 		-ORBListenEndPoints iiop://<hostname>:<port1> \
 		-m 0 \
 		-r NameService \
@@ -37,7 +37,7 @@ Failover Test
 
 3) Start backup tao_ft_naming process
 
-	$TAO_ROOT/orbsvcs/Naming_Service/tao_ft_naming --backup \
+	$TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming --backup \
 		-ORBListenEndPoints iiop://<hostname>:<port2> \
 		-m 0 \
 		-c $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \
@@ -82,7 +82,7 @@ Persistence Test
 
 2) Start tao_ft_naming
 
-	$TAO_ROOT/orbsvcs/Naming_Service/tao_ft_naming \
+	$TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \
 		-ORBListenEndPoints iiop://<hostname>:<port1> \
 		-g $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \
 		-o $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \
@@ -123,9 +123,9 @@ Persistence Test
 
 5) Terminate tao_ft_naming and then restart it with the original arguments
 
-	kill `pidof $TAO_ROOT/orbsvcs/Naming_Service/tao_ft_naming`
+	kill `pidof $TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming`
 
-	$TAO_ROOT/orbsvcs/Naming_Service/tao_ft_naming \
+	$TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \
 		-ORBListenEndPoints iiop://<hostname>:<port1> \
 		-g $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/nm.ior \
 		-o $TAO_ROOT/orbsvcs/tests/FT_Naming/FaultTolerant/ns.ior \
@@ -180,7 +180,7 @@ Redundant Equivalancy Test
 
 2) Start primary tao_ft_naming process
 
-	$TAO_ROOT/orbsvcs/Naming_Service/tao_ft_naming \
+	$TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \
 	  --primary \
 		-ORBListenEndPoints iiop://<hostname>:<port1> \
 		-o /tmp/ns_primary.ior \
@@ -190,7 +190,7 @@ Redundant Equivalancy Test
 
 3) Start backup tao_ft_naming process
 
-	$TAO_ROOT/orbsvcs/Naming_Service/tao_ft_naming \
+	$TAO_ROOT/orbsvcs/FT_Naming_Service/tao_ft_naming \
 	  --backup \
 		-ORBListenEndPoints iiop://<hostname>:<port2> \
 		-o /tmp/ns_backup.ior \
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
index 9fa2e86f51e..a72ddcbf57a 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_equivalence_test.pl
@@ -315,7 +315,7 @@ sub redundant_equivalency_test()
     my $client_stdout_file        = $client->LocalFile ($stdout_file);
     my $client_stderr_file        = $client->LocalFile ($stderr_file);
 
-    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     # Run two Naming Servers
     my $ns1_args = "--primary ".
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
index ad2aeba4eac..c76c2cb7f19 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_failover_test.pl
@@ -314,7 +314,7 @@ sub failover_test()
                    "-r $name_dir ".
                    "-v $group_dir";
 
-    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     my $client_args = "--failover " .
                       "-ORBDebugLevel $debug_level " .
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
index c71653cfec1..b05c40e6778 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
@@ -313,7 +313,7 @@ sub persistence_test ()
                         "-v $group_dir ".
                         "-u $name_dir ";
 
-    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     my $client1_args = "--persistence " .
                        "--create " .
@@ -455,7 +455,7 @@ sub backup_restore_test ()
                         "-v $group_dir ".
                         "-u $name_dir ";
 
-    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_ft_naming";
+    my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
     my $client1_args = "--persistence " .
                        "--create " .
diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
index b67cb26aa9a..a005fcca1ac 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Federation/run_test.pl
@@ -93,7 +93,7 @@ $ns2->DeleteFile ($ns2_ior);
 $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
 $CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level");
 
-my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_ft_naming";
+my $tao_ft_naming = "$ENV{TAO_ROOT}/orbsvcs/FT_Naming_Service/tao_ft_naming";
 
 my $name_dir1 = "NameService1";
 my $name_dir2 = "NameService2";
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
index 729d20d38aa..d3e8e10845d 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/run_test.pl
@@ -93,7 +93,7 @@ my $args = "-ORBEndPoint $ns_endpoint1 " .
     "-r $naming_persistence_dir " .
     "-v $groups_persistence_dir " .
     "--primary";
-my $prog = "$startdir/../../../Naming_Service/tao_ft_naming";
+my $prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Primary: $prog $args\n";
 
@@ -122,7 +122,7 @@ $args = "-ORBEndPoint $ns_endpoint2 " .
         "-v $groups_persistence_dir " .
         "--backup";
 
-$prog = "$startdir/../../../Naming_Service/tao_ft_naming";
+$prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Backup: $prog $args\n";
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
index 3aa67068b69..b00a02d342e 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
@@ -114,7 +114,7 @@ my $args = "-ORBEndPoint $ns_endpoint1 " .
            "-v $groups_persistence_dir " .
            "-n 100 " .
            "--primary";
-my $prog = "$startdir/../../../Naming_Service/tao_ft_naming";
+my $prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Primary: $prog $args\n";
 
@@ -143,7 +143,7 @@ $args = "-ORBEndPoint $ns_endpoint2 " .
         "-v $groups_persistence_dir " .
         "--backup";
 
-$prog = "$startdir/../../../Naming_Service/tao_ft_naming";
+$prog = "$startdir/../../../FT_Naming_Service/tao_ft_naming";
 
 print STDERR "Starting Backup: $prog $args\n";
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
index df18c6ccee3..0fcea3d6fd1 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl
@@ -155,7 +155,7 @@ sub run_test
 }
 
 @server_exes = ("../../Naming_Service/tao_cosnaming",
-                "../../Naming_Service/tao_ft_naming");
+                "../../FT_Naming_Service/tao_ft_naming");
 
 foreach $e (@server_exes) {
     print STDERR "Testing Naming Service Executable: $e\n";
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
index 37d6ec95f46..b2b85681179 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ft.pl
@@ -67,7 +67,7 @@ $test->DeleteFile($persistent_log_file);
 sub name_server
 {
     my $args = "-u NameService -ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_";
-    my $prog = "$startdir/../../Naming_Service/tao_ft_naming";
+    my $prog = "$startdir/../../FT_Naming_Service/tao_ft_naming";
 
     $SV = $test->CreateProcess ("$prog", "$args");