*** empty log message ***

10 files changed, 184 insertions, 234 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp
new file mode 100644
index 00000000000..3dc7949dd15
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.cpp
@@ -0,0 +1,18 @@
+// -*- C++ -*-
+
+#include "LB_Balancing_Strategy.h"
+
+
+ACE_RCSID (orbsvcs,
+           LB_Balancing_Strategy,
+           "$Id$")
+
+TAO_LB_Balancing_Strategy::~TAO_LB_Balancing_Strategy (void)
+{
+}
+
+void
+TAO_LB_Balancing_Strategy::load_changed (TAO_LB_ReplicaProxy *,
+                                         CORBA::Environment &)
+{
+}
diff --git a/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h
new file mode 100644
index 00000000000..a78ad47aebc
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LB_Balancing_Strategy.h
@@ -0,0 +1,74 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LoadBalancing_Strategy.h
+ *
+ *  $Id$
+ *
+ *  @author Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
+
+#ifndef TAO_LB_BALANCING_STRATEGY_H
+#define TAO_LB_BALANCING_STRATEGY_H
+
+#include "ace/pre.h"
+
+#include "orbsvcs/LoadBalancingS.h"
+#include "LoadBalancing_export.h"
+
+# if !defined (ACE_LACKS_PRAGMA_ONCE)
+#   pragma once
+# endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class TAO_LB_ReplicaProxy;
+
+
+/**
+ * @class TAO_LB_Balancing_Strategy
+ *
+ * @brief Load balancing strategy abstract base class.
+ *
+ * This abstract base class defines the interface load balancing
+ * strategies should implement.
+ */
+class TAO_LoadBalancing_Export TAO_LB_Balancing_Strategy
+{
+public:
+
+  /// Destructor
+  virtual ~TAO_LB_Balancing_Strategy (void);
+
+  // @@ The name of the method should be more meaningful, what about:
+  //    select_replica(), select_unloaded_replica() or something like
+  //    that?
+  /// Return the object reference to the Replica to which requests should
+  /// be redirected.
+  virtual CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+
+  /// Insert ReplicaProxy servant into the set of replica proxies upon
+  /// which the load balancing algorithm is performed.
+  virtual int insert (TAO_LB_ReplicaProxy *) = 0;
+
+  /// Remove ReplicaProxy servant from the set of replica proxies.
+  virtual int remove (TAO_LB_ReplicaProxy *) = 0;
+
+  /**
+   * The load on one proxy has changed.
+   * @@ Ossama: see my comments on LoadBalancing_i about changing the
+   * signature of this method.
+   */
+  virtual void load_changed (TAO_LB_ReplicaProxy *proxy,
+                             CORBA::Environment &ACE_TRY_ENV);
+};
+
+#if !defined (__ACE_INLINE__)
+#include "LoadBalancing_Strategy.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif  /* TAO_LB_BALANCING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp
new file mode 100644
index 00000000000..3dc7949dd15
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.cpp
@@ -0,0 +1,18 @@
+// -*- C++ -*-
+
+#include "LB_Balancing_Strategy.h"
+
+
+ACE_RCSID (orbsvcs,
+           LB_Balancing_Strategy,
+           "$Id$")
+
+TAO_LB_Balancing_Strategy::~TAO_LB_Balancing_Strategy (void)
+{
+}
+
+void
+TAO_LB_Balancing_Strategy::load_changed (TAO_LB_ReplicaProxy *,
+                                         CORBA::Environment &)
+{
+}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h
new file mode 100644
index 00000000000..a78ad47aebc
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Balancing_Strategy.h
@@ -0,0 +1,74 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LoadBalancing_Strategy.h
+ *
+ *  $Id$
+ *
+ *  @author Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
+
+#ifndef TAO_LB_BALANCING_STRATEGY_H
+#define TAO_LB_BALANCING_STRATEGY_H
+
+#include "ace/pre.h"
+
+#include "orbsvcs/LoadBalancingS.h"
+#include "LoadBalancing_export.h"
+
+# if !defined (ACE_LACKS_PRAGMA_ONCE)
+#   pragma once
+# endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class TAO_LB_ReplicaProxy;
+
+
+/**
+ * @class TAO_LB_Balancing_Strategy
+ *
+ * @brief Load balancing strategy abstract base class.
+ *
+ * This abstract base class defines the interface load balancing
+ * strategies should implement.
+ */
+class TAO_LoadBalancing_Export TAO_LB_Balancing_Strategy
+{
+public:
+
+  /// Destructor
+  virtual ~TAO_LB_Balancing_Strategy (void);
+
+  // @@ The name of the method should be more meaningful, what about:
+  //    select_replica(), select_unloaded_replica() or something like
+  //    that?
+  /// Return the object reference to the Replica to which requests should
+  /// be redirected.
+  virtual CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+
+  /// Insert ReplicaProxy servant into the set of replica proxies upon
+  /// which the load balancing algorithm is performed.
+  virtual int insert (TAO_LB_ReplicaProxy *) = 0;
+
+  /// Remove ReplicaProxy servant from the set of replica proxies.
+  virtual int remove (TAO_LB_ReplicaProxy *) = 0;
+
+  /**
+   * The load on one proxy has changed.
+   * @@ Ossama: see my comments on LoadBalancing_i about changing the
+   * signature of this method.
+   */
+  virtual void load_changed (TAO_LB_ReplicaProxy *proxy,
+                             CORBA::Environment &ACE_TRY_ENV);
+};
+
+#if !defined (__ACE_INLINE__)
+#include "LoadBalancing_Strategy.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+
+#endif  /* TAO_LB_BALANCING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp
deleted file mode 100644
index a64cf50f4b7..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-
-#include "LoadBalancing_Strategy.h"
-#include "ace/Containers.h"
-
-#if defined (__ACE_INLINE__)
-#include "LoadBalancing_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(orbsvcs, LoadBalancing_Strategy, "$Id$")
-
-TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void)
-{
-}
-
-void
-TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *,
-                                              CORBA::Environment &)
-{
-}
-
-// @@ Ossama: i had to instantiate the template here because it is
-// used in two strategies, but it sound kind of silly...
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<TAO_LB_ReplicaProxy *>;
-template class ACE_Unbounded_Set<TAO_LB_ReplicaProxy *>;
-template class ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<TAO_LB_ReplicaProxy *>
-#pragma instantiate ACE_Unbounded_Set<TAO_LB_ReplicaProxy *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h
deleted file mode 100644
index a13fe85e1e7..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_LoadBalancing
-//
-// = FILENAME
-//    LoadBalancing_Strategy.h
-//
-// = AUTHOR
-//    Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
-
-#ifndef LOAD_BALANCING_STRATEGY_H
-#define LOAD_BALANCING_STRATEGY_H
-
-#include "ace/pre.h"
-
-#include "orbsvcs/LoadBalancingS.h"
-#include "LoadBalancing_export.h"
-
-# if !defined (ACE_LACKS_PRAGMA_ONCE)
-#   pragma once
-# endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_LB_ReplicaProxy;
-
-// The abstract load balancing strategy class.
-
-class TAO_LoadBalancing_Export TAO_LB_LoadBalancing_Strategy
-{
-  // = TITLE
-  //    Load balancing strategy abstract base class.
-
-  // = DESCRIPTION
-  //    This abstract base class defines the interface load balancing
-  //    strategies should implement.
-
-public:
-  virtual ~TAO_LB_LoadBalancing_Strategy (void);
-  // Destructor
-
-  // @@ The name of the method should be more meaningful, what about:
-  //    select_replica(), select_unloaded_replica() or something like
-  //    that?
-  virtual CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Return the object reference to the Replica to which requests should
-  // be redirected.
-
-  virtual int insert (TAO_LB_ReplicaProxy *) = 0;
-  // Insert ReplicaProxy servant into the set of replica proxies upon
-  // which the load balancing algorithm is performed.
-
-  virtual int remove (TAO_LB_ReplicaProxy *) = 0;
-  // Remove ReplicaProxy servant from the set of replica proxies.
-
-  virtual void load_changed (TAO_LB_ReplicaProxy *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  // The load on one proxy has changed.
-  // @@ Ossama: see my comments on LoadBalancing_i about changing the
-  // signature of this method.
-};
-
-#if !defined (__ACE_INLINE__)
-#include "LoadBalancing_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-
-#endif  /* LOAD_BALANCING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.i b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.i
deleted file mode 100644
index aa25cd5a09f..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp
deleted file mode 100644
index a64cf50f4b7..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-
-#include "LoadBalancing_Strategy.h"
-#include "ace/Containers.h"
-
-#if defined (__ACE_INLINE__)
-#include "LoadBalancing_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(orbsvcs, LoadBalancing_Strategy, "$Id$")
-
-TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void)
-{
-}
-
-void
-TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *,
-                                              CORBA::Environment &)
-{
-}
-
-// @@ Ossama: i had to instantiate the template here because it is
-// used in two strategies, but it sound kind of silly...
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<TAO_LB_ReplicaProxy *>;
-template class ACE_Unbounded_Set<TAO_LB_ReplicaProxy *>;
-template class ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<TAO_LB_ReplicaProxy *>
-#pragma instantiate ACE_Unbounded_Set<TAO_LB_ReplicaProxy *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_LB_ReplicaProxy *>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h
deleted file mode 100644
index a13fe85e1e7..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO_LoadBalancing
-//
-// = FILENAME
-//    LoadBalancing_Strategy.h
-//
-// = AUTHOR
-//    Ossama Othman <ossama@uci.edu>
-//
-// ============================================================================
-
-#ifndef LOAD_BALANCING_STRATEGY_H
-#define LOAD_BALANCING_STRATEGY_H
-
-#include "ace/pre.h"
-
-#include "orbsvcs/LoadBalancingS.h"
-#include "LoadBalancing_export.h"
-
-# if !defined (ACE_LACKS_PRAGMA_ONCE)
-#   pragma once
-# endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_LB_ReplicaProxy;
-
-// The abstract load balancing strategy class.
-
-class TAO_LoadBalancing_Export TAO_LB_LoadBalancing_Strategy
-{
-  // = TITLE
-  //    Load balancing strategy abstract base class.
-
-  // = DESCRIPTION
-  //    This abstract base class defines the interface load balancing
-  //    strategies should implement.
-
-public:
-  virtual ~TAO_LB_LoadBalancing_Strategy (void);
-  // Destructor
-
-  // @@ The name of the method should be more meaningful, what about:
-  //    select_replica(), select_unloaded_replica() or something like
-  //    that?
-  virtual CORBA::Object_ptr replica (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-  // Return the object reference to the Replica to which requests should
-  // be redirected.
-
-  virtual int insert (TAO_LB_ReplicaProxy *) = 0;
-  // Insert ReplicaProxy servant into the set of replica proxies upon
-  // which the load balancing algorithm is performed.
-
-  virtual int remove (TAO_LB_ReplicaProxy *) = 0;
-  // Remove ReplicaProxy servant from the set of replica proxies.
-
-  virtual void load_changed (TAO_LB_ReplicaProxy *proxy,
-                             CORBA::Environment &ACE_TRY_ENV);
-  // The load on one proxy has changed.
-  // @@ Ossama: see my comments on LoadBalancing_i about changing the
-  // signature of this method.
-};
-
-#if !defined (__ACE_INLINE__)
-#include "LoadBalancing_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-
-#endif  /* LOAD_BALANCING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.i b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.i
deleted file mode 100644
index aa25cd5a09f..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.i
+++ /dev/null
@@ -1,3 +0,0 @@
-// -*- C++ -*-
-
-// $Id$