ChangeLogTag: Fri Feb 18 17:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

20 files changed, 31 insertions, 15 deletions

diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 7f01d95962a..89d427ced0e 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoserver, minimum_corba {
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 9d8c221b6e7..b58c313ebe5 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -26,6 +26,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
 
 ACE_RCSID(Adapter_Activator, server, "$Id$")
 
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index 25c120a7b0e..70a0f306963 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -7,6 +7,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 #include "ace/Singleton.h"
 #include "ace/Malloc.h"
 
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index 04d3e67fc42..62a433a23c3 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,11 +1,12 @@
 //$Id$
-project(*Client) : taoexe, messaging, portableserver, minimum_corba {
+project(*Client) : taoclient, messaging, minimum_corba {
   source_files {
+    DatabaseC.cpp
     client.cpp
   }
 }
 
-project(*Server) : taoexe, messaging, portableserver, dynamicinterface, minimum_corba {
+project(*Server) : taoserver, messaging, dynamicinterface, minimum_corba {
   source_files {
     Database_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 3289d6f8bac..56145e39158 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -18,6 +18,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 ACE_RCSID(Default_Servant, File_i, "$Id$")
 
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 779807622d3..52883cadbcd 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,13 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver, minimum_corba {
+project(*Client) : taoclient, minimum_corba {
   source_files {
+    FileC.cpp
     client.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver, minimum_corba {
+project(*Server) : taoserver, minimum_corba {
   source_files {
     File_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index a5247ede801..8d96c04e54c 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -17,12 +17,14 @@
 //===========================================================================
 
 #include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Adapter_Activator.h"
 
 #include "tao/ORB.h"
+#include "ace/Log_Msg.h"
+#include "ace/SString.h"
 
-ACE_RCSID (FindPOA, 
-           FindPOA, 
+ACE_RCSID (FindPOA,
+           FindPOA,
            "$Id$")
 
 void
@@ -92,7 +94,7 @@ main (int argc, char **argv)
 
       // Get a TAO_Adapter_Activator reference
       PortableServer::AdapterActivator_var activator =
-        new TAO_Adapter_Activator (poa_manager.in ());
+        new TAO::Portable_Server::Adapter_Activator (poa_manager.in ());
 
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
index e5743eb768c..6be6fb2148f 100644
--- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, minimum_corba {
+project: taoserver, minimum_corba {
 }
 
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h
index b70c23e05f8..7c307fc26aa 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.h
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.h
@@ -23,6 +23,7 @@
 
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 class ServantActivator : public PortableServer::ServantActivator
 {
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
index 5fb4927d770..72bcf90edb6 100644
--- a/TAO/examples/POA/Loader/POA_Loader.mpc
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoserver, minimum_corba {
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h
index 5f3b6401c3c..969787a3a02 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.h
+++ b/TAO/examples/POA/Loader/Servant_Activator.h
@@ -22,6 +22,7 @@
 #define SERVANT_ACTIVATOR_H
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h
index 81b5ebb88be..a5e5725e2bd 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.h
+++ b/TAO/examples/POA/Loader/Servant_Locator.h
@@ -22,6 +22,7 @@
 #define SERVANT_LOCATOR_H
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
index b330e9a825f..c94b12f94dd 100644
--- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -1,3 +1,3 @@
 //$Id$
-project : taoexe, portableserver, minimum_corba {
+project : taoserver, minimum_corba {
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
index 043dacf4d79..8f2d7afd85f 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
@@ -17,6 +17,7 @@
 // ================================================================
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
index 33a332bb163..14982781d69 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
@@ -18,6 +18,7 @@
 //==================================================================================
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
index dc03fcbe513..53e6316101c 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
@@ -23,6 +23,7 @@
 #define SERVANT_ACTIVATOR_H
 
 #include "Servant_Manager.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 class ServantActivator_i : public PortableServer::ServantActivator
 {
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
index 397dc9d87fb..bdd85a2f07e 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
@@ -24,6 +24,7 @@
 #include "ace/DLL.h"
 
 #include "Servant_Manager.h"
+#include "tao/PortableServer/ServantLocatorC.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 4d89c0f8aca..1e8e3f687b4 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
@@ -24,9 +24,11 @@
 #include "ace/Containers.h"
 
 #include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Active_Object_Map.h"
 
 #include "tao/ORB.h"
+#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
index 368e062cbc6..98e7b408cf3 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, bidir_giop, minimum_corba {
+project: taoserver, bidir_giop, minimum_corba {
 }
diff --git a/TAO/examples/POA/RootPOA/RootPOA.mpc b/TAO/examples/POA/RootPOA/RootPOA.mpc
index 1ed2fb1882d..7860ab129f4 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.mpc
+++ b/TAO/examples/POA/RootPOA/RootPOA.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     RootPOA.cpp
   }