*** empty log message ***

10 files changed, 605 insertions, 442 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
index 8cb47065700..45321673f29 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
@@ -68,21 +68,6 @@ TAO_LB_ObjectGroupManager::remove_member (
                     LoadBalancing::ObjectGroup::_nil ());
 }
 
-LoadBalancing::ObjectGroup_ptr
-TAO_LB_ObjectGroupManager::set_primary_member (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* the_location */,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound,
-                   LoadBalancing::PrimaryNotSet,
-                   LoadBalancing::BadReplicationStyle))
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
-}
-
 LoadBalancing::Locations *
 TAO_LB_ObjectGroupManager::locations_of_members (
     LoadBalancing::ObjectGroup_ptr /* object_group */,
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
index 0e7fd89f38d..b2892f42d7d 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.h
@@ -41,7 +41,8 @@ class TAO_LB_ObjectGroupManager
 public:
 
   /// Constructor.
-  TAO_LB_ObjectGroupManager (TAO_LB_ObjectGroup_Map &map);
+  TAO_LB_ObjectGroupManager (TAO_LB_PropertyManager &property_manager,
+                             TAO_LB_ObjectGroup_Map &map);
 
   /**
    * @name TAO_LoadBalancer::ObjectGroupManager methods
diff --git a/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
index 538f718570d..6f463d92a1c 100644
--- a/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_PropertyManager.cpp
@@ -6,9 +6,9 @@ ACE_RCSID (LoadBalancing,
            LB_PropertyManager,
            "$Id$")
 
-TAO_LB_PropertyManager::TAO_LB_PropertyManager (void)
-{
-}
+// TAO_LB_PropertyManager::TAO_LB_PropertyManager (void)
+// {
+// }
 
 void
 TAO_LB_PropertyManager::set_default_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.idl b/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
index efac122abad..fc4471b761e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
@@ -196,12 +196,12 @@ module LoadBalancing
       raises (ObjectGroupNotFound,
               MemberNotFound);
 
-    ObjectGroup set_primary_member (in ObjectGroup object_group,
-                                    in Location the_location)
-      raises (ObjectGroupNotFound,
-              MemberNotFound,
-              PrimaryNotSet,
-              BadReplicationStyle);
+//     ObjectGroup set_primary_member (in ObjectGroup object_group,
+//                                     in Location the_location)
+//       raises (ObjectGroupNotFound,
+//               MemberNotFound,
+//               PrimaryNotSet,
+//               BadReplicationStyle);
 
     Locations locations_of_members (in ObjectGroup object_group)
       raises (ObjectGroupNotFound);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
index 8cb47065700..45321673f29 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
@@ -68,21 +68,6 @@ TAO_LB_ObjectGroupManager::remove_member (
                     LoadBalancing::ObjectGroup::_nil ());
 }
 
-LoadBalancing::ObjectGroup_ptr
-TAO_LB_ObjectGroupManager::set_primary_member (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
-    const LoadBalancing::Location & /* the_location */,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   LoadBalancing::ObjectGroupNotFound,
-                   LoadBalancing::MemberNotFound,
-                   LoadBalancing::PrimaryNotSet,
-                   LoadBalancing::BadReplicationStyle))
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    LoadBalancing::ObjectGroup::_nil ());
-}
-
 LoadBalancing::Locations *
 TAO_LB_ObjectGroupManager::locations_of_members (
     LoadBalancing::ObjectGroup_ptr /* object_group */,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
index 0e7fd89f38d..b2892f42d7d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.h
@@ -41,7 +41,8 @@ class TAO_LB_ObjectGroupManager
 public:
 
   /// Constructor.
-  TAO_LB_ObjectGroupManager (TAO_LB_ObjectGroup_Map &map);
+  TAO_LB_ObjectGroupManager (TAO_LB_PropertyManager &property_manager,
+                             TAO_LB_ObjectGroup_Map &map);
 
   /**
    * @name TAO_LoadBalancer::ObjectGroupManager methods
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
index 538f718570d..6f463d92a1c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_PropertyManager.cpp
@@ -6,9 +6,9 @@ ACE_RCSID (LoadBalancing,
            LB_PropertyManager,
            "$Id$")
 
-TAO_LB_PropertyManager::TAO_LB_PropertyManager (void)
-{
-}
+// TAO_LB_PropertyManager::TAO_LB_PropertyManager (void)
+// {
+// }
 
 void
 TAO_LB_PropertyManager::set_default_properties (
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
index 77e77a32dd1..c811d007329 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancingI.h
@@ -24,6 +24,9 @@
 
 #include "orbsvcs/LoadBalancingS.h"
 #include "LB_ObjectGroup_Map.h"
+#include "LB_PropertyManager.h"
+#include "LB_GenericFactory.h"
+#include "LB_ObjectGroupManager.h"
 
 class TAO_LoadBalancing_Export TAO_LoadBalancing_ReplicationManager_i
   : public virtual POA_LoadBalancing::ReplicationManager
@@ -39,58 +42,58 @@ public:
   /// Register a load notifier with the load balancer
   /// ReplicationManager.
   virtual void register_load_notifier (
-      TAO_LoadBalancing::LoadNotifier_ptr load_notifier,
+      LoadBalancing::LoadNotifier_ptr load_notifier,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a reference to the load notifier in use.
-  virtual TAO_LoadBalancing::LoadNotifier_ptr get_load_notifier (
+  virtual LoadBalancing::LoadNotifier_ptr get_load_notifier (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InterfaceNotFound));
+                     LoadBalancing::InterfaceNotFound));
 
   /**
-   * @name TAO_LoadBalancer::PropertyManager methods
+   * @name LoadBalancing::PropertyManager methods
    */
   //@{
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const TAO_LoadBalancing::Properties & props,
+      const LoadBalancing::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual TAO_LoadBalancing::Properties * get_default_properties (
+  virtual LoadBalancing::Properties * get_default_properties (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const TAO_LoadBalancing::Properties & props,
+      const LoadBalancing::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /// Set properties associated with a given Replica type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const TAO_LoadBalancing::Properties & overrides,
+      const LoadBalancing::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /**
    * Return the properties associated with a give Replica type.  These
    * properties include the type-specific properties in use, in
    * addition to the default properties that were not overridden.
    */
-  virtual TAO_LoadBalancing::Properties * get_type_properties (
+  virtual LoadBalancing::Properties * get_type_properties (
       const char * type_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -98,11 +101,11 @@ public:
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const TAO_LoadBalancing::Properties & props,
+      const LoadBalancing::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /**
    * Dynamically set the properties associated with a given object
@@ -111,13 +114,13 @@ public:
    * properties.
    */
   virtual void set_properties_dynamically (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Properties & overrides,
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /**
    * Return the properties currently in use by the given object
@@ -126,45 +129,45 @@ public:
    * were used when the Replica was created, and default properties
    * that weren't overridden.
    */
-  virtual TAO_LoadBalancing::Properties * get_properties (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
+  virtual LoadBalancing::Properties * get_properties (
+      LoadBalancing::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound));
+                     LoadBalancing::ObjectGroupNotFound));
 
   //@}
 
   /**
-   * @name TAO_LoadBalancer::ObjectGroupManager methods
+   * @name LoadBalancing::ObjectGroupManager methods
    */
   //@{
 
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
-  virtual TAO_LoadBalancing::ObjectGroup_ptr create_member (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Location & the_location,
+  virtual LoadBalancing::ObjectGroup_ptr create_member (
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Location & the_location,
       const char * type_id,
-      const TAO_LoadBalancing::Criteria & the_criteria,
+      const LoadBalancing::Criteria & the_criteria,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::MemberAlreadyPresent,
-                     TAO_LoadBalancing::NoFactory,
-                     TAO_LoadBalancing::ObjectNotCreated,
-                     TAO_LoadBalancing::InvalidCriteria,
-                     TAO_LoadBalancing::CannotMeetCriteria));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::MemberAlreadyPresent,
+                     LoadBalancing::NoFactory,
+                     LoadBalancing::ObjectNotCreated,
+                     LoadBalancing::InvalidCriteria,
+                     LoadBalancing::CannotMeetCriteria));
 
   /// Add an existing object to the ObjectGroup.
-  virtual TAO_LoadBalancing::ObjectGroup_ptr add_member (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Location & the_location,
+  virtual LoadBalancing::ObjectGroup_ptr add_member (
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Location & the_location,
       CORBA::Object_ptr member,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::MemberAlreadyPresent,
-                     TAO_LoadBalancing::ObjectNotAdded));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::MemberAlreadyPresent,
+                     LoadBalancing::ObjectNotAdded));
 
   /**
    * Remove an object at a specific location from the given
@@ -173,49 +176,49 @@ public:
    * infrastructure (load balancer) will be deleted by the
    * infrastructure.
    */
-  virtual TAO_LoadBalancing::ObjectGroup_ptr remove_member (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Location & the_location,
+  virtual LoadBalancing::ObjectGroup_ptr remove_member (
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::MemberNotFound));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
-  virtual TAO_LoadBalancing::Locations * locations_of_members (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
+  virtual LoadBalancing::Locations * locations_of_members (
+      LoadBalancing::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound));
+                     LoadBalancing::ObjectGroupNotFound));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
-  virtual TAO_LoadBalancing::ObjectGroupId get_object_group_id (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
+  virtual LoadBalancing::ObjectGroupId get_object_group_id (
+      LoadBalancing::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound));
+                     LoadBalancing::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
-  virtual TAO_LoadBalancing::ObjectGroup_ptr get_object_group_ref (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
+  virtual LoadBalancing::ObjectGroup_ptr get_object_group_ref (
+      LoadBalancing::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound));
+                     LoadBalancing::ObjectGroupNotFound));
 
   /// Return the reference corresponding to the Replica of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Location & loc,
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Location & loc,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::MemberNotFound));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::MemberNotFound));
 
   //@}
 
   /**
-   * @name TAO_LoadBalancer::GenericFactory methods
+   * @name LoadBalancing::GenericFactory methods
    */
   //@{
 
@@ -227,16 +230,16 @@ public:
    */
   virtual CORBA::Object_ptr create_object (
       const char * type_id,
-      const TAO_LoadBalancing::Criteria & the_criteria,
-      TAO_LoadBalancing::GenericFactory::FactoryCreationId_out
+      const LoadBalancing::Criteria & the_criteria,
+      LoadBalancing::GenericFactory::FactoryCreationId_out
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::NoFactory,
-                     TAO_LoadBalancing::ObjectNotCreated,
-                     TAO_LoadBalancing::InvalidCriteria,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::CannotMeetCriteria));
+                     LoadBalancing::NoFactory,
+                     LoadBalancing::ObjectNotCreated,
+                     LoadBalancing::InvalidCriteria,
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::CannotMeetCriteria));
 
   /**
    * Delete the object corresponding to the provided
@@ -245,11 +248,11 @@ public:
    * Afterward, the ObjectGroup itself will be deleted.
    */
   virtual void delete_object (
-      const TAO_LoadBalancing::GenericFactory::FactoryCreationId &
+      const LoadBalancing::GenericFactory::FactoryCreationId &
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectNotFound));
+                     LoadBalancing::ObjectNotFound));
 
   //@}
 
@@ -270,7 +273,7 @@ private:
   /// the_criteria.
   int get_initial_number_replicas (
     const char *type_id,
-    const TAO_LoadBalancing::Criteria &the_criteria,
+    const LoadBalancing::Criteria &the_criteria,
     CORBA::UShort &initial_number_replicas) const;
 
   /// Extract the value of the Factories property from the_criteria.
@@ -282,16 +285,16 @@ private:
    */
   int get_factory_infos (
     const char *type_id,
-    const TAO_LoadBalancing::Criteria &the_criteria,
-    TAO_LoadBalancing::FactoryInfos &factory_infos) const;
+    const LoadBalancing::Criteria &the_criteria,
+    LoadBalancing::FactoryInfos &factory_infos) const;
 
   /// Create a POA with the appropriate policies to support
   /// ServantLocators (i.e. the ReplicaLocator).
   int init (PortableServer::POA_ptr root_poa);
 
-  /// Assignment operator for TAO_LoadBalancer::FactoryInfo instances.
-  void operator= (TAO_LoadBalancer::FactoryInfo &lhs,
-                  const TAO_LoadBalancer::FactoryInfo &rhs);
+  /// Assignment operator for LoadBalancing::FactoryInfo instances.
+  void operator= (LoadBalancing::FactoryInfo &lhs,
+                  const LoadBalancing::FactoryInfo &rhs);
 
 private:
 
@@ -324,4 +327,4 @@ private:
 
 #include "ace/post.h"
 
-#endif  /* LOADBALANCINGI_H */
+#endif  /* TAO_LOADBALANCINGI_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancingI.h b/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
index 77e77a32dd1..c811d007329 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancingI.h
@@ -24,6 +24,9 @@
 
 #include "orbsvcs/LoadBalancingS.h"
 #include "LB_ObjectGroup_Map.h"
+#include "LB_PropertyManager.h"
+#include "LB_GenericFactory.h"
+#include "LB_ObjectGroupManager.h"
 
 class TAO_LoadBalancing_Export TAO_LoadBalancing_ReplicationManager_i
   : public virtual POA_LoadBalancing::ReplicationManager
@@ -39,58 +42,58 @@ public:
   /// Register a load notifier with the load balancer
   /// ReplicationManager.
   virtual void register_load_notifier (
-      TAO_LoadBalancing::LoadNotifier_ptr load_notifier,
+      LoadBalancing::LoadNotifier_ptr load_notifier,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a reference to the load notifier in use.
-  virtual TAO_LoadBalancing::LoadNotifier_ptr get_load_notifier (
+  virtual LoadBalancing::LoadNotifier_ptr get_load_notifier (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InterfaceNotFound));
+                     LoadBalancing::InterfaceNotFound));
 
   /**
-   * @name TAO_LoadBalancer::PropertyManager methods
+   * @name LoadBalancing::PropertyManager methods
    */
   //@{
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const TAO_LoadBalancing::Properties & props,
+      const LoadBalancing::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /// Get the default properties used by all object groups.
-  virtual TAO_LoadBalancing::Properties * get_default_properties (
+  virtual LoadBalancing::Properties * get_default_properties (
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const TAO_LoadBalancing::Properties & props,
+      const LoadBalancing::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /// Set properties associated with a given Replica type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const TAO_LoadBalancing::Properties & overrides,
+      const LoadBalancing::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /**
    * Return the properties associated with a give Replica type.  These
    * properties include the type-specific properties in use, in
    * addition to the default properties that were not overridden.
    */
-  virtual TAO_LoadBalancing::Properties * get_type_properties (
+  virtual LoadBalancing::Properties * get_type_properties (
       const char * type_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -98,11 +101,11 @@ public:
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const TAO_LoadBalancing::Properties & props,
+      const LoadBalancing::Properties & props,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /**
    * Dynamically set the properties associated with a given object
@@ -111,13 +114,13 @@ public:
    * properties.
    */
   virtual void set_properties_dynamically (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Properties & overrides,
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Properties & overrides,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::UnsupportedProperty));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::UnsupportedProperty));
 
   /**
    * Return the properties currently in use by the given object
@@ -126,45 +129,45 @@ public:
    * were used when the Replica was created, and default properties
    * that weren't overridden.
    */
-  virtual TAO_LoadBalancing::Properties * get_properties (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
+  virtual LoadBalancing::Properties * get_properties (
+      LoadBalancing::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound));
+                     LoadBalancing::ObjectGroupNotFound));
 
   //@}
 
   /**
-   * @name TAO_LoadBalancer::ObjectGroupManager methods
+   * @name LoadBalancing::ObjectGroupManager methods
    */
   //@{
 
   /// Create a member using the load balancer ObjectGroupManager, and
   /// add the created object to the ObjectGroup.
-  virtual TAO_LoadBalancing::ObjectGroup_ptr create_member (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Location & the_location,
+  virtual LoadBalancing::ObjectGroup_ptr create_member (
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Location & the_location,
       const char * type_id,
-      const TAO_LoadBalancing::Criteria & the_criteria,
+      const LoadBalancing::Criteria & the_criteria,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::MemberAlreadyPresent,
-                     TAO_LoadBalancing::NoFactory,
-                     TAO_LoadBalancing::ObjectNotCreated,
-                     TAO_LoadBalancing::InvalidCriteria,
-                     TAO_LoadBalancing::CannotMeetCriteria));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::MemberAlreadyPresent,
+                     LoadBalancing::NoFactory,
+                     LoadBalancing::ObjectNotCreated,
+                     LoadBalancing::InvalidCriteria,
+                     LoadBalancing::CannotMeetCriteria));
 
   /// Add an existing object to the ObjectGroup.
-  virtual TAO_LoadBalancing::ObjectGroup_ptr add_member (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Location & the_location,
+  virtual LoadBalancing::ObjectGroup_ptr add_member (
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Location & the_location,
       CORBA::Object_ptr member,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::MemberAlreadyPresent,
-                     TAO_LoadBalancing::ObjectNotAdded));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::MemberAlreadyPresent,
+                     LoadBalancing::ObjectNotAdded));
 
   /**
    * Remove an object at a specific location from the given
@@ -173,49 +176,49 @@ public:
    * infrastructure (load balancer) will be deleted by the
    * infrastructure.
    */
-  virtual TAO_LoadBalancing::ObjectGroup_ptr remove_member (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Location & the_location,
+  virtual LoadBalancing::ObjectGroup_ptr remove_member (
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Location & the_location,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::MemberNotFound));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::MemberNotFound));
 
   /// Return the locations of the members in the given ObjectGroup.
-  virtual TAO_LoadBalancing::Locations * locations_of_members (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
+  virtual LoadBalancing::Locations * locations_of_members (
+      LoadBalancing::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound));
+                     LoadBalancing::ObjectGroupNotFound));
 
   /// Return the ObjectGroupId for the given ObjectGroup.
-  virtual TAO_LoadBalancing::ObjectGroupId get_object_group_id (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
+  virtual LoadBalancing::ObjectGroupId get_object_group_id (
+      LoadBalancing::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound));
+                     LoadBalancing::ObjectGroupNotFound));
 
   /// @note Does this method make sense for load balanced objects?
-  virtual TAO_LoadBalancing::ObjectGroup_ptr get_object_group_ref (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
+  virtual LoadBalancing::ObjectGroup_ptr get_object_group_ref (
+      LoadBalancing::ObjectGroup_ptr object_group,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound));
+                     LoadBalancing::ObjectGroupNotFound));
 
   /// Return the reference corresponding to the Replica of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
-      TAO_LoadBalancing::ObjectGroup_ptr object_group,
-      const TAO_LoadBalancing::Location & loc,
+      LoadBalancing::ObjectGroup_ptr object_group,
+      const LoadBalancing::Location & loc,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectGroupNotFound,
-                     TAO_LoadBalancing::MemberNotFound));
+                     LoadBalancing::ObjectGroupNotFound,
+                     LoadBalancing::MemberNotFound));
 
   //@}
 
   /**
-   * @name TAO_LoadBalancer::GenericFactory methods
+   * @name LoadBalancing::GenericFactory methods
    */
   //@{
 
@@ -227,16 +230,16 @@ public:
    */
   virtual CORBA::Object_ptr create_object (
       const char * type_id,
-      const TAO_LoadBalancing::Criteria & the_criteria,
-      TAO_LoadBalancing::GenericFactory::FactoryCreationId_out
+      const LoadBalancing::Criteria & the_criteria,
+      LoadBalancing::GenericFactory::FactoryCreationId_out
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::NoFactory,
-                     TAO_LoadBalancing::ObjectNotCreated,
-                     TAO_LoadBalancing::InvalidCriteria,
-                     TAO_LoadBalancing::InvalidProperty,
-                     TAO_LoadBalancing::CannotMeetCriteria));
+                     LoadBalancing::NoFactory,
+                     LoadBalancing::ObjectNotCreated,
+                     LoadBalancing::InvalidCriteria,
+                     LoadBalancing::InvalidProperty,
+                     LoadBalancing::CannotMeetCriteria));
 
   /**
    * Delete the object corresponding to the provided
@@ -245,11 +248,11 @@ public:
    * Afterward, the ObjectGroup itself will be deleted.
    */
   virtual void delete_object (
-      const TAO_LoadBalancing::GenericFactory::FactoryCreationId &
+      const LoadBalancing::GenericFactory::FactoryCreationId &
         factory_creation_id,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     TAO_LoadBalancing::ObjectNotFound));
+                     LoadBalancing::ObjectNotFound));
 
   //@}
 
@@ -270,7 +273,7 @@ private:
   /// the_criteria.
   int get_initial_number_replicas (
     const char *type_id,
-    const TAO_LoadBalancing::Criteria &the_criteria,
+    const LoadBalancing::Criteria &the_criteria,
     CORBA::UShort &initial_number_replicas) const;
 
   /// Extract the value of the Factories property from the_criteria.
@@ -282,16 +285,16 @@ private:
    */
   int get_factory_infos (
     const char *type_id,
-    const TAO_LoadBalancing::Criteria &the_criteria,
-    TAO_LoadBalancing::FactoryInfos &factory_infos) const;
+    const LoadBalancing::Criteria &the_criteria,
+    LoadBalancing::FactoryInfos &factory_infos) const;
 
   /// Create a POA with the appropriate policies to support
   /// ServantLocators (i.e. the ReplicaLocator).
   int init (PortableServer::POA_ptr root_poa);
 
-  /// Assignment operator for TAO_LoadBalancer::FactoryInfo instances.
-  void operator= (TAO_LoadBalancer::FactoryInfo &lhs,
-                  const TAO_LoadBalancer::FactoryInfo &rhs);
+  /// Assignment operator for LoadBalancing::FactoryInfo instances.
+  void operator= (LoadBalancing::FactoryInfo &lhs,
+                  const LoadBalancing::FactoryInfo &rhs);
 
 private:
 
@@ -324,4 +327,4 @@ private:
 
 #include "ace/post.h"
 
-#endif  /* LOADBALANCINGI_H */
+#endif  /* TAO_LOADBALANCINGI_H */
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
index a109fd605f0..3c021013bd0 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
+++ b/TAO/orbsvcs/orbsvcs/Makefile.LoadBalancing
@@ -45,10 +45,10 @@ CPP_SRCS += \
   LoadBalancing/LB_PropertyManager \
   LoadBalancing/LB_RPMS_Monitor \
   LoadBalancing/LB_RPMS_Monitor_Interceptor \
+  LoadBalancing/LB_RPMS_Monitor_ORBInitializer \
   LoadBalancing/LB_Redirect_Table \
   LoadBalancing/LB_ReplicaInfo \
   LoadBalancing/LB_ReplicaLocator \
-  LoadBalancing/LB_Round_Robin_Strategy \
   LoadBalancing/LoadBalancingI
 
 
@@ -518,7 +518,7 @@ realclean: clean
  Naming/naming_export.h \
  CosNamingC.i \
  LoadBalancingC.i \
- LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_ObjectGroup_Map.h \
+ LoadBalancing/LB_ObjectGroup_Map.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -564,7 +564,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_PropertyManager.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
 .obj/LB_Minimum_Dispersion.o .obj/LB_Minimum_Dispersion.so .shobj/LB_Minimum_Dispersion.o .shobj/LB_Minimum_Dispersion.so: LoadBalancing/LB_Minimum_Dispersion.cpp \
  LoadBalancing/LB_Minimum_Dispersion.h \
@@ -799,7 +803,54 @@ realclean: clean
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- LoadBalancing/ReplicaProxy.h LoadBalancing/ReplicaProxy.i
+ LoadBalancing/LB_ObjectGroup_Map.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+ LoadBalancing/LB_ReplicaInfo.h
 
 .obj/LB_ObjectGroupManager.o .obj/LB_ObjectGroupManager.so .shobj/LB_ObjectGroupManager.o .shobj/LB_ObjectGroupManager.so: LoadBalancing/LB_ObjectGroupManager.cpp \
  LoadBalancing/LB_ObjectGroupManager.h \
@@ -1000,7 +1051,58 @@ realclean: clean
  CosNamingC.h \
  Naming/naming_export.h \
  CosNamingC.i \
- LoadBalancingC.i
+ LoadBalancingC.i \
+ LoadBalancing/LB_ObjectGroup_Map.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+ LoadBalancing/LB_ReplicaInfo.h
 
 .obj/LB_ObjectGroup_Map.o .obj/LB_ObjectGroup_Map.so .shobj/LB_ObjectGroup_Map.o .shobj/LB_ObjectGroup_Map.so: LoadBalancing/LB_ObjectGroup_Map.cpp \
  LoadBalancing/LB_ObjectGroup_Map.h \
@@ -1682,7 +1784,36 @@ realclean: clean
  LoadBalancingS_T.cpp \
  LoadBalancingS.i \
  LoadBalancing/LB_RPMS_Monitor_Interceptor.h \
- LoadBalancing/LB_RPMS_Monitor_Interceptor.inl
+ LoadBalancing/LB_Redirect_Table.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancing/LB_RPMS_Monitor_Interceptor.inl \
+ LoadBalancing/LB_RPMS_Monitor_ORBInitializer.h
 
 .obj/LB_RPMS_Monitor_Interceptor.o .obj/LB_RPMS_Monitor_Interceptor.so .shobj/LB_RPMS_Monitor_Interceptor.o .shobj/LB_RPMS_Monitor_Interceptor.so: \
  LoadBalancing/LB_RPMS_Monitor_Interceptor.cpp \
@@ -1696,9 +1827,239 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(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 \
+ $(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/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/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(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/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(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 \
+ $(TAO_ROOT)/tao/orbconf.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/DynamicC.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/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(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/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ LoadBalancingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.h \
+ $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+ $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(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 \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(ACE_ROOT)/ace/Array_Base.h \
+ $(ACE_ROOT)/ace/Array_Base.inl \
+ $(ACE_ROOT)/ace/Array_Base.cpp \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ LoadBalancing/LoadBalancing_export.h \
+ CosNamingC.h \
+ Naming/naming_export.h \
+ CosNamingC.i \
+ LoadBalancingC.i \
+ LoadBalancing/LB_Redirect_Table.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ LoadBalancing/LB_RPMS_Monitor_Interceptor.inl
+
+.obj/LB_RPMS_Monitor_ORBInitializer.o .obj/LB_RPMS_Monitor_ORBInitializer.so .shobj/LB_RPMS_Monitor_ORBInitializer.o .shobj/LB_RPMS_Monitor_ORBInitializer.so: \
+ LoadBalancing/LB_RPMS_Monitor_ORBInitializer.cpp \
+ LoadBalancing/LB_RPMS_Monitor_ORBInitializer.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.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/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1784,6 +2145,7 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
@@ -1844,8 +2206,7 @@ realclean: clean
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- LoadBalancing/LB_RPMS_Monitor_Interceptor.inl
+ $(TAO_ROOT)/tao/LocalObject.i
 
 .obj/LB_Redirect_Table.o .obj/LB_Redirect_Table.so .shobj/LB_Redirect_Table.o .shobj/LB_Redirect_Table.so: LoadBalancing/LB_Redirect_Table.cpp \
  LoadBalancing/LB_Redirect_Table.h \
@@ -1977,14 +2338,64 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.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 \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.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/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(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/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/debug.h
@@ -2464,237 +2875,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h
-
-.obj/LB_Round_Robin_Strategy.o .obj/LB_Round_Robin_Strategy.so .shobj/LB_Round_Robin_Strategy.o .shobj/LB_Round_Robin_Strategy.so: LoadBalancing/LB_Round_Robin_Strategy.cpp \
- LoadBalancing/LB_Round_Robin_Strategy.h \
- $(ACE_ROOT)/ace/pre.h \
- LoadBalancing/LB_Balancing_Strategy.h \
- LoadBalancingS.h \
- $(TAO_ROOT)/tao/PortableInterceptorS.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 \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(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/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(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 \
- $(TAO_ROOT)/tao/orbconf.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/DynamicC.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/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(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/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- CosNamingS.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(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 \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- Naming/naming_export.h \
- CosNamingC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- CosNamingS_T.h \
- CosNamingS_T.i \
- CosNamingS_T.cpp \
- CosNamingS.i \
- LoadBalancingC.h \
- LoadBalancing/LoadBalancing_export.h \
- LoadBalancingC.i \
- LoadBalancingS_T.h \
- LoadBalancingS_T.i \
- LoadBalancingS_T.cpp \
- LoadBalancingS.i \
- LoadBalancing/LoadBalancing_export.h LoadBalancing/ReplicaProxy.h \
- LoadBalancing/ReplicaProxy.i
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_PropertyManager.h \
+ LoadBalancing/LB_GenericFactory.h \
+ LoadBalancing/LB_ObjectGroupManager.h
 
 .obj/LoadBalancingI.o .obj/LoadBalancingI.so .shobj/LoadBalancingI.o .shobj/LoadBalancingI.so: LoadBalancing/LoadBalancingI.cpp \
  LoadBalancing/LoadBalancingI.h \
@@ -2969,7 +3152,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Map_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
- LoadBalancing/LB_ReplicaInfo.h
+ LoadBalancing/LB_ReplicaInfo.h LoadBalancing/LB_PropertyManager.h \
+ LoadBalancing/LB_GenericFactory.h \
+ LoadBalancing/LB_ObjectGroupManager.h
 
 .obj/LoadBalancingS.o .obj/LoadBalancingS.so .shobj/LoadBalancingS.o .shobj/LoadBalancingS.so: LoadBalancingS.cpp LoadBalancingS.h \
  $(ACE_ROOT)/ace/pre.h \