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

33 files changed, 153 insertions, 364 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index a82c7b94f96..e8a787e2872 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,10 +1,15 @@
+Mon Feb 12 12:53:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/*.{h,cpp,inl}:
+          Removed ACE_THROW_SPEC, layout changes, reduced includes
+
 Sat Feb 10 20:16:57 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
         * DAnCE/TargetManager/ResourceCommitmentManager.h:
         * DAnCE/TargetManager/ResourceCommitmentManager.cpp:
 
         * ciao/Deployment_ResourceCommitmentManager.idl:
-				  Added the $Id$ tags
+          Added missing Id tag
 
 Fri Feb  9 20:11:15 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
@@ -28,87 +33,88 @@ Fri Feb  9 20:11:15 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
         * ciao/CCM_Core.mpc:
         * ciao/Deployment_ResourceCommitmentManager.idl:
         * ciao/Deployment_TargetManager.idl:
-                                  Merged in changes from the branch TargetManager_Ext to introduce new
-                                        feature complying to the spec
 
-                                        Fri Feb  2 21:00:48 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+        Merged in changes from the branch TargetManager_Ext to introduce new
+        feature complying to the spec
+
+          Fri Feb  2 21:00:48 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-                                        * DAnCE/TargetManager/CmpClient.cpp:
-                                        * DAnCE/TargetManager/DomainDataManager.h:
-                                        * DAnCE/TargetManager/DomainDataManager.cpp:
-                                        * DAnCE/TargetManager/TargetManager.mpc:
-                                        * DAnCE/TargetManager/TargetManagerImpl.idl:
-                                        * DAnCE/TargetManager/TargetManager_exec.h:
-                                        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManager.mpc:
+          * DAnCE/TargetManager/TargetManagerImpl.idl:
+          * DAnCE/TargetManager/TargetManager_exec.h:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
 
-                                        Cleaning TM code to separate CIAO-specific functionality.
+          Cleaning TM code to separate CIAO-specific functionality.
 
-                                        Tue Jan 16 21:18:57 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+          Tue Jan 16 21:18:57 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-                                        * DAnCE/TargetManager/CmpClient.cpp:
-                                        * DAnCE/TargetManager/DomainDataManager.h:
-                                        * DAnCE/TargetManager/DomainDataManager.cpp:
-                                        * DAnCE/TargetManager/TargetManagerExt.idl:
-                                        * DAnCE/TargetManager/TargetManagerImpl.idl:
-                                        * DAnCE/TargetManager/TargetManager_exec.h:
-                                        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManagerExt.idl:
+          * DAnCE/TargetManager/TargetManagerImpl.idl:
+          * DAnCE/TargetManager/TargetManager_exec.h:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
 
-                                        Added some comments to decrease doxygen warnings;Changed
-                                        ACE_DEBUG in many places to ACE_ERROR;Removed a lot of unwanted
-                                        debug messages
+          Added some comments to decrease doxygen warnings;Changed
+          ACE_DEBUG in many places to ACE_ERROR;Removed a lot of unwanted
+          debug messages
 
-                                        Fri Jan 12 22:04:14 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+          Fri Jan 12 22:04:14 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-                                        * DAnCE/TargetManager/CmpClient.cpp:
-                                        * DAnCE/TargetManager/DomainDataManager.h:
-                                        * DAnCE/TargetManager/DomainDataManager.cpp:
-                                        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
 
-                                        * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl:
+          * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl:
 
-                                        * ciao/Deployment_TargetManager.idl:
-                                        Changed to address Johnny's comments
+          * ciao/Deployment_TargetManager.idl:
+          Changed to address Johnny's comments
 
-                                        Thu Dec 28 22:59:45 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+          Thu Dec 28 22:59:45 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-                                        * DAnCE/TargetManager/CmpClient.cpp:
-                                        * DAnCE/TargetManager/DomainDataManager.h:
-                                        * DAnCE/TargetManager/DomainDataManager.cpp:
-                                        * DAnCE/TargetManager/TargetManager_exec.h:
-                                        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManager_exec.h:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
 
-                                        * ciao/Deployment_ResourceCommitmentManager.idl:
-                                        * ciao/Deployment_TargetManager.idl:
-                                        Modified defination to ResourceCommitmentManager
+          * ciao/Deployment_ResourceCommitmentManager.idl:
+          * ciao/Deployment_TargetManager.idl:
+          Modified defination to ResourceCommitmentManager
 
-                                        Wed Dec 27 19:59:32 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+          Wed Dec 27 19:59:32 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-                                        * DAnCE/TargetManager/CmpClient.cpp:
-                                        * DAnCE/TargetManager/DomainDataManager.h:
-                                        * DAnCE/TargetManager/DomainDataManager.cpp:
-                                        * DAnCE/TargetManager/TargetManager.mpc:
-                                        * DAnCE/TargetManager/TargetManager_exec.h:
-                                        * DAnCE/TargetManager/TargetManager_exec.cpp:
+          * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/DomainDataManager.h:
+          * DAnCE/TargetManager/DomainDataManager.cpp:
+          * DAnCE/TargetManager/TargetManager.mpc:
+          * DAnCE/TargetManager/TargetManager_exec.h:
+          * DAnCE/TargetManager/TargetManager_exec.cpp:
 
-                                        * ciao/CCM_Core.mpc:
-                                        * ciao/Deployment_ResourceCommitmentManager.idl:
-                                        * ciao/Deployment_TargetManager.idl:
-                                        Changes made to accomodate the ResourceCommitmentManager
+          * ciao/CCM_Core.mpc:
+          * ciao/Deployment_ResourceCommitmentManager.idl:
+          * ciao/Deployment_TargetManager.idl:
+          Changes made to accomodate the ResourceCommitmentManager
 
-                                        Tue Dec  5 17:44:49 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+          Tue Dec  5 17:44:49 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-                                        * ciao/Deployment_TargetManager.idl:
-                                        Deleted some extraneous comments
+          * ciao/Deployment_TargetManager.idl:
+          Deleted some extraneous comments
 
-                                        Tue Dec  5 06:29:22 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
+          Tue Dec  5 06:29:22 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
-                                        * DAnCE/TargetManager/CmpClient.cpp:
+          * DAnCE/TargetManager/CmpClient.cpp:
 
-                                        * ciao/CCM_Core.mpc:
-                                        * ciao/Deployment_ResourceCommitmentManager.idl:
-                                        * ciao/Deployment_TargetManager.idl:
-                                        Added in order to introduce ResourceCommitmenManager
-                                        to TargetManager
+          * ciao/CCM_Core.mpc:
+          * ciao/Deployment_ResourceCommitmentManager.idl:
+          * ciao/Deployment_TargetManager.idl:
+          Added in order to introduce ResourceCommitmenManager
+          to TargetManager
 
 Thu Feb  8 18:35:51 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/CIAO/ciao/Container_Base.cpp b/CIAO/ciao/Container_Base.cpp
index 593757bc493..37685102bf2 100644
--- a/CIAO/ciao/Container_Base.cpp
+++ b/CIAO/ciao/Container_Base.cpp
@@ -89,7 +89,6 @@ namespace CIAO
   int
   Session_Container::init (const char *name,
                            const CORBA::PolicyList *more_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::init");
 
@@ -217,7 +216,6 @@ namespace CIAO
   CORBA::Object_ptr
   Session_Container::install_servant (PortableServer::Servant p,
                                       Container::OA_Type t)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::install_servant");
 
@@ -244,7 +242,6 @@ namespace CIAO
   CORBA::Object_ptr
   Session_Container::install_component (PortableServer::Servant p,
                                         PortableServer::ObjectId_out oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::install_component");
     PortableServer::ObjectId_var id =
@@ -270,10 +267,6 @@ namespace CIAO
                                         const char *sv_dll_name,
                                         const char *sv_entrypt,
                                         const char *ins_name)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Deployment::UnknownImplId,
-                     Deployment::ImplEntryPointNotFound,
-                     Deployment::InstallationFailure))
   {
     CIAO_TRACE ("Session_Container::ciao_install_home");
 
@@ -474,7 +467,6 @@ namespace CIAO
 
   void
   Session_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::ciao_uninstall_home");
 
@@ -485,7 +477,6 @@ namespace CIAO
   void
   Session_Container::uninstall (CORBA::Object_ptr objref,
                                 Container::OA_Type t)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::uninstall");
 
@@ -509,7 +500,6 @@ namespace CIAO
   void
   Session_Container::uninstall (PortableServer::Servant svt,
                                 Container::OA_Type t)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::uninstall");
     PortableServer::POA_ptr tmp = 0;
@@ -532,7 +522,6 @@ namespace CIAO
   void
   Session_Container::uninstall_component (Components::CCMObject_ptr objref,
                                           PortableServer::ObjectId_out oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::uninstall_component");
 
@@ -555,7 +544,6 @@ namespace CIAO
 
   void
   Session_Container::deactivate_facet (const PortableServer::ObjectId &)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::deactivate_facet");
   }
@@ -570,7 +558,6 @@ namespace CIAO
 
   CORBA::Object_ptr
   Session_Container::get_home_objref (PortableServer::Servant)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Session_Container::get_home_objref");
     throw CORBA::NO_IMPLEMENT ();
diff --git a/CIAO/ciao/Container_Base.h b/CIAO/ciao/Container_Base.h
index 551a1670d5b..0b028cbfa73 100644
--- a/CIAO/ciao/Container_Base.h
+++ b/CIAO/ciao/Container_Base.h
@@ -76,7 +76,7 @@ namespace CIAO
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
                       const CORBA::PolicyList *more_policies = 0)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      = 0;
 
     /// Install a new home
     virtual Components::CCMHome_ptr ciao_install_home (
@@ -86,19 +86,16 @@ namespace CIAO
         const char *sv_entrypt,
         const char *ins_name
       )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::UnknownImplId,
-                       Deployment::ImplEntryPointNotFound,
-                       Deployment::InstallationFailure)) = 0;
+      = 0;
 
     // Uninstall a servant for component or home.
     virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      = 0;
 
     // Uninstall a servant for component.
     virtual void uninstall_component (::Components::CCMObject_ptr objref,
                                       PortableServer::ObjectId_out oid)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      = 0;
 
     // @@Jai, please see the Session Container class for comments.
     // @@ Jai, do you really need the environment variable?
@@ -108,7 +105,7 @@ namespace CIAO
     virtual void delete_servant_map (PortableServer::ObjectId &oid) = 0;
 
     virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      = 0;
 
   protected:
     /// Reference to the ORB
@@ -179,8 +176,7 @@ namespace CIAO
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
                       const CORBA::PolicyList *more_policies = 0)
-
-      ACE_THROW_SPEC ((CORBA::SystemException));
+;
 
     /**
      * @brief Simply installing a home executor into the component.
@@ -199,44 +195,33 @@ namespace CIAO
         const char *sv_dll_name,
         const char *sv_entrypt,
         const char *ins_name
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::UnknownImplId,
-                       Deployment::ImplEntryPointNotFound,
-                       Deployment::InstallationFailure));
+      );
 
     /// Uninstall a servant for component or home.
-    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref);
 
     /// Uninstall a servant for component.
     virtual void uninstall_component (::Components::CCMObject_ptr objref,
-                                      PortableServer::ObjectId_out oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                      PortableServer::ObjectId_out oid);
 
     /// Install a servant for component or home.
     virtual CORBA::Object_ptr install_servant (PortableServer::Servant p,
-                                       Container::OA_Type t)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                       Container::OA_Type t);
 
     /// Install a component servant.
     CORBA::Object_ptr install_component (PortableServer::Servant p,
-                                         PortableServer::ObjectId_out oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                         PortableServer::ObjectId_out oid);
 
     /// Get an object reference to a component or home from the servant.
-    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p);
 
     /// Uninstall a servant for component or home.
     void uninstall (CORBA::Object_ptr objref,
-                    Container::OA_Type t)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                    Container::OA_Type t);
 
     /// Uninstall a servant for component or home.
     void uninstall (PortableServer::Servant svt,
-                    Container::OA_Type t)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                    Container::OA_Type t);
 
     // @@Jai, please consider naming this method as
     // "add_servant_to_map ()" to be more descriptive.
@@ -256,11 +241,9 @@ namespace CIAO
      * deactivate_facet from the Swapping_Conatiner's interface. It
      * would make the base container interface much cleaner.
      */
-    virtual void deactivate_facet (const PortableServer::ObjectId &oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void deactivate_facet (const PortableServer::ObjectId &oid);
 
-    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p);
 
     /// Analog of the POA method that creates an object reference from
     /// an object id string.
diff --git a/CIAO/ciao/Container_Base.inl b/CIAO/ciao/Container_Base.inl
index 5d178c2024c..1c6bc7a075c 100644
--- a/CIAO/ciao/Container_Base.inl
+++ b/CIAO/ciao/Container_Base.inl
@@ -2,7 +2,6 @@
 
 ACE_INLINE CORBA::Object_ptr
 CIAO::Session_Container::get_objref (PortableServer::Servant p)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->the_POA ()->servant_to_reference (p);
 }
diff --git a/CIAO/ciao/Context_Impl_Base.cpp b/CIAO/ciao/Context_Impl_Base.cpp
index 72d99657c08..55980ea0b71 100644
--- a/CIAO/ciao/Context_Impl_Base.cpp
+++ b/CIAO/ciao/Context_Impl_Base.cpp
@@ -25,7 +25,6 @@ namespace CIAO
   Components::Principal_ptr
   Context_Impl_Base::get_caller_principal (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -33,7 +32,6 @@ namespace CIAO
   Components::CCMHome_ptr
   Context_Impl_Base::get_CCM_home (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return Components::CCMHome::_duplicate (this->home_.in ());
   }
@@ -41,8 +39,6 @@ namespace CIAO
   CORBA::Boolean
   Context_Impl_Base::get_rollback_only (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -50,8 +46,6 @@ namespace CIAO
   Components::Transaction::UserTransaction_ptr
   Context_Impl_Base::get_user_transaction (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -60,7 +54,6 @@ namespace CIAO
   Context_Impl_Base::is_caller_in_role (
       const char * /* role */
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -68,8 +61,6 @@ namespace CIAO
   void
   Context_Impl_Base::set_rollback_only (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
diff --git a/CIAO/ciao/Context_Impl_Base.h b/CIAO/ciao/Context_Impl_Base.h
index 189a9f3aba2..33c12d8ad5c 100644
--- a/CIAO/ciao/Context_Impl_Base.h
+++ b/CIAO/ciao/Context_Impl_Base.h
@@ -68,31 +68,22 @@ namespace CIAO
     // Operations from ::Components::CCMContext.
 
     virtual Components::Principal_ptr
-    get_caller_principal ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_caller_principal ();
 
     virtual Components::CCMHome_ptr
-    get_CCM_home ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_CCM_home ();
 
     virtual CORBA::Boolean
-    get_rollback_only ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    get_rollback_only ();
 
     virtual Components::Transaction::UserTransaction_ptr
-    get_user_transaction ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    get_user_transaction ();
 
     virtual CORBA::Boolean
-    is_caller_in_role (const char *role)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    is_caller_in_role (const char *role);
 
     virtual void
-    set_rollback_only ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    set_rollback_only ();
 
     // CIAO-specific.
 
diff --git a/CIAO/ciao/Context_Impl_T.cpp b/CIAO/ciao/Context_Impl_T.cpp
index c63e23ed06b..eb6153c58d1 100644
--- a/CIAO/ciao/Context_Impl_T.cpp
+++ b/CIAO/ciao/Context_Impl_T.cpp
@@ -34,8 +34,6 @@ namespace CIAO
   CORBA::Object_ptr
   Context_Impl<BASE_CTX, SVNT, COMP>::get_CCM_object (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::IllegalState))
   {
     if (CORBA::is_nil (this->component_.in ()))
       {
diff --git a/CIAO/ciao/Context_Impl_T.h b/CIAO/ciao/Context_Impl_T.h
index e85943c0425..cc2370b251b 100644
--- a/CIAO/ciao/Context_Impl_T.h
+++ b/CIAO/ciao/Context_Impl_T.h
@@ -81,9 +81,7 @@ namespace CIAO
     // Operations from ::Components::SessionContext.
 
     virtual CORBA::Object_ptr
-    get_CCM_object ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::IllegalState));
+    get_CCM_object ();
 
   protected:
     SVNT *servant_;
diff --git a/CIAO/ciao/Dynamic_Component_Activator.cpp b/CIAO/ciao/Dynamic_Component_Activator.cpp
index cdce36fb96f..1c41aa00575 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.cpp
+++ b/CIAO/ciao/Dynamic_Component_Activator.cpp
@@ -22,8 +22,6 @@ namespace CIAO
   PortableServer::Servant
   Dynamic_Component_Activator::incarnate (const PortableServer::ObjectId &oid,
                                 PortableServer::POA_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest))
   {
     Dynamic_Component_Servant_Base* servant = 0;
     PortableServer::ObjectId new_oid (oid);
@@ -43,7 +41,6 @@ namespace CIAO
     PortableServer::Servant ,
     CORBA::Boolean ,
     CORBA::Boolean)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h
index aec2aaf79f5..6c45fe287c4 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/CIAO/ciao/Dynamic_Component_Activator.h
@@ -65,16 +65,13 @@ namespace CIAO
      */
     PortableServer::Servant incarnate (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::ForwardRequest));
+      PortableServer::POA_ptr poa);
 
     void etherealize (const PortableServer::ObjectId &oid,
                       PortableServer::POA_ptr adapter,
                       PortableServer::Servant servant,
                       CORBA::Boolean cleanup_in_progress,
-                      CORBA::Boolean remaining_activations)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Boolean remaining_activations);
 
     void add_servant_map (PortableServer::ObjectId &oid,
                           Dynamic_Component_Servant_Base* servant);
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.cpp b/CIAO/ciao/Home_Servant_Impl_Base.cpp
index 0cfd1ec9870..2a55e25e9ec 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_Base.cpp
@@ -18,7 +18,6 @@ namespace CIAO
   CORBA::IRObject_ptr
   Home_Servant_Impl_Base::get_component_def (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -26,7 +25,6 @@ namespace CIAO
   CORBA::IRObject_ptr
   Home_Servant_Impl_Base::get_home_def (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
diff --git a/CIAO/ciao/Home_Servant_Impl_Base.h b/CIAO/ciao/Home_Servant_Impl_Base.h
index f7744ea6b48..780f7c782b6 100644
--- a/CIAO/ciao/Home_Servant_Impl_Base.h
+++ b/CIAO/ciao/Home_Servant_Impl_Base.h
@@ -50,12 +50,10 @@ namespace CIAO
     // Operations for CCMHome interface.
 
     virtual ::CORBA::IRObject_ptr
-    get_component_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_component_def ();
 
     virtual ::CORBA::IRObject_ptr
-    get_home_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_home_def ();
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid) = 0;
diff --git a/CIAO/ciao/Home_Servant_Impl_T.cpp b/CIAO/ciao/Home_Servant_Impl_T.cpp
index cfc7985e0c7..405a91250fc 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Home_Servant_Impl_T.cpp
@@ -54,8 +54,6 @@ namespace CIAO
                     COMP_SVNT>::remove_component (
       ::Components::CCMObject_ptr comp
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::RemoveFailure))
   {
     CIAO_TRACE ("Home_Servant_Impl<>::remove_component");
 
@@ -117,8 +115,6 @@ namespace CIAO
                     EXEC,
                     COMP_SVNT>::create_component (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CreateFailure))
   {
     CIAO_TRACE ("Home_Servant_Impl<>::create_component");
 
@@ -135,8 +131,6 @@ namespace CIAO
                     EXEC,
                     COMP_SVNT>::create (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CreateFailure))
   {
     CIAO_TRACE ("Home_Servant_Impl<>::create");
 
@@ -166,7 +160,6 @@ namespace CIAO
                     COMP_SVNT>::_ciao_activate_component (
       typename COMP_SVNT::_exec_type::_ptr_type exe
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Home_Servant_Impl<>::_ciao_activate_component");
 
@@ -216,7 +209,6 @@ namespace CIAO
                     COMP_SVNT>::_ciao_passivate_component (
       typename COMP_SVNT::_stub_ptr_type comp
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO_TRACE ("Home_Servant_Impl<>::_ciao_passivate_component");
 
diff --git a/CIAO/ciao/Home_Servant_Impl_T.h b/CIAO/ciao/Home_Servant_Impl_T.h
index c29ba00615a..a2cee7f04e4 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.h
+++ b/CIAO/ciao/Home_Servant_Impl_T.h
@@ -57,23 +57,17 @@ namespace CIAO
     // Operations for CCMHome interface.
 
     virtual void
-    remove_component (Components::CCMObject_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    remove_component (Components::CCMObject_ptr comp);
 
     // Operations for keyless home interface.
 
     virtual ::Components::CCMObject_ptr
-    create_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    create_component ();
 
     // Operations for implicit home interface.
 
     virtual typename COMP_SVNT::_stub_ptr_type
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    create ();
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid);
@@ -82,12 +76,10 @@ namespace CIAO
     // CIAO-specific operations.
 
     typename COMP_SVNT::_stub_ptr_type
-    _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_activate_component (typename COMP_SVNT::_exec_type::_ptr_type exe);
 
     void
-    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp);
 
   protected:
     const char *ins_name_;
diff --git a/CIAO/ciao/NodeApp_CB_Impl.cpp b/CIAO/ciao/NodeApp_CB_Impl.cpp
index c87e80f9333..d3817d4b4c4 100644
--- a/CIAO/ciao/NodeApp_CB_Impl.cpp
+++ b/CIAO/ciao/NodeApp_CB_Impl.cpp
@@ -6,7 +6,6 @@ NodeApplication_Callback_Impl  (CORBA::ORB_ptr o,
                                 PortableServer::POA_ptr p,
                                 Deployment::NodeApplicationManager_ptr s,
                                 const Deployment::Properties &properties)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   : orb_ (CORBA::ORB::_duplicate (o)),
     poa_ (PortableServer::POA::_duplicate (p)),
     nam_ (Deployment::NodeApplicationManager::_duplicate (s))
@@ -42,7 +41,6 @@ Deployment::NodeApplicationManager_ptr
 CIAO::NodeApplication_Callback_Impl::register_node_application (
     Deployment::NodeApplication_ptr na,
     Deployment::Properties_out properties)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   properties = this->properties_._retn ();
 
diff --git a/CIAO/ciao/NodeApp_CB_Impl.h b/CIAO/ciao/NodeApp_CB_Impl.h
index bd5c5fd7711..6b4bd0e2a30 100644
--- a/CIAO/ciao/NodeApp_CB_Impl.h
+++ b/CIAO/ciao/NodeApp_CB_Impl.h
@@ -41,8 +41,7 @@ namespace CIAO
     NodeApplication_Callback_Impl (CORBA::ORB_ptr o,
                                    PortableServer::POA_ptr p,
                                    Deployment::NodeApplicationManager_ptr s,
-                                   const Deployment::Properties &properties)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                   const Deployment::Properties &properties);
 
     /// Get the containing POA.  This operation does *not* increase
     /// the reference count of the POA.
@@ -53,8 +52,7 @@ namespace CIAO
     /// NodeApplicationManager
     Deployment::NodeApplicationManager_ptr
     register_node_application (Deployment::NodeApplication_ptr na,
-                               Deployment::Properties_out properties)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                               Deployment::Properties_out properties);
 
     Deployment::NodeApplication_ptr get_nodeapp_ref (void);
 
diff --git a/CIAO/ciao/Servant_Activator.cpp b/CIAO/ciao/Servant_Activator.cpp
index a43867a0185..284cfadf435 100644
--- a/CIAO/ciao/Servant_Activator.cpp
+++ b/CIAO/ciao/Servant_Activator.cpp
@@ -39,7 +39,6 @@ namespace CIAO
   bool
   Servant_Activator::update_port_activator (
     const PortableServer::ObjectId &oid)
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
@@ -66,8 +65,6 @@ namespace CIAO
   PortableServer::Servant
   Servant_Activator::incarnate (const PortableServer::ObjectId &oid,
                                 PortableServer::POA_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::ForwardRequest))
   {
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
@@ -124,7 +121,6 @@ namespace CIAO
                                   PortableServer::Servant servant,
                                   CORBA::Boolean ,
                                   CORBA::Boolean)
-      ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
diff --git a/CIAO/ciao/Servant_Activator.h b/CIAO/ciao/Servant_Activator.h
index 9a3cfc58644..6cfd3d979d8 100644
--- a/CIAO/ciao/Servant_Activator.h
+++ b/CIAO/ciao/Servant_Activator.h
@@ -57,8 +57,7 @@ namespace CIAO
 
     virtual ~Servant_Activator (void);
 
-    bool update_port_activator (const PortableServer::ObjectId &oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    bool update_port_activator (const PortableServer::ObjectId &oid);
 
     /// Template methods overridden to get callbacks.
     /**
@@ -68,16 +67,13 @@ namespace CIAO
      */
     PortableServer::Servant incarnate (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::ForwardRequest));
+      PortableServer::POA_ptr poa);
 
     void etherealize (const PortableServer::ObjectId &oid,
                       PortableServer::POA_ptr adapter,
                       PortableServer::Servant servant,
                       CORBA::Boolean cleanup_in_progress,
-                      CORBA::Boolean remaining_activations)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                      CORBA::Boolean remaining_activations);
 
     /// Local helper methods
     bool register_port_activator (Port_Activator *pa);
diff --git a/CIAO/ciao/Servant_Impl_Base.cpp b/CIAO/ciao/Servant_Impl_Base.cpp
index a40c0a5d6f6..30072e85e8d 100644
--- a/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servant_Impl_Base.cpp
@@ -24,8 +24,6 @@ namespace CIAO
   ::Components::PrimaryKeyBase *
   Servant_Impl_Base::get_primary_key (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     ::Components::NoKeyAvailable))
   {
     throw ::Components::NoKeyAvailable ();
   }
@@ -33,7 +31,6 @@ namespace CIAO
   CORBA::IRObject_ptr
   Servant_Impl_Base::get_component_def (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -41,8 +38,6 @@ namespace CIAO
   void
   Servant_Impl_Base::configuration_complete (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidConfiguration))
   {
     // CIAO to-do
   }
@@ -50,8 +45,6 @@ namespace CIAO
   void
   Servant_Impl_Base::remove (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::RemoveFailure))
   {
     try
     {
@@ -122,8 +115,6 @@ namespace CIAO
   Servant_Impl_Base::get_connections (
       const char * /* name */
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -131,7 +122,6 @@ namespace CIAO
   ::Components::ComponentPortDescription *
   Servant_Impl_Base::get_all_ports (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     OBV_Components::ComponentPortDescription *cps = 0;
     ACE_NEW_RETURN (cps,
@@ -167,8 +157,6 @@ namespace CIAO
   Servant_Impl_Base::provide_facet (
       const char *name
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
   {
     if (0 == name)
       {
@@ -189,8 +177,6 @@ namespace CIAO
   Servant_Impl_Base::get_named_facets (
       const ::Components::NameList & names
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
   {
     Components::FacetDescriptions *retval = 0;
     ACE_NEW_RETURN (retval,
@@ -219,7 +205,6 @@ namespace CIAO
   ::Components::FacetDescriptions *
   Servant_Impl_Base::get_all_facets (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::FacetDescriptions *tmp = 0;
     ACE_NEW_RETURN (tmp,
@@ -246,7 +231,6 @@ namespace CIAO
   ::Components::ConsumerDescriptions *
   Servant_Impl_Base::get_all_consumers (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::ConsumerDescriptions *tmp = 0;
     ACE_NEW_THROW_EX (tmp,
@@ -275,8 +259,6 @@ namespace CIAO
   Servant_Impl_Base::get_consumer (
       const char *sink_name
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
   {
     if (0 == sink_name)
       {
@@ -298,8 +280,6 @@ namespace CIAO
   Servant_Impl_Base::get_named_consumers (
       const ::Components::NameList & names
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
   {
     Components::ConsumerDescriptions *retval = 0;
     ACE_NEW_RETURN (retval,
@@ -329,8 +309,6 @@ namespace CIAO
   Servant_Impl_Base::get_named_emitters (
       const ::Components::NameList & /* names */
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
@@ -339,7 +317,6 @@ namespace CIAO
 
   Servant_Impl_Base::get_all_receptacles (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_DEBUG ((LM_DEBUG, "In Servant_Impl_Base::get_all_receptacles\n"));
 
@@ -373,8 +350,6 @@ namespace CIAO
   Servant_Impl_Base::get_named_receptacles (
       const ::Components::NameList & /* names */
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
   {
     throw ::CORBA::NO_IMPLEMENT ();
   }
@@ -383,8 +358,6 @@ namespace CIAO
   Servant_Impl_Base::get_named_publishers (
       const ::Components::NameList & /* names */
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::InvalidName))
   {
     throw ::CORBA::NO_IMPLEMENT ();
   }
@@ -393,7 +366,6 @@ namespace CIAO
   void
   Servant_Impl_Base::add_facet (const char *port_name,
                                 ::CORBA::Object_ptr port_ref)
-    ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     if (0 == port_name || ::CORBA::is_nil (port_ref))
       {
@@ -540,7 +512,6 @@ namespace CIAO
       const char *port_name,
       ::Components::EventConsumerBase_ptr port_ref
     )
-    ACE_THROW_SPEC (( ::CORBA::SystemException))
   {
     if (0 == port_name || ::CORBA::is_nil (port_ref))
       {
@@ -626,7 +597,6 @@ namespace CIAO
 
   ::Components::StandardConfigurator_ptr
   Servant_Impl_Base::get_standard_configurator ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // Create the configurator servant.
     StandardConfigurator_Impl *config_impl = 0;
diff --git a/CIAO/ciao/Servant_Impl_Base.h b/CIAO/ciao/Servant_Impl_Base.h
index 89e5293264f..3ce9d42f137 100644
--- a/CIAO/ciao/Servant_Impl_Base.h
+++ b/CIAO/ciao/Servant_Impl_Base.h
@@ -61,93 +61,65 @@ namespace CIAO
     /// Operations for CCMObject interface.
 
     virtual ::Components::PrimaryKeyBase *
-    get_primary_key ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::NoKeyAvailable));
+    get_primary_key ();
 
     virtual CORBA::IRObject_ptr
-    get_component_def ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_component_def ();
 
     virtual Components::SessionComponent_ptr
     get_executor ()
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+      = 0;
 
     virtual void
-    configuration_complete ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidConfiguration));
+    configuration_complete ();
 
     virtual void
-    remove ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    remove ();
 
     virtual ::Components::ConnectionDescriptions *
-    get_connections (const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_connections (const char *name);
 
     virtual ::Components::ComponentPortDescription *
-    get_all_ports ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_ports ();
 
     virtual CORBA::Object_ptr
-    provide_facet (const char *name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    provide_facet (const char *name);
 
     virtual ::Components::FacetDescriptions *
-    get_named_facets (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_facets (const ::Components::NameList & names);
 
     virtual ::Components::FacetDescriptions *
-    get_all_facets ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_facets ();
 
 
     virtual ::Components::ConsumerDescriptions *
-    get_all_consumers ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_consumers ();
 
 
     virtual ::Components::EventConsumerBase_ptr
-    get_consumer (const char *sink_name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_consumer (const char *sink_name);
 
     virtual ::Components::ConsumerDescriptions *
-    get_named_consumers (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_consumers (const ::Components::NameList & names);
 
     virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_emitters (const ::Components::NameList & names);
 
     virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_receptacles (const ::Components::NameList & names);
 
     virtual ::Components::ReceptacleDescriptions *
-    get_all_receptacles ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_all_receptacles ();
 
     virtual ::Components::PublisherDescriptions *
-    get_named_publishers (const ::Components::NameList & names)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::InvalidName));
+    get_named_publishers (const ::Components::NameList & names);
 
     /// Operation to set attributes on the component.
     virtual void set_attributes (const Components::ConfigValues &descr) = 0;
 
     // Creates and returns the StandardConfigurator for the component.
     virtual ::Components::StandardConfigurator_ptr
-    get_standard_configurator ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_standard_configurator ();
 
     /// Override that returns the (passed-in) default POA of our member
     /// component's container, to ensure that we get registered
@@ -157,8 +129,7 @@ namespace CIAO
 
   protected:
     void add_facet (const char *port_name,
-                    ::CORBA::Object_ptr port_ref)
-      ACE_THROW_SPEC (( ::CORBA::SystemException));
+                    ::CORBA::Object_ptr port_ref);
 
     CORBA::Object_ptr lookup_facet (const char *port_name);
 
@@ -171,8 +142,7 @@ namespace CIAO
                          ::Components::Cookie * cookie);
 
     void add_consumer (const char *port_name,
-                       ::Components::EventConsumerBase_ptr port_ref)
-      ACE_THROW_SPEC (( ::CORBA::SystemException));
+                       ::Components::EventConsumerBase_ptr port_ref);
 
     ::Components::EventConsumerBase_ptr lookup_consumer (
         const char *port_name
diff --git a/CIAO/ciao/Servant_Impl_T.cpp b/CIAO/ciao/Servant_Impl_T.cpp
index 719d0e51513..81eb60789d6 100644
--- a/CIAO/ciao/Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servant_Impl_T.cpp
@@ -62,7 +62,6 @@ namespace CIAO
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::same_component (
       CORBA::Object_ptr object_ref
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (::CORBA::is_nil (object_ref))
       {
@@ -85,7 +84,6 @@ namespace CIAO
   ::Components::CCMHome_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_ccm_home (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->context_->get_CCM_home ();
   }
@@ -96,7 +94,6 @@ namespace CIAO
   Components::SessionComponent_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::get_executor (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
@@ -111,7 +108,6 @@ namespace CIAO
   CORBA::Object_ptr
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::_get_component (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionContext_var sc =
       ::Components::SessionContext::_narrow (
@@ -144,7 +140,6 @@ namespace CIAO
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::activate_component (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     if (this->is_activated () == 0)
       {
@@ -162,7 +157,6 @@ namespace CIAO
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_preactivate (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
@@ -184,7 +178,6 @@ namespace CIAO
             typename CONTEXT>
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_activate ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
@@ -207,7 +200,6 @@ namespace CIAO
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_postactivate (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (
@@ -230,7 +222,6 @@ namespace CIAO
   CORBA::Boolean
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::is_activated (
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->pre_activated_;
   }
@@ -241,7 +232,6 @@ namespace CIAO
   void
   Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::ciao_passivate (
     )
-  ACE_THROW_SPEC ((CORBA::SystemException))
   {
     // @@ Jai, could you please see why this is required?
     ::Components::SessionComponent_var temp =
diff --git a/CIAO/ciao/Servant_Impl_T.h b/CIAO/ciao/Servant_Impl_T.h
index 5fb7f7c3cf3..f86fcd0c046 100644
--- a/CIAO/ciao/Servant_Impl_T.h
+++ b/CIAO/ciao/Servant_Impl_T.h
@@ -55,47 +55,37 @@ namespace CIAO
     // Operations for CCMObject interface.
 
     virtual CORBA::Boolean
-    same_component (CORBA::Object_ptr object_ref)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    same_component (CORBA::Object_ptr object_ref);
 
     virtual ::Components::CCMHome_ptr
-    get_ccm_home ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_ccm_home ();
 
     virtual CORBA::Object_ptr
-    _get_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _get_component ();
 
     virtual Components::SessionComponent_ptr
-    get_executor ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    get_executor ();
 
    // CIAO-specific operations.
 
     void
-    ciao_preactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ciao_preactivate ();
 
     void
-    ciao_activate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ciao_activate ();
 
     void
-    ciao_postactivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ciao_postactivate ();
 
     /// @@NOTE: The busted operation.
     void
-    ciao_passivate ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ciao_passivate ();
 
     CORBA::Boolean
-    is_activated ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    is_activated ();
 
     void
-    activate_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    activate_component ();
 
   protected:
 
diff --git a/CIAO/ciao/StandardConfigurator_Impl.cpp b/CIAO/ciao/StandardConfigurator_Impl.cpp
index b1ca2033d21..ad706594e31 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.cpp
+++ b/CIAO/ciao/StandardConfigurator_Impl.cpp
@@ -23,7 +23,6 @@ namespace CIAO
   void
   StandardConfigurator_Impl::set_configuration (
       const Components::ConfigValues &descr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->component_->set_attributes (descr);
   }
@@ -31,8 +30,6 @@ namespace CIAO
   void
   StandardConfigurator_Impl::configure (
     Components::CCMObject_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::WrongComponentType))
   {
 
   }
diff --git a/CIAO/ciao/StandardConfigurator_Impl.h b/CIAO/ciao/StandardConfigurator_Impl.h
index 1c1f800d6c2..564cd24856d 100644
--- a/CIAO/ciao/StandardConfigurator_Impl.h
+++ b/CIAO/ciao/StandardConfigurator_Impl.h
@@ -55,13 +55,10 @@ namespace CIAO
     /// being configured, i.e, the template method from
     /// StandardConfigurator interface.
     virtual void set_configuration (
-        const Components::ConfigValues & descr)
-        ACE_THROW_SPEC ((CORBA::SystemException));
+        const Components::ConfigValues & descr);
 
     void configure (
-        Components::CCMObject_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::WrongComponentType));
+        Components::CCMObject_ptr comp);
 
   private:
     /// The component whose attributes are going to be configured via
diff --git a/CIAO/ciao/Swapping_Container.cpp b/CIAO/ciao/Swapping_Container.cpp
index aff7ab93113..8d5331a33cc 100644
--- a/CIAO/ciao/Swapping_Container.cpp
+++ b/CIAO/ciao/Swapping_Container.cpp
@@ -35,14 +35,12 @@ namespace CIAO
 
   CORBA::Object_ptr
   Swapping_Container::get_home_objref (PortableServer::Servant p)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return this->the_home_servant_POA ()->servant_to_reference (p);
   }
 
   void
   Swapping_Container::deactivate_facet (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->the_facet_cons_POA ()->deactivate_object (oid);
   }
@@ -50,7 +48,6 @@ namespace CIAO
   int
   Swapping_Container::init (const char *name,
                             const CORBA::PolicyList *more_policies)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     char buffer[MAXPATHLEN];
 
@@ -213,7 +210,6 @@ namespace CIAO
 
   void
   Swapping_Container::ciao_uninstall_home (Components::CCMHome_ptr homeref)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::POA_ptr tmp = this->home_servant_poa_.in ();
     PortableServer::ObjectId_var oid =
@@ -225,7 +221,6 @@ namespace CIAO
   CORBA::Object_ptr
   Swapping_Container::install_servant (PortableServer::Servant p,
                                       Container::OA_Type t)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::POA_ptr tmp = 0;
 
diff --git a/CIAO/ciao/Swapping_Container.h b/CIAO/ciao/Swapping_Container.h
index 98231eef33c..4d5b188526a 100644
--- a/CIAO/ciao/Swapping_Container.h
+++ b/CIAO/ciao/Swapping_Container.h
@@ -48,29 +48,23 @@ namespace CIAO
 
     /// Initialize the container with a name.
     virtual int init (const char *name = 0,
-                      const CORBA::PolicyList *more_policies = 0)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                      const CORBA::PolicyList *more_policies = 0);
 
     virtual CORBA::Object_ptr install_servant (PortableServer::Servant p,
-                                               Container::OA_Type t)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+                                               Container::OA_Type t);
 
-    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Object_ptr get_objref (PortableServer::Servant p);
 
-    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void ciao_uninstall_home (Components::CCMHome_ptr homeref);
 
-    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual CORBA::Object_ptr get_home_objref (PortableServer::Servant p);
 
     virtual void add_servant_map (PortableServer::ObjectId &oid,
                                   Dynamic_Component_Servant_Base* servant);
 
     virtual void delete_servant_map (PortableServer::ObjectId &oid);
 
-    virtual void deactivate_facet (const PortableServer::ObjectId &oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void deactivate_facet (const PortableServer::ObjectId &oid);
 
     PortableServer::POA_ptr the_home_servant_POA (void) const;
 
diff --git a/CIAO/ciao/Swapping_Container.inl b/CIAO/ciao/Swapping_Container.inl
index 079569724d7..698eec0324d 100644
--- a/CIAO/ciao/Swapping_Container.inl
+++ b/CIAO/ciao/Swapping_Container.inl
@@ -2,7 +2,6 @@
 
 ACE_INLINE CORBA::Object_ptr
 CIAO::Swapping_Container::get_objref (PortableServer::Servant p)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->the_POA ()->servant_to_reference (p);
 }
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
index e85da4386d4..919c70e6df9 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
@@ -18,14 +18,12 @@ namespace CIAO
 
   CORBA::IRObject_ptr
   Swapping_Home_Servant_Impl_Base::get_component_def (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
 
   CORBA::IRObject_ptr
   Swapping_Home_Servant_Impl_Base::get_home_def (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     throw CORBA::NO_IMPLEMENT ();
   }
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
index d9e86e81e7d..a6ee1575aaa 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_Base.h
@@ -46,11 +46,9 @@ namespace CIAO
     virtual ~Swapping_Home_Servant_Impl_Base (void);
 
     // Operations for CCMHome interface.
-    virtual ::CORBA::IRObject_ptr get_component_def (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::CORBA::IRObject_ptr get_component_def (void);
 
-    virtual ::CORBA::IRObject_ptr get_home_def (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual ::CORBA::IRObject_ptr get_home_def (void);
 
   protected:
     Swapping_Container *container_;
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
index 948f9d7c81a..6004e28d83a 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.cpp
@@ -68,8 +68,6 @@ namespace CIAO
                              COMP_SVNT>::remove_component (
       ::Components::CCMObject_ptr
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::RemoveFailure))
   {
     PortableServer::ObjectId_var oid =
       PortableServer::string_to_ObjectId (this->obj_id_);
@@ -92,8 +90,6 @@ namespace CIAO
                              EXEC,
                              COMP_SVNT>::create_component (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CreateFailure))
   {
     return this->create ();
   }
@@ -108,8 +104,6 @@ namespace CIAO
                              EXEC,
                              COMP_SVNT>::create (
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     Components::CreateFailure))
   {
     if (this->executor_.in () == 0)
     {
@@ -134,7 +128,6 @@ namespace CIAO
                              COMP_SVNT>::_ciao_activate_component (
       ::Components::EnterpriseComponent_ptr ec
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::Object_var hobj =
       this->container_->get_home_objref (this);
@@ -198,7 +191,6 @@ namespace CIAO
                              COMP_SVNT>::_ciao_passivate_component (
       typename COMP_SVNT::_stub_ptr_type comp
     )
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid;
 
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
index db85bbce784..09f01ccc415 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
@@ -59,23 +59,17 @@ namespace CIAO
     // Operations for CCMHome interface.
 
     virtual void
-    remove_component (Components::CCMObject_ptr comp)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::RemoveFailure));
+    remove_component (Components::CCMObject_ptr comp);
 
     // Operations for keyless home interface.
 
     virtual ::Components::CCMObject_ptr
-    create_component ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    create_component ();
 
     // Operations for implicit home interface.
 
     virtual typename COMP_SVNT::_stub_ptr_type
-    create ()
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Components::CreateFailure));
+    create ();
 
     virtual void
     update_component_map (PortableServer::ObjectId &oid);
@@ -84,12 +78,10 @@ namespace CIAO
     // CIAO-specific operations.
 
     typename COMP_SVNT::_stub_ptr_type
-    _ciao_activate_component (::Components::EnterpriseComponent_ptr ec)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_activate_component (::Components::EnterpriseComponent_ptr ec);
 
     void
-    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    _ciao_passivate_component (typename COMP_SVNT::_stub_ptr_type comp);
 
   protected:
     typename EXEC::_var_type executor_;
diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.cpp b/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
index 5a89c765125..e2afdaeab8b 100644
--- a/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
+++ b/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
@@ -31,7 +31,6 @@ namespace CIAO
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP>::deactivate_facet (
       const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     this->container_->deactivate_facet (oid);
   }
@@ -42,7 +41,6 @@ namespace CIAO
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP>::remove_facet (
       CORBA::Object_ptr reference)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     PortableServer::ObjectId_var oid =
       this->container_->the_facet_cons_POA ()->reference_to_id (reference);
@@ -58,7 +56,6 @@ namespace CIAO
   void
   Upgradeable_Context_Impl<BASE_CTX, SVNT, COMP>::update_port_activator (
       const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CIAO::Servant_Activator *sa =
       this->container_->ports_servant_activator ();
diff --git a/CIAO/ciao/Upgradeable_Context_Impl_T.h b/CIAO/ciao/Upgradeable_Context_Impl_T.h
index 60d43187bec..53ec4843ddc 100644
--- a/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -45,22 +45,17 @@ namespace CIAO
     virtual ~Upgradeable_Context_Impl (void);
 
     virtual void
-    deactivate_facet (const PortableServer::ObjectId &oid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    deactivate_facet (const PortableServer::ObjectId &oid);
 
     virtual void
-    update_port_activator (const PortableServer::ObjectId &oid)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    update_port_activator (const PortableServer::ObjectId &oid);
 
     virtual void
-    remove_facet (CORBA::Object_ptr reference)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    remove_facet (CORBA::Object_ptr reference);
 
     virtual ::Components::ConsumerDescriptions *
     get_registered_consumers (const char *publisher_name)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       ::Components::InvalidName,
-                       ::Components::InvalidConnection)) = 0;
+      = 0;
 
   private:
     /// Not to be used