summaryrefslogtreecommitdiff
path: root/netsvcs/clients/Naming/Client
diff options
context:
space:
mode:
Diffstat (limited to 'netsvcs/clients/Naming/Client')
-rw-r--r--netsvcs/clients/Naming/Client/Client.dsw44
-rw-r--r--netsvcs/clients/Naming/Client/Client_Test.cpp647
-rw-r--r--netsvcs/clients/Naming/Client/Client_Test.dsp97
-rw-r--r--netsvcs/clients/Naming/Client/Client_Test.h12
-rw-r--r--netsvcs/clients/Naming/Client/Makefile329
-rw-r--r--netsvcs/clients/Naming/Client/Makefile.am36
-rw-r--r--netsvcs/clients/Naming/Client/Makefile.bor8
-rw-r--r--netsvcs/clients/Naming/Client/README123
-rw-r--r--netsvcs/clients/Naming/Client/main.cpp79
-rw-r--r--netsvcs/clients/Naming/Client/main.dsp93
-rw-r--r--netsvcs/clients/Naming/Client/svc.conf7
-rw-r--r--netsvcs/clients/Naming/Client/svc2.conf9
12 files changed, 0 insertions, 1484 deletions
diff --git a/netsvcs/clients/Naming/Client/Client.dsw b/netsvcs/clients/Naming/Client/Client.dsw
deleted file mode 100644
index ce0f3f09d41..00000000000
--- a/netsvcs/clients/Naming/Client/Client.dsw
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "Client_Test"=.\Client_Test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "main"=.\main.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name Client_Test
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
deleted file mode 100644
index 2df1e540275..00000000000
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ /dev/null
@@ -1,647 +0,0 @@
-// $Id$
-
-#define ACE_BUILD_SVC_DLL
-
-#include "ace/Service_Config.h"
-#include "ace/Naming_Context.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Thread_Manager.h"
-#include "Client_Test.h"
-
-ACE_RCSID(Client, Client_Test, "$Id$")
-
-class ACE_Svc_Export Client_Test : public ACE_Service_Object
-{
-public:
- Client_Test (void);
-
- int open (void);
- // Cache reactor and then register self with reactor
-
- int close (void);
- // Close things down and free up resources.
-
- virtual int handle_input (ACE_HANDLE handle);
- // Handle user entered commands
-
- virtual int init (int argc, char *argv[]);
- // Initialize name options and naming context when dynamically
- // linked.
-
- virtual int fini (void);
- // Close down the test when dynamically unlinked.
-
- void list_options (void);
- // Print name options
-
- int bind (const char *key,
- const char *value,
- const char *type = "");
- // Bind a key to a value
-
- int unbind (const char *key);
- // Unbind a name binding
-
- int rebind (const char *key,
- const char *value,
- const char *type = "");
- // Rebind a name binding
-
- int find (const char *key);
- // Find the value associated with a key
-
- int list_names (const char *pattern);
- // Find all names that match pattern
-
- int list_values (const char *pattern);
- // Find all values that match pattern
-
- int list_types (const char *pattern);
- // Find all types that match pattern
-
- int list_name_entries (const char *pattern);
- // Find all names that match pattern
-
- int list_value_entries (const char *pattern);
- // Find all values that match pattern
-
- int list_type_entries (const char *pattern);
- // Find all types that match pattern
-
-private:
- ACE_Name_Options *name_options_;
- // Name Options associated with the Naming Context
-
- void display_menu (void);
- // Display user menu
-
- int set_proc_local (void);
- // Set options to use PROC_LOCAL naming context
-
- int set_node_local (void);
- // Set options to use NODE_LOCAL naming context
-
- int set_host (const char *hostname, int port);
- // Set options to use NET_LOCAL naming context specifying host name
- // and port number
-
- int quit (void);
- // Gracefully exit
-};
-
-// The following Factory is used by the ACE_Service_Config and
-// svc.conf file to dynamically initialize the state of the client
-// test.
-
-ACE_SVC_FACTORY_DEFINE (Client_Test)
-
-// Get the instance of Name_Service using Dynamic_Service
-
-//inline Name_Service *
-//NAME_SERVICE (void)
-
-inline ACE_Naming_Context *
-NAMING_CONTEXT (void)
-{
- return ACE_Dynamic_Service<ACE_Naming_Context>::instance ("ACE_Naming_Context");
-}
-
-Client_Test::Client_Test (void)
-{
- ACE_DEBUG ((LM_DEBUG,
- "Client_Test::Client_Test\n"));
-}
-
-int
-Client_Test::init (int /* argc */,
- char * /* argv */ [])
-{
- ACE_DEBUG ((LM_DEBUG, "Client_Test::init\n"));
-
- // Cache the name options.
- this->name_options_ = NAMING_CONTEXT ()->name_options ();
- return this->open ();
-}
-
-int
-Client_Test::open (void)
-{
- this->display_menu ();
-
- if (ACE_Event_Handler::register_stdin_handler (this,
- ACE_Reactor::instance (),
- ACE_Thread_Manager::instance ()) == -1)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p\n",
- "register_stdin_handler"),
- -1);
- return 0;
-}
-
-
-int
-Client_Test::close (void)
-{
- // Deregister this handler with the ACE_Reactor.
- return ACE_Reactor::instance ()->remove_handler
- (ACE_STDIN,
- ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK);
-}
-
-int
-Client_Test::fini (void)
-{
- ACE_DEBUG ((LM_DEBUG,
- "Client_Test::fini\n"));
- return this->close ();
-}
-
-int
-Client_Test::handle_input (ACE_HANDLE)
-{
- char option[BUFSIZ];
- char buf1[BUFSIZ];
- char buf2[BUFSIZ];
- char buf3[BUFSIZ];
- char *temp_buf;
- int port;
- char input[1024];
-
- if (::scanf ("%s", option) <= 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Try again!\n",
- "Client_Test::handle_input"),
- 0);
-
- int result = -1;
-
- switch (isupper (option[0]) ? tolower (option[0]) : option[0])
- {
- case 'p' :
- result = this->set_proc_local ();
- break;
- case 'n' :
- result = this->set_node_local ();
- break;
- case 'h' :
- if (::scanf ("%s %d", buf1, &port) <= 0)
- break;
- result = this->set_host (buf1, port);
- break;
- case 'b' :
- // get the input from stdin
- ACE_OS::fgets (input, sizeof input, stdin);
-
- // get the key
- if ((temp_buf = ACE_OS::strtok (input, " ")))
- {
- ACE_OS::strcpy (buf1, temp_buf);
-
- temp_buf = ACE_OS::strtok (0, " ");
-
- // get the value
- if (temp_buf)
- {
- ACE_OS::strcpy (buf2, temp_buf);
-
- temp_buf = ACE_OS::strtok (0, " ");
-
- // get the type (if entered).
- if (temp_buf)
- {
- ACE_OS::strcpy (buf3, temp_buf);
- result = this->bind (buf1, buf2, buf3);
- }
- else
- result = this->bind (buf1, buf2);
- }
- else
- ACE_ERROR ((LM_ERROR,
- "Bind Failed! Value not entered.\n"));
- }
- else
- ACE_ERROR ((LM_ERROR,
- "Bind Failed! Key and Value not entered.\n"));
- break;
- case 'u' :
- if (::scanf ("%s", buf1) <= 0)
- break;
- result = this->unbind (buf1);
- break;
- case 'r' :
- // get the input from stdin
- ACE_OS::fgets (input, sizeof input, stdin);
-
- temp_buf = ACE_OS::strtok (input, " ");
- // get the key
- if (temp_buf)
- {
- ACE_OS::strcpy (buf1, temp_buf);
-
- temp_buf = ACE_OS::strtok (0, " ");
-
- // get the value
- if (temp_buf)
- {
- ACE_OS::strcpy (buf2, temp_buf);
-
- temp_buf = ACE_OS::strtok (0, " ");
- // get the type (if entered)
- if (temp_buf)
- {
- ACE_OS::strcpy (buf3, temp_buf);
- result = this->rebind (buf1, buf2, buf3);
- }
- else
- result = this->rebind (buf1, buf2);
- }
- else
- ACE_ERROR ((LM_ERROR,
- "Rebind Failed! Value not entered.\n"));
- }
- else
- ACE_ERROR ((LM_ERROR,
- "Reind Failed! Key and value not entered.\n"));
- break;
- case 'f' :
- if (::scanf ("%s", buf1) <= 0)
- break;
- result = this->find (buf1);
- break;
- case 'j' :
- if (::scanf ("%s", buf1) <= 0)
- break;
- else
- result = this->list_names (buf1);
- break;
- case 'k' :
- if (::scanf ("%s", buf1) <= 0)
- break;
- else
- result = this->list_values (buf1);
- break;
- case 'l' :
- if (::scanf ("%s", buf1) <= 0)
- break;
- else
- result = this->list_types (buf1);
- break;
- case 'c' :
- if (::scanf ("%s", buf1) <= 0)
- break;
- else
- result = this->list_name_entries (buf1);
- break;
- case 'd' :
- if (::scanf ("%s", buf1) <= 0)
- break;
- else
- result = this->list_value_entries (buf1);
- break;
- case 'e' :
- if (::scanf ("%s", buf1) <= 0)
- break;
- else
- result = this->list_type_entries (buf1);
- break;
- case 'q' :
- result = this->quit ();
- break;
- default :
- ACE_DEBUG ((LM_DEBUG,
- "Unrecognized command.\n"));
- }
-
- this->display_menu ();
- return result;
-}
-
-void
-Client_Test::display_menu (void)
-{
- ACE_DEBUG ((LM_DEBUG, "\n"));
- this->list_options ();
- ACE_DEBUG ((LM_DEBUG, " Name Service Main Menu\n"));
- ACE_DEBUG ((LM_DEBUG, " ----------------------\n"));
- ACE_DEBUG ((LM_DEBUG, "<P> Use Process Local Database\n"));
- ACE_DEBUG ((LM_DEBUG, "<N> Use Node Local Database\n"));;
- ACE_DEBUG ((LM_DEBUG, "<H> Set Remote Name server <host> and <port>\n\n"));
- ACE_DEBUG ((LM_DEBUG, "<B> Bind <key> <value> [<type>]\n"));
- ACE_DEBUG ((LM_DEBUG, "<U> Unbind <key>\n"));
- ACE_DEBUG ((LM_DEBUG, "<R> Rebind <key> <value> [<type>]\n"));
- ACE_DEBUG ((LM_DEBUG, "<F> Find <key>\n"));
- ACE_DEBUG ((LM_DEBUG, "<J> Lookup keys matching <pattern>\n"));
- ACE_DEBUG ((LM_DEBUG, "<K> Lookup values matching <pattern>\n"));
- ACE_DEBUG ((LM_DEBUG, "<L> Lookup types matching <pattern>\n"));
- ACE_DEBUG ((LM_DEBUG, "<C> Complete lookup keys matching <pattern>\n"));
- ACE_DEBUG ((LM_DEBUG, "<D> Complete lookup values matching <pattern>\n"));
- ACE_DEBUG ((LM_DEBUG, "<E> Complete lookup types matching <pattern>\n"));
-
- ACE_DEBUG ((LM_DEBUG, "<Q> or ^C (exit)\n"));
-}
-
-void
-Client_Test::list_options (void)
-{
- switch (this->name_options_->context ())
- {
- case ACE_Naming_Context::PROC_LOCAL:
- ACE_DEBUG ((LM_DEBUG,
- " *** Using Process Local Database\n"));
- break;
- case ACE_Naming_Context::NODE_LOCAL:
- ACE_DEBUG ((LM_DEBUG,
- " *** Using Node Local Database\n"));
- break;
- case ACE_Naming_Context::NET_LOCAL:
- ACE_DEBUG ((LM_DEBUG,
- " *** Hostname: %s\n",
- this->name_options_->nameserver_host ()));
- ACE_DEBUG ((LM_DEBUG,
- " *** Port Number: %d\n",
- this->name_options_->nameserver_port ()));
- break;
- default:
- assert (!"shouldn't occur!\n");
- /* NOTREACHED */
- }
- ACE_DEBUG ((LM_DEBUG,
- " *** Namespace directory is %s ***\n",
- this->name_options_->namespace_dir ()));
-}
-
-int
-Client_Test::set_proc_local (void)
-{
- // Close down original name space
- NAMING_CONTEXT ()->close ();
- this->name_options_->nameserver_host ("localhost");
- this->name_options_->context (ACE_Naming_Context::PROC_LOCAL);
- return NAMING_CONTEXT ()->open (ACE_Naming_Context::PROC_LOCAL);
-}
-
-int
-Client_Test::set_node_local (void)
-{
- // Close down original name space
- NAMING_CONTEXT ()->close ();
- this->name_options_->nameserver_host ("localhost");
- this->name_options_->context (ACE_Naming_Context::NODE_LOCAL);
- return NAMING_CONTEXT ()->open (ACE_Naming_Context::NODE_LOCAL);
-}
-
-int
-Client_Test::set_host (const char *hostname, int port)
-{
- // Close down original name space
- NAMING_CONTEXT ()->close ();
-
- this->name_options_->context (ACE_Naming_Context::NET_LOCAL);
- // Set Name Options
- this->name_options_->nameserver_host (hostname);
- this->name_options_->nameserver_port (port);
-
- return NAMING_CONTEXT ()->open (ACE_Naming_Context::NET_LOCAL);
-}
-
-int
-Client_Test::quit (void)
-{
- // Send ourselves a SIGINT!
- return ACE_OS::kill (ACE_OS::getpid (), SIGINT);
-}
-
-int
-Client_Test::bind (const char *key,
- const char *value,
- const char *type)
-{
- if (NAMING_CONTEXT ()->bind (key, value, type) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Bind failed! Key %s exists\n",
- "Client_Test::bind",
- key),
- 0);
- return 0;
-}
-
-int
-Client_Test::unbind (const char *key)
-{
- if (NAMING_CONTEXT ()->unbind (key) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Unbind failed! Key %s not found\n",
- "Client_Test::unbind",
- key),
- 0);
- return 0;
-}
-
-int
-Client_Test::rebind (const char *key,
- const char *value,
- const char *type)
-{
- int result = NAMING_CONTEXT ()->rebind (key, value, type );
- return result == 1 ? 0 : result;
-}
-
-int
-Client_Test::list_names (const char *pattern)
-{
- ACE_PWSTRING_SET set;
-
- if (NAMING_CONTEXT ()->list_names (set, pattern) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Pattern matching failed!\n",
- "Client_Test::list_names"),
- 0);
- else
- {
- ACE_PWSTRING_ITERATOR set_iterator (set);
-
- for (ACE_WString *name = 0;
- set_iterator.next (name) !=0;
- set_iterator.advance())
- ACE_DEBUG ((LM_DEBUG,
- "%s\n",
- name->char_rep ()));
- }
- return 0;
-}
-
-int
-Client_Test::list_values (const char *pattern)
-{
- ACE_PWSTRING_SET set;
-
- if (NAMING_CONTEXT ()->list_values (set, pattern) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Pattern matching failed!\n",
- "Client_Test::list_values"),
- 0);
- else
- {
- ACE_PWSTRING_ITERATOR set_iterator (set);
-
- for (ACE_WString *value = 0;
- set_iterator.next (value) !=0;
- set_iterator.advance())
- ACE_DEBUG ((LM_DEBUG,
- "%s\n",
- value->char_rep ()));
- }
- return 0;
-}
-
-int
-Client_Test::list_types (const char *pattern)
-{
- ACE_PWSTRING_SET set;
-
- if (NAMING_CONTEXT ()->list_types (set, pattern) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Pattern matching failed!\n",
- "Client_Test::list_types"),
- 0);
- else
- {
- ACE_PWSTRING_ITERATOR set_iterator (set);
-
- for (ACE_WString *type = 0;
- set_iterator.next (type) !=0;
- set_iterator.advance())
- ACE_DEBUG ((LM_DEBUG,
- "%s\n",
- type->char_rep ()));
- }
- return 0;
-}
-
-int
-Client_Test::list_name_entries (const char *pattern)
-{
- ACE_BINDING_SET set;
-
- if (NAMING_CONTEXT ()->list_name_entries (set, pattern) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Pattern matching failed!\n",
- "Client_Test::list_names"),
- 0);
- else
- {
- ACE_BINDING_ITERATOR set_iterator (set);
-
- for (ACE_Name_Binding *entry = 0;
- set_iterator.next (entry) !=0;
- set_iterator.advance())
- {
- ACE_DEBUG ((LM_DEBUG,
- "%s\t",
- entry->name_.char_rep ()));
- ACE_DEBUG ((LM_DEBUG,
- "%s\t",
- entry->value_.char_rep ()));
- if (entry->type_)
- ACE_DEBUG ((LM_DEBUG,
- "%s\n",
- entry->type_));
- }
- }
- return 0;
-}
-
-int
-Client_Test::list_value_entries (const char *pattern)
-{
- ACE_BINDING_SET set;
-
- if (NAMING_CONTEXT ()->list_value_entries (set, pattern) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Pattern matching failed!\n",
- "Client_Test::list_values"),
- 0);
- else
- {
- ACE_BINDING_ITERATOR set_iterator (set);
- for (ACE_Name_Binding *entry = 0;
- set_iterator.next (entry) !=0;
- set_iterator.advance())
- {
- ACE_DEBUG ((LM_DEBUG,
- "%s\t",
- entry->name_.char_rep ()));
- ACE_DEBUG ((LM_DEBUG,
- "%s\t",
- entry->value_.char_rep ()));
- if (entry->type_)
- ACE_DEBUG ((LM_DEBUG,
- "%s\n",
- entry->type_));
- }
- }
- return 0;
-}
-
-int
-Client_Test::list_type_entries (const char *pattern)
-{
- ACE_BINDING_SET set;
-
- if (NAMING_CONTEXT ()->list_type_entries (set, pattern) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Pattern matching failed!\n",
- "Client_Test::list_types"),
- 0);
- else
- {
- ACE_BINDING_ITERATOR set_iterator (set);
-
- for (ACE_Name_Binding *entry = 0;
- set_iterator.next (entry) !=0;
- set_iterator.advance())
- {
- ACE_DEBUG ((LM_DEBUG,
- "%s\t",
- entry->name_.char_rep ()));
- ACE_DEBUG ((LM_DEBUG,
- "%s\t",
- entry->value_.char_rep ()));
- ACE_DEBUG ((LM_DEBUG,
- "%s\n",
- entry->type_));
- }
- }
- return 0;
-}
-
-int
-Client_Test::find (const char *key)
-{
- char *value = 0;
- char *type = 0;
-
- if (NAMING_CONTEXT ()->resolve (key, value, type) != 0)
- ACE_ERROR_RETURN ((LM_ERROR,
- "%p Find failed! Key %s not found\n",
- "Client_Test::list_find",
- key),
- 0);
- else
- {
- ACE_DEBUG ((LM_DEBUG,
- "Binding for %s : value = %s\ttype = %s\n",
- key,
- value,
- type));
- if (type)
- delete [] type;
- return 0;
- }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Dynamic_Service<ACE_Naming_Context>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Dynamic_Service<ACE_Naming_Context>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/netsvcs/clients/Naming/Client/Client_Test.dsp b/netsvcs/clients/Naming/Client/Client_Test.dsp
deleted file mode 100644
index 6cdc92d791c..00000000000
--- a/netsvcs/clients/Naming/Client/Client_Test.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NETSVCS Naming Client DLL" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=NETSVCS Naming Client DLL - Win32 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 "Client_Test.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 "Client_Test.mak" CFG="NETSVCS Naming Client DLL - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "NETSVCS Naming Client DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "NETSVCS Naming Client DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "NETSVCS Naming Client DLL - 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 ""
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\...." /I "..\..\..\..\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# 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:windows /dll /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\bin\Client_Test.dll" /libpath:"..\..\..\..\ace"
-
-!ELSEIF "$(CFG)" == "NETSVCS Naming Client DLL - 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 ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /D "_WINDOWS" /D "_DEBUG" /D "WIN32" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# 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:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\Client_Testd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "NETSVCS Naming Client DLL - Win32 Release"
-# Name "NETSVCS Naming Client DLL - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\Client_Test.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/netsvcs/clients/Naming/Client/Client_Test.h b/netsvcs/clients/Naming/Client/Client_Test.h
deleted file mode 100644
index 36ac6a097ea..00000000000
--- a/netsvcs/clients/Naming/Client/Client_Test.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Define the external Client_Test interface.
-
-ACE_SVC_FACTORY_DECLARE (Client_Test)
diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile
deleted file mode 100644
index f294841feba..00000000000
--- a/netsvcs/clients/Naming/Client/Makefile
+++ /dev/null
@@ -1,329 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#
-# Makefile for the ACE client-side Name_Server test
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-# Local macros
-#----------------------------------------------------------------------------
-
-FILES = Client_Test
-
-PSRC = $(addsuffix .cpp,$(BIN))
-OBJ = $(SRC:%.cpp=$(VDIR)%.o)
-
-LSRC = $(addsuffix .cpp,$(FILES))
-LOBJ = $(LSRC:%.cpp=$(VDIR)%.o)
-SHOBJ = $(addsuffix .$(SOEXT),$(FILES))
-
-BIN2 = main
-LIB2 = libClient_Test.a
-SHLIB2 = libClient_Test.$(SOEXT)
-
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
- BIN = $(BIN2)
- LIB = $(LIB2)
- SHLIB = $(SHLIB2)
-endif # Other
-
-#----------------------------------------------------------------------------
-# 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
-
-#----------------------------------------------------------------------------
-# Local targets
-#----------------------------------------------------------------------------
-
-ifneq ($(BIN),)
- ifeq ($(SHLIB), $(findstring $(SHLIB), $(BUILD)))
- $(BIN): $(SHLIB)
- endif
- ifeq ($(LIB), $(findstring $(LIB), $(BUILD)))
- $(BIN): $(LIB)
- endif
-endif # BIN
-
-#----------------------------------------------------------------------------
-# Dependencies
-#----------------------------------------------------------------------------
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/Client_Test.o .obj/Client_Test.so .shobj/Client_Test.o .shobj/Client_Test.so: Client_Test.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.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/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(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/Naming_Context.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Name_Proxy.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(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/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
- $(ACE_ROOT)/ace/Dynamic_Service.i \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(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/Thread_Manager.i \
- Client_Test.h
-
-.obj/main.o .obj/main.so .shobj/main.o .shobj/main.so: main.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.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/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(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/Naming_Context.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Name_Proxy.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(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/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h \
- $(ACE_ROOT)/ace/ARGV.h \
- $(ACE_ROOT)/ace/ARGV.i \
- Client_Test.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am
deleted file mode 100644
index b4a397b58d8..00000000000
--- a/netsvcs/clients/Naming/Client/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-##----------------------------------------------------------------------------
-## $Id$
-##
-## Makefile for the client programs that test the ACE network services
-##----------------------------------------------------------------------------
-
-##
-## Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_LIBRARIES = libClient_Test.a
-
-libClient_Test_a_SOURCES = Client_Test.cpp Client_Test.h
-
-
-noinst_PROGRAMS = \
- main
-
-main_SOURCES = main.cpp
-main_LDADD = $(top_builddir)/netsvcs/clients/Naming/Client/libClient_Test.a \
- $(top_builddir)/ace/libACE.la
-
-noinst_DATA = svc.conf svc2.conf
-
-EXTRA_DIST = $(noinst_DATA)
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
- -rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/netsvcs/clients/Naming/Client/Makefile.bor b/netsvcs/clients/Naming/Client/Makefile.bor
deleted file mode 100644
index 9f7daeada25..00000000000
--- a/netsvcs/clients/Naming/Client/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-
-NAME = main
-OBJFILES = \
- $(OBJDIR)\main.obj \
- $(OBJDIR)\Client_Test.obj
-
-!include <$(ACE_ROOT)\netsvcs\build.bor>
-
diff --git a/netsvcs/clients/Naming/Client/README b/netsvcs/clients/Naming/Client/README
deleted file mode 100644
index 68e69b6b3bf..00000000000
--- a/netsvcs/clients/Naming/Client/README
+++ /dev/null
@@ -1,123 +0,0 @@
-This directory contains a test for the ACE_Name_Server library. This
-test program also illustrates how to use the ACE Service_Config
-mechanism, which enables the client code to be dynamically linked into
-the process at installation-time or run-time.
-
-The client test is an application that allows the user to vary the
-test parameters through the following menu driven interface:
-
- Name Service Main Menu
- ----------------------
- *** Using Process Local Database ***
-
-<P> Use Process Local Database
-<N> Use Node Local Database
-<H> Set Remote Name server <host> and <port>
-
-<B> Bind <key> <value> [<type>]
-<U> Unbind <key>
-<R> Rebind <key> <value> [<type>]
-<F> Find <key>
-<J> Lookup keys matching <pattern>
-<K> Lookup values matching <pattern>
-<L> Lookup types matching <pattern>
-<C> Complete lookup keys matching <pattern>
-<D> Complete lookup values matching <pattern>
-<E> Complete lookup types matching <pattern>
-
-<Q> or ^C (exit)
-
-Initially, the user can select the type of database -- process local,
-node local, or net local -- from the menu.
-
-<P> uses the process local database (i.e., the database is called the
- same name as the process and stored in /tmp).
-<N> uses the node local database (which defaults to /tmp/localnames).
-<H> uses the net local database by specifying host and port number (by
- default this is stored in a file called /tmp/globalnames on the server).
-
-The user can then create new bindings, delete existing bindings, or
-rebind bindings:
-
-<B> Bind <key> <value> [<type>]
- -- binds the key to the value and adds the
- binding to the database. Note that type
- information is optional.
-<U> Unbind <key> -- unbind a binding whose key is <key>
-<R> Rebind <key> <value> [<type>]
- -- rebind <key> to <value>. Once again <type> is optional.
-<F> Find <key> -- find the binding associated with key <key>
-<Q> or ^C (exit) -- exit gracefully, saving the contents of the
- Name Server in persistent shared memory.
-
-In addition, the user can do pattern matching for keys, values, and
-types. Note that pattern matching is supported using regular expressions.
-
-<J> Lookup keys matching <pattern>
- -- find all keys that match <pattern>
-<K> Lookup values matching <pattern>
- -- find all values that match <pattern>
-<L> Lookup types matching <pattern>
- -- find all types that match <pattern>
-
-<C> Complete lookup keys matching <pattern>
- -- find all bindings whose keys match <pattern>
-<D> Complete lookup values matching <pattern>
- -- find all bindings whose values match <pattern>
-<E> Complete lookup types matching <pattern>
- -- find all bindings whose types match <pattern>
-
--------------------------
-Running the tests:
-
-The test program uses a DLL supported by the svc.conf file, which
-allows them to configure the client-side dynamically. The client test
-program accomplishes this by making use of a Singleton proxy object
-(Name_Service) to provide an interface to the client-side.
-
-The test programs rely on svc.conf to provide the necessary parameters
-for dynamically linking the Name Service library and then
-executing. In the absence of svc.conf, the test programs would use
-static binding.
-
-client:
-
-The client test can be started without any parameters. However, if the
-user wants to use the net local database, the hostname and the port
-number of the server containing the net local database can be given at
-"command line" in the svc.conf file, e.g.:
-
-dynamic ACE_Naming_Context Service_Object * libACE.so:_make_ACE_Naming_Context ()
- "main -h tango.cs -p 7891"
-dynamic Name_Server_test Service_Object * .shobj/Client_Test.so:_make_Client_Test () ""
-
-The above example starts the client test application and sets up a
-connection to port 7891 to a Name Server running on tango.cs, which
-has the net local database. The Client_Test directive must come after
-ACE_Naming_Context since it relies on the ACE_Naming_Context having
-been dynamically linked.
-
-Note that you can also use environment variables in the "command
-line", as follows:
-
-dynamic ACE_Naming_Context Service_Object * libACE.so:_make_ACE_Naming_Context ()
- "main -s $DB -p $PORT -h tango"
-dynamic Name_Server_test Service_Object * .shobj/Client_Test.so:_make_Client_Test () ""
-
-In this example, $DB and $PORT are environment variables that are
-automatically interpreted and substituted by ACE. In addition, note
-how you can give a relative name for the libACE_svcs.so and ACE will
-locate this for you automatically by reading your LD search path.
-
-server:
-
-The name server is needed only in the case where the net local
-database needs to be accessed. The server test needs to run on the
-machine that contains the net local database. To execute the server
-test, the user has to specify the port number at which the server will
-be listening in the svc.conf file. An implementation of a name
-service for ACE is available in the $ACE_ROOT/netsvcs/{lib,servers}
-directories. Please see the README files there for an explanation of
-how to run the server.
-
-
diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp
deleted file mode 100644
index 407b74e78b7..00000000000
--- a/netsvcs/clients/Naming/Client/main.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-// Test the client-side of the ACE Name Server...
-
-#include "ace/Service_Config.h"
-#include "ace/Naming_Context.h"
-#include "ace/ARGV.h"
-#include "ace/Log_Msg.h"
-
-#include "Client_Test.h"
-
-ACE_RCSID(Client, main, "$Id$")
-
-int
-main (int, char *argv[])
-{
- ACE_Service_Config daemon;
- ACE_ARGV new_args;
-
- // Load the existing <argv> into our new one.
- new_args.add (argv);
- // Enable loading of static services.
- new_args.add ("-y");
- // Enable debugging within dynamically linked services.
- new_args.add ("-d");
-
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("argc = %d\n"),
- ACE_TEXT (new_args.argc ())));
-
- // Print the contents of the combined <ACE_ARGV>.
- for (size_t i = 0; i < new_args.argc (); i++)
- ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("(%d) %s\n"),
- i,
- new_args.argv ()[i]));
-
- if (daemon.open (new_args.argc (),
- new_args.argv ()) == -1)
- {
- if (errno != ENOENT)
- ACE_ERROR ((LM_ERROR,
- "%p\n%a",
- "open",
- 1));
- else // Use static binding.
- {
- ACE_ARGV args;
-
- args.add (argv[0]);
- args.add ("-p10011"); // Port number.
- ACE_Service_Object *so =
- ACE_SVC_INVOKE (ACE_Naming_Context);
-
- if (so->init (args.argc (),
- args.argv ()) == -1)
- ACE_ERROR ((LM_ERROR,
- "%p\n%a",
- "ACE_Naming_Context",
- 1));
-
- so = ACE_SVC_INVOKE (Client_Test);
-
- if (so->init (0,
- args.argv ()) == -1)
- ACE_ERROR ((LM_ERROR,
- "%p\n%a",
- "Client_Test",
- 1));
- }
- }
-
- // Run forever, performing the configured services until we are shut
- // down by a SIGINT/SIGQUIT signal.
-
- ACE_Reactor::run_event_loop ();
-
- return 0;
-}
diff --git a/netsvcs/clients/Naming/Client/main.dsp b/netsvcs/clients/Naming/Client/main.dsp
deleted file mode 100644
index 301c6cfea17..00000000000
--- a/netsvcs/clients/Naming/Client/main.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NETSVCS Naming Client Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=NETSVCS Naming Client Test - Win32 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 "main.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 "main.mak" CFG="NETSVCS Naming Client Test - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "NETSVCS Naming Client Test - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "NETSVCS Naming Client Test - Win32 Debug" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "NETSVCS Naming Client Test - 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 ""
-# 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 "..\..\..\..\\" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /FD /c
-# SUBTRACT CPP /YX
-# 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 ace.lib Client_Test.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace"
-
-!ELSEIF "$(CFG)" == "NETSVCS Naming Client Test - 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 ""
-# 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 "..\..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /FD /c
-# SUBTRACT CPP /YX
-# 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 aced.lib Client_Testd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "NETSVCS Naming Client Test - Win32 Release"
-# Name "NETSVCS Naming Client Test - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/netsvcs/clients/Naming/Client/svc.conf b/netsvcs/clients/Naming/Client/svc.conf
deleted file mode 100644
index ba583b0d446..00000000000
--- a/netsvcs/clients/Naming/Client/svc.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# Note that $PORT is an environment variable that is
-# automatically interpreted and substituted by ACE!
-# static ACE_Naming_Context "main -p $PORT -h tango"
-dynamic ACE_Naming_Context Service_Object * ACE:_make_ACE_Naming_Context () "main -p $PORT -h tango"
-dynamic Name_Server_test Service_Object * Client_Test:_make_Client_Test ()
-# Note: Client_Test must come after ACE_Naming_Context since it relies
-# on the ACE_Naming_Context having been linked...
diff --git a/netsvcs/clients/Naming/Client/svc2.conf b/netsvcs/clients/Naming/Client/svc2.conf
deleted file mode 100644
index 44a276a4a44..00000000000
--- a/netsvcs/clients/Naming/Client/svc2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Note that $DB and $PORT are environment variables that are
-# automatically interpreted and substituted by ACE! In addition, note
-# how you can give a relative name for the libACE_svcs.so and ACE will
-# locate this for you automatically by reading your LD search path!
-dynamic ACE_Naming_Context Service_Object * ACE:_make_ACE_Naming_Context () "main -s $DB"
-dynamic ACE_Naming_Context2 Service_Object * ACE:_make_ACE_Naming_Context () "main -s $DB"
-dynamic Name_Server_test Service_Object * Client_Test:_make_Client_Test ()
-# Note: Client_Test must come after ACE_Naming_Context since it relies
-# on the ACE_Naming_Context having been dynamically linked.
View Lorry Controller Status