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

6 files changed, 30 insertions, 195 deletions

diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index c824b411c5e..b9aec6de436 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -215,7 +215,6 @@ size_t TAO::FT_FaultConsumer::notifications () const
 void TAO::FT_FaultConsumer::push_structured_event (
   const CosNotification::StructuredEvent &event
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected))
 {
   // Debugging support.
   this->notifications_ += 1;
@@ -266,7 +265,6 @@ void TAO::FT_FaultConsumer::offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
   )
-  ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType))
 {
   ACE_UNUSED_ARG (added);
   ACE_UNUSED_ARG (removed);
@@ -277,7 +275,6 @@ void TAO::FT_FaultConsumer::offer_change (
 
 void TAO::FT_FaultConsumer::disconnect_structured_push_consumer (
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //TODO: For now, we are just ignoring the disconnect callback.
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 04f8c3303e1..5731824342f 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -105,18 +105,15 @@ namespace TAO
     // CORBA methods
     virtual void push_structured_event (
       const CosNotification::StructuredEvent &notification
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException, CosEventComm::Disconnected));
+      );
 
    virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType));
+      );
 
    virtual void disconnect_structured_push_consumer (
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      );
 
     //@}
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 33d947d344e..1d3f14c6732 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -46,9 +46,6 @@ TAO::FT_Property_Validator::~FT_Property_Validator (void)
 void
 TAO::FT_Property_Validator::validate_property (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   const CORBA::ULong len = props.length ();
 
@@ -135,9 +132,6 @@ TAO::FT_Property_Validator::validate_property (
 void
 TAO::FT_Property_Validator::validate_criteria (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
   const CORBA::ULong len = props.length ();
   PortableGroup::Criteria invalid_criteria;
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index 77d0d76b6a0..6c1f52f946a 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -48,19 +48,13 @@ namespace TAO
     /// first invalid property is encountered.  The remaining properties
     /// will not be validated.
     virtual
-    void validate_property (const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+    void validate_property (const PortableGroup::Properties & props);
 
     /// Validate the given properties/criteria.  All criteria
     /// will be validated regardless of whether or not an invalid
     /// property was encountered.
     virtual
-    void validate_criteria (const PortableGroup::Properties & criteria)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidCriteria,
-                      PortableGroup::CannotMeetCriteria));
+    void validate_criteria (const PortableGroup::Properties & criteria);
 
   private:
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 3446bccf877..19d3dd06682 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -355,7 +355,6 @@ int TAO::FT_ReplicationManager::fini (void)
 void
 TAO::FT_ReplicationManager::register_fault_notifier (
   FT::FaultNotifier_ptr fault_notifier)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   this->register_fault_notifier_i (fault_notifier);
 }
@@ -364,7 +363,6 @@ TAO::FT_ReplicationManager::register_fault_notifier (
 void
 TAO::FT_ReplicationManager::register_fault_notifier_i (
   FT::FaultNotifier_ptr fault_notifier)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   if (CORBA::is_nil (fault_notifier))
   {
@@ -446,7 +444,6 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
 //CORBA
 FT::FaultNotifier_ptr
 TAO::FT_ReplicationManager::get_fault_notifier ()
-  ACE_THROW_SPEC ( (CORBA::SystemException, FT::InterfaceNotFound))
 {
   if (CORBA::is_nil (this->fault_notifier_.in ()))
   {
@@ -461,7 +458,6 @@ TAO::FT_ReplicationManager::get_fault_notifier ()
 ::PortableGroup::FactoryRegistry_ptr
 TAO::FT_ReplicationManager::get_factory_registry (
   const PortableGroup::Criteria & selection_criteria)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   ACE_UNUSED_ARG (selection_criteria);
   return this->factory_registry_.reference ();
@@ -470,7 +466,6 @@ TAO::FT_ReplicationManager::get_factory_registry (
 // TAO-specific shutdown operation.
 //public
 void TAO::FT_ReplicationManager::shutdown ()
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   this->quit_ = 1;
 }
@@ -500,9 +495,6 @@ char * TAO::FT_ReplicationManager::type_id (
 void
 TAO::FT_ReplicationManager::set_default_properties (
   const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
 
   this->properties_support_.set_default_properties (props);
@@ -512,7 +504,6 @@ TAO::FT_ReplicationManager::set_default_properties (
 //CORBA
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_default_properties ()
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   return this->properties_support_.get_default_properties ();
 }
@@ -521,9 +512,6 @@ TAO::FT_ReplicationManager::get_default_properties ()
 void
 TAO::FT_ReplicationManager::remove_default_properties (
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.remove_default_properties (props);
 }
@@ -533,9 +521,6 @@ void
 TAO::FT_ReplicationManager::set_type_properties (
     const char *type_id,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.set_type_properties (
     type_id,
@@ -546,7 +531,6 @@ TAO::FT_ReplicationManager::set_type_properties (
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_type_properties (
     const char *type_id)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   return this->properties_support_.get_type_properties (type_id);
 }
@@ -556,9 +540,6 @@ void
 TAO::FT_ReplicationManager::remove_type_properties (
     const char *type_id,
     const PortableGroup::Properties & props)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
   this->properties_support_.remove_type_properties (
     type_id,
@@ -570,10 +551,6 @@ void
 TAO::FT_ReplicationManager::set_properties_dynamically (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Properties & overrides)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::UnsupportedProperty))
 {
 
   TAO::PG_Object_Group * group = 0;
@@ -591,8 +568,6 @@ TAO::FT_ReplicationManager::set_properties_dynamically (
 PortableGroup::Properties *
 TAO::FT_ReplicationManager::get_properties (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::Properties_var result;
   ACE_NEW_THROW_EX (result, PortableGroup::Properties(), CORBA::NO_MEMORY ());
@@ -619,13 +594,6 @@ PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::set_primary_member (
   PortableGroup::ObjectGroup_ptr object_group,
   const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (
-    CORBA::SystemException
-    , PortableGroup::ObjectGroupNotFound
-    , PortableGroup::MemberNotFound
-    , FT::PrimaryNotSet
-    , FT::BadReplicationStyle
-  ))
 {
   METHOD_ENTRY (TAO::FT_ReplicationManager::set_primary_member);
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil();
@@ -660,13 +628,6 @@ TAO::FT_ReplicationManager::create_member (
     const PortableGroup::Location & the_location,
     const char * type_id,
     const PortableGroup::Criteria & the_criteria)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::CannotMeetCriteria))
 {
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil();
   TAO::PG_Object_Group * group = 0;
@@ -695,10 +656,6 @@ TAO::FT_ReplicationManager::add_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location,
     CORBA::Object_ptr member)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberAlreadyPresent,
-                   PortableGroup::ObjectNotAdded))
 {
   METHOD_ENTRY (TAO::FT_ReplicationManager::add_member);
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil ();
@@ -732,9 +689,6 @@ PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::remove_member (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil ();
 
@@ -762,8 +716,6 @@ TAO::FT_ReplicationManager::remove_member (
 PortableGroup::Locations *
 TAO::FT_ReplicationManager::locations_of_members (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::Locations * result = 0;
 
@@ -790,7 +742,6 @@ TAO::FT_ReplicationManager::locations_of_members (
 PortableGroup::ObjectGroups *
 TAO::FT_ReplicationManager::groups_at_location (
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (CORBA::SystemException))
 {
   return this->group_factory_.groups_at_location (the_location);
 }
@@ -799,8 +750,6 @@ TAO::FT_ReplicationManager::groups_at_location (
 PortableGroup::ObjectGroupId
 TAO::FT_ReplicationManager::get_object_group_id (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::ObjectGroupId result = 0;
   TAO::PG_Object_Group * group = 0;
@@ -826,8 +775,6 @@ TAO::FT_ReplicationManager::get_object_group_id (
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::get_object_group_ref (
     PortableGroup::ObjectGroup_ptr object_group)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound))
 {
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil ();
 
@@ -854,10 +801,6 @@ TAO::FT_ReplicationManager::get_object_group_ref (
 PortableGroup::ObjectGroup_ptr
 TAO::FT_ReplicationManager::get_object_group_ref_from_id (
     PortableGroup::ObjectGroupId group_id)
-  ACE_THROW_SPEC ( (
-    CORBA::SystemException
-    , PortableGroup::ObjectGroupNotFound
-  ))
 {
   PortableGroup::ObjectGroup_var result = PortableGroup::ObjectGroup::_nil ();
 
@@ -885,9 +828,6 @@ CORBA::Object_ptr
 TAO::FT_ReplicationManager::get_member_ref (
     PortableGroup::ObjectGroup_ptr object_group,
     const PortableGroup::Location & the_location)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectGroupNotFound,
-                   PortableGroup::MemberNotFound))
 {
   CORBA::Object_var result = CORBA::Object::_nil();
 
@@ -920,12 +860,6 @@ TAO::FT_ReplicationManager::create_object (
   const char * type_id,
   const PortableGroup::Criteria & the_criteria,
   PortableGroup::GenericFactory::FactoryCreationId_out factory_creation_id)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::NoFactory,
-                   PortableGroup::ObjectNotCreated,
-                   PortableGroup::InvalidCriteria,
-                   PortableGroup::InvalidProperty,
-                   PortableGroup::CannotMeetCriteria))
 {
   METHOD_ENTRY (TAO::FT_ReplicationManager::create_object)
 
@@ -968,8 +902,6 @@ TAO::FT_ReplicationManager::create_object (
 void
 TAO::FT_ReplicationManager::delete_object (
   const PortableGroup::GenericFactory::FactoryCreationId & factory_creation_id)
-  ACE_THROW_SPEC ( (CORBA::SystemException,
-                   PortableGroup::ObjectNotFound))
 {
 
   PortableGroup::ObjectGroupId group_id = 0;
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 753b8f9340c..c8f1b65c95e 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -157,33 +157,20 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     virtual void register_fault_notifier (
         FT::FaultNotifier_ptr fault_notifier
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     /// Returns the reference of the Fault Notifier.
     virtual FT::FaultNotifier_ptr get_fault_notifier (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , FT::InterfaceNotFound
-      ));
+      );
 
     /// TAO-specific find factory registry
     virtual ::PortableGroup::FactoryRegistry_ptr get_factory_registry (
         const PortableGroup::Criteria & selection_criteria
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     /// TAO-specific shutdown operation.
     virtual void shutdown (
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     //@}
 
@@ -196,21 +183,14 @@ namespace TAO
 
     /// Set the default properties to be used by all object groups.
     virtual void set_default_properties (
-        const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & props);
 
     /// Get the default properties used by all object groups.
-    virtual PortableGroup::Properties * get_default_properties ()
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual PortableGroup::Properties * get_default_properties ();
 
     /// Remove default properties.
     virtual void remove_default_properties (
-        const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & props);
 
     /**
      * Set properties associated with a given Replica type.  These
@@ -218,10 +198,7 @@ namespace TAO
      */
     virtual void set_type_properties (
         const char * type_id,
-        const PortableGroup::Properties & overrides)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & overrides);
 
     /**
      * Return the properties associated with a given Replica type.  These
@@ -229,16 +206,12 @@ namespace TAO
      * addition to the default properties that were not overridden.
      */
     virtual PortableGroup::Properties * get_type_properties (
-        const char * type_id)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const char * type_id);
 
     /// Remove the given properties associated with the Replica type ID.
     virtual void remove_type_properties (
         const char * type_id,
-        const PortableGroup::Properties & props)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & props);
 
     /**
      * Dynamically set the properties associated with a given object
@@ -248,11 +221,7 @@ namespace TAO
      */
     virtual void set_properties_dynamically (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Properties & overrides)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::UnsupportedProperty));
+        const PortableGroup::Properties & overrides);
 
     /**
      * Return the properties currently in use by the given object
@@ -262,9 +231,7 @@ namespace TAO
      * that weren't overridden.
      */
     virtual PortableGroup::Properties * get_properties (
-        PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound));
+        PortableGroup::ObjectGroup_ptr object_group);
 
     //@}
 
@@ -281,24 +248,13 @@ namespace TAO
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
         const char * type_id,
-        const PortableGroup::Criteria & the_criteria)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::MemberAlreadyPresent,
-                      PortableGroup::NoFactory,
-                      PortableGroup::ObjectNotCreated,
-                      PortableGroup::InvalidCriteria,
-                      PortableGroup::CannotMeetCriteria));
+        const PortableGroup::Criteria & the_criteria);
 
     /// Add an existing object to the ObjectGroup.
     virtual PortableGroup::ObjectGroup_ptr add_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location,
-        CORBA::Object_ptr member)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::MemberAlreadyPresent,
-                      PortableGroup::ObjectNotAdded));
+        CORBA::Object_ptr member);
 
     /**
      * Remove the member at a specific location from an
@@ -313,27 +269,19 @@ namespace TAO
      */
     virtual PortableGroup::ObjectGroup_ptr remove_member (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Location & the_location)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::MemberNotFound));
+        const PortableGroup::Location & the_location);
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::Locations * locations_of_members (
-        PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound));
+        PortableGroup::ObjectGroup_ptr object_group);
 
     /// Return the locations of the members in the given ObjectGroup.
     virtual PortableGroup::ObjectGroups * groups_at_location (
-        const PortableGroup::Location & the_location)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+        const PortableGroup::Location & the_location);
 
     /// Return the ObjectGroupId for the given ObjectGroup.
     virtual PortableGroup::ObjectGroupId get_object_group_id (
-        PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound));
+        PortableGroup::ObjectGroup_ptr object_group);
 
     /**
      * Return an update the IOGR for an object group.  If no changes have
@@ -341,9 +289,7 @@ namespace TAO
      * parameter.
      */
     virtual PortableGroup::ObjectGroup_ptr get_object_group_ref (
-        PortableGroup::ObjectGroup_ptr object_group)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound));
+        PortableGroup::ObjectGroup_ptr object_group);
 
     /**
      * TAO-specific extension.
@@ -351,11 +297,7 @@ namespace TAO
      */
      virtual PortableGroup::ObjectGroup_ptr get_object_group_ref_from_id (
           PortableGroup::ObjectGroupId group_id
-        )
-        ACE_THROW_SPEC ((
-          CORBA::SystemException
-          , PortableGroup::ObjectGroupNotFound
-        ));
+        );
 
     /**
      * Return the reference corresponding to the Replica of a given
@@ -363,23 +305,13 @@ namespace TAO
      */
     virtual CORBA::Object_ptr get_member_ref (
         PortableGroup::ObjectGroup_ptr object_group,
-        const PortableGroup::Location & loc)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectGroupNotFound,
-                      PortableGroup::MemberNotFound));
+        const PortableGroup::Location & loc);
 
     /// Sets the primary member of a group.
     virtual PortableGroup::ObjectGroup_ptr set_primary_member (
         PortableGroup::ObjectGroup_ptr object_group,
         const PortableGroup::Location & the_location
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableGroup::ObjectGroupNotFound
-        , PortableGroup::MemberNotFound
-        , FT::PrimaryNotSet
-        , FT::BadReplicationStyle
-      ));
+      );
 
     //@}
 
@@ -404,13 +336,7 @@ namespace TAO
         const char * type_id,
         const PortableGroup::Criteria & the_criteria,
         PortableGroup::GenericFactory::FactoryCreationId_out
-          factory_creation_id)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::NoFactory,
-                      PortableGroup::ObjectNotCreated,
-                      PortableGroup::InvalidCriteria,
-                      PortableGroup::InvalidProperty,
-                      PortableGroup::CannotMeetCriteria));
+          factory_creation_id);
 
     /**
      * Delete the object group corresponding to the provided
@@ -420,9 +346,7 @@ namespace TAO
      */
     virtual void delete_object (
         const PortableGroup::GenericFactory::FactoryCreationId &
-          factory_creation_id)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      PortableGroup::ObjectNotFound));
+          factory_creation_id);
 
     //@}
 
@@ -437,10 +361,7 @@ namespace TAO
     /// Registers the Fault Notifier with the Replication Manager.
     void register_fault_notifier_i (
         FT::FaultNotifier_ptr fault_notifier
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+      );
 
     ////////////////
     // Forbidden methods