ChangeLogTag:Sat Jun 12 19:51:29 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

23 files changed, 253 insertions, 88 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 3183e7cc00f..3e01d7110a0 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,29 @@
+Sat Jun 12 19:51:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
+	* orbsvcs/orbsvcs/Runtime_Scheduler.h:
+	* orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
+	* orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h:
+	* orbsvcs/orbsvcs/Naming/Naming_Context.cpp:
+	* orbsvcs/orbsvcs/Naming/Naming_Context.h:
+	* orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
+	* orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h:
+	* orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+	* orbsvcs/orbsvcs/Sched/Config_Scheduler.h:
+	* orbsvcs/tests/EC_Basic/EC_Basic.cpp:
+	* orbsvcs/tests/EC_Basic/EC_Basic.h:
+	* orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+	* orbsvcs/tests/EC_Mcast/EC_Mcast.h:
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+	* orbsvcs/tests/EC_Multiple/EC_Multiple.h:
+	* orbsvcs/tests/Event/lib/Consumer.cpp:
+	* orbsvcs/tests/Event/lib/Consumer.h:
+	* orbsvcs/tests/Event/lib/Supplier.cpp:
+	* orbsvcs/tests/Event/lib/Supplier.h:
+	* orbsvcs/tests/Event_Latency/Event_Latency.cpp:
+	* orbsvcs/tests/Event_Latency/Event_Latency.h:
+	  More throw spec fixes
+
 Sat Jun 12 18:42:04 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Channel_Clients_T.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 75622f13e48..41751bcb4ee 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -716,6 +716,7 @@ TAO_Hash_Binding_Iterator::_default_POA (CORBA::Environment &/*env*/)
 CORBA::Boolean
 TAO_Hash_Binding_Iterator::next_one (CosNaming::Binding_out b,
                                      CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNaming::Binding *binding;
 
@@ -779,6 +780,7 @@ CORBA::Boolean
 TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many,
                                    CosNaming::BindingList_out bl,
                                    CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We perform an allocation before obtaining the lock so that an out
   // parameter is allocated in case we fail to obtain the lock.
@@ -827,6 +829,7 @@ TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many,
 
 void
 TAO_Hash_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
     ACE_GUARD_THROW_EX (ACE_Lock,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index 889abc65c9e..981d598691f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -164,16 +164,19 @@ public:
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
   CORBA::Boolean next_one (CosNaming::Binding_out b,
-                           CORBA::Environment &ACE_TRY_ENV);
+                           CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next binding.  If there are no more
   // bindings false is returned.
 
   CORBA::Boolean next_n (CORBA::ULong how_many,
                          CosNaming::BindingList_out bl,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns at most the requested number of bindings.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation destroys the iterator.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
index 74cb7670bca..3566b6a9b28 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
@@ -40,6 +40,11 @@ void
 TAO_Naming_Context::bind (const CosNaming::Name &n,
                           CORBA::Object_ptr obj,
                           CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     CosNaming::NamingContext::NotFound,
+                     CosNaming::NamingContext::CannotProceed,
+                     CosNaming::NamingContext::InvalidName,
+                     CosNaming::NamingContext::AlreadyBound))
 {
   impl_->bind (n, obj, ACE_TRY_ENV);
 }
@@ -48,6 +53,10 @@ void
 TAO_Naming_Context::rebind (const CosNaming::Name &n,
                             CORBA::Object_ptr obj,
                             CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName))
 {
   impl_->rebind (n, obj, ACE_TRY_ENV);
 }
@@ -56,6 +65,11 @@ void
 TAO_Naming_Context::bind_context (const CosNaming::Name &n,
                                   CosNaming::NamingContext_ptr nc,
                                   CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName,
+                       CosNaming::NamingContext::AlreadyBound))
 {
   impl_->bind_context (n, nc, ACE_TRY_ENV);
 }
@@ -64,6 +78,10 @@ void
 TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
                                     CosNaming::NamingContext_ptr nc,
                                     CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName))
 {
   impl_->rebind_context (n, nc, ACE_TRY_ENV);
 }
@@ -71,6 +89,10 @@ TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
 CORBA::Object_ptr
 TAO_Naming_Context::resolve (const CosNaming::Name &n,
                              CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName))
 {
   return impl_->resolve (n, ACE_TRY_ENV);
 }
@@ -78,12 +100,17 @@ TAO_Naming_Context::resolve (const CosNaming::Name &n,
 void
 TAO_Naming_Context::unbind (const CosNaming::Name &n,
                             CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName))
 {
   impl_->unbind (n, ACE_TRY_ENV);
 }
 
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return impl_->new_context (ACE_TRY_ENV);
 }
@@ -91,12 +118,19 @@ TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::bind_new_context (const CosNaming::Name &n,
                                       CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::AlreadyBound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName))
 {
   return impl_->bind_new_context (n, ACE_TRY_ENV);
 }
 
 void
 TAO_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotEmpty))
 {
   impl_->destroy (ACE_TRY_ENV);
 }
@@ -106,6 +140,7 @@ TAO_Naming_Context::list (CORBA::ULong how_many,
                           CosNaming::BindingList_out bl,
                           CosNaming::BindingIterator_out bi,
                           CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   impl_->list (how_many, bl, bi, ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
index 3eeaf616d06..335474b653d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
@@ -49,7 +49,14 @@ public:
 
   virtual void bind (const CosNaming::Name &n,
                      CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV =
+                         TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     CosNaming::NamingContext::NotFound,
+                     CosNaming::NamingContext::CannotProceed,
+                     CosNaming::NamingContext::InvalidName,
+                     CosNaming::NamingContext::AlreadyBound));
+
   // Create a binding for name <n> and object <obj> in the naming
   // context.  Compound names are treated as follows: ctx->bind (<c1;
   // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
@@ -60,7 +67,13 @@ public:
 
   virtual void rebind (const CosNaming::Name &n,
                        CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV =
+                           TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName));
+
   // This is similar to <bind> operation above, except for when the
   // binding for the specified name already exists in the specified
   // context.  In that case, the existing binding is replaced with the
@@ -68,20 +81,37 @@ public:
 
   virtual void bind_context (const CosNaming::Name &n,
                              CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                             CORBA::Environment &ACE_TRY_ENV =
+                                 TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName,
+                       CosNaming::NamingContext::AlreadyBound));
+
   // This is the version of <bind> specifically for binding naming
   // contexts, so that they will participate in name resolution when
   // compound names are passed to be resolved.
 
   virtual void rebind_context (const CosNaming::Name &n,
                                CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                               CORBA::Environment &ACE_TRY_ENV =
+                                   TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName));
   // This is a version of <rebind> specifically for naming contexts,
   // so that they can participate in name resolution when compound
   // names are passed.
 
   virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                                     CORBA::Environment &ACE_TRY_ENV =
+                                         TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName));
   // Return object reference that is bound to the name.  Compound name
   // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
   // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
@@ -89,25 +119,45 @@ public:
   // for "narrowing" the object to the appropriate type.
 
   virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                       CORBA::Environment &ACE_TRY_ENV =
+                           TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName));
+
   // Remove the name binding from the context.  When compound names
   // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV =
-                                                    TAO_default_environment ());
+  virtual CosNaming::NamingContext_ptr new_context (
+      CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
 
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
-                                                         CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual CosNaming::NamingContext_ptr bind_new_context (
+      const CosNaming::Name &n,
+      CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotFound,
+                       CosNaming::NamingContext::AlreadyBound,
+                       CosNaming::NamingContext::CannotProceed,
+                       CosNaming::NamingContext::InvalidName));
+
   // This operation creates a new context and binds it to the name
   // supplied as an argument.  The newly-created context is
   // implemented by the same server as the context in which it was
   // bound (the name argument excluding the last component).
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
+                            TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       CosNaming::NamingContext::NotEmpty));
   // Delete the naming context.  NOTE: the user should <unbind> any
   // bindings in which the given context is bound to some names before
   // invoking <destroy> operation on it.
@@ -116,7 +166,10 @@ public:
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
                      CosNaming::BindingIterator_out bi,
-                     CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV =
+                         TAO_default_environment ())
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index b2cbe4e6b28..2ca3560afab 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -750,6 +750,7 @@ TAO_Persistent_Binding_Iterator::_default_POA (CORBA::Environment &/*env*/)
 CORBA::Boolean
 TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b,
                                            CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNaming::Binding *binding;
 
@@ -814,6 +815,7 @@ CORBA::Boolean
 TAO_Persistent_Binding_Iterator::next_n (CORBA::ULong how_many,
                                          CosNaming::BindingList_out bl,
                                          CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We perform an allocation before obtaining the lock so that an out
   // parameter is allocated in case we fail to obtain the lock.
@@ -863,6 +865,7 @@ TAO_Persistent_Binding_Iterator::next_n (CORBA::ULong how_many,
 
 void
 TAO_Persistent_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
     ACE_GUARD_THROW_EX (ACE_Lock,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index 42145b8e3c1..01943e5352f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -177,16 +177,19 @@ public:
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
   CORBA::Boolean next_one (CosNaming::Binding_out b,
-                           CORBA::Environment &ACE_TRY_ENV);
+                           CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next binding.  If there are no more
   // bindings false is returned.
 
   CORBA::Boolean next_n (CORBA::ULong how_many,
                          CosNaming::BindingList_out bl,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns at most the requested number of bindings.
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (CORBA::Environment &ACE_TRY_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation destroys the iterator.
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 2d95a6afdb8..6c0c748ee4f 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -30,7 +30,7 @@ ACE_Runtime_Scheduler (int config_count,
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::create (const char *entry_point,
                                CORBA::Environment &)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
   // Just make sure it's there and return its handle.
@@ -49,7 +49,7 @@ ACE_Runtime_Scheduler::create (const char *entry_point,
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::lookup (const char * entry_point,
                                CORBA::Environment &TAO_IN_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException))
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return create (entry_point, TAO_IN_ENV);
 }
@@ -60,7 +60,7 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point,
 RtecScheduler::RT_Info *
 ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
                             CORBA::Environment &ACE_TRY_ENV)
-     TAO_THROW_SPEC((CORBA::SystemException,
+     ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
@@ -111,7 +111,7 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
                                  CORBA::Long threads,
                                  RtecScheduler::Info_Type_t info_type,
                                  CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   // We compare the values with the ones stored and print a message on
@@ -148,7 +148,7 @@ ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
                                  RtecScheduler::Preemption_Priority_t& p_priority,
                                  CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
@@ -171,7 +171,7 @@ ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                              RtecScheduler::Preemption_Subpriority_t& subpriority,
                                              RtecScheduler::Preemption_Priority_t& p_priority,
                                              CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
@@ -196,7 +196,7 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                        CORBA::Long /* number_of_calls */,
                                        RtecScheduler::Dependency_Type_t /* dependency_type */,
                                        CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
@@ -231,7 +231,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
                                            RtecScheduler::Config_Info_Set_out /* configs */,
                                            RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */,
                                            CORBA::Environment &)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                       RtecScheduler::TASK_COUNT_MISMATCH))
@@ -250,7 +250,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
                                                RtecScheduler::OS_Priority& priority,
                                                RtecScheduler::Dispatching_Type_t & d_type,
                                                CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
@@ -283,7 +283,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
 
 RtecScheduler::Preemption_Priority_t
 ACE_Runtime_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
   // throw an exception if a valid schedule has not been loaded
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index f49c4f5a5bb..853a0be5c40 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -39,7 +39,7 @@ public:
 
   virtual RtecScheduler::handle_t create (const char * entry_point,
                                           CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME));
   // Create an RT_Info.  In the config run scheduler this actually constructs
   // a new RT_Info.  Here, we just return its handle, or an error value if
@@ -47,13 +47,13 @@ public:
 
   virtual RtecScheduler::handle_t lookup (const char * entry_point,
                                           CORBA::Environment &_env)
-    TAO_THROW_SPEC((CORBA::SystemException));
+    ACE_THROW_SPEC((CORBA::SystemException));
   // Lookup a handle for an RT_Info, and return its handle, or an error
   // value if it's not present.
 
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
                                        CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Return a pointer to the RT_Info corresponding to the passed handle.
 
@@ -68,7 +68,7 @@ public:
                     CORBA::Long threads,
                     RtecScheduler::Info_Type_t info_type,
                     CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Set characteristics of the RT_Info corresponding to the passed handle.
 
@@ -77,7 +77,7 @@ public:
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                          RtecScheduler::Preemption_Priority_t& p_priority,
                          CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
   // Returns the priority and subpriority values assigned to an RT_Info,
@@ -88,7 +88,7 @@ public:
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
   // Returns the priority and subpriority values assigned to an RT_Info,
@@ -99,7 +99,7 @@ public:
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
                                CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the config run scheduler, this method registers a dependency between
   // two RT_Infos.  In the run time scheduler, this is a no-op.
@@ -110,7 +110,7 @@ public:
                                    RtecScheduler::Config_Info_Set_out configs,
                                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
                                    CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                      RtecScheduler::TASK_COUNT_MISMATCH));
@@ -122,13 +122,13 @@ public:
                                        RtecScheduler::OS_Priority& o_priority,
                                        RtecScheduler::Dispatching_Type_t & d_type,
                                        CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // Provides the thread priority and queue type for the given priority level.
 
   virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the
   // schedule.  The number returned is one less than the total number
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index c0f38390024..e911cbc6daf 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -35,7 +35,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 RtecScheduler::handle_t
 ACE_Config_Scheduler::create (const char * entry_point,
                               CORBA::Environment &)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
   typedef RtecScheduler::RT_Info* RT_Info_ptr;
@@ -87,7 +87,7 @@ ACE_Config_Scheduler::create (const char * entry_point,
 RtecScheduler::handle_t
 ACE_Config_Scheduler::lookup (const char * entry_point,
                               CORBA::Environment &)
-    TAO_THROW_SPEC ((CORBA::SystemException))
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecScheduler::RT_Info* rt_info = 0;
   switch (impl->get_rt_info (entry_point, rt_info))
@@ -109,7 +109,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point,
 RtecScheduler::RT_Info*
 ACE_Config_Scheduler::get (RtecScheduler::handle_t handle,
                            CORBA::Environment &)
-     TAO_THROW_SPEC((CORBA::SystemException,
+     ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -145,7 +145,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 CORBA::Long threads,
                                 RtecScheduler::Info_Type_t info_type,
                                 CORBA::Environment &)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -177,7 +177,7 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
@@ -196,7 +196,7 @@ void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                                  RtecScheduler::Preemption_Priority_t& p_priority,
                                                  CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC((CORBA::SystemException,
+     ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED))
 {
@@ -211,7 +211,7 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            RtecScheduler::Dependency_Type_t
                                              dependency_type,
                                            CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
@@ -249,7 +249,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                RtecScheduler::Config_Info_Set_out configs,
                                                RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
                                                CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
+     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                       RtecScheduler::TASK_COUNT_MISMATCH))
@@ -450,7 +450,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
                                                    RtecScheduler::OS_Priority& priority,
                                                    RtecScheduler::Dispatching_Type_t & d_type,
                                                    CORBA::Environment &TAO_IN_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
 {
@@ -469,7 +469,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 
 RtecScheduler::Preemption_Priority_t
 ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index 5d4d8015ada..533b6272b1f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -36,15 +36,15 @@ public:
 
   virtual RtecScheduler::handle_t create (const char * entry_point,
                                           CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
+    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
 
   virtual RtecScheduler::handle_t lookup (const char * entry_point,
                                           CORBA::Environment &_env)
-    TAO_THROW_SPEC((CORBA::SystemException));
+    ACE_THROW_SPEC((CORBA::SystemException));
 
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
                                        CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
                     RtecScheduler::Criticality_t criticality,
@@ -57,14 +57,14 @@ public:
                     CORBA::Long threads,
                     RtecScheduler::Info_Type_t info_type,
                     CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
+    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                          RtecScheduler::Preemption_Priority_t& p_priority,
                          CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
 
@@ -73,7 +73,7 @@ public:
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority,
                                      CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
 
@@ -82,7 +82,7 @@ public:
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type,
                                CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
 
   virtual void compute_scheduling (CORBA::Long minimum_priority,
@@ -91,7 +91,7 @@ public:
                                    RtecScheduler::Config_Info_Set_out configs,
                                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
                                    CORBA::Environment &_env)
-    TAO_THROW_SPEC((CORBA::SystemException,
+    ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
                     RtecScheduler::TASK_COUNT_MISMATCH));
@@ -100,18 +100,21 @@ public:
                                        RtecScheduler::OS_Priority& priority,
                                        RtecScheduler::Dispatching_Type_t & d_type,
                                        CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // provide the thread priority and queue type for the given priority level
 
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
+  virtual RtecScheduler::Preemption_Priority_t
+      last_scheduled_priority (CORBA::Environment &_env)
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the last priority number assigned to an operation in the schedule.
-  // The number returned is one less than the total number of scheduled priorities.
-  // All scheduled priorities range from 0 to the number returned, inclusive.
-
+  // Returns the last priority number assigned to an operation in the
+  // schedule.
+  // The number returned is one less than the total number of
+  // scheduled priorities.
+  // All scheduled priorities range from 0 to the number returned,
+  // inclusive.
 
 private:
 
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
index 1a7ed58db81..1186e323e2e 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
@@ -301,6 +301,7 @@ ECB_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 void
 ECB_Consumer::push (const RtecEventComm::EventSet& events,
                     CORBA::Environment &TAO_IN_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->test_->push (this->consumer_id_,
                      events,
@@ -309,6 +310,7 @@ ECB_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 ECB_Consumer::disconnect_push_consumer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -406,6 +408,7 @@ ECB_Supplier::send_event (RtecEventComm::EventSet& events,
 
 void
 ECB_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
   // this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV);
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
index 5ffa770d18e..1ea8ce9f1aa 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h
@@ -123,8 +123,10 @@ public:
 
   // = The POA_RtecEventComm::PushComsumer methods.
   virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env);
-  virtual void disconnect_push_consumer (CORBA::Environment &);
+                     CORBA::Environment &_env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   ECB_Test* test_;
@@ -176,7 +178,8 @@ public:
   // Send one event, the supplier provides the SourceID
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (CORBA::Environment &);
+  virtual void disconnect_push_supplier (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   ECB_Test* test_;
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index cd524449573..0a598f3e9e9 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -733,6 +733,7 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events,
 
 void
 ECM_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (TAO_IN_ENV);
 
@@ -840,6 +841,7 @@ ECM_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 void
 ECM_Consumer::push (const RtecEventComm::EventSet& events,
                     CORBA::Environment &TAO_IN_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
   this->federation_->consumer_push (arrival, events, TAO_IN_ENV);
@@ -847,6 +849,7 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 ECM_Consumer::disconnect_push_consumer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 8d021e57381..2c908911e53 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -184,7 +184,8 @@ public:
   // Implement the callbacks for our consumer personality.
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (CORBA::Environment &);
+  virtual void disconnect_push_supplier (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   ECM_Local_Federation* federation_;
@@ -234,8 +235,10 @@ public:
 
   // = The POA_RtecEventComm::PushComsumer methods.
   virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env);
-  virtual void disconnect_push_consumer (CORBA::Environment &);
+                     CORBA::Environment &_env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   ECM_Local_Federation* federation_;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 3eba6826489..7f5fc421bc2 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -1542,6 +1542,7 @@ Test_Supplier::push (const RtecEventComm::EventSet& events,
 
 void
 Test_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -1644,6 +1645,7 @@ Test_Consumer::close (CORBA::Environment &TAO_IN_ENV)
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events,
                      CORBA::Environment &TAO_IN_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
   this->test_->push_consumer (this->cookie_, arrival, events, TAO_IN_ENV);
@@ -1651,6 +1653,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 Test_Consumer::disconnect_push_consumer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 766cc3f3372..eee31288689 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -66,7 +66,8 @@ public:
   // Implement the callbacks for our consumer personality.
 
 
-  virtual void disconnect_push_supplier (CORBA::Environment &);
+  virtual void disconnect_push_supplier (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
@@ -125,8 +126,10 @@ public:
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env);
-  virtual void disconnect_push_consumer (CORBA::Environment &);
+                     CORBA::Environment &_env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index f95b415b310..7d25fe17bfb 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -96,6 +96,7 @@ EC_Consumer::accumulate (EC_Driver::Throughput_Stats& throughput,
 void
 EC_Consumer::push (const RtecEventComm::EventSet& events,
                    CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->consumer_push (this->cookie_, events, ACE_TRY_ENV);
 
@@ -142,6 +143,7 @@ EC_Consumer::push (const RtecEventComm::EventSet& events,
 
 void
 EC_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->driver_->consumer_disconnect (this->cookie_, ACE_TRY_ENV);
   this->supplier_proxy_ =
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index ce1ac9be637..e764d31666d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -77,8 +77,10 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env);
-  virtual void disconnect_push_consumer (CORBA::Environment &);
+                     CORBA::Environment &_env)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void disconnect_push_consumer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 827ded8acff..8eed8a01816 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -137,6 +137,7 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
 
 void
 EC_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index d13d6bd2819..09e0e423134 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -97,7 +97,8 @@ public:
   // Return an event type to push....
 
   // = The PushSupplier methods
-  virtual void disconnect_push_supplier (CORBA::Environment &);
+  virtual void disconnect_push_supplier (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   EC_Driver *driver_;
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index a8378f7aa59..fdee769899f 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -163,6 +163,7 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 
 void
 Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n"));
 }
@@ -170,6 +171,7 @@ Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
 void
 Latency_Consumer::push (const RtecEventComm::EventSet &events,
                         CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Latency_Consumer:push - "));
   ACE_TIMEPROBE (EVENT_LATENCY_PUSH_EVENT_TO_CONSUMER);
@@ -356,8 +358,10 @@ Latency_Supplier::Supplier::Supplier (Latency_Supplier* impl)
 {
 }
 
-void Latency_Supplier::Supplier::disconnect_push_supplier
-  (CORBA::Environment &TAO_IN_ENV)
+void
+Latency_Supplier::Supplier::disconnect_push_supplier (
+    CORBA::Environment &TAO_IN_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->impl_->disconnect_push_supplier (TAO_IN_ENV);
 }
@@ -367,15 +371,19 @@ Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl)
 {
 }
 
-void Latency_Supplier::Consumer::disconnect_push_consumer
-  (CORBA::Environment &TAO_IN_ENV)
+void
+Latency_Supplier::Consumer::disconnect_push_consumer (
+    CORBA::Environment &TAO_IN_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->impl_->disconnect_push_consumer (TAO_IN_ENV);
 }
 
-void Latency_Supplier::Consumer::push
-  (const RtecEventComm::EventSet &events,
-   CORBA::Environment &TAO_IN_ENV)
+void
+Latency_Supplier::Consumer::push (
+    const RtecEventComm::EventSet &events,
+    CORBA::Environment &TAO_IN_ENV)
+      ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->impl_->push (events, TAO_IN_ENV);
 }
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
index 2ef454cc317..2c0cc175e5a 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
@@ -50,7 +50,8 @@ public:
   // supplier.  Stores <my_name> for printing out messages.  Returns 0
   // on success, -1 on failure.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &);
+  virtual void disconnect_push_consumer (CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // The channel is disconnecting.
 
   void entry_point (const char*);
@@ -59,9 +60,9 @@ public:
   void print_stats () /* const */;
   // Print timing statistics.
 
-// (not protected to allow short-circuiting) protected:
   virtual void push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &);
+                     CORBA::Environment &)
+    ACE_THROW_SPEC ((CORBA::SystemException));
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
   // disconnects from the channel.
@@ -124,7 +125,8 @@ public:
   //
   class Supplier : public POA_RtecEventComm::PushSupplier {
   public:
-    virtual void disconnect_push_supplier (CORBA::Environment &);
+    virtual void disconnect_push_supplier (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException));
     // The channel is disconnecting.
 
   private:
@@ -138,10 +140,12 @@ public:
   class Consumer : public POA_RtecEventComm::PushConsumer {
   public:
     virtual void push (const RtecEventComm::EventSet &events,
-                       CORBA::Environment &);
+                       CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException));
     // The channel pushed some events to us.
 
-    virtual void disconnect_push_consumer (CORBA::Environment &);
+    virtual void disconnect_push_consumer (CORBA::Environment &)
+      ACE_THROW_SPEC ((CORBA::SystemException));
     // The channel is disconnecting.
 
   private: