*** empty log message ***

16 files changed, 341 insertions, 36 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index b4e833cd394..9733d2f9131 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -4,8 +4,8 @@ Tue Jan 05 22:55:07 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
  	  are holding the connection cache lock in these methods, the
  	  Svc_Handler should not call purge().  If it does, a deadlock
  	  will occur (unless we have recursive locks) since we are already
- 	  the connection cache lock.  Therefore, we zero out the recycler
- 	  before calling svc_handler->close() and purge out the
+ 	  holding the connection cache lock.  Therefore, we zero out the
+ 	  recycler before calling svc_handler->close() and purge out the
  	  svc_handler entry ourself (through purge_i()).
 
 	  Thanks to Mark L. Boriack <mboriack@std.saic.com> for providing
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 48282299fe1..bcf731cad06 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,39 @@
+Wed Jan 06 02:58:28 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * TAO_Examples.dsw
+	* POA/Explicit_Activation/Makefile
+	* POA/Generic_Servant/Makefile
+	* POA/Generic_Servant/server.dsp
+        * POA/Loader/Loader.dsw
+        * POA/Loader/Makefile
+        * POA/Loader/server.dsp
+        * POA/On_Demand_Activation/On_Demand_Activation.dsw
+        * POA/On_Demand_Activation/server.dsp
+	* POA/On_Demand_Activation/Makefile
+        * POA/On_Demand_Loading/Makefile
+        * POA/On_Demand_Loading/On_Demand_Loading.dsw
+        * POA/On_Demand_Loading/server.dsp
+
+	  - Changed the name of the Generic Servant dynamic library from
+ 	    MyFoo back to Generic_Servant.  This was causing too many
+ 	    things to break on NT since the original settings were based
+ 	    on the Generic_Servant name.
+
+	  - Removed excess include directories in the make setting.
+
+	  - Fixed NT make files (including release settings) and made them
+ 	    conform with the existing makefiles.
+
+        * POA/On_Demand_Loading/Servant_Activator.cpp
+        * POA/On_Demand_Loading/Servant_Locator.cpp
+        * POA/Loader/Servant_Activator.cpp
+        * POA/Loader/Servant_Locator.cpp
+	* POA/Loader/Server_Manager.cpp
+
+	  - Removed access includes files.
+
+        * POA/On_Demand_Loading/Servant_Manager.cpp: Fixed use of ACE_CString.	  	  
+	
 Tue Jan  5 22:36:54 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* tao/default_server.{h,cpp}:
diff --git a/TAO/examples/POA/Loader/Loader.dsw b/TAO/examples/POA/Loader/Loader.dsw
index 953c1056b3f..a6cb35f3e3c 100644
--- a/TAO/examples/POA/Loader/Loader.dsw
+++ b/TAO/examples/POA/Loader/Loader.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "POA Loader Server"=".\POA Loader Server.dsp" - Package Owner=<4>

+Project: "POA Loader Server"=".\server.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile
index db0d4facc2b..ea2d5c9daa8 100644
--- a/TAO/examples/POA/Loader/Makefile
+++ b/TAO/examples/POA/Loader/Makefile
@@ -2,17 +2,17 @@
 # $Id$
 #
 
-BIN = Server_Manager server
+BIN = server
 
-MYFILES = Servant_Activator Servant_Locator 
+MYFILES = Server_Manager Servant_Activator Servant_Locator 
 
 SRC = $(addsuffix .cpp,$(MYFILES)) $(addsuffix .cpp, $(BIN))
 OBJ = $(addsuffix .o,$(MYFILES))
 
-CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
+CPPFLAGS += -I$(TAO_ROOT) 
 
-LDLIBS     =  -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
+LDLIBS = -lTAO
+LDFLAGS += -L$(TAO_ROOT)/tao 
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index 9f6224bc8b0..f98404fe0b1 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -18,7 +18,6 @@
 // ============================================================================
 
 #include "Servant_Activator.h"
-#include "MyFooServant.h"
 
 ACE_RCSID(Loader, Servant_Activator, "$Id$")
 
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index f059e2952fb..439c78d9d61 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -18,7 +18,6 @@
 // ============================================================================
 
 #include "Servant_Locator.h"
-#include "MyFooServant.h"
 
 ACE_RCSID(Loader, Servant_Locator, "$Id$")
 
diff --git a/TAO/examples/POA/Loader/server.dsp b/TAO/examples/POA/Loader/server.dsp
new file mode 100644
index 00000000000..ab444c08630
--- /dev/null
+++ b/TAO/examples/POA/Loader/server.dsp
@@ -0,0 +1,124 @@
+# Microsoft Developer Studio Project File - Name="POA Loader Server" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

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

+

+CFG=POA Loader 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 "POA Loader 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 "POA Loader Server.mak" CFG="POA Loader Server - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "POA Loader Server - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "POA Loader 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)" == "POA Loader Server - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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 /out:"Release/server.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "POA Loader 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 "..\..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "POA Loader Server - Win32 Release"

+# Name "POA Loader Server - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Servant_Activator.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Locator.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\server.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Server_Manager.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Servant_Activator.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Locator.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Server_Manager.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/examples/POA/On_Demand_Activation/On_Demand_Activation.dsw b/TAO/examples/POA/On_Demand_Activation/On_Demand_Activation.dsw
index f121fae15c3..c1f27728048 100644
--- a/TAO/examples/POA/On_Demand_Activation/On_Demand_Activation.dsw
+++ b/TAO/examples/POA/On_Demand_Activation/On_Demand_Activation.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "server"=.\server.dsp - Package Owner=<4>

+Project: "POA On Demand Activation"=.\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/examples/POA/On_Demand_Activation/server.dsp b/TAO/examples/POA/On_Demand_Activation/server.dsp
index 943facf33b8..bda559e7e0b 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.dsp
+++ b/TAO/examples/POA/On_Demand_Activation/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="POA On_Demand Server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="POA On Demand Activation Server" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

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

 

-CFG=POA On_Demand Server - Win32 Debug

+CFG=POA On Demand Activation 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 

@@ -13,13 +13,13 @@ CFG=POA On_Demand Server - Win32 Debug
 !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="POA On_Demand Server - Win32 Debug"

+!MESSAGE NMAKE /f "server.mak" CFG="POA On Demand Activation Server - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "POA On_Demand Server - Win32 Release" (based on\

+!MESSAGE "POA On Demand Activation Server - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "POA On_Demand Server - Win32 Debug" (based on\

+!MESSAGE "POA On Demand Activation Server - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -29,7 +29,7 @@ CFG=POA On_Demand Server - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "POA On_Demand Server - Win32 Release"

+!IF  "$(CFG)" == "POA On Demand Activation Server - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -55,7 +55,7 @@ LINK32=link.exe
 # ADD LINK32 tao.lib ace.lib ..\Generic_Servant\Generic_Servant.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "POA On_Demand Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "POA On Demand Activation Server - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -85,8 +85,8 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "POA On_Demand Server - Win32 Release"

-# Name "POA On_Demand Server - Win32 Debug"

+# Name "POA On Demand Activation Server - Win32 Release"

+# Name "POA On Demand Activation Server - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ""

diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile
index daa869388ab..e41d1f35c97 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile
@@ -2,17 +2,17 @@
 # $Id$
 #
 
-BIN = Server_Manager server
+BIN = server
 
 MYFILES = Servant_Manager Servant_Activator Servant_Locator 
 
 SRC = $(addsuffix .cpp,$(MYFILES)) $(addsuffix .cpp, $(BIN))
 OBJ = $(addsuffix .o,$(MYFILES))
 
-CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
+CPPFLAGS += -I$(TAO_ROOT)
 
-LDLIBS     =  -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
+LDLIBS = -lTAO
+LDFLAGS += -L$(TAO_ROOT)/tao
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
diff --git a/TAO/examples/POA/On_Demand_Loading/On_Demand_Loading.dsw b/TAO/examples/POA/On_Demand_Loading/On_Demand_Loading.dsw
index 2c3eaf6f223..0024cc02e62 100644
--- a/TAO/examples/POA/On_Demand_Loading/On_Demand_Loading.dsw
+++ b/TAO/examples/POA/On_Demand_Loading/On_Demand_Loading.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "POA On_Demand_Loading Server"=".\POA On_Demand_Loading Server.dsp" - Package Owner=<4>

+Project: "POA On Demand Loading Server"=".\server.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
index c2736a3f3e7..44fc163baac 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -18,7 +18,6 @@
 // ============================================================================
 
 #include "Servant_Activator.h"
-#include "MyFooServant.h"
 
 ACE_RCSID(On_Demand_Loading, Servant_Activator, "$Id$")
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
index 914e140a36d..e89f4305c27 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -18,7 +18,6 @@
 // ============================================================================
 
 #include "Servant_Locator.h"
-#include "MyFooServant.h"
 
 ACE_RCSID(On_Demand_Activation, Servant_Locator, "$Id$")
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
index dadd3efe113..2c6069f5d02 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -106,19 +106,18 @@ ServantManager_i::parse_string (const char *s)
 
   size_t index = str.find (':');
   // On error, npos is returned.
-  if (index == str.length () + 1)
+  if (index == ACE_CString::npos)
     ACE_ERROR ((LM_ERROR,
                 "Required character absent!\n"));
   
   // The index gives us the location which is equivalent to the size
   // of the dllname_ string.
-  this->dllname_.set (str.c_str (),
-                      index);
+  this->dllname_ = str.substr (0, index);
   
   // Obtain the substring from the offset which is one greater than
   // the location of ':'.
-  this->create_symbol_ = str.substring (index + 1,
-                                        str.length ());
+  this->create_symbol_ = str.substr (index + 1);
+
   ACE_DEBUG ((LM_DEBUG,
               "the servant dll:%s\n the factory_function:%s\n ",
               this->dllname_.c_str (),
diff --git a/TAO/examples/POA/On_Demand_Loading/server.dsp b/TAO/examples/POA/On_Demand_Loading/server.dsp
new file mode 100644
index 00000000000..82830a12040
--- /dev/null
+++ b/TAO/examples/POA/On_Demand_Loading/server.dsp
@@ -0,0 +1,129 @@
+# Microsoft Developer Studio Project File - Name="POA On Demand Loading Server" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

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

+

+CFG=POA On Demand Loading 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 "POA On Demand Loading 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 "POA On Demand Loading Server.mak"\

+ CFG="POA On Demand Loading Server - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "POA On Demand Loading Server - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "POA On Demand Loading 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)" == "POA On Demand Loading Server - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /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 /out:"Release/server.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "POA On Demand Loading 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 "..\..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "POA On Demand Loading Server - Win32 Release"

+# Name "POA On Demand Loading Server - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Servant_Activator.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Locator.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Manager.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\server.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Server_Manager.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Servant_Activator.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Servant_Locator.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Server_Manager.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/TAO/examples/TAO_Examples.dsw b/TAO/examples/TAO_Examples.dsw
index 4445e8f7d16..8c878213d8a 100644
--- a/TAO/examples/TAO_Examples.dsw
+++ b/TAO/examples/TAO_Examples.dsw
@@ -129,6 +129,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "POA Loader Server"=.\POA\Loader\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Project: "POA Locking"=.\POA\locking\locking.dsp - Package Owner=<4>

 

 Package=<5>

@@ -153,7 +165,19 @@ Package=<4>
 

 ###############################################################################

 

-Project: "POA On_Demand Server"=.\POA\On_Demand_Activation\server.dsp - Package Owner=<4>

+Project: "POA On Demand Activation Server"=.\POA\On_Demand_Activation\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "POA On Demand Loading Server"=.\POA\On_Demand_Loading\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -161,9 +185,6 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

 }}}

 

 ###############################################################################