From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 17:30:41 +0200
Subject: Huge exception overhaul: Merged ClusterStorageException with
 PersistencyException. Replaced MembershipException with
 InvalidCollectionModification CORBA Exception. Made all predef steps throw
 more accurate exceptions when they go wrong, and let more exceptions bubble
 through from underneath.

---
 src/main/idl/Entity.idl | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/main/idl/Entity.idl')

diff --git a/src/main/idl/Entity.idl b/src/main/idl/Entity.idl
index 3348b41..ff0dad3 100644
--- a/src/main/idl/Entity.idl
+++ b/src/main/idl/Entity.idl
@@ -64,9 +64,10 @@ module entity
                          in string             workflow,
                          in string             collections )
             raises( common::AccessRightsException,
-                    common::InvalidDataException,
+                    common::InvalidData,
                     common::PersistencyException,
-                    common::ObjectNotFoundException );
+                    common::ObjectNotFound,
+                    common::InvalidCollectionModification );
                     
         /**
         * Returns a chunk of XML which may be a serialized C2KLocalObject, or in the case of Outcomes is merely a fragment of XML.
@@ -90,7 +91,7 @@ module entity
         **/
         string queryData( in string path )
             raises( common::AccessRightsException,
-                    common::ObjectNotFoundException,
+                    common::ObjectNotFound,
                     common::PersistencyException );
 
         /**
@@ -128,11 +129,12 @@ module entity
                             in string    			requestData
                           )
             raises( common::AccessRightsException,
-                    common::InvalidTransitionException,
-                    common::ObjectNotFoundException,
-                    common::InvalidDataException,
+                    common::InvalidTransition,
+                    common::ObjectNotFound,
+                    common::InvalidData,
                     common::PersistencyException,
-                    common::ObjectAlreadyExistsException );
+                    common::ObjectAlreadyExists,
+                    common::InvalidCollectionModification);
 
 
         /**
@@ -150,7 +152,7 @@ module entity
         string queryLifeCycle( in common::SystemKey   agentKey,                              
                                in boolean             filter )
             raises( common::AccessRightsException,
-                    common::ObjectNotFoundException,
+                    common::ObjectNotFound,
                     common::PersistencyException );                    
     };
 
@@ -180,16 +182,16 @@ module entity
 		  * @throws CannotManageException when an error occurs writing the data to LDAP
 		  **/
 		void addRole( in string roleName )
-			raises( common::ObjectNotFoundException,
-					common::CannotManageException );
+			raises( common::ObjectNotFound,
+					common::CannotManage );
 
 		/** Remove this Agent from the given role
 		  * @param the role name to remove
 		  * @throws CannotManageException when an error occurs writing the data to LDAP
 		  **/
 		void removeRole( in string roleName )
-			raises( common::ObjectNotFoundException,
-					common::CannotManageException );
+			raises( common::ObjectNotFound,
+					common::CannotManage );
     };
 
 }; //end of module entity
-- 
cgit v1.2.3