10 files changed, 0 insertions, 800 deletions
diff --git a/TAO/tests/POA/Generic_Servant/Foo.idl b/TAO/tests/POA/Generic_Servant/Foo.idl
deleted file mode 100644
index 0773c9a0325..00000000000
--- a/TAO/tests/POA/Generic_Servant/Foo.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-//===============================================================================
-//
-// = FILENAME
-//     Foo.idl
-//
-//==================================================================================
-
-// IDL
-
-interface Foo
-{
-  long doit();
-};
diff --git a/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw b/TAO/tests/POA/Generic_Servant/Generic_Servant.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/POA/Generic_Servant/Generic_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/Generic_Servant/Makefile b/TAO/tests/POA/Generic_Servant/Makefile
deleted file mode 100644
index 0c9a9b1781d..00000000000
--- a/TAO/tests/POA/Generic_Servant/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-TAO_IDLFLAGS = -Wb,export_macro=GENERIC_SERVANT_Export -Wb,export_include=generic_servant_export.h
-
-LDLIBS = -lTAO
-
-LIB = libserver.a
-
-IDL_SRC	= FooC FooS
-
-BINFILES = $(IDL_SRC) client
-
-LIB_SRC = $(IDL_SRC) MyFooServant
-
-LSRC = $(addsuffix .cpp,$(LIB_SRC))
-LOBJ = $(addsuffix .o,$(LIB_SRC))
-
-POA_CLT_SRCS = $(addsuffix .cpp,$(BINFILES))
-POA_CLT_OBJS = $(addprefix $(VDIR),$(addsuffix .o,$(BINFILES)))
-
-BIN = client
-
-BUILD = $(VOBJS) $(VLIB) $(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.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-DCFLAGS = -g
-
-#$(IDL_SRC): cubit.idl
-#	$(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl
-
-client: $(POA_CLT_OBJS)
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-#clean:
-#	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf FooC.* FooS.*
-
-# 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/Generic_Servant/MyFooServant.cpp b/TAO/tests/POA/Generic_Servant/MyFooServant.cpp
deleted file mode 100644
index 29e6a02c3f7..00000000000
--- a/TAO/tests/POA/Generic_Servant/MyFooServant.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-//===============================================================================
-//
-//
-// = FILENAME
-//     MyFooServant.cpp
-//
-// = DESCRIPTION
-//     This is a simple foo servant implementation
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
-
-#include "MyFooServant.h"
-
-// Constructor
-MyFooServant::MyFooServant (PortableServer::POA_ptr poa,
-                            CORBA::Long value)
-  : poa_ (PortableServer::POA::_duplicate (poa)),
-    value_ (value)
-{
-}
-
-// Destructor
-MyFooServant::~MyFooServant (void)
-{
-}
-
-// Return the Default POA of this Servant
-PortableServer::POA_ptr
-MyFooServant::_default_POA (CORBA::Environment &/*env*/)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in());
-}
-
-// Return this->value
-CORBA::Long
-MyFooServant::doit (CORBA::Environment &/*env*/)
-{
-  return this->value_;
-}
diff --git a/TAO/tests/POA/Generic_Servant/MyFooServant.h b/TAO/tests/POA/Generic_Servant/MyFooServant.h
deleted file mode 100644
index 60d08af7ce1..00000000000
--- a/TAO/tests/POA/Generic_Servant/MyFooServant.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-//=============================================================================
-//
-//
-// = FILENAME
-//     MyFooServant.h
-//
-// = DESCRIPTION
-//     Defines MyFooServant class for the Foo interface
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//=============================================================================
-
-#if !defined (MYFOOSERVANT_H)
-#define MYFOOSERVANT_H
-
-#include "FooS.h"
-
-class GENERIC_SERVANT_Export MyFooServant : public POA_Foo
-{
-public:
-  // constructor - takes a POA and a value parameter
-  MyFooServant (PortableServer::POA_ptr poa,
-                CORBA::Long value);
-
-  // Destructor
-  virtual ~MyFooServant (void);
-
-  //Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-
-  // Simple doit method
-  virtual CORBA::Long doit (CORBA::Environment &env);
-
-protected:
-  // Default poa associated with this servant
-  PortableServer::POA_var poa_;
-  CORBA::Long value_;
-};
-
-#endif /* MYFOOSERVANT_H */
diff --git a/TAO/tests/POA/Generic_Servant/README b/TAO/tests/POA/Generic_Servant/README
deleted file mode 100644
index 05ee0f2a18e..00000000000
--- a/TAO/tests/POA/Generic_Servant/README
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-Generic Servant:
-===============
-
-File Name
----------
-
-Foo.idl                 Simple Foo idl interface
-MyFooServant.h          Servant definition  for the Foo interface
-MyFooServant.cpp        Servant implementation for the FOO interface
-client.cpp              A simple Foo client
-
-Typing
-
-% Make
-
- creates an executable client and server library libserver.a.
-
-To run the client, type 
-
-% client [-ORBport port] -k IOR
-
-where IOR can be got from the server output.
diff --git a/TAO/tests/POA/Generic_Servant/client.cpp b/TAO/tests/POA/Generic_Servant/client.cpp
deleted file mode 100644
index 18b75d1e86f..00000000000
--- a/TAO/tests/POA/Generic_Servant/client.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// $Id$
-
-//===============================================================================
-//
-//
-// = FILENAME
-//     client.cpp
-//
-// = DESCRIPTION
-//     This is a simple foo client implementation.
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-//==================================================================================
-
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-#include "ace/Profile_Timer.h"
-#include "FooC.h"
-
-static char *IOR = 0;
-static int iterations = 1;
-
-static int
-parse_args (int argc, char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        IOR = get_opts.optarg;
-        break;
-      case 'i':
-        iterations = ::atoi (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\n"), -1);
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-void
-print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
-             int iterations)
-{
-  if (iterations > 0)
-    {
-      elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-      elapsed_time.real_time /= iterations;
-      elapsed_time.user_time /= iterations;
-      elapsed_time.system_time /= iterations;
-
-      double tmp = 1000 / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "\treal_time\t = %0.06f ms, \n"
-		  "\tuser_time\t = %0.06f ms, \n"
-		  "\tsystem_time\t = %0.06f ms, \n"
-		  "\t%0.00f calls/second\n",
-		  elapsed_time.real_time   < 0.0 ? 0.0 : elapsed_time.real_time,
-		  elapsed_time.user_time   < 0.0 ? 0.0 : elapsed_time.user_time,
-		  elapsed_time.system_time < 0.0 ? 0.0 : elapsed_time.system_time,
-		  tmp < 0.0 ? 0.0 : tmp));
-    }
-  else
-    ACE_ERROR ((LM_ERROR,
-		"\tNo time stats printed.  Zero iterations or error ocurred.\n"));
-}
-
-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;
-    }
-
-  // Initialize options based on command-line arguments.
-  int parse_args_result = parse_args (argc, argv);
-  if (parse_args_result != 0)
-    return parse_args_result;
-
-  // Get an object reference from the argument string.
-  CORBA::Object_var object = orb->string_to_object (IOR, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("CORBA::ORB::string_to_object");
-      return -1;
-    }
-
-  // Try to narrow the object reference to a Foo reference.
-  Foo_var foo = Foo::_narrow (object.in (), env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("Foo::_narrow");
-      return -1;
-    }
-
-  ACE_Profile_Timer timer;
-  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
-  // We start an ACE_Profile_Timer here...
-  timer.start ();
-
-  CORBA::Long result = 0;
-  int i = 0;
-  for (i = 0; i < iterations; i++ && env.exception () == 0)
-    {
-      // Invoke the doit() method of the foo reference.
-      result = foo->doit (env);
-    }
-     
-  // stop the timer.
-  timer.stop ();
-  timer.elapsed_time (elapsed_time);
-
-  // compute average time.
-  print_stats (elapsed_time, i);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("Foo::doit");
-      return -1;
-    }
-  
-  // Print the result of doit () method of the foo reference.
-  cout << result << endl;
-
-  return 0;
-}
diff --git a/TAO/tests/POA/Generic_Servant/client.dsp b/TAO/tests/POA/Generic_Servant/client.dsp
deleted file mode 100644
index 4ee9d087ee9..00000000000
--- a/TAO/tests/POA/Generic_Servant/client.dsp
+++ /dev/null
@@ -1,164 +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 /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 /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=.\Foo.idl
-
-!IF  "$(CFG)" == "client - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.h" : $(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)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(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)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooS.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/TAO/tests/POA/Generic_Servant/generic_servant_export.h b/TAO/tests/POA/Generic_Servant/generic_servant_export.h
deleted file mode 100644
index ad0e36483ab..00000000000
--- a/TAO/tests/POA/Generic_Servant/generic_servant_export.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// ${TAO_ROOT}/TAO_IDL/GenExportH.BAT
-// ------------------------------
-#if !defined (GENERIC_SERVANT_EXPORT_H)
-#define GENERIC_SERVANT_EXPORT_H
-
-#include "ace/OS.h"
-
-#if defined (GENERIC_SERVANT_HAS_DLL)
-#  if (GENERIC_SERVANT_HAS_DLL == 1)
-#    if defined (GENERIC_SERVANT_BUILD_DLL)
-#      define GENERIC_SERVANT_Export ACE_Proper_Export_Flag
-#      define GENERIC_SERVANT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
-#    else
-#      define GENERIC_SERVANT_Export ACE_Proper_Import_Flag
-#      define GENERIC_SERVANT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
-#    endif /* GENERIC_SERVANT_BUILD_DLL */
-#  else
-#    define GENERIC_SERVANT_Export
-#    define GENERIC_SERVANT_SINGLETON_DECLARATION(T)
-#    define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
-#  endif   /* ! GENERIC_SERVANT_HAS_DLL == 1 */
-#else
-#  define GENERIC_SERVANT_Export
-#  define GENERIC_SERVANT_SINGLETON_DECLARATION(T)
-#  define GENERIC_SERVANT_SINGLETON_INSTANTIATION(T)
-#endif     /* GENERIC_SERVANT_HAS_DLL */
-
-#endif     /* GENERIC_SERVANT_EXPORT_H */
-           // End of auto generated file.
diff --git a/TAO/tests/POA/Generic_Servant/server.dsp b/TAO/tests/POA/Generic_Servant/server.dsp
deleted file mode 100644
index 78b16995046..00000000000
--- a/TAO/tests/POA/Generic_Servant/server.dsp
+++ /dev/null
@@ -1,176 +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) Dynamic-Link Library" 0x0102
-
-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) Dynamic-Link Library")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "server__"
-# PROP BASE Intermediate_Dir "server__"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /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 "server_0"
-# PROP BASE Intermediate_Dir "server_0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 tao.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE=$(InputPath)
-PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\
- ..\On_Demand_Activation
-PostBuild_Cmds=copy server.dll ..\Explicit_Activation	copy server.dll\
- ..\On_Demand_Activation
-# End Special Build Tool
-
-!ENDIF 
-
-# Begin Target
-
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\Foo.idl
-
-!IF  "$(CFG)" == "server - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.h" : $(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)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\Foo.idl
-InputName=Foo
-
-BuildCmds= \
-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\
- -Wb,export_include=generic_servant_export.h $(InputName).idl
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooC.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\FooS.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\MyFooServant.cpp
-# End Source File
-# End Target
-# End Project