11 files changed, 0 insertions, 1212 deletions
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.dsw b/TAO/tests/POA/Default_Servant/Default_Servant.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/POA/Default_Servant/Default_Servant.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.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/POA/Default_Servant/File.idl b/TAO/tests/POA/Default_Servant/File.idl
deleted file mode 100644
index 0caa3792c23..00000000000
--- a/TAO/tests/POA/Default_Servant/File.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-
-//=================================================================
-//
-// = FILENAME
-//     File.idl
-//
-// = DESCRIPTION
-//     A simple File Descriptor and File System IDL interface.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================
-
-// IDL
-
-module File 
-{
-  exception IOError 
-    {
-      long error;
-    };
-
-  interface Descriptor 
-    {
-      typedef sequence<octet> DataBuffer;
-      
-	// write buffer to File
-      long write (in DataBuffer buffer)
-        raises (IOError);
-
-	// read num_bytes to DataBuffer
-      DataBuffer read (in long num_bytes)
-        raises (IOError);
-
-	// seek to offset in File from whence
-      unsigned long lseek (in unsigned long offset,
-                           in long whence)
-        raises (IOError);
-
-	// destroy the descriptor
-      void destroy ();
-    };
-
-  interface System 
-    {
-	// File open operation
-      Descriptor open (in string file_name, in long flags)
-        raises (IOError);
-    };        
-};
diff --git a/TAO/tests/POA/Default_Servant/File_i.cpp b/TAO/tests/POA/Default_Servant/File_i.cpp
deleted file mode 100644
index c1b2771d3c0..00000000000
--- a/TAO/tests/POA/Default_Servant/File_i.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// $Id$
-//
-//===================================================================
-//
-// = FILENAME
-//     File_i.cpp
-//
-// = DESCRIPTION
-//      Implementation of the File IDL module and the interfaces
-//      Descriptor and System in it.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
-
-#include "File_i.h"
-
-// IDL File::System constructor
-FileImpl::System::System (PortableServer::POA_ptr poa)
- : poa_ (PortableServer::POA::_duplicate (poa)),
-   // Create the Default Descriptor Servant
-    fd_servant_ (poa)
-{
-  CORBA::Environment env;
-  // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_, env);
-  ACE_ASSERT (env.exception () == 0);
-}
-
-FileImpl::System::~System (void)
-{
-}
-
-PortableServer::POA_ptr
-FileImpl::System::_default_POA (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-File::Descriptor_ptr
-FileImpl::System::open (const char *file_name,
-                        CORBA::Long flags,
-                        CORBA::Environment &env)
-{
-  // Do an ACE_OS::open
-  ACE_HANDLE file_descriptor = ACE_OS::open (file_name,
-                                             flags);
-
-  if (file_descriptor == ACE_INVALID_HANDLE)
-    {
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return 0;
-    }
-
-  char file_descriptor_buffer[BUFSIZ];
-
-  // convert ACE_HANDLE to a string
-  ACE_OS::sprintf (file_descriptor_buffer,
-                   "%ld",
-                   (CORBA::Long) file_descriptor);
-
-  //Create an objectID from the ACE_HANDLE string
-  PortableServer::ObjectId_var oid =
-    PortableServer::string_to_ObjectId (file_descriptor_buffer);
-
-  // create an object reference with the specified ObjectID got
-  // from ACE_HANDLE string
-  CORBA::Object_var obj =
-    this->poa_->create_reference_with_id (oid.in (),
-                                          "IDL:File/Descriptor:1.0",
-                                          env);
-  if (env.exception () != 0)
-    return File::Descriptor::_nil ();
-
-  // Narrow the object reference to a File Descriptor
-  File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in (), env);
-
-  if (env.exception () != 0)
-    return File::Descriptor::_nil ();
-
-  return fd._retn ();
-}
-
-// IDL File::Descriptor constructor
-FileImpl::Descriptor::Descriptor (PortableServer::POA_ptr poa)
-  : poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-FileImpl::Descriptor::~Descriptor (void)
-{
-}
-
-PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-//Extracts the ACE_HANDLE from the passed object reference
-ACE_HANDLE
-FileImpl::Descriptor::fd (CORBA::Environment &env)
-{
-  // Get a reference to myself
-  File::Descriptor_var me = this->_this (env);
-
-  if (env.exception () != 0)
-    return ACE_INVALID_HANDLE;
-
-  // Get the ObjectId from the reference
-  PortableServer::ObjectId_var oid =
-    this->poa_->reference_to_id (me.in (), env);
-
-  if (env.exception () != 0)
-    return ACE_INVALID_HANDLE;
-
-  // Convert the ObjectId to a string
-  CORBA::String_var s =
-    PortableServer::ObjectId_to_string (oid.in ());
-
-  // Get the ACE_HANDLE from the string
-  return (ACE_HANDLE) ::atol (s.in ());
-}
-
-CORBA::Long
-FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
-                             CORBA::Environment &env)
-{
-  ACE_HANDLE file_descriptor = this->fd (env);
-
-  if (env.exception () != 0)
-    return 0;
-
-  const CORBA::Octet *data = &buffer[0];
-
-  ssize_t len = ACE_OS::write (file_descriptor,
-                               data,
-                               buffer.length ());
-  if (len > 0)
-    return len;
-  else
-    {
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return 0;
-    }
-}
-
-File::Descriptor::DataBuffer *
-FileImpl::Descriptor::read (CORBA::Long num_bytes,
-                            CORBA::Environment &env)
-{
-  ACE_HANDLE file_descriptor = this->fd (env);
-
-  if (env.exception () != 0)
-    return 0;
-
-  CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
-  int length = ACE_OS::read (file_descriptor, buffer, num_bytes);
-
-  if (length > 0)
-    return new File::Descriptor::DataBuffer (length,
-                                             length,
-                                             buffer,
-                                             CORBA::B_TRUE);
-  else
-    {
-      File::Descriptor::DataBuffer::freebuf (buffer);
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return 0;
-    }
-}
-
-CORBA::ULong
-FileImpl::Descriptor::lseek (CORBA::ULong offset,
-                             CORBA::Long whence,
-                             CORBA::Environment &env)
-{
-  ACE_HANDLE file_descriptor = this->fd (env);
-
-  if (env.exception () != 0)
-    return 0;
-
-  CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
-                                                    offset,
-                                                    whence);
-  if (result == -1)
-    {
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return 0;
-    }
-  else
-    return (CORBA::ULong) result;
-}
-
-void
-FileImpl::Descriptor::destroy (CORBA::Environment &env)
-{
-  // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (env);
-
-  if (env.exception () != 0)
-    return;
-
-  //close the file corresponding to this object reference
-  int result = ACE_OS::close (file_descriptor);
-
-  if (result != 0)
-    {
-      CORBA::Exception *exception = new File::IOError (errno);
-      env.exception (exception);
-      return;
-    }
-}
diff --git a/TAO/tests/POA/Default_Servant/File_i.h b/TAO/tests/POA/Default_Servant/File_i.h
deleted file mode 100644
index 4ebbccea87b..00000000000
--- a/TAO/tests/POA/Default_Servant/File_i.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// $Id$
-//===================================================================
-//
-// = FILENAME
-//     File_i.h
-//
-// = DESCRIPTION
-//      Defines the implementation classes for the File IDL
-//     module
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
-
-
-
-#include "FileS.h"
-
-class FileImpl
-// FileImpl class provides the namespace for the File IDL module .
-{
-public:
-  class Descriptor : public POA_File::Descriptor
-    // Descriptor implements the Descriptor interface in the File Module
-    // A single Descriptor servant can serve multiple object references
-  {
-  public:
-    //Constructor
-    Descriptor (PortableServer::POA_ptr poa);
-
-    //Destructor
-    ~Descriptor (void);
-
-    // Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-
-    // write buffer to File corresponding to this Descriptor
-    virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer, 
-                               CORBA::Environment &env);
-
-    // Reads num_bytes from the file and returns it
-    virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes, 
-                                                CORBA::Environment &env);
-    // seek to the offset in file from whence
-    virtual CORBA::ULong lseek (CORBA::ULong offset, 
-                                CORBA::Long whence,  
-                                CORBA::Environment &env);
-
-    // closes the file corresponding to the requested ObjectID
-    virtual void destroy (CORBA::Environment &env);
-
-  private:
-    
-    // Extracts the ACE_HANDLE from the objectID
-    ACE_HANDLE fd (CORBA::Environment &env);
-   
-    PortableServer::POA_var poa_;
-  };
-
-  class System : public POA_File::System
-    // File System implementation class
-  {
-  public:
-    // Constructor, Creates a single File Descriptor Servant and 
-    // registers it with the POA as the Default Servant
-    System (PortableServer::POA_ptr poa);
-
-    //Destructor
-    ~System (void);
-
-    //Returns the default POA of this object
-    PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-
-    //Opens a file ,creates a Descriptor reference with the ACE_HANDLE
-    // and returns that reference	
-    File::Descriptor_ptr open (const char *file_name, 
-                               CORBA::Long flags,
-                               CORBA::Environment &env);
-    
-  private:
-    PortableServer::POA_var poa_;
-    
-    // The single File Descriptor servant which serves requests for any
-    // Descriptor object under poa_.
-    Descriptor fd_servant_;
-  };
-};
-
diff --git a/TAO/tests/POA/Default_Servant/Makefile b/TAO/tests/POA/Default_Servant/Makefile
deleted file mode 100644
index a6df3a59a33..00000000000
--- a/TAO/tests/POA/Default_Servant/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_SRC	= FileC.cpp FileS.cpp
-PROG_SRCS =	$(IDL_SRC) server.cpp client.cpp File_i.cpp
-
-LSRC = $(PROG_SRCS)
-
-FILE_SVR_OBJS = FileC.o FileS.o server.o File_i.o
-FILE_CLT_OBJS = FileC.o FileS.o client.o
-
-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.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-DCFLAGS = -g
-
-.PRECIOUS: FileC.h FileC.i FileC.cpp FileS.h FileS.i FileS.cpp
-
-server:	$(addprefix $(VDIR),$(FILE_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(FILE_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf FileC.* FileS.*
-
-# 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/POA/Default_Servant/README b/TAO/tests/POA/Default_Servant/README
deleted file mode 100644
index d64c59dbe80..00000000000
--- a/TAO/tests/POA/Default_Servant/README
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-
-Default_Servants
-================
-	
-	By using the USE_DEFAULT_SERVANT policy, the developer can create
-	a POA that will use a single servant to implement all of its objects.
-	This approach is useful when there is very little data associated 
-	with each object, so little that the data can be encoded in the
-	Object Id.
-
-Example:
-=======
-	In the example implementation a Single Servant is enough to
-	serve requests for a File Descriptor interface. The Object Id of the
-	Descriptor objects are formed from the file handle returned by the
-	System call. The servant can get the file handle from the object
-	reference to process the request. Thus a single Descriptor servant
-	can serve multiple objects.
-
-SERVER:
-======
-
-	1. To run the server, type
-	
-	   % server [-ORBport port] [-ORBobjrefstyle URL] [-ORBhost host]
-			
-CLIENT:
-======
-	The client tries to create a file "test" and writes a message to 
-	the file and reads it back and prints it.
-
-	1. To run the client, type
-
-	   % client -k IOR
-
-	where the IOR is got from the server output.
-
-	
-	
-	
-
-
-		
diff --git a/TAO/tests/POA/Default_Servant/client.cpp b/TAO/tests/POA/Default_Servant/client.cpp
deleted file mode 100644
index 78ad1ab6aee..00000000000
--- a/TAO/tests/POA/Default_Servant/client.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// $Id$
-//
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/Default_Servant/client
-//
-//  = FILENAME
-//     client.cpp
-//
-//  = DESCRIPTION
-//      A client program for the File IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
-
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-#include "FileC.h"
-
-static char *ior = 0;
-static char *filename = "test";
-static char *message = "POA rules!!";
-
-static int
-parse_args (int argc, char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:f:m:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-      case 'f':
-        filename = get_opts.optarg;
-        break;
-      case 'm':
-        message = get_opts.optarg;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           "-k IOR"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  if (ior == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Please specify the IOR for the servant"), -1);
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Parse the command-line arguments to get the IOR 
-  parse_args (argc, argv);
-
-  // Get the object reference with the IOR
-  CORBA::Object_var object = orb->string_to_object (ior, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::string_to_object");
-      return -1;
-    }
-  
-  // Narrow the object reference to a File::System
-  File::System_var file_system = File::System::_narrow (object.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::System::_narrow");
-      return -1;
-    }
-
-  // Creat the file filename i.e "test"
-  File::Descriptor_var fd = file_system->open (filename, O_CREAT | O_RDWR, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::System::open");
-      return -1;
-    }
-
-  int message_length = ACE_OS::strlen (message) + 1;
-  CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (message_length);
-  ACE_OS::strcpy ((char *) buffer, message);
-  File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, CORBA::B_TRUE);
-
-  // write the message to the file
-  fd->write (data_sent, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::Descriptor::write");
-      return -1;
-    }
-
-  //seek to the beginning of the file
-  fd->lseek (0, SEEK_SET, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::Descriptor::lseek");
-      return -1;
-    }
-
-  // Read back the written message
-  File::Descriptor::DataBuffer_var data_received = fd->read (message_length, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::Descriptor::read");
-      return -1;
-    }
-
-  char *result = (char *) &data_received[0];
-
-  // print the read message
-  ACE_DEBUG((LM_DEBUG,"%s\n",
-	     result));
-
-  // close the file 
-  fd->destroy (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("File::Descriptor::destroy");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/POA/Default_Servant/client.dsp b/TAO/tests/POA/Default_Servant/client.dsp
deleted file mode 100644
index d9b6b151a3b..00000000000
--- a/TAO/tests/POA/Default_Servant/client.dsp
+++ /dev/null
@@ -1,160 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=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="client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "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 ""
-# 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 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# 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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "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 /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# 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 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\client.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\File.idl
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\File.idl
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl File.idl
-
-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\File.idl
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl File.idl
-
-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\FileC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FileS.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/TAO/tests/POA/Default_Servant/server.cpp b/TAO/tests/POA/Default_Servant/server.cpp
deleted file mode 100644
index 87f80689d52..00000000000
--- a/TAO/tests/POA/Default_Servant/server.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-// $Id$
-//
-//===================================================================
-//  = LIBRARY
-//      TAO/tests/POA/Default_Servant/server
-//
-//  = FILENAME
-//      server.cpp
-//
-//  = DESCRIPTION
-//      A server program for the File IDL module
-//
-//  = AUTHOR
-//     Irfan Pyarali
-//
-//====================================================================
-
-
-#include "ace/streams.h"
-#include "File_i.h"
-
-int 
-main (int argc, char **argv)
-{
-  CORBA::Environment env;
-
-  // Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB_init");
-      return -1;
-    }
-
-  // Get the Root POA object reference
-  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
-
-  // Narrow the object reference to a POA reference
-  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::_narrow");
-      return -1;
-    }
-  
-  PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::the_POAManager");
-      return -1;
-    }
-  
-  CORBA::PolicyList policies (5);
-  policies.length (5);  
-
-  // ID Assignment Policy
-  policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
-      return -1;
-    }
-
-  // Lifespan Policy
-  policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_lifespan_policy");
-      return -1;
-    }
-  
-  // Request Processing Policy
-  policies[2] =
-    root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_request_processing_policy");
-      return -1;
-    }
-  
-  // Servant Retention Policy
-  policies[3] =
-    root_poa->create_servant_retention_policy (PortableServer::RETAIN, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_servant_retention_policy");
-      return -1;
-    }
-
-  // Id Uniqueness Policy
-  policies[4] =
-    root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_id_uniqueness_policy");
-      return -1;
-    }
-
-  ACE_CString name = "firstPOA";
-  PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
-                                                            poa_manager.in (),
-                                                            policies,
-                                                            env);  
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  for (CORBA::ULong i = 0;
-       i < policies.length () && env.exception () == 0;
-       ++i)
-    {
-      CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (env);
-    }  
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::create_POA");
-      return -1;
-    }
-
-  // Create a File System Implementation object in first_poa
-  FileImpl::System file_system_impl (first_poa.in ());
-
-  PortableServer::ObjectId_var file_system_oid =
-    PortableServer::string_to_ObjectId ("FileSystem");
-
-  first_poa->activate_object_with_id (file_system_oid.in (), 
-                                      &file_system_impl, 
-                                      env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::activate_object_with_id");
-      return -1;
-    }
-  
-  CORBA::Object_var file_system =
-    first_poa->id_to_reference (file_system_oid.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::id_to_reference");
-      return -1;
-    }
-  // Get the IOR for the "FileSystem" object
-  CORBA::String_var file_system_ior =
-    orb->object_to_string (file_system.in (), env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::object_to_string");
-      return -1;
-    }
-
-  ACE_DEBUG((LM_DEBUG,"%s\n",
-	     file_system_ior.in ()));
-
-  // set the state of the poa_manager to active i.e ready to process requests
-  poa_manager->activate (env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POAManager::activate");
-      return -1;
-    }
-
-  // Run the ORB
-  if (orb->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-
-  // Destroy the rootPOA and its children
-  root_poa->destroy (CORBA::B_TRUE, 
-                     CORBA::B_TRUE, 
-                     env);
-  if (env.exception () != 0)
-    {
-      env.print_exception ("PortableServer::POA::destroy");
-      return -1;
-    }
-
-  return 0;
-}
-
-
diff --git a/TAO/tests/POA/Default_Servant/server.dsp b/TAO/tests/POA/Default_Servant/server.dsp
deleted file mode 100644
index e18b2ce8743..00000000000
--- a/TAO/tests/POA/Default_Servant/server.dsp
+++ /dev/null
@@ -1,164 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=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="server - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "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 ""
-# 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 /GR /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# 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 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "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 /GR /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# 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 tao.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\File.idl
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\File.idl
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl File.idl
-
-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\File.idl
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl File.idl
-
-"FileS.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileS.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileS.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"FileC.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\File_i.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FileC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FileS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/TAO/tests/POA/Default_Servant/svc.conf b/TAO/tests/POA/Default_Servant/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/POA/Default_Servant/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"