5 files changed, 33 insertions, 100 deletions
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index e2c02543132..aeee835b58d 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -7,64 +7,66 @@ TAO_BUILDDIR = $(top_builddir)
 
 ## Makefile.NT_Naming_Service.am 
 
-bin_PROGRAMS = NT_Naming_Service
+noinst_PROGRAMS = NT_Naming_Service
 
 NT_Naming_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 NT_Naming_Service_SOURCES = \
-  NT_Naming_Server.cpp \
-  NT_Naming_Service.cpp \
   Naming_Service.cpp \
-  NT_Naming_Service.h \
-  Naming_Service.h
+  NT_Naming_Server.cpp \
+  NT_Naming_Service.cpp
 
 NT_Naming_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS = \
+  NT_Naming_Service.h \
+  Naming_Service.h
+
 ## Makefile.Naming_Service.am 
 
-bin_PROGRAMS += Naming_Service
+noinst_PROGRAMS += Naming_Service
 
 Naming_Service_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+ -I$(ACE_ROOT) \
+ -I$(ACE_BUILDDIR) \
+ -I$(TAO_ROOT) \
+ -I$(TAO_BUILDDIR) \
+ -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 Naming_Service_SOURCES = \
   Naming_Server.cpp \
-  Naming_Service.cpp \
-  Naming_Service.h
+  Naming_Service.cpp
 
 Naming_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+noinst_HEADERS += \
+  Naming_Service.h
+
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 9dd785b891e..a16d6d434dc 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -3,34 +3,6 @@
 #include "Naming_Service.h"
 #include "ace/OS_main.h"
 
-#include <orbsvcs/Shutdown_Utilities.h>
-#include <tao/debug.h>
-
-class Naming_Svc_Shutdown : public Shutdown_Functor
-{
-public:
-  Naming_Svc_Shutdown(TAO_Naming_Service& ns);
-
-  void operator() (int which_signal);
-private:
-  TAO_Naming_Service& ns_;
-};
-
-Naming_Svc_Shutdown::Naming_Svc_Shutdown (TAO_Naming_Service &ns)
-  : ns_(ns)
-{
-}
-
-void
-Naming_Svc_Shutdown::operator() (int which_signal)
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Name Service: shutting down on signal %d\n",
-                which_signal));
-  (void) this->ns_.shutdown ();
-}
-
 // Driver function for the TAO Naming Service.
 
 int
@@ -38,10 +10,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TAO_Naming_Service naming_service;
 
-  // Stuff to insure that we're gracefully shut down...
-  Naming_Svc_Shutdown killer (naming_service);
-  Service_Shutdown kill_contractor(killer);
-
   if (naming_service.init (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_LIB_TEXT("Failed to start the Naming Service.\n")),
@@ -61,7 +29,5 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   ACE_ENDTRY;
   ACE_CHECK_RETURN (1);
 
-  naming_service.fini ();
-
   return 0;
 }
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 1d57246d2f1..5cbe18e4aae 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -122,35 +122,6 @@ TAO_Naming_Service::run (ACE_ENV_SINGLE_ARG_DECL)
   return 0;
 }
 
-void
-TAO_Naming_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-int
-TAO_Naming_Service::fini (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  this->my_naming_server_.fini();
-
-  ACE_TRY
-  {
-    // destroy implies shutdown
-    this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::fini");
-    return -1;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 // Destructor.
 TAO_Naming_Service::~TAO_Naming_Service (void)
 {
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index b2326ebabab..8bcbfcecf2d 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -21,7 +21,7 @@
 #define TAO_NAMING_SERVICE_H
 
 #include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Server.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
 
 class TAO_Naming_Service
 {
@@ -42,15 +42,9 @@ public:
   virtual int init (int argc, ACE_TCHAR* argv[]);
   // Initialize the Naming Service with the arguments.
 
-  virtual int fini (void);
-  // The opposite of init().
-
   int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Run the TAO_Naming_Service.
 
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  // Shut down the TAO_Naming_Service; you must still call fini().
-
   virtual ~TAO_Naming_Service (void);
   // Destructor.
 
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index 7a96a9e6d25..ff877b2864f 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, naming_serv {
+project : orbsvcsexe, core, naming {
   exename  = Naming_Service
   Source_Files {
     Naming_Server.cpp
@@ -9,7 +9,7 @@ project : orbsvcsexe, core, naming_serv {
   }
 }
 
-project(NT_Naming_Service) : orbsvcsexe, core, naming_serv {
+project(NT_Naming_Service) : orbsvcsexe, core, naming {
   exename  = NT_Naming_Service
   Source_Files {
     Naming_Service.cpp