ChangeLogTag: Fri Dec 27 15:03:36 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

19 files changed, 4 insertions, 1501 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index d87a6a05a70..23ba505192c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec 27 15:03:36 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
+
+	* tests/ior_corbaloc: Removed.
+
 Fri Dec 27 11:49:22 2002  Priyanka Gontla  <pgontla@ece.uci.edu>
 
 	* tao/CORBALOC_Parser.h: 
diff --git a/TAO/tests/ior_corbaloc/Makefile b/TAO/tests/ior_corbaloc/Makefile
deleted file mode 100644
index f17f70b9d96..00000000000
--- a/TAO/tests/ior_corbaloc/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-IDL_FILES = corbaloc
-IDL_SRC = corbalocC corbalocS
-
-LDLIBS = -lTAO_CosNaming -lTAO_PortableServer -lTAO 
-#CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-BIN = server client corbaname_client
-
-#SRC = $(addsuffix .cpp, $(BIN) $(IDL_SRC) status_i)
-
-CLIENT_OBJS = $(addsuffix .o, $(IDL_SRC) client ior_corbaloc_client_i)
-SERVER_OBJS = $(addsuffix .o, $(IDL_SRC) server status_i)
-CORBANAME_CLIENT_OBJS = $(addsuffix .o, $(IDL_SRC) corbaname_client status_i)
-
-TAO_IDLFLAGS += -Ge 1
-#----------------------------------------------------------------------------
-# Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-.PRECIOUS: $(foreach ext, $(IDL_EXT), corbaloc$(ext))
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-corbaname_client: $(addprefix $(VDIR),$(CORBANAME_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), corbaloc$(ext))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
diff --git a/TAO/tests/ior_corbaloc/Makefile.bor b/TAO/tests/ior_corbaloc/Makefile.bor
deleted file mode 100644
index bb7411a3990..00000000000
--- a/TAO/tests/ior_corbaloc/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for building the ior_corbaloc test executables
-#
-
-MAKEFILES = server.bor client.bor corbaname_client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/ior_corbaloc/client.bor b/TAO/tests/ior_corbaloc/client.bor
deleted file mode 100644
index b439634ad35..00000000000
--- a/TAO/tests/ior_corbaloc/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Makefile for building the ior_corbaloc client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
-        $(OBJDIR)\corbalocS.obj \
-        $(OBJDIR)\corbalocC.obj \
-        $(OBJDIR)\ior_corbaloc_client_i.obj \
-        $(OBJDIR)\client.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-        $(TAO_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
-        $(TAO_NAMING_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-        $(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
-        $(TAO_NAMING_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\corbaloc.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\corbalocS.cpp $(IDLDIR)\corbalocC.cpp: $(IDLDIR)\corbaloc.idl
-	$(TAO_IDL) $**
diff --git a/TAO/tests/ior_corbaloc/client.cpp b/TAO/tests/ior_corbaloc/client.cpp
deleted file mode 100644
index 1cbae2ff35e..00000000000
--- a/TAO/tests/ior_corbaloc/client.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaloc/
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//     This implements a simple CORBA client for the
-//     corbaloc: style IOR parser
-//
-// = AUTHOR
-//     Priyanka Gontla <pgontla@ece.uci.edu>
-//
-// ============================================================================
-
-#include "ior_corbaloc_client_i.h"
-
-int main (int argc, char *argv [])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-
-      IOR_corbaloc_Client_i client;
-
-      int init_result;
-      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (init_result == 0)
-          {
-            client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_TRY_CHECK;
-          }
-        return 0;
-    }
-  ACE_CATCH (CORBA::SystemException, ex)
-    {
-      //
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/tests/ior_corbaloc/corbaloc.idl b/TAO/tests/ior_corbaloc/corbaloc.idl
deleted file mode 100644
index 296ae9adde0..00000000000
--- a/TAO/tests/ior_corbaloc/corbaloc.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-module corbaloc
-{
-  
-  interface Status
-  {
-    // = TITLE
-    //     A simple interface to check the status of 
-    //     connection between the client and the server.
-    //
-    // = DESCRIPTION
-    //     Prints out the status.
-
-    boolean print_status ();
-    // Return <true == 0> if the server received the 
-    // request from the client.
-        
-  };
-};
-
diff --git a/TAO/tests/ior_corbaloc/corbaname_client.bor b/TAO/tests/ior_corbaloc/corbaname_client.bor
deleted file mode 100644
index e3f8396d08c..00000000000
--- a/TAO/tests/ior_corbaloc/corbaname_client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Makefile for building the ior_corbaloc corbaname_client
-#
-
-NAME = corbaname_client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
-        $(OBJDIR)\corbalocS.obj \
-        $(OBJDIR)\corbalocC.obj \
-        $(OBJDIR)\ior_corbaloc_client_i.obj \
-        $(OBJDIR)\corbaname_client.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-        $(TAO_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
-        $(TAO_NAMING_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-        $(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
-        $(TAO_NAMING_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\corbaloc.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\corbalocS.cpp $(IDLDIR)\corbalocC.cpp: $(IDLDIR)\corbaloc.idl
-	$(TAO_IDL) $**
diff --git a/TAO/tests/ior_corbaloc/corbaname_client.cpp b/TAO/tests/ior_corbaloc/corbaname_client.cpp
deleted file mode 100644
index f3e96d4ab5c..00000000000
--- a/TAO/tests/ior_corbaloc/corbaname_client.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//=============================================================================
-/**
- *  @file    corbaname_client.cpp
- *
- *  $Id$
- *
- *   This implements a simple CORBA client to tests the
- *   corbaname: style IOR parser
- *
- *
- *  @author  Craig Rodrigues <crodrigu@bbn.com>
- */
-//=============================================================================
-
-#include "ior_corbaloc_client_i.h"
-
-int main (int argc, char *argv [])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // First initialize the ORB, that will remove some arguments...
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-
-      if(argc < 2 )
-        {
-          ACE_ERROR_RETURN((LM_ERROR,
-                            "Usage:\n  %s [corbaname URL]\n",
-                            argv[0]),
-                           1);
-        }
-
-      // Get an object reference using a corbaname: style URL
-      CORBA::Object_var obj =
-        orb->string_to_object (argv[1]
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow
-      corbaloc::Status_var factory =
-        corbaloc::Status::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (factory.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "ERROR: Object reference <%s> is nil\n",
-                             argv[1]),
-                            -1);
-        }
-
-      // Invoke a request on the server
-      CORBA::Boolean ret_value =
-        factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ret_value != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "The server has not been contacted. Error!!\n",
-                      0));
-        }
-
-      return 0;
-    }
-  ACE_CATCH (CORBA::SystemException, ex)
-    {
-      //
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc.mpc b/TAO/tests/ior_corbaloc/ior_corbaloc.mpc
deleted file mode 100644
index 67edd0abd8b..00000000000
--- a/TAO/tests/ior_corbaloc/ior_corbaloc.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-project: namingexe {
-  Source_Files {
-    status_i.cpp
-    server.cpp
-  }
-}
-
-project(client): namingexe {
-  exename  = client
-
-  Source_Files {
-    ior_corbaloc_client_i.cpp
-    client.cpp
-  }
-}
-
-project(corbaname client): server {
-  exename = corbaname_client
-
-  Source_Files {
-    status_i.cpp
-    corbaname_client.cpp
-  }
-}
-
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp b/TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp
deleted file mode 100644
index 6372f42e818..00000000000
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client.dsp
+++ /dev/null
@@ -1,213 +0,0 @@
-# Microsoft Developer Studio Project File - Name="IOR CorbaLoc Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=IOR CorbaLoc Client - 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 "IOR CorbaLoc Client.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 "IOR CorbaLoc Client.mak" CFG="IOR CorbaLoc Client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "IOR CorbaLoc Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "IOR CorbaLoc Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "IOR CorbaLoc Client - 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 "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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  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 TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Release/client.exe" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

-

-!ELSEIF  "$(CFG)" == "IOR CorbaLoc Client - 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 "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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  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 TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "IOR CorbaLoc Client - Win32 Release"

-# Name "IOR CorbaLoc Client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbalocC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbalocS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ior_corbaloc_client_i.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\corbalocC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbalocS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ior_corbaloc_client_i.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "*.idl"

-# Begin Source File

-

-SOURCE=.\corbaloc.idl

-

-!IF  "$(CFG)" == "IOR CorbaLoc Client - Win32 Release"

-

-# Begin Custom Build - Invoking IDL Compiler

-InputPath=.\corbaloc.idl

-InputName=corbaloc

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IOR CorbaLoc Client - Win32 Debug"

-

-# Begin Custom Build - Invoking IDL Compiler

-InputPath=.\corbaloc.idl

-InputName=corbaloc

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
deleted file mode 100644
index 5c3403bbffe..00000000000
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaloc/
-//
-// = FILENAME
-//    ior_corbaloc_client_i.cpp
-//
-// = DESCRIPTION
-//    This example implements a simple client which sends a corbaloc:
-//    style url to the server and gets a response from the
-//    server to indicate that the server has received the request.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
-
-#include "ior_corbaloc_client_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-// Constructor
-IOR_corbaloc_Client_i::IOR_corbaloc_Client_i (void)
-{
-}
-
-IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void)
-{
-}
-
-int
-IOR_corbaloc_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
-{
-
-  ACE_TRY
-    {
-      CosNaming::Name name (1);
-
-      name.length (1);
-      name[0].id = CORBA::string_dup ("STATUS");
-
-      // Resolve the name
-      CORBA::Object_var factory_object =
-        this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow
-      corbaloc::Status_var factory =
-        corbaloc::Status::_narrow (factory_object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (factory.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference is nil for: %s\n",
-                             corbaloc_url_.c_str() ),
-                            1);
-        }
-
-      // Invoke a request on the server
-      CORBA::Boolean ret_value =
-        factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (ret_value != 0)
-        {
-        ACE_DEBUG ((LM_DEBUG,
-                    "The server has not been contacted. Error!!\n",
-                    0));
-        }
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "CosNaming::NamingContext::NotFound");
-    }
-  ACE_CATCH (CORBA::SystemException, ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "A system exception on client side");
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-IOR_corbaloc_Client_i::init (int& argc,
-                             char *argv[]
-                             ACE_ENV_ARG_DECL)
-{
-
-  ACE_TRY
-    {
-
-      // First initialize the ORB, that will remove some arguments...
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-
-      if(argc < 2){
-              ACE_DEBUG((LM_DEBUG, "\nUsage:\n  %s [corbaloc URL for NameService]\n", argv[0]));
-              ACE_OS::exit(-1);
-      }
-
-      corbaloc_url_ = argv[1];
-
-      // Get a reference to the Naming Service
-      CORBA::Object_var naming_context_object =
-        orb->string_to_object (corbaloc_url_.c_str()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (naming_context_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot resolve Naming Service\n : client"),
-                          -1);
-
-      // Narrow to get the correct reference
-      this->naming_context_ =
-        CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (this->naming_context_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot narrow Naming Service\n :client"),
-                          -1);
-    }
-  ACE_CATCH (CORBA::SystemException, ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "client");
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
deleted file mode 100644
index ae3bf9bf963..00000000000
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ===========================================================
-//
-// = LIBRARY
-//    TAO/tests/ior_corbaloc/
-//
-// = FILENAME
-//    ior_corbaloc_client_i.h
-//
-// = DESCRIPTION
-//    This class implements a simple client which sends a corbaloc:
-//    style url to the server and gets a response from the
-//    server to indicate that the server has received the request.
-//
-// = AUTHORS
-//    Priyanka Gontla <pgontla@ece.uci.edu>
-//
-//============================================================
-
-#if !defined (IOR_CORBALOC_CLIENT_I_H)
-#define IOR_CORBALOC_CLIENT_I_H
-
-#include "corbalocC.h"
-#include "orbsvcs/orbsvcs/CosNamingC.h"
-
-class IOR_corbaloc_Client_i
-{
-  // = TITLE
-  //     NContextExt Client Implementation
-  //
-  // = DESCRIPTION
-  //
-
- public:
-  // = Constructor and destructor.
-  IOR_corbaloc_Client_i (void);
-  ~IOR_corbaloc_Client_i (void);
-
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  // Execute the client example code.
-
-  int init (int& argc, char *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  // Initialize the client communication endpoint with the server.
-
- private:
-  /// corbaloc url to test
-  ACE_CString corbaloc_url_;
-
-  /// Naming context
-  CosNaming::NamingContextExt_var naming_context_;
-};
-
-#endif /* IOR_CORBALOC_CLIENT_I_H */
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp b/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp
deleted file mode 100644
index 13028d590a4..00000000000
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_server.dsp
+++ /dev/null
@@ -1,213 +0,0 @@
-# Microsoft Developer Studio Project File - Name="IOR CorbaLoc Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=IOR CorbaLoc Server - 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 "IOR CorbaLoc Server.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 "IOR CorbaLoc Server.mak" CFG="IOR CorbaLoc Server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "IOR CorbaLoc Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "IOR CorbaLoc Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "IOR CorbaLoc Server - 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 "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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  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 TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Release/server.exe" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

-

-!ELSEIF  "$(CFG)" == "IOR CorbaLoc Server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "IOR_CorbaLoc_Server___Win32_Debug"

-# PROP BASE Intermediate_Dir "IOR_CorbaLoc_Server___Win32_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 "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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  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 TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "IOR CorbaLoc Server - Win32 Release"

-# Name "IOR CorbaLoc Server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\corbalocC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbalocS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\status_i.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\corbalocC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbalocS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\status_i.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "*.idl"

-# Begin Source File

-

-SOURCE=.\corbaloc.idl

-

-!IF  "$(CFG)" == "IOR CorbaLoc Server - Win32 Release"

-

-# Begin Custom Build - Invoking IDL Compiler

-InputPath=.\corbaloc.idl

-InputName=corbaloc

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IOR CorbaLoc Server - Win32 Debug"

-

-# Begin Custom Build - Invoking IDL Compiler

-InputPath=.\corbaloc.idl

-InputName=corbaloc

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp b/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp
deleted file mode 100644
index 4ce7391fcbf..00000000000
--- a/TAO/tests/ior_corbaloc/ior_corbaname_client.dsp
+++ /dev/null
@@ -1,213 +0,0 @@
-# Microsoft Developer Studio Project File - Name="IOR CorbaName Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=IOR CorbaName Client - 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 "IOR CorbaName Client.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 "IOR CorbaName Client.mak" CFG="IOR CorbaName Client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "IOR CorbaName Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "IOR CorbaName Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "IOR CorbaName Client - 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 "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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  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 TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Release/corbaname_client.exe" /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

-

-!ELSEIF  "$(CFG)" == "IOR CorbaName Client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "IOR_CorbaName_Client___Win32_Debug"

-# PROP BASE Intermediate_Dir "IOR_CorbaName_Client___Win32_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 "..\..\..\\" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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  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 TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"corbaname_client.exe" /pdbtype:sept /libpath:"..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "IOR CorbaName Client - Win32 Release"

-# Name "IOR CorbaName Client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\corbalocC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbalocS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbaname_client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ior_corbaloc_client_i.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\corbalocC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbalocS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ior_corbaloc_client_i.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "*.idl"

-# Begin Source File

-

-SOURCE=.\corbaloc.idl

-

-!IF  "$(CFG)" == "IOR CorbaName Client - Win32 Release"

-

-# Begin Custom Build - Invoking IDL Compiler

-InputPath=.\corbaloc.idl

-InputName=corbaloc

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "IOR CorbaName Client - Win32 Debug"

-

-# Begin Custom Build - Invoking IDL Compiler

-InputPath=.\corbaloc.idl

-InputName=corbaloc

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/ior_corbaloc/run_test.pl b/TAO/tests/ior_corbaloc/run_test.pl
deleted file mode 100755
index 855bc9566ce..00000000000
--- a/TAO/tests/ior_corbaloc/run_test.pl
+++ /dev/null
@@ -1,148 +0,0 @@
-     eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-  &  eval 'exec perl -S $0 $argv:q'
-  if 0;
-
-# $Id$
-# -*- perl -*-
-
-# This is a Perl Script that runs the corbaloc: style URL tests.
-# It starts the servers and client.
-
-use lib "../../../bin";
-
-use PerlACE::Run_Test;
-
-$TARGETHOSTNAME = "localhost";
-
-$status = 0;
-
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-$sleeptime = 8;
-
-@iorfile = ("ns1.ior",
-            "ns2.ior",
-            "ns2.ior" );
-
-$def_port = 2809;
-@ns_orb_port=( 12000 + PerlACE::uniqueid (),
-               $def_port);
-
-# List of tests to test corbaloc URL syntax.
-@corbaloc_tests = ("corbaloc:rir:/NameService",
-         "corbaloc:rir:/",
-         "corbaloc:iiop:$TARGETHOSTNAME:$ns_orb_port[0]/NameService",
-         "corbaloc::$TARGETHOSTNAME:$ns_orb_port[0]/NameService",
-         "corbaloc::1.0\@$TARGETHOSTNAME:$ns_orb_port[0]/NameService",
-	 "corbaloc::$TARGETHOSTNAME/NameService",
-         "corbaloc::1.1\@$TARGETHOSTNAME:$ns_orb_port[0]/NameService",
-         "corbaloc::1.2\@$TARGETHOSTNAME:$ns_orb_port[0]/NameService");
-
-
-@comments = ("Using RIR protocol with the object key specified: \n",
-             "Using RIR protocol without specifying the object key: \n(empty object key defaults to \"NameService\"\n",
-             "Using IIOP protocol with the hostname, port specified: \n",
-             "Using IIOP protocol, with protocol unspecified, hostname specified, port specified: \n",
-             "Using the default protocol (iiop) with the hostname, port specified: \n",
-             "Using IIOP protocol with protocol unspecified, hostname specified, port unspecified\n(should default to $def_port): \n");
-
-$test_number = 0;
-
-# Run the naming service, server. Run the client for each of the test. 
-# Client uses ior in a file to bootstrap to the server.
-
-@SR = (new PerlACE::Process ("server"),
-       new PerlACE::Process ("server"),
-       new PerlACE::Process ("server"));
-@SR_NAME=( "STATUS", "STATUS1", "STATUS");
-
-$CL = new PerlACE::Process ("client");
-$CN_CL = new PerlACE::Process ("corbaname_client");
-
-# We run two Naming_Service processes.  One on an arbitrary port,
-# and one on the corbaloc: default port of 2809
-@NS = (new PerlACE::Process ("../../orbsvcs/Naming_Service/Naming_Service"),
-       new PerlACE::Process ("../../orbsvcs/Naming_Service/Naming_Service"));
-
-for($i=0; $i <= $#NS; $i++){
-  # Make sure the files are gone, so we can wait on them.
-  unlink $iorfile[$i];
-  print "Spawning Naming Service on port $ns_orb_port[$i]......\n";
-  $NS[$i]->Arguments (" -ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port[$i]"
-                      ." -o $iorfile[$i] -m 0");
-  
-  $NS[$i]->Spawn ();
-  
-  if (PerlACE::waitforfile_timed ($iorfile[$i], $sleeptime) == -1) {
-    print STDERR "ERROR: cannot find IOR file <$iorfile[$i]>\n";
-    $NS[$i]->Kill (); 
-    exit 1;
-  }
-}
-
-sleep 2;
-
-for($i=0; $i <= $#SR; $i++){
-  print "Spawning server with name $SR_NAME[$i]\n";
-  $SR[$i]->Arguments ("-ORBInitRef NameService=file://$iorfile[$i] $SR_NAME[$i]");
-  $SR[$i]->Spawn ();
-}
-
-sleep 5;
-
-
-print "\n======= Running corbaloc: tests\n";
-foreach $o (@corbaloc_tests) {  
-  print STDERR "\n".$test_number.".  ".$comments[$test_number];
-  print STDERR "             $o\n";
-  
-  
-  $CL->Arguments ("$o -ORBInitRef NameService=file://$iorfile[0]");
-  $client = $CL->SpawnWaitKill (60);
-  
-  if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-  }
-  
-  $test_number++;
-}
-
-
-
-print "\n======= Running corbaname: tests\n";
-@corbaname_tests = ("corbaname:iiop:$TARGETHOSTNAME:$ns_orb_port[0]#$SR_NAME[0]",
-                    "corbaname::$TARGETHOSTNAME:$ns_orb_port[0]#$SR_NAME[0]",
-
-                    "corbaname::$TARGETHOSTNAME#$SR_NAME[1]",
-                    "corbaname::$TARGETHOSTNAME:$ns_orb_port[1]#$SR_NAME[1]");
-
-foreach $o ( @corbaname_tests ){
-  print STDERR "\n$test_number:  $o\n";
-  $CN_CL->Arguments ("$o $corbaname_tests[$i]");
-  $client = $CN_CL->SpawnWaitKill (60);
-
-
-  $test_number++;
-}
-
-
-for($i=0; $i <= $#NS; $i++){
-$nameservice = $NS[$i]->TerminateWaitKill (10); 
-
-if ($nameservice != 0) {
-  print STDERR "ERROR: name server $i returned $nameservice\n";
-  $status = 1;
-}
-}
-
-
-for($i=0; $i <= $#SR; $i++){
-$server = $SR[$i]->TerminateWaitKill (10);
-if ($server != 0) {
-  print STDERR "ERROR: server $i returned $server\n";
-  $status = 1;
-}
-}
-
-exit $status;
diff --git a/TAO/tests/ior_corbaloc/server.bor b/TAO/tests/ior_corbaloc/server.bor
deleted file mode 100644
index 588d50546eb..00000000000
--- a/TAO/tests/ior_corbaloc/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Makefile for building the ior_corbaloc server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
-        $(OBJDIR)\corbalocS.obj \
-        $(OBJDIR)\corbalocC.obj \
-        $(OBJDIR)\status_i.obj \
-        $(OBJDIR)\server.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-        $(TAO_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
-        $(TAO_NAMING_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-        $(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
-        $(TAO_NAMING_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\corbaloc.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\corbalocS.cpp $(IDLDIR)\corbalocC.cpp: $(IDLDIR)\corbaloc.idl
-	$(TAO_IDL) $**
diff --git a/TAO/tests/ior_corbaloc/server.cpp b/TAO/tests/ior_corbaloc/server.cpp
deleted file mode 100644
index 415daf348c1..00000000000
--- a/TAO/tests/ior_corbaloc/server.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// $Id$
-// server.cpp
-
-#include "status_i.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/orbsvcs/CosNamingC.h"
-
-int main (int argc, char* argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // First initialize the ORB, that will remove some arguments...
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv,
-                         "" /* the ORB name, it can be anything! */
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (argc < 2)
-        {
-          ACE_DEBUG ((LM_DEBUG, "\nUsage:\n  %s [NAME to insert in Naming Service]\n", argv[0]));
-          return -1;
-        }
-      // Get a reference to the RootPOA
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // narrow down to the correct reference
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Set a POA Manager
-      PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Activate the POA Manager
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create the servant
-      corbaloc_Status_i status_i;
-      status_i.set_name (argv[1]);
-      // Activate it to obtain the reference
-      corbaloc::Status_var status =
-        status_i._this ();
-      ACE_TRY_CHECK;
-
-      // Get a reference to Naming Context
-      CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow down the reference
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_context_object.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Bind Iterator_Factory to the Naming Context
-      CosNaming::Name name (1);
-      name.length (1);
-      name[0].id = CORBA::string_dup (argv[1]);
-
-      naming_context->rebind (name, status.in ());
-      ACE_TRY_CHECK;
-
-      // Run the orb
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Destroy the POA, waiting until the destruction terminates
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, ex) {
-    ACE_PRINT_EXCEPTION (ex, "CORBA exception raised! ");
-  }
-  ACE_CATCHANY {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught in server");
-  }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/tests/ior_corbaloc/status_i.cpp b/TAO/tests/ior_corbaloc/status_i.cpp
deleted file mode 100644
index e519ac04eb9..00000000000
--- a/TAO/tests/ior_corbaloc/status_i.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#include "status_i.h"
-
-corbaloc_Status_i::corbaloc_Status_i ()
-  : server_name_()
-{
-  // Constructor
-}
-
-CORBA::Boolean
-corbaloc_Status_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // If the server received the request from the client, return true
-  // == 0;
-  ACE_DEBUG ((LM_DEBUG,
-              "Invoking print_status() method for servant with name: %s\nregistered in Naming Service\n",
-              server_name_.c_str ()));
-  return 0;
-}
diff --git a/TAO/tests/ior_corbaloc/status_i.h b/TAO/tests/ior_corbaloc/status_i.h
deleted file mode 100644
index 3ffb0fc9c65..00000000000
--- a/TAO/tests/ior_corbaloc/status_i.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#ifndef STATUS_I_H
-#define STATUS_I_H
-
-#include "corbalocS.h"
-
-class corbaloc_Status_i : public POA_corbaloc::Status
-{
-public:
-  corbaloc_Status_i ();
-
-  CORBA::Boolean print_status (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void set_name (const char *name) { server_name_ = name; }
-
-private:
-  ACE_CString server_name_;
-};
-
-#endif /* STATUS_I_H */