ChangelogTag: Tue Sep 6 11:32:31 2005 Arvind S. Krishna <arvindk@dre.vanderbilt.edu>

6 files changed, 52 insertions, 7 deletions

diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index 40dd4334807..26312ebd79f 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -31,8 +31,8 @@ class ACE_Lock;
 class ACE_Event_Handler;
 
 /*
- * Hook to specialize the connection handler with the 
- * concrete connection handler implementation. 
+ * Hook to specialize the connection handler with the
+ * concrete connection handler implementation.
  */
 //@@ CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
 
@@ -184,7 +184,7 @@ private:
   ACE_Lock * lock_;
 
   /*
-   * Hook to add instance members from derived class 
+   * Hook to add instance members from derived class
    * onto base Connection_Handler class. Any further
    * additions to this class should go before this
    * hook.
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index b8f359ab072..35b3f7348de 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -1,3 +1,7 @@
+/*
+ * Hook to copy all include and forward declarations.
+ */
+//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
 #include "tao/IIOP_Acceptor.h"
 #include "tao/IIOP_Profile.h"
 #include "tao/MProfile.h"
@@ -16,6 +20,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/os_include/os_netdb.h"
 
+//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END
 
 ACE_RCSID (tao,
            IIOP_Acceptor,
@@ -39,6 +44,9 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag)
 {
 }
 
+
+//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
+
 TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
 {
   // Make sure we are closed before we start destroying the
@@ -1162,3 +1170,5 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
     }
   return 0;
 }
+
+//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 1e56680f1b7..7aead095560 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -42,6 +42,13 @@
 class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
 {
 public:
+
+  /*
+   * Hook that marks begining of all concrete i.e. non virtual 
+   * methods implemented in IIOP_Acceptor class.
+   */
+  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START
+
   /// Constructor.
   TAO_IIOP_Acceptor (CORBA::Boolean flag = 0);
 
@@ -60,6 +67,8 @@ public:
   typedef TAO_Concurrency_Strategy<TAO_IIOP_Connection_Handler> CONCURRENCY_STRATEGY;
   typedef TAO_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> ACCEPT_STRATEGY;
 
+  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END
+
   /**
    * The TAO_Acceptor methods, check the documentation in
    * Transport_Acceptor.h for details.
@@ -85,6 +94,7 @@ public:
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO::ObjectKey &key);
 
+  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_START
   /**
    * Set the host name for the given addr.
    * A hostname may be forced by using specified_hostname.  This
@@ -169,7 +179,9 @@ protected:
   int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
+  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END
 
+  //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_START
 protected:
 
   /// Array of ACE_INET_Addr instances, each one corresponding to a
@@ -224,6 +236,7 @@ private:
   CONCURRENCY_STRATEGY *concurrency_strategy_;
   ACCEPT_STRATEGY *accept_strategy_;
 
+  //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index e2c3957dde0..7ce92592394 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -52,6 +52,12 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core
 {
 }
 
+/* Copy hook that copies over the concrete methods from this class
+ * to the base Connection_Handler class as a part of the specialization
+ * process. Add all concrete and virtual
+ * methods implemented in this class within this hook.
+ */
+//@@ CONNECTION_HANDLER_SPL_COPY_HOOK_START
 TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
 {
   delete this->transport ();
@@ -450,3 +456,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
 
   return 0;
 }
+//@@ CONNECTION_HANDLER_SPL_COPY_HOOK_END
+/*
+ * End copy hook
+ */
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index e127e4ec055..dcf58c46328 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -18,7 +18,11 @@ ACE_RCSID (tao,
            IIOP_Connector,
            "$Id$")
 
+TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
+{
+}
 
+//@@ TAO_TRANSPORT_SPL_COPY_HOOK_START
 TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (IOP::TAG_INTERNET_IOP)
   , lite_flag_ (flag)
@@ -27,10 +31,6 @@ TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag)
 {
 }
 
-TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
-{
-}
-
 int
 TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
@@ -395,3 +395,4 @@ TAO_IIOP_Connector::cancel_svc_handler (
 
   return -1;
 }
+//@@ TAO_TRANSPORT_SPL_COPY_HOOK_END
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 2f7d91f769c..1dc05e5d7fa 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -67,6 +67,7 @@ public:
 
 public:
 
+  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_START
   typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
           TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY;
 
@@ -80,6 +81,7 @@ public:
   typedef ACE_Strategy_Connector<TAO_IIOP_Connection_Handler,
                                  ACE_SOCK_CONNECTOR>
           TAO_IIOP_BASE_CONNECTOR;
+  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_END
 
 protected:
 
@@ -98,6 +100,12 @@ protected:
   /// Cancel the passed cvs handler from the connector
   virtual int cancel_svc_handler (TAO_Connection_Handler * svc_handler);
 
+/*
+ * Hook to copy over the protected and private data from this class to
+ * base Connector class.
+ */
+//@@ TAO_CONNECTOR_SPL_COPY_HOOK_START
+
 protected:
 
   /// Do we need to use a GIOP_Lite for sending messages?
@@ -115,6 +123,9 @@ private:
 
   /// The connector initiating connection requests for IIOP.
   TAO_IIOP_BASE_CONNECTOR base_connector_;
+
+//@@ TAO_CONNECTOR_SPL_COPY_HOOK_END
+
 };