Tue Jun 12 13:30:02 2001 Frank Hunleth <fhunleth@cs.wustl.edu>, Angelo Corsaro <corsaro@cs.wustl.edu>

16 files changed, 140 insertions, 1145 deletions

diff --git a/TAO/tao/Strategies/Direct_Priority_Mapping.cpp b/TAO/tao/Strategies/Direct_Priority_Mapping.cpp
deleted file mode 100644
index b16314573ef..00000000000
--- a/TAO/tao/Strategies/Direct_Priority_Mapping.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#if (TAO_HAS_RT_CORBA == 1)
-
-#include "Direct_Priority_Mapping.h"
-#include "ace/Sched_Params.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Direct_Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(Strategies, Direct_Priority_Mapping, "$Id$")
-
-TAO_Direct_Priority_Mapping::TAO_Direct_Priority_Mapping (int policy)
-  :  policy_ (policy)
-{
-  this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-  this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-}
-
-TAO_Direct_Priority_Mapping::~TAO_Direct_Priority_Mapping (void)
-{
-}
-
-CORBA::Boolean
-TAO_Direct_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
-                                        RTCORBA::NativePriority &native_priority)
-{
-  if (corba_priority < 0)
-    return 0;
-
-#if defined (ACE_WIN32)
-
-  int current_native_priority = this->min_;
-  int next_native_priority;
-  for (int i = 1; i <= corba_priority; ++i)
-    {
-      next_native_priority =
-        ACE_Sched_Params::next_priority (this->policy_,
-                                         current_native_priority);
-
-      if (next_native_priority == current_native_priority)
-        return 0;
-
-      current_native_priority = next_native_priority;
-    }
-
-  native_priority = current_native_priority;
-  return 1;
-
-#else
-
-  if (this->min_ < this->max_)
-    {
-      native_priority = corba_priority + this->min_;
-      if (native_priority > this->max_)
-        return 0;
-    }
-  else if (this->min_ > this->max_)
-    {
-      native_priority = this->min_ - corba_priority;
-      if (native_priority < this->max_)
-        return 0;
-    }
-  else
-    {
-      // There is only one native priority.
-      if (corba_priority != 0)
-        return 0;
-
-      native_priority = this->min_;
-    }
-
-  return 1;
-#endif /* ACE_WIN32 */
-}
-
-CORBA::Boolean
-TAO_Direct_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
-                                       RTCORBA::Priority &corba_priority)
-{
-#if defined (ACE_WIN32)
-
-  int current_native_priority = this->min_;
-  for (corba_priority = 0; ; ++corba_priority)
-    {
-      if (current_native_priority == native_priority)
-        return 1;
-
-      else if (current_native_priority == this->max_)
-        return 0;
-
-      else
-        current_native_priority =
-          ACE_Sched_Params::next_priority (this->policy_,
-                                           current_native_priority);
-    }
-
-#else
-  if (this->min_ < this->max_)
-    {
-      if (native_priority < this->min_
-          || native_priority > this->max_)
-        return 0;
-      corba_priority = native_priority - this->min_;
-    }
-  else if (this->min_ > this->max_)
-    {
-      if (native_priority > this->min_
-          || native_priority < this->max_)
-        return 0;
-      corba_priority = this->min_ - native_priority;
-    }
-  else if (this->min_ == this->max_)
-    {
-      if (native_priority != this->min_)
-        return 0;
-      corba_priority = 0;
-    }
-
-  return 1;
-
-#endif /* ACE_WIN32 */
-}
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/Strategies/Direct_Priority_Mapping.h b/TAO/tao/Strategies/Direct_Priority_Mapping.h
deleted file mode 100644
index 700378e182a..00000000000
--- a/TAO/tao/Strategies/Direct_Priority_Mapping.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Direct_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares the Direct_Priority_Mapping interface, as defined in the
-//   RT-CORBA spec.
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_DIRECT_PRIORITY_MAPPING_H
-#define TAO_DIRECT_PRIORITY_MAPPING_H
-#include "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if (TAO_HAS_RT_CORBA == 1)
-
-#include "tao/Priority_Mapping.h"
-#include "strategies_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Strategies_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping
-{
-  //
-  // = TITLE
-  //   A simple implementation of the Priority_Mapping interface
-  //
-  // = DESCRIPTION
-  //   This implementation uses direct mapping between the range of
-  //   priorities for a given scheduling class (ACE_SCHED_OTHER,
-  //   ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
-  //   priorities (0...32767)
-  //
-public:
-  TAO_Direct_Priority_Mapping (int policy = ACE_SCHED_OTHER);
-  // Default constructor
-
-  virtual ~TAO_Direct_Priority_Mapping (void);
-  // The destructor
-
-  virtual CORBA::Boolean
-      to_native (RTCORBA::Priority corba_priority,
-                 RTCORBA::NativePriority &native_priority);
-  virtual CORBA::Boolean
-      to_CORBA (RTCORBA::NativePriority native_priority,
-                RTCORBA::Priority &corba_priority);
-
-private:
-  int policy_;
-  // The scheduling policy
-
-  int min_;
-  int max_;
-  // The range
-};
-
-#if defined (__ACE_INLINE__)
-# include "Direct_Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
-
-#include "ace/post.h"
-#endif /* TAO_DIRECT_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/Strategies/Direct_Priority_Mapping.i b/TAO/tao/Strategies/Direct_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Strategies/Direct_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Strategies/Linear_Priority_Mapping.cpp b/TAO/tao/Strategies/Linear_Priority_Mapping.cpp
deleted file mode 100644
index 76eb4b9460b..00000000000
--- a/TAO/tao/Strategies/Linear_Priority_Mapping.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#if (TAO_HAS_RT_CORBA == 1)
-
-#include "Linear_Priority_Mapping.h"
-#include "tao/debug.h"
-#include "ace/Sched_Params.h"
-
-#if !defined (__ACE_INLINE__)
-# include "Linear_Priority_Mapping.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(Strategies, Linear_Priority_Mapping, "$Id$")
-
-TAO_Linear_Priority_Mapping::TAO_Linear_Priority_Mapping (int policy)
-  :  policy_ (policy)
-{
-  this->min_ = ACE_Sched_Params::priority_min (this->policy_);
-  this->max_ = ACE_Sched_Params::priority_max (this->policy_);
-}
-
-TAO_Linear_Priority_Mapping::~TAO_Linear_Priority_Mapping (void)
-{
-}
-
-CORBA::Boolean
-TAO_Linear_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
-                                        RTCORBA::NativePriority &native_priority)
-{
-  if (corba_priority < 0 || corba_priority > RTCORBA::maxPriority)
-    return 0;
-
-#if defined (ACE_WIN32)
-  // Count up the number of distinct native priorities on current
-  // platform.
-  int n;
-  int current_priority = this->min_;
-  for (n = 1; current_priority != this->max_; ++n)
-    {
-      current_priority =
-        ACE_Sched_Params::next_priority (this->policy_,
-                                         current_priority);
-    }
-  int native_priority_index =
-    1
-    + ((n - 1)
-       * corba_priority
-       / (RTCORBA::maxPriority - RTCORBA::minPriority));
-
-  // Now, find the value corresponding to this index.
-  native_priority = this->min_;
-  for (int i = 2; i <= native_priority_index; ++i)
-    {
-      native_priority = ACE_Sched_Params::next_priority (this->policy_,
-                                                         native_priority);
-    }
-  return 1;
-
-#else
-
-  native_priority =
-    this->min_
-    + ((this->max_ - this->min_)
-       * corba_priority
-       / (RTCORBA::maxPriority - RTCORBA::minPriority));
-
-  return 1;
-
-#endif /* ACE_WIN32 */
-}
-
-CORBA::Boolean
-TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
-                                       RTCORBA::Priority &corba_priority)
-{
-#if defined (ACE_WIN32)
-
-  // Iterate over native priorities in order to 1) make sure
-  // <native_priority> argument contains a valid value, 2) count its
-  // index among all valid native pr. values, 3) get the total number
-  // of native priority values for the current platform.
-
-  int total;
-  int native_priority_index = 0;
-  int current_priority = this->min_;
-  for (total = 1; ; ++total)
-    {
-      if (native_priority == current_priority)
-        native_priority_index = total;
-
-      if (current_priority == this->max_)
-        break;
-
-      current_priority =
-        ACE_Sched_Params::next_priority (this->policy_,
-                                         current_priority);
-    }
-
-  if (native_priority_index == 0)
-    return 0;
-
-  int delta = total - 1;
-  if (delta != 0)
-    {
-      corba_priority =
-        RTCORBA::minPriority
-        + ((RTCORBA::maxPriority - RTCORBA::minPriority)
-           * (native_priority_index - 1) / delta);
-    }
-  else
-    {
-      // There is only one native priority.
-      corba_priority = RTCORBA::minPriority;
-    }
-
-  return 1;
-
-#else
-
-  if ((this->min_ < this->max_
-       && (native_priority < this->min_
-           || native_priority > this->max_))
-      || (this->min_ > this->max_
-          && (native_priority < this->max_
-              || native_priority > this->min_)))
-    {
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Linear_Priority_Mapping::to_CORBA: "
-                    " priority %d out of range [%d,%d]\n",
-                    native_priority, this->min_, this->max_));
-      return 0;
-    }
-
-  int delta = this->max_ - this->min_;
-  if (delta != 0)
-    {
-      corba_priority =
-        RTCORBA::minPriority
-        + ((RTCORBA::maxPriority - RTCORBA::minPriority)
-           * (native_priority - this->min_) / delta);
-    }
-  else
-    {
-      // There is only one native priority.
-      if (native_priority != this->min_)
-        return 0;
-      corba_priority = RTCORBA::minPriority;
-    }
-
-  return 1;
-
-#endif /* ACE_WIN32 */
-}
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/Strategies/Linear_Priority_Mapping.h b/TAO/tao/Strategies/Linear_Priority_Mapping.h
deleted file mode 100644
index e755ecd0b5b..00000000000
--- a/TAO/tao/Strategies/Linear_Priority_Mapping.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Linear_Priority_Mapping.h
-//
-// = DESCRIPTION
-//   Declares the Linear_Priority_Mapping interface, as defined in the
-//   RT-CORBA spec.
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_LINEAR_PRIORITY_MAPPING_H
-#define TAO_LINEAR_PRIORITY_MAPPING_H
-#include "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if (TAO_HAS_RT_CORBA == 1)
-
-#include "tao/Priority_Mapping.h"
-#include "strategies_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Strategies_Export TAO_Linear_Priority_Mapping : public TAO_Priority_Mapping
-{
-  //
-  // = TITLE
-  //   A simple implementation of the Priority_Mapping interface
-  //
-  // = DESCRIPTION
-  //   This implementation uses linear mapping between the range of
-  //   priorities for a given scheduling class (ACE_SCHED_OTHER,
-  //   ACE_SCHED_FIFO, ACE_SCHED_RR) and the valid range of CORBA
-  //   priorities (0...32767)
-  //
-public:
-  TAO_Linear_Priority_Mapping (int policy = ACE_SCHED_OTHER);
-  // Default constructor
-
-  virtual ~TAO_Linear_Priority_Mapping (void);
-  // The destructor
-
-  virtual CORBA::Boolean
-      to_native (RTCORBA::Priority corba_priority,
-                 RTCORBA::NativePriority &native_priority);
-  virtual CORBA::Boolean
-      to_CORBA (RTCORBA::NativePriority native_priority,
-                RTCORBA::Priority &corba_priority);
-
-private:
-  int policy_;
-  // The scheduling policy
-
-  int min_;
-  int max_;
-  // The range
-};
-
-#if defined (__ACE_INLINE__)
-# include "Linear_Priority_Mapping.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
-
-#include "ace/post.h"
-#endif /* TAO_LINEAR_PRIORITY_MAPPING_H */
diff --git a/TAO/tao/Strategies/Linear_Priority_Mapping.i b/TAO/tao/Strategies/Linear_Priority_Mapping.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Strategies/Linear_Priority_Mapping.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile
index 4ce06bd19dd..717381335ad 100644
--- a/TAO/tao/Strategies/Makefile
+++ b/TAO/tao/Strategies/Makefile
@@ -48,14 +48,6 @@ CPP_SRCS += \
   FIFO_Connection_Purging_Strategy \
   NULL_Connection_Purging_Strategy
 
-ifeq ($(rt_corba),1)
-
-CPP_SRCS += \
-  Linear_Priority_Mapping \
-  Direct_Priority_Mapping
-
-endif # rt_corba
-
 IDL_SRC = \
         $(addsuffix S.cpp, $(IDL_FILES)) \
         $(addsuffix C.cpp, $(IDL_FILES))
@@ -360,8 +352,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/params.h \
@@ -405,10 +400,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/ORB_Table.h \
@@ -418,8 +409,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Connector_Registry.i \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- UIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
+ UIOP_Connector.h $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/LSOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
@@ -430,8 +420,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Connector_Impl.cpp
 
 .obj/UIOP_Lite_Factory.o .obj/UIOP_Lite_Factory.so .shobj/UIOP_Lite_Factory.o .shobj/UIOP_Lite_Factory.so: UIOP_Lite_Factory.cpp UIOP_Lite_Factory.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -703,8 +692,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/params.h \
@@ -748,10 +740,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/ORB_Table.h \
@@ -761,8 +749,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Connector_Registry.i \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- UIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
+ UIOP_Connector.h $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/LSOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
@@ -1036,8 +1023,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- UIOP_Transport.i \
+ $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
@@ -1045,8 +1031,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/Wait_Strategy.inl \
  UIOP_Connection_Handler.inl UIOP_Endpoint.h UIOP_Endpoint.i \
- UIOP_Profile.i \
- $(TAO_ROOT)/tao/ORB.h \
+ UIOP_Profile.i $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
@@ -1054,8 +1039,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -1102,13 +1090,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/debug.h \
  uiop_endpoints.h uiop_endpoints.i
 
 .obj/UIOP_Transport.o .obj/UIOP_Transport.so .shobj/UIOP_Transport.o .shobj/UIOP_Transport.so: UIOP_Transport.cpp UIOP_Transport.h \
@@ -1331,8 +1314,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- UIOP_Transport.i UIOP_Connection_Handler.h \
+ $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \
+ UIOP_Connection_Handler.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
@@ -1395,14 +1378,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
  $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/Sync_Strategies.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -1418,6 +1393,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -1452,12 +1432,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/GIOP_Message_Base.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
@@ -1739,8 +1716,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- UIOP_Transport.i \
- $(ACE_ROOT)/ace/Acceptor.h \
+ UIOP_Transport.i $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
  $(TAO_ROOT)/tao/Connection_Handler.inl \
@@ -1752,8 +1728,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Connector_Impl.h \
  $(TAO_ROOT)/tao/Connector_Impl.inl \
  $(TAO_ROOT)/tao/Connector_Impl.cpp \
- UIOP_Profile.h \
- $(TAO_ROOT)/tao/Profile.h \
+ UIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -1779,6 +1754,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -1820,10 +1797,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
@@ -2103,8 +2076,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -2149,10 +2125,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/ORB_Table.h \
@@ -2162,8 +2134,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Connector_Registry.i \
  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
- UIOP_Profile.h \
- $(TAO_ROOT)/tao/Profile.h \
+ UIOP_Profile.h $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -2173,13 +2144,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.i \
  UIOP_Endpoint.h UIOP_Endpoint.i UIOP_Profile.i \
  $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/debug.h
+ $(TAO_ROOT)/tao/MProfile.i
 
 .obj/UIOP_Connection_Handler.o .obj/UIOP_Connection_Handler.so .shobj/UIOP_Connection_Handler.o .shobj/UIOP_Connection_Handler.so: UIOP_Connection_Handler.cpp \
  UIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/pre.h \
- UIOP_Transport.h \
+ $(ACE_ROOT)/ace/pre.h UIOP_Transport.h \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -2398,8 +2367,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- UIOP_Transport.i \
+ $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
@@ -2439,6 +2407,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -2493,10 +2463,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
@@ -2622,8 +2588,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/UNIX_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- UIOP_Endpoint.i UIOP_Connection_Handler.h UIOP_Transport.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.i UIOP_Endpoint.i \
+ UIOP_Connection_Handler.h UIOP_Transport.h \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
@@ -2740,8 +2706,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- UIOP_Transport.i \
+ $(ACE_ROOT)/ace/Dynamic.i UIOP_Transport.i \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(TAO_ROOT)/tao/Connection_Handler.h \
@@ -3024,8 +2989,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/params.h \
@@ -3069,10 +3037,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/ORB_Table.h \
@@ -3260,12 +3224,15 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/MEM_Addr.h \
- $(ACE_ROOT)/ace/MEM_Addr.i \
- SHMIOP_Endpoint.i SHMIOP_Profile.i \
+ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
+ SHMIOP_Profile.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -3350,10 +3317,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -3367,7 +3330,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/iiop_endpoints.h \
  $(TAO_ROOT)/tao/iiop_endpoints.i
 
@@ -3639,16 +3601,15 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- SHMIOP_Endpoint.h \
- $(TAO_ROOT)/tao/ORB.h \
+ SHMIOP_Endpoint.h $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/ORB.i \
  $(ACE_ROOT)/ace/MEM_Addr.h \
- $(ACE_ROOT)/ace/MEM_Addr.i \
- SHMIOP_Endpoint.i SHMIOP_Profile.i \
+ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
+ SHMIOP_Profile.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
@@ -3664,14 +3625,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
  $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/Sync_Strategies.i \
  $(TAO_ROOT)/tao/Stub.h \
@@ -3681,6 +3634,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -3715,12 +3673,9 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
@@ -4041,19 +3996,19 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- SHMIOP_Endpoint.h \
- $(TAO_ROOT)/tao/ORB.h \
+ SHMIOP_Endpoint.h $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- SHMIOP_Endpoint.i SHMIOP_Profile.i \
- $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/ORB.i SHMIOP_Endpoint.i \
+ SHMIOP_Profile.i $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Base_Transport_Property.h \
  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -4095,10 +4050,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
@@ -4377,8 +4328,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -4423,10 +4377,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/ORB_Table.h \
@@ -4458,8 +4408,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.i \
  SHMIOP_Endpoint.h SHMIOP_Endpoint.i SHMIOP_Profile.i \
  $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/debug.h
+ $(TAO_ROOT)/tao/MProfile.i
 
 .obj/SHMIOP_Connection_Handler.o .obj/SHMIOP_Connection_Handler.so .shobj/SHMIOP_Connection_Handler.o .shobj/SHMIOP_Connection_Handler.so: SHMIOP_Connection_Handler.cpp \
  SHMIOP_Connection_Handler.h \
@@ -4724,6 +4673,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
@@ -4778,10 +4729,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Messaging_Policy_i.h \
@@ -4815,10 +4762,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Base_Transport_Property.h \
  $(TAO_ROOT)/tao/Base_Transport_Property.inl \
- SHMIOP_Endpoint.h \
- $(ACE_ROOT)/ace/MEM_Addr.h \
- $(ACE_ROOT)/ace/MEM_Addr.i \
- SHMIOP_Endpoint.i
+ SHMIOP_Endpoint.h $(ACE_ROOT)/ace/MEM_Addr.h \
+ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i
 
 .obj/SHMIOP_Endpoint.o .obj/SHMIOP_Endpoint.so .shobj/SHMIOP_Endpoint.o .shobj/SHMIOP_Endpoint.so: SHMIOP_Endpoint.cpp SHMIOP_Endpoint.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -4919,8 +4864,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Endpoint.i \
- strategies_export.h \
- $(TAO_ROOT)/tao/ORB.h \
+ strategies_export.h $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
@@ -4958,8 +4902,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/MEM_Addr.h \
- $(ACE_ROOT)/ace/MEM_Addr.i \
- SHMIOP_Endpoint.i SHMIOP_Connection_Handler.h \
+ $(ACE_ROOT)/ace/MEM_Addr.i SHMIOP_Endpoint.i \
+ SHMIOP_Connection_Handler.h \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
@@ -5085,8 +5029,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 
 .obj/GIOP_Message_NonReactive_Base.o .obj/GIOP_Message_NonReactive_Base.so .shobj/GIOP_Message_NonReactive_Base.o .shobj/GIOP_Message_NonReactive_Base.so: GIOP_Message_NonReactive_Base.cpp \
  GIOP_Message_NonReactive_Base.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -5251,8 +5194,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -5337,10 +5283,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -5354,14 +5296,12 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Leader_Follower.i \
- $(TAO_ROOT)/tao/debug.h
+ $(TAO_ROOT)/tao/Leader_Follower.i
 
 .obj/GIOP_Message_NonReactive_Handler.o .obj/GIOP_Message_NonReactive_Handler.so .shobj/GIOP_Message_NonReactive_Handler.o .shobj/GIOP_Message_NonReactive_Handler.so: \
  GIOP_Message_NonReactive_Handler.cpp \
  GIOP_Message_NonReactive_Handler.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -5524,8 +5464,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -5610,10 +5553,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -5627,7 +5566,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Transport.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Endpoint.h \
@@ -5841,8 +5779,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -5896,10 +5837,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -6039,12 +5976,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- uiop_endpoints.i
+ $(TAO_ROOT)/tao/Any.i uiop_endpoints.i
 
 .obj/advanced_resource.o .obj/advanced_resource.so .shobj/advanced_resource.o .shobj/advanced_resource.so: advanced_resource.cpp advanced_resource.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -6209,8 +6144,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -6269,10 +6207,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -6290,15 +6224,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  Reactor_Per_Priority.h \
  $(TAO_ROOT)/tao/Reactor_Registry.h \
  $(TAO_ROOT)/tao/Reactor_Registry.i \
- Reactor_Per_Priority.i Direct_Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- Direct_Priority_Mapping.i Linear_Priority_Mapping.h \
- Linear_Priority_Mapping.i LFU_Connection_Purging_Strategy.h \
+ Reactor_Per_Priority.i LFU_Connection_Purging_Strategy.h \
  $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
  $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
  FIFO_Connection_Purging_Strategy.h NULL_Connection_Purging_Strategy.h \
- $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Single_Reactor.h \
  $(TAO_ROOT)/tao/Single_Reactor.i \
  $(TAO_ROOT)/tao/LRU_Connection_Purging_Strategy.h \
@@ -6353,8 +6282,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/TP_Reactor.i
 
 .obj/Reactor_Per_Priority.o .obj/Reactor_Per_Priority.so .shobj/Reactor_Per_Priority.o .shobj/Reactor_Per_Priority.so: Reactor_Per_Priority.cpp \
- Reactor_Per_Priority.h \
- $(ACE_ROOT)/ace/pre.h \
+ Reactor_Per_Priority.h $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/Reactor_Registry.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -6514,8 +6442,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Set.h \
+ $(TAO_ROOT)/tao/Policy_Set.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
@@ -6581,10 +6512,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -6599,13 +6526,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Leader_Follower.h \
- $(TAO_ROOT)/tao/Leader_Follower.i \
- $(TAO_ROOT)/tao/debug.h
+ $(TAO_ROOT)/tao/Leader_Follower.i
 
 .obj/LFU_Connection_Purging_Strategy.o .obj/LFU_Connection_Purging_Strategy.so .shobj/LFU_Connection_Purging_Strategy.o .shobj/LFU_Connection_Purging_Strategy.so: LFU_Connection_Purging_Strategy.cpp \
  LFU_Connection_Purging_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -6792,8 +6717,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 .obj/FIFO_Connection_Purging_Strategy.o .obj/FIFO_Connection_Purging_Strategy.so .shobj/FIFO_Connection_Purging_Strategy.o .shobj/FIFO_Connection_Purging_Strategy.so: \
  FIFO_Connection_Purging_Strategy.cpp \
  FIFO_Connection_Purging_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -6980,8 +6904,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 .obj/NULL_Connection_Purging_Strategy.o .obj/NULL_Connection_Purging_Strategy.so .shobj/NULL_Connection_Purging_Strategy.o .shobj/NULL_Connection_Purging_Strategy.so: \
  NULL_Connection_Purging_Strategy.cpp \
  NULL_Connection_Purging_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
- strategies_export.h \
+ $(ACE_ROOT)/ace/pre.h strategies_export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -7165,313 +7088,4 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Strategies.i \
  $(TAO_ROOT)/tao/Transport.inl
 
-.obj/Linear_Priority_Mapping.o .obj/Linear_Priority_Mapping.so .shobj/Linear_Priority_Mapping.o .shobj/Linear_Priority_Mapping.so: Linear_Priority_Mapping.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- Linear_Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- strategies_export.h Linear_Priority_Mapping.i \
- $(TAO_ROOT)/tao/debug.h \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-
-.obj/Direct_Priority_Mapping.o .obj/Direct_Priority_Mapping.so .shobj/Direct_Priority_Mapping.o .shobj/Direct_Priority_Mapping.so: Direct_Priority_Mapping.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- Direct_Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- strategies_export.h Direct_Priority_Mapping.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Strategies/Reactor_Per_Priority.cpp b/TAO/tao/Strategies/Reactor_Per_Priority.cpp
index 8c820ddc940..9235c6de8c3 100644
--- a/TAO/tao/Strategies/Reactor_Per_Priority.cpp
+++ b/TAO/tao/Strategies/Reactor_Per_Priority.cpp
@@ -39,11 +39,13 @@ TAO_Reactor_Per_Priority::reactor (void)
   if (leader_follower != 0)
     return leader_follower->reactor ();
 
+  TAO_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
   CORBA::Short priority = 0;
-  if (this->orb_core ()->get_protocols_hooks ()->
-      get_thread_priority (this->orb_core (),
-                           priority,
-                           ACE_TRY_ENV) 
+  if (tph->get_thread_priority (priority,
+                                ACE_TRY_ENV)
       == -1)
     {
       if (TAO_debug_level > 3)
@@ -85,11 +87,13 @@ TAO_Reactor_Per_Priority::leader_follower (void)
   if (leader_follower != 0)
     return *leader_follower;
 
+  TAO_Protocols_Hooks *tph =
+    this->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (*leader_follower);
+
   CORBA::Short priority = 0;
-  if (this->orb_core ()->get_protocols_hooks ()->
-      get_thread_priority (this->orb_core (),
-                           priority,
-                           ACE_TRY_ENV) 
+  if (tph->get_thread_priority (priority,
+                                ACE_TRY_ENV)
       == -1)
     return *leader_follower;
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 927afcb74fe..287ca92f9d5 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -157,24 +157,12 @@ TAO_SHMIOP_Profile::decode (TAO_InputCDR& cdr)
                   cdr.length (),
                   encap_len));
     }
-// @@ RTCORBA_SUBSETTING:
-  // The original version pre-subsetting was as below. We moved this
-  // code out because it is not in the critical path, does not interfere
-  // with the correctness of the method.
 
+  // Decode any additional endpoints per profile.  (At the present,
+  // only RTCORBA takes advantage of this feature.)
   if (this->decode_endpoints () == -1)
     return -1;
 
-//#if (TAO_HAS_RT_CORBA == 1)
-
-  // Currently there are > 1 endpoint per profile only with RTCORBA.
-
-  // Decode endpoints, if any.
-//   if (this->decode_endpoints () == -1)
-//     return -1;
-
-// #endif  /* TAO_HAS_RT_CORBA == 1 */
-
   if (cdr.good_bit ())
     {
       // Invalidate the object_addr_ until first access.
diff --git a/TAO/tao/Strategies/TAO_Strategies.dsp b/TAO/tao/Strategies/TAO_Strategies.dsp
index eda74764ee0..3b836f5bd2e 100644
--- a/TAO/tao/Strategies/TAO_Strategies.dsp
+++ b/TAO/tao/Strategies/TAO_Strategies.dsp
@@ -98,10 +98,6 @@ SOURCE=.\advanced_resource.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\FIFO_Connection_Purging_Strategy.cpp

 # End Source File

 # Begin Source File

@@ -114,10 +110,6 @@ SOURCE=.\GIOP_Message_NonReactive_Handler.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\LFU_Connection_Purging_Strategy.cpp

 # End Source File

 # Begin Source File

@@ -206,10 +198,6 @@ SOURCE=.\advanced_resource.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\GIOP_Message_NonReactive_Base.h

 # End Source File

 # Begin Source File

@@ -218,10 +206,6 @@ SOURCE=.\GIOP_Message_NonReactive_Handler.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Reactor_Per_Priority.h

 # End Source File

 # Begin Source File

@@ -318,10 +302,6 @@ SOURCE=.\advanced_resource.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\GIOP_Message_NonReactive_Base.inl

 # End Source File

 # Begin Source File

@@ -330,10 +310,6 @@ SOURCE=.\GIOP_Message_NonReactive_Handler.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Reactor_Per_Priority.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Strategies/TAO_Strategies_Static.dsp b/TAO/tao/Strategies/TAO_Strategies_Static.dsp
index bd1cf67c0af..a31b91cece4 100644
--- a/TAO/tao/Strategies/TAO_Strategies_Static.dsp
+++ b/TAO/tao/Strategies/TAO_Strategies_Static.dsp
@@ -95,10 +95,6 @@ SOURCE=.\advanced_resource.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\FIFO_Connection_Purging_Strategy.cpp

 # End Source File

 # Begin Source File

@@ -111,10 +107,6 @@ SOURCE=.\GIOP_Message_NonReactive_Handler.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\LFU_Connection_Purging_Strategy.cpp

 # End Source File

 # Begin Source File

@@ -203,10 +195,6 @@ SOURCE=.\advanced_resource.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\GIOP_Message_NonReactive_Base.h

 # End Source File

 # Begin Source File

@@ -215,10 +203,6 @@ SOURCE=.\GIOP_Message_NonReactive_Handler.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Reactor_Per_Priority.h

 # End Source File

 # Begin Source File

@@ -303,10 +287,6 @@ SOURCE=.\advanced_resource.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Direct_Priority_Mapping.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\GIOP_Message_NonReactive_Base.inl

 # End Source File

 # Begin Source File

@@ -315,10 +295,6 @@ SOURCE=.\GIOP_Message_NonReactive_Handler.inl
 # End Source File

 # Begin Source File

 

-SOURCE=.\Linear_Priority_Mapping.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Reactor_Per_Priority.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index cbb5592d386..7213bd93d2c 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -28,7 +28,6 @@
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/debug.h"
 #include "tao/Protocols_Hooks.h"
-#include "tao/RT_Policy_i.h"
 
 ACE_RCSID(Strategies, UIOP_Acceptor, "$Id$")
 
@@ -315,7 +314,7 @@ TAO_UIOP_Acceptor::open_i (const char *rendezvous)
   (void) this->base_acceptor_.acceptor().enable (ACE_CLOEXEC);
   // This avoids having child processes acquire the listen socket thereby
   // denying the server the opportunity to restart on a well-known endpoint.
-  // This does not affect the aberrent behavior on Win32 platforms. 
+  // This does not affect the aberrent behavior on Win32 platforms.
 
   // @@ If Profile creation is slow we may need to cache the
   //    rendezvous point here
@@ -531,8 +530,6 @@ TAO_UIOP_Acceptor::parse_options (const char *str)
 int
 TAO_UIOP_Acceptor::init_uiop_properties (void)
 {
-#if (TAO_HAS_RT_CORBA == 1)
-
   // @@ Currently (in the code below), we obtain protocol properties from
   // ORB-level ServerProtocol, even though the policy may
   // have been overridden on POA level.  That's because currently all
@@ -545,11 +542,14 @@ TAO_UIOP_Acceptor::init_uiop_properties (void)
   // ServerProtocolPolicy.
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  int send_buffer_size = 0;
-  int recv_buffer_size = 0;
+  // Initialize the settings to the ORB defaults.  If RT CORBA is enabled,
+  // it may override these.
+  int send_buffer_size = this->orb_core_->orb_params ()->sock_sndbuf_size ();
+  int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size ();
   int no_delay = 0;
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
     {
@@ -557,8 +557,7 @@ TAO_UIOP_Acceptor::init_uiop_properties (void)
       const char *protocol_type = protocol;
 
       int hook_result =
-        tph->call_server_protocols_hook (this->orb_core_,
-                                         send_buffer_size,
+        tph->call_server_protocols_hook (send_buffer_size,
                                          recv_buffer_size,
                                          no_delay,
                                          protocol_type);
@@ -573,15 +572,6 @@ TAO_UIOP_Acceptor::init_uiop_properties (void)
   this->uiop_properties_.recv_buffer_size =
    recv_buffer_size;
 
-#else /* TAO_HAS_RT_CORBA == 1 */
-
-  this->uiop_properties_.send_buffer_size =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  this->uiop_properties_.recv_buffer_size =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
-
   return 0;
 }
 
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 9f67e4ddb2c..a515cf02514 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -455,8 +455,6 @@ TAO_UIOP_Connector::object_key_delimiter (void) const
 int
 TAO_UIOP_Connector::init_uiop_properties (void)
 {
-#if (TAO_HAS_RT_CORBA == 1)
-
   // Connector protocol properties are obtained from ORB-level
   // RTCORBA::ClientProtocolProperties policy override.
   // If the override doesn't exist or doesn't contain the
@@ -469,19 +467,19 @@ TAO_UIOP_Connector::init_uiop_properties (void)
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  int send_buffer_size = 0;
-  int recv_buffer_size = 0;
+  int send_buffer_size = this->orb_core ()->orb_params ()->sock_sndbuf_size ();
+  int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
   int no_delay = 0;
 
-  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
     {
       const char protocol [] = "uiop";
       const char *protocol_type = protocol;
       int hook_result =
-        tph->call_client_protocols_hook (this->orb_core (),
-                                         send_buffer_size,
+        tph->call_client_protocols_hook (send_buffer_size,
                                          recv_buffer_size,
                                          no_delay,
                                          protocol_type);
@@ -496,17 +494,6 @@ TAO_UIOP_Connector::init_uiop_properties (void)
     this->uiop_properties_.recv_buffer_size =
       recv_buffer_size;
 
-#else /* TAO_HAS_RT_CORBA == 1 */
-
-  // Without RTCORBA, protocol configuration properties come from ORB
-  // options.
-  this->uiop_properties_.send_buffer_size =
-    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  this->uiop_properties_.recv_buffer_size =
-    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
-
   return 0;
 }
 
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 6a2991fe989..d5fe4796953 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -358,25 +358,11 @@ TAO_UIOP_Profile::decode (TAO_InputCDR& cdr)
                   encap_len));
     }
 
-
-  // @@ RTCORBA_SUBSETTING:
-  // The original version pre-subsetting was as below. We moved this
-  // code out because it is not in the critical path, does not interfere
-  // with the correctness of the method.
-
+  // Decode any additional endpoints per profile.  (At the present,
+  // only RTCORBA takes advantage of this feature.)
   if (this->decode_endpoints () == -1)
     return -1;
 
-//#if (TAO_HAS_RT_CORBA == 1)
-
-  // Currently there are > 1 endpoint per profile only with RTCORBA.
-
-  // Decode endpoints, if any.
-//   if (this->decode_endpoints () == -1)
-//     return -1;
-
-// #endif  /* TAO_HAS_RT_CORBA == 1 */
-
   if (cdr.good_bit ())
     return 1;
 
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index f3ff108f948..c590e862fec 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -10,8 +10,6 @@
 #include "SHMIOP_Factory.h"
 
 #include "Reactor_Per_Priority.h"
-#include "Direct_Priority_Mapping.h"
-#include "Linear_Priority_Mapping.h"
 #include "LFU_Connection_Purging_Strategy.h"
 #include "FIFO_Connection_Purging_Strategy.h"
 #include "NULL_Connection_Purging_Strategy.h"
@@ -49,10 +47,8 @@ TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 }
 
 TAO_Advanced_Resource_Factory::TAO_Advanced_Resource_Factory (void)
-  :sched_policy_ (ACE_SCHED_OTHER),
-   reactor_registry_type_ (TAO_SINGLE_REACTOR),
+  :reactor_registry_type_ (TAO_SINGLE_REACTOR),
    reactor_type_ (TAO_REACTOR_TP),
-   priority_mapping_type_ (TAO_PRIORITY_MAPPING_DIRECT),
    cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK)
 {
   // Constructor
@@ -105,9 +101,9 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
             char *name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name, "null") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_ST;
+              this->reactor_type_ = TAO_REACTOR_SELECT_ST;
             else if (ACE_OS::strcasecmp (name, "token") == 0)
-              reactor_type_= TAO_REACTOR_SELECT_MT;
+              this->reactor_type_= TAO_REACTOR_SELECT_MT;
           }
       }
 
@@ -121,14 +117,14 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
 
             if (ACE_OS::strcasecmp (name,
                                     "select_mt") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_MT;
+              this->reactor_type_ = TAO_REACTOR_SELECT_MT;
             else if (ACE_OS::strcasecmp (name,
                                          "select_st") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_ST;
+              this->reactor_type_ = TAO_REACTOR_SELECT_ST;
             else if (ACE_OS::strcasecmp (name,
                                          "fl") == 0)
 #if defined(ACE_HAS_FL)
-              reactor_type_ = TAO_REACTOR_FL;
+              this->reactor_type_ = TAO_REACTOR_FL;
 #else
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("TAO_Advanced_Factory - FlReactor")
@@ -136,7 +132,7 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
 #endif /* ACE_HAS_FL */
             else if (ACE_OS::strcasecmp (name, "tk_reactor") == 0)
 #if defined(ACE_HAS_TK)
-              reactor_type_ = TAO_REACTOR_TK;
+              this->reactor_type_ = TAO_REACTOR_TK;
 #else
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("TAO_Advanced_Factory - TkReactor")
@@ -145,7 +141,7 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
             else if (ACE_OS::strcasecmp (name,
                                          "wfmo") == 0)
 #if defined(ACE_WIN32)
-              reactor_type_ = TAO_REACTOR_WFMO;
+              this->reactor_type_ = TAO_REACTOR_WFMO;
 #else
               ACE_DEBUG ((LM_DEBUG,
                           "TAO_Advanced_Factory - WFMO Reactor"
@@ -154,7 +150,7 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
             else if (ACE_OS::strcasecmp (name,
                                          "msg_wfmo") == 0)
 #if defined(ACE_WIN32)
-              reactor_type_ = TAO_REACTOR_MSGWFMO;
+              this->reactor_type_ = TAO_REACTOR_MSGWFMO;
 #else
               ACE_DEBUG ((LM_DEBUG,
                           "TAO_Advanced_Factory - MsgWFMO Reactor"
@@ -163,7 +159,7 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
 
             else if (ACE_OS::strcasecmp (name,
                                          "tp") == 0)
-              reactor_type_ = TAO_REACTOR_TP;
+              this->reactor_type_ = TAO_REACTOR_TP;
             else
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("TAO_Advanced_Factory - unknown argument")
@@ -193,49 +189,14 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv)
               }
           }
       }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBSchedPolicy") == 0)
+    else
       {
-        curarg++;
-        if (curarg < argc)
+        if (TAO_debug_level > 0)
           {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "SCHED_OTHER") == 0)
-              this->sched_policy_ = ACE_SCHED_OTHER;
-            else if (ACE_OS::strcasecmp (name,
-                                         "SCHED_FIFO") == 0)
-              this->sched_policy_ = ACE_SCHED_FIFO;
-            else if (ACE_OS::strcasecmp (name,
-                                         "SCHED_RR") == 0)
-              this->sched_policy_ = ACE_SCHED_RR;
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO_Default_Factory - unknown argument")
-                          ACE_TEXT (" <%s> for -ORBSchedPolicy\n"), name));
-          }
-      }
-
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBPriorityMapping") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name,
-                                    "linear") == 0)
-              this->priority_mapping_type_ = TAO_PRIORITY_MAPPING_LINEAR;
-            else if (ACE_OS::strcasecmp (name,
-                                         "direct") == 0)
-              this->priority_mapping_type_ = TAO_PRIORITY_MAPPING_DIRECT;
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO_Default_Factory - unknown argument")
-                          ACE_TEXT (" <%s> for -ORBPriorityMapping\n"), name));
+            ACE_DEBUG ((LM_ERROR,
+                        ACE_TEXT ("TAO_Advanced_Factory: Unknown option ")
+                        ACE_TEXT ("<%s>.\n"),
+                        argv[curarg]));
           }
       }
 
@@ -660,35 +621,6 @@ TAO_Advanced_Resource_Factory::create_lf_strategy (void)
   return strategy;
 }
 
-TAO_Priority_Mapping *
-TAO_Advanced_Resource_Factory::get_priority_mapping (void)
-{
-#if (TAO_HAS_RT_CORBA == 0)
-  return 0;
-#else
-  TAO_Priority_Mapping *pm;
-  switch (this->priority_mapping_type_)
-    {
-    case TAO_PRIORITY_MAPPING_LINEAR:
-      ACE_NEW_RETURN (pm,
-                      TAO_Linear_Priority_Mapping (this->sched_policy_),
-                      0);
-      break;
-    case TAO_PRIORITY_MAPPING_DIRECT:
-      ACE_NEW_RETURN (pm,
-                      TAO_Direct_Priority_Mapping (this->sched_policy_),
-                      0);
-      break;
-    default:
-      ACE_NEW_RETURN (pm,
-                      TAO_Priority_Mapping,
-                      0);
-      break;
-    }
-  return pm;
-#endif /* TAO_HAS_RT_CORBA == 0 */
-}
-
 // ****************************************************************
 
 ACE_STATIC_SVC_DEFINE (TAO_Advanced_Resource_Factory,
diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h
index 74ec735895f..0d06565778e 100644
--- a/TAO/tao/Strategies/advanced_resource.h
+++ b/TAO/tao/Strategies/advanced_resource.h
@@ -64,13 +64,6 @@ public:
     TAO_REACTOR_TP
   };
 
-  // = Priority mapping types
-  enum
-  {
-    TAO_PRIORITY_MAPPING_LINEAR,
-    TAO_PRIORITY_MAPPING_DIRECT
-  };
-
   // = Reactor mappings strategy
   enum
   {
@@ -87,8 +80,6 @@ public:
   virtual int input_cdr_allocator_type_locked (void);
   virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
 
-  virtual TAO_Priority_Mapping *get_priority_mapping (void);
-
   virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void);
   virtual TAO_LF_Strategy *create_lf_strategy (void);
 
@@ -100,19 +91,12 @@ protected:
   TAO_ProtocolFactorySet protocol_factories_;
   // list of loaded protocol factories.
 
-  int sched_policy_;
-  // The scheduling policy used to initialize the priority mapping
-  // strategy.
-
   int reactor_registry_type_;
   // The type of reactor registry.
 
   int reactor_type_;
   // Flag indicating which kind of reactor we should use.
 
-  int priority_mapping_type_;
-  // The type of priority mapping class created by this factory.
-
   int cdr_allocator_type_;
   // The type of CDR allocators.