56 files changed, 0 insertions, 5703 deletions
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.dsw b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.dsw
deleted file mode 100644
index d17cf7c9604..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "client"=.\client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "server"=.\server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl
deleted file mode 100644
index f93b53177b9..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpcall/Triangle_Test
-//
-// = FILENAME
-//    Triangle_Test.idl
-//
-// = DESCRIPTION
-//    An example of how nested upcalls work/fail?
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-
-
-interface Object_A {
-
-  long foo (in long time);
-
-};
-
-interface MT_Object;
-
-interface MT_Object 
-{
-  long yadda (in long hop_count, in MT_Object partner);
-};
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
deleted file mode 100644
index 3a9c39cc188..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    MT_Object_i.cpp
-//
-// = DESCRIPTION
-//    This class implements the Object A  of the 
-//    Nested Upcalls - MT Client test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "MT_Object_i.h"
-
-ACE_RCSID(MT_Client_Test, MT_Object_i, "$Id$")
-
-#define MAX_HOP_COUNT 20
-
-// CTOR
-MT_Object_i::MT_Object_i (void)
-{
-}
-
-// DTOR
-MT_Object_i::~MT_Object_i (void)
-{
-}
-
-
-CORBA::Long
-MT_Object_i::yadda (CORBA::Long hop_count,
-                       MT_Object_ptr partner,
-                       CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) MT_Object_i::yadda () hop count = %d\n",
-              hop_count));
-
-  if (hop_count < MAX_HOP_COUNT)
-  {
-    if (partner != 0)
-      return partner->yadda (hop_count + 1, this->_this (env), env) + 1;
-  }
-
-  return 0;
-}
-
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
deleted file mode 100644
index 0a2300f6110..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client test
-//
-// = FILENAME
-//    MT_Object_A_i.h
-//
-// = DESCRIPTION
-//    This class implements the Object A of the 
-//    Nested Upcalls - MT Client test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (MT_OBJECT_IMPL_H)
-#  define MT_OBJECT_IMPL_H
-
-#include "MT_Client_TestS.h"
-#include "MT_Client_TestC.h"
-
-class MT_Object_i : public POA_MT_Object
-{
-  // = TITLE
-  //     Implement the <MT_Object> IDL interface.
-public:
-  MT_Object_i (void);
-  // Constructor.
-
-  virtual ~MT_Object_i (void);
-  // Destructor.
-
-  virtual CORBA::Long yadda (CORBA::Long hop_count,
-                             MT_Object_ptr partner,
-                             CORBA::Environment &_tao_environment);
-
-};
-
-#endif /* MT_OBJECT_IMPL_H */
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
deleted file mode 100644
index bc6b0a8c173..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#       $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_SRC = MT_Client_TestC.cpp MT_Client_TestS.cpp
-PROG_SRCS = $(IDL_SRC) server.cpp client.cpp \
-        local_server.cpp MT_Object_i.cpp
-
-SRC = $(PROG_SRCS)
-
-CLIENT_OBJS = MT_Client_TestS.o MT_Client_TestC.o \
-        MT_Object_i.o local_server.o client.o
-
-SERVER_OBJS = MT_Client_TestS.o MT_Client_TestC.o server.o \
-        MT_Object_i.o
-
-BIN = client server
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#       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
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-
-.PRECIOUS: MT_Client_TestC.h MT_Client_TestC.i MT_Client_TestC.cpp
-.PRECIOUS: MT_Client_TestS.h MT_Client_TestS.i MT_Client_TestS.cpp
-.PRECIOUS: MT_Client_TestS_T.h MT_Client_TestS_T.i MT_Client_TestS_T.cpp
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf MT_Client_Test[CS].* MT_Client_TestS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/README b/TAO/tests/NestedUpcall/MT_Client_Test/README
deleted file mode 100644
index c8397f8d938..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/README
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Multiple Client and global resources test
-=========================================
-
-
-This test uses global resources, meaning one ORB and one Reactor.
-Several client threads are created, which call one of the two servers. 
-This means, two server instances should be running. Also one
-server thread is running, doing nested upcalls to the same server.
-
-The intention is to see if global resources with multiple threads work.
-
-The client understands the following switches:
-
--f file of the ior of the first server, used by approx. half of the 
-   client threads and the local server thread.
-
--g file of the ior of the second server
-
--n number of client threads {0..infty :-)}
-
--i number of client iterations
-
--s number of local server iterations
-
-
-server switches:
-
--o file to put the ior
-
-
-
-Usage:
-
-server_A -o ior1 -ORBport 10031
-server_A -o ior2 -ORBport 10032
-
-//for two client threads, 10 iterations and 5 server iterations
-client -f ior1 -g ior2 -n 2 -i 10 -s 5 -ORBport 10033
-
-! Don't forget the ORB port for the client!
-\ No newline at end of file
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
deleted file mode 100644
index 6eee002c688..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
deleted file mode 100644
index af2e1e68945..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    client.cpp
-//
-// = DESCRIPTION
-//    Start one server thread calling a distant MT Object serveral times,
-//    also starting serveral client threads which call the MT Object too.
-//    The server does nested upcalls.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "ace/Read_Buffer.h"
-#include "client.h"
-#include "local_server.h"
-
-ACE_RCSID(MT_Client_Test, client, "$Id$")
-
-MT_Client_Task::MT_Client_Task (int argc, char **argv,
-				int client_number)
-  : argc_ (argc),
-    argv_ (argv),
-    client_number_ (client_number)
-{
-}
-
-int
-MT_Client_Task::svc (void)
-{
-  if (this->mT_Client_.init (this->argc_,
-                             this->argv_,
-			     this->client_number_) == -1)
-    return 1;
-  else
-    return this->mT_Client_.run ();
-}
-
-// Constructor.
-MT_Client::MT_Client ()
-  : object_key_ (0),
-    iterations_ (1)
-{
-}
-
-
-// Reads the Object A IOR from a file
-
-int
-MT_Client::read_ior (char *filename)
-{
-  // Open the file for reading.
-  ACE_HANDLE f_handle = ACE_OS::open (filename,0);
-
-  if (f_handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for reading: %p\n",
-                       filename),
-                      -1);
-
-  ACE_Read_Buffer ior_buffer (f_handle);
-
-  this->object_key_ = ior_buffer.read ();
-  if (this->object_key_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to allocate memory to read ior: %p\n"),
-                       -1);
-
-  ACE_OS::close (f_handle);
-  return 0;
-}
-
-
-// Parses the command line arguments and returns an error status.
-
-int
-MT_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "df:g:h:i:n:s:");
-  int c;
-  int result;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-    {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-        // Depending on the thread ID we pick the IOR
-      case 'f': // read the IOR from the file.
-        if ((this->client_number_ % 2) == 0)
-        {
-          result = this->read_ior (get_opts.optarg);
-          // read IOR for MT Object
-          if (result < 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Unable to read ior from %s : %p\n",
-                               get_opts.optarg),
-                              -1);
-        }
-        break;
-      case 'g': // read the IOR from the file.
-        if ((this->client_number_ % 2) == 1)
-        {
-          result = this->read_ior (get_opts.optarg);
-          // read IOR for Object A
-          if (result < 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Unable to read ior from %s : %p\n",
-                               get_opts.optarg),
-                              -1);
-        }
-        break;
-      case 'i': this->iterations_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'h':
-      case 'n':
-      case 's':
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                          "usage:  %s\n"
-                           " [-f] first server ior file\n"
-                           " [-g] second server ior file\n"
-                           " [-h] third server ior file\n"
-                           " [-i] client iterations\n"
-                           " [-n] number of client threads\n"
-                           " [-s] number of server iterations\n",
-                          this->argv_ [0]),
-                          -1);
-    }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-MT_Client::run (void)
-{
-  TAO_TRY
-  {
-    for (unsigned long i = 0; i < this->iterations_; i++)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) MT_Client::run: %d of %d\n",
-                  i,
-                  this->iterations_));
-
-      // call the recursive object MT_Object for nested upcalls
-      // testing
-      this->mT_Object_var_->yadda (0,
-                                   0,
-                                   TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  }
-  TAO_CATCHANY
-  {
-    TAO_TRY_ENV.print_exception ("MT_Client:run");
-    return -1;
-  }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-MT_Client::~MT_Client (void)
-{
-  if (this->object_key_ != 0)
-    ACE_OS::free (this->object_key_);
-  if (this->argv_ != 0)
-    delete [] this->argv_;
-}
-
-
-int
-MT_Client::init (int argc, char **argv,
-		 int client_number)
-{
-
-  // Make a copy of argv since ORB_init will change it.
-  this->argc_ = argc;
-  this->argv_ = new char *[argc];
-  for (int i = 0; i < argc; i++)
-    this->argv_[i] = argv[i];
-
-
-  this->client_number_ = client_number;
-
-  TAO_TRY
-  {
-      this->orb_var_ = CORBA::ORB::_duplicate (TAO_ORB_Core_instance()->orb());
-      TAO_CHECK_ENV;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-      if (this->object_key_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "The IOR is nil, not able to get the object.\n"),
-                            -1);
-
-
-      CORBA::Object_var object_var = this->orb_var_->string_to_object (this->object_key_,
-                                                                       TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (object_var.in()))
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "No proper object has been returned.\n"),
-                            -1);
-
-      this->mT_Object_var_ = MT_Object::_narrow (object_var.in(),
-                                                 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (this->mT_Object_var_.in()))
-      {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "We have no proper reference to the Object.\n"),
-                            -1);
-      }
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n"));
-
-  }
-  TAO_CATCHANY
-  {
-    TAO_TRY_ENV.print_exception ("MT_Client::init");
-    return -1;
-  }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  TAO_ORB_Manager orb_manager;
-
-  orb_manager.init (argc,
-                    argv,
-                    env);
-
-  if (env.exception() != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "main: Failure while initializing the ORB."),
-                       -1);
-
-
-  ACE_DEBUG ((LM_DEBUG,"\n\tMT_Client: client\n\n"));
-
-  int i;
-  int threads = 1;
-
-  for (i = 0; i < argc; i++)
-    if (ACE_OS::strcmp (argv[i], "-n") == 0)
-      threads = ACE_OS::atoi(argv[i + 1]);
-
-  // create a separate server thread
-  ACE_Thread_Manager server_thr_mgr;
-  // starting the server thread
-  MT_Server_Task *server = new MT_Server_Task (&server_thr_mgr,
-                                               argc,
-                                               argv,
-                                               &orb_manager);
-  server->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
-
-  // starting the client threads
-  MT_Client_Task **clients = new MT_Client_Task*[threads];
-
-  for (i = 0; i < threads; i++)
-    clients[i] = new MT_Client_Task (argc, argv, i);
-
-  for (i = 0; i < threads; i++)
-    clients[i]->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
-
-  int result = ACE_Thread_Manager::instance ()->wait ();
-
-  for (i = 0; i < threads; i++)
-    delete clients[i];
-
-  delete [] clients;
-
-  //orb_manager.orb ()->shutdown ();
-
-  // wait for the server thread to end
-  result |= server_thr_mgr.wait ();
-
-  delete server;
-
-  return result;
-}
-
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp
deleted file mode 100644
index c3b2a70528d..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.dsp
+++ /dev/null
@@ -1,219 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NU MT_Client_Test Client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=NU MT_Client_Test 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 "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 "client.mak" CFG="NU MT_Client_Test Client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NU MT_Client_Test Client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "NU MT_Client_Test 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)" == "NU MT_Client_Test 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ELSEIF  "$(CFG)" == "NU MT_Client_Test Client - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "client__"
-# PROP BASE Intermediate_Dir "client__"
-# 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NU MT_Client_Test Client - Win32 Release"
-# Name "NU MT_Client_Test Client - Win32 Debug"
-# Begin Group "source files"
-
-# PROP Default_Filter "*.cpp"
-# Begin Source File
-
-SOURCE=.\client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\local_server.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Client_TestC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Client_TestS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Object_i.cpp
-# End Source File
-# End Group
-# Begin Group "header files"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\client.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\local_server.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Client_TestC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Object_i.h
-# End Source File
-# End Group
-# Begin Group "IDL files"
-
-# PROP Default_Filter "*.idl"
-# Begin Source File
-
-SOURCE=.\MT_Client_Test.idl
-
-!IF  "$(CFG)" == "NU MT_Client_Test Client - Win32 Release"
-
-USERDEP__MT_CL="..\..\..\.\bin\Release\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL compiler
-InputPath=.\MT_Client_Test.idl
-InputName=MT_Client_Test
-
-BuildCmds= \
-	tao_idl $(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)" == "NU MT_Client_Test Client - Win32 Debug"
-
-USERDEP__MT_CL="..\..\..\..\bin\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL compiler
-InputPath=.\MT_Client_Test.idl
-InputName=MT_Client_Test
-
-BuildCmds= \
-	tao_idl $(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/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
deleted file mode 100644
index b46b41f6d79..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//    Test for multithreaded client using one global ORB (and Reactor)
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (MT_CLIENT_H)
-#define MT_CLIENT_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "tao/corba.h"
-#include "MT_Client_TestC.h"
-
-class MT_Client
-{
-  // = TITLE
-  //    A simple client talking to one server
-  //
-  // = DESCRIPTION
-  //    It is connecting to a server which holds the Object_A
-  //    or using the "-m" switch to a server holding the MT_Object
-
-public:
-  MT_Client (void);
-  ~MT_Client (void);
-  // = Constructor and destructor.
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, 
-            char **argv,
-	    int client_number);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int read_ior (char *filename);
-  // reading the IOR of object A in
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *object_key_;
-  // Key of the object
-
-  int shutdown_;
-  // Flag to tell server to shutdown.
-
-  MT_Object_var mT_Object_var_;
-  // pointer to the mt Object
-
-  CORBA::ORB_var orb_var_;
-  // Remember our orb.
-
-  int client_number_;
-  // This is used to choose the server...
-
-  unsigned long iterations_;
-  // number of loops
-
-};
-
-class MT_Client_Task : public ACE_Task<ACE_SYNCH>
-{
-  // = TITLE
-  //    Wrapper for the MT_Client to be an extra thread
-  //
-  // = DESCRIPTION
-  //    No big purpose, just wrapping
-public:
-  MT_Client_Task (int argc, char **argv, int client_number);
-
-  virtual int svc (void);
-
-private:
-  MT_Client mT_Client_;
-  int argc_;
-  char **argv_;
-
-  int client_number_;
-  // To determine if we use the first or the second server.
-};
-
-#endif /* MT_CLIENT_H */
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
deleted file mode 100644
index 2e750d704f0..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    local_server.cpp
-//
-// = DESCRIPTION
-//    This server will run the ORB briefly and then make
-//    several calls on the distant MT Object.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "ace/Read_Buffer.h"
-#include "local_server.h"
-
-ACE_RCSID(MT_Client_Test, local_server, "$Id$")
-
-MT_Server_Task::MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
-                                int argc,
-                                char **argv,
-                                TAO_ORB_Manager* orb_manager_ptr)
-   :ACE_Task<ACE_SYNCH> (thr_mgr_ptr),
-    argc_ (argc),
-    argv_ (argv),
-    orb_manager_ptr_ (orb_manager_ptr)
-{
-}
-
-int
-MT_Server_Task::svc (void)
-{
-  if (this->mT_Server_.init (this->argc_,
-                             this->argv_,
-                             this->orb_manager_ptr_) == -1)
-    return 1;
-  else
-    return this->mT_Server_.run_ORB_briefly ();
-}
-
-
-MT_Server::MT_Server ()
-  : object_key_ (0),
-    ior_output_file_ (0),
-    orb_manager_ptr_ (0),
-    iterations_ (1)
-{
-}
-
-// Reads the MT Object IOR from a file
-int
-MT_Server::read_ior (char *filename)
-{
-  // Open the file for reading.
-  ACE_HANDLE f_handle = ACE_OS::open (filename,0);
-
-  if (f_handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for reading: %p\n",
-                       filename),
-                      -1);
-
-  ACE_Read_Buffer ior_buffer (f_handle);
-
-  this->object_key_ = ior_buffer.read ();
-  if (this->object_key_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to allocate memory to read ior: %p\n"),
-                       -1);
-
-  ACE_OS::close (f_handle);
-  return 0;
-}
-
-
-
-int
-MT_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "d:f:g:h:i:n:s:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'h': // read the IOR from the file.
-        int result;
-        result = this->read_ior (get_opts.optarg);
-        // read IOR for MT Object
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
-                             get_opts.optarg),
-                            -1);
-        break;
-      case 'f':
-      case 'g':
-      case 'i':
-      case 'n':
-        break;
-      case 's': this->iterations_ = atoi (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]\n"
-                           " [-f] first server ior file\n"
-                           " [-g] second server ior file\n"
-                           " [-h] third server ior file\n"
-                           " [-i] client iterations\n"
-                           " [-n] number of client threads\n"
-                           " [-s] number of server iterations\n"
-                           "\n",
-                           argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-MT_Server::init (int argc,
-                 char** argv,
-                 TAO_ORB_Manager* orb_manager_ptr)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-  if ((this->orb_manager_ptr_ = orb_manager_ptr) == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "MT_Server::init: ORB_Manager is nil!\n"),
-                       -1);
-
-  TAO_TRY
-  {
-
-    // Call the init of TAO_ORB_Manager to create a child POA
-    // under the root POA.
-    this->orb_manager_ptr_->init_child_poa (argc,
-                                       argv,
-                                       "child_poa",
-                                       TAO_TRY_ENV);
-
-    TAO_CHECK_ENV;
-
-    this->parse_args ();
-    // ~~ check for the return value here
-
-    CORBA::String_var str  =
-      this->orb_manager_ptr_->activate_under_child_poa ("MT",
-                                                 &this->mT_Object_i_,
-                                                 TAO_TRY_ENV);
-    ACE_DEBUG ((LM_DEBUG,
-                "The IOR is: <%s>\n",
-                str.in ()));
-
-    if (this->ior_output_file_)
-    {
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       str.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
-
-    // retrieve the object reference to the distant mt object
-    if (this->object_key_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "The IOR is nil, not able to get the object.\n"),
-                            -1);
-
-    CORBA::ORB_var orb_var = this->orb_manager_ptr_->orb ();
-
-    CORBA::Object_var object_var = orb_var->string_to_object (this->object_key_,
-                                                              TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    if (CORBA::is_nil (object_var.in()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "No proper object has been returned.\n"),
-                          -1);
-
-    this->mT_Object_var_ = MT_Object::_narrow (object_var.in(),
-                                               TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    if (CORBA::is_nil (this->mT_Object_var_.in()))
-    {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "We have no proper reference to the Object.\n"),
-                          -1);
-    }
-
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n"));
-
-  }
-  TAO_CATCHANY
-  {
-    TAO_TRY_ENV.print_exception ("MT_Client::init");
-    return -1;
-  }
-  TAO_ENDTRY;
-
-
-  return 0;
-}
-
-int
-MT_Server::run ()
-{
-  CORBA::Environment env;
-  if (this->orb_manager_ptr_->run (env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "MT_Server::run"),
-                      -1);
-  return 0;
-}
-
-MT_Server::~MT_Server (void)
-{
-  if (this->object_key_ != 0)
-    ACE_OS::free (this->object_key_);
-}
-
-
-int
-MT_Server::run_ORB_briefly (void)
-{
-  if (this->iterations_ > 0)
-  {
-    CORBA::Environment env;
-
-    ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) MT_Server::run: "
-                "going to call distant MT Object\n"));
-
-    for (unsigned int i = 0; i < this->iterations_; i++)
-    {
-      this->mT_Object_var_->yadda (0,
-                                   this->mT_Object_i_._this (env),
-                                   env);
-
-      if (env.exception () != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "MT_Server::run: failed to call distant MT object\n"),
-                          -1);
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) MT_Server::run: "
-                  "called distant MT Object i = %d\n",
-                  i));
-    }
-  }
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
deleted file mode 100644
index 84bfc68d5fa..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    local_server.h
-//
-// = DESCRIPTION
-//     This class implements a simple server for the 
-//     Nested Upcalls - MT Client test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (MT_CLIENT_TEST_MT_SERVER_H)
-#define MT_CLIENT_TEST_MT_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/TAO.h"
-#include "MT_Object_i.h"
-
-class MT_Server
-{
-  // = TITLE
-  //   This is the server for the mt_object
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
-
-public:
-
-  MT_Server ();
-  // Default constructor
-
-  ~MT_Server (void);
-  // Destructor
-
-  int init (int argc,
-            char **argv,
-            TAO_ORB_Manager* orb_manager_ptr);
-  // Initialize the MT_Server state - parsing arguments and ...
-
-  int run (void);
-  // Run the orb
-
-  int run_ORB_briefly (void);
-  // Just run it briefly
-
-private:
-  int read_ior (char *filename);
-  // reading the IOR of mt object in
-
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  char *object_key_;
-  // Key of the object
-
-  FILE* ior_output_file_;
-  // File to output the IOR of the object A.
-
-  TAO_ORB_Manager* orb_manager_ptr_;
-  // The ORB manager
-
-  MT_Object_i mT_Object_i_;
-  // Implementation object 
-
-  MT_Object_var mT_Object_var_;
-  // reference for the distant MT Object
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-
-  unsigned int iterations_;
-  // number of times the server should call to the disted MT OBject
-};
-
-
-class MT_Server_Task : public ACE_Task<ACE_SYNCH>
-{
-  // = TITLE
-  //    Wrapper for the MT_Server to be an extra thread
-  //
-  // = DESCRIPTION
-  //    No big purpose, just wrapping
-public:
-  MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr,
-                  int argc, 
-                  char **argv,
-                  TAO_ORB_Manager* orb_manager_ptr);
-
-  virtual int svc (void);
-
-private:
-  MT_Server mT_Server_;
-  int argc_;
-  char **argv_;
-  TAO_ORB_Manager* orb_manager_ptr_;
-};
-
-
-#endif /* MT_CLIENT_TEST_MT_SERVER_H */
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
deleted file mode 100755
index 9e95d871e75..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
+++ /dev/null
@@ -1,37 +0,0 @@
-#$Id$
-# -*- perl -*-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-unshift @INC, '../../../../bin';
-require Process;
-
-$server1_port = 0;
-$server2_port = 0;
-$ior1file = "theior1";
-$ior2file = "theior2";
-$sleeptime = 3;
-
-$SV1 = Process::Create ("server".$Process::EXE_EXT, 
-                        " -ORBport $server1_port -o $ior1file ".
-			" -ORBobjrefstyle url");
-
-$SV2 = Process::Create ("server".$Process::EXE_EXT, 
-                        " -ORBport $server2_port -o $ior2file ".
-			" -ORBobjrefstyle url");
-
-sleep $sleeptime;
-
-$status = system ("client".$Process::EXE_EXT.
-		  " -ORBport $client_port ".
-		  " -f $ior1file -g $ior2file -n 2 -i 10 -s 5");
-
-$SV1->Kill (); $SV1->Wait ();
-$SV2->Kill (); $SV2->Wait ();
-
-unlink $ior1file;
-unlink $ior2file;
-
-# @@ Capture any errors from the server too.
-exit $status;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
deleted file mode 100644
index 5f172c9c07a..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple server for the 
-//    Nested Upcalls - MT_Client test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "server.h"
-
-ACE_RCSID(MT_Client_Test, server, "$Id$")
-
-MT_Object_Server::MT_Object_Server (void)
-  : ior_output_file_ (0)
-{
-}
-
-int
-MT_Object_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "do:m");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_output_file_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-o] <ior_output_file>"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-MT_Object_Server::init (int argc,
-                       char** argv,
-                       CORBA::Environment& env)
-{
-  // Call the init of TAO_ORB_Manager to create a child POA
-  // under the root POA.
-  this->orb_manager_.init_child_poa (argc,
-                                     argv,
-                                     "child_poa",
-                                     env);
-
-  TAO_CHECK_ENV_RETURN (env,-1);
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-  // ~~ check for the return value here
-
-  CORBA::String_var str;
-  str = this->orb_manager_.activate_under_child_poa ("MT_Object",
-                                                     &this->mT_Object_i_,
-                                                     env);
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              str.in ()));
-
-  if (this->ior_output_file_)
-    {
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       str.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
-
-
-  return 0;
-}
-
-
-int
-MT_Object_Server::run (CORBA::Environment& env)
-{
-  if (this->orb_manager_.run (env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "NestedUpCalls_Server::run"),
-                      -1);
-  return 0;
-}
-
-MT_Object_Server::~MT_Object_Server (void)
-{
-}
-
-int
-main (int argc, char *argv[])
-{
-  MT_Object_Server MT_Object_Server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
-  TAO_TRY
-    {
-      if (MT_Object_Server.init (argc,argv,TAO_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          MT_Object_Server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp b/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp
deleted file mode 100644
index b10aedbb27e..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.dsp
+++ /dev/null
@@ -1,215 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NU MT_Client_Test Server" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=NU MT_Client_Test 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 "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 "server.mak" CFG="NU MT_Client_Test Server - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NU MT_Client_Test Server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "NU MT_Client_Test 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)" == "NU MT_Client_Test 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ELSEIF  "$(CFG)" == "NU MT_Client_Test Server - 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NU MT_Client_Test Server - Win32 Release"
-# Name "NU MT_Client_Test Server - Win32 Debug"
-# Begin Group "source files"
-
-# PROP Default_Filter "*.cpp"
-# Begin Source File
-
-SOURCE=.\MT_Client_TestC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Client_TestS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Object_i.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.cpp
-# End Source File
-# End Group
-# Begin Group "header files"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\MT_Client_TestC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Client_TestS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\MT_Object_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.h
-# End Source File
-# End Group
-# Begin Group "IDL files"
-
-# PROP Default_Filter "*.idl"
-# Begin Source File
-
-SOURCE=.\MT_Client_Test.idl
-
-!IF  "$(CFG)" == "NU MT_Client_Test Server - Win32 Release"
-
-USERDEP__MT_CL="..\..\..\..\bin\Release\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL compiler
-InputPath=.\MT_Client_Test.idl
-InputName=MT_Client_Test
-
-BuildCmds= \
-	tao_idl $(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)" == "NU MT_Client_Test Server - Win32 Debug"
-
-USERDEP__MT_CL="..\..\..\..\bin\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL Compiler
-InputPath=.\MT_Client_Test.idl
-InputName=MT_Client_Test
-
-BuildCmds= \
-	tao_idl $(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/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
deleted file mode 100644
index cb58c0d6376..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/MT_Client_Test
-//
-// = FILENAME
-//    server_A.h
-//
-// = DESCRIPTION
-//      This class implements a simple server for the 
-//      Nested Upcalls - MT Client test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (MT_CLIENT_TEST_MT_OBJECT_SERVER_H)
-#define MT_CLIENT_TEST_MT_OBJECT_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/TAO.h"
-#include "MT_Object_i.h"
-
-class MT_Object_Server
-{
-  // = TITLE
-  //   This is the server for the object A in the test.
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
-
-public:
-
-  MT_Object_Server (void);
-  // Default constructor
-
-  ~MT_Object_Server (void);
-  // Destructor
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
-  // Initialize the NestedUpCalls_Server state - parsing arguments and ...
-
-  int run (CORBA::Environment& env);
-  // Run the orb
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  FILE* ior_output_file_;
-  // File to output the IOR of the object A.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager
-
-  MT_Object_i mT_Object_i_;
-  // Implementation object MT_OBject
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-
-  u_char use_mt_object_;
-};
-
-#endif /* MT_CLIENT_TEST_MT_OBJECT_SERVER_H */
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/svc.conf b/TAO/tests/NestedUpcall/MT_Client_Test/svc.conf
deleted file mode 100644
index 44c01ee1f07..00000000000
--- a/TAO/tests/NestedUpcall/MT_Client_Test/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBresources global"
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/NestedUpcall/Makefile b/TAO/tests/NestedUpcall/Makefile
deleted file mode 100644
index 9cc1a40e9e4..00000000000
--- a/TAO/tests/NestedUpcall/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#	Makefile for the NestedUpcall tests
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = Reactor \
-        Triangle_Test \
-	MT_Client_Test
-
-#----------------------------------------------------------------------------
-#	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/TAO/tests/NestedUpcall/Reactor/Makefile b/TAO/tests/NestedUpcall/Reactor/Makefile
deleted file mode 100644
index 9290259567d..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lorbsvcs -lTAO
-
-IDL_SRC = ReactorC.cpp ReactorS.cpp
-PROG_SRCS = $(IDL_SRC) server.cpp client.cpp #tmplinst.cpp
-
-NESTEDUPCALLS_SVR_OBJS = ReactorS.o ReactorC.o server.o reactor_i.o
-NESTEDUPCALLS_CLT_OBJS = ReactorS.o ReactorC.o client.o eh_i.o
-
-SRC = $(sort $(NESTEDUPCALLS_SVR_OBJS:.o=.cpp) \
-             $(NESTEDUPCALLS_CLT_OBJS:.o=.cpp))
-
-BIN = server client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	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
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs 
-
-.PRECIOUS: ReactorC.h ReactorC.i ReactorC.cpp
-.PRECIOUS: ReactorS.h ReactorS.i ReactorS.cpp
-
-server:	$(addprefix $(VDIR),$(NESTEDUPCALLS_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(NESTEDUPCALLS_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf ReactorS.* ReactorC.* ReactorS_T.*
-	-/bin/rm -rf client server 
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h b/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
deleted file mode 100644
index 73c3195c4fe..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/NestedUpCalls_i.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    NestedUpCalls_i.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (_NESTEDUPCALLS_I_H)
-#define _NESTEDUPCALLS_I_H
-
-//#include "cubitS.h"
-
-// Forward declarations.
-class NestedUpCalls_i;
-
-// Typedefs.
-typedef NestedUpCalls_i *NestedUpCalls_i_ptr;
-typedef NestedUpCalls_i_ptr NestedUpCalls_i_ref;
-
-class NestedUpCalls_i : public POA
-{
-  // = TITLE
-  //    Illustrates how to integrate a servant with the generated
-  //    skeleton.
-  //
-  // = DESCRIPTION
-  //    Implementation of the cubit example at the servant side.
-  //    Cubes an octet, short, long, struct and union.
-public:
-  NestedUpCalls_i (const char *obj_name = 0);
-  // Constructor
-
-  ~NestedUpCalls_i (void);
-  // Destructor
-
-/*  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env);
-  // Cube an octet
-
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env);
-  // Cube a short
-
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env);
-  // Cube a long
-
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env);
-  // Cube a struct.
-
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values,
-                                   CORBA::Environment &env);
-  // Cube a union.
-
-  virtual void cube_sequence (const Cubit::vector &input,
-                              Cubit::vector_out output,
-                              CORBA::Environment &env);
-  // Cube a sequence.
-*/
-  virtual void shutdown (CORBA::Environment &env);
-  // Shutdown routine.
-};
-
-class NestedUpCalls_Reactor_i;
-
-typedef NestedUpCalls_Reactor_i *NestedUpCalls_Reactor_i_ptr;
-
-class NestedUpCalls_Reactor_i: public POA_Cubit_Factory
-{
-  // = TITLE
-  //   NestedUpCalls_Reactor_i
-  //
-  // = DESCRIPTION
-  //   Factory object returning the cubit objrefs
-public:
-  NestedUpCalls_Reactor_i (void);
-  // Constructor.
-
-  ~NestedUpCalls_Reactor_i (void);
-  // Destructor.
-
-  virtual Cubit_ptr make_cubit (const char *key,
-                                CORBA::Environment &env);
-  // Make the cubit object whose key is "key".
-
-private:
-  NestedUpCalls_i my_cubit_;
-};
-
-#endif /* _NestedUpCalls_i_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/NestedUpcall.dsw b/TAO/tests/NestedUpcall/Reactor/NestedUpcall.dsw
deleted file mode 100644
index 1a172dc6d07..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/NestedUpcall.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "client"=.\client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "server"=.\server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/tests/NestedUpcall/Reactor/README b/TAO/tests/NestedUpcall/Reactor/README
deleted file mode 100644
index a1147be10e4..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/README
+++ /dev/null
@@ -1,86 +0,0 @@
--*- indented-text -*-
-
-$Id$
-
-			      BACKGROUND
-			      ==========
-
-This example tests the scenario of nested upcalls in TAO.  For
-example, a particular process may need to act in both the role of
-client and server.  This interaction is common in situations where the
-process makes a twoway invocation on a remote servant, passing a local
-object reference 'o' to that servant.  In the process of servicing
-that invocation, the servant makes a twoway invocation on 'o'.
-
-This example illustrates an interaction that should be familiar to
-anyone who's used ACE: the process of registering a handler with a
-Reactor.  The EventHandler is the local object reference, and the
-Reactor the remote servant.  NOTE: This example in no way should be
-construed as testimony that remote Reactors make sense or are in any
-way useful.  It is merely a motivating example!
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-The client and server by default make use of the Naming Service.  The
-cubit server now has its own NamingServer implementation and hence you
-don't have to start the NamingService before starting the client and
-server.
-
-	You just have to use the -s flags on both the server and
-client if you don't want to use the naming service.
-
-			      EXECUTION
-			      =========
-
-server:
--------
-
-% server [-d] [-s] [-ORBhost <serverhost>] [-ORBport <portnum>]
- 	   [-o <ior_output_file>] 
-
-Options:
--------
--s       Tells the server not to use the Naming Service.
-
--d       Debug flag (It is additive more -d flags will give debugging).
-
--o      Outputs the ior file to the file
-
-Using -d turns on debugging messages.  It is additive, i.e., the more
--d options provided, the more debugging you can get.  At the moment,
-only 2 levels of debugging are implemented, and more than 2 -d options
-are ignored.
-
-
-client:
--------
-
-% client [-d] [-s] [-x] <-f ior_file> <-k ior>  -n <iterations> 
-
-Options:
--------
-	d	Debug flag
-	s	Don't Use the Naming Service
-	x 	Tells the server to shutdown.
-	f	Reads the ior from the file
-	k	Reads the ior from commandline
-	
-	There are 3 ways of giving the IOR to the client:
-
-	1. From a file using the -f option. (This file can be produced using 
-		the -o option of the server.)
-	
-	2. Directly on the commandline using the -k option.
-	
-	3. Get it from the Naming Service (which is the default client
-       	   behavior).  
-
-NestedUpCalls_Test:
-------------------
-
-        This is a simple test program which tests the server and
-client using the default options of the server and client. To test
-using this just run
-
-        % NestedUpCalls_Test       
diff --git a/TAO/tests/NestedUpcall/Reactor/Reactor.idl b/TAO/tests/NestedUpcall/Reactor/Reactor.idl
deleted file mode 100644
index ae70a317d8b..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/Reactor.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpcall
-//
-// = FILENAME
-//    Reactor.idl
-//
-// = DESCRIPTION
-//    A simple test of nested upcalls using a structure we likely all
-//    know and love.
-//
-//    Existence of this interface should not be taken as testimony that
-//    such a structure would work in ACE!  There is no such thing as an
-//    IDL interface to the Reactor (yet)!
-//
-// = AUTHORS
-//    Chris Cleeland
-//
-// ============================================================================
-
-interface Reactor;
-
-interface EventHandler 
-{
-  Long peer ();
-  // Returns an integer corresponding to the event handler's file
-  // descriptor.
-
-  UShort decrement (in Reactor r, in UShort num);
-  // Decrements <num> by invoking the <decrement> operation on <r>
-  // and returning that value, finally stopping when it gets to zero.
-};
-
-interface Reactor 
-{
-  Long register_handler (in EventHandler eh);
-  // Turns around and queries <eh> for the peer.
-
-  oneway void set_value ();
-  // do-nothing oneway to check for proper operation.
-
-  UShort decrement (in EventHandler eh, in UShort num);
-  // Decrements <num> by invoking the <decrement> operation on <eh>
-  // and returning that value, finally stopping when it gets to zero.
-
-  void stop ();
-  // Stops the reactor.
-};
-
diff --git a/TAO/tests/NestedUpcall/Reactor/client.cpp b/TAO/tests/NestedUpcall/Reactor/client.cpp
deleted file mode 100644
index 6535474e02b..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/client.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-// $Id$
-
-#include "ace/Profile_Timer.h"
-#include "ace/Env_Value_T.h"
-#include "ace/Read_Buffer.h"
-#include "client.h"
-#include "eh_i.h"
-#include "orbsvcs/CosNamingC.h"
-
-ACE_RCSID(Reactor, client, "$Id$")
-
-#define quote(x) #x
-
-// Constructor.
-NestedUpCalls_Client::NestedUpCalls_Client (void)
-  : nested_up_calls_reactor_key_ (0),
-    shutdown_ (0),
-    call_count_ (0),
-    nested_up_calls_reactor_ior_file_ (0),
-    f_handle_ (ACE_INVALID_HANDLE),
-    use_naming_service_ (1)
-{
-}
-
-// Simple function that returns the substraction of 117 from the
-// parameter.
-
-int
-NestedUpCalls_Client::func (u_int i)
-{
-  return i - 117;
-}
-
-// Reads the NestedUpCalls reactor ior from a file
-
-int
-NestedUpCalls_Client::read_ior (char *filename)
-{
-  // Open the file for reading.
-  this->f_handle_ = ACE_OS::open (filename,0);
-
-  if (this->f_handle_ == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for writing: %p\n",
-                       filename),
-                      -1);
-  ACE_Read_Buffer ior_buffer (this->f_handle_);
-  this->nested_up_calls_reactor_key_ = ior_buffer.read ();
-
-  if (this->nested_up_calls_reactor_key_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to allocate memory to read ior: %p\n"),
-                      -1);
-   return 0;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-NestedUpCalls_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:k:xs");
-  int c;
-  int result;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-          case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg);
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
-                             get_opts.optarg),
-                            -1);
-            break;
-      case 'k': // read the nestedupcalls IOR from the command-line.
-        this->nested_up_calls_reactor_key_ =
-          ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'x':
-        this->shutdown_ = 1;
-        break;
-      case 's': // Don't use the TAO Naming Service.
-        this->use_naming_service_ = 0;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-f nested_up_calls_reactor-obj-ref-key-file]"
-                           " [-k nestedupcalls-obj-ref-key]"
-                           " [-x]"
-                           " [-s]"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Execute client example code.
-int
-NestedUpCalls_Client::run (void)
-{
-
-  TAO_TRY
-    {
-      // Create an EventHandler servant to hand to the other side...
-      auto_ptr<EventHandler_i> eh_impl (new EventHandler_i);
-      EventHandler_var eh = eh_impl->_this (TAO_TRY_ENV);
-
-      // Now, we can invoke an operation on the remote side.
-      CORBA::Long r = this->reactor_->register_handler (eh.in (), TAO_TRY_ENV);
-
-      // We ought to have a result!
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s: received %d as return from register_handler ()\n",
-                  argv_[0], r));
-
-      this->reactor_->set_value (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->reactor_->decrement (eh.in (), 5, TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->reactor_->stop (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (this->shutdown_)
-          {
-                  dexc (this->env_, "server, please ACE_OS::exit");
-      }
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("Nestedupcalls::run ()");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
-
-NestedUpCalls_Client::~NestedUpCalls_Client (void)
-{
-  // Free resources
-  // Close the ior files
-  if (this->nested_up_calls_reactor_ior_file_)
-    ACE_OS::fclose (this->nested_up_calls_reactor_ior_file_);
-  if (this->f_handle_ != ACE_INVALID_HANDLE)
-    ACE_OS::close (this->f_handle_);
-
-  if (this->nested_up_calls_reactor_key_ != 0)
-    ACE_OS::free (this->nested_up_calls_reactor_key_);
-}
-
-int
-NestedUpCalls_Client::init_naming_service (void)
-{
-  TAO_TRY
-    {
-      CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService");
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to resolve the Name Service.\n"),
-                          -1);
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      CosNaming::Name nested_up_calls_reactor_name (2);
-      nested_up_calls_reactor_name.length (2);
-      nested_up_calls_reactor_name[0].id = CORBA::string_dup ("NestedUpCalls");
-      nested_up_calls_reactor_name[1].id = CORBA::string_dup ("nested_up_calls_reactor");
-      CORBA::Object_var reactor_obj =
-        naming_context->resolve (nested_up_calls_reactor_name,TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      this->reactor_ =
-        Reactor::_narrow (reactor_obj.in (),TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (CORBA::is_nil (this->reactor_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve nested up calls reactor in Naming service <%s>\n"),
-                          -1);
-   }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("NestedUpCalls::init_naming_service");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-int
-NestedUpCalls_Client::init (int argc, char **argv)
-{
-  int naming_result;
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  TAO_TRY
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-      if (this->use_naming_service_)
-        {
-          naming_result = this->init_naming_service ();
-          if (naming_result < 0)
-            return naming_result;
-        }
-      else
-        {
-          if (this->nested_up_calls_reactor_key_ == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%s: no nested up calls reactor key specified\n",
-                               this->argv_[0]),
-                              -1);
-
-
-          CORBA::Object_var reactor_object =
-            this->orb_->string_to_object (this->nested_up_calls_reactor_key_,
-                                          TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          this->reactor_ =
-                Reactor::_narrow (reactor_object.in(), TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          if (CORBA::is_nil (this->reactor_.in ()))
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "invalid reactor key <%s>\n",
-                               this->nested_up_calls_reactor_key_),
-                              -1);
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "Reactor received OK\n"));
-  }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("NestedUpCalls::init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-// This function runs the test.
-int
-main (int argc, char **argv)
-{
-  NestedUpCalls_Client nestedupcalls_client;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls: client \n\n"));
-
-  if (nestedupcalls_client.init (argc, argv) == -1)
-    return 1;
-  else
-    return nestedupcalls_client.run ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class auto_ptr<EventHandler_i>;
-template class ACE_Auto_Basic_Ptr<EventHandler_i>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<EventHandler_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<EventHandler_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/NestedUpcall/Reactor/client.dsp b/TAO/tests/NestedUpcall/Reactor/client.dsp
deleted file mode 100644
index 826a005a597..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/client.dsp
+++ /dev/null
@@ -1,219 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NU Reactor Client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=NU Reactor 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 "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 "client.mak" CFG="NU Reactor Client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NU Reactor Client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "NU Reactor 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)" == "NU Reactor 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ELSEIF  "$(CFG)" == "NU Reactor 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NU Reactor Client - Win32 Release"
-# Name "NU Reactor Client - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ".cpp"
-# Begin Source File
-
-SOURCE=.\client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\eh_i.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorS.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ".h"
-# Begin Source File
-
-SOURCE=.\client.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\eh_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorS_T.h
-# End Source File
-# End Group
-# Begin Group "IDL Files"
-
-# PROP Default_Filter ".idl"
-# Begin Source File
-
-SOURCE=.\Reactor.idl
-
-!IF  "$(CFG)" == "NU Reactor Client - Win32 Release"
-
-USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL compiler
-InputPath=.\Reactor.idl
-InputName=Reactor
-
-BuildCmds= \
-	tao_idl $(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)" == "NU Reactor Client - Win32 Debug"
-
-USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL Compiler
-InputPath=.\Reactor.idl
-InputName=Reactor
-
-BuildCmds= \
-	tao_idl $(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/NestedUpcall/Reactor/client.h b/TAO/tests/NestedUpcall/Reactor/client.h
deleted file mode 100644
index 706a4d9105a..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/client.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls
-//
-// = FILENAME
-//    client.h
-//
-// = DESCRIPTION
-//
-//
-// = AUTHORS
-//    Aniruddha Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "reactor_i.h"
-#include "ace/Auto_Ptr.h"
-
-class NestedUpCalls_Client
-{
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the NestedUpCalls client
-  //    example.  Provides a better understanding of the logic in an
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    NestedUpCalls CORBA server.  All the complexity for initializing the
-  //    server is hidden in the class.  Just the run() interface is needed.
-public:
-  // = Constructor and destructor.
-  NestedUpCalls_Client (void);
-  ~NestedUpCalls_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int init_naming_service (void);
-  // Function to initialize the naming service.
-
-  int func (u_int i);
-  // Simple function that returns the substraction of 117 from the
-  // parameter.
-
-  int read_ior (char *filename);
-  // Function to read the NestedUpCalls reactor ior from a file.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *nested_up_calls_reactor_key_;
-  // Key of reactor obj ref.
-
-  int shutdown_;
-  // Flag to tell server to shutdown.
-
-  Reactor_var reactor_;
-  // reactor pointer for NestedUpCalls.
-
-  CORBA::Environment env_;
-  // Environment variable.
-
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
-  u_int call_count_;
-  // # of calls made to functions.
-
-  FILE *nested_up_calls_reactor_ior_file_;
-  // File from which to obtain the IOR.
-
-  ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
-
-  int use_naming_service_;
-  // Flag to tell client not to use Namingservice to find the NestedUpCalls
-  // reactor.
-};
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp b/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
deleted file mode 100644
index 9418e1477f8..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "eh_i.h"
-
-ACE_RCSID(Reactor, eh_i, "$Id$")
-
-// CTOR
-EventHandler_i::EventHandler_i (void)
-{
-}
-
-// DTOR
-EventHandler_i::~EventHandler_i (void)
-{
-}
-
-// Return a long
-CORBA::Long
-EventHandler_i::peer (CORBA::Environment &env)
-{
-  // Doesn't matter what value we return!
-  CORBA::Long val = 6;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "EventHandler_i::peer() returning %d\n",
-              val));
-
-  return val;
-}
-
-CORBA::UShort
-EventHandler_i::decrement (Reactor_ptr eh,
-                      CORBA::UShort num,
-                      CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) EventHandler::decrement (%d)%$", num));
-
-  CORBA::UShort ret;
-  if (--num <= 0)
-    ret = 0;
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) EventHandler::decrement() invoking Reactor::decrement(%d)%$", num));
-      ret = eh->decrement (_this (env), num, env);
-    }
-  ACE_DEBUG ((LM_DEBUG, "%}(%P|%t) EventHandler::decrement() returning %d%$", ret));
-  return ret;
-}
diff --git a/TAO/tests/NestedUpcall/Reactor/eh_i.h b/TAO/tests/NestedUpcall/Reactor/eh_i.h
deleted file mode 100644
index c8443da0bcb..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/eh_i.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-#if !defined (EVENTHANDLER_I_H)
-#  define EVENTHANDLER_I_H
-
-#include "ReactorS.h"
-
-class EventHandler_i : public POA_EventHandler
-{
-  // = TITLE
-  //     Servant implementation for the <EventHandler> IDL interface.
-public:
-  EventHandler_i (void);
-  // Constructor.
-
-  virtual ~EventHandler_i (void);
-  // Destructor.
-
-  virtual CORBA::Long peer (CORBA::Environment &env);
-  // Return some value...doesn't matter what.
-
-  virtual CORBA::UShort decrement (Reactor_ptr eh,
-                                   CORBA::UShort num,
-                                   CORBA::Environment &env);
-  // deccrement <num> by calling decrement thru <eh> until zero is
-  // reached, then return.
-};
-
-#endif /* EVENTHANDLER_I_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp b/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
deleted file mode 100644
index a761bebf51c..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "reactor_i.h"
-
-ACE_RCSID(Reactor, reactor_i, "$Id$")
-
-// CTOR
-Reactor_i::Reactor_i (void)
-{
-}
-
-// DTOR
-Reactor_i::~Reactor_i (void)
-{
-}
-
-// register...with nothing
-CORBA::Long
-Reactor_i::register_handler (EventHandler_ptr eh,
-                             CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) BEGIN Reactor_i::register_handler ()\n"));
-
-  CORBA::Long r = 0;
-
-  TAO_TRY
-    {
-      r = eh->peer (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("getting peer");
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) got this value from peer: %d\n",
-              r));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) END Reactor_i::register_handler ()\n"));
-  return 0;
-}
-
-void
-Reactor_i::set_value (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) doing Reactor_i::set_value()\n"));
-}
-
-CORBA::UShort
-Reactor_i::decrement (EventHandler_ptr eh,
-                      CORBA::UShort num,
-                      CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "%{%I(%P|%t) Reactor::decrement (%d)%$", num));
-
-  CORBA::UShort ret;
-  if (--num <= 0)
-    ret = 0;
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reactor::decrement() invoking EventHandler::decrement(%d)%$", num));
-      Reactor_var me = _this (env);
-      ret = eh->decrement (me.in (), num, env);
-    }
-  ACE_DEBUG ((LM_DEBUG, "%}(%P|%t) Reactor::decrement() returning %d\n", ret));
-  return ret;
-}
-
-void
-Reactor_i::stop (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) stopping.\n"));
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-}
diff --git a/TAO/tests/NestedUpcall/Reactor/reactor_i.h b/TAO/tests/NestedUpcall/Reactor/reactor_i.h
deleted file mode 100644
index 3d4ede734c9..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/reactor_i.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-#if !defined (REACTOR_I_H)
-#  define REACTOR_I_H
-
-#include "ReactorS.h"
-
-class Reactor_i : public POA_Reactor
-{
-  // = TITLE
-  //     Implement the <Reactor> IDL interface.
-public:
-  Reactor_i (void);
-  // Constructor.
-
-  virtual ~Reactor_i (void);
-  // Destructor.
-
-  virtual CORBA::Long register_handler(EventHandler_ptr eh,
-                                       CORBA::Environment &env);
-  // Register (with nothing...it's an example!)
-
-  virtual void set_value (CORBA::Environment &env);
-
-  virtual CORBA::UShort decrement (EventHandler_ptr eh,
-                                   CORBA::UShort num,
-                                   CORBA::Environment &env);
-  // deccrement <num> by calling decrement thru <eh> until zero is
-  // reached, then return.
-
-  virtual void stop (CORBA::Environment &env);
-  // Stops the reactor.
-};
-
-#endif /* REACTOR_I_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/run_test.pl b/TAO/tests/NestedUpcall/Reactor/run_test.pl
deleted file mode 100755
index ae24eb7881a..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/run_test.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# $Id$
-#
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-unshift @INC, '../../../../bin';
-require Process;
-require Uniqueid;
-
-$iorfile = "theior";
-$sleeptime = 10;
-
-$SV = Process::Create ("server".$Process::EXE_EXT, 
-		       " -ORBobjrefstyle url");
-
-sleep ($sleeptime);
-
-$status  = system ("client".$Process::EXE_EXT.
-		   " -x ");
-
-$SV->Wait ();
-
-# @@ Capture any errors from the server too.
-exit $status;
diff --git a/TAO/tests/NestedUpcall/Reactor/server.cpp b/TAO/tests/NestedUpcall/Reactor/server.cpp
deleted file mode 100644
index 4b7d4e9a761..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/server.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// $Id$
-
-#include "server.h"
-
-ACE_RCSID(Reactor, server, "$Id$")
-
-NestedUpCalls_Server::NestedUpCalls_Server (void)
-  : use_naming_service_ (1),
-    ior_output_file_ (0)
-{
-}
-
-int
-NestedUpCalls_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:o:s");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-          case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_output_file_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case 's': // Don't use the TAO Naming Service.
-        this->use_naming_service_=0;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-o] <ior_output_file>"
-                           " [-s]"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-NestedUpCalls_Server::init (int argc,
-                    char** argv,
-                    CORBA::Environment& env)
-{
-  // Call the init of TAO_ORB_Manager to create a child POA
-  // under the root POA.
-  this->orb_manager_.init_child_poa (argc,
-                                     argv,
-                                     "child_poa",
-                                     env);
-
-  TAO_CHECK_ENV_RETURN (env,-1);
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-  // ~~ check for the return value here
-
-  CORBA::String_var str  =
-    this->orb_manager_.activate_under_child_poa ("reactor",
-                                                 &this->reactor_impl_,
-                                                 env);
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              str.in ()));
-
-  if (this->ior_output_file_)
-    {
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       str.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
-
-  if (this->use_naming_service_)
-    return this->init_naming_service (env);
-
-  return 0;
-}
-
-// Initialisation of Naming Service and register IDL_Cubit Context and
-// cubit_factory object.
-
-int
-NestedUpCalls_Server::init_naming_service (CORBA::Environment& env)
-{
-  int result;
-  CORBA::ORB_var orb;
-  PortableServer::POA_var child_poa;
-
-  orb = this->orb_manager_.orb ();
-  child_poa = this->orb_manager_.child_poa ();
-
-  result = this->my_name_server_.init (orb.in (),
-                                       child_poa.in ());
-  if (result < 0)
-    return result;
-  reactor_ = this->reactor_impl_._this (env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-
-  //Register the nested_up_calls_reactor name with the NestedUpCalls Naming
-  //Context...
-  CosNaming::Name nested_up_calls_context_name (1);
-  nested_up_calls_context_name.length (1);
-  nested_up_calls_context_name[0].id = CORBA::string_dup ("NestedUpCalls");
-  this->naming_context_ =
-    this->my_name_server_->bind_new_context (nested_up_calls_context_name,
-                                             env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-
-  CosNaming::Name reactor_name (1);
-  reactor_name.length (1);
-  reactor_name[0].id = CORBA::string_dup ("nested_up_calls_reactor");
-  this->naming_context_->bind (reactor_name,
-                                                           reactor_.in (),
-                                           env);
-  TAO_CHECK_ENV_RETURN (env,-1);
-  return 0;
-}
-
-int
-NestedUpCalls_Server::run (CORBA::Environment& env)
-{
-  if (this->orb_manager_.run (env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "NestedUpCalls_Server::run"),
-                      -1);
-  return 0;
-}
-
-NestedUpCalls_Server::~NestedUpCalls_Server (void)
-{
-}
-
-int
-main (int argc, char *argv[])
-{
-  NestedUpCalls_Server nested_up_calls_server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls:SERVER \n \n"));
-  TAO_TRY
-    {
-      if (nested_up_calls_server.init (argc,argv,TAO_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          nested_up_calls_server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/Reactor/server.dsp b/TAO/tests/NestedUpcall/Reactor/server.dsp
deleted file mode 100644
index 7dcf1b8d61b..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/server.dsp
+++ /dev/null
@@ -1,219 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NU Reactor Server" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=NU Reactor 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 "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 "server.mak" CFG="NU Reactor Server - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NU Reactor Server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "NU Reactor 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)" == "NU Reactor 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ELSEIF  "$(CFG)" == "NU Reactor Server - 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NU Reactor Server - Win32 Release"
-# Name "NU Reactor Server - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ".cpp"
-# Begin Source File
-
-SOURCE=.\reactor_i.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ".h"
-# Begin Source File
-
-SOURCE=.\reactor_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorS.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ReactorS_T.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.h
-# End Source File
-# End Group
-# Begin Group "IDL Files"
-
-# PROP Default_Filter ".idl"
-# Begin Source File
-
-SOURCE=.\Reactor.idl
-
-!IF  "$(CFG)" == "NU Reactor Server - Win32 Release"
-
-USERDEP__REACT="..\..\..\..\bin\Release\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL compiler
-InputPath=.\Reactor.idl
-InputName=Reactor
-
-BuildCmds= \
-	tao_idl $(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)" == "NU Reactor Server - Win32 Debug"
-
-USERDEP__REACT="..\..\..\..\bin\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL Compiler
-InputPath=.\Reactor.idl
-InputName=Reactor
-
-BuildCmds= \
-	tao_idl $(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/NestedUpcall/Reactor/server.h b/TAO/tests/NestedUpcall/Reactor/server.h
deleted file mode 100644
index cb02f84b701..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/server.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls
-//
-// = FILENAME
-//    server.h
-//
-// = DESCRIPTION
-//      This class implements a simple NestedUpCalls CORBA server for the NestedUpCalls
-//      example using skeletons generated by the TAO ORB compiler.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (_NUC_SERVER_H)
-#define _NUC_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/TAO.h"
-#include "orbsvcs/CosNamingC.h"
-#include "reactor_i.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-class NestedUpCalls_Server
-{
-  // = TITLE
-  //   Defines a NestedUpCalls Server class that implements the functionality
-  //   of a server process as an object.
-  //
-  // = DESCRIPTION
-  //   The interface is quite simple. A server program has to call
-  //   init to initialize the NestedUpCalls_Server's state and then call run
-  //   to run the orb.
-public:
-
-  NestedUpCalls_Server (void);
-  // Default constructor
-
-  ~NestedUpCalls_Server (void);
-  // Destructor
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
-  // Initialize the NestedUpCalls_Server state - parsing arguments and ...
-
-  int run (CORBA::Environment& env);
-  // Run the orb
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  int init_naming_service (CORBA::Environment &env);
-  // Initialises the name server and registers NestedUpCalls reactor with the
-  // name server.
-
-  int use_naming_service_;
-  //Flag to tell server not to use the TAO Naming Service to register
-  //the NestedUpCalls reactor.
-
-  FILE* ior_output_file_;
-  // File to output the NestedUpCalls reactor IOR.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager
-
-  TAO_Naming_Server my_name_server_;
-  // An instance of the name server used for registering the reactor
-  // objects.
-
-  Reactor_i reactor_impl_;
-  // Implementation object of the NestedUpCalls reactor.
-
-  Reactor_var reactor_;
-  // Reactor_var to register with NamingService.
-
-  CosNaming::NamingContext_var NestedUpCalls_context_;
-  // Naming context for the NestedUpCalls_reactor.
-
-  CosNaming::NamingContext_var naming_context_;
-  // Naming context for the Naming Service.
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-};
-
-#endif /* _NUC_SERVER_H */
diff --git a/TAO/tests/NestedUpcall/Reactor/svc.conf b/TAO/tests/NestedUpcall/Reactor/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/NestedUpcall/Reactor/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
deleted file mode 100644
index 50da37278aa..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_A_i.cpp
-//
-// = DESCRIPTION
-//    This class implements the Object A  of the 
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "Initiator_i.h"
-
-ACE_RCSID(Triangle_Test, Initiator_i, "$Id$")
-
-// CTOR
-Initiator_i::Initiator_i (Object_A_ptr object_A_ptr,
-                                Object_B_ptr object_B_ptr)
-: object_A_var_ (Object_A::_duplicate (object_A_ptr)),
-  object_B_var_ (Object_B::_duplicate (object_B_ptr))
-{
-}
-
-// DTOR
-Initiator_i::~Initiator_i (void)
-{
-}
-
-
-
-void
-Initiator_i::foo_object_B (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n"));
-
-  TAO_TRY
-    {
-      this->object_B_var_->foo (this->object_A_var_.in (), 
-                                TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n"));
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("calling the server_");
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) END Initiator_i::foo_object_B ()\n"));
-}
-
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
deleted file mode 100644
index d96de135ef8..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Initiator_i.h
-//
-// = DESCRIPTION
-//    This class implements the Initiator of the 
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (INITIATOR_IMPL_H)
-#  define INITIATOR_IMPL_H
-
-#include "Triangle_TestS.h"
-
-class Initiator_i : public POA_Initiator
-{
-  // = TITLE
-  //     Implement the <Initiator> IDL interface.
-public:
-  Initiator_i (Object_A_ptr object_A_ptr, 
-                  Object_B_ptr object_B_ptr);
-  // Constructor.
-
-  virtual ~Initiator_i (void);
-  // Destructor.
-
-  virtual void foo_object_B (CORBA::Environment &env);
-
-private:
-  Object_A_var object_A_var_;
-  // reference to object A
-
-  Object_B_var object_B_var_;
-  // reference to object B
-};
-
-#endif /* INITIATOR_IMPL_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
deleted file mode 100644
index 4b4cddbc618..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lorbsvcs -lTAO
-
-IDL_SRC = Triangle_TestC.cpp Triangle_TestS.cpp
-PROG_SRCS = $(IDL_SRC) server_A.cpp server_B.cpp \
-	Object_A_i.cpp Object_B_i.cpp Initiator_i.cpp \
-	initiator.cpp 
-
-LSRC = $(PROG_SRCS)
-
-NESTEDUPCALLS_SVR_A_OBJS = Triangle_TestS.o Triangle_TestC.o server_A.o \
-	Object_A_i.o
-
-NESTEDUPCALLS_SVR_B_OBJS = Triangle_TestS.o Triangle_TestC.o server_B.o \
-        Object_B_i.o 
-
-NESTEDUPCALLS_INITIATOR_OBJS = Triangle_TestS.o Triangle_TestC.o initiator.o \
-	Initiator_i.o
-
-
-BIN = server_A server_B initiator
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	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
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao 
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs 
-
-.PRECIOUS: Trangle_TestC.h Triangle_TestC.i Triangle_TestC.cpp
-.PRECIOUS: Triangle_TestS.h Triangle_TestS.i Triangle_TestS.cpp
-
-server_A: $(addprefix $(VDIR),$(NESTEDUPCALLS_SVR_A_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-server_B: $(addprefix $(VDIR),$(NESTEDUPCALLS_SVR_B_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-initiator: $(addprefix $(VDIR),$(NESTEDUPCALLS_INITIATOR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf Triangle_TestS.* Triangle_TestC.* Triangle_TestS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
deleted file mode 100644
index 30a0190a43c..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_A_i.cpp
-//
-// = DESCRIPTION
-//    This class implements the Object A  of the
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "Object_A_i.h"
-
-ACE_RCSID(Triangle_Test, Object_A_i, "$Id$")
-
-// CTOR
-Object_A_i::Object_A_i (void)
-: finish_two_way_call_ (0)
-{
-}
-
-// DTOR
-Object_A_i::~Object_A_i (void)
-{
-}
-
-
-
-void
-Object_A_i::foo (Initiator_ptr initiator_ptr,
-                    CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) BEGIN Object_A_i::foo ()\n"));
-
-  TAO_TRY
-    {
-      initiator_ptr->foo_object_B (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      while (!this->finish_two_way_call_)
-        TAO_ORB_Core_instance ()->reactor ()->handle_events ();
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("calling the initiator");
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) END Object_A_i::foo ()\n"));
-}
-
-void
-Object_A_i::finish (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) BEGIN Object_A_i::finish ()\n"));
-
-  this->finish_two_way_call_ = 1;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) END Object_A_i::finish ()\n"));
-
-}
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
deleted file mode 100644
index a1da7af1796..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_A_i.h
-//
-// = DESCRIPTION
-//    This class implements the Object A of the 
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (OBJECT_B_IMPL_H)
-#  define OBJECT_B_IMPL_H
-
-#include "Triangle_TestS.h"
-
-class Object_A_i : public POA_Object_A
-{
-  // = TITLE
-  //     Implement the <Object_A> IDL interface.
-public:
-  Object_A_i (void);
-  // Constructor.
-
-  virtual ~Object_A_i (void);
-  // Destructor.
-
-  virtual void foo (Initiator_ptr initiator_ptr,
-                    CORBA::Environment &env);
-
-  virtual void finish (CORBA::Environment &env);
-
-  unsigned long finish_two_way_call_;
-};
-
-#endif /* OBJECT_B_IMPL_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
deleted file mode 100644
index bd83f80c205..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_B_i.cpp
-//
-// = DESCRIPTION
-//    This class implements the Object B  of the 
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "Object_B_i.h"
-
-ACE_RCSID(Triangle_Test, Object_B_i, "$Id$")
-
-// CTOR
-Object_B_i::Object_B_i (void)
-{
-}
-
-// DTOR
-Object_B_i::~Object_B_i (void)
-{
-}
-
-
-
-void
-Object_B_i::foo (Object_A_ptr object_A_ptr,
-                    CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) BEGIN Object_B_i::foo ()\n"));
-
-  TAO_TRY
-    {
-      
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n"));
-
-      object_A_ptr->finish (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      // Start to wait on this variable, it is set to true
-      // by the method finish ()
-      long int usecs = 500000;
-      ACE_Time_Value pause(0, usecs);
-
-      ACE_OS::sleep(pause);
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("calling the initiator");
-    }
-  TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) END Object_B_i::foo ()\n"));
-}
-
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
deleted file mode 100644
index 0757357d510..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    Object_B_i.h
-//
-// = DESCRIPTION
-//    This class implements the Object B of the 
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (OBJECT_B_IMPL_H)
-#  define OBJECT_B_IMPL_H
-
-#include "Triangle_TestS.h"
-
-class Object_B_i : public POA_Object_B
-{
-  // = TITLE
-  //     Implement the <Object_B> IDL interface.
-public:
-  Object_B_i (void);
-  // Constructor.
-
-  virtual ~Object_B_i (void);
-  // Destructor.
-
-  virtual void foo(Object_A_ptr object_A_ptr,
-                   CORBA::Environment &env);
-};
-
-#endif /* OBJECT_B_IMPL_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/README b/TAO/tests/NestedUpcall/Triangle_Test/README
deleted file mode 100644
index 70e8d57e5fe..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/README
+++ /dev/null
@@ -1,31 +0,0 @@
-$Id$
-Documentation about the Triangle test
-
-Purpose:
-
-Is to show how nested upcalls are handled.
-
-Three objects exist: 
-Object A, Object B and the Initiator
-
-The initiator calls a two-way call foo on object A,
-object A calls foo_object_B, a one-way call, on the initiator,
-this causes initiator to call foo on object B,
-this causes object B to (oneway) call finish on object A,
-this causes object A to return from its first two-way call 
-(before object B returns from its two-way call),
-after a second or so object B returns from its two-way call.
-
-The printed order should show, that the replies are 
-handled in the stack order, but not in the actual 
-arriving order.
-
-To start:
-
-%server_A -o server1 -ORBport 10045
-%
-%server_B -o server2 -ORBport 10046
-%
-%initiator -f server1 -g server2 -ORBport 10047
-
- 
-\ No newline at end of file
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.dsw b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.dsw
deleted file mode 100644
index 9adf76b9310..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.dsw
+++ /dev/null
@@ -1,53 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "initiator"=.\initiator.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "server_A"=.\server_A.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "server_B"=.\server_B.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl
deleted file mode 100644
index cb9ee8d1728..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpcall/Triangle_Test
-//
-// = FILENAME
-//    Triangle_Test.idl
-//
-// = DESCRIPTION
-//    An example of how nested upcalls work/fail?
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-
-interface Initiator {
-
-  oneway void foo_object_B ();
-
-};
-
-interface Object_A {
-
-  void foo (in Initiator initiator);
-  
-  oneway void finish ();
-
-};
-
-interface Object_B {
-
-  void foo (in Object_A object_A);
-
-};
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
deleted file mode 100644
index 9c377cab3d2..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    initiator.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple server for the 
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "ace/Read_Buffer.h"
-#include "initiator.h"
-
-ACE_RCSID(Triangle_Test, initiator, "$Id$")
-
-Initiator_Server::Initiator_Server (void)
-  : object_A_key_ (0),
-    object_B_key_ (0),
-    object_A_var_ (0),
-    object_B_var_ (0),
-    initiator_i_ptr_ (0)
-{
-}
-
-// Reads the Object A/B IOR from a file
-// A_B == 0, means read Object A's IOR
-// A_B == 1, means read Object B's IOR
-
-int
-Initiator_Server::read_ior (char *filename, unsigned int A_B)
-{
-  // Open the file for reading.
-  ACE_HANDLE f_handle = ACE_OS::open (filename,0);
-
-  if (f_handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for reading: %p\n",
-                       filename),
-                      -1);
-  ACE_Read_Buffer ior_buffer (f_handle);
-
-  if (A_B == 0)
-  {
-    this->object_A_key_ = ior_buffer.read ();
-    if (this->object_A_key_ == 0)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unable to allocate memory to read ior: %p\n"),
-                        -1);
-  }
-  else
-  {
-    this->object_B_key_ = ior_buffer.read ();
-    if (this->object_B_key_ == 0)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Unable to allocate memory to read ior: %p\n"),
-                        -1);
-  }
-
-  ACE_OS::close (f_handle);
-  return 0;
-}
-
-
-int
-Initiator_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "df:g:");
-  int c, result;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg,0); 
-        // read IOR for Object A
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
-                             get_opts.optarg),
-                            -1);
-            break;
-      case 'g': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg,1); 
-        // read IOR for Object A
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
-                             get_opts.optarg),
-                            -1);
-            break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-f] <object_A_ior_file>"
-                           " [-g] <object_B_ior_file>"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-Initiator_Server::init (int argc,
-                       char** argv,
-                       CORBA::Environment& env)
-{
-  // Call the init of TAO_ORB_Manager to create a child POA
-  // under the root POA.
-  this->orb_manager_.init_child_poa (argc,
-                                     argv,
-                                     "child_poa",
-                                     env);
-
-  TAO_CHECK_ENV_RETURN (env,-1);
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-  // ~~ check for the return value here
-
-  if (this->object_A_key_ == 0 || this->object_B_key_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                      "%s: The two objects A and B are missing\n",
-                      this->argv_[0]),
-                      -1);
-
-
-  TAO_TRY
-  {
-    // Get Object A
-
-    CORBA::Object_var object_A_obj_var =
-      this->orb_manager_.orb()->string_to_object (this->object_A_key_,
-                                  TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    this->object_A_var_ =
-      Object_A::_narrow (object_A_obj_var.in(), TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    if (CORBA::is_nil (this->object_A_var_.in ()))
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "invalid object A key <%s>\n",
-                         object_A_key_),
-                         -1);
-
-    ACE_DEBUG ((LM_DEBUG, 
-                "Object A IOR: %s\n", 
-                this->object_A_key_));
-    ACE_DEBUG ((LM_DEBUG, "Object A received OK\n"));
-
-
-    // Get Object B
-
-    CORBA::Object_var object_B_obj_var =
-      this->orb_manager_.orb()->string_to_object (this->object_B_key_,
-                                    TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    this->object_B_var_ =
-      Object_B::_narrow (object_B_obj_var.in(), TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-
-    if (CORBA::is_nil (this->object_B_var_.in ()))
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "invalid object b key <%s>\n",
-                         object_B_key_),
-                         -1);
-
-    ACE_DEBUG ((LM_DEBUG, 
-                "Object A IOR: %s\n", 
-                this->object_A_key_));
-    ACE_DEBUG ((LM_DEBUG, "Object B received OK\n"));
-
-  }
-  TAO_CATCH (CORBA::SystemException, sysex)
-  {
-    ACE_UNUSED_ARG (sysex);
-    TAO_TRY_ENV.print_exception ("System Exception");
-    return -1;
-  }
-  TAO_CATCH (CORBA::UserException, userex)
-  {
-    ACE_UNUSED_ARG (userex);
-    TAO_TRY_ENV.print_exception ("User Exception");
-    return -1;
-  }
-  TAO_ENDTRY;
-
-
-  ACE_NEW_RETURN (this->initiator_i_ptr_, 
-                  Initiator_i(this->object_A_var_.in(),
-                                 this->object_B_var_.in()),
-                  -1);
-
-  CORBA::String_var str  =
-    this->orb_manager_.activate_under_child_poa ("initiator",
-                                                 this->initiator_i_ptr_,
-                                                 env);
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              str.in ()));
-
-
-  return 0;
-}
-
-
-int
-Initiator_Server::run (CORBA::Environment& env)
-{
-  TAO_TRY
-  {
-    ACE_DEBUG ((LM_DEBUG,
-              "Initiator_Server::run: Trying to invoke foo on Object A\n"));
-
-    this->object_A_var_->foo (this->initiator_i_ptr_->_this(TAO_TRY_ENV), 
-                              TAO_TRY_ENV);
-    TAO_CHECK_ENV;
-    ACE_DEBUG ((LM_DEBUG,
-              "Initiator_Server::run: Returned from invoke foo on Object A\n"));
-  }
-  TAO_CATCH (CORBA::SystemException, sysex)
-  {
-    ACE_UNUSED_ARG (sysex);
-    TAO_TRY_ENV.print_exception ("System Exception");
-    return -1;
-  }
-  TAO_CATCH (CORBA::UserException, userex)
-  {
-    ACE_UNUSED_ARG (userex);
-    TAO_TRY_ENV.print_exception ("User Exception");
-    return -1;
-  }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-Initiator_Server::~Initiator_Server (void)
-{
-  if (this->object_A_key_ != 0)
-    ACE_OS::free (this->object_A_key_);
-  if (this->object_B_key_ != 0)
-    ACE_OS::free (this->object_B_key_);
-  if (this->initiator_i_ptr_ != 0)
-    delete initiator_i_ptr_;
-}
-
-int
-main (int argc, char *argv[])
-{
-  Initiator_Server initiator_Server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n"));
-  TAO_TRY
-    {
-      if (initiator_Server.init (argc,argv,TAO_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          initiator_Server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp
deleted file mode 100644
index 4114915c5b2..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.dsp
+++ /dev/null
@@ -1,215 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NU Triangle Initiator" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=NU Triangle Initiator - 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 "initiator.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 "initiator.mak" CFG="NU Triangle Initiator - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NU Triangle Initiator - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Initiator - 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)" == "NU Triangle Initiator - 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ELSEIF  "$(CFG)" == "NU Triangle Initiator - 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NU Triangle Initiator - Win32 Release"
-# Name "NU Triangle Initiator - Win32 Debug"
-# Begin Group "source files"
-
-# PROP Default_Filter "*.cpp"
-# Begin Source File
-
-SOURCE=.\initiator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Initiator_i.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestS.cpp
-# End Source File
-# End Group
-# Begin Group "header files"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\initiator.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Initiator_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestS.h
-# End Source File
-# End Group
-# Begin Group "IDL files"
-
-# PROP Default_Filter "*.idl"
-# Begin Source File
-
-SOURCE=.\Triangle_Test.idl
-
-!IF  "$(CFG)" == "NU Triangle Initiator - Win32 Release"
-
-USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL compiler
-InputPath=.\Triangle_Test.idl
-InputName=Triangle_Test
-
-BuildCmds= \
-	tao_idl $(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)" == "NU Triangle Initiator - Win32 Debug"
-
-USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL Compiler
-InputPath=.\Triangle_Test.idl
-InputName=Triangle_Test
-
-BuildCmds= \
-	tao_idl $(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/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
deleted file mode 100644
index 628889f8254..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    initiator.h
-//
-// = DESCRIPTION
-//      This class implements a simple server for the 
-//      Nested Upcalls - Triangle test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (_TRIANGLE_TEST_INITITATOR_SERVER_H)
-#define _TRIANGLE_TEST_INITITATOR_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/TAO.h"
-#include "Initiator_i.h"
-
-class Initiator_Server
-{
-  // = TITLE
-  //   This is the server for the Initiator in the test.
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
-
-public:
-
-  Initiator_Server (void);
-  // Default constructor
-
-  ~Initiator_Server (void);
-  // Destructor
-
-  int read_ior (char *filename, unsigned int A_B);
-  // read in the IOR's for the two objects A and B
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
-  // Initialize the Initiator_Server state - parsing arguments and ...
-
-  int run (CORBA::Environment& env);
-  // Run the orb
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  char * object_A_key_;
-  // The IOR of object A
-
-  char * object_B_key_;
-  // The IOR of object B
-
-  Object_A_var object_A_var_;
-  // reference to object A
-
-  Object_B_var object_B_var_;
-  // reference to object B
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager
-
-  Initiator_i *initiator_i_ptr_;
-  // Implementation object of the Initiator
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-};
-
-#endif /* _TRIANGLE_TEST_INITITATOR_SERVER_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
deleted file mode 100755
index 54a9c4ba695..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ /dev/null
@@ -1,37 +0,0 @@
-#$Id$
-# -*- perl -*-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-unshift @INC, '../../../../bin';
-require Process;
-
-$server1_port = 0;
-$server2_port = 0;
-$ior1file = "theior1";
-$ior2file = "theior2";
-$sleeptime = 3;
-
-$SV1 = Process::Create ("server_A".$Process::EXE_EXT, 
-                        " -ORBport $server1_port -o $ior1file ".
-			" -ORBobjrefstyle url");
-
-$SV2 = Process::Create ("server_B".$Process::EXE_EXT, 
-                        " -ORBport $server2_port -o $ior2file ".
-			" -ORBobjrefstyle url");
-
-sleep $sleeptime;
-
-$status = system ("initiator".$Process::EXE_EXT.
-		  " -ORBport $client_port ".
-		  " -f $ior1file -g $ior2file");
-
-$SV1->Kill (); $SV1->Wait ();
-$SV2->Kill (); $SV2->Wait ();
-
-unlink $ior1file;
-unlink $ior2file;
-
-# @@ Capture any errors from the server too.
-exit $status;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
deleted file mode 100644
index baf1fb58ed1..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    server_A.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple server for the 
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "server_A.h"
-
-ACE_RCSID(Triangle_Test, server_A, "$Id$")
-
-Object_A_Server::Object_A_Server (void)
-  : ior_output_file_ (0)
-{
-}
-
-int
-Object_A_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "do:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_output_file_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-o] <ior_output_file>"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-Object_A_Server::init (int argc,
-                       char** argv,
-                       CORBA::Environment& env)
-{
-  // Call the init of TAO_ORB_Manager to create a child POA
-  // under the root POA.
-  this->orb_manager_.init_child_poa (argc,
-                                     argv,
-                                     "child_poa",
-                                     env);
-
-  TAO_CHECK_ENV_RETURN (env,-1);
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-  // ~~ check for the return value here
-
-  CORBA::String_var str  =
-    this->orb_manager_.activate_under_child_poa ("object_A",
-                                                 &this->object_A_i_,
-                                                 env);
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              str.in ()));
-
-  if (this->ior_output_file_)
-    {
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       str.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
-
-
-  return 0;
-}
-
-
-int
-Object_A_Server::run (CORBA::Environment& env)
-{
-  if (this->orb_manager_.run (env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "NestedUpCalls_Server::run"),
-                      -1);
-  return 0;
-}
-
-Object_A_Server::~Object_A_Server (void)
-{
-}
-
-int
-main (int argc, char *argv[])
-{
-  Object_A_Server object_A_Server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
-  TAO_TRY
-    {
-      if (object_A_Server.init (argc,argv,TAO_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          object_A_Server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp
deleted file mode 100644
index f15327233b2..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.dsp
+++ /dev/null
@@ -1,215 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NU Triangle Server_A" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=NU Triangle Server_A - 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 "server_A.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 "server_A.mak" CFG="NU Triangle Server_A - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NU Triangle Server_A - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Server_A - 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)" == "NU Triangle Server_A - 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ELSEIF  "$(CFG)" == "NU Triangle Server_A - 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NU Triangle Server_A - Win32 Release"
-# Name "NU Triangle Server_A - Win32 Debug"
-# Begin Group "source files"
-
-# PROP Default_Filter "*.cpp"
-# Begin Source File
-
-SOURCE=.\Object_A_i.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\server_A.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestS.cpp
-# End Source File
-# End Group
-# Begin Group "header files"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\Object_A_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server_A.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestS.h
-# End Source File
-# End Group
-# Begin Group "IDL files"
-
-# PROP Default_Filter "*.idl"
-# Begin Source File
-
-SOURCE=.\Triangle_Test.idl
-
-!IF  "$(CFG)" == "NU Triangle Server_A - Win32 Release"
-
-USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL compiler
-InputPath=.\Triangle_Test.idl
-InputName=Triangle_Test
-
-BuildCmds= \
-	tao_idl $(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)" == "NU Triangle Server_A - Win32 Debug"
-
-USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL Compiler
-InputPath=.\Triangle_Test.idl
-InputName=Triangle_Test
-
-BuildCmds= \
-	tao_idl $(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/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
deleted file mode 100644
index 070bf80d0f9..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    server_A.h
-//
-// = DESCRIPTION
-//      This class implements a simple server for the 
-//      Nested Upcalls - Triangle test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (_TRIANGLE_TEST_OBJECT_A_SERVER_H)
-#define _TRIANGLE_TEST_OBJECT_A_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/TAO.h"
-#include "Object_A_i.h"
-
-class Object_A_Server
-{
-  // = TITLE
-  //   This is the server for the object A in the test.
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
-
-public:
-
-  Object_A_Server (void);
-  // Default constructor
-
-  ~Object_A_Server (void);
-  // Destructor
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
-  // Initialize the NestedUpCalls_Server state - parsing arguments and ...
-
-  int run (CORBA::Environment& env);
-  // Run the orb
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  FILE* ior_output_file_;
-  // File to output the IOR of the object A.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager
-
-  Object_A_i object_A_i_;
-  // Implementation object of the NestedUpCalls reactor.
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-};
-
-#endif /* _TRIANGLE_TEST_OBJECT_A_SERVER_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
deleted file mode 100644
index a2346d5e254..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    server_B.cpp
-//
-// = DESCRIPTION
-//    This class implements a simple server for the 
-//    Nested Upcalls - Triangle test.
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#include "server_B.h"
-
-ACE_RCSID(Triangle_Test, server_B, "$Id$")
-
-Object_B_Server::Object_B_Server (void)
-  : ior_output_file_ (0)
-{
-}
-
-int
-Object_B_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "do:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_output_file_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-o] <ior_output_file>"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-Object_B_Server::init (int argc,
-                       char** argv,
-                       CORBA::Environment& env)
-{
-  // Call the init of TAO_ORB_Manager to create a child POA
-  // under the root POA.
-  this->orb_manager_.init_child_poa (argc,
-                                     argv,
-                                     "child_poa",
-                                     env);
-
-  TAO_CHECK_ENV_RETURN (env,-1);
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-  // ~~ check for the return value here
-
-  CORBA::String_var str  =
-    this->orb_manager_.activate_under_child_poa ("object_B",
-                                                 &this->object_B_i_,
-                                                 env);
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              str.in ()));
-
-  if (this->ior_output_file_)
-    {
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       str.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
-
-
-  return 0;
-}
-
-
-int
-Object_B_Server::run (CORBA::Environment& env)
-{
-  if (this->orb_manager_.run (env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Object_B_Server::run"),
-                      -1);
-  return 0;
-}
-
-Object_B_Server::~Object_B_Server (void)
-{
-}
-
-int
-main (int argc, char *argv[])
-{
-  Object_B_Server object_B_Server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n"));
-  TAO_TRY
-    {
-      if (object_B_Server.init (argc,argv,TAO_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          object_B_Server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp
deleted file mode 100644
index eef5ffbbaf5..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.dsp
+++ /dev/null
@@ -1,215 +0,0 @@
-# Microsoft Developer Studio Project File - Name="NU Triangle Server_B" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=NU Triangle Server_B - 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 "server_B.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 "server_B.mak" CFG="NU Triangle Server_B - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "NU Triangle Server_B - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "NU Triangle Server_B - 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)" == "NU Triangle Server_B - 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ELSEIF  "$(CFG)" == "NU Triangle Server_B - 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 "..\..\..\..\\" /I "..\..\..\orbsvcs" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "NU Triangle Server_B - Win32 Release"
-# Name "NU Triangle Server_B - Win32 Debug"
-# Begin Group "source files"
-
-# PROP Default_Filter "*.cpp"
-# Begin Source File
-
-SOURCE=.\Object_B_i.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\server_B.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestS.cpp
-# End Source File
-# End Group
-# Begin Group "header files"
-
-# PROP Default_Filter "*.h"
-# Begin Source File
-
-SOURCE=.\Object_B_i.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\server_B.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestC.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Triangle_TestS.h
-# End Source File
-# End Group
-# Begin Group "IDL files"
-
-# PROP Default_Filter "*.idl"
-# Begin Source File
-
-SOURCE=.\Triangle_Test.idl
-
-!IF  "$(CFG)" == "NU Triangle Server_B - Win32 Release"
-
-USERDEP__TRIAN="..\..\..\..\bin\Release\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL compiler
-InputPath=.\Triangle_Test.idl
-InputName=Triangle_Test
-
-BuildCmds= \
-	tao_idl $(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)" == "NU Triangle Server_B - Win32 Debug"
-
-USERDEP__TRIAN="..\..\..\..\bin\tao_idl.exe"	
-# Begin Custom Build - Invoking TAO IDL Compiler
-InputPath=.\Triangle_Test.idl
-InputName=Triangle_Test
-
-BuildCmds= \
-	tao_idl $(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/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
deleted file mode 100644
index 51028a046e2..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/NestedUpCalls/Triangle_Test
-//
-// = FILENAME
-//    server_B.h
-//
-// = DESCRIPTION
-//      This class implements a simple server for the 
-//      Nested Upcalls - Triangle test
-//
-// = AUTHORS
-//    Michael Kircher
-//
-// ============================================================================
-
-#if !defined (_TRIANGLE_TEST_OBJECT_B_SERVER_H)
-#define _TRIANGLE_TEST_OBJECT_B_SERVER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/TAO.h"
-#include "Object_B_i.h"
-
-class Object_B_Server
-{
-  // = TITLE
-  //   This is the server for the object A in the test.
-  //
-  // = DESCRIPTION
-  //   See the README file for more information.
-
-public:
-
-  Object_B_Server (void);
-  // Default constructor
-
-  ~Object_B_Server (void);
-  // Destructor
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
-  // Initialize the NestedUpCalls_Server state - parsing arguments and ...
-
-  int run (CORBA::Environment& env);
-  // Run the orb
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  FILE* ior_output_file_;
-  // File to output the IOR of the object A.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager
-
-  Object_B_i object_B_i_;
-  // Implementation object of the NestedUpCalls reactor.
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-};
-
-#endif /* _TRIANGLE_TEST_OBJECT_B_SERVER_H */
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/svc.conf b/TAO/tests/NestedUpcall/Triangle_Test/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/NestedUpcall/Triangle_Test/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"