Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO into master

31 files changed, 0 insertions, 405 deletions

diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 728338137c6..ac9a0a4f01c 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -11,8 +11,6 @@
 #include "ace/os_include/sys/os_socket.h"
 #include "ace/Svc_Handler.h"
 
-//@@ CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 #include "tao/Connection_Handler.inl"
 #endif /* __ACE_INLINE__ */
@@ -33,7 +31,6 @@ TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
 
 TAO_Connection_Handler::~TAO_Connection_Handler (void)
 {
-  //@@ CONNECTION_HANDLER_DESTRUCTOR_ADD_HOOK
 }
 
 int
@@ -418,15 +415,6 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh)
   return 1;
 }
 
-/*
- * Comment hook to comment the base class implementations
- * that do nothing. Specialized versions from derived
- * class will directly override these methods. Add
- * all methods that are virtual, have do nothing implementations
- * within this hook for later specialization.
- */
-//@@ CONNECTION_HANDLER_SPL_COMMENT_HOOK_START
-
 int
 TAO_Connection_Handler::set_dscp_codepoint (CORBA::Boolean)
 {
@@ -445,8 +433,6 @@ TAO_Connection_Handler::release_os_resources (void)
   return 0;
 }
 
-//@@ CONNECTION_HANDLER_SPL_COMMENT_HOOK_END
-
 void
 TAO_Connection_Handler::pre_io_hook (int &)
 {
@@ -477,6 +463,4 @@ TAO_Connection_Handler::close_handler (u_long)
   return 0;
 }
 
-//@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index a76506d7ceb..6e7c768030a 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -33,12 +33,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Core;
 class TAO_Transport;
 
-/*
- * Hook to specialize the connection handler with the
- * concrete connection handler implementation.
- */
-//@@ CONNECTION_HANDLER_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class TAO_Connection_Handler
  *
@@ -132,13 +126,6 @@ public:
 
   virtual int handle_write_ready (const ACE_Time_Value *timeout);
 
-  /*
-   * Hook to add public methods from concrete connection handler
-   * implementation onto the base connection handler.
-   */
-
-   //@@ CONNECTION_HANDLER_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// Return our TAO_ORB_Core pointer
   TAO_ORB_Core *orb_core (void);
@@ -208,19 +195,8 @@ private:
   /// Once closed make sure the transport is not added back to the cache.
   /// This is distinct from the leader-follower state so it cannot be reset.
   bool is_closed_;
-
-  /*
-   * Hook to add instance members from derived class
-   * onto base Connection_Handler class. Any further
-   * additions to this class should go before this
-   * hook.
-   */
-  //@@ CONNECTION_HANDLER_SPL_PRIVATE_DATA_ADD_HOOK
 };
 
-//@@ CONNECTION_HANDLER_SPL_EXTERN_ADD_HOOK
-
-
 /**
  * @class TAO_Auto_Reference
  *
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index a6c8dc8b242..f143c25b53e 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -69,6 +69,4 @@ TAO_Connection_Handler::handle_write_ready (const ACE_Time_Value *)
   return 0;
 }
 
-//@@ CONNECTION_HANDLER_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Endpoint.cpp b/TAO/tao/Endpoint.cpp
index 7142c6ab8fe..f6bd16c9dd0 100644
--- a/TAO/tao/Endpoint.cpp
+++ b/TAO/tao/Endpoint.cpp
@@ -20,5 +20,3 @@ TAO_Endpoint::next_filtered (TAO_ORB_Core *, TAO_Endpoint *root)
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
-
-//@@ TAO_ENDPOINT_SPL_METHODS_ADD_HOOK
diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h
index 130f465c02d..f4a943177b9 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -28,12 +28,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 
-/*
- * Includes and forward decls for specializing TAO's
- * endpoint implementation.
- */
-//@@ TAO_ENDPOINT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class TAO_Endpoint
  *
@@ -119,12 +113,6 @@ public:
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (void)  = 0;
 
-  /*
-   * Hook to add public methods from derived class onto base
-   * Endpoint class.
-   */
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// Lock for the address lookup.
   /**
@@ -150,20 +138,11 @@ protected:
   CORBA::Short priority_;
 
 private:
-
   /// Endpoints should not be copied.
   TAO_Endpoint (const TAO_Endpoint&);
   void operator= (const TAO_Endpoint&);
-
-  /*
-   * Addition of private members from derived class.
-   */
-  //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_ADD_HOOK
-
 };
 
-//@@ TAO_ENDPOINT_SPL_EXTERN_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 355b3190fb8..b680dbe26e5 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -14,11 +14,6 @@
 #include "tao/ZIOP_Adapter.h"
 #include "ace/Min_Max.h"
 
-/*
- * Hook to add additional include files during specializations.
- */
-//@@ GIOP_MESSAGE_BASE_INCLUDE_ADD_HOOK
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
@@ -980,21 +975,12 @@ TAO_GIOP_Message_Base::process_request (
 
       CORBA::Object_var forward_to;
 
-      /*
-       * Hook to specialize request processing within TAO
-       * This hook will be replaced by specialized request
-       * processing implementation.
-       */
-//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_START
-
       // Do this before the reply is sent.
       this->orb_core_->request_dispatcher ()->dispatch (
           this->orb_core_,
           request,
           forward_to);
 
-//@@ TAO_DISPATCH_RESOLUTION_OPT_COMMENT_HOOK_END
-
       if (request.is_forwarded ())
         {
           CORBA::Boolean const permanent_forward_condition =
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 3e5dd1f6c97..f0c6bffd560 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -1,7 +1,3 @@
-/*
- * Hook to copy all include and forward declarations.
- */
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
 #include "tao/IIOP_Acceptor.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -53,8 +49,6 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
 #endif /* ACE_HAS_IPV6 && ACE_USES_IPV4_IPV6_MIGRATION */
 }
 
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END
-
 TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
 {
   // Make sure we are closed before we start destroying the
@@ -75,8 +69,6 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
   delete [] this->hostname_in_ior_;
 }
 
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
-
 // TODO =
 //    2) For V1.[1,2] there are tagged components
 int
@@ -1272,5 +1264,3 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
-
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index cd8883ff27b..361580a4f40 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -45,13 +45,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
 {
 public:
-
-  /*
-   * Hook that marks beginning 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 (void);
 
@@ -76,8 +69,6 @@ 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.
@@ -103,7 +94,6 @@ 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 @a addr.
    * A hostname may be forced by using @a specified_hostname.  This
@@ -127,7 +117,6 @@ public:
                         const char *specified_hostname = 0);
 
 protected:
-
   /**
    * Helper method
    * Clear out 'addr' & 'specified_hostname' and initialize them based
@@ -208,15 +197,12 @@ protected:
   int create_shared_profile (const TAO::ObjectKey &object_key,
                              TAO_MProfile &mprofile,
                              CORBA::Short priority);
-  //@@ TAO_ACCEPTOR_SPL_CONCRETE_METHODS_COPY_HOOK_END
 
 private:
   void operator= (const TAO_IIOP_Acceptor &);
   TAO_IIOP_Acceptor (const TAO_IIOP_Acceptor &);
 
-  //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_START
 protected:
-
   /// Array of ACE_INET_Addr instances, each one corresponding to a
   /// given network interface.
   ACE_INET_Addr *addrs_;
@@ -263,7 +249,6 @@ protected:
   ACE_INET_Addr default_address_;
 
 private:
-
   /// The concrete acceptor, as a pointer to it's base class.
   BASE_ACCEPTOR base_acceptor_;
 
@@ -271,8 +256,6 @@ private:
   CREATION_STRATEGY *creation_strategy_;
   CONCURRENCY_STRATEGY *concurrency_strategy_;
   ACCEPT_STRATEGY *accept_strategy_;
-
-  //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_COPY_HOOK_END
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 552eff0856b..e5831f43aa4 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -120,13 +120,6 @@ TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
     }
 }
 
-/* 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
-
 int
 TAO_IIOP_Connection_Handler::open_handler (void *v)
 {
@@ -690,12 +683,6 @@ TAO_IIOP_Connection_Handler::handle_write_ready (const ACE_Time_Value *timeout)
   return ACE::handle_write_ready (this->peer ().get_handle (), timeout);
 }
 
-
-//@@ CONNECTION_HANDLER_SPL_COPY_HOOK_END
-/*
- * End copy hook
- */
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 0992972b9d7..b7cc8127aab 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -83,7 +83,6 @@ TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
 {
 }
 
-//@@ TAO_CONNECTOR_SPL_COPY_HOOK_START
 TAO_IIOP_Connector::TAO_IIOP_Connector (void)
   : TAO_Connector (IOP::TAG_INTERNET_IOP)
   , connect_strategy_ ()
@@ -788,8 +787,6 @@ TAO_IIOP_Connector::cancel_svc_handler (
   return -1;
 }
 
-//@@ TAO_CONNECTOR_SPL_COPY_HOOK_END
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index c0de19a25d0..1ecabbcf012 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -67,9 +67,6 @@ public:
   virtual char object_key_delimiter (void) const;
 
 public:
-
-  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_START
-
   typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
           TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY;
 
@@ -83,7 +80,6 @@ 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:
   /// A flag indicating the actual connector supports parallel
@@ -113,12 +109,6 @@ 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
-
 private:
   /// This is the first half of making a connection. Both make_connection
   /// and make_parallel_connection will start out using begin_connection.
@@ -146,15 +136,11 @@ private:
   TAO_IIOP_Endpoint *remote_endpoint (TAO_Endpoint *ep);
 
 private:
-
   /// Our connect strategy
   TAO_IIOP_CONNECT_STRATEGY connect_strategy_;
 
   /// The connector initiating connection requests for IIOP.
   TAO_IIOP_BASE_CONNECTOR base_connector_;
-
-//@@ TAO_CONNECTOR_SPL_COPY_HOOK_END
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index ee036dfc7e3..b30580fc28e 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -1,10 +1,4 @@
 // -*- C++ -*-
-/*
- * Add all include files within the following
- * two markers.
- */
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
-
 #include "tao/IIOP_Endpoint.h"
 
 #if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
@@ -31,11 +25,8 @@
 #include "ace/INET_Addr.h"
 #include "ace/Sock_Connect.h"
 
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const ACE_INET_Addr &addr,
                                       int use_dotted_decimal_addresses)
   : TAO_Endpoint (IOP::TAG_INTERNET_IOP)
@@ -104,8 +95,6 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
 {
   this->host(host); // With IPv6 performs check for decimal address
 }
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
-
 
 TAO_IIOP_Endpoint &
 TAO_IIOP_Endpoint::operator= (const TAO_IIOP_Endpoint &other)
@@ -130,8 +119,6 @@ TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint (void)
 {
 }
 
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
-
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs)
   : TAO_Endpoint (rhs.tag_, rhs.priority_)
   , host_ (rhs.host_)
@@ -634,8 +621,6 @@ TAO_IIOP_Endpoint::preferred_network (void) const
   return this->preferred_path_.host.in ();
 }
 
-//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* TAO_HAS_IIOP && TAO_HAS_IIOP != 0 */
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index 47db490ef26..4279c0fa733 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -45,8 +45,6 @@ class TAO_IIOP_Profile;
 class TAO_Export TAO_IIOP_Endpoint : public TAO_Endpoint
 {
 public:
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START
-
   // @todo Lose these friends!
   friend class TAO_IIOP_Profile;
   friend class TAO_SSLIOP_Profile;
@@ -70,9 +68,6 @@ public:
                      CORBA::UShort port,
                      CORBA::Short priority);
 
-
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_END
-
   /// Destructor.
   ~TAO_IIOP_Endpoint (void);
 
@@ -113,12 +108,6 @@ public:
 
   // = IIOP_Endpoint-specific methods.
 
-  /*
-   * Hook to copy only the non virtual concrete methods implemented
-   * in this class to the derived class in the specialization.
-   */
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START
-
   /// Return a reference to the <object_addr>.
   const ACE_INET_Addr &object_addr (void) const;
 
@@ -147,9 +136,6 @@ public:
   bool is_ipv6_decimal (void) const;
 #endif /* ACE_HAS_IPV6 */
 
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_END
-
-
   /// Need to have an assignment operator since the IIOP_Profile class may
   /// have to reorder its list of endpoints based on filtering by the EndpointPolicy.
   TAO_IIOP_Endpoint & operator= (const TAO_IIOP_Endpoint& other);
@@ -169,9 +155,6 @@ private:
                                       bool prefer_ipv6,
                                       bool want_ipv6);
 
-
-  //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_START
-
   /// Helper method for setting INET_Addr.
   int set (const ACE_INET_Addr &addr,
            int use_dotted_decimal_addresses);
@@ -228,8 +211,6 @@ private:
   /// IIOP Endpoints can be strung into a list.  Return the next
   /// endpoint in the list, if any.
   TAO_IIOP_Endpoint *next_;
-
-  //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_END
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index fee07e0b832..975605b0641 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -32,8 +32,6 @@ TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
     }
 }
 
-//@@ TAO_PROFILE_SPL_COPY_HOOK_START
-
 const char TAO_IIOP_Profile::object_key_delimiter_ = '/';
 
 char
@@ -42,8 +40,6 @@ TAO_IIOP_Profile::object_key_delimiter (void) const
   return TAO_IIOP_Profile::object_key_delimiter_;
 }
 
-//@@ TAO_PROFILE_SPL_COPY_HOOK_END
-
 TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr &addr,
                                     const TAO::ObjectKey &object_key,
                                     const TAO_GIOP_Message_Version &version,
@@ -86,7 +82,6 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (TAO_ORB_Core *orb_core)
 {
 }
 
-//@@ TAO_PROFILE_SPL_COPY_HOOK_START
 int
 TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr)
 {
@@ -846,7 +841,6 @@ TAO_IIOP_Profile::decode_endpoints (void)
 
   return 0;
 }
-//@@ TAO_PROFILE_SPL_COPY_HOOK_END
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index b4a0a10b527..9c72d78a0c7 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -42,8 +42,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Export TAO_IIOP_Profile : public TAO_Profile
 {
 public:
-
-  //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_START
   static const char object_key_delimiter_;
 
   /// Return the char string prefix.
@@ -87,8 +85,6 @@ public:
   /// Add an endpoint when the specific endpoint type is unknown
   virtual void add_generic_endpoint (TAO_Endpoint *ep);
 
-  //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_END
-
   /// The object key delimiter that IIOP uses or expects.
   virtual char object_key_delimiter (void) const;
 
@@ -130,13 +126,8 @@ protected:
    * encapsulation of a sequence of structs, each representing a
    * single endpoint.  Data format is specified in iiop_endpoins.pidl.
    */
-
-  //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_COPY_HOOK_START
-
   int encode_endpoints_for_rt (void);
 
-  //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_COPY_HOOK_END
-
   /// Template methods. Please see Profile.h for the documentation.
   virtual int decode_profile (TAO_InputCDR &cdr);
   virtual int decode_endpoints (void);
@@ -176,9 +167,6 @@ protected:
    * <encode_endpoints> method documentation above for how the rest of
    * the endpoint list is transmitted.
    */
-
-  //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_START
-
   TAO_IIOP_Endpoint endpoint_;
 
   /// For efficient insertion at the end of the list
@@ -186,8 +174,6 @@ protected:
 
   /// Number of endpoints in the list headed by <endpoint_>.
   CORBA::ULong count_;
-
-  //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_END
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 9e9318f8489..d9f835c81bc 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -31,16 +31,6 @@ TAO_IIOP_Transport::~TAO_IIOP_Transport (void)
 {
 }
 
-/*
- * Hook to copy over all concrete implementations
- * of Transport class from this class to the base
- * class as a part of the specialization.
- * All enhancements to the IIOP_Transport
- * class, i.e., addition of new concrete non virtual
- * methods should be added within this hook.
- */
-
-//@@ TAO_TRANSPORT_SPL_COPY_HOOK_START
 ACE_Event_Handler *
 TAO_IIOP_Transport::event_handler_i (void)
 {
@@ -436,10 +426,6 @@ TAO_IIOP_Transport::get_listen_point (
     }
   return 1;
 }
-//@@ TAO_TRANSPORT_SPL_COPY_HOOK_END
-/*
- * End of copy hook.
- */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 2824458e957..9bd8738a623 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -29,8 +29,6 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-//@@ TAO_SERVANT_BASE_INCLUDE_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 # include "tao/PortableServer/Servant_Base.inl"
 #endif /* ! __ACE_INLINE__ */
@@ -569,12 +567,6 @@ TAO_ServantBase::synchronous_upcall_dispatch (
       // case.
       skel (req, servant_upcall, derived_this);
 
-      /*
-       * Dispatch resolution specialization add hook.
-       * Over-ridden with code to handle optimized dispatch.
-       */
-      //@@ TAO_DISPATCH_RESOLUTION_OPT_ADD_HOOK
-
       // It is our job to send the already marshaled reply, but only
       // send if it is expected and it has not already been sent
 
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 2c332b8fb03..d7a4376cc73 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -65,8 +65,6 @@ TAO_Profile::~TAO_Profile (void)
     }
 
   this->orb_core_->object_key_table ().unbind (this->ref_object_key_);
-
-  //@@ TAO_PROFILE_SPL_DESTRUCTOR_ADD_HOOK
 }
 
 void
@@ -728,13 +726,6 @@ TAO_Profile::hash_service_i (CORBA::ULong m)
   return this->orb_core_->hash_service (this, m);
 }
 
-/*
- * Hook to comment out no op method
- * in the base class that is specialized in the
- * derived class.
- */
-//@@ TAO_PROFILE_SPL_COMMENT_HOOK_START
-
 int
 TAO_Profile::encode_alternate_endpoints(void)
 {
@@ -753,10 +744,6 @@ TAO_Profile::remove_generic_endpoint (TAO_Endpoint *)
   // default for virtual methods, thus a no-op
 }
 
-//@@ TAO_PROFILE_SPL_COMMENT_HOOK_END
-
-//@@ TAO_PROFILE_SPL_METHODS_ADD_HOOK
-
 // ****************************************************************
 
 TAO_Unknown_Profile::TAO_Unknown_Profile (CORBA::ULong tag,
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 88423d1657e..c1d2f4ed21a 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -273,8 +273,6 @@ public:
   virtual CORBA::ULong hash (CORBA::ULong max) = 0;
   //@}
 
-  //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// If you have a virtual method you need a virtual dtor.
   virtual ~TAO_Profile (void);
@@ -347,10 +345,7 @@ private:
   TAO_Profile (const TAO_Profile&);
   void operator= (const TAO_Profile&);
 
-  //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_ADD_HOOK
-
 protected:
-
   /// IIOP version number.
   TAO_GIOP_Message_Version version_;
 
@@ -396,15 +391,10 @@ private:
   /// Having (tagged_profile_ != 0) doesn't mean yet that
   /// tagged_profile_ building is finished.
   bool tagged_profile_created_;
-
-  //@@ TAO_PROFILE_SPL_PRIVATE_DATA_ADD_HOOK
 };
 
-//@@ TAO_PROFILE_SPL_EXTERN_ADD_HOOK
-
 // A helper class to handle the various kinds of octet sequences used
 // inside the ORB.
-
 typedef TAO::unbounded_value_sequence<CORBA::Octet> TAO_opaque;
 
 TAO_Export CORBA::Boolean
@@ -462,8 +452,6 @@ private:
   TAO_opaque body_;
 };
 
-//@@ TAO_PROFILE_SPL_EXTERN_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index d2243029e0d..b4fdb54c24b 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -424,7 +424,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
   // get a timer queue (or not) from a possibly configured
   // time policy
   TAO_RSF_Timer_Queue_Ptr tmq (*this, this->create_timer_queue ());
-//@@ TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_START
   switch (this->reactor_type_)
     {
     case TAO_REACTOR_SELECT_MT:
@@ -496,8 +495,6 @@ TAO_Advanced_Resource_Factory::allocate_reactor_impl (void) const
       break;
     }
 
-//@@ TAO_ADVANCED_RESOURCE_REACTOR_SPL_COMMENT_HOOK_END
-
   // safe to release timer queue
   tmq.release ();
   return impl;
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 37b2c37a234..6978e847a7b 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -33,12 +33,6 @@
 #include "ace/CORBA_macros.h"
 #include "ace/Truncate.h"
 
-/*
- * Specialization hook to add include files from
- * concrete transport implementation.
- */
-//@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Transport.inl"
 #endif /* __ACE_INLINE__ */
@@ -183,14 +177,6 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
                     TAO::Transport::Stats,
                     CORBA::NO_MEMORY ());
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-
-  /*
-   * Hook to add code that initializes components that
-   * belong to the concrete protocol implementation.
-   * Further additions to this Transport class will
-   * need to add code *before* this hook.
-   */
-  //@@ TAO_TRANSPORT_SPL_CONSTRUCTOR_ADD_HOOK
 }
 
 TAO_Transport::~TAO_Transport (void)
@@ -232,14 +218,6 @@ TAO_Transport::~TAO_Transport (void)
 #if TAO_HAS_TRANSPORT_CURRENT == 1
   delete this->stats_;
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-
-  /*
-   * Hook to add code that cleans up components
-   * belong to the concrete protocol implementation.
-   * Further additions to this Transport class will
-   * need to add code *before* this hook.
-   */
-  //@@ TAO_TRANSPORT_SPL_DESTRUCTOR_ADD_HOOK
 }
 
 void
@@ -276,16 +254,6 @@ TAO_Transport::idle_after_reply (void)
   return this->tms ()->idle_after_reply ();
 }
 
-/*
- * A concrete transport class specializes this
- * method. This hook allows commenting this function
- * when TAO's transport is specialized. Note: All
- * functions that have an implementation that does
- * nothing should be added within this hook to
- * enable specialization.
- */
-//@@ TAO_TRANSPORT_SPL_COMMENT_HOOK_START
-
 int
 TAO_Transport::tear_listen_point_list (TAO_InputCDR &)
 {
@@ -320,8 +288,6 @@ TAO_Transport::send_message_shared (TAO_Stub *stub,
   return result;
 }
 
-//@@ TAO_TRANSPORT_SPL_COMMENT_HOOK_END
-
 bool
 TAO_Transport::post_connect_hook (void)
 {
@@ -2926,11 +2892,4 @@ TAO_Transport::connection_closed_on_read (void) const
   return connection_closed_on_read_;
 }
 
-/*
- * Hook to add concrete implementations from the derived class onto
- * TAO's transport.
- */
-
-//@@ TAO_TRANSPORT_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index ea7f68d4c96..f97848540da 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -147,11 +147,6 @@ namespace TAO
   }
 }
 
-/*
- * Specialization hook for the TAO's transport implementation.
- */
-//@@ TAO_TRANSPORT_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class TAO_Transport
  *
@@ -666,13 +661,6 @@ public:
 
   virtual void set_bidir_context_info (TAO_Operation_Details &opdetails);
 
-  /*
-   * Specialization hook to add public methods from
-   * concrete transport implementations to TAO's transport
-   * class
-   */
-  //@@ TAO_TRANSPORT_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   virtual TAO_Connection_Handler * connection_handler_i (void) = 0;
 
@@ -1077,8 +1065,6 @@ private:
    * TAO's protocol implementation onto the base Transport class
    */
 
-  //@@ TAO_TRANSPORT_SPL_PRIVATE_METHODS_ADD_HOOK
-
 protected:
   /// IOP protocol tag.
   CORBA::ULong const tag_;
@@ -1235,22 +1221,8 @@ private:
 
   /// lock for synchronizing Transport OutputCDR access
   mutable TAO_SYNCH_MUTEX output_cdr_mutex_;
-
-  /*
-   * specialization hook to add class members from concrete
-   * transport class onto the base transport class. Please
-   * add any private members to this class *before* this hook.
-   */
-  //@@ TAO_TRANSPORT_SPL_DATA_MEMBERS_ADD_HOOK
 };
 
-/*
- * Hook to add external typedefs and specializations to
- * TAO's transport implementation.
- */
-
-//@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 namespace TAO
 {
diff --git a/TAO/tao/Transport_Acceptor.cpp b/TAO/tao/Transport_Acceptor.cpp
index 3ef9deb8982..1a1a9a5577d 100644
--- a/TAO/tao/Transport_Acceptor.cpp
+++ b/TAO/tao/Transport_Acceptor.cpp
@@ -17,8 +17,6 @@ TAO_Acceptor::TAO_Acceptor (CORBA::ULong tag)
 
 TAO_Acceptor::~TAO_Acceptor (void)
 {
-
-  //@@ TAO_ACCEPTOR_DESTRUCTOR_ADD_HOOK
 }
 
 int
@@ -89,6 +87,4 @@ TAO_Acceptor::handle_expiration (ACE_Event_Handler* base_acceptor)
   return 0;
 }
 
-//@@ TAO_ACCEPTOR_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index 984ad333825..1d8ba921d3f 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -48,8 +48,6 @@ namespace TAO
   class ObjectKey;
 }
 
-//@@ TAO_ACCEPTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 // ****************************************************************
 
 /// The TAO-specific OMG assigned value for the TAG_ORB_TYPE tagged
@@ -148,23 +146,11 @@ public:
   /// into the reactor to try accepting again.
   int handle_expiration (ACE_Event_Handler* base_acceptor);
 
-  /*
-   * Hook to add public methods from derived acceptor classes onto
-   * this class.
-   */
-  //@@ TAO_ACCEPTOR_SPL_PUBLIC_METHODS_ADD_HOOK
-
 private:
   /// IOP protocol tag.
   CORBA::ULong const tag_;
 
   time_t error_retry_delay_;
-
-  /*
-   * Hook to add data members from concrete acceptor implementations onto
-   * the base class.
-   */
-  //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_ADD_HOOK
 };
 
 /// This is a drop-in replacement class for the ACE_Strategy_Acceptor.
@@ -201,8 +187,6 @@ private:
   TAO_Acceptor* acceptor_;
 };
 
-//@@ TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp
index e76ebe93340..5dbd85887e6 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -18,8 +18,6 @@
 
 #include "ace/OS_NS_string.h"
 
-//@@ TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Transport_Connector.inl"
 #endif /* __ACE_INLINE__ */
@@ -1090,6 +1088,4 @@ TAO_Connector::check_connection_closure (
   return result;
 }
 
-//@@ TAO_CONNECTOR_SPL_METHODS_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h
index 292f451b3b7..b8aa3702d0e 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -45,12 +45,6 @@ namespace TAO
   class Profile_Transport_Resolver;
 }
 
-/*
- * Hook to add includes and forward declaration
- * to the Connector class.
- */
-//@@ TAO_CONNECTOR_SPL_INCLUDE_FORWARD_DECL_ADD_HOOK
-
 /**
  * @class TAO_Connector
  *
@@ -123,8 +117,6 @@ public:
   /// Return the object key delimiter to use or expect.
   virtual char object_key_delimiter (void) const = 0;
 
-  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_ADD_HOOK
-
 protected:
   /// A flag indicating the actual connector supports parallel connection
   /// attempts. The base implementation always returns 0. Override to return
@@ -216,23 +208,17 @@ protected:
   TAO_ORB_Core *orb_core (void);
 
 protected:
-
   /// The (a)synch connect strategy
   TAO_Connect_Strategy *active_connect_strategy_;
 
 private:
-
   /// IOP protocol tag.
   CORBA::ULong const tag_;
 
   /// Pointer to our ORB core
   TAO_ORB_Core *orb_core_;
-
-  //@@ TAO_CONNECTOR_SPL_PRIVATE_DATA_ADD_HOOK
 };
 
-//@@ TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index de6873224f4..4b672c8204d 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -17,14 +17,6 @@ TAO_Wait_On_Leader_Follower::~TAO_Wait_On_Leader_Follower (void)
 {
 }
 
-/*
- * Hook to specialize the wait strategy when the concrete strategy is
- * a simple "lf" strategy. Add all public/protected/private methods
- * within the *COPY* hooks.
- */
-
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
-
 int
 TAO_Wait_On_Leader_Follower::register_handler (void)
 {
@@ -52,8 +44,6 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
       this->transport_->register_handler ();
     }
 
-  // Send the request.
-//@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
   return this->TAO_Wait_Strategy::sending_request (orb_core, msg_semantics);
 }
 
@@ -72,9 +62,4 @@ TAO_Wait_On_Leader_Follower::can_process_upcalls (void) const
   return true;
 }
 
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_END
-/*
- * End copy hook.
- */
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index f2cc92134e3..7bc3f96ef1a 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -20,14 +20,6 @@ TAO_Wait_On_Read::~TAO_Wait_On_Read (void)
 {
 }
 
-/*
- * Hook to specialize the wait strategy when the concrete strategy is
- * a simple "rw" strategy. Add all public/protected/private methods
- * within the *COPY* hooks.
- */
-
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
-
 int
 TAO_Wait_On_Read::sending_request (TAO_ORB_Core *orb_core,
                                    TAO_Message_Semantics msg_semantics)
@@ -49,7 +41,6 @@ TAO_Wait_On_Read::sending_request (TAO_ORB_Core *orb_core,
     }
 
   // Send the request.
-//@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
   return this->TAO_Wait_Strategy::sending_request (orb_core, msg_semantics);
 }
 
@@ -68,7 +59,6 @@ TAO_Wait_On_Read::finished_request ()
       }
     }
 
-  //@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
     this->TAO_Wait_Strategy::finished_request ();
 }
 
@@ -174,9 +164,4 @@ TAO_Wait_On_Read::can_process_upcalls (void) const
   return true;
 }
 
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_END
-/*
- * End copy hook.
- */
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index efb90ca1103..4efe9ce0fe4 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -1,7 +1,5 @@
 #include "tao/Wait_Strategy.h"
 
-//@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Wait_Strategy.inl"
 #endif /* __ACE_INLINE__ */
@@ -26,25 +24,15 @@ TAO_Wait_Strategy::defer_upcall (ACE_Event_Handler*)
   return -1;
 }
 
-/*
- * Hook to comment out this method in the lf wait strategy
- */
-//@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START
 int
 TAO_Wait_Strategy::sending_request (TAO_ORB_Core *, TAO_Message_Semantics)
 {
   return 0;
 }
-//@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_END
 
 void
 TAO_Wait_Strategy::finished_request ()
 {
 }
 
-/*
- * Hook to specialize the Wait Strategy
- */
-//@@ TAO_WAIT_STRATEGY_SPL_ADD_HOOK
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 8edce81619d..6dfae7e2af0 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -429,11 +429,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (
 {
   TAO_Wait_Strategy *ws = 0;
 
-/*
- * Hook to customize the wait strategy object when the concrete
- * wait strategy object is known a priori.
- */
-//@@ WAIT_STRATEGY_SPL_COMMENT_HOOK_START
   switch (this->wait_strategy_)
     {
       case TAO_WAIT_ON_LEADER_FOLLOWER :
@@ -465,7 +460,6 @@ TAO_Default_Client_Strategy_Factory::create_wait_strategy (
           break;
         }
     }
-//@@ WAIT_STRATEGY_SPL_COMMENT_HOOK_END
 
   return ws;
 }
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index becfa443f70..55abe198aad 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -390,10 +390,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
                                  ACE_TEXT("-ORBFlushingStrategy")) == 0)
       {
         ++curarg;
-        /*
-         * Hook to specialize TAO's Flushing strategy implementations
-         */
-//@@ FLUSHING_STRATEGY_SPL_COMMENT_HOOK_START
         if (curarg < argc)
           {
             ACE_TCHAR* name = argv[curarg];
@@ -410,7 +406,6 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
             else
               this->report_option_value_error (ACE_TEXT("-ORBFlushingStrategy"), name);
           }
-//@@ FLUSHING_STRATEGY_SPL_COMMENT_HOOK_END
       }
     else if (ACE_OS::strcasecmp (argv[curarg],
                                  ACE_TEXT ("-ORBMuxedConnectionMax")) == 0)
@@ -757,13 +752,9 @@ ACE_Reactor_Impl*
 TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
 {
   ACE_Reactor_Impl *impl = 0;
-  /*
-   * Hook to specialize TAO's reactor implementation.
-   */
   // get a timer queue (or not) from a possibly configured
   // time policy
   TAO_RSF_Timer_Queue_Ptr tmq (*this, this->create_timer_queue ());
-//@@ TAO_REACTOR_SPL_COMMENT_HOOK_START
   ACE_NEW_RETURN (impl,
                   ACE_TP_Reactor (ACE::max_handles (),
                                   1,
@@ -772,7 +763,6 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
                                   this->reactor_mask_signals_,
                                   ACE_Select_Reactor_Token::LIFO),
                   0);
-//@@ TAO_REACTOR_SPL_COMMENT_HOOK_END
   // safe to release timer queue
   tmq.release ();
   return impl;