ChangeLogTag:Wed May 26 18:51:39 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

1 files changed, 9 insertions, 33 deletions

diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 4c1abc6afa0..c81ad332b5f 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -18,7 +18,6 @@
 #ifndef TAO_DEFAULT_RESOURCE_H
 #define TAO_DEFAULT_RESOURCE_H
 
-#include "ace/Strategies_T.h"
 #include "ace/Singleton.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -26,7 +25,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Resource_Factory.h"
-#include "tao/IIOP_Acceptor.h"
 #include "tao/POA.h"
 
 // ****************************************************************
@@ -54,20 +52,8 @@ public:
   ACE_Thread_Manager tm_;
   // The Thread Manager
 
-  TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
-  // This no-op creation strategy is necessary for using the
-  // <Strategy_Connector> with the <Cached_Connect_Strategy>.
-
-  TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_;
-  // This no-op activation strategy prevents the cached connector from
-  // calling the service handler's <open> method multiple times.
-
-  TAO_IIOP_Acceptor a_;
-  // The Acceptor
-
-  TAO_IIOP_Connector c_;
-  // The Connector, HACK to create the first connector which happens
-  // to be IIOP.
+  TAO_Acceptor_Registry ar_;
+  // The Acceptor Registry!
 
   TAO_Connector_Registry cr_;
   // The Connector Registry!
@@ -78,9 +64,6 @@ public:
   TAO_Object_Adapter *object_adapter_;
   // Object Adapter.
 
-  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
-  // The Cached Connect Strategy
-
   TAO_POA *poa_;
   // Pointer to application-created POA.
 
@@ -156,21 +139,19 @@ public:
   // = Resource Retrieval
   virtual ACE_Reactor *get_reactor (void);
   virtual ACE_Thread_Manager *get_thr_mgr (void);
-  virtual TAO_Connector *get_connector (void);
+  virtual TAO_Acceptor_Registry  *get_acceptor_registry (void);
   virtual TAO_Connector_Registry *get_connector_registry (void);
-  virtual TAO_CACHED_CONNECT_STRATEGY *get_cached_connect_strategy (void);
-  virtual TAO_NULL_CREATION_STRATEGY *get_null_creation_strategy (void);
-  virtual TAO_NULL_ACTIVATION_STRATEGY *get_null_activation_strategy (void);
-  virtual TAO_Acceptor *get_acceptor (void);
   virtual TAO_POA *get_root_poa (void);
   virtual TAO_Object_Adapter *object_adapter (void);
-  virtual TAO_GLOBAL_Collocation_Table *get_global_collocation_table (void);
   virtual ACE_Allocator* input_cdr_dblock_allocator (void);
   virtual ACE_Allocator* input_cdr_buffer_allocator (void);
   virtual ACE_Allocator* output_cdr_dblock_allocator (void);
   virtual ACE_Allocator* output_cdr_buffer_allocator (void);
   virtual ACE_Data_Block *create_input_cdr_data_block (size_t size);
 
+  virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
+  virtual int init_protocol_factories (void);
+
 protected:
   ACE_Reactor_Impl *allocate_reactor_impl (void) const;
   // Obtain the reactor implementation
@@ -186,11 +167,6 @@ protected:
   // thread-specific.  If not set specifically, this takes on the
   // value of <resource_source_>.
 
-  int collocation_table_source_;
-  // Flag indicating whether the collocation table should be global
-  // thread-specific.  It defaults to TAO_GLOBAL if not set
-  // specifically.
-
   int reactor_type_;
   // Flag indicating which kind of reactor we should use.
 
@@ -200,15 +176,15 @@ protected:
   // CDR streams, for instance to keep the buffers around after the
   // upcall and/or pass them to another thread.
 
+  TAO_ProtocolFactorySet protocol_factories_;
+  // list of loaded protocol factories.
+
   // = Typedefs for the singleton types used to store our orb core
   // information.
   typedef ACE_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>
           GLOBAL_ALLOCATED;
   typedef ACE_TSS_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>
           TSS_ALLOCATED;
-
-  typedef ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>
-          GLOBAL_Collocation_Table;
 };
 
 #if defined (__ACE_INLINE__)