ChangeLogTag:Wed Jun 2 13:18:38 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

1 files changed, 2 insertions, 53 deletions

diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 222afeb123d..9314eb30b06 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -18,44 +18,9 @@
 #define TAO_DEFAULT_CLIENT_H
 
 #include "tao/Client_Strategy_Factory.h"
-#include "tao/default_client.h"
+#include "ace/Service_Config.h"
 
-// ****************************************************************
-
-class TAO_Export TAO_ST_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_Client_Connection_Handler>
-{
-public:
-  TAO_ST_Connect_Creation_Strategy (ACE_Thread_Manager * = 0);
-
-  virtual int make_svc_handler (TAO_Client_Connection_Handler *&sh);
-  // Makes TAO_ST_Client_Connection_Handlers
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_MT_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_Client_Connection_Handler>
-{
-public:
-  TAO_MT_Connect_Creation_Strategy (ACE_Thread_Manager * = 0);
-
-  virtual int make_svc_handler (TAO_Client_Connection_Handler *&sh);
-  // Makes TAO_MT_Client_Connection_Handlers
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_RW_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_Client_Connection_Handler>
-{
-public:
-  TAO_RW_Connect_Creation_Strategy (ACE_Thread_Manager * = 0);
-
-  virtual int make_svc_handler (TAO_Client_Connection_Handler *&sh);
-  // Makes TAO_RW_Client_Connection_Handlers
-};
-
-// ****************************************************************
-
-class TAO_Default_Client_Strategy_Factory : public TAO_Client_Strategy_Factory
+class TAO_Export TAO_Default_Client_Strategy_Factory : public TAO_Client_Strategy_Factory
 {
   // = TITLE
   //   This is the "default" client strategy factor for TAO.  It
@@ -82,12 +47,6 @@ public:
   // the TAO_GIOP_Invocation::location_forward and the
   // TAO_GIOP_Invocation::start
 
-  // @@ This routine should not be here, otherwise the protocols are
-  //    not pluggable, but we need to integrate the changes from
-  //    asynchronous messaging to eliminate this method....
-  ACE_Creation_Strategy<TAO_Client_Connection_Handler> *create_client_creation_strategy (void);
-  // Create the correct client connection creation strategy.
-
   TAO_Request_Mux_Strategy *create_request_mux_strategy (void);
   // Create the correct client request muxing strategy.
 
@@ -104,16 +63,6 @@ private:
   Lock_Type iiop_profile_lock_type_;
   // the lock type for forwarding IIOP Profile
 
-  enum Client_Connection_Handler_Type
-  {
-    MT_CLIENT_CONNECTION_HANDLER,
-    ST_CLIENT_CONNECTION_HANDLER,
-    RW_CLIENT_CONNECTION_HANDLER
-  };
-
-  Client_Connection_Handler_Type client_connection_handler_;
-  // Type of client connection handler to create.
-
   enum Request_Mux_Strategy
   {
     TAO_MUXED_RMS,