Tue Oct 21 23:33:19 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

98 files changed, 85 insertions, 330 deletions

diff --git a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
index 25931d3c4c5..f03c672f988 100644
--- a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.cpp
@@ -16,21 +16,18 @@ Consumer_i::Consumer_i(CORBA::ORB_ptr orb,
 
 CORBA::Object_ptr
 Consumer_i::get_typed_consumer ()
-  throw (CORBA::SystemException)
 {
   return CORBA::Object::_duplicate(object_.in());
 }
 
 // Override the push() operation.
 void Consumer_i::push(const CORBA::Any &)
- throw(CORBA::SystemException)
 {
   throw CORBA::NO_IMPLEMENT ();
 }
 
 // Override the disconnect_push_consumer() operation.
 void Consumer_i::disconnect_push_consumer()
- throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
index 57391c4ff98..a7a940adfe5 100644
--- a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
+++ b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Consumer_i.h
@@ -17,14 +17,11 @@ class Consumer_i
                CORBA::Object_ptr obj);
 
     // Override operations from TypedPushConsumer interface.
-    virtual CORBA::Object_ptr get_typed_consumer ()
-      throw (CORBA::SystemException);
+    virtual CORBA::Object_ptr get_typed_consumer ();
 
-    virtual void push(const CORBA::Any & data) 
-     throw(CORBA::SystemException);
+    virtual void push(const CORBA::Any & data) ;
 
-    virtual void disconnect_push_consumer()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_consumer();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
index 5d91988b9a1..5357c914909 100644
--- a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.cpp
@@ -27,7 +27,6 @@ Messenger_i::~Messenger_i (void)
 void Messenger_i::send_message (const char * user_name,
                                 const char * subject,
                                 const char * message)
-  throw (CORBA::SystemException)
 {
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
diff --git a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
index 1b71a298e0a..8fc73a88b99 100644
--- a/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
+++ b/TAO/DevGuideExamples/EventServices/OMG_TypedEC/Messenger_i.h
@@ -32,8 +32,7 @@ public:
   
   virtual void send_message (const char * user_name,
                              const char * subject,
-                             const char * message)
-    throw (CORBA::SystemException);
+                             const char * message);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
index 19cb419cd8a..cdc851d54fe 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.cpp
@@ -22,7 +22,6 @@ EchoEventConsumer_i::EchoEventConsumer_i(
 
 // Implement the push() operation.
 void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
- throw(CORBA::SystemException)
 {
   // Loop through the events, looking for shutdown events.
   for (u_int i = 0; i < events.length (); ++i) {
@@ -47,7 +46,6 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
 
 // Implement the disconnect_push_consumer() operation.
 void EchoEventConsumer_i::disconnect_push_consumer()
- throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
index 66b22473ea2..abe88a334e1 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventConsumer_i.h
@@ -18,11 +18,9 @@ class EchoEventConsumer_i : public virtual POA_RtecEventComm::PushConsumer
                         int event_limit);
 
     // Override operations from PushConsumer interface.
-    virtual void push(const RtecEventComm::EventSet& events)
-     throw(CORBA::SystemException);
+    virtual void push(const RtecEventComm::EventSet& events);
 
-    virtual void disconnect_push_consumer()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_consumer();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
index 32408473712..cc334152252 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.cpp
@@ -15,7 +15,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb)
 
 // Override the disconnect_push_Supplier() operation.
 void EchoEventSupplier_i::disconnect_push_supplier()
-     throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
index 53f74aeea45..ab93a670215 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Basic/EchoEventSupplier_i.h
@@ -14,8 +14,7 @@ class EchoEventSupplier_i : public virtual POA_RtecEventComm::PushSupplier
     // Constructor
     EchoEventSupplier_i(CORBA::ORB_ptr orb);
 
-    virtual void disconnect_push_supplier()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_supplier();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
index 19cb419cd8a..cdc851d54fe 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.cpp
@@ -22,7 +22,6 @@ EchoEventConsumer_i::EchoEventConsumer_i(
 
 // Implement the push() operation.
 void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
- throw(CORBA::SystemException)
 {
   // Loop through the events, looking for shutdown events.
   for (u_int i = 0; i < events.length (); ++i) {
@@ -47,7 +46,6 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
 
 // Implement the disconnect_push_consumer() operation.
 void EchoEventConsumer_i::disconnect_push_consumer()
- throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
index 66b22473ea2..abe88a334e1 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventConsumer_i.h
@@ -18,11 +18,9 @@ class EchoEventConsumer_i : public virtual POA_RtecEventComm::PushConsumer
                         int event_limit);
 
     // Override operations from PushConsumer interface.
-    virtual void push(const RtecEventComm::EventSet& events)
-     throw(CORBA::SystemException);
+    virtual void push(const RtecEventComm::EventSet& events);
 
-    virtual void disconnect_push_consumer()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_consumer();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
index 32408473712..cc334152252 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.cpp
@@ -15,7 +15,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb)
 
 // Override the disconnect_push_Supplier() operation.
 void EchoEventSupplier_i::disconnect_push_supplier()
-     throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
index 53f74aeea45..ab93a670215 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Federated/EchoEventSupplier_i.h
@@ -14,8 +14,7 @@ class EchoEventSupplier_i : public virtual POA_RtecEventComm::PushSupplier
     // Constructor
     EchoEventSupplier_i(CORBA::ORB_ptr orb);
 
-    virtual void disconnect_push_supplier()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_supplier();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
index 19cb419cd8a..cdc851d54fe 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.cpp
@@ -22,7 +22,6 @@ EchoEventConsumer_i::EchoEventConsumer_i(
 
 // Implement the push() operation.
 void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
- throw(CORBA::SystemException)
 {
   // Loop through the events, looking for shutdown events.
   for (u_int i = 0; i < events.length (); ++i) {
@@ -47,7 +46,6 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
 
 // Implement the disconnect_push_consumer() operation.
 void EchoEventConsumer_i::disconnect_push_consumer()
- throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
index 66b22473ea2..abe88a334e1 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventConsumer_i.h
@@ -18,11 +18,9 @@ class EchoEventConsumer_i : public virtual POA_RtecEventComm::PushConsumer
                         int event_limit);
 
     // Override operations from PushConsumer interface.
-    virtual void push(const RtecEventComm::EventSet& events)
-     throw(CORBA::SystemException);
+    virtual void push(const RtecEventComm::EventSet& events);
 
-    virtual void disconnect_push_consumer()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_consumer();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
index 19143980588..c8f3a278431 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.cpp
@@ -15,7 +15,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb)
 
 // Override the disconnect_push_Supplier() operation.
 void EchoEventSupplier_i::disconnect_push_supplier()
-     throw(CORBA::SystemException)
 {
  
   // Deactivate this object.
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
index 53f74aeea45..ab93a670215 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_Filter/EchoEventSupplier_i.h
@@ -14,8 +14,7 @@ class EchoEventSupplier_i : public virtual POA_RtecEventComm::PushSupplier
     // Constructor
     EchoEventSupplier_i(CORBA::ORB_ptr orb);
 
-    virtual void disconnect_push_supplier()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_supplier();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
index 19cb419cd8a..cdc851d54fe 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.cpp
@@ -22,7 +22,6 @@ EchoEventConsumer_i::EchoEventConsumer_i(
 
 // Implement the push() operation.
 void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
- throw(CORBA::SystemException)
 {
   // Loop through the events, looking for shutdown events.
   for (u_int i = 0; i < events.length (); ++i) {
@@ -47,7 +46,6 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events)
 
 // Implement the disconnect_push_consumer() operation.
 void EchoEventConsumer_i::disconnect_push_consumer()
- throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
index 66b22473ea2..abe88a334e1 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumer_i.h
@@ -18,11 +18,9 @@ class EchoEventConsumer_i : public virtual POA_RtecEventComm::PushConsumer
                         int event_limit);
 
     // Override operations from PushConsumer interface.
-    virtual void push(const RtecEventComm::EventSet& events)
-     throw(CORBA::SystemException);
+    virtual void push(const RtecEventComm::EventSet& events);
 
-    virtual void disconnect_push_consumer()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_consumer();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
index 32408473712..cc334152252 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.cpp
@@ -15,7 +15,6 @@ EchoEventSupplier_i::EchoEventSupplier_i(CORBA::ORB_ptr orb)
 
 // Override the disconnect_push_Supplier() operation.
 void EchoEventSupplier_i::disconnect_push_supplier()
-     throw(CORBA::SystemException)
 {
   // Deactivate this object.
   CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent");
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
index 53f74aeea45..ab93a670215 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventSupplier_i.h
@@ -14,8 +14,7 @@ class EchoEventSupplier_i : public virtual POA_RtecEventComm::PushSupplier
     // Constructor
     EchoEventSupplier_i(CORBA::ORB_ptr orb);
 
-    virtual void disconnect_push_supplier()
-     throw(CORBA::SystemException);
+    virtual void disconnect_push_supplier();
 
   private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
index 65ecadbb778..0ffeda9ba79 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
+++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.cpp
@@ -28,7 +28,7 @@ SimpleAddressServer::SimpleAddressServer (const ACE_INET_Addr& address) {
 void
 SimpleAddressServer::get_addr (const RtecEventComm::EventHeader&,
                                RtecUDPAdmin::UDP_Addr& address)
-    throw (CORBA::SystemException) {
+{
   if (this->address_._d() == RtecUDPAdmin::Rtec_inet6)
     throw CORBA::DATA_CONVERSION(0, CORBA::COMPLETED_YES);
   address = this->address_.v4_addr();
@@ -37,7 +37,6 @@ SimpleAddressServer::get_addr (const RtecEventComm::EventHeader&,
 void
 SimpleAddressServer::get_address(const RtecEventComm::EventHeader&,
                                  RtecUDPAdmin::UDP_Address& address)
-  throw (CORBA::SystemException)
 {
   address = this->address_;
 }
diff --git a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
index 2cca5409f60..eec2c5f2a7d 100644
--- a/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
+++ b/TAO/DevGuideExamples/EventServices/RTEC_MCast_Federated/SimpleAddressServer.h
@@ -15,12 +15,10 @@ class SimpleAddressServer : public POA_RtecUDPAdmin::AddrServer {
 public:
   SimpleAddressServer (const ACE_INET_Addr& address);
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr& address)
-    throw (CORBA::SystemException);
+                         RtecUDPAdmin::UDP_Addr& address);
 
   virtual void get_address(const RtecEventComm::EventHeader& header,
-                           RtecUDPAdmin::UDP_Address& address)
-    throw (CORBA::SystemException);
+                           RtecUDPAdmin::UDP_Address& address);
 
 private:
   RtecUDPAdmin::UDP_Address address_;
diff --git a/TAO/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp b/TAO/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
index 882bcf082d6..401d9a7cd1c 100644
--- a/TAO/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/ImplRepo/IORTable/Messenger_i.cpp
@@ -8,7 +8,6 @@ CORBA::Boolean Messenger_i::send_message(
   const char * user_name,
   const char * subject,
   char *& message)
-  throw (CORBA::SystemException)
 {
   std::cout << "Message from: " << user_name << std::endl
             << "Subject:      " << subject << std::endl
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
index 4fb82b72484..12a9a638b41 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp
@@ -18,7 +18,6 @@ CORBA::Boolean Messenger_i::send_message (
   const char * subject,
   char *& message
   )
-  throw(CORBA::SystemException)
 {
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
index a24b16942e8..02bf04e120f 100644
--- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.h
@@ -25,8 +25,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
index 9628e3ac26f..e248db3f5ea 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.cpp
@@ -15,7 +15,6 @@ Messenger_Locator_i::preinvoke (const PortableServer::ObjectId &oid,
                                            PortableServer::POA_ptr,
                                            const char *,
                                            void * & cookie )
-  throw (CORBA::SystemException, PortableServer::ForwardRequest)
 {
   // Get the ObjectId in string format.
   CORBA::String_var oid_str = PortableServer::ObjectId_to_string (oid);
@@ -44,7 +43,6 @@ Messenger_Locator_i::postinvoke (const PortableServer::ObjectId &,
                                             const char *,
                                             void * cookie,
                                             PortableServer::Servant servant)
-  throw (CORBA::SystemException)
 {
 
   std::cout << "postinvoke called..." << std::endl;
diff --git a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
index 5dcdd4fe6c4..4ba89bf8cac 100644
--- a/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
+++ b/TAO/DevGuideExamples/LocalObjects/ServantLocator/MessengerLocator_i.h
@@ -17,16 +17,14 @@ class Messenger_Locator_i : public PortableServer::ServantLocator,
   virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa,
                                              const char * operation,
-                                             void * & cookie)
-    throw (CORBA::SystemException, PortableServer::ForwardRequest);
+                                             void * & cookie);
 
   // Postinvoke function
   virtual void postinvoke (const PortableServer::ObjectId & oid,
                            PortableServer::POA_ptr poa,
                            const char * operation,
                            void * cookie,
-                           PortableServer::Servant servant)
-    throw (CORBA::SystemException);
+                           PortableServer::Servant servant);
 
 };
 
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
index 1dfb3f8c828..ad31f84aeab 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.cpp
@@ -20,9 +20,7 @@ void MessengerHandler::send_message (
    CORBA::Boolean ami_return_val,
    const char * message,
    CORBA::Long time
-   )
-   throw (CORBA::SystemException)
-                                     
+   )                                     
 {
   if (ami_return_val)
   {
@@ -44,7 +42,6 @@ void MessengerHandler::send_message (
 }
 
 void MessengerHandler::send_message_excep (Messaging::ExceptionHolder* excep_holder)
-  throw (CORBA::SystemException)
 {
   // We'll print an error message and shut down the orb
   try
@@ -57,4 +54,3 @@ void MessengerHandler::send_message_excep (Messaging::ExceptionHolder* excep_hol
   }
   orb_->shutdown(0);
 }
-
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
index 4a77d92742d..986654f44d4 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerHandler.h
@@ -18,13 +18,11 @@ virtual void send_message (
     CORBA::Boolean ami_return_val,
     const char * message,
     CORBA::Long time
-  )
-  throw(CORBA::SystemException);
+  );
 
 virtual void send_message_excep (
     Messaging::ExceptionHolder * excep_holder
-  )
-  throw(CORBA::SystemException);
+  );
 
 
   int message_was_sent()
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
index e80cab4fb2e..820971c777c 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.cpp
@@ -30,7 +30,6 @@ CORBA::Boolean Messenger_i::send_message (
   char *& message,
   CORBA::Long_out time_sent
   )
-  throw (CORBA::SystemException, MessengerUnableToSendMessage)
 {
   if (throw_exception_)
   {
diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
index 61785d4edf2..2cc2587c3eb 100644
--- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
+++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger_i.h
@@ -32,8 +32,7 @@ virtual CORBA::Boolean send_message (
     const char * subject,
     char *& message,
     CORBA::Long_out time_sent
-  )
-  throw (CORBA::SystemException, MessengerUnableToSendMessage);
+  );
 
 private:
   // Specify an amount of time to wait inside
diff --git a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
index af12e09474a..98be27c4cdd 100644
--- a/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
+++ b/TAO/DevGuideExamples/Messaging/RelativeRoundtripTimeout/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
index f0a8ae0b4cb..79cdb4982d6 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp
@@ -25,8 +25,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
 {
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
@@ -37,7 +35,6 @@ CORBA::Boolean Messenger_i::send_message (
 }
 
 void Messenger_i::shutdown ()
-  throw(CORBA::SystemException)
 {
   orb_->shutdown(0);
 }
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
index 07e3829072f..3a2dff83972 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.h
@@ -30,11 +30,9 @@ public:
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
-  virtual void shutdown ()
-    throw(CORBA::SystemException);
+  virtual void shutdown ();
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
index abb3fdbc848..df6eaf11a49 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp
@@ -24,8 +24,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
 {
   std::cout << "Message from: " << user_name << std::endl;
   std::cout << "Subject:      " << subject << std::endl;
@@ -34,4 +32,3 @@ CORBA::Boolean Messenger_i::send_message (
   message = CORBA::string_dup("Thanks for the message.");
   return 1;
 }
-  
diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
index af12e09474a..98be27c4cdd 100644
--- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
index 1ef3f40cf89..38741b7016f 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.cpp
@@ -28,8 +28,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char* /*subject*/,
     char *& message
   )
-  throw(CORBA::SystemException)
-
 {
   CORBA::string_free(message);
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
index af12e09474a..98be27c4cdd 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPerConnection/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
index 1ef3f40cf89..38741b7016f 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.cpp
@@ -28,8 +28,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char* /*subject*/,
     char *& message
   )
-  throw(CORBA::SystemException)
-
 {
   CORBA::string_free(message);
 
diff --git a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
index af12e09474a..98be27c4cdd 100644
--- a/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
+++ b/TAO/DevGuideExamples/Multithreading/ThreadPool/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp b/TAO/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
index bf37e302a03..d40e8496387 100644
--- a/TAO/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp
@@ -24,8 +24,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
   {
     //Add your implementation here
     std::cerr << "Message from: " << user_name << std::endl;
diff --git a/TAO/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h b/TAO/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
index c94ed6ed7ae..b021dcaa44c 100644
--- a/TAO/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
+++ b/TAO/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp b/TAO/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
index 63306d0951e..21edede8773 100644
--- a/TAO/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp
@@ -25,8 +25,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
   {
     //Add your implementation here
     std::cerr << "Message from: " << user_name << std::endl;
diff --git a/TAO/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h b/TAO/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
index c94ed6ed7ae..b021dcaa44c 100644
--- a/TAO/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
+++ b/TAO/DevGuideExamples/NamingService/Naming_Server/Messenger_i.h
@@ -30,8 +30,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
index fecc0974cf3..023c7bc0fae 100644
--- a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp
@@ -13,7 +13,6 @@ void
 EventSequenceConsumer_i::push_structured_events (
   const CosNotification::EventBatch& events 
   )
-  throw (CORBA::SystemException, CosEventComm::Disconnected)
 {
   
   std::cout << "events received " << std::endl;
@@ -30,7 +29,6 @@ EventSequenceConsumer_i::push_structured_events (
 
 void 
 EventSequenceConsumer_i::disconnect_sequence_push_consumer ()
-throw(CORBA::SystemException)
 {
   
   CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -47,6 +45,5 @@ EventSequenceConsumer_i::offer_change (
    const CosNotification::EventTypeSeq &,
    const CosNotification::EventTypeSeq &
    )
-   throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
 {
 }
diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
index 93090705983..a5ee6f42cd1 100644
--- a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
+++ b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.h
@@ -12,17 +12,14 @@ public:
   
   virtual void push_structured_events (
     const CosNotification::EventBatch & events 
-    )
-    throw (CORBA::SystemException, CosEventComm::Disconnected);
+    );
   
   virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed 
-    )
-    throw (CORBA::SystemException, CosNotifyComm::InvalidEventType);     
+    );
   
-  virtual void disconnect_sequence_push_consumer ()
-    throw(CORBA::SystemException);           
+  virtual void disconnect_sequence_push_consumer ();
 private:
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
index f204818dfea..d97dbc3eb4e 100644
--- a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp
@@ -10,7 +10,6 @@ EventSequenceSupplier_i::EventSequenceSupplier_i(CORBA::ORB_ptr orb)
 
 void
 EventSequenceSupplier_i::disconnect_sequence_push_supplier ()
-      throw (CORBA::SystemException)  
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -27,7 +26,6 @@ EventSequenceSupplier_i::subscription_change (
         const CosNotification::EventTypeSeq &,
         const CosNotification::EventTypeSeq & 
       )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
 {
 }       
 
diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
index cb568b52bdb..258cd948d59 100644
--- a/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
+++ b/TAO/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.h
@@ -10,14 +10,12 @@ class EventSequenceSupplier_i : public POA_CosNotifyComm::SequencePushSupplier
 public:
     // Constructor
     EventSequenceSupplier_i(CORBA::ORB_ptr orb);
-    virtual void disconnect_sequence_push_supplier ()
-      throw(CORBA::SystemException);        
+    virtual void disconnect_sequence_push_supplier ();        
     
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed 
-      )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType);       
+      );
 private:
     CORBA::ORB_var orb_;
 };
diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
index 9dfa95b1903..17585fed28b 100644
--- a/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp
@@ -78,7 +78,6 @@ CORBA::Boolean Messenger_i::send_message (
                                           const char * subject,
                                           char *& message 
                                           )
-                                          throw (CORBA::SystemException)
 {
   
   std::cout << "Message from: " << user_name << std::endl;
diff --git a/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
index ad5cbfd387f..34e085ffd2a 100644
--- a/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
+++ b/TAO/DevGuideExamples/NotifyService/EventSequence/Messenger_i.h
@@ -21,8 +21,7 @@ class  Messenger_i : public POA_Messenger
       const char * user_name,
       const char * subject,
       char *& message 
-    )
-    throw(CORBA::SystemException);
+    );
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
index 5384ec40cf4..efd67223b4f 100644
--- a/TAO/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
@@ -113,7 +113,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw (CORBA::SystemException)
 {
 
    std::cout << "Message from: " << user_name << std::endl;
diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
index 2d9fb78127e..a294d20c258 100644
--- a/TAO/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
+++ b/TAO/DevGuideExamples/NotifyService/Filtering/Messenger_i.h
@@ -23,8 +23,7 @@ public:
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw (CORBA::SystemException);
+  );
 
 private:
    CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
index 54e11486eb3..1680f717662 100644
--- a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp
@@ -13,8 +13,6 @@ void
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
-      throw (CORBA::SystemException,
-             CosEventComm::Disconnected)
 {
 
    const char *value;       
@@ -30,7 +28,6 @@ StructuredEventConsumer_i::push_structured_event(
 void 
 StructuredEventConsumer_i::disconnect_structured_push_consumer(
       )
-      throw (CORBA::SystemException)
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -47,9 +44,6 @@ StructuredEventConsumer_i::offer_change(
         const CosNotification::EventTypeSeq &, 
         const CosNotification::EventTypeSeq &
       )
-      throw (CORBA::SystemException,
-             CosNotifyComm::InvalidEventType)
-
 {
   //Noop
 } 
diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
index 194c91e7928..c533573454c 100644
--- a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
+++ b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.h
@@ -13,20 +13,15 @@ public:
 
     virtual void push_structured_event(
       const CosNotification::StructuredEvent &notification
-      )
-      throw (CORBA::SystemException,
-             CosEventComm::Disconnected);
+      );
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      throw (CORBA::SystemException,
-             CosNotifyComm::InvalidEventType);
+      );
 
    virtual void disconnect_structured_push_consumer(
-      )
-      throw (CORBA::SystemException);
+      );
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
index 2a60545f40c..0180d5a5669 100644
--- a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp
@@ -9,9 +9,7 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 }
 
 void
-StructuredEventSupplier_i::disconnect_structured_push_supplier (
-      )
-    throw (CORBA::SystemException)
+StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 {
   
   CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -26,10 +24,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier (
 void
 StructuredEventSupplier_i::subscription_change (
                               const CosNotification::EventTypeSeq &, 
-                              const CosNotification::EventTypeSeq &
-      )
-  throw (CORBA::SystemException,
-         CosNotifyComm::InvalidEventType)
+                              const CosNotification::EventTypeSeq &)
 {
 }       
-
diff --git a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
index 3cdf4a9d618..0efe1146e63 100644
--- a/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
+++ b/TAO/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.h
@@ -12,16 +12,12 @@ public:
     // Constructor
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
     virtual void disconnect_structured_push_supplier (
-    )
-    throw (CORBA::SystemException);
+    );
 
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-    )
-
-    throw (CORBA::SystemException, 
-            CosNotifyComm::InvalidEventType);
+    );
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
index 79c2da91195..2528e7ffb55 100644
--- a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.cpp
@@ -86,7 +86,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
     char *& message)
-  throw (CORBA::SystemException)
 {
   
   ACE_OS::printf("Message from: %s\nSubject:      %s\nMessage:      %s\n",
@@ -126,4 +125,3 @@ CORBA::Boolean Messenger_i::send_message (
   return 1;
 
 }
-
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
index 20928c59ae5..07686c54325 100644
--- a/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/NotifyService/Messenger/Messenger_i.h
@@ -15,8 +15,7 @@ class  Messenger_i : public POA_Messenger
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
-                               char *& message)
-    throw (CORBA::SystemException);
+                               char *& message);
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
index 6c1835709ee..9db5dde03bc 100644
--- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp
@@ -13,8 +13,6 @@ void
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
-      throw (CORBA::SystemException, CosEventComm::Disconnected)
-
 {
 
   std::cout << "event received " << std::endl;
@@ -30,7 +28,6 @@ StructuredEventConsumer_i::push_structured_event(
 
 void 
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
-      throw (CORBA::SystemException)
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -47,6 +44,5 @@ StructuredEventConsumer_i::offer_change(
         const CosNotification::EventTypeSeq &, 
         const CosNotification::EventTypeSeq &
       )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
 {
 } 
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
index 1199e45021e..dc7b62a9a6e 100644
--- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
+++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h
@@ -13,18 +13,14 @@ public:
 
     virtual void push_structured_event(
       const CosNotification::StructuredEvent &notification
-      )
-      throw (CORBA::SystemException, CosEventComm::Disconnected);  
+      );
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType);     
+      );
 
-   virtual void disconnect_structured_push_consumer()
-      throw (CORBA::SystemException);           
+   virtual void disconnect_structured_push_consumer();
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
index 3d7e0257c4a..cafef802cb6 100644
--- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp
@@ -10,7 +10,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
-     throw(CORBA::SystemException)    
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -27,7 +26,6 @@ StructuredEventSupplier_i::subscription_change (
                     const CosNotification::EventTypeSeq &, 
                     const CosNotification::EventTypeSeq &
       )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
 {
 }       
 
diff --git a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
index e36692fde7a..30fea5628d3 100644
--- a/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
+++ b/TAO/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h
@@ -11,14 +11,12 @@ class StructuredEventSupplier_i :
 public:
     // Constructor
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
-    virtual void disconnect_structured_push_supplier ()
-      throw(CORBA::SystemException);        
+    virtual void disconnect_structured_push_supplier ();
     
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-    )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType);       
+    );
 private:
     CORBA::ORB_var orb_;
 };
diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
index dcc07df6fe7..8459de9ec0f 100644
--- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.cpp
@@ -120,10 +120,7 @@ Messenger_i::~Messenger_i (void)
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
-    char *& message)
-
-  throw (CORBA::SystemException)
-  
+    char *& message)  
 {
   
   std::cout << "Message from: " << user_name << std::endl;
@@ -162,4 +159,3 @@ CORBA::Boolean Messenger_i::send_message (
   return 1;
 
 }
-
diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
index b1805fcdc86..92e0f3ea617 100644
--- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
+++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/Messenger_i.h
@@ -15,9 +15,7 @@ public:
  CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
-    char *& message)
-
-  throw (CORBA::SystemException);
+    char *& message);
 
 private:
    CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
index e6e47f9dc54..b56120524e4 100644
--- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp
@@ -13,8 +13,6 @@ void
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
-  throw (CORBA::SystemException, CosEventComm::Disconnected)
-
 {
 
     const char *value;
@@ -29,7 +27,6 @@ StructuredEventConsumer_i::push_structured_event(
 void 
 StructuredEventConsumer_i::disconnect_structured_push_consumer(
       )
-      throw(CORBA::SystemException)
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -46,6 +43,5 @@ StructuredEventConsumer_i::offer_change(
         const CosNotification::EventTypeSeq &, 
         const CosNotification::EventTypeSeq &
       )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
 {
 } 
diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
index c9beba9021b..a1915b9b4b7 100644
--- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
+++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.h
@@ -12,18 +12,14 @@ public:
 
     virtual void push_structured_event(
       const CosNotification::StructuredEvent &notification
-      )
-      throw (CORBA::SystemException, CosEventComm::Disconnected);  
+      );
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType);     
+      );
 
-   virtual void disconnect_structured_push_consumer(
-      )
-      throw(CORBA::SystemException);           
+   virtual void disconnect_structured_push_consumer();
 private:
     CORBA::ORB_var orb_;
 };
diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
index 6b7efc9d530..ead6306ba03 100644
--- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp
@@ -10,7 +10,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
-      throw (CORBA::SystemException)     
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -25,9 +24,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
 void
 StructuredEventSupplier_i::subscription_change (
                     const CosNotification::EventTypeSeq &, 
-                    const CosNotification::EventTypeSeq &
-      )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)        
+                    const CosNotification::EventTypeSeq &)
 {
 }       
-
diff --git a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
index 67d706165db..5cd59a73967 100644
--- a/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
+++ b/TAO/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.h
@@ -10,14 +10,11 @@ class StructuredEventSupplier_i : public POA_CosNotifyComm::StructuredPushSuppli
 public:
     // Constructor
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
-    virtual void disconnect_structured_push_supplier ()
-    throw (CORBA::SystemException);        
+    virtual void disconnect_structured_push_supplier ();        
     
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed
-    )
-    throw(CORBA::SystemException, CosNotifyComm::InvalidEventType);       
+        const CosNotification::EventTypeSeq & removed);
 private:
     CORBA::ORB_var orb_;
 };
diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
index d17a740f85c..155b6a7a0df 100644
--- a/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.cpp
@@ -99,7 +99,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
     char *& message)
-  throw (CORBA::SystemException)
 {
   
   std::cout << "Message from: " << user_name << std::endl;
diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
index 20928c59ae5..07686c54325 100644
--- a/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
+++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/Messenger_i.h
@@ -15,8 +15,7 @@ class  Messenger_i : public POA_Messenger
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
-                               char *& message)
-    throw (CORBA::SystemException);
+                               char *& message);
 
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
index eef1b0b3a88..41d84e7cc33 100644
--- a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp
@@ -13,11 +13,6 @@ void
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
-      throw (
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       )
-
 {
 
   std::cout << "event received " << std::endl;
@@ -33,9 +28,6 @@ StructuredEventConsumer_i::push_structured_event(
 
 void 
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
-      throw (
-        CORBA::SystemException
-      )
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -52,9 +44,5 @@ StructuredEventConsumer_i::offer_change(
         const CosNotification::EventTypeSeq &,
         const CosNotification::EventTypeSeq &
       )
-      throw (
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      )
 {
 } 
diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
index 949e6cbeee9..4ac3c9caaa6 100644
--- a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
+++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.h
@@ -13,25 +13,14 @@ public:
 
     virtual void push_structured_event(
       const CosNotification::StructuredEvent &notification
-      )
-      throw (
-        CORBA::SystemException,
-        CosEventComm::Disconnected
-       );  
+      );  
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      throw (
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
       );     
 
-   virtual void disconnect_structured_push_consumer()
-      throw (
-        CORBA::SystemException
-      );           
+   virtual void disconnect_structured_push_consumer();           
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
index 470b2c1f5aa..cafef802cb6 100644
--- a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp
@@ -10,9 +10,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
-      throw (
-        CORBA::SystemException
-      )
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -29,10 +26,6 @@ StructuredEventSupplier_i::subscription_change (
                     const CosNotification::EventTypeSeq &, 
                     const CosNotification::EventTypeSeq &
       )
-      throw (
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
-      )        
 {
 }       
 
diff --git a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
index 5c9add0decd..d62832bc466 100644
--- a/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
+++ b/TAO/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.h
@@ -11,18 +11,11 @@ class StructuredEventSupplier_i :
 public:
     // Constructor
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
-    virtual void disconnect_structured_push_supplier ()
-    throw (
-       CORBA::SystemException
-    );        
+    virtual void disconnect_structured_push_supplier ();        
     
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-    )
-    throw (
-        CORBA::SystemException,
-        CosNotifyComm::InvalidEventType
     );       
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
index 46e11a3bd47..f1a39b49590 100644
--- a/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.cpp
@@ -116,7 +116,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
     char *& message)
-  throw (CORBA::SystemException)
 {
   ACE_OS::printf("Message from: %s\nSubject:      %s\nMessage:      %s\n",
                  user_name, subject, message);
diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
index 61eb47e26ac..596302cfc7d 100644
--- a/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
+++ b/TAO/DevGuideExamples/NotifyService/RTNotify/Messenger_i.h
@@ -16,8 +16,7 @@ class  Messenger_i : public POA_Messenger
 
   CORBA::Boolean send_message (const char * user_name,
                                const char * subject,
-                               char *& message)
-    throw (CORBA::SystemException);
+                               char *& message);
 
  private:
   CORBA::ORB_var orb_;
@@ -26,8 +25,3 @@ class  Messenger_i : public POA_Messenger
 };
 
 #endif 
-
-
-
-
-
diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
index 6c1835709ee..9db5dde03bc 100644
--- a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp
@@ -13,8 +13,6 @@ void
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event
       )
-      throw (CORBA::SystemException, CosEventComm::Disconnected)
-
 {
 
   std::cout << "event received " << std::endl;
@@ -30,7 +28,6 @@ StructuredEventConsumer_i::push_structured_event(
 
 void 
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
-      throw (CORBA::SystemException)
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -47,6 +44,5 @@ StructuredEventConsumer_i::offer_change(
         const CosNotification::EventTypeSeq &, 
         const CosNotification::EventTypeSeq &
       )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
 {
 } 
diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
index 1199e45021e..dc7b62a9a6e 100644
--- a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
+++ b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.h
@@ -13,18 +13,14 @@ public:
 
     virtual void push_structured_event(
       const CosNotification::StructuredEvent &notification
-      )
-      throw (CORBA::SystemException, CosEventComm::Disconnected);  
+      );
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType);     
+      );
 
-   virtual void disconnect_structured_push_consumer()
-      throw (CORBA::SystemException);           
+   virtual void disconnect_structured_push_consumer();
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
index 3d7e0257c4a..fd3292c21ef 100644
--- a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp
@@ -10,7 +10,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
-     throw(CORBA::SystemException)    
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -27,7 +26,5 @@ StructuredEventSupplier_i::subscription_change (
                     const CosNotification::EventTypeSeq &, 
                     const CosNotification::EventTypeSeq &
       )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType)
 {
 }       
-
diff --git a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
index e36692fde7a..b5e5396adc7 100644
--- a/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
+++ b/TAO/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.h
@@ -11,14 +11,12 @@ class StructuredEventSupplier_i :
 public:
     // Constructor
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
-    virtual void disconnect_structured_push_supplier ()
-      throw(CORBA::SystemException);        
+    virtual void disconnect_structured_push_supplier ();        
     
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-    )
-      throw (CORBA::SystemException, CosNotifyComm::InvalidEventType);       
+    );       
 private:
     CORBA::ORB_var orb_;
 };
diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
index 7b2cf0364de..968d42dc0ed 100644
--- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
@@ -124,7 +124,6 @@ CORBA::Boolean Messenger_i::send_message (
                                           const char * subject,
                                           char *& message
                                           )
-                                          throw (CORBA::SystemException)
 {
   
   std::cout << "Message from: " << user_name << std::endl;
@@ -171,4 +170,3 @@ CORBA::Boolean Messenger_i::send_message (
   }
   return 0;
 }
-
diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
index 2d9fb78127e..a294d20c258 100644
--- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
+++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.h
@@ -23,8 +23,7 @@ public:
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw (CORBA::SystemException);
+  );
 
 private:
    CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
index d94fd471e63..3cdd30f8954 100644
--- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp
@@ -12,8 +12,6 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb)
 void 
 StructuredEventConsumer_i::push_structured_event(
        const CosNotification::StructuredEvent &event)
-      throw (CORBA::SystemException,
-             CosEventComm::Disconnected)
 {
 
    const char *value;       
@@ -28,7 +26,6 @@ StructuredEventConsumer_i::push_structured_event(
 
 void 
 StructuredEventConsumer_i::disconnect_structured_push_consumer()
-      throw (CORBA::SystemException)
 {
 
    CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -44,9 +41,6 @@ void
 StructuredEventConsumer_i::offer_change(
         const CosNotification::EventTypeSeq &, 
         const CosNotification::EventTypeSeq &)
-      throw (CORBA::SystemException,
-             CosNotifyComm::InvalidEventType)
-
 {
   //Noop
 } 
diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
index df0084d5f86..49e983dd765 100644
--- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
+++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.h
@@ -11,18 +11,13 @@ public:
     StructuredEventConsumer_i(CORBA::ORB_ptr orb);
 
     virtual void push_structured_event(
-      const CosNotification::StructuredEvent &notification)
-      throw (CORBA::SystemException,
-             CosEventComm::Disconnected);
+      const CosNotification::StructuredEvent &notification);
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed)
-      throw (CORBA::SystemException,
-             CosNotifyComm::InvalidEventType);
+        const CosNotification::EventTypeSeq & removed);
 
-   virtual void disconnect_structured_push_consumer()
-      throw (CORBA::SystemException);
+   virtual void disconnect_structured_push_consumer();
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
index 5fab415340a..08c7cef843d 100644
--- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
+++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp
@@ -10,7 +10,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb)
 
 void
 StructuredEventSupplier_i::disconnect_structured_push_supplier ()
-throw (CORBA::SystemException)
 {
   
   CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent");
@@ -26,8 +25,5 @@ void
 StructuredEventSupplier_i::subscription_change (
     const CosNotification::EventTypeSeq &, 
     const CosNotification::EventTypeSeq &)
-    throw (CORBA::SystemException,
-    CosNotifyComm::InvalidEventType)
 {
 }       
-
diff --git a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
index 963d3358390..a78faed2868 100644
--- a/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
+++ b/TAO/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.h
@@ -10,15 +10,11 @@ class StructuredEventSupplier_i : public POA_CosNotifyComm::StructuredPushSuppli
 public:
     // Constructor
     StructuredEventSupplier_i(CORBA::ORB_ptr orb);
-    virtual void disconnect_structured_push_supplier ()
-    throw (CORBA::SystemException);
+    virtual void disconnect_structured_push_supplier ();
 
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
-        const CosNotification::EventTypeSeq & removed)
-
-    throw (CORBA::SystemException, 
-            CosNotifyComm::InvalidEventType);
+        const CosNotification::EventTypeSeq & removed);
 
 private:
     CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp b/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
index ca0a314fa0e..3480fadc7ae 100644
--- a/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.cpp
@@ -22,8 +22,6 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
   {
     if (ssliop_current_->no_context())
       std::cout << "Message from:        " << user_name << std::endl;
@@ -40,7 +38,6 @@ CORBA::Boolean Messenger_i::send_message (
 void Messenger_i::shutdown (
       const char * user_name
     )
-    throw(CORBA::SystemException)
 {
   if ( ! (ssliop_current_->no_context()) )
   {
@@ -152,5 +149,3 @@ void Messenger_i::shutdown (
       std::cout << std::endl;
   }
 }
-
-
diff --git a/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h b/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
index 389eb156981..595b470f639 100644
--- a/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
+++ b/TAO/DevGuideExamples/Security/ParticipatingApp/Messenger_i.h
@@ -24,13 +24,11 @@ public:
      const char * user_name,
      const char * subject,
      char *& message
-    )
-    throw(CORBA::SystemException);
+    );
 
   virtual void shutdown (
         const char * user_name
-    )
-    throw(CORBA::SystemException);
+    );
 
 protected:
   CORBA::ORB_var orb_;
diff --git a/TAO/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp b/TAO/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
index a7164df866b..a92cea8879f 100644
--- a/TAO/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp
@@ -17,12 +17,9 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
   {
     std::cout << "Message from: " << user_name << std::endl;
     std::cout << "Subject:      " << subject << std::endl;
     std::cout << "Message:      " << message << std::endl;
     return 1;
   }
-  
diff --git a/TAO/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h b/TAO/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
index 7fdf50bdb45..ef9b4a759a2 100644
--- a/TAO/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
+++ b/TAO/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.h
@@ -23,8 +23,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw (CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp b/TAO/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
index 0d8656c4c88..809cfcc584f 100644
--- a/TAO/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp
@@ -24,12 +24,9 @@ CORBA::Boolean Messenger_i::send_message (
     const char * subject,
     char *& message
   )
-  throw(CORBA::SystemException)
-
   {
     std::cout << "Message from: " << user_name << std::endl;
     std::cout << "Subject:      " << subject << std::endl;
     std::cout << "Message:      " << message << std::endl;
     return 1;
   }
-  
diff --git a/TAO/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h b/TAO/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
index b7ffc8a2fa5..ef9b4a759a2 100644
--- a/TAO/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
+++ b/TAO/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.h
@@ -23,8 +23,7 @@ virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  throw(CORBA::SystemException);
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
index 2185451ce1c..4322b6397a4 100644
--- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
+++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp
@@ -49,7 +49,6 @@ Smart_Messenger_Proxy::send_message (
   const char * user_name,
   const char * subject,
   char *& message)
-    throw (CORBA::SystemException)
 {
   logger_->log_message("Before send_message()");
   CORBA::Boolean ret_val = 
diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
index 6ce6467ae82..6183c4bd0b0 100644
--- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
+++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.h
@@ -24,8 +24,7 @@ class Smart_Messenger_Proxy : public TAO_Messenger_Smart_Proxy_Base
     virtual CORBA::Boolean send_message(
       const char * user_name,
       const char * subject,
-      char *& message)
-        throw (CORBA::SystemException);
+      char *& message);
   private:
     Logger_var logger_;
 };
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
index 9faab372315..8d295f17be7 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp
@@ -8,7 +8,6 @@
 
   
 CORBA::Boolean Messenger_i::send_message (Message*& msg)
-  throw (CORBA::SystemException)
 {
   msg->print();
 
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
index 8d6cc64a620..a12e478f95e 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.h
@@ -8,8 +8,7 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  virtual CORBA::Boolean send_message(Message*& msg)
-    throw (CORBA::SystemException);
+  virtual CORBA::Boolean send_message(Message*& msg);
 };
 
 #endif
diff --git a/TAO/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/DevGuideExamples/ValueTypes/Notify/consumer.cpp
index 9bf083209ce..a0db2b5ccdb 100644
--- a/TAO/DevGuideExamples/ValueTypes/Notify/consumer.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Notify/consumer.cpp
@@ -85,13 +85,11 @@ public:
   }
 
   virtual void disconnect_push_consumer()
-    throw (CORBA::SystemException)
   {
     std::cout << "disconnect_push_consumer()." << std::endl;
   }
 
   virtual void push(const CORBA::Any& a)
-    throw (CORBA::SystemException, CosEventComm::Disconnected)
   {
     MyEvent* vt;
     a >>= vt;
diff --git a/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp
index 305c1dbcd86..122a4227ee7 100644
--- a/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Notify/supplier.cpp
@@ -87,7 +87,7 @@ public:
     reactor_->schedule_timer(this, 0, tv, ACE_Time_Value::zero);
   }
 
-  virtual void disconnect_push_supplier() throw (CORBA::SystemException) {
+  virtual void disconnect_push_supplier() {
     // this should never be called. The notify service uses this to allow its
     // clients to disconnect gracefully.
     std::cout << "disconnect_push_supplier()." << std::endl;