*** empty log message ***

7 files changed, 44 insertions, 33 deletions

diff --git a/TAO/CIAO/DAnCE/ChangeLog b/TAO/CIAO/DAnCE/ChangeLog
index a94e44c0535..f7779010dd8 100644
--- a/TAO/CIAO/DAnCE/ChangeLog
+++ b/TAO/CIAO/DAnCE/ChangeLog
@@ -1,3 +1,14 @@
+Fri Mar 11 16:46:17 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
+
+        * ciao/Swapping_Servant_Home_Impl_Base.cpp:
+        * ciao/Swapping_Servant_Home_Impl_Base.h:
+        * ciao/Swapping_Servant_Home_Impl_T.cpp:
+        * ciao/Swapping_Servant_Home_Impl_T.h:
+
+          Changed the name of the class Swapping_Servant_Home_Impl
+          to Swapping_Home_Servant_Impl, to follow the naming
+          convention.
+
 Fri Mar 11 13:55:17 2005  Will Otte <wotte@dre.vanderbilt.edu>
 
 	* Config_Handlers/DP_Handler.cpp
@@ -6,7 +17,7 @@ Fri Mar 11 13:55:17 2005  Will Otte <wotte@dre.vanderbilt.edu>
 	* Config_Handlers/PSPE_Handler.cpp
 
 	Some cosmetic fixes and silenced a couple warnings.
-	
+
 	* Config_Handlers/Basic_Deployment_Data.cpp
 	* Config_Handlers/Basic_Deployment_Data.hpp
 	* Config_Handlers/ccd.cpp
@@ -29,7 +40,7 @@ Fri Mar 11 13:55:17 2005  Will Otte <wotte@dre.vanderbilt.edu>
 	New XSC handlers compiled using the soon to be cut 0.6.1 release of XSC.
 
 	This silences a number of warnings from GCC.
-	
+
 Fri Mar 11 16:29:30 (IST) 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* ciao/Container_Base.h:
@@ -46,7 +57,7 @@ Fri Mar 11 16:29:30 (IST) 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu
 	* ciao/Swapping_Container.h:
 	* examples/Hello/Sender/Sender_svnt.cpp.with-connections:
 
-	  Left @@ comments for Jai and some for Gan. 
+	  Left @@ comments for Jai and some for Gan.
 
 Thu Mar 10 13:46:21 2005  Will Otte <wotte@dre.vanderbilt.edu>
 
@@ -54,8 +65,8 @@ Thu Mar 10 13:46:21 2005  Will Otte <wotte@dre.vanderbilt.edu>
 	* XSCRT/ExtendedTypeInfo.ipp
 
 	  Updated the XSCRT runtime to the latest version to fix warnings
-	  in VC7. 
-	
+	  in VC7.
+
 Thu Mar 10 10:29:32 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
 
         * Config_Handlers/BasicSP.cdp:
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_Base.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_Base.cpp
index 67802096476..9f799ae08aa 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_Base.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_Base.cpp
@@ -4,25 +4,25 @@
 
 namespace CIAO
 {
-  Swapping_Servant_Home_Impl_Base::Swapping_Servant_Home_Impl_Base (void)
+  Swapping_Home_Servant_Impl_Base::Swapping_Home_Servant_Impl_Base (void)
   {
     ACE_ASSERT (0);
   }
 
-  Swapping_Servant_Home_Impl_Base::Swapping_Servant_Home_Impl_Base 
+  Swapping_Home_Servant_Impl_Base::Swapping_Home_Servant_Impl_Base 
     (Swapping_Container * c)
     : container_ (c)
   {
   }
 
-  Swapping_Servant_Home_Impl_Base::~Swapping_Servant_Home_Impl_Base (void)
+  Swapping_Home_Servant_Impl_Base::~Swapping_Home_Servant_Impl_Base (void)
   {
   }
 
   // Operations for CCMHome interface.
 
   CORBA::IRObject_ptr
-  Swapping_Servant_Home_Impl_Base::get_component_def (
+  Swapping_Home_Servant_Impl_Base::get_component_def (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -32,7 +32,7 @@ namespace CIAO
   }
 
   CORBA::IRObject_ptr
-  Swapping_Servant_Home_Impl_Base::get_home_def (
+  Swapping_Home_Servant_Impl_Base::get_home_def (
       ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_Base.h b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_Base.h
index 88b3033deca..82860394d32 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_Base.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_Base.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    Swapping_Servant_Home_Impl_Base.h
+ *  @file    Swapping_Home_Servant_Impl_Base.h
  *
  *  $Id$
  *
@@ -28,7 +28,7 @@ namespace CIAO
   class Swapping_Container;
 
   /**
-   * @class Swapping_Servant_Home_Impl_Base
+   * @class Swapping_Home_Servant_Impl_Base
    *
    */
   // @@ Jai, why are you inheriting from "home" here? What is the
@@ -37,15 +37,15 @@ namespace CIAO
   // This is a home implementation and that is why inheriting from
   // "home".
   //
-  class CIAO_SERVER_Export Swapping_Servant_Home_Impl_Base
+  class CIAO_SERVER_Export Swapping_Home_Servant_Impl_Base
     : public virtual POA_Components::CCMHome
   {
   public:
-    explicit Swapping_Servant_Home_Impl_Base (void);
+    explicit Swapping_Home_Servant_Impl_Base (void);
 
-    Swapping_Servant_Home_Impl_Base (Swapping_Container * c);
+    Swapping_Home_Servant_Impl_Base (Swapping_Container * c);
 
-    virtual ~Swapping_Servant_Home_Impl_Base (void);
+    virtual ~Swapping_Home_Servant_Impl_Base (void);
 
     // Operations for CCMHome interface.
     virtual ::CORBA::IRObject_ptr
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
index 45914d68704..df1449af49b 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -16,14 +16,14 @@ namespace CIAO
             typename COMP_EXEC,
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
-  Swapping_Servant_Home_Impl<BASE_SKEL,
+  Swapping_Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     EXEC_VAR,
                     COMP,
                     COMP_VAR,
                     COMP_EXEC,
                     COMP_EXEC_VAR,
-                    COMP_SVNT>::Swapping_Servant_Home_Impl (
+                    COMP_SVNT>::Swapping_Home_Servant_Impl (
       EXEC * exe,
       Session_Container * c, const char* obj_id, const char* repo_id)
     : Home_Servant_Impl_Base (c),
@@ -39,14 +39,14 @@ namespace CIAO
             typename COMP_EXEC,
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
-  Swapping_Servant_Home_Impl<BASE_SKEL,
+  Swapping_Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     EXEC_VAR,
                     COMP,
                     COMP_VAR,
                     COMP_EXEC,
                     COMP_EXEC_VAR,
-                    COMP_SVNT>::~Swapping_Servant_Home_Impl (void)
+                    COMP_SVNT>::~Swapping_Home_Servant_Impl (void)
   {
     const DYNAMIC_SERVANT_MAP_ITERATOR end = 
       this->dynamic_servant_map_.end ();
@@ -75,7 +75,7 @@ namespace CIAO
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   void
-  Swapping_Servant_Home_Impl<BASE_SKEL,
+  Swapping_Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     EXEC_VAR,
                     COMP,
@@ -110,7 +110,7 @@ namespace CIAO
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   Components::CCMObject_ptr
-  Swapping_Servant_Home_Impl<BASE_SKEL,
+  Swapping_Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     EXEC_VAR,
                     COMP,
@@ -137,7 +137,7 @@ namespace CIAO
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   COMP *
-  Swapping_Servant_Home_Impl<BASE_SKEL,
+  Swapping_Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     EXEC_VAR,
                     COMP,
@@ -176,7 +176,7 @@ namespace CIAO
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   COMP *
-  Swapping_Servant_Home_Impl<BASE_SKEL,
+  Swapping_Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     EXEC_VAR,
                     COMP,
@@ -236,7 +236,7 @@ namespace CIAO
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   void
-  Swapping_Servant_Home_Impl<BASE_SKEL,
+  Swapping_Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     EXEC_VAR,
                     COMP,
@@ -264,7 +264,7 @@ namespace CIAO
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
   void
-  Swapping_Servant_Home_Impl<BASE_SKEL,
+  Swapping_Home_Servant_Impl<BASE_SKEL,
                     EXEC,
                     EXEC_VAR,
                     COMP,
diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
index 6834c2050b9..a248588df67 100644
--- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.h
@@ -48,17 +48,17 @@ namespace CIAO
             typename COMP_EXEC,
             typename COMP_EXEC_VAR,
             typename COMP_SVNT>
-  class Swapping_Servant_Home_Impl
+  class Swapping_Home_Servant_Impl
     : public virtual BASE_SKEL,
       public virtual Home_Servant_Impl_Base,
       public virtual PortableServer::RefCountServantBase
   {
   public:
-    Swapping_Servant_Home_Impl (EXEC * exe,
+    Swapping_Home_Servant_Impl (EXEC * exe,
                        Session_Container * c,
                        const char* obj_id, const char* repo_id);
 
-    virtual ~Swapping_Servant_Home_Impl (void);
+    virtual ~Swapping_Home_Servant_Impl (void);
 
     // Operations for CCMHome interface.
 
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.h.with-connections b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.h.with-connections
index 553ce363740..a112ec5883b 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.h.with-connections
+++ b/TAO/CIAO/DAnCE/examples/Hello/Receiver/Receiver_svnt.h.with-connections
@@ -319,7 +319,7 @@ namespace Receiver_Impl
   namespace CIAO_GLUE_Hello
   {
     class RECEIVER_SVNT_Export ReceiverHome_Servant
-      : public virtual CIAO::Swapping_Servant_Home_Impl<
+      : public virtual CIAO::Swapping_Home_Servant_Impl<
           POA_Hello::ReceiverHome,
           ::Hello::CCM_ReceiverHome,
           ::Hello::CCM_ReceiverHome_var,
@@ -332,7 +332,7 @@ namespace Receiver_Impl
     {
       public:
       /// Hack for VC6.
-      typedef CIAO::Swapping_Servant_Home_Impl<
+      typedef CIAO::Swapping_Home_Servant_Impl<
           POA_Hello::ReceiverHome,
           ::Hello::CCM_ReceiverHome,
           ::Hello::CCM_ReceiverHome_var,
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.h.with-connections b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.h.with-connections
index b6d834eba77..344aa400ae7 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.h.with-connections
+++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.h.with-connections
@@ -344,7 +344,7 @@ namespace Sender_Impl
   namespace CIAO_GLUE_Hello
   {
     class SENDER_SVNT_Export SenderHome_Servant
-      : public virtual CIAO::Swapping_Servant_Home_Impl<
+      : public virtual CIAO::Swapping_Home_Servant_Impl<
           POA_Hello::SenderHome,
           ::Hello::CCM_SenderHome,
           ::Hello::CCM_SenderHome_var,
@@ -357,7 +357,7 @@ namespace Sender_Impl
     {
       public:
       /// Hack for VC6.
-      typedef CIAO::Swapping_Servant_Home_Impl<
+      typedef CIAO::Swapping_Home_Servant_Impl<
           POA_Hello::SenderHome,
           ::Hello::CCM_SenderHome,
           ::Hello::CCM_SenderHome_var,