Wed Oct 19 11:30:23 MST 2005 Yan Dai <dai_y@ociweb.com>

18 files changed, 69 insertions, 30 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7aa063a68a4..047376e638b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,35 @@
+Wed Oct 19 11:30:23 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * tao/CSD_Framework/CSD_Strategy_Base.h:
+
+          Removed un-necessary ";" from the POAManager forward declaration.
+          
+        * tao/CSD_Framework/CSD_Strategy_Base.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+           
+          Removed the argument name from the csd hook interfaces instead
+          of using ACE_UNUSED_ARG. 
+          
+        * docs/libraries.html:
+        
+          Added CSD_Framework and CSD_ThreadPool library descriptions.
+          
+        * examples/CSD_Strategy/ThreadPool/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool2/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool3/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool4/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool4/Foo_i.h:
+        * examples/CSD_Strategy/ThreadPool5/Callback_i.h:
+        * examples/CSD_Strategy/ThreadPool5/Foo_i.h:
+        * performance-tests/CSD_Strategy/TestServant/Foo_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h:
+        * tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h:
+        
+          Replaced deprecated RefCountServantBase with ServantBase. 
+          
 Wed Oct 19 10:01:03 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* tao/Valuetype/Value_VarOut_T.cpp (operator=):
diff --git a/TAO/docs/libraries.html b/TAO/docs/libraries.html
index c172809bc82..26ddf36c89e 100644
--- a/TAO/docs/libraries.html
+++ b/TAO/docs/libraries.html
@@ -246,6 +246,21 @@ and the dependencies outlined below are the same. <P>
     this library </td> 
    <td>valuetype.mpb</td>
    </tr>
+   <tr align=left>
+   <th>libTAO_CSD_Framework.so</th>
+   <td>Support framework for Custom Servant Dispatching (CSD) feature. The CSD_ThreadPool
+    depends on this library</td> 
+   <td>csd_framework.mpb</td>
+   </tr>
+   <tr align=left>
+   <th>libTAO_CSD_ThreadPool.so</th>
+   <td>Support for ThreadPool Custom Servant Dispatching (CSD) Strategy. This library can 
+    be loaded statically or dynamically. Applications are required to
+    <code> #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
+    </code> for static loading and provide service configuration file for dynamic loading.
+   </td> 
+   <td>csd_threadpool.mpb</td>
+   </tr>
 </tr>
 </table>
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
index cf1ee0968e1..ef3ce44dfed 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
@@ -8,7 +8,7 @@
 
 
 class Foo_i : public virtual POA_Foo,
-              public virtual PortableServer::RefCountServantBase
+              public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
index 5cc2a45e467..1c0de5164bb 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
@@ -10,7 +10,7 @@
 class FooServantList;
 
 class Foo_i : public virtual POA_Foo,
-              public virtual PortableServer::RefCountServantBase
+              public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
index 0d897194358..8ad9d4cb37d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
@@ -6,7 +6,7 @@
 
 
 class Foo_i : public virtual POA_Foo,
-              public virtual PortableServer::RefCountServantBase
+              public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
index c66fe818f94..f2f72d3e1dc 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
@@ -6,7 +6,7 @@
 
 
 class Callback_i : public virtual POA_Callback,
-              public virtual PortableServer::RefCountServantBase
+              public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
index 82c115ecbe6..f6aaffa4a7f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
@@ -11,7 +11,7 @@
 class FooServantList;
 
 class Foo_i : public virtual POA_Foo,
-              public virtual PortableServer::RefCountServantBase
+              public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
index 0837c30df81..4183955f22f 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
@@ -6,7 +6,7 @@
 
 
 class Callback_i : public virtual POA_Callback,
-              public virtual PortableServer::RefCountServantBase
+              public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
index f28d9aeeacc..ace8731db65 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
@@ -10,7 +10,7 @@ class FooServantList;
 
 
 class Foo_i : public virtual POA_Foo,
-              public virtual PortableServer::RefCountServantBase
+              public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
index b6270ecf0e3..ca90fa99349 100644
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
@@ -8,7 +8,7 @@
 
 
 class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo,
-                                        public virtual PortableServer::RefCountServantBase
+                                        public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
index de6524c3b04..c6cb6881d51 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
@@ -111,23 +111,19 @@ TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa
 
 void
 TAO::CSD::Strategy_Base::servant_activated_event_i
-                                (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
+                                (PortableServer::Servant ,
+                                 const PortableServer::ObjectId& 
                                  ACE_ENV_ARG_DECL)
 {
-  ACE_UNUSED_ARG(servant);
-  ACE_UNUSED_ARG(oid);
   // do nothing.
 }
 
 
 void
 TAO::CSD::Strategy_Base::servant_deactivated_event_i
-                                (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
+                                (PortableServer::Servant,
+                                 const PortableServer::ObjectId&
                                  ACE_ENV_ARG_DECL)
 {
-  ACE_UNUSED_ARG(servant);
-  ACE_UNUSED_ARG(oid);
   // do nothing.
 }
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
index 9650a914a45..3ba637c7baf 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
@@ -34,7 +34,7 @@ class TAO_Root_POA;
 namespace PortableServer
 {
   class POAManager;
-};
+}
 
 
 namespace TAO
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 4d51829d9e4..7ff329f3a3f 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -2909,22 +2909,18 @@ TAO_Root_POA::poa_deactivated_hook ()
 }
 
 void 
-TAO_Root_POA::servant_activated_hook (PortableServer::Servant servant, 
-                                      const PortableServer::ObjectId& oid
+TAO_Root_POA::servant_activated_hook (PortableServer::Servant, 
+                                      const PortableServer::ObjectId&
                                       ACE_ENV_ARG_DECL)
 {
   //no-ops
-  ACE_UNUSED_ARG (servant);
-  ACE_UNUSED_ARG (oid);
 }
 
 void 
-TAO_Root_POA::servant_deactivated_hook (PortableServer::Servant servant, 
-                                        const PortableServer::ObjectId& oid
+TAO_Root_POA::servant_deactivated_hook (PortableServer::Servant, 
+                                        const PortableServer::ObjectId&
                                         ACE_ENV_ARG_DECL)
 {
   //no-ops
-  ACE_UNUSED_ARG (servant);
-  ACE_UNUSED_ARG (oid);
 }
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
index 094def1fb06..071b556b530 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
@@ -8,7 +8,7 @@
 
 
 class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A,
-                public virtual PortableServer::RefCountServantBase
+                public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index 8404d72e382..833f11c8e78 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -9,7 +9,7 @@
 
 class CSD_TP_Foo_B_Export Callback_i
                               : public virtual POA_Callback,
-                                public virtual PortableServer::RefCountServantBase
+                                public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
index c6838db5776..860540807d6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
@@ -8,7 +8,7 @@
 
 
 class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B,
-                public virtual PortableServer::RefCountServantBase
+                public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
index f5de38ef1ce..30d211cca85 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
@@ -8,7 +8,7 @@
 
 
 class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C,
-                public virtual PortableServer::RefCountServantBase
+                public virtual PortableServer::ServantBase
 {
   public:
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
index 9097ddddbb4..e203d01535c 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
@@ -18,7 +18,7 @@
 /// Implement the Test::Hello interface
 class Hello
   : public virtual POA_Test::Hello
-  , public virtual PortableServer::RefCountServantBase
+  , public virtual PortableServer::ServantBase
 {
 public:
   /// Constructor