diff options
author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-23 04:30:06 +0000 |
---|---|---|
committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-23 04:30:06 +0000 |
commit | 615c6979c0b339c7e2c89477899d63bf87e1dd93 (patch) | |
tree | 7e633c5be1c568b2e00f6ec8a2b6b3e6dbf3bd58 /netsvcs/clients/Naming | |
parent | 34cd7dceb74cbcc62c09c388504bec353bed4881 (diff) | |
download | ATCD-TAO-0_2_32.tar.gz |
This commit was manufactured by cvs2svn to create tag 'TAO-0_2_32'.TAO-0_2_32
Diffstat (limited to 'netsvcs/clients/Naming')
19 files changed, 0 insertions, 2239 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 593ca2b55a4..00000000000 --- a/netsvcs/clients/Naming/Client/Client_Test.cpp +++ /dev/null @@ -1,572 +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 (char *key, char *value, char *type = ""); - // Bind a key to a value - - int unbind (char *key); - // Unbind a name binding - - int rebind (char *key, char *value, char *type = ""); - // Rebind a name binding - - int find (char *key); - // Find the value associated with a key - - int list_names (char *pattern); - // Find all names that match pattern - - int list_values (char *pattern); - // Find all values that match pattern - - int list_types (char *pattern); - // Find all types that match pattern - - int list_name_entries (char *pattern); - // Find all names that match pattern - - int list_value_entries (char *pattern); - // Find all values that match pattern - - int list_type_entries (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 (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); - - // get the value - if ((temp_buf = ACE_OS::strtok (0, " "))) - { - ACE_OS::strcpy (buf2, temp_buf); - - // get the type (if entered) - if ((temp_buf = ACE_OS::strtok (0, " "))) - { - 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); - - // get the key - if ((temp_buf = ACE_OS::strtok (input, " "))) - { - ACE_OS::strcpy (buf1, temp_buf); - - // get the value - if ((temp_buf = ACE_OS::strtok (0, " "))) - { - ACE_OS::strcpy (buf2, temp_buf); - - // get the type (if entered) - if ((temp_buf = ACE_OS::strtok (0, " "))) - { - 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) -{ -// ACE_DEBUG ((LM_DEBUG, " *** Process Name is %s ***\n", -// this->name_options_->process_name ())); - 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 (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 (char* key, char* value, 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 (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 (char* key, char* value, char* type) -{ - int result = NAMING_CONTEXT ()->rebind (key, value, type ); - return result == 1 ? 0 : result; -} - -int -Client_Test::list_names (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 (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 (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 (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 (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 (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 (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 d0b3a1dba9d..00000000000 --- a/netsvcs/clients/Naming/Client/Client_Test.h +++ /dev/null @@ -1,13 +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 21296e110ef..00000000000 --- a/netsvcs/clients/Naming/Client/Makefile +++ /dev/null @@ -1,251 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the ACE client-side Name_Server test -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -BIN = main -LIB = libClient_Test.a -SHLIB = libClient_Test.$(SOEXT) - -FILES = Client_Test - -PSRC = $(addsuffix .cpp,$(BIN)) -OBJ = $(SRC:%.cpp=$(VDIR)%.o) - -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) - -LIBS += $(ACELIB) - -LDLIBS = -lClient_Test - -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 - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# 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/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.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.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.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/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.h \ - $(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/Containers.h \ - $(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/Naming_Context.h \ - $(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.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/Thread_Manager.h \ - $(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/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.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.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.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/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.h \ - $(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/Containers.h \ - $(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/Naming_Context.h \ - $(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 \ - Client_Test.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp deleted file mode 100644 index 67cd68c24f2..00000000000 --- a/netsvcs/clients/Naming/Client/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// $Id$ - -// Test the client-side of the ACE Name Server... - -#include "ace/Service_Config.h" -#include "ace/Naming_Context.h" -#include "Client_Test.h" - -ACE_RCSID(Client, main, "$Id$") - -int -main (int argc, char *argv[]) -{ - ACE_Service_Config daemon; - - if (daemon.open (argc, argv) == -1) - { - if (errno != ENOENT) - ACE_ERROR ((LM_ERROR, "%p\n%a", "open", 1)); - else // Use static binding. - { - char *l_argv[3]; - l_argv[0] = argv[0]; - l_argv[1] = "-p 10011"; - l_argv[2] = 0; - ACE_Service_Object *so = ACE_SVC_INVOKE (ACE_Naming_Context); - - if (so->init (2, l_argv) == -1) - ACE_ERROR ((LM_ERROR, "%p\n%a", "ACE_Naming_Context", 1)); - - so = ACE_SVC_INVOKE (Client_Test); - - if (so->init (0, l_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 4e789d4eaf0..00000000000 --- a/netsvcs/clients/Naming/Client/svc.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Note that $DB and $PORT are environment variables that are -# automatically interpreted and substituted by ACE! -static 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 41075e1bf29..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 * libACE.so:_make_ACE_Naming_Context () "main -s $DB" -dynamic ACE_Naming_Context2 Service_Object * libACE.so:_make_ACE_Naming_Context () "main -s $DB" -dynamic Name_Server_test Service_Object * .shobj/Client_Test.so:_make_Client_Test () -# Note: Client_Test must come after ACE_Naming_Context since it relies -# on the ACE_Naming_Context having been dynamically linked. diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp deleted file mode 100644 index c747f012011..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp +++ /dev/null @@ -1,384 +0,0 @@ -// $Id$ - -#include "ace/Service_Config.h" -#include "ace/Read_Buffer.h" -#include "ace/Thread_Manager.h" -#include "ace/streams.h" /* Because dump () uses ofstream. */ -#include "Dump_Restore.h" - -ACE_RCSID(Dump_Restore, Dump_Restore, "$Id$") - -Dump_Restore::Dump_Restore (int argc, char *argv[]) - : infile_ (0) -{ - ACE_NEW (this->ns_context_, ACE_Naming_Context); - - // Cache the name options - this->name_options_ = this->ns_context_->name_options (); - this->name_options_->parse_args (argc, argv); - - //determine name context - if (ACE_OS::strcmp (this->name_options_->nameserver_host (), "localhost") == 0) - { - if (ns_context_->open (ACE_Naming_Context::PROC_LOCAL) == -1) - ACE_ERROR ( (LM_ERROR, "%p\n", "ns_context_->open")); - } - else - { - // Don't really need to do this but it's a hack to fix - // the problme of Display () not printing the right hostname - ACE_OS::strcpy (this->hostname_, - this->name_options_->nameserver_host ()); - this->port_ = this->name_options_->nameserver_port (); - - if (this->ns_context_->open (ACE_Naming_Context::NET_LOCAL) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "ns_context_->open")); - } - - this->display_menu (); - - if (ACE_Event_Handler::register_stdin_handler (this, - ACE_Reactor::instance (), - ACE_Thread_Manager::instance ()) == -1) - ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler")); -} - -Dump_Restore::~Dump_Restore (void) -{ - // Deregister this handler with the ACE_Reactor. - ACE_Reactor::instance ()->remove_handler - (ACE_STDIN, - ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK); - - ACE_OS::fclose (this->infile_); -} - -int -Dump_Restore::handle_input (ACE_HANDLE) -{ - char option[BUFSIZ]; - char buf1[BUFSIZ]; - u_short port; - - if (::scanf ("%s", option) <= 0) - { - ACE_DEBUG ((LM_ERROR, "try again\n")); - return 0; - } - - switch (option[0]) - { - case 'P' : - case 'p' : - set_proc_local (); - break; - case 'N' : - case 'n' : - set_node_local (); - break; - case 'H' : - case 'h' : - if (::scanf ("%s %hu", buf1, &port) <= 0) - break; - set_host (buf1, port); - break; - case 'F': - case 'f': - if (::scanf ("%s", filename_) <= 0) - break; - if (this->infile_) - ACE_OS::fclose (this->infile_); - this->infile_ = fopen(filename_,"r"); - break; - case 'B' : - case 'b' : - populate (Dump_Restore::BIND); - break; - case 'U' : - case 'u' : - populate (Dump_Restore::UNBIND); - break; - case 'R' : - case 'r' : - populate (Dump_Restore::REBIND); - break; - case 'D': - case 'd': - if (::scanf ("%s", dump_filename_) <= 0) - break; - this->dump (); - break; - case 'Q' : - case 'q' : - quit (); - break; - default : - ACE_DEBUG ((LM_DEBUG, "Unrecognized command.\n")); - } - - display_menu (); - return 0; -} - -void -Dump_Restore::display_menu (void) -{ - ACE_DEBUG ((LM_DEBUG, "\n")); - ACE_DEBUG ((LM_DEBUG, "Name Service Main Menu\n")); - ACE_DEBUG ((LM_DEBUG, "----------------------\n")); - - // Check if using local name space or remote name space - if (ACE_OS::strcmp (this->name_options_->nameserver_host (), "localhost") == 0) - { - if (this->ns_scope_ == ACE_Naming_Context::PROC_LOCAL) - ACE_DEBUG ((LM_DEBUG, " *** Using Process Local Database ***\n\n")); - else - ACE_DEBUG ((LM_DEBUG, " *** Using Node Local Database ***\n\n")); - } - else - { - ACE_DEBUG ((LM_DEBUG, " Hostname: %s\n", this->hostname_)); - ACE_DEBUG ((LM_DEBUG, " Port Number: %d\n", this->port_)); - } - - if (this->infile_) - ACE_DEBUG ((LM_DEBUG, "Input File: %s\n", this->filename_)); - else - ACE_DEBUG ((LM_DEBUG, "** No Input File Specified **\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")); - ACE_DEBUG ((LM_DEBUG, "<F> Set Input File <file name>\n")); - ACE_DEBUG ((LM_DEBUG, "<B> Bind\n")); - ACE_DEBUG ((LM_DEBUG, "<U> Unbind\n")); - ACE_DEBUG ((LM_DEBUG, "<R> Rebind\n")); - ACE_DEBUG ((LM_DEBUG, "<D> Dump <file name>\n")); - ACE_DEBUG ((LM_DEBUG, "<Q> or ^C (exit) \n")); -} - - -int -Dump_Restore::set_proc_local (void) -{ - // Set Name Options - this->name_options_->nameserver_host ("localhost"); - this->name_options_->nameserver_port (0); - - // Set Naming Context scope - this->ns_scope_ = ACE_Naming_Context::PROC_LOCAL; - - // Remove old naming context - delete this->ns_context_; - - // Create new Naming Context - ACE_NEW_RETURN (this->ns_context_, ACE_Naming_Context, -1); - - if (this->ns_context_->open (ACE_Naming_Context::PROC_LOCAL) == -1) - ACE_ERROR_RETURN ( (LM_ERROR, "%p\n", "ns_context_->open"), -1); - - return 0; -} - -int -Dump_Restore::set_node_local (void) -{ - // Set Name Options - this->name_options_->nameserver_host ("localhost"); - this->name_options_->nameserver_port (0); - - // Set Naming Context scope - this->ns_scope_ = ACE_Naming_Context::NODE_LOCAL; - - // Remove old naming context - delete this->ns_context_; - - // Create new Naming Context - ACE_NEW_RETURN (this->ns_context_, ACE_Naming_Context, -1); - - if (ns_context_->open (ACE_Naming_Context::NODE_LOCAL) == -1) - ACE_ERROR_RETURN ( (LM_ERROR, "%p\n", "ns_context_->open"), -1); - return 0; -} - -int -Dump_Restore::set_host (char* hostname, int port) -{ - // Set Name Options - this->name_options_->nameserver_host (hostname); - this->name_options_->nameserver_port (port); - - // don't really need to do this but it's a hack to fix - // the problme of Display () not printing the right hostname - ACE_OS::strcpy (this->hostname_, hostname); - this->port_ = port; - this->ns_scope_ = ACE_Naming_Context::NET_LOCAL; - - // remove old naming context - delete this->ns_context_; - - // Create new Naming Context - ACE_NEW_RETURN (this->ns_context_, ACE_Naming_Context, -1); - - // assume net_local context - if (ns_context_->open (ACE_Naming_Context::NET_LOCAL) == -1) - ACE_ERROR_RETURN ( (LM_ERROR, "%p\n", "ns_context_->open"), -1); - - return 0; -} - -int -Dump_Restore::doit (Dump_Restore::Operation_Type op, - char *name, - char* value, - char* type) -{ - int result = -1; - - switch (op) - { - case Dump_Restore::BIND: - { - result = this->bind (name, value, type); - break; - } - case Dump_Restore::UNBIND: - { - result = this->unbind (name); - break; - } - case Dump_Restore::REBIND: - { - result = this->rebind (name, value, type); - break; - } - } - - return result; -} - -int -Dump_Restore::populate (Dump_Restore::Operation_Type op) -{ - if (this->infile_) - { - int result = -1; - enum State { NAME, VALUE, TYPE }; - - State state = NAME; - // reset file pointer - ACE_OS::rewind (this->infile_); - - ACE_Allocator *allocator = ACE_Allocator::instance (); - ACE_Read_Buffer read_buffer (this->infile_, 0, allocator); - - for (char *temp; (temp = read_buffer.read ('\n')) != 0; ) - { - char *name = 0; - char *actual_name = 0; - char *value = 0; - char *actual_value = 0; - char *type = 0; - char *actual_type = 0; - - switch (state) - { - case NAME: - name = temp; - ACE_OS::strtok (name, "="); - actual_name = ACE_OS::strtok (0, "="); - state = VALUE; - break; - case VALUE: - value = temp; - ACE_OS::strtok (value, "="); - actual_value = ACE_OS::strtok (0, "="); - state = TYPE; - break; - case TYPE: - type = temp; - ACE_OS::strtok (type, "="); - actual_type = ACE_OS::strtok (0, "="); - - if (actual_type) - result = this->doit (op, - actual_name, - actual_value, - actual_type); - else - result = this->doit (op, - actual_name, - actual_value); - if (name) - allocator->free(name); - if (value) - allocator->free(value); - if (type) - allocator->free(type); - state = NAME; - break; - default: - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "populate"), -1); - /* NOTREACHED */ - } - } - - return result; - } - else - return -1; -} - -int -Dump_Restore::bind (char* key, char* value, char* type) -{ - int result = ns_context_->bind (key, value, type); - - if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ns_context_->bind"), -1); - else if (result == 1) - ACE_ERROR_RETURN ((LM_ERROR, "%s%s%s\n", "key <", key, "> already bound"), 1); - return 0; -} - -int -Dump_Restore::unbind (char* key) -{ - int result = ns_context_->unbind (key); - - if (result == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ns_context_->unbind"), -1); - - return 0; -} - -int -Dump_Restore::rebind (char* key, char* value, char* type) -{ - if (ns_context_->rebind (key, value, type) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ns_context_->rebind"), -1); - - return 0; -} - -int -Dump_Restore::quit (void) -{ - return ACE_OS::kill (ACE_OS::getpid (), SIGINT); -} - -void -Dump_Restore::dump (void) -{ - ofstream output_file (dump_filename_); - - ostream *orig_stream = ACE_Log_Msg::instance ()->msg_ostream (); - ACE_Log_Msg::instance ()->msg_ostream (&output_file); - ACE_Log_Msg::instance ()->clr_flags (ACE_Log_Msg::STDERR | ACE_Log_Msg::LOGGER ); - ACE_Log_Msg::instance ()->set_flags (ACE_Log_Msg::OSTREAM); - - ns_context_->dump (); - - ACE_Log_Msg::instance ()->msg_ostream (orig_stream); - ACE_Log_Msg::instance ()->clr_flags (ACE_Log_Msg::STDERR); -} diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h deleted file mode 100644 index c2702ba04c9..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.h +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Event_Handler.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/Reactor.h" -#include "ace/Naming_Context.h" - -class Dump_Restore : public ACE_Event_Handler -{ -public: - enum Operation_Type - { - BIND, - UNBIND, - REBIND - }; - Dump_Restore (int argc, char *argv[]); - // Initialize name options and naming context - - ~Dump_Restore (void); - - virtual int handle_input (ACE_HANDLE handle); - // Handle user entered commands - - void dump (void); - -private: - char hostname_[MAXHOSTNAMELEN + 1]; - // Cache the hostname and port number for remote case - - 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 (char* hostname, int port); - // Set options to use NET_LOCAL naming context specifying host name - // and port number. - - int quit (void); - // Gracefully exit. - - int populate (Dump_Restore::Operation_Type op); - - int doit (Dump_Restore::Operation_Type op, - char *name, - char *value, - char *type = ""); - int bind (char* key, char* value, char* type = ""); - int unbind (char* key); - int rebind (char* key, char* value, char* type = ""); - - char filename_[MAXPATHLEN + 1]; - char dump_filename_[MAXPATHLEN + 1]; - - u_short port_; - // port server is listening on - - ACE_Naming_Context *ns_context_; - // Current naming context - - ACE_Naming_Context::Context_Scope_Type ns_scope_; - // Defines the scope of the naming context - - FILE *infile_; - // input file - - ACE_Name_Options *name_options_; - // Name Options associated with the Naming Context -}; diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile deleted file mode 100644 index c972bd6a75e..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile +++ /dev/null @@ -1,245 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id$ -# -# Makefile for the ACE Dump-Restore Name_Server utility -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -BIN = main -LIB = libDump_Restore.a -SHLIB = libDump_Restore.$(SOEXT) - -FILES = Dump_Restore - -PSRC = $(addsuffix .cpp,$(BIN)) -OBJ = $(SRC:%.cpp=$(VDIR)%.o) - -LSRC = $(addsuffix .cpp,$(FILES)) -LOBJ = $(LSRC:%.cpp=$(VDIR)%.o) -SHOBJ = $(addsuffix .so,$(FILES)) - -LDLIBS = -lDump_Restore - -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 - -#---------------------------------------------------------------------------- -# Local targets -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/Dump_Restore.o .obj/Dump_Restore.so .shobj/Dump_Restore.o .shobj/Dump_Restore.so: Dump_Restore.cpp \ - $(ACE_ROOT)/ace/Service_Config.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/inc_user_config.h \ - $(ACE_ROOT)/ace/config.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.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.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/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.h \ - $(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/Containers.h \ - $(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/Read_Buffer.h \ - $(ACE_ROOT)/ace/Read_Buffer.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - Dump_Restore.h \ - $(ACE_ROOT)/ace/Naming_Context.h \ - $(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 -.obj/main.o .obj/main.so .shobj/main.o .shobj/main.so: main.cpp \ - $(ACE_ROOT)/ace/Service_Config.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/inc_user_config.h \ - $(ACE_ROOT)/ace/config.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.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.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/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.h \ - $(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/Containers.h \ - $(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 \ - Dump_Restore.h \ - $(ACE_ROOT)/ace/Naming_Context.h \ - $(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 - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/netsvcs/clients/Naming/Dump_Restore/README b/netsvcs/clients/Naming/Dump_Restore/README deleted file mode 100644 index 3bb13935d87..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/README +++ /dev/null @@ -1,67 +0,0 @@ -This file describes the usage of the Dump-Restore utility for the ACE -Name Server. - -Similar to the test application provided in the Client-Server -directory, a simple ASCII menu-driven interface is provided to the -user: - - Name Service Main Menu - ---------------------- - *** Using Process Local Database *** - -** No Input File Specified ** -<P> Use Process Local Database -<N> Use Node Local Database -<H> Set Remote Name server <host> and <port> -<F> Set Input File <file name> - -<B> Bind -<U> Unbind -<R> Rebind -<D> Dump <file name> -<Q> or ^C (exit) - -Initially, the user can select the type of database 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). -<F> Sets the name of the input file that will be used by the - test application to populate the database. The format of - the file should be: - - name=<name1> - value=<value1> - type=[<type1>] - name=<name2> - value=<value2> - type=[<type2>] - . - . - . - - Note that the type field is optional. However, if no type - information is associated with a name binding, a null entry still - needs to be present (i.e., type=). - -Once the input file has been specified, the user can then do one of -the following: - -<B> Bind -- bind all the bindings in the file to the database. - This can be used to "restore" the state of the - Name Server. -<U> Unbind -- unbind all the bindings in the file from the database. -<R> Rebind -- rebind all the bindings in the file to the database. -<D> Dump <file name> -- dump the state of the database to <filename>. -<Q> or ^C (exit) -- exit gracefully, saving the contents of the - Name Server in persistent shared memory. - -Note that the dump file is stored in ASCII with exactly the same -format as the input file. Also, one can easily change the test -application so that a call to Dump results in the state of the -database dumped to standard output instead of a file. diff --git a/netsvcs/clients/Naming/Dump_Restore/createfile.cpp b/netsvcs/clients/Naming/Dump_Restore/createfile.cpp deleted file mode 100644 index 25bf2fb803c..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/createfile.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// $Id$ - -#include <stdio.h> -#include <string.h> -#include "ace/ACE.h" - -ACE_RCSID(Dump_Restore, createfile, "$Id$") - -int -main (int argc, char **argv) -{ - FILE *infile, *outfile; - char buf[BUFSIZ]; - - if ((infile = fopen (argv[1], "r")) == NULL) - return -1; - - if ((outfile = fopen (argv[2], "w")) == NULL) - return -1; - - int count = 0; - while (::fgets (buf, BUFSIZ, infile)) - { - buf[::strlen(buf) - 1] = '\0'; - fputs (buf, outfile); - if (count % 2 == 0) - fputs (" ", outfile); - else - fputs ("\n", outfile); - count++; - } - fclose (outfile); - fclose (infile); -} diff --git a/netsvcs/clients/Naming/Dump_Restore/main.cpp b/netsvcs/clients/Naming/Dump_Restore/main.cpp deleted file mode 100644 index a30538d8c75..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/main.cpp +++ /dev/null @@ -1,25 +0,0 @@ -// $Id$ - -// Test the client-side of the ACE Name Server... - -#include "ace/Service_Config.h" -#include "Dump_Restore.h" - -ACE_RCSID(Dump_Restore, main, "$Id$") - -int -main (int argc, char *argv[]) -{ - ACE_Service_Config daemon (argv[0]); - - ACE_DEBUG ((LM_DEBUG, "entering main\n")); - - // Get a handler - Dump_Restore client_handler (argc, argv); - - ACE_Reactor::run_event_loop (); - - /* NOTREACHED */ - ACE_DEBUG ((LM_DEBUG, "leaving main\n")); - return 0; -} diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp b/netsvcs/clients/Naming/Dump_Restore/nametest.cpp deleted file mode 100644 index fb9c71a5014..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/nametest.cpp +++ /dev/null @@ -1,112 +0,0 @@ -#include "ace/Naming_Context.h" -// $Id$ - -#include "ace/Name_Options.h" -#include "nametest.h" - -void -Nametest::listopt (void) -{ - cout << "serverport is " - << ACE_Name_Options::instance ()->nameserver_port() - << endl; - cout << "serverhost is " - << ACE_Name_Options::instance ()->nameserver_host() - << endl; - cout << "process_name is " - << ACE_Name_Options::instance ()->process_name() - << endl; - cout << "namespace_dir is " - << ACE_Name_Options::instance ()->namespace_dir() - << endl; -} - -int -Nametest::init (int argc, char *argv[]) -{ - ACE_Server_Record *sr; - ACE_Service_Config::svc_rep ()->find ("Name_Server_Proxy", &sr); - ACE_Service_Type *st = sr->type (); - ACE_Server_Object *so = st->object (); -dynamic_cast<ACE_Name_Server_Proxy *> (so); - - ACE_Name_Server_Proxy *ns_proxy = ACE_Service_Config::name_server_proxy (); - - ns_proxy->bind (...); - - this->listopt (); - - ACE_Naming_Context ns_context; - - if (ns_context.open (ACE_Naming_Context::NET_LOCAL) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ns_context.open"), -1); - - const char *mykey = argv[0]; - char *myvalue = argv[1]; - char *ns_value = 0; - char *ns_type = 0; - - if (ns_context.bind (mykey, myvalue, "ottotype") == -1) - cout << "bind failed" << endl; - else - cout << "bind succeeded" << endl; - - - if (ns_context.resolve (mykey, ns_value, ns_type) == -1) - cout << "resolve of " << mykey << " failed" << endl; - else - cout << "resolve of " << mykey << " succeeded, value = " - << ns_value << ", type = " << ns_type << endl; - - delete [] ns_value; - delete [] ns_type; - ns_value = 0; - ns_type = 0; - - if (ns_context.rebind (mykey, myvalue, "newottotype") == -1) - cout << "rebind failed" << endl; - else - cout << "rebind succeeded" << endl; - - if (ns_context.resolve (mykey, ns_value, ns_type) == -1) - cout << "resolve of " << mykey << " failed" << endl; - else - cout << "resolve of " << mykey << " succeeded, value = " - << ns_value << ", type = " << ns_type << endl; - - delete [] ns_value; - delete [] ns_type; - ns_value = 0; - ns_type = 0; - - if (ns_context.unbind (mykey) == -1) - cout << "unbind failed" << endl; - else - cout << "unbind succeeded" << endl; - - return 0; -} - -int -Nametest::fini (void) -{ - cout << "Nametest::fini called" << endl; - return 0; -} - -int -Nametest::info (char **, unsigned) const -{ - cout << "Nametest::info called" << endl; - return 0; -} - -extern "C" ACE_Service_Object *_alloc(void); - -// Factory function that is called automatically when the ACE -// framework dynamically links this shared object file. - -ACE_Service_Object *_alloc (void) -{ - return new Nametest; -} diff --git a/netsvcs/clients/Naming/Dump_Restore/nametest.h b/netsvcs/clients/Naming/Dump_Restore/nametest.h deleted file mode 100644 index fa0cc5dc05c..00000000000 --- a/netsvcs/clients/Naming/Dump_Restore/nametest.h +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -#include "ace/Service_Object.h" - -class Nametest : public ACE_Service_Object -{ -public: - virtual int init (int argc, char *argv[]); - virtual int fini (void); - virtual int info (char **, size_t) const; - - void listopt (void); -}; - diff --git a/netsvcs/clients/Naming/Makefile b/netsvcs/clients/Naming/Makefile deleted file mode 100644 index 97bbaa2ef30..00000000000 --- a/netsvcs/clients/Naming/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -#---------------------------------------------------------------------------- -# $Id: Makefile 1.1 10/18/96 -# -# Makefile for the Name Server test applications -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# Local macros -#---------------------------------------------------------------------------- - -INFO = README - -DIRS = Client \ - Dump_Restore - -#---------------------------------------------------------------------------- -# 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.nested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU - diff --git a/netsvcs/clients/Naming/README b/netsvcs/clients/Naming/README deleted file mode 100644 index 7e461560cb6..00000000000 --- a/netsvcs/clients/Naming/README +++ /dev/null @@ -1,124 +0,0 @@ -This directory contains a set of tests for the ACE_Name_Server -library. There are two directories -- client and server, which test -the client and server, respectively. In addition, these tests -illustrate how to use the ACE Service_Config mechanism, which enables -the client and server 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: - -Both the client and the server test programs use DLL supported by -svc.conf which allows them to configure the client-side and the -server-side (respectively) 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/bin -directory. Please see the README file there for an explanation of how -to run the server. |