summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/Naming_Service
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/Naming_Service')
-rw-r--r--TAO/orbsvcs/Naming_Service/Makefile298
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.cpp189
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.dsp445
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.dsw29
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.h78
-rw-r--r--TAO/orbsvcs/Naming_Service/README92
-rw-r--r--TAO/orbsvcs/Naming_Service/svc.conf49
7 files changed, 0 insertions, 1180 deletions
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
deleted file mode 100644
index 31212a10732..00000000000
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ /dev/null
@@ -1,298 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-# Local macros
-#----------------------------------------------------------------------------
-
-BIN = Naming_Service
-
-SRC = $(addsuffix .cpp, $(BIN))
-
-LDLIBS = -lorbsvcs -lTAO
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
-
-#----------------------------------------------------------------------------
-# Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
- TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-#TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Naming_Service.o .obj/Naming_Service.so .shobj/Naming_Service.o .shobj/Naming_Service.so: Naming_Service.cpp Naming_Service.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/Align.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_Table.h \
- $(TAO_ROOT)/tao/Object_Table.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/IIOP_Object.h \
- $(TAO_ROOT)/tao/IIOP_Object.i \
- $(TAO_ROOT)/tao/IIOP_ORB.h \
- $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/IIOP_Interpreter.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
deleted file mode 100644
index 8f1a731c531..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// $Id$
-
-#include "Naming_Service.h"
-
-ACE_RCSID(Naming_Service, Naming_Service, "$Id$")
-
- // Default Constructor.
-
-TAO_Naming_Service::TAO_Naming_Service (void)
- : ior_output_file_ (0),
- pid_file_name_ (0),
- context_size_ (ACE_DEFAULT_MAP_SIZE),
- time_ (0)
-{
-}
-
-// Constructor taking command-line arguments.
-
-TAO_Naming_Service::TAO_Naming_Service (int argc,
- char* argv[])
- : ior_output_file_ (0),
- pid_file_name_ (0),
- context_size_ (ACE_DEFAULT_MAP_SIZE),
- time_ (0)
-{
- this->init (argc, argv);
-}
-
-int
-TAO_Naming_Service::parse_args (int argc,
- char *argv[])
-{
- ACE_Get_Opt get_opts (argc, argv, "do:p:s:t:");
- int c;
- int size, time;
-
- while ((c = get_opts ()) != -1)
- switch (c)
- {
- case 'd': // debug flag.
- TAO_debug_level++;
- break;
- case 'o': // outputs the naming service ior to a file.
- this->ior_output_file_ =
- ACE_OS::fopen (get_opts.optarg, "w");
-
- if (this->ior_output_file_ == 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "Unable to open %s for writing: %p\n",
- get_opts.optarg), -1);
- break;
- case 'p':
- this->pid_file_name_ = get_opts.optarg;
- break;
- case 's':
- size = ACE_OS::atoi (get_opts.optarg);
- if (size >= 0)
- this->context_size_ = size;
- break;
- case 't':
- time = ACE_OS::atoi (get_opts.optarg);
- if (time >= 0)
- this->time_ = time;
- break;
- case '?':
- default:
- ACE_ERROR_RETURN ((LM_ERROR,
- "usage: %s "
- "-NScontextname <contextname> "
- "-o <ior_output_file> "
- "-p <pid_file_name> "
- "\n",
- argv [0]),
- -1);
- }
- return 0;
-}
-
-// Initialize the state of the TAO_Naming_Service object
-int
-TAO_Naming_Service::init (int argc,
- char *argv[])
-{
- int result;
- CORBA::ORB_var orb;
- PortableServer::POA_var child_poa;
-
- TAO_TRY
- {
- this->orb_manager_.init_child_poa (argc,
- argv,
- "child_poa",
- TAO_TRY_ENV);
- TAO_CHECK_ENV;
-
- orb = this->orb_manager_.orb ();
- child_poa = this->orb_manager_.child_poa ();
-
- // Check the non-ORB arguments. this needs to come before we
- // initialize my_naming_server so that we can pass on some of
- // the command-line arguments.
-
- result = this->parse_args (argc, argv);
- if (result < 0)
- return result;
-
- result = this->my_naming_server_.init (orb.in (),
- child_poa.in (),
- context_size_,
- 0,
- 0);
- TAO_CHECK_ENV;
- if (result == -1)
- return result;
- }
- TAO_CATCHANY
- {
- TAO_TRY_ENV.print_exception ("TAO_Naming_Service::init");
- return -1;
- }
- TAO_ENDTRY;
-
- if (this->ior_output_file_ != 0)
- {
- CORBA::String_var str =
- this->my_naming_server_.naming_service_ior ();
- ACE_OS::fprintf (this->ior_output_file_,
- "%s",
- str.in ());
- ACE_OS::fclose (this->ior_output_file_);
- }
-
- if (this->pid_file_name_ != 0)
- {
- FILE *pidf = fopen (this->pid_file_name_, "w");
- if (pidf != 0)
- {
- ACE_OS::fprintf (pidf,
- "%d\n",
- ACE_OS::getpid ());
- ACE_OS::fclose (pidf);
- }
- }
- return 0;
-}
-
-// Run the ORB event loop.
-
-int
-TAO_Naming_Service::run (CORBA_Environment& env)
-{
- if (time_ == 0)
- return this->orb_manager_.run (env);
- else
- {
- ACE_Time_Value *t = new ACE_Time_Value (time_);
- return this->orb_manager_.run (env, t);
- }
-}
-
-// Destructor.
-
-TAO_Naming_Service::~TAO_Naming_Service (void)
-{
-}
-
-int
-main (int argc, char *argv[])
-{
- TAO_Naming_Service naming_service;
-
- int init_result = naming_service.init (argc, argv);
-
- if (init_result == -1)
- return -1;
-
- TAO_TRY
- {
- naming_service.run (TAO_TRY_ENV);
- TAO_CHECK_ENV;
- }
- TAO_CATCHANY
- {
- TAO_TRY_ENV.print_exception ("NamingService");
- return -1;
- }
- TAO_ENDTRY;
- return 0;
-}
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
deleted file mode 100644
index 3f6c88be194..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
+++ /dev/null
@@ -1,445 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Naming_Service" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
-
-CFG=Naming_Service - Win32 Alpha Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "Naming_Service.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "Naming_Service.mak" CFG="Naming_Service - Win32 Alpha Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "Naming_Service - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Service - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Naming_Service - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE "Naming_Service - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-
-!IF "$(CFG)" == "Naming_Service - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Service - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib orbsvcsd.lib aced.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Service - Win32 Alpha Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Naming_S"
-# PROP BASE Intermediate_Dir "Naming_S"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /MDd /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 TAOd.lib orbsvcsd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-# ADD LINK32 TAOd.lib orbsvcsd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-
-!ELSEIF "$(CFG)" == "Naming_Service - Win32 Alpha Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Naming_0"
-# PROP BASE Intermediate_Dir "Naming_0"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
-# SUBTRACT CPP /YX
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 orbsvcs.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "Naming_Service - Win32 Release"
-# Name "Naming_Service - Win32 Debug"
-# Name "Naming_Service - Win32 Alpha Debug"
-# Name "Naming_Service - Win32 Alpha Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\Naming_Service.cpp
-
-!IF "$(CFG)" == "Naming_Service - Win32 Release"
-
-!ELSEIF "$(CFG)" == "Naming_Service - Win32 Debug"
-
-!ELSEIF "$(CFG)" == "Naming_Service - Win32 Alpha Debug"
-
-DEP_CPP_NAMIN=\
- "..\..\..\ace\Acceptor.cpp"\
- "..\..\..\ace\Acceptor.h"\
- "..\..\..\ace\Acceptor.i"\
- "..\..\..\ace\ACE.h"\
- "..\..\..\ace\ACE.i"\
- "..\..\..\ace\Addr.h"\
- "..\..\..\ace\Addr.i"\
- "..\..\..\ace\Atomic_Op.i"\
- "..\..\..\ace\Auto_Ptr.cpp"\
- "..\..\..\ace\Auto_Ptr.h"\
- "..\..\..\ace\Auto_Ptr.i"\
- "..\..\..\ace\Basic_Types.h"\
- "..\..\..\ace\Basic_Types.i"\
- "..\..\..\ace\config-win32-borland.h"\
- "..\..\..\ace\config-win32-common.h"\
- "..\..\..\ace\config-win32.h"\
- "..\..\..\ace\config-WinCE.h"\
- "..\..\..\ace\config.h"\
- "..\..\..\ace\Connector.cpp"\
- "..\..\..\ace\Connector.h"\
- "..\..\..\ace\Connector.i"\
- "..\..\..\ace\Containers.cpp"\
- "..\..\..\ace\Containers.h"\
- "..\..\..\ace\Containers.i"\
- "..\..\..\ace\Dynamic.h"\
- "..\..\..\ace\Dynamic.i"\
- "..\..\..\ace\Dynamic_Service.cpp"\
- "..\..\..\ace\Dynamic_Service.h"\
- "..\..\..\ace\Event_Handler.h"\
- "..\..\..\ace\Event_Handler.i"\
- "..\..\..\ace\Free_List.cpp"\
- "..\..\..\ace\Free_List.h"\
- "..\..\..\ace\Free_List.i"\
- "..\..\..\ace\Get_Opt.h"\
- "..\..\..\ace\Get_Opt.i"\
- "..\..\..\ace\Handle_Set.h"\
- "..\..\..\ace\Handle_Set.i"\
- "..\..\..\ace\Hash_Map_Manager.cpp"\
- "..\..\..\ace\Hash_Map_Manager.h"\
- "..\..\..\ace\inc_user_config.h"\
- "..\..\..\ace\INET_Addr.h"\
- "..\..\..\ace\INET_Addr.i"\
- "..\..\..\ace\IO_Cntl_Msg.h"\
- "..\..\..\ace\iosfwd.h"\
- "..\..\..\ace\IPC_SAP.h"\
- "..\..\..\ace\IPC_SAP.i"\
- "..\..\..\ace\Log_Msg.h"\
- "..\..\..\ace\Log_Priority.h"\
- "..\..\..\ace\Log_Record.h"\
- "..\..\..\ace\Log_Record.i"\
- "..\..\..\ace\Malloc.h"\
- "..\..\..\ace\Malloc.i"\
- "..\..\..\ace\Malloc_Base.h"\
- "..\..\..\ace\Malloc_T.cpp"\
- "..\..\..\ace\Malloc_T.h"\
- "..\..\..\ace\Malloc_T.i"\
- "..\..\..\ace\Managed_Object.cpp"\
- "..\..\..\ace\Managed_Object.h"\
- "..\..\..\ace\Managed_Object.i"\
- "..\..\..\ace\Map_Manager.cpp"\
- "..\..\..\ace\Map_Manager.h"\
- "..\..\..\ace\Map_Manager.i"\
- "..\..\..\ace\Mem_Map.h"\
- "..\..\..\ace\Mem_Map.i"\
- "..\..\..\ace\Memory_Pool.h"\
- "..\..\..\ace\Memory_Pool.i"\
- "..\..\..\ace\Message_Block.h"\
- "..\..\..\ace\Message_Block.i"\
- "..\..\..\ace\Message_Queue.h"\
- "..\..\..\ace\Message_Queue.i"\
- "..\..\..\ace\Message_Queue_T.cpp"\
- "..\..\..\ace\Message_Queue_T.h"\
- "..\..\..\ace\Message_Queue_T.i"\
- "..\..\..\ace\Module.cpp"\
- "..\..\..\ace\Module.h"\
- "..\..\..\ace\Module.i"\
- "..\..\..\ace\Object_Manager.h"\
- "..\..\..\ace\Object_Manager.i"\
- "..\..\..\ace\OS.h"\
- "..\..\..\ace\OS.i"\
- "..\..\..\ace\Reactor.h"\
- "..\..\..\ace\Reactor.i"\
- "..\..\..\ace\Reactor_Impl.h"\
- "..\..\..\ace\Service_Config.h"\
- "..\..\..\ace\Service_Config.i"\
- "..\..\..\ace\Service_Object.h"\
- "..\..\..\ace\Service_Object.i"\
- "..\..\..\ace\Service_Repository.h"\
- "..\..\..\ace\Service_Repository.i"\
- "..\..\..\ace\Service_Types.h"\
- "..\..\..\ace\Service_Types.i"\
- "..\..\..\ace\Shared_Object.h"\
- "..\..\..\ace\Shared_Object.i"\
- "..\..\..\ace\Signal.h"\
- "..\..\..\ace\Signal.i"\
- "..\..\..\ace\Singleton.cpp"\
- "..\..\..\ace\Singleton.h"\
- "..\..\..\ace\Singleton.i"\
- "..\..\..\ace\SOCK.h"\
- "..\..\..\ace\SOCK.i"\
- "..\..\..\ace\SOCK_Acceptor.h"\
- "..\..\..\ace\SOCK_Acceptor.i"\
- "..\..\..\ace\SOCK_Connector.h"\
- "..\..\..\ace\SOCK_Connector.i"\
- "..\..\..\ace\SOCK_Dgram.h"\
- "..\..\..\ace\SOCK_Dgram.i"\
- "..\..\..\ace\SOCK_Dgram_Mcast.h"\
- "..\..\..\ace\SOCK_Dgram_Mcast.i"\
- "..\..\..\ace\SOCK_IO.h"\
- "..\..\..\ace\SOCK_IO.i"\
- "..\..\..\ace\SOCK_Stream.h"\
- "..\..\..\ace\SOCK_Stream.i"\
- "..\..\..\ace\SString.h"\
- "..\..\..\ace\SString.i"\
- "..\..\..\ace\Strategies.h"\
- "..\..\..\ace\Strategies.i"\
- "..\..\..\ace\Strategies_T.cpp"\
- "..\..\..\ace\Strategies_T.h"\
- "..\..\..\ace\Strategies_T.i"\
- "..\..\..\ace\Stream_Modules.cpp"\
- "..\..\..\ace\Stream_Modules.h"\
- "..\..\..\ace\Stream_Modules.i"\
- "..\..\..\ace\streams.h"\
- "..\..\..\ace\SV_Semaphore_Complex.h"\
- "..\..\..\ace\SV_Semaphore_Complex.i"\
- "..\..\..\ace\SV_Semaphore_Simple.h"\
- "..\..\..\ace\SV_Semaphore_Simple.i"\
- "..\..\..\ace\Svc_Conf_Tokens.h"\
- "..\..\..\ace\Svc_Handler.cpp"\
- "..\..\..\ace\Svc_Handler.h"\
- "..\..\..\ace\Svc_Handler.i"\
- "..\..\..\ace\Synch.h"\
- "..\..\..\ace\Synch.i"\
- "..\..\..\ace\Synch_Options.h"\
- "..\..\..\ace\Synch_Options.i"\
- "..\..\..\ace\Synch_T.cpp"\
- "..\..\..\ace\Synch_T.h"\
- "..\..\..\ace\Synch_T.i"\
- "..\..\..\ace\Task.h"\
- "..\..\..\ace\Task.i"\
- "..\..\..\ace\Task_T.cpp"\
- "..\..\..\ace\Task_T.h"\
- "..\..\..\ace\Task_T.i"\
- "..\..\..\ace\Thread.h"\
- "..\..\..\ace\Thread.i"\
- "..\..\..\ace\Thread_Manager.h"\
- "..\..\..\ace\Thread_Manager.i"\
- "..\..\..\ace\Time_Value.h"\
- "..\..\..\ace\Timer_Queue.h"\
- "..\..\..\ace\Timer_Queue_T.cpp"\
- "..\..\..\ace\Timer_Queue_T.h"\
- "..\..\..\ace\Timer_Queue_T.i"\
- "..\..\..\ace\Trace.h"\
- "..\..\..\ace\WFMO_Reactor.h"\
- "..\..\..\ace\WFMO_Reactor.i"\
- "..\..\..\ace\ws2tcpip.h"\
- "..\..\tao\align.h"\
- "..\..\tao\any.h"\
- "..\..\tao\any.i"\
- "..\..\tao\cdr.h"\
- "..\..\tao\cdr.i"\
- "..\..\tao\Client_Strategy_Factory.h"\
- "..\..\tao\connect.h"\
- "..\..\tao\connect.i"\
- "..\..\tao\corba.h"\
- "..\..\tao\CurrentC.h"\
- "..\..\tao\CurrentC.i"\
- "..\..\tao\debug.h"\
- "..\..\tao\default_client.h"\
- "..\..\tao\default_client.i"\
- "..\..\tao\default_server.h"\
- "..\..\tao\default_server.i"\
- "..\..\tao\Environment.h"\
- "..\..\tao\Environment.i"\
- "..\..\tao\Exception.h"\
- "..\..\tao\Exception.i"\
- "..\..\tao\giop.h"\
- "..\..\tao\giop.i"\
- "..\..\tao\IIOP_Interpreter.h"\
- "..\..\tao\IIOP_Object.h"\
- "..\..\tao\IIOP_Object.i"\
- "..\..\tao\IIOP_ORB.h"\
- "..\..\tao\IIOP_ORB.i"\
- "..\..\tao\Invocation.h"\
- "..\..\tao\Invocation.i"\
- "..\..\tao\marshal.h"\
- "..\..\tao\marshal.i"\
- "..\..\tao\nvlist.h"\
- "..\..\tao\NVList.i"\
- "..\..\tao\object.h"\
- "..\..\tao\object.i"\
- "..\..\tao\Object_KeyC.h"\
- "..\..\tao\Object_KeyC.i"\
- "..\..\tao\Object_Table.h"\
- "..\..\tao\Operation_Table.h"\
- "..\..\tao\orb.h"\
- "..\..\tao\ORB.i"\
- "..\..\tao\orb_core.h"\
- "..\..\tao\orb_core.i"\
- "..\..\tao\ORB_Strategies_T.cpp"\
- "..\..\tao\ORB_Strategies_T.h"\
- "..\..\tao\ORB_Strategies_T.i"\
- "..\..\tao\orbconf.h"\
- "..\..\tao\params.h"\
- "..\..\tao\params.i"\
- "..\..\tao\poa.h"\
- "..\..\tao\POA.i"\
- "..\..\tao\POA_CORBA.h"\
- "..\..\tao\poa_macros.h"\
- "..\..\tao\poaC.h"\
- "..\..\tao\poaC.i"\
- "..\..\tao\poaS.h"\
- "..\..\tao\poaS.i"\
- "..\..\tao\PolicyC.h"\
- "..\..\tao\PolicyC.i"\
- "..\..\tao\Principal.h"\
- "..\..\tao\Principal.i"\
- "..\..\tao\request.h"\
- "..\..\tao\Request.i"\
- "..\..\tao\sequence.h"\
- "..\..\tao\sequence.i"\
- "..\..\tao\Sequence_T.cpp"\
- "..\..\tao\Sequence_T.h"\
- "..\..\tao\Sequence_T.i"\
- "..\..\tao\servant_base.h"\
- "..\..\tao\Server_Request.h"\
- "..\..\tao\Server_Request.i"\
- "..\..\tao\Server_Strategy_Factory.h"\
- "..\..\tao\singletons.h"\
- "..\..\tao\stub.h"\
- "..\..\tao\stub.i"\
- "..\..\tao\TAO.h"\
- "..\..\tao\typecode.h"\
- "..\..\tao\typecode.i"\
- "..\..\tao\Union.h"\
- "..\..\tao\varout.cpp"\
- "..\..\tao\varout.h"\
- "..\..\tao\varout.i"\
- "..\orbsvcs\CosNamingC.h"\
- "..\orbsvcs\CosNamingC.i"\
- "..\orbsvcs\CosNamingS.h"\
- "..\orbsvcs\CosNamingS.i"\
- "..\orbsvcs\CosNamingS_T.cpp"\
- "..\orbsvcs\CosNamingS_T.h"\
- "..\orbsvcs\CosNamingS_T.i"\
- "..\orbsvcs\IOR_Multicast.h"\
- "..\orbsvcs\Naming\CosNaming_i.h"\
- "..\orbsvcs\Naming\Entries.h"\
- "..\orbsvcs\Naming\Naming_Utils.h"\
- "..\orbsvcs\orbsvcs_export.h"\
- ".\Naming_Service.h"\
-
-NODEP_CPP_NAMIN=\
- "..\..\..\ace\sys_conf.h"\
-
-
-!ELSEIF "$(CFG)" == "Naming_Service - Win32 Alpha Release"
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\CosNaming_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Naming_Service.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\NS_CosNaming.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsw b/TAO/orbsvcs/Naming_Service/Naming_Service.dsw
deleted file mode 100644
index e306b797e57..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Naming_Service"=.\Naming_Service.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
deleted file mode 100644
index ae7fe95ce48..00000000000
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-// orbsvcs/Naming_Service/Naming_Service
-//
-// = FILENAME
-// Naming_Service.h
-//
-// = DESCRIPTION
-// This class implements the functionality of a Naming_Service in
-// a stand-alone process.
-//
-// = AUTHORS
-// Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (TAO_NAMING_SERVICE_H)
-#define TAO_NAMING_SERVICE_H
-
-#include "tao/TAO.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-class TAO_Naming_Service
-{
- // = TITLE
- // Defines a class that encapsulates the implementation of the
- // COS Naming Service.
- //
- // = DESCRIPTION
- // This class makes use of the <TAO_Naming_Server> and
- // <TAO_ORB_Manager> class to implement the COS Naming Service.
-public:
- TAO_Naming_Service (void);
- // Default Constructor.
-
- TAO_Naming_Service (int argc, char *argv[]);
- // Constructor taking the command-line arguments.
-
- int init (int argc, char *argv[]);
- // Initialize the Naming Service with the arguments.
-
- int run (CORBA_Environment& env);
- // Run the TAO_Naming_Service.
-
- ~TAO_Naming_Service (void);
- // Destructor.
-
-private:
- int parse_args (int argc, char *argv[]);
- // parses the arguments.
-
- TAO_ORB_Manager orb_manager_;
- // The ORB manager.
-
- TAO_Naming_Server my_naming_server_;
- // Naming Server instance.
-
- FILE *ior_output_file_;
- // File to output the Naming Service IOR.
-
- const char *pid_file_name_;
- // File to output the process id.
-
- size_t context_size_;
- // Size of the hash_table allocated upon the creation of the Naming
- // Service context (if one is created). Note: all the contexts
- // created under the given context will use the same size for their
- // initial hash table allocations.
-
- size_t time_;
- // After how long the server should stop listening to requests (in
- // seconds).
-};
-
-#endif /* TAO_NAMING_SERVICE_H */
diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README
deleted file mode 100644
index 8b821342e53..00000000000
--- a/TAO/orbsvcs/Naming_Service/README
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-
- This directory contains the files that implement the TAO
-Naming Service. The TAO Naming Service uses IP Multicast to process
-client "resolve_initial_references()" requests.
-
-To Run:
-======
-
-% Naming_Service [-ORBport port]
- [-ORBobjrefstyle url]
- [-ORBnameserviceport nsport]
- [-s context_size]
- [-t time]
-
-Arguments:
-==========
- port
- The ORB port.
-
- nsport
- Multicast port.
-
- context_size
- Size of the hash table allocated upon the creation of
- the root Naming Context (if one is created). All
- contexts created under the root will use the same
- size for their hash tables. The default is 1024.
-
- time
- How long the server should listen for requests before
- exiting.
-
-Environment Variables:
-=====================
-
- NameServicePort - Multicast port.
-
-Sample Run:
-==========
-
-% Naming_Service -ORBport 20000 -ORBobjrefstyle url -ORBnameserviceport 19999
-starting up daemon <unknown>
-opening dynamic service Resource_Factory
-did dynamic on Resource_Factory, error = 0
-opening dynamic service Client_Strategy_Factory
-did dynamic on Client_Strategy_Factory, error = 0
-opening dynamic service Server_Strategy_Factory
-did dynamic on Server_Strategy_Factory, error = 0
-listening as object <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
-The multicast server setup is done.
-
-NameService Client:
-==================
-
-A client of the TAO Naming Service will use the ORB
-resolve_initial_references() method to resolve the "NamingService"
-object service. By default, this resolution is performed using
-Multicast. This behavior can be overridden in the following ways:
-
- 1. Pass the argument -ORBnameserviceior ior.
- This ior is got from the output of the Naming_Service from
- line 'listening as object <iiop:..>'.
-
- For example, If a client wants to use the Naming_Service
- from the sample run it could use:
-
- % client - ORBnameserviceior
- <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
-
- 2. Set the environment variable `NameService' (minus the
- quotes), as follows in csh or tcsh:
-
- % setenv NameService <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
-
- and then run the client,
-
- % client <.. client's arguments>
-
-These two techniques may be needed in an environment where
-
- 1. There is more than one NamingService, to avoid the
- confusion of a server registering its object with one
- NamingService and the client getting the reply from some
- other NamingService.
-
- 2. The OS platform doesn't support multicast.
-
- 3. The client or server isn't written using TAO, and therefore
- doesn't use TAO's multicast NameService resolution protocol.
-
-
diff --git a/TAO/orbsvcs/Naming_Service/svc.conf b/TAO/orbsvcs/Naming_Service/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/Naming_Service/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO. There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory. These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-# - both client and server strategies are specified in the same
-# file, which would only make sense for co-located clients & servers
-# - both of the factories are actually sourced out of libTAO.so
-# (TAO.DLL on Win32), and they would normally be in a separate
-# dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-# -ORBresources <which>
-# where <which> can be 'global' to specify globally-held resources,
-# or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-# <none currently>
-#
-# The options which can be passed to the Server are:
-#
-# -ORBconcurrency <which>
-# where <which> can be 'thread-per-connection' to specify
-# use of the ACE_Threaded_Strategy concurrency strategy,
-# or 'reactive' to specify use of the ACE_Reactive_Strategy
-# concurrency strategy.
-#
-# -ORBthreadflags <flags>
-# specifies the default thread flags to use, where <flags> is a
-# logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-# THR_SUSPENDED, or THR_DAEMON. Note that not every flag may be valid
-# on every platform.
-#
-# -ORBdemuxstrategy <which>
-# where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-# and specifies the type of object lookup strategy used internally.
-# -ORBtablesize <unsigned>
-# specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"