Mon Feb 12 06:50:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

34 files changed, 97 insertions, 439 deletions

diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index b64c252a9b1..94c2b13c87a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -61,7 +61,6 @@ TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void)
 
 CosLoadBalancing::Location *
 TAO_LB_CPU_Load_Average_Monitor::the_location (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -77,7 +76,6 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (void)
 
 CosLoadBalancing::LoadList *
 TAO_LB_CPU_Load_Average_Monitor::loads (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Float load = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
index 035a41a37dc..7dc97095d66 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -63,8 +63,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Location * the_location ();
 
   /// Return the average CPU load at the location which this
   /// LoadMonitor resides.
@@ -73,8 +72,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::LoadList * loads ();
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index f6c9ab4202f..6af2f8c23c0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -111,7 +111,6 @@ TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void)
 
 CosLoadBalancing::Location *
 TAO_LB_CPU_Utilization_Monitor::the_location (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Location * location;
   ACE_NEW_THROW_EX (location,
@@ -127,7 +126,6 @@ TAO_LB_CPU_Utilization_Monitor::the_location (void)
 
 CosLoadBalancing::LoadList *
 TAO_LB_CPU_Utilization_Monitor::loads (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Float load = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
index ea3431fa897..d7e8e281494 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h
@@ -60,8 +60,7 @@ public:
   /**
    * The returned "Location" is a sequence of length 1.
    */
-  virtual CosLoadBalancing::Location * the_location ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Location * the_location ();
 
   /// Return the average CPU load at the location which this
   /// LoadMonitor resides.
@@ -70,8 +69,7 @@ public:
    *         equal to CosLoadBalancing::LoadAverage, and the average CPU
    *         load.
    */
-  virtual CosLoadBalancing::LoadList * loads ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::LoadList * loads ();
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 3fb67cb6dd4..06ef0a6907c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -12,14 +12,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 void
 TAO_LB_ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr tmp;
   ACE_NEW_THROW_EX (tmp,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
index ae4b5b53b76..5e954707386 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -56,11 +56,9 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index f66ac874705..97a45fd32fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -11,22 +11,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
 TAO_LB_ClientRequestInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_ClientRequestInterceptor");
 }
 
 void
 TAO_LB_ClientRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   /*
   CORBA::Object_var t = ri->target ();
@@ -75,30 +71,24 @@ TAO_LB_ClientRequestInterceptor::send_request (
 void
 TAO_LB_ClientRequestInterceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_LB_ClientRequestInterceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
index 900293f53f6..a20986f4f6d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -68,34 +68,24 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
 
   virtual void receive_other (
-      PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ClientRequestInfo_ptr ri);
   //@}
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index b426519dec2..fefb7cd4a69 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -31,14 +31,12 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor (
 
 char *
 TAO_LB_IORInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_IORInterceptor");
 }
 
 void
 TAO_LB_IORInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Force the LoadManager reference to be released since the ORB's
   // lifetime is tied to object reference lifetimes.
@@ -48,14 +46,12 @@ TAO_LB_IORInterceptor::destroy (void)
 void
 TAO_LB_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_IORInterceptor::components_established (
     PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
@@ -89,7 +85,6 @@ void
 TAO_LB_IORInterceptor::adapter_manager_state_changed (
     const char *,
     PortableInterceptor::AdapterState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (state == PortableInterceptor::ACTIVE)
     {
@@ -101,7 +96,6 @@ void
 TAO_LB_IORInterceptor::adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
     PortableInterceptor::AdapterState state)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (state == PortableInterceptor::ACTIVE)
     {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index b3d2481831d..aa22bfd1059 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -71,37 +71,25 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
   /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((
-        CORBA::SystemException
-    ));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void components_established (
-      PortableInterceptor::IORInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::IORInfo_ptr info);
 
   virtual void adapter_manager_state_changed (
       const char * id,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      PortableInterceptor::AdapterState state);
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-      PortableInterceptor::AdapterState state)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
+      PortableInterceptor::AdapterState state);
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 0e31588a9bb..7aa42d2bba7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -54,14 +54,12 @@ TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void)
 
 char *
 TAO_LB_LeastLoaded::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LeastLoaded");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_LeastLoaded::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -79,7 +77,6 @@ void
 TAO_LB_LeastLoaded::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
@@ -153,8 +150,6 @@ TAO_LB_LeastLoaded::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_LeastLoaded::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -174,9 +169,6 @@ CORBA::Object_ptr
 TAO_LB_LeastLoaded::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -227,7 +219,6 @@ void
 TAO_LB_LeastLoaded::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index 73d3715b1a3..b4f2509debf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -87,34 +87,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
index 56b62f8a780..75794766a04 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -23,7 +23,6 @@ TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void)
 
 void
 TAO_LB_LoadAlert::enable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
@@ -32,7 +31,6 @@ TAO_LB_LoadAlert::enable_alert (void)
 
 void
 TAO_LB_LoadAlert::disable_alert (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index d4f2ecb6ddc..c84f325033b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -43,12 +43,10 @@ public:
 
   /// Forward requests back to the load manager via the object group
   /// reference.
-  virtual void enable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void enable_alert (void);
 
   /// Stop forwarding requests, and begin accepting them again.
-  virtual void disable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disable_alert (void);
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
index 1ce94dba907..dad51762f88 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -15,14 +15,12 @@ TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
 
 void
 TAO_LB_LoadAlert_Handler::enable_alert (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_LoadAlert_Handler::enable_alert_excep (
     ::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_ERROR ((LM_ERROR,
@@ -32,14 +30,12 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep (
 
 void
 TAO_LB_LoadAlert_Handler::disable_alert (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_LoadAlert_Handler::disable_alert_excep (
     ::Messaging::ExceptionHolder *)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
     ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index 7168d127bcd..9523f02abc5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -43,19 +43,15 @@ class TAO_LB_LoadAlert_Handler
 {
 public:
 
-  virtual void enable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void enable_alert (void);
 
   virtual void enable_alert_excep (
-      ::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      ::Messaging::ExceptionHolder *);
 
-  virtual void disable_alert (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disable_alert (void);
 
   virtual void disable_alert_excep (
-      ::Messaging::ExceptionHolder *)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      ::Messaging::ExceptionHolder *);
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index 378f0b7ca41..eea89c9641d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -52,14 +52,12 @@ TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void)
 
 char *
 TAO_LB_LoadAverage::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadAverage");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_LoadAverage::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -77,7 +75,6 @@ void
 TAO_LB_LoadAverage::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
@@ -151,8 +148,6 @@ TAO_LB_LoadAverage::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_LoadAverage::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -172,9 +167,6 @@ CORBA::Object_ptr
 TAO_LB_LoadAverage::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -197,7 +189,6 @@ void
 TAO_LB_LoadAverage::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
index 74e2b0d4c4c..62e64a28326 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h
@@ -69,34 +69,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index ad9d4f6f92d..8ead44278b1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -73,7 +73,6 @@ void
 TAO_LB_LoadManager::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (loads.length () == 0)
     throw CORBA::BAD_PARAM ();
@@ -131,8 +130,6 @@ TAO_LB_LoadManager::push_loads (
 
 CosLoadBalancing::LoadList *
 TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   CosLoadBalancing::LoadList * tmp;
   ACE_NEW_THROW_EX (tmp,
@@ -158,7 +155,6 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location)
 
 void
 TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
@@ -213,7 +209,6 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location)
 
 void
 TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_);
 
@@ -269,9 +264,6 @@ void
 TAO_LB_LoadManager::register_load_alert (
     const PortableGroup::Location & the_location,
     CosLoadBalancing::LoadAlert_ptr load_alert)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LoadAlertAlreadyPresent,
-                   CosLoadBalancing::LoadAlertNotAdded))
 {
   if (CORBA::is_nil (load_alert))
     throw CORBA::BAD_PARAM ();
@@ -297,8 +289,6 @@ TAO_LB_LoadManager::register_load_alert (
 CosLoadBalancing::LoadAlert_ptr
 TAO_LB_LoadManager::get_load_alert (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LoadAlertNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -322,8 +312,6 @@ TAO_LB_LoadManager::get_load_alert (
 void
 TAO_LB_LoadManager::remove_load_alert (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LoadAlertNotFound))
 {
   // Disable the "alert" status on the LoadAlert object since it will
   // no longer be associated with the LoadManager.  In particular,
@@ -344,8 +332,6 @@ void
 TAO_LB_LoadManager::register_load_monitor (
     const PortableGroup::Location & the_location,
     CosLoadBalancing::LoadMonitor_ptr load_monitor)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::MonitorAlreadyPresent))
 {
   if (CORBA::is_nil (load_monitor))
     throw CORBA::BAD_PARAM ();
@@ -403,8 +389,6 @@ TAO_LB_LoadManager::register_load_monitor (
 CosLoadBalancing::LoadMonitor_ptr
 TAO_LB_LoadManager::get_load_monitor (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
@@ -424,8 +408,6 @@ TAO_LB_LoadManager::get_load_monitor (
 void
 TAO_LB_LoadManager::remove_load_monitor (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
@@ -456,9 +438,6 @@ TAO_LB_LoadManager::remove_load_monitor (
 void
 TAO_LB_LoadManager::set_default_properties (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_props (props);
   this->preprocess_properties (new_props);
@@ -468,7 +447,6 @@ TAO_LB_LoadManager::set_default_properties (
 
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_default_properties ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     this->property_manager_.get_default_properties ();
@@ -477,9 +455,6 @@ TAO_LB_LoadManager::get_default_properties ()
 void
 TAO_LB_LoadManager::remove_default_properties (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_default_properties (props);
 }
@@ -488,9 +463,6 @@ void
 TAO_LB_LoadManager::set_type_properties (
     const char *type_id,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_overrides (overrides);
   this->preprocess_properties (new_overrides);
@@ -502,7 +474,6 @@ TAO_LB_LoadManager::set_type_properties (
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_type_properties (
     const char *type_id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     this->property_manager_.get_type_properties (type_id);
@@ -512,9 +483,6 @@ void
 TAO_LB_LoadManager::remove_type_properties (
     const char *type_id,
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->property_manager_.remove_type_properties (type_id,
                                                   props);
@@ -524,10 +492,6 @@ void
 TAO_LB_LoadManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   PortableGroup::Properties new_overrides (overrides);
   this->preprocess_properties (new_overrides);
@@ -539,8 +503,6 @@ TAO_LB_LoadManager::set_properties_dynamically (
 PortableGroup::Properties *
 TAO_LB_LoadManager::get_properties (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->property_manager_.get_properties (object_group);
@@ -552,13 +514,6 @@ TAO_LB_LoadManager::create_member (
     const PortableGroup::Location & the_location,
     const char * type_id,
     const PortableGroup::Criteria & the_criteria)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
   return
     this->object_group_manager_.create_member (object_group,
@@ -572,10 +527,6 @@ TAO_LB_LoadManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::ObjectNotAdded))
 {
   return
     this->object_group_manager_.add_member (object_group,
@@ -587,9 +538,6 @@ PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.remove_member (object_group,
@@ -599,8 +547,6 @@ TAO_LB_LoadManager::remove_member (
 PortableGroup::Locations *
 TAO_LB_LoadManager::locations_of_members (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.locations_of_members (object_group);
@@ -609,7 +555,6 @@ TAO_LB_LoadManager::locations_of_members (
 PortableGroup::ObjectGroups *
 TAO_LB_LoadManager::groups_at_location (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
     this->object_group_manager_.groups_at_location (the_location);
@@ -618,8 +563,6 @@ TAO_LB_LoadManager::groups_at_location (
 PortableGroup::ObjectGroupId
 TAO_LB_LoadManager::get_object_group_id (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.get_object_group_id (object_group);
@@ -628,8 +571,6 @@ TAO_LB_LoadManager::get_object_group_id (
 PortableGroup::ObjectGroup_ptr
 TAO_LB_LoadManager::get_object_group_ref (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   return
     this->object_group_manager_.get_object_group_ref (object_group);
@@ -637,9 +578,6 @@ TAO_LB_LoadManager::get_object_group_ref (
 
 PortableGroup::ObjectGroup_ptr TAO_LB_LoadManager::get_object_group_ref_from_id (
     PortableGroup::ObjectGroupId group_id)
-  ACE_THROW_SPEC((
-    CORBA::SystemException,
-    PortableGroup::ObjectGroupNotFound))
 {
   return this->object_group_manager_.get_object_group_ref_from_id (
     group_id);
@@ -649,9 +587,6 @@ CORBA::Object_ptr
 TAO_LB_LoadManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   return
     this->object_group_manager_.get_member_ref (object_group,
@@ -664,12 +599,6 @@ TAO_LB_LoadManager::create_object (
     const PortableGroup::Criteria & the_criteria,
     PortableGroup::GenericFactory::FactoryCreationId_out
       factory_creation_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::CannotMeetCriteria))
 {
 //   this->init ();
 
@@ -742,8 +671,6 @@ void
 TAO_LB_LoadManager::delete_object (
     const PortableGroup::GenericFactory::FactoryCreationId &
       factory_creation_id)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectNotFound))
 {
   this->generic_factory_.delete_object (factory_creation_id);
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index 22cfeb1d3e3..47fce3ecdf4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -53,65 +53,47 @@ public:
 
   /// For the PUSH load monitoring style.
   virtual void push_loads (const PortableGroup::Location & the_location,
-                           const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                           const CosLoadBalancing::LoadList & loads);
 
   /// Return the raw loads at the given location.
   virtual CosLoadBalancing::LoadList * get_loads (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Inform member at given location of load alert condition.
-  virtual void enable_alert (const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound));
+  virtual void enable_alert (const PortableGroup::Location & the_location);
 
   /// Inform member at given location that load alert condition has
   /// passed.
-  virtual void disable_alert (const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CosLoadBalancing::LoadAlertNotFound));
+  virtual void disable_alert (const PortableGroup::Location & the_location);
 
   /// Register a LoadAlert object for the member at the given
   /// location.
   virtual void register_load_alert (
       const PortableGroup::Location & the_location,
-      CosLoadBalancing::LoadAlert_ptr load_alert)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LoadAlertAlreadyPresent,
-                     CosLoadBalancing::LoadAlertNotAdded));
+      CosLoadBalancing::LoadAlert_ptr load_alert);
 
   /// Retrieve the LoadAlert object for the member at the given
   /// location.
   virtual CosLoadBalancing::LoadAlert_ptr get_load_alert (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LoadAlertNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Remove (de-register) the LoadAlert object for the member at the
   /// given location.
-  virtual void remove_load_alert (const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LoadAlertNotFound));
+  virtual void remove_load_alert (const PortableGroup::Location & the_location);
 
   /// Register a load monitor with the load balancer.
   virtual void register_load_monitor (
       const PortableGroup::Location & the_location,
-      CosLoadBalancing::LoadMonitor_ptr load_monitor)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::MonitorAlreadyPresent));
+      CosLoadBalancing::LoadMonitor_ptr load_monitor);
 
   /// Return a reference to the load monitor at the given location.
   virtual CosLoadBalancing::LoadMonitor_ptr get_load_monitor (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Remove a load monitor at the given location from the load
   /// balancer.
   virtual void remove_load_monitor (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   //@}
 
@@ -124,30 +106,20 @@ public:
 
   /// Set the default properties to be used by all object groups.
   virtual void set_default_properties (
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /// Get the default properties used by all object groups.
-  virtual PortableGroup::Properties * get_default_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual PortableGroup::Properties * get_default_properties ();
 
   /// Remove default properties.
   virtual void remove_default_properties (
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /// Set properties associated with a given Replica type.  These
   /// properties override the default properties.
   virtual void set_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & overrides)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & overrides);
 
   /**
    * Return the properties associated with a give Replica type.  These
@@ -155,16 +127,12 @@ public:
    * addition to the default properties that were not overridden.
    */
   virtual PortableGroup::Properties * get_type_properties (
-      const char * type_id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const char * type_id);
 
   /// Remove the given properties associated with the Replica type ID.
   virtual void remove_type_properties (
       const char * type_id,
-      const PortableGroup::Properties & props)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & props);
 
   /**
    * Dynamically set the properties associated with a given object
@@ -174,11 +142,7 @@ public:
    */
   virtual void set_properties_dynamically (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Properties & overrides)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::UnsupportedProperty));
+      const PortableGroup::Properties & overrides);
 
   /**
    * Return the properties currently in use by the given object
@@ -188,9 +152,7 @@ public:
    * that weren't overridden.
    */
   virtual PortableGroup::Properties * get_properties (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   //@}
 
@@ -208,24 +170,13 @@ public:
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
       const char * type_id,
-      const PortableGroup::Criteria & the_criteria)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberAlreadyPresent,
-                     PortableGroup::NoFactory,
-                     PortableGroup::ObjectNotCreated,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::CannotMeetCriteria));
+      const PortableGroup::Criteria & the_criteria);
 
   /// Add an existing object to the ObjectGroup.
   virtual PortableGroup::ObjectGroup_ptr add_member (
       PortableGroup::ObjectGroup_ptr object_group,
       const PortableGroup::Location & the_location,
-      CORBA::Object_ptr member)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberAlreadyPresent,
-                     PortableGroup::ObjectNotAdded));
+      CORBA::Object_ptr member);
 
   /**
    * Remove an object at a specific location from the given
@@ -236,49 +187,33 @@ public:
    */
   virtual PortableGroup::ObjectGroup_ptr remove_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      const PortableGroup::Location & the_location);
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::Locations * locations_of_members (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// Return the locations of the members in the given ObjectGroup.
   virtual PortableGroup::ObjectGroups * groups_at_location (
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const PortableGroup::Location & the_location);
 
   /// Return the ObjectGroupId for the given ObjectGroup.
   virtual PortableGroup::ObjectGroupId get_object_group_id (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// @note Does this method make sense for load balanced objects?
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-      PortableGroup::ObjectGroup_ptr object_group)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroup_ptr object_group);
 
   /// TAO specific method
   virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
-      PortableGroup::ObjectGroupId group_id)
-    ACE_THROW_SPEC((
-       CORBA::SystemException,
-       PortableGroup::ObjectGroupNotFound));
+      PortableGroup::ObjectGroupId group_id);
 
   /// Return the reference corresponding to the Replica of a given
   /// ObjectGroup at the given location.
   virtual CORBA::Object_ptr get_member_ref (
       PortableGroup::ObjectGroup_ptr object_group,
-      const PortableGroup::Location & loc)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      const PortableGroup::Location & loc);
 
   //@}
 
@@ -299,13 +234,7 @@ public:
       const char * type_id,
       const PortableGroup::Criteria & the_criteria,
       PortableGroup::GenericFactory::FactoryCreationId_out
-        factory_creation_id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::NoFactory,
-                     PortableGroup::ObjectNotCreated,
-                     PortableGroup::InvalidCriteria,
-                     PortableGroup::InvalidProperty,
-                     PortableGroup::CannotMeetCriteria));
+        factory_creation_id);
 
   /**
    * Delete the object corresponding to the provided
@@ -315,9 +244,7 @@ public:
    */
   virtual void delete_object (
       const PortableGroup::GenericFactory::FactoryCreationId &
-        factory_creation_id)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectNotFound));
+        factory_creation_id);
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index eb8e197efe6..39cc9e497e1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -53,14 +53,12 @@ TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void)
 
 char *
 TAO_LB_LoadMinimum::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("LoadMinimum");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_LoadMinimum::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -78,7 +76,6 @@ void
 TAO_LB_LoadMinimum::push_loads (
     const PortableGroup::Location & the_location,
     const CosLoadBalancing::LoadList & loads)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only the first load is used by this load balancing strategy.
   if (loads.length () == 0)
@@ -152,8 +149,6 @@ TAO_LB_LoadMinimum::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_LoadMinimum::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                                const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -173,9 +168,6 @@ CORBA::Object_ptr
 TAO_LB_LoadMinimum::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -232,7 +224,6 @@ void
 TAO_LB_LoadMinimum::analyze_loads (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
     if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
index b2785462279..4874926aec4 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h
@@ -88,34 +88,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
index 6210a2860db..f8e89fb7857 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -23,8 +23,6 @@ TAO_LB_MemberLocator::preinvoke (
     PortableServer::POA_ptr /* adapter */,
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie & /* the_cookie */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::ForwardRequest))
 {
   try
     {
@@ -61,7 +59,6 @@ TAO_LB_MemberLocator::postinvoke (
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie /* the_cookie */,
     PortableServer::Servant /* the_servant */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
index bc395ed36f0..d5a570cb318 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -61,9 +61,7 @@ public:
       const PortableServer::ObjectId & oid,
       PortableServer::POA_ptr adapter,
       const char * operation,
-      PortableServer::ServantLocator::Cookie & the_cookie)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest));
+      PortableServer::ServantLocator::Cookie & the_cookie);
 
   /// This method is no-op in this ServantLocator implementation.
   virtual void postinvoke (
@@ -71,8 +69,7 @@ public:
       PortableServer::POA_ptr adapter,
       const char * operation,
       PortableServer::ServantLocator::Cookie the_cookie,
-      PortableServer::Servant the_servant)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableServer::Servant the_servant);
 
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index f82e4f02eb7..81e9373c6e2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -27,14 +27,12 @@ TAO_LB_ORBInitializer::TAO_LB_ORBInitializer (
 void
 TAO_LB_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
     info->resolve_initial_references ("LoadManager");
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
index 83f93618333..c019eebf019 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
@@ -68,11 +68,9 @@ public:
    * interface.
    */
   //@{
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
   //@}
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index be53f7004fd..8ca8ca70b05 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -84,7 +84,6 @@ CORBA::Object_ptr
 TAO_LB_ObjectReferenceFactory::make_object (
     const char * repository_id,
     const PortableInterceptor::ObjectId & id)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (repository_id == 0)
     throw CORBA::BAD_PARAM ();
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index a5e119164e3..583e0674000 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -70,8 +70,7 @@ class TAO_LB_ObjectReferenceFactory
   //@{
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
-      const PortableInterceptor::ObjectId & id)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      const PortableInterceptor::ObjectId & id);
   //@}
 
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index febc140ce6d..2e85283e384 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -29,14 +29,12 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa)
 
 char *
 TAO_LB_Random::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Random");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_Random::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosLoadBalancing::Properties * props = 0;
   ACE_NEW_THROW_EX (props,
@@ -54,8 +52,6 @@ void
 TAO_LB_Random::push_loads (
     const PortableGroup::Location & /* the_location */,
     const CosLoadBalancing::LoadList & /* loads */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::StrategyNotAdaptive))
 {
   throw CosLoadBalancing::StrategyNotAdaptive ();
 }
@@ -63,8 +59,6 @@ TAO_LB_Random::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_Random::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                           const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -76,9 +70,6 @@ CORBA::Object_ptr
 TAO_LB_Random::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -95,7 +86,6 @@ void
 TAO_LB_Random::analyze_loads (
     PortableGroup::ObjectGroup_ptr /* object_group */,
     CosLoadBalancing::LoadManager_ptr /* load_manager */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -110,9 +100,6 @@ TAO_LB_Random::_tao_next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager,
     const PortableGroup::Locations & locations)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   const CORBA::ULong len = locations.length ();
   if (len == 0)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index a1ffe3ee89c..a457e689c46 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -50,35 +50,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::StrategyNotAdaptive));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
@@ -90,10 +80,7 @@ public:
   static CORBA::Object_ptr _tao_next_member (
       PortableGroup::ObjectGroup_ptr object_group,
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Locations & locations)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      const PortableGroup::Locations & locations);
 
   /// Initialize the random load balancing strategy.
   /**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 4266ba6052c..9c56658d726 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -26,14 +26,12 @@ TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void)
 
 char *
 TAO_LB_RoundRobin::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("RoundRobin");
 }
 
 CosLoadBalancing::Properties *
 TAO_LB_RoundRobin::get_properties (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // There are no RoundRobin properties.  Return an empty property
   // list.
@@ -54,8 +52,6 @@ void
 TAO_LB_RoundRobin::push_loads (
     const PortableGroup::Location & /* the_location */,
     const CosLoadBalancing::LoadList & /* loads */)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::StrategyNotAdaptive))
 {
   throw CosLoadBalancing::StrategyNotAdaptive ();
 }
@@ -63,8 +59,6 @@ TAO_LB_RoundRobin::push_loads (
 CosLoadBalancing::LoadList *
 TAO_LB_RoundRobin::get_loads (CosLoadBalancing::LoadManager_ptr load_manager,
                               const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosLoadBalancing::LocationNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -76,9 +70,6 @@ CORBA::Object_ptr
 TAO_LB_RoundRobin::next_member (
     PortableGroup::ObjectGroup_ptr object_group,
     CosLoadBalancing::LoadManager_ptr load_manager)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   if (CORBA::is_nil (load_manager))
     throw CORBA::BAD_PARAM ();
@@ -144,7 +135,6 @@ void
 TAO_LB_RoundRobin::analyze_loads (
     PortableGroup::ObjectGroup_ptr /* object_group */,
     CosLoadBalancing::LoadManager_ptr /* load_manager */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index aecac8a987b..2f307ed07a0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -51,35 +51,25 @@ public:
    * Methods required by the CosLoadBalancing::Strategy interface.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual CosLoadBalancing::Properties * get_properties ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosLoadBalancing::Properties * get_properties ();
 
   virtual void push_loads (
       const PortableGroup::Location & the_location,
-      const CosLoadBalancing::LoadList & loads)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::StrategyNotAdaptive));
+      const CosLoadBalancing::LoadList & loads);
 
   virtual CosLoadBalancing::LoadList * get_loads (
       CosLoadBalancing::LoadManager_ptr load_manager,
-      const PortableGroup::Location & the_location)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CosLoadBalancing::LocationNotFound));
+      const PortableGroup::Location & the_location);
 
   virtual CORBA::Object_ptr next_member (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableGroup::ObjectGroupNotFound,
-                     PortableGroup::MemberNotFound));
+      CosLoadBalancing::LoadManager_ptr load_manager);
 
   virtual void analyze_loads (
       PortableGroup::ObjectGroup_ptr object_group,
-      CosLoadBalancing::LoadManager_ptr load_manager)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      CosLoadBalancing::LoadManager_ptr load_manager);
   //@}
 
   /// Returns the default POA for this servant.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
index 4feb2474cac..ca239bf7a8d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -24,22 +24,18 @@ TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void)
 
 char *
 TAO_LB_ServerRequestInterceptor::name (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor");
 }
 
 void
 TAO_LB_ServerRequestInterceptor::destroy (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (this->load_alert_.alerted ())
     {
@@ -118,23 +114,18 @@ TAO_LB_ServerRequestInterceptor::receive_request_service_contexts (
 void
 TAO_LB_ServerRequestInterceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 TAO_LB_ServerRequestInterceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     {
@@ -150,8 +141,6 @@ TAO_LB_ServerRequestInterceptor::send_exception (
 void
 TAO_LB_ServerRequestInterceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   if (TAO_debug_level > 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
index 5cd2591ffeb..dfdd7c2f0e6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -63,35 +63,24 @@ public:
    * ServerRequestInterceptors.
    */
   //@{
-  virtual char * name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name (void);
 
-  virtual void destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy (void);
 
   virtual void receive_request_service_contexts (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void send_other (
-      PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+      PortableInterceptor::ServerRequestInfo_ptr ri);
   //@}
 
 protected: