*** empty log message ***

6 files changed, 23 insertions, 55 deletions

diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
index ba6484fc02f..b406fc3b766 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
@@ -26,7 +26,7 @@ TAO_LoadBalancer::parse_args (int argc,
                               char *argv[],
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:o:s:h");
+  ACE_Get_Opt get_opts (argc, argv, "o:s:h");
 
   int c = 0;
 
@@ -34,9 +34,6 @@ TAO_LoadBalancer::parse_args (int argc,
     {
       switch (c)
         {
-//         case 'i':
-//           this->repository_id_ = get_opts.optarg;
-//           break;
         case 'o':
           this->load_balancer_file_ = get_opts.optarg;
           break;
@@ -120,6 +117,7 @@ TAO_LoadBalancer::usage (const char *cmd) const
   ACE_DEBUG ((LM_INFO,
               ACE_TEXT ("Usage:  %s ")
               ACE_TEXT ("-o <ior_output_file> ")
+              ACE_TEXT ("-s <rr|md> ")
               ACE_TEXT ("-h ")
               ACE_TEXT ("\n"),
               cmd));
diff --git a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
index d869aef990e..6d809749243 100644
--- a/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_GenericFactory.cpp
@@ -24,7 +24,7 @@ TAO_LB_GenericFactory::TAO_LB_GenericFactory (
 CORBA::Object_ptr
 TAO_LB_GenericFactory::create_object (
     const char * type_id,
-    const LoadBalancing::Criteria & the_criteria,
+    const LoadBalancing::Criteria & /* the_criteria */,
     LoadBalancing::GenericFactory::FactoryCreationId_out
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
@@ -35,10 +35,10 @@ TAO_LB_GenericFactory::create_object (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::CannotMeetCriteria))
 {
-//   LoadBalancing::Criteria_var creation_criteria =
-//     this->property_manager_.process_criteria (the_criteria,
-//                                               ACE_TRY_ENV);
-//   ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  LoadBalancing::Properties_var properties =
+    this->property_manager_.get_type_properties (type_id,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   CORBA::ULong factory_infos_count = factory_infos.length ();
 
@@ -199,21 +199,6 @@ TAO_LB_GenericFactory::populate_object_group (
 {
   for (CORBA::ULong j = 0; j < factory_infos_count; ++j)
     {
-      // The FactoryInfo::the_location member was used when
-      // determining which FactoryInfo
-      //    member?
-      // @@ It looks like it is only used when the application
-      //    control membership style is used.  The application
-      //    requests that a replica be created at a given
-      //    "location," at which point the ReplicationManager
-      //    searches through its registered FactoryInfos for a
-      //    FactoryInfo with a "Location" member that matches
-      //    the location at which to create the desired
-      //    replica.
-      // @@ It is also used to ensure that only one replica of
-      //    a given type is created at a given location.
-
-
       LoadBalancing::FactoryInfo &factory_info =
         factory_infos[j];
 
diff --git a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
index b28da531573..919eb0980ad 100644
--- a/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LB_ObjectGroupManager.cpp
@@ -139,7 +139,7 @@ TAO_LB_ObjectGroupManager::locations_of_members (
 
 LoadBalancing::ObjectGroupId
 TAO_LB_ObjectGroupManager::get_object_group_id (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    LoadBalancing::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::ObjectGroupNotFound))
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing.idl b/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
index 1dc9d9db16f..42b36ba9a07 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing.idl
@@ -85,15 +85,15 @@ module LoadBalancing
   const MembershipStyle MEMB_APP_CTRL = 0;
   const MembershipStyle MEMB_INF_CTRL = 1;
 
-  typedef unsigned short LoadMonitoringStyle;
-  const LoadMonitoringStyle PULL = 0;
-  const LoadMonitoringStyle PUSH = 1;
-  //  const LoadMonitoringStyle NOT_MONITORED = 2;
-
-  typedef unsigned short LoadMonitoringGranularity;
-  const LoadMonitoringGranularity MEMB = 0;
-  const LoadMonitoringGranularity LOC = 1;
-  const LoadMonitoringGranularity LOC_AND_TYPE = 2;
+  typedef unsigned short MonitoringStyle;
+  const MonitoringStyle PULL = 0;
+  const MonitoringStyle PUSH = 1;
+  //  const MonitoringStyle NOT_MONITORED = 2;
+
+  typedef unsigned short MonitoringGranularity;
+  const MonitoringGranularity MEMB = 0;
+  const MonitoringGranularity LOC = 1;
+  const MonitoringGranularity LOC_AND_TYPE = 2;
 
   typedef unsigned short InitialNumberReplicas;
   typedef unsigned short MinimumNumberReplicas;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
index d869aef990e..6d809749243 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_GenericFactory.cpp
@@ -24,7 +24,7 @@ TAO_LB_GenericFactory::TAO_LB_GenericFactory (
 CORBA::Object_ptr
 TAO_LB_GenericFactory::create_object (
     const char * type_id,
-    const LoadBalancing::Criteria & the_criteria,
+    const LoadBalancing::Criteria & /* the_criteria */,
     LoadBalancing::GenericFactory::FactoryCreationId_out
       factory_creation_id,
     CORBA::Environment &ACE_TRY_ENV)
@@ -35,10 +35,10 @@ TAO_LB_GenericFactory::create_object (
                    LoadBalancing::InvalidProperty,
                    LoadBalancing::CannotMeetCriteria))
 {
-//   LoadBalancing::Criteria_var creation_criteria =
-//     this->property_manager_.process_criteria (the_criteria,
-//                                               ACE_TRY_ENV);
-//   ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  LoadBalancing::Properties_var properties =
+    this->property_manager_.get_type_properties (type_id,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   CORBA::ULong factory_infos_count = factory_infos.length ();
 
@@ -199,21 +199,6 @@ TAO_LB_GenericFactory::populate_object_group (
 {
   for (CORBA::ULong j = 0; j < factory_infos_count; ++j)
     {
-      // The FactoryInfo::the_location member was used when
-      // determining which FactoryInfo
-      //    member?
-      // @@ It looks like it is only used when the application
-      //    control membership style is used.  The application
-      //    requests that a replica be created at a given
-      //    "location," at which point the ReplicationManager
-      //    searches through its registered FactoryInfos for a
-      //    FactoryInfo with a "Location" member that matches
-      //    the location at which to create the desired
-      //    replica.
-      // @@ It is also used to ensure that only one replica of
-      //    a given type is created at a given location.
-
-
       LoadBalancing::FactoryInfo &factory_info =
         factory_infos[j];
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
index b28da531573..919eb0980ad 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectGroupManager.cpp
@@ -139,7 +139,7 @@ TAO_LB_ObjectGroupManager::locations_of_members (
 
 LoadBalancing::ObjectGroupId
 TAO_LB_ObjectGroupManager::get_object_group_id (
-    LoadBalancing::ObjectGroup_ptr /* object_group */,
+    LoadBalancing::ObjectGroup_ptr object_group,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    LoadBalancing::ObjectGroupNotFound))