Tue Oct 21 20:59:59 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

author: Abdullah Sowayan <sowayan@users.noreply.github.com> 2008-10-21 21:02:46 +0000
committer: Abdullah Sowayan <sowayan@users.noreply.github.com> 2008-10-21 21:02:46 +0000
commit: 7a6b7ac07fb0c405be997a50c2ddb7d12bba61cd (patch)
tree: bbc724a9ddda20d363875112e582e1b43e95f319
parent: 166062da57bc96ce5325b7c7b5120f74bc836694 (diff)
download: ATCD-7a6b7ac07fb0c405be997a50c2ddb7d12bba61cd.tar.gz
58 files changed, 293 insertions, 670 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index be2bc0cb971..1e7010ba50d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,65 @@
+Tue Oct 21 20:59:59 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * DevGuideExamples/BiDirectionalGIOP/simple_i.h:
+        * DevGuideExamples/BiDirectionalGIOP/simple_i.cpp:
+        * DevGuideExamples/CIAO/Messenger/Administrator_exec_i.h:
+        * DevGuideExamples/CIAO/Messenger/Administrator_exec_i.cpp:
+        * DevGuideExamples/CIAO/Messenger/History_exec_i.h:
+        * DevGuideExamples/CIAO/Messenger/History_exec_i.cpp:
+        * DevGuideExamples/CIAO/Messenger/Messenger_exec_i.h:
+        * DevGuideExamples/CIAO/Messenger/Messenger_exec_i.cpp:
+        * DevGuideExamples/CIAO/Messenger/Publication_exec_i.h:
+        * DevGuideExamples/CIAO/Messenger/Publication_exec_i.cpp:
+        * DevGuideExamples/CIAO/Messenger/Receiver_exec_i.h:
+        * DevGuideExamples/CIAO/Messenger/Receiver_exec_i.cpp:
+        * DevGuideExamples/CIAO/Messenger/Runnable_exec_i.h:
+        * DevGuideExamples/CIAO/Messenger/Runnable_exec_i.cpp:
+        * DevGuideExamples/CIAO/Messenger/StaticDAnCE/StaticDAnCEApp.cpp:
+        * DevGuideExamples/ImplRepo/IORTable/Messenger_i.h:
+        * DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h:
+        * DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp:
+        * DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h:
+        * DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp:
+        * DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h:
+        * DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp:
+        * DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h:
+        * DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp:
+        * DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h:
+        * DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp:
+        * DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h:
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp:
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h:
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp:
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp:
+        * DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp:
+        * DevGuideExamples/ValueTypes/Bank/server.cpp:
+
+          Remove exception specifications from the code. It has fallen out of favor.
+
 Tue Oct 21 19:10:21 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * DevGuideExamples:
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
index be05be761e9..86ed435218f 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.cpp
@@ -19,30 +19,21 @@ Simple_i::Simple_i (CORBA::ORB_ptr orb, int callback_count)
 Simple_i::~Simple_i (void)
 {
 }
-  
+
 CORBA::Long Simple_i::test_method (CORBA::Boolean do_callback)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   if (do_callback) {
     ready_for_callback_ = 1;
   }
   return 0;
 }
-  
+
 void Simple_i::callback_object (Callback_ptr cb)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   callback_ = Callback::_duplicate(cb);
 }
-  
+
 void Simple_i::shutdown ()
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
 {
   const int wait = 0;
   orb_->shutdown(wait);
@@ -66,12 +57,12 @@ Simple_i::call_client()
         ACE_OS::abort(); // Should probably define and throw a UserException
       }
     }
-    
+
     callback_->shutdown();
-    
+
     return 1;
   }
-  
+
   return 0;
 }
 
diff --git a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
index feb107e351f..614ccafecda 100644
--- a/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
+++ b/TAO/DevGuideExamples/BiDirectionalGIOP/simple_i.h
@@ -7,29 +7,20 @@ class  Simple_i : public virtual POA_Simple
 {
 public:
   Simple_i (CORBA::ORB_ptr orb, int iterations);
-  
+
   virtual ~Simple_i (void);
-  
+
 virtual CORBA::Long test_method (
     CORBA::Boolean do_callback
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
 virtual void callback_object (
     Callback_ptr cb
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
 virtual void shutdown (
-    
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+
+  );
 
   /// Not part of the CORBA interface. This method is called
   /// by our special orb event loop in server main().
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Administrator_exec_i.cpp b/TAO/DevGuideExamples/CIAO/Messenger/Administrator_exec_i.cpp
index e99433bda39..967f848ee1d 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Administrator_exec_i.cpp
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Administrator_exec_i.cpp
@@ -50,9 +50,6 @@ namespace CIDL_Administrator_Impl
   void
   Administrator_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ =
     Administrator_Context::_narrow (
@@ -66,9 +63,6 @@ namespace CIDL_Administrator_Impl
 
   void
   Administrator_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
 
@@ -81,9 +75,6 @@ namespace CIDL_Administrator_Impl
 
   void
   Administrator_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
 
@@ -93,9 +84,6 @@ namespace CIDL_Administrator_Impl
 
   void
   Administrator_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("ccm_remove\n")));
@@ -103,9 +91,6 @@ namespace CIDL_Administrator_Impl
 
   void
   Administrator_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("ciao_preactivate\n")));
@@ -113,9 +98,6 @@ namespace CIDL_Administrator_Impl
 
   void
   Administrator_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("ciao_postactivate\n")));
@@ -246,9 +228,6 @@ namespace CIDL_Administrator_Impl
 
   ::Components::EnterpriseComponent_ptr
   AdministratorHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Administrator_exec_i.h b/TAO/DevGuideExamples/CIAO/Messenger/Administrator_exec_i.h
index 69271a63266..5c9adf2c38f 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Administrator_exec_i.h
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Administrator_exec_i.h
@@ -54,40 +54,22 @@ namespace CIDL_Administrator_Impl
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_remove ();
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_postactivate ();
 
     protected:
     Administrator_Context *context_;
@@ -122,10 +104,7 @@ namespace CIDL_Administrator_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" ADMINISTRATOR_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/History_exec_i.cpp b/TAO/DevGuideExamples/CIAO/Messenger/History_exec_i.cpp
index e964e12f455..be3e056f5cf 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/History_exec_i.cpp
+++ b/TAO/DevGuideExamples/CIAO/Messenger/History_exec_i.cpp
@@ -39,8 +39,6 @@ namespace CIDL_Messenger_Impl
 
   ::Messages *
   History_exec_i::get_all ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException))
   {
     // Your code here.
 
@@ -68,8 +66,6 @@ namespace CIDL_Messenger_Impl
 
   ::Message *
   History_exec_i::get_latest ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException))
   {
     // Your code here.
 
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/History_exec_i.h b/TAO/DevGuideExamples/CIAO/Messenger/History_exec_i.h
index 6e100e29a90..4e31b534670 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/History_exec_i.h
+++ b/TAO/DevGuideExamples/CIAO/Messenger/History_exec_i.h
@@ -49,14 +49,10 @@ namespace CIDL_Messenger_Impl
     // Operations from ::History
 
     virtual ::Messages *
-    get_all ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException));
+    get_all ();
 
     virtual ::Message *
-    get_latest ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException));
+    get_latest ();
 
     // MY CODE
 
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Messenger_exec_i.cpp b/TAO/DevGuideExamples/CIAO/Messenger/Messenger_exec_i.cpp
index 0520e7bc2f3..17da48c1fb3 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Messenger_exec_i.cpp
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Messenger_exec_i.cpp
@@ -96,14 +96,12 @@ namespace CIDL_Messenger_Impl
 
   char*
   Messenger_exec_i::subject ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup( this->subject_.c_str() );
   }
 
   void
   Messenger_exec_i::subject ( const char* subject)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->subject_ = CORBA::string_dup( subject );
   }
@@ -112,7 +110,6 @@ namespace CIDL_Messenger_Impl
 
   ::CCM_Publication_ptr
   Messenger_exec_i::get_content ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
 
@@ -125,7 +122,6 @@ namespace CIDL_Messenger_Impl
 
   ::CCM_Runnable_ptr
   Messenger_exec_i::get_control ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
 
@@ -138,7 +134,6 @@ namespace CIDL_Messenger_Impl
 
   ::CCM_History_ptr
   Messenger_exec_i::get_message_history ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
 
@@ -154,9 +149,6 @@ namespace CIDL_Messenger_Impl
   void
   Messenger_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ =
     Messenger_Context::_narrow (
@@ -170,27 +162,18 @@ namespace CIDL_Messenger_Impl
 
   void
   Messenger_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Messenger_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
   }
 
   void
   Messenger_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("Messenger_exec_i::ccm_activate\n")));
@@ -199,9 +182,6 @@ namespace CIDL_Messenger_Impl
 
   void
   Messenger_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("Messenger_exec_i::ccm_passivate\n")));
@@ -209,9 +189,6 @@ namespace CIDL_Messenger_Impl
 
   void
   Messenger_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("Messenger_exec_i::ccm_remove\n")));
@@ -241,9 +218,6 @@ namespace CIDL_Messenger_Impl
 
   ::Components::EnterpriseComponent_ptr
   MessengerHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Messenger_exec_i.h b/TAO/DevGuideExamples/CIAO/Messenger/Messenger_exec_i.h
index 218d006301b..d9cefd8fc04 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Messenger_exec_i.h
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Messenger_exec_i.h
@@ -57,64 +57,41 @@ namespace CIDL_Messenger_Impl
 
     // Attribute operations.
 
-    virtual char * subject ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * subject ();
 
-    virtual void subject (const char* subject)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void subject (const char* subject);
 
     // Port operations.
 
     virtual ::CCM_Publication_ptr
-    get_content ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_content ();
 
     virtual ::CCM_Runnable_ptr
-    get_control ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_control ();
 
     virtual ::CCM_History_ptr
-    get_message_history ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    get_message_history ();
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_remove ();
 
     // MY CODE
     virtual int svc();
@@ -151,10 +128,7 @@ namespace CIDL_Messenger_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" MESSENGER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Publication_exec_i.cpp b/TAO/DevGuideExamples/CIAO/Messenger/Publication_exec_i.cpp
index a12ada2d355..c232cb9ac77 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Publication_exec_i.cpp
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Publication_exec_i.cpp
@@ -43,7 +43,6 @@ namespace CIDL_Messenger_Impl
 
   char*
   Publication_exec_i::text ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_Guard<ACE_Mutex> guard(this->lock_);
 
@@ -53,7 +52,6 @@ namespace CIDL_Messenger_Impl
   void
   Publication_exec_i::text (
   const char* text)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_Guard<ACE_Mutex> guard(this->lock_);
 
@@ -63,7 +61,6 @@ namespace CIDL_Messenger_Impl
 
   CORBA::UShort
   Publication_exec_i::period ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_Guard<ACE_Mutex> guard(this->lock_);
 
@@ -73,7 +70,6 @@ namespace CIDL_Messenger_Impl
   void
   Publication_exec_i::period (
   CORBA::UShort period)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_Guard<ACE_Mutex> guard( this->lock_ );
 
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Publication_exec_i.h b/TAO/DevGuideExamples/CIAO/Messenger/Publication_exec_i.h
index 7cb75471279..7843b82c41e 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Publication_exec_i.h
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Publication_exec_i.h
@@ -50,20 +50,16 @@ namespace CIDL_Messenger_Impl
     // Operations from ::Publication
 
     virtual char*
-    text ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    text ();
 
     virtual void
-    text ( const char* text)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    text ( const char* text);
 
     virtual CORBA::UShort
-    period ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    period ();
 
     virtual void
-    period ( CORBA::UShort period)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    period ( CORBA::UShort period);
 
   private:
     std::string text_;
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Receiver_exec_i.cpp b/TAO/DevGuideExamples/CIAO/Messenger/Receiver_exec_i.cpp
index b08db1cef52..ed52e382212 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Receiver_exec_i.cpp
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Receiver_exec_i.cpp
@@ -44,7 +44,6 @@ namespace CIDL_Receiver_Impl
   void
   Receiver_exec_i::push_message_consumer (
   ::Message * ev)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Your code here.
 
@@ -76,9 +75,6 @@ namespace CIDL_Receiver_Impl
   void
   Receiver_exec_i::set_session_context (
   ::Components::SessionContext_ptr ctx)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     this->context_ =
     Receiver_Context::_narrow (
@@ -92,9 +88,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_activate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("Receiver_exec_i::ccm_activate\n")));
@@ -102,9 +95,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_passivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("Receiver_exec_i::ccm_passivate\n")));
@@ -112,9 +102,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ccm_remove ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("Receiver_exec_i::ccm_remove\n")));
@@ -122,9 +109,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ciao_preactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("Receiver_exec_i::ciao_preactivate\n")));
@@ -132,9 +116,6 @@ namespace CIDL_Receiver_Impl
 
   void
   Receiver_exec_i::ciao_postactivate ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     // Your code here.
     ACE_DEBUG((LM_INFO, ACE_TEXT("Receiver_exec_i::ciao_postactivate\n")));
@@ -164,9 +145,6 @@ namespace CIDL_Receiver_Impl
 
   ::Components::EnterpriseComponent_ptr
   ReceiverHome_exec_i::create ()
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
   {
     ::Components::EnterpriseComponent_ptr retval =
     ::Components::EnterpriseComponent::_nil ();
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Receiver_exec_i.h b/TAO/DevGuideExamples/CIAO/Messenger/Receiver_exec_i.h
index 5ccb8fb402d..c56055080c4 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Receiver_exec_i.h
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Receiver_exec_i.h
@@ -50,47 +50,28 @@ namespace CIDL_Receiver_Impl
 
     virtual void
     push_message_consumer (
-    ::Message *ev)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ::Message *ev);
 
     // Operations from Components::SessionComponent
 
     virtual void
     set_session_context (
-    ::Components::SessionContext_ptr ctx)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ::Components::SessionContext_ptr ctx);
 
     virtual void
-    ciao_preactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_preactivate ();
 
     virtual void
-    ciao_postactivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ciao_postactivate ();
 
     virtual void
-    ccm_activate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_activate ();
 
     virtual void
-    ccm_passivate ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_passivate ();
 
     virtual void
-    ccm_remove ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    ccm_remove ();
 
     protected:
     Receiver_Context *context_;
@@ -115,10 +96,7 @@ namespace CIDL_Receiver_Impl
     // Implicit operations.
 
     virtual ::Components::EnterpriseComponent_ptr
-    create ()
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
+    create ();
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Runnable_exec_i.cpp b/TAO/DevGuideExamples/CIAO/Messenger/Runnable_exec_i.cpp
index 12ba03b4c8b..a98cc736006 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Runnable_exec_i.cpp
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Runnable_exec_i.cpp
@@ -42,14 +42,12 @@ namespace CIDL_Messenger_Impl
 
   void
   Runnable_exec_i::start ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->run_lock_.release();
   }
 
   void
   Runnable_exec_i::stop ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->run_lock_.acquire();
   }
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/Runnable_exec_i.h b/TAO/DevGuideExamples/CIAO/Messenger/Runnable_exec_i.h
index 13f8f7d358d..1e9e45668a4 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/Runnable_exec_i.h
+++ b/TAO/DevGuideExamples/CIAO/Messenger/Runnable_exec_i.h
@@ -48,12 +48,10 @@ namespace CIDL_Messenger_Impl
     // Operations from ::Runnable
 
     virtual void
-    start ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    start ();
 
     virtual void
-    stop ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    stop ();
 
     // MY CODE
 
diff --git a/TAO/DevGuideExamples/CIAO/Messenger/StaticDAnCE/StaticDAnCEApp.cpp b/TAO/DevGuideExamples/CIAO/Messenger/StaticDAnCE/StaticDAnCEApp.cpp
index 985173e5720..4f50720ec1e 100644
--- a/TAO/DevGuideExamples/CIAO/Messenger/StaticDAnCE/StaticDAnCEApp.cpp
+++ b/TAO/DevGuideExamples/CIAO/Messenger/StaticDAnCE/StaticDAnCEApp.cpp
@@ -22,22 +22,16 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     {
       // Get reference to Root POA.
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA"
-                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var poa
-        = PortableServer::POA::_narrow (obj.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = PortableServer::POA::_narrow (obj.in ());
 
       // Activate POA manager
       PortableServer::POAManager_var mgr
-        = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        = poa->the_POAManager ();
 
-      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      mgr->activate ();
 
       int homes_table_size =
         sizeof (homes_table)/sizeof(HomeAttributes);
@@ -75,13 +69,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       static_node_manager_impl->init ();
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("IORTable");
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        IORTable::Table::_narrow (table_object.in ());
 
       if (CORBA::is_nil (adapter.in ()))
           ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
@@ -90,28 +81,21 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         static_node_manager_impl->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (manager.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+        orb->object_to_string (manager.in ());
 
       adapter->bind ("NodeManager",
-                     str.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+                     str.in ());
 
       // Run the main event loop for the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->run ();
 
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
 
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   catch (CORBA::Exception& ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+      ex._tao_print_exception ("Caught CORBA Exception: ");
       return -1;
     }
 
diff --git a/TAO/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h b/TAO/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
index ec79e9d3d3c..50d880249f6 100644
--- a/TAO/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
+++ b/TAO/DevGuideExamples/ImplRepo/IORTable/Messenger_i.h
@@ -10,8 +10,7 @@ public:
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException));
+  );
 };
 
 #endif
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
index 21cd2e19be7..d2bf828ee3b 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp
@@ -19,7 +19,6 @@ ClientInterceptor::~ClientInterceptor (void)
 
 char *
 ClientInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling ClientInterceptor name() method" << std::endl;
   return CORBA::string_dup (this->myname_);
@@ -27,14 +26,12 @@ ClientInterceptor::name ()
 
 void
 ClientInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientInterceptor::send_poll (
                               PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling send_poll()." << std::endl;
 }
@@ -43,8 +40,6 @@ ClientInterceptor::send_poll (
 void
 ClientInterceptor::send_request (
                                  PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   std::cout << "Calling send_request()." << std::endl;
 
@@ -70,7 +65,6 @@ ClientInterceptor::send_request (
 void
 ClientInterceptor::receive_reply (
                                   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_reply()." << std::endl;
@@ -79,8 +73,6 @@ ClientInterceptor::receive_reply (
 void
 ClientInterceptor::receive_other (
                                   PortableInterceptor::ClientRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   std::cout << "Calling receive_other()." << std::endl;
 }
@@ -88,8 +80,6 @@ ClientInterceptor::receive_other (
 void
 ClientInterceptor::receive_exception (
                                       PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_exception()." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
index 4882eaac54c..080f3571c1d 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.h
@@ -15,29 +15,19 @@ class ClientInterceptor
 
   virtual ~ClientInterceptor ();
 
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
  private:
   const char *myname_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
index 41786a4e1c8..36f5613c087 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp
@@ -18,20 +18,17 @@
 Messenger_i::Messenger_i (void)
 {
 }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
 {
 }
-  
+
 CORBA::Boolean Messenger_i::send_message (
                                           const char * user_name,
                                           const char * subject,
                                           char *& message
                                           )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 
 {
   //Add your implementation here
@@ -40,4 +37,4 @@ CORBA::Boolean Messenger_i::send_message (
   std::cerr << "Message:      " << message << std::endl;
   return 1;
 }
-  
+
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
index 99ceb257dfd..6cd2b747609 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h
@@ -20,20 +20,17 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
   virtual CORBA::Boolean send_message (
                                        const char * user_name,
                                        const char * subject,
                                        char *& message
-                                       )
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+                                       );
 
 };
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
index e22e1af87f0..f13d90e8e70 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.cpp
@@ -14,21 +14,19 @@ ServerInitializer::ServerInitializer ()
 void
 ServerInitializer::pre_init (
                              PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerInitializer::post_init (
                               PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // Create and register the request interceptors.
   PortableInterceptor::ServerRequestInterceptor_ptr si =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
 
-  try 
+  try
     {
       si = new ServerInterceptor ();
     }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
index f07b7821cb2..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInitializer.h
@@ -10,11 +10,9 @@ public virtual PortableInterceptor::ORBInitializer
  public:
   ServerInitializer ();
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
  private:
   int interceptor_type_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
index 04b4e47f498..b09d616662c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.cpp
@@ -9,7 +9,7 @@
 
 const IOP::ServiceId service_id = 0xdeed;
 const unsigned int num_allowed_users = 4;
-static const char* allowed_users[num_allowed_users+1] = 
+static const char* allowed_users[num_allowed_users+1] =
   {"Ron Klein", "Scott Case", "Mark Hodge", "Greg Black", 0};
 const char* restricted_interfaces[1] = {"IDL:Messenger:1.0"};
 
@@ -25,7 +25,6 @@ ServerInterceptor::~ServerInterceptor ()
 
 char *
 ServerInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling ServerInterceptor name() method" << std::endl;
   return CORBA::string_dup (this->myname_);
@@ -33,7 +32,6 @@ ServerInterceptor::name ()
 
 void
 ServerInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling destroy()." << std::endl;
 }
@@ -41,8 +39,6 @@ ServerInterceptor::destroy ()
 void
 ServerInterceptor::receive_request_service_contexts (
                                                      PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_request_service_contexts()." << std::endl;
@@ -51,12 +47,10 @@ ServerInterceptor::receive_request_service_contexts (
 void
 ServerInterceptor::receive_request (
                                     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   bool permission_granted = false;
   std::cout << "Calling receive_request()." << std::endl;
-  
+
   if (ri->target_is_a(restricted_interfaces[0])){
     IOP::ServiceId id = service_id;
     // Check that the request service context can be retrieved.
@@ -67,7 +61,7 @@ ServerInterceptor::receive_request (
 
     const char * buf =
       reinterpret_cast<const char *> (ocSeq.get_buffer ());
-  
+
     for (unsigned int i=0; i<num_allowed_users; ++i) {
       if (ACE_OS::strcmp (buf, allowed_users[i]) == 0)
         {
@@ -75,7 +69,7 @@ ServerInterceptor::receive_request (
         }
     }
   }
-  
+
   if (permission_granted == true) {
     std::cout << "Permission Granted " << std::endl;
   }
@@ -88,7 +82,6 @@ ServerInterceptor::receive_request (
 void
 ServerInterceptor::send_reply (
                                PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_reply()." << std::endl;
@@ -97,8 +90,6 @@ ServerInterceptor::send_reply (
 void
 ServerInterceptor::send_exception (
                                    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_exception()." << std::endl;
@@ -107,8 +98,6 @@ ServerInterceptor::send_exception (
 void
 ServerInterceptor::send_other (
                                PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_other()." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
index d0eb11ee704..a8da1affe95 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ServerInterceptor.h
@@ -9,34 +9,23 @@ class ServerInterceptor
 {
  public:
   ServerInterceptor (void);
-  
+
   ~ServerInterceptor ();
-  
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name ();
+
+  virtual void destroy ();
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-                                                 PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                                 PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
  private:
   const char *myname_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
index 6abd46ca4c0..8324a171429 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp
@@ -10,7 +10,6 @@ void
 ClientInitializer::pre_init (
                              PortableInterceptor::ORBInitInfo_ptr
                              )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -18,17 +17,16 @@ void
 ClientInitializer::post_init (
                               PortableInterceptor::ORBInitInfo_ptr info
                               )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // get Codec factory
   IOP::CodecFactory_var codec_factory = info->codec_factory();
-  
+
   // Create and register the request interceptors.
   PortableInterceptor::ClientRequestInterceptor_ptr ci =
     PortableInterceptor::ClientRequestInterceptor::_nil ();
-  
-  try 
+
+  try
     {
       ci = new ClientInterceptor (codec_factory);
     }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
index 9536c6ce776..da95a8e339a 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.h
@@ -11,10 +11,8 @@ class ClientInitializer :
 {
  public:
   ClientInitializer (void);
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #endif
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
index c919423a0eb..14b1af0c774 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp
@@ -12,14 +12,14 @@ ClientInterceptor (IOP::CodecFactory_var cf)
   : myname_ ("Client_Authentication_Interceptor")
 {
   std::cout << "Calling ClientInterceptor constructor." << std::endl;
-  
+
   // Set up a structure that contains information necessary to
   // create a GIOP 1.2 CDR encapsulation Codec.
   IOP::Encoding encoding;
   encoding.format = IOP::ENCODING_CDR_ENCAPS;
   encoding.major_version = 1;
   encoding.minor_version = 2;
- 
+
   // Obtain the CDR encapsulation Codec.
   this->codec = cf->create_codec (encoding);
 }
@@ -30,7 +30,6 @@ ClientInterceptor::~ClientInterceptor (void)
 
 char *
 ClientInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling ClientInterceptor name() method" << std::endl;
   return CORBA::string_dup (this->myname_);
@@ -38,14 +37,12 @@ ClientInterceptor::name ()
 
 void
 ClientInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientInterceptor::send_poll (
                               PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_poll()." << std::endl;
@@ -55,26 +52,24 @@ ClientInterceptor::send_poll (
 void
 ClientInterceptor::send_request (
                                  PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   std::cout << "Calling send_request()." << std::endl;
-  
+
   const CORBA::ULong tagID = 9654;
 
-  try  
+  try
     {
       IOP::TaggedComponent_var myTag = ri->get_effective_component(tagID);
       char *tag =
         reinterpret_cast<char*> (myTag->component_data.get_buffer());
-  
+
       std::cout << "IOR Tag is : " << tag << std::endl;
     }
   catch(...)
-    { 
+    {
       std::cerr << "Tagged Component not found" << std::endl;
     }
-   
+
   IOP::ServiceContext sc;
   sc.context_id = service_ctx_id;
 
@@ -87,7 +82,7 @@ ClientInterceptor::send_request (
 
   sc.context_data = reinterpret_cast<CORBA::OctetSeq&>(
                                          *codec->encode(gid_as_any));
-  
+
   // Add this context to the service context list.
   ri->add_request_service_context (sc, 0);
 
@@ -96,7 +91,6 @@ ClientInterceptor::send_request (
 void
 ClientInterceptor::receive_reply (
                                   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_reply()." << std::endl;
@@ -105,8 +99,6 @@ ClientInterceptor::receive_reply (
 void
 ClientInterceptor::receive_other (
                                   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_other()." << std::endl;
@@ -115,8 +107,6 @@ ClientInterceptor::receive_other (
 void
 ClientInterceptor::receive_exception (
                                       PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_exception()." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
index 445a601d082..2b43cd9123e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.h
@@ -10,35 +10,25 @@ class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
   public virtual TAO_Local_RefCounted_Object
 {
-  
+
  public:
   ClientInterceptor (IOP::CodecFactory_var) ;
-  
-  virtual ~ClientInterceptor ();  
 
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ~ClientInterceptor ();
+
+  virtual char * name ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
  private:
   const char *myname_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
index eb4520c600b..78d2841ba76 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.cpp
@@ -8,17 +8,14 @@
 Messenger_i::Messenger_i (void)
 {
 }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
 {
 }
-  
+
 
 void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   try
     {
@@ -56,16 +53,16 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
       // Obtain the CDR encapsulation Codec.
       IOP::Codec_var codec =
         codec_factory->create_codec (encoding);
-    
-      CORBA::Any uid_as_any; 
+
+      CORBA::Any uid_as_any;
       uid_as_any = *(codec->decode(user_name));
-    
+
       CORBA::Long uid;
       uid_as_any >>= uid;
       std::cout << "UID: " << uid << std::endl;
 
     }
-  
+
   catch(...)
     {
       std::cerr << "exception received" << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
index dc3e46058f5..d481b7803f5 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/Messenger_i.h
@@ -11,17 +11,14 @@
 class  Messenger_i : public virtual POA_Messenger
 {
  public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
 
 
-  virtual void send_message (const CORBA::OctetSeq & user_name)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void send_message (const CORBA::OctetSeq & user_name);
 
 };
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
index 43ad1333ee6..2d41d009e3d 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp
@@ -2,21 +2,18 @@
 #include <iostream>
 char *
 ServerIORInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerIORInterceptor");
 }
 
 void
 ServerIORInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerIORInterceptor::establish_components (
                                             PortableInterceptor::IORInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   const char * permission = "ServerRequiresAuth";
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
index 9dd6c080b45..86936f9aa04 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.h
@@ -8,23 +8,17 @@ public virtual PortableInterceptor::IORInterceptor,
 public virtual TAO_Local_RefCounted_Object
 {
  public:
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
   virtual void establish_components (
                                      PortableInterceptor::IORInfo_ptr info
-                                     )
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                                     );
 
   virtual void components_established (
     PortableInterceptor::IORInfo_ptr /*info*/
     )
-    ACE_THROW_SPEC ((
-    CORBA::SystemException
-    ))
   {
   }
 
@@ -32,9 +26,6 @@ public virtual TAO_Local_RefCounted_Object
     PortableInterceptor::AdapterManagerId /*id*/,
     PortableInterceptor::AdapterState /*state*/
     )
-    ACE_THROW_SPEC ((
-    CORBA::SystemException
-    ))
   {
   }
 
@@ -42,9 +33,6 @@ public virtual TAO_Local_RefCounted_Object
     const PortableInterceptor::ObjectReferenceTemplateSeq& /*templates*/,
     PortableInterceptor::AdapterState /*state*/
     )
-    ACE_THROW_SPEC ((
-    CORBA::SystemException
-    ))
   {
   }
 };
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
index b275cf004ea..65fba6b3d7e 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.cpp
@@ -9,14 +9,12 @@ ServerInitializer::ServerInitializer ()
 void
 ServerInitializer::pre_init (
                              PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerInitializer::post_init (
                               PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // get reference to the codec_factory
   IOP::CodecFactory_var codec_factory = info->codec_factory();
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
index f07b7821cb2..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInitializer.h
@@ -10,11 +10,9 @@ public virtual PortableInterceptor::ORBInitializer
  public:
   ServerInitializer ();
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
  private:
   int interceptor_type_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
index c70299b8523..043d6b440cc 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.cpp
@@ -11,14 +11,14 @@ ServerInterceptor::ServerInterceptor (IOP::CodecFactory_var cf)
   : myname_ ("Server_Authentication_Interceptor")
 {
   std::cout << "Calling ServerInterceptor constructor." << std::endl;
-  
+
   // Set up a structure that contains information necessary to
   // create a GIOP 1.2 CDR encapsulation Codec.
   IOP::Encoding encoding;
   encoding.format = IOP::ENCODING_CDR_ENCAPS;
   encoding.major_version = 1;
   encoding.minor_version = 2;
-  
+
   // Obtain the CDR encapsulation Codec.
   this->codec = cf->create_codec (encoding);
 }
@@ -29,7 +29,6 @@ ServerInterceptor::~ServerInterceptor ()
 
 char *
 ServerInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling ServerInterceptor name() method" << std::endl;
   return CORBA::string_dup (this->myname_);
@@ -37,7 +36,6 @@ ServerInterceptor::name ()
 
 void
 ServerInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling destroy()." << std::endl;
 }
@@ -45,8 +43,6 @@ ServerInterceptor::destroy ()
 void
 ServerInterceptor::receive_request_service_contexts (
                                                      PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_request_service_contexts()." << std::endl;
@@ -55,12 +51,10 @@ ServerInterceptor::receive_request_service_contexts (
 void
 ServerInterceptor::receive_request (
                                     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   bool permission_granted = false;
   std::cout << "Calling receive_request()." << std::endl;
-  
+
   if (ri->target_is_a(restricted_interfaces[0])){
     IOP::ServiceId id = service_id;
     // Check that the request service context can be retrieved.
@@ -72,10 +66,10 @@ ServerInterceptor::receive_request (
                                             sc->context_data.length(),
                                             sc->context_data.get_buffer(),
                                             0);
- 
+
     CORBA::Any gid_as_any;
     gid_as_any = *codec->decode(ocSeq);
- 
+
     CORBA::Long gid;
     gid_as_any >>= gid;
     for (int i=0; i<3; ++i) {
@@ -85,20 +79,18 @@ ServerInterceptor::receive_request (
 	}
     }
   }
-  
+
   if (permission_granted == true) {
     std::cout << "Permission Granted " << std::endl;
   }
   else {
-    std::cout << "Permission Denied " << std::endl;
-    ACE_THROW_SPEC (CORBA::NO_PERMISSION());
+    std::cout << "Permission Denied " << std::endl;;
   }
 }
 
 void
 ServerInterceptor::send_reply (
                                PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_reply()." << std::endl;
@@ -107,8 +99,6 @@ ServerInterceptor::send_reply (
 void
 ServerInterceptor::send_exception (
                                    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_exception()." << std::endl;
@@ -117,8 +107,6 @@ ServerInterceptor::send_exception (
 void
 ServerInterceptor::send_other (
                                PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_other()." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
index abcac4bc9f5..6fb4f52ddbd 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerInterceptor.h
@@ -10,34 +10,23 @@ class ServerInterceptor
 {
  public:
   ServerInterceptor (IOP::CodecFactory_var);
-  
+
   ~ServerInterceptor ();
-  
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name ();
+
+  virtual void destroy ();
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-                                                 PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                                 PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
  private:
   const char *myname_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
index 8dfb951ba97..0c2241c5312 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ServerInterceptor.cpp
@@ -70,8 +70,7 @@ ServerInterceptor::receive_request (
     std::cout << "Permission Granted " << std::endl;
   }
   else {
-    std::cout << "Permission Denied " << std::endl;
-    ACE_THROW_SPEC (CORBA::NO_PERMISSION());
+    std::cout << "Permission Denied " << std::endl;;
   }
 }
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
index 77792427eba..6bdd7c6a1de 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp
@@ -25,7 +25,6 @@ ClientInterceptor::~ClientInterceptor (void)
 
 char *
 ClientInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling ClientInterceptor name() method" << std::endl;
   return CORBA::string_dup (this->myname_);
@@ -33,14 +32,12 @@ ClientInterceptor::name ()
 
 void
 ClientInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientInterceptor::send_poll (
                               PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_poll()." << std::endl;
@@ -50,8 +47,6 @@ ClientInterceptor::send_poll (
 void
 ClientInterceptor::send_request (
                                  PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   std::cout << "Calling send_request()." << std::endl;
 
@@ -72,14 +67,14 @@ ClientInterceptor::send_request (
   CORBA::Any *recurse = ri->get_slot(slot);
   CORBA::Long x;
   *recurse >>= x;
-  
+
   CORBA::Any flag;
   if (x == 0)
     {
       flag <<= 1;
-      
+
       pic->set_slot(slot, flag);
-      
+
       // get server time
       std::cout << "Server Time = " << messenger->get_time() << std::endl;
     }
@@ -95,7 +90,6 @@ ClientInterceptor::send_request (
 void
 ClientInterceptor::receive_reply (
                                   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_reply()." << std::endl;
@@ -104,8 +98,6 @@ ClientInterceptor::receive_reply (
 void
 ClientInterceptor::receive_other (
                                   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_other()." << std::endl;
@@ -114,8 +106,6 @@ ClientInterceptor::receive_other (
 void
 ClientInterceptor::receive_exception (
                                       PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_exception()." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
index c65e5f0c6df..538460c6e71 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.h
@@ -11,37 +11,27 @@ class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
   public virtual TAO_Local_RefCounted_Object
 {
-  
+
  public:
-  ClientInterceptor (Messenger_var theMessage, 
+  ClientInterceptor (Messenger_var theMessage,
                      PortableInterceptor::Current_ptr thePic,
                      PortableInterceptor::SlotId theSlot);
-  
-  virtual ~ClientInterceptor ();  
 
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ~ClientInterceptor ();
+
+  virtual char * name ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
  private:
   const char *myname_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
index b69a42ab285..8057ba8baca 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.cpp
@@ -19,20 +19,17 @@
 Messenger_i::Messenger_i (void)
   {
   }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
   {
   }
-  
+
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
     char *& message
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 
   {
     //Add your implementation here
@@ -41,21 +38,18 @@ CORBA::Boolean Messenger_i::send_message (
     std::cerr << "Message:      " << message << std::endl;
     return 1;
   }
-  
+
 char * Messenger_i::get_time (
 
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 
 {
   time_t thetime;
   struct tm * timeinfo;
- 
+
   ACE_OS::time(&thetime);
   timeinfo = ACE_OS::localtime(&thetime);
   char *timestring = CORBA::string_dup(ACE_OS::asctime(timeinfo));
-  
+
   return timestring;
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
index 46135bf7dd9..b072109812c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/Messenger_i.h
@@ -20,27 +20,21 @@
 class  Messenger_i : public virtual POA_Messenger
 {
 public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
-  
+
 virtual CORBA::Boolean send_message (
     const char * user_name,
     const char * subject,
     char *& message
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
 virtual char * get_time (
 
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
+  );
 
 };
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
index 4ead54b7746..c4ac773fcc4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.cpp
@@ -8,14 +8,12 @@ ServerInitializer::ServerInitializer ()
 void
 ServerInitializer::pre_init (
                              PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerInitializer::post_init (
                               PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create and register the request interceptors.
   PortableInterceptor::ServerRequestInterceptor_var si =
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
index f07b7821cb2..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInitializer.h
@@ -10,11 +10,9 @@ public virtual PortableInterceptor::ORBInitializer
  public:
   ServerInitializer ();
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
  private:
   int interceptor_type_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
index db1004b8a2f..7b4bef43561 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.cpp
@@ -21,7 +21,6 @@ ServerInterceptor::~ServerInterceptor ()
 
 char *
 ServerInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling ServerInterceptor name() method" << std::endl;
   return CORBA::string_dup (this->myname_);
@@ -29,7 +28,6 @@ ServerInterceptor::name ()
 
 void
 ServerInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling destroy()." << std::endl;
 }
@@ -37,8 +35,6 @@ ServerInterceptor::destroy ()
 void
 ServerInterceptor::receive_request_service_contexts (
                                                      PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_request_service_contexts()." << std::endl;
@@ -47,12 +43,10 @@ ServerInterceptor::receive_request_service_contexts (
 void
 ServerInterceptor::receive_request (
                                     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   bool permission_granted = false;
   std::cout << "Calling receive_request()." << std::endl;
-  
+
   if (ri->target_is_a(restricted_interfaces[0])){
     IOP::ServiceId id = service_id;
     // Check that the request service context can be retrieved.
@@ -63,7 +57,7 @@ ServerInterceptor::receive_request (
 
     const char * buf =
       reinterpret_cast<const char *> (ocSeq.get_buffer ());
-  
+
     for (unsigned int i=0; i<num_allowed_users; ++i) {
       if (ACE_OS::strcmp (buf, allowed_users[i]) == 0)
         {
@@ -71,20 +65,18 @@ ServerInterceptor::receive_request (
         }
     }
   }
-  
+
   if (permission_granted == true) {
     std::cout << "Permission Granted " << std::endl;
   }
   else {
-    std::cout << "Permission Denied " << std::endl;
-    ACE_THROW_SPEC (CORBA::NO_PERMISSION());
+    std::cout << "Permission Denied " << std::endl;;
   }
 }
 
 void
 ServerInterceptor::send_reply (
                                PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_reply()." << std::endl;
@@ -93,8 +85,6 @@ ServerInterceptor::send_reply (
 void
 ServerInterceptor::send_exception (
                                    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_exception()." << std::endl;
@@ -103,8 +93,6 @@ ServerInterceptor::send_exception (
 void
 ServerInterceptor::send_other (
                                PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_other()." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
index d0eb11ee704..a8da1affe95 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ServerInterceptor.h
@@ -9,34 +9,23 @@ class ServerInterceptor
 {
  public:
   ServerInterceptor (void);
-  
+
   ~ServerInterceptor ();
-  
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name ();
+
+  virtual void destroy ();
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-                                                 PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                                 PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
  private:
   const char *myname_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
index 8049968e6e6..b812a1851f3 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp
@@ -9,7 +9,6 @@ void
 ClientInitializer::pre_init (
                              PortableInterceptor::ORBInitInfo_ptr
                              )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
@@ -17,12 +16,11 @@ void
 ClientInitializer::post_init (
                               PortableInterceptor::ORBInitInfo_ptr info
                               )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   // get Codec factory
   IOP::CodecFactory_var codec_factory = info->codec_factory();
-  
+
   // Create and register the request interceptors.
   PortableInterceptor::ClientRequestInterceptor_var ci =
     new ClientInterceptor (codec_factory);
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
index 9536c6ce776..da95a8e339a 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.h
@@ -11,10 +11,8 @@ class ClientInitializer :
 {
  public:
   ClientInitializer (void);
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 };
 
 #endif
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
index 16112bba847..5ac1df636aa 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp
@@ -29,7 +29,6 @@ ClientInterceptor::~ClientInterceptor (void)
 
 char *
 ClientInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling ClientInterceptor name() method" << std::endl;
   return CORBA::string_dup (this->myname_);
@@ -37,14 +36,12 @@ ClientInterceptor::name ()
 
 void
 ClientInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ClientInterceptor::send_poll (
                               PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_poll()." << std::endl;
@@ -54,8 +51,6 @@ ClientInterceptor::send_poll (
 void
 ClientInterceptor::send_request (
                                  PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   std::cout << "Calling send_request()." << std::endl;
 
@@ -79,7 +74,6 @@ ClientInterceptor::send_request (
 void
 ClientInterceptor::receive_reply (
                                   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_reply()." << std::endl;
@@ -88,8 +82,6 @@ ClientInterceptor::receive_reply (
 void
 ClientInterceptor::receive_other (
                                   PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_other()." << std::endl;
@@ -98,8 +90,6 @@ ClientInterceptor::receive_other (
 void
 ClientInterceptor::receive_exception (
                                       PortableInterceptor::ClientRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling receive_exception()." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
index a8bed32eb50..5e97825d64c 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.h
@@ -10,40 +10,30 @@ class ClientInterceptor:
   public virtual PortableInterceptor::ClientRequestInterceptor,
   public virtual TAO_Local_RefCounted_Object
 {
-  
+
  public:
   ClientInterceptor (IOP::CodecFactory_var) ;
-  
-  virtual ~ClientInterceptor ();  
 
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual ~ClientInterceptor ();
+
+  virtual char * name ();
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void destroy ();
 
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
  private:
   const char *myname_;
   IOP::Codec_var codec;
-  
+
 };
 
 #endif
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
index 995ce6f626e..006a641f753 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.cpp
@@ -7,17 +7,14 @@
 Messenger_i::Messenger_i (void)
 {
 }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
 {
 }
-  
+
 
 void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
 {
   try
     {
@@ -27,7 +24,7 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
       strcpy (argv[0], "MessengerServer");
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-    
+
       // Obtain a reference to the CodecFactory.
       CORBA::Object_var obj =
     	orb->resolve_initial_references ("CodecFactory");
@@ -55,10 +52,10 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
       // Obtain the CDR encapsulation Codec.
       IOP::Codec_var codec =
         codec_factory->create_codec (encoding);
-    
-      CORBA::Any uid_as_any; 
+
+      CORBA::Any uid_as_any;
       uid_as_any = *(codec->decode(user_name));
-    
+
       CORBA::Long uid;
       uid_as_any >>= uid;
       std::cout << "UID: " << uid << std::endl;
@@ -71,4 +68,4 @@ void Messenger_i::send_message (const CORBA::OctetSeq & user_name)
     }
 
 }
-  
+
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
index fac0e58921c..24befa12b87 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/Messenger_i.h
@@ -11,17 +11,14 @@
 class  Messenger_i : public virtual POA_Messenger
 {
  public:
-  //Constructor 
+  //Constructor
   Messenger_i (void);
-  
-  //Destructor 
+
+  //Destructor
   virtual ~Messenger_i (void);
 
 
-  virtual void send_message (const CORBA::OctetSeq & user_name)
-    ACE_THROW_SPEC ((
-                     CORBA::SystemException
-                     ));
+  virtual void send_message (const CORBA::OctetSeq & user_name);
 
 };
 
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
index 066634498f6..3874ab18825 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.cpp
@@ -8,14 +8,12 @@ ServerInitializer::ServerInitializer ()
 void
 ServerInitializer::pre_init (
                              PortableInterceptor::ORBInitInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 ServerInitializer::post_init (
                               PortableInterceptor::ORBInitInfo_ptr info)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // get reference to the codec_factory
   IOP::CodecFactory_var codec_factory = info->codec_factory();
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
index f07b7821cb2..fb880e8b5f4 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInitializer.h
@@ -10,11 +10,9 @@ public virtual PortableInterceptor::ORBInitializer
  public:
   ServerInitializer ();
 
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info);
 
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info);
 
  private:
   int interceptor_type_;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
index 08ddc68dca7..ed249c961cb 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp
@@ -11,7 +11,7 @@ ServerInterceptor::ServerInterceptor (IOP::CodecFactory_var cf)
   : myname_ ("Server_Authentication_Interceptor")
 {
   std::cout << "Calling ServerInterceptor constructor." << std::endl;
-  
+
   // Set up a structure that contains information necessary to
   // create a GIOP 1.2 CDR encapsulation Codec.
   IOP::Encoding encoding;
@@ -30,7 +30,6 @@ ServerInterceptor::~ServerInterceptor ()
 
 char *
 ServerInterceptor::name ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling ServerInterceptor name() method" << std::endl;
   return CORBA::string_dup (this->myname_);
@@ -38,7 +37,6 @@ ServerInterceptor::name ()
 
 void
 ServerInterceptor::destroy ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   std::cout << "Calling destroy()." << std::endl;
 }
@@ -46,8 +44,6 @@ ServerInterceptor::destroy ()
 void
 ServerInterceptor::receive_request_service_contexts (
                                                      PortableInterceptor::ServerRequestInfo_ptr)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   std::cout << "Calling receive_request_service_contexts()." << std::endl;
 }
@@ -55,12 +51,10 @@ ServerInterceptor::receive_request_service_contexts (
 void
 ServerInterceptor::receive_request (
                                     PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   bool permission_granted = false;
   std::cout << "Calling receive_request()." << std::endl;
-  
+
   if (ri->target_is_a(restricted_interfaces[0])){
     IOP::ServiceId id = service_id;
     // Check that the request service context can be retrieved.
@@ -72,10 +66,10 @@ ServerInterceptor::receive_request (
                                             sc->context_data.length(),
                                             sc->context_data.get_buffer(),
                                             0);
-     
+
     CORBA::Any gid_as_any;
     gid_as_any = *codec->decode(ocSeq);
- 
+
     CORBA::Long gid;
     gid_as_any >>= gid;
     for (int i=0; i<3; ++i) {
@@ -85,20 +79,18 @@ ServerInterceptor::receive_request (
 	}
     }
   }
-  
+
   if (permission_granted == true) {
     std::cout << "Permission Granted " << std::endl;
   }
   else {
-    std::cout << "Permission Denied " << std::endl;
-    ACE_THROW_SPEC (CORBA::NO_PERMISSION());
+    std::cout << "Permission Denied " << std::endl;;
   }
 }
 
 void
 ServerInterceptor::send_reply (
                                PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_reply()." << std::endl;
@@ -107,8 +99,6 @@ ServerInterceptor::send_reply (
 void
 ServerInterceptor::send_exception (
                                    PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_exception()." << std::endl;
@@ -117,8 +107,6 @@ ServerInterceptor::send_exception (
 void
 ServerInterceptor::send_other (
                                PortableInterceptor::ServerRequestInfo_ptr ri)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
 {
   ACE_UNUSED_ARG(ri);
   std::cout << "Calling send_other()." << std::endl;
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
index abcac4bc9f5..6fb4f52ddbd 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.h
@@ -10,34 +10,23 @@ class ServerInterceptor
 {
  public:
   ServerInterceptor (IOP::CodecFactory_var);
-  
+
   ~ServerInterceptor ();
-  
-  virtual char * name ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual char * name ();
+
+  virtual void destroy ();
 
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
   virtual void receive_request_service_contexts (
-                                                 PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+                                                 PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
+  virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
 
  private:
   const char *myname_;
diff --git a/TAO/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp b/TAO/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
index bcc73c50247..dea865aa6f4 100644
--- a/TAO/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
+++ b/TAO/DevGuideExamples/Security/SecurityUnawareApp/MessengerI.cpp
@@ -25,22 +25,19 @@
 Messenger_i::Messenger_i (void)
   {
   }
-  
+
 // Implementation skeleton destructor
 Messenger_i::~Messenger_i (void)
   {
   }
-  
+
 CORBA::Boolean Messenger_i::send_message (
     const char * user_name,
     const char * subject,
     char *& message
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 
   {
     //Add your implementation here
   }
-  
+
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
index 6c0d38c657c..8073405eec7 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/server.cpp
@@ -28,7 +28,6 @@ class PersonFactory
   : public virtual Person_init
 {
   Person* create(const char* name)
-    ACE_THROW_SPEC((CORBA::SystemException))
   {
     Person_i* p = new Person_i;
     p->name(name);
@@ -48,7 +47,6 @@ class Transaction_i
 {
 public:
   CORBA::Long update(Person* p)
-    ACE_THROW_SPEC((CORBA::SystemException))
   {
     ACE_DEBUG((LM_DEBUG,
       "Server: Subtracting $1.50 from person:%s starting balance:$%.2f\n",
author	Abdullah Sowayan <sowayan@users.noreply.github.com>	2008-10-21 21:02:46 +0000
committer	Abdullah Sowayan <sowayan@users.noreply.github.com>	2008-10-21 21:02:46 +0000
commit	7a6b7ac07fb0c405be997a50c2ddb7d12bba61cd (patch)
tree	bbc724a9ddda20d363875112e582e1b43e95f319
parent	166062da57bc96ce5325b7c7b5120f74bc836694 (diff)
download	ATCD-7a6b7ac07fb0c405be997a50c2ddb7d12bba61cd.tar.gz