ChangeLogTag: Mon Oct 13 18:20:45 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

44 files changed, 239 insertions, 91 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index ba7f9cd679a..97adf23ab2c 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,52 @@
+Mon Oct 13 18:20:45 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * examples/TAO_Examples.dsw
+        * examples/AMH/Sink_Server/Base_Server.h:
+        * examples/AMI/FL_Callback/AMI_Peer.dsp:
+        * examples/Buffered_Oneways/client.dsp:
+        * examples/OBV/Simple_util.h:
+        * examples/OBV/Typed_Events/Client_i.cpp:
+        * examples/OBV/Typed_Events/Event_Types_impl.h:
+        * examples/POA/DSI/Database_i.cpp:
+        * examples/POA/FindPOA/FindPOA.cpp:
+        * examples/POA/FindPOA/FindPOA.dsp:
+        * examples/POA/Loader/Servant_Activator.cpp:
+        * examples/POA/Loader/Servant_Activator.h:
+        * examples/POA/Loader/Servant_Locator.cpp:
+        * examples/POA/Loader/Servant_Locator.h:
+        * examples/POA/NewPOA/NewPOA.cpp:
+        * examples/POA/On_Demand_Activation/Servant_Activator.cpp:
+        * examples/POA/On_Demand_Activation/Servant_Activator.h:
+        * examples/POA/On_Demand_Activation/Servant_Locator.cpp:
+        * examples/POA/On_Demand_Activation/Servant_Locator.h:
+        * examples/POA/On_Demand_Loading/Servant_Activator.cpp:
+        * examples/POA/On_Demand_Loading/Servant_Locator.cpp:
+        * examples/POA/On_Demand_Loading/Servant_Locator.h:
+        * examples/POA/On_Demand_Loading/Servant_Manager.h:
+        * examples/POA/On_Demand_Loading/server.dsp:
+        * examples/POA/POA_BiDir/POA_BiDir.cpp:
+        * examples/POA/RootPOA/RootPOA.cpp:
+        * examples/Persistent_Grid/Grid_i.cpp:
+        * examples/Quoter/Factory_Finder.cpp:
+        * examples/Quoter/Factory_Finder_i.cpp:
+        * examples/Quoter/Generic_Factory.cpp:
+        * examples/Quoter/Generic_Factory_i.cpp:
+        * examples/Quoter/Quoter_i.cpp:
+        * examples/Quoter/client.cpp:
+        * examples/Quoter/client.h:
+        * examples/Quoter/server.dsp:
+        * examples/Simple/grid/Grid_i.cpp:
+        * examples/Simple/time-date/Time_Date_i.cpp:
+        * examples/Simulator/Event_Supplier/DOVE_Supplier.cpp:
+        * examples/Simulator/Event_Supplier/DOVE_Supplier.h:
+        * examples/Simulator/Event_Supplier/DualEC_Sup.cpp:
+        * examples/Simulator/Event_Supplier/DualEC_Sup.h:
+        * examples/Simulator/Event_Supplier/Event_Sup.cpp:
+        * examples/Simulator/Event_Supplier/Logging_Sup.cpp:
+
+	  Updated file includes to match changes to the
+	  rest of TAO, and fixed MSVC project settings.
+
 Mon Oct 13 11:05:58 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Invocation_Adapter.cpp (object_forwarded):
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.h b/TAO/examples/AMH/Sink_Server/Base_Server.h
index 95a8a6d63d2..bbf8bfdb20c 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.h
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.h
@@ -18,10 +18,11 @@
 #define BASE_SERVER_H
 
 #include /**/ "ace/pre.h"
-#include "tao/corba.h"
+
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 
+#include "tao/ORB.h"
 
 // Forward declaration of the kind of servant we are willing to handle
 // in this server
diff --git a/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp b/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp
index 7035c15311f..61aeacb7b3e 100644
--- a/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp
+++ b/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # 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

+# ADD CPP /nologo /MDd /W3 /Gm /GR /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"

diff --git a/TAO/examples/Buffered_Oneways/client.dsp b/TAO/examples/Buffered_Oneways/client.dsp
index 6516ac300c8..6e6173c2b0f 100644
--- a/TAO/examples/Buffered_Oneways/client.dsp
+++ b/TAO/examples/Buffered_Oneways/client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib TAO_Messaging.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\Messaging"

+# ADD LINK32 ace.lib tao.lib TAO_Messaging.lib TAO_Valuetype.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib taod.lib TAO_Messagingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\Messaging"

+# ADD LINK32 aced.lib taod.lib TAO_Messagingd.lib TAO_Valuetyped.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\Messaging" /libpath:"..\..\tao\Valuetype"

 

 !ENDIF 

 

diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index fc8fb5eb7c6..352049e88d0 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -24,7 +24,7 @@
 #define TAO_UTIL_H
 
 #include "tao/PortableServer/ORB_Manager.h"
-//#include "orbsvcs/Naming/Naming_Utils.h"
+
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index c76cccb0176..bea4580dfb2 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -2,7 +2,9 @@
 
 #include "Client_i.h"
 #include "Event_Types_impl.h"
+
 #include "tao/ORB_Core.h"
+
 #include "ace/Get_Opt.h"
 
 int
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index 3fc93b43f41..083eb596a24 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -3,8 +3,11 @@
 
 #if !defined (EVENT_TYPES_IMPL_H)
 #define EVENT_TYPES_IMPL_H
+
 #include "Event_TypesC.h"
 
+#include "tao/Valuetype/ValueFactory.h"
+
 // Event hierarchy implementation classes ======================
 
 // The implementation of a valuetype in C++ needs to derive from
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index e58aa64b603..4d69a3fe87e 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -1,8 +1,12 @@
 // $Id$
 
 #include "Database_i.h"
+
 #include "tao/DynamicInterface/Server_Request.h"
 
+#include "tao/NVList.h"
+#include "tao/Typecode.h"
+
 ACE_RCSID (DSI, 
            Database_i, 
            "$Id$")
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index 91989c55e41..a5247ede801 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -16,11 +16,14 @@
 //
 //===========================================================================
 
-#include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/POA.h"
 
-ACE_RCSID(FindPOA, FindPOA, "$Id$")
+#include "tao/ORB.h"
+
+ACE_RCSID (FindPOA, 
+           FindPOA, 
+           "$Id$")
 
 void
 find_non_existant_POA (PortableServer::POA_ptr parent,
diff --git a/TAO/examples/POA/FindPOA/FindPOA.dsp b/TAO/examples/POA/FindPOA/FindPOA.dsp
index c38739d7e5d..33dd1c1a595 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.dsp
+++ b/TAO/examples/POA/FindPOA/FindPOA.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # 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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_Valuetype.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

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

@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # 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 TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Valuetyped.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index f3ad061d3e3..7e1dd32535c 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -19,7 +19,9 @@
 
 #include "Servant_Activator.h"
 
-ACE_RCSID(Loader, Servant_Activator, "$Id$")
+ACE_RCSID (Loader, 
+           Servant_Activator, 
+           "$Id$")
 
 // Initialization.The dllname is used by the Loactor to load it into
 // memory. The factory function is the point of entry into the dll and
diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h
index 2110dd0b3c5..5f3b6401c3c 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.h
+++ b/TAO/examples/POA/Loader/Servant_Activator.h
@@ -18,14 +18,15 @@
 //
 // ================================================================
 
-#include "ace/OS.h"
-
 #ifndef SERVANT_ACTIVATOR_H
 #define SERVANT_ACTIVATOR_H
 
-#include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
+
+#include "tao/ORB.h"
+
 #include "ace/DLL.h"
+#include "ace/Log_Msg.h"
 
 class ServantActivator : public PortableServer::ServantActivator
 {
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index 66186a1a5b1..087e03d54d7 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -19,7 +19,9 @@
 
 #include "Servant_Locator.h"
 
-ACE_RCSID(Loader, Servant_Locator, "$Id$")
+ACE_RCSID (Loader, 
+           Servant_Locator, 
+           "$Id$")
 
 // Initialization.The dllname is used by the Loactor to load it into
 // memory. The factory function is the point of entry into the dll and
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h
index 1063eaeb280..81b5ebb88be 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.h
+++ b/TAO/examples/POA/Loader/Servant_Locator.h
@@ -18,15 +18,16 @@
 //
 // ================================================================
 
-#include "ace/OS.h"
-
 #ifndef SERVANT_LOCATOR_H
 #define SERVANT_LOCATOR_H
 
-#include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
+
+#include "tao/ORB.h"
+
 #include "ace/DLL.h"
 #include "ace/SString.h"
+#include "ace/Log_Msg.h"
 
 class ServantLocator : public PortableServer::ServantLocator
 {
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index 544191256d6..89529e6bcf8 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -21,11 +21,16 @@
 //    Irfan Pyarali
 // ========================================================================
 
-#include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
+
+#include "tao/ORB.h"
+
 #include "ace/SString.h"
+#include "ace/Log_Msg.h"
 
-ACE_RCSID(NewPOA, NewPOA, "$Id$")
+ACE_RCSID (NewPOA, 
+           NewPOA, 
+           "$Id$")
 
 void
 print_poa (PortableServer::POA_ptr poa
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
index f4057618a36..cf627cbe67e 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -20,7 +20,9 @@
 #include "Servant_Activator.h"
 #include "test_i.h"
 
-ACE_RCSID(On_Demand_Activation, Servant_Activator, "$Id$")
+ACE_RCSID (On_Demand_Activation, 
+           Servant_Activator, 
+           "$Id$")
 
 ServantActivator::ServantActivator (CORBA::ORB_ptr orb)
   : orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
index fba55720e08..043dacf4d79 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
@@ -16,9 +16,10 @@
 //
 // ================================================================
 
-#include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
 
+#include "tao/ORB.h"
+
 class ServantActivator : public PortableServer::ServantActivator
 {
 public:
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
index cea9e181d0c..5d7e4ecd917 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -20,7 +20,9 @@
 #include "Servant_Locator.h"
 #include "test_i.h"
 
-ACE_RCSID(On_Demand_Activation, Servant_Locator, "$Id$")
+ACE_RCSID (On_Demand_Activation, 
+           Servant_Locator, 
+           "$Id$")
 
 ServantLocator::ServantLocator (CORBA::ORB_ptr orb)
   : counter_ (0),
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
index 0d89fd98962..33a332bb163 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
@@ -17,9 +17,10 @@
 //
 //==================================================================================
 
-#include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
 
+#include "tao/ORB.h"
+
 class ServantLocator : public PortableServer::ServantLocator
 {
   // = TITLE
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
index 7263bd58583..9fc6f5ad62f 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -19,7 +19,9 @@
 
 #include "Servant_Activator.h"
 
-ACE_RCSID(On_Demand_Loading, Servant_Activator, "$Id$")
+ACE_RCSID (On_Demand_Loading, 
+           Servant_Activator, 
+           "$Id$")
 
 // Initialization.
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
index dc5620385f5..be4a1893bea 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -19,7 +19,9 @@
 
 #include "Servant_Locator.h"
 
-ACE_RCSID(On_Demand_Activation, Servant_Locator, "$Id$")
+ACE_RCSID (On_Demand_Activation, 
+           Servant_Locator, 
+           "$Id$")
 
 // Initialization.
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
index b3ed4f7982c..397dc9d87fb 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
@@ -21,8 +21,8 @@
 #ifndef SERVANT_LOCATOR_H
 #define SERVANT_LOCATOR_H
 
-#include "tao/corba.h"
 #include "ace/DLL.h"
+
 #include "Servant_Manager.h"
 
 class ServantLocator_i : public PortableServer::ServantLocator
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
index 6566b9c01d1..4d89c0f8aca 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
@@ -17,18 +17,17 @@
 //
 //==================================================================================
 
-#include "ace/OS.h"
-
 #ifndef SERVANT_MANAGER_H
 #define SERVANT_MANAGER_H
 
 #include "ace/DLL.h"
 #include "ace/Containers.h"
-#include "tao/corba.h"
-#include "tao/PortableServer/PortableServer.h"
 
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/POA.h"
 
+#include "tao/ORB.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/examples/POA/On_Demand_Loading/server.dsp b/TAO/examples/POA/On_Demand_Loading/server.dsp
index e926a363fbc..c307cc6445f 100644
--- a/TAO/examples/POA/On_Demand_Loading/server.dsp
+++ b/TAO/examples/POA/On_Demand_Loading/server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # 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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_Valuetype.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # 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 TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Valuetyped.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Valuetype" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
index 2c22f8667b2..f3e2299214d 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
@@ -16,12 +16,16 @@
 //    Balachandran Natarajan <bala@cs.wustl.edu>
 // ========================================================================
 
-#include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
+
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+
 #include "tao/Any.h"
+#include "tao/ORB.h"
 
-ACE_RCSID(POA_BiDir, POA_BiDir, "$Id$")
+ACE_RCSID (POA_BiDir, 
+           POA_BiDir, 
+           "$Id$")
 
 void
 print_poa (PortableServer::POA_ptr poa
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index d9c6a8ba94b..9a3a874ba37 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -18,10 +18,15 @@
 //
 //=========================================================================
 
-#include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
 
-ACE_RCSID(RootPOA, RootPOA, "$Id$")
+#include "tao/orb.h"
+
+#include "ace/Log_Msg.h"
+
+ACE_RCSID (RootPOA, 
+           RootPOA, 
+           "$Id$")
 
 int
 main (int argc, char **argv)
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 67dd2d72c8d..404b70192fb 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
+
 #include "Grid_i.h"
-#include "tao/corba.h"
 
 // Default constructor.
 
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index c7a76c7a97f..ad08f3fd7a9 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -14,10 +14,11 @@
 //
 // ============================================================================
 
-#include "tao/corba.h"
 #include "Factory_Finder.h"
 
-ACE_RCSID(Quoter, Factory_Finder, "$Id$")
+ACE_RCSID (Quoter, 
+
+           Factory_Finder, "$Id$")
 
 Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server (void)
 :   debug_level_ (1)
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 9720df205c5..871941f0e53 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -14,13 +14,16 @@
 //
 // ============================================================================
 
-#include "ace/Get_Opt.h"
 #include "Factory_Finder_i.h"
 #include "QuoterC.h"
-#include "tao/corba.h"
+
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Quoter, Factory_Finder_i, "$Id$")
+#include "ace/Get_Opt.h"
+
+ACE_RCSID (Quoter, 
+           Factory_Finder_i, 
+           "$Id$")
 
 // Constructor
 Quoter_Factory_Finder_i::Quoter_Factory_Finder_i (int debug_level)
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index acb7858daf1..12516fcb83a 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -13,11 +13,13 @@
 //
 // ============================================================================
 
-#include "tao/corba.h"
-#include "orbsvcs/LifeCycleServiceC.h"
 #include "Generic_Factory.h"
 
-ACE_RCSID(Quoter, Generic_Factory, "$Id$")
+#include "orbsvcs/LifeCycleServiceC.h"
+
+ACE_RCSID (Quoter, 
+           Generic_Factory, 
+           "$Id$")
 
 Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void)
 : use_LifeCycle_Service_ (0),
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index bf8002d1ff4..15c9a4034c5 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -15,11 +15,14 @@
 
 #include "Generic_Factory_i.h"
 #include "QuoterC.h"
-#include "tao/corba.h"
+
 #include "tao/ORB_Core.h"
+
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Quoter, Generic_Factory_i, "$Id$")
+ACE_RCSID (Quoter, 
+           Generic_Factory_i, 
+           "$Id$")
 
 // Constructor
 Quoter_Generic_Factory_i::Quoter_Generic_Factory_i (int debug_level)
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 1b9d5a93819..1e3851293a6 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -14,12 +14,15 @@
 // ============================================================================
 
 #include "Quoter_i.h"
+
 #include "tao/PortableServer/POA.h"
-#include "tao/corba.h"
+
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Quoter, Quoter_i, "$Id$")
+ACE_RCSID (Quoter, 
+           Quoter_i, 
+           "$Id$")
 
 // Constructor.  Create all the quoter factories.
 
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index a685c33fdeb..7dec1d90a22 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -1,10 +1,14 @@
 // $Id$
 
 #include "ace/Read_Buffer.h"
+
 #include "orbsvcs/CosNamingC.h"
+
 #include "client.h"
 
-ACE_RCSID(Quoter, client, "$Id$")
+ACE_RCSID (Quoter, 
+           client, 
+           "$Id$")
 
 Quoter_Task::Quoter_Task (int argc, char **argv)
   : argc_ (argc), argv_ (argv)
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index 7af1f955ced..d5014c872c8 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -26,12 +26,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "tao/corba.h"
 #include "QuoterC.h"
+
 #include "orbsvcs/CosLifeCycleC.h"
 
+#include "ace/Task.h"
+#include "ace/Thread_Manager.h"
+
 class Quoter_Client
 {
   // = TITLE
diff --git a/TAO/examples/Quoter/server.dsp b/TAO/examples/Quoter/server.dsp
index 17f93f044aa..f4bb297dd7c 100644
--- a/TAO/examples/Quoter/server.dsp
+++ b/TAO/examples/Quoter/server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # 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_PortableServer.lib TAO.lib TAO_CosNaming.lib TAO_CosLifeCycle.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAO_Valuetype.lib TAO_PortableServer.lib TAO.lib TAO_CosNaming.lib TAO_CosLifeCycle.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\orbsvcs\orbsvcs"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # 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_PortableServerd.lib TAOd.lib TAO_CosNamingd.lib TAO_CosLifeCycled.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAO_Valuetyped.lib TAO_PortableServerd.lib TAOd.lib TAO_CosNamingd.lib TAO_CosLifeCycled.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\orbsvcs\orbsvcs"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ENDIF 

diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 4d547003920..8a320540b28 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 // $Id$
+
 #include "Grid_i.h"
-#include "tao/corba.h"
 
 // Default constructor.
 
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index 1b4cc0854e9..2e30652be49 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -2,7 +2,6 @@
 // $Id$
 
 #include "Time_Date_i.h"
-#include "tao/corba.h"
 
 // Default constructor.
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index a8a39910057..dbe6c2a9ebf 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -17,7 +17,9 @@
 #include "DOVE_Supplier.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID(Event_Supplier, DOVE_Supplier, "$Id$")
+ACE_RCSID (Event_Supplier, 
+           DOVE_Supplier, 
+           "$Id$")
 
 // Static pointer member initialization for Singleton.
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index fc6b9de6843..1324df29fa3 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -19,7 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corba.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/Event_Utilities.h"
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index dd49376fa98..02f7f607d2a 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -24,23 +24,24 @@
 #include "DualEC_Sup.h"
 #include "NavWeapC.h"
 
+#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
+
 #include "tao/PortableServer/ORB_Manager.h"
-#include "tao/corba.h"
 #include "tao/ORB_Core.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
-//#include "ace/Profile_Timer.h"
 #include "ace/OS.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
 
 #include <limits.h>
 
-ACE_RCSID(Event_Supplier, DualEC_Sup, "$Id$")
+ACE_RCSID (Event_Supplier, 
+           DualEC_Sup, 
+           "$Id$")
 
 static const char usage [] =
 "[[-?]\n"
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
index eb66f22e8ec..be62fdeb02f 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -20,10 +20,6 @@
 #ifndef DUALEC_SUP_H
 #define DUALEC_SUP_H
 
-//#include <ctype.h>
-//#include <stdio.h>
-
-#include "tao/corba.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/Event_Utilities.h"
@@ -31,6 +27,7 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Event/Module_Factory.h"
 #include "orbsvcs/Event/Event_Channel.h"
+
 #include "NavWeapC.h"
 #include "NavWeapS.h"
 #include "DOVE_Supplier.h"
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 1d42b0c1598..80b0273729c 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -17,22 +17,25 @@
 //
 // ============================================================================
 
-#include "tao/corba.h"
-#include "tao/PortableServer/ORB_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-//#include "ace/Profile_Timer.h"
-#include "ace/OS.h"
+#include "Event_Sup.h"
+#include "NavWeapC.h"
+
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
-#include "Event_Sup.h"
-#include "NavWeapC.h"
+
+#include "tao/PortableServer/ORB_Manager.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+#include "ace/OS.h"
 
 #include <limits.h>
 
-ACE_RCSID(Event_Supplier, Event_Sup, "$Id$")
+ACE_RCSID (Event_Supplier, 
+           Event_Sup, 
+           "$Id$")
 
 static const char usage [] =
 "[[-?]\n"
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 6bf504cefdb..a18a0426af9 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -21,22 +21,25 @@
 //
 // ============================================================================
 
-#include "tao/corba.h"
-#include "tao/PortableServer/ORB_Manager.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-//#include "ace/Profile_Timer.h"
-#include "ace/OS.h"
+#include "Logging_Sup.h"
+#include "NavWeapC.h"
+
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
-#include "Logging_Sup.h"
-#include "NavWeapC.h"
+
+#include "tao/PortableServer/ORB_Manager.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+#include "ace/OS.h"
 
 #include <limits.h>
 
-ACE_RCSID(Event_Supplier, Logging_Sup, "$Id$")
+ACE_RCSID (Event_Supplier, 
+           Logging_Sup, 
+           "$Id$")
 
 static const char usage [] =
 "[[-?]\n"
diff --git a/TAO/examples/TAO_Examples.dsw b/TAO/examples/TAO_Examples.dsw
index c218b11d2ee..9a49a0c6ebf 100644
--- a/TAO/examples/TAO_Examples.dsw
+++ b/TAO/examples/TAO_Examples.dsw
@@ -3,6 +3,30 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

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

 

+Project: "AMH_Sink_Server Client"=.\AMH\Sink_Server\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

+Project: "AMH_Sink_Server Server"=.\AMH\Sink_Server\st_server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "AMI Peer"=.\AMI\FL_Callback\AMI_Peer.dsp - Package Owner=<4>

 

 Package=<5>

@@ -279,6 +303,18 @@ Package=<4>
 

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

 

+Project: "MT_AMH_Sink_Server Server"=.\AMH\Sink_Server\mt_server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

 Project: "OBV Typed Events Client"=.\OBV\Typed_Events\client.dsp - Package Owner=<4>

 

 Package=<5>

@@ -501,7 +537,7 @@ Package=<4>
 

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

 

-Project: "POA BiDir"=.\POA\POA_BiDir\POA_BiDir.dsp - Package Owner=<4>

+Project: "POA POA_BiDir"=.\POA\POA_BiDir\POA_BiDir.dsp - Package Owner=<4>

 

 Package=<5>

 {{{