From b68ea0f2b12c4c5189c5fc7c182a1b242dc63579 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 23:18:47 +0200
Subject: Rolled back the renaming of existing exceptions.

---
 src/main/idl/CommonExceptions.idl | 10 +++++-----
 src/main/idl/Entity.idl           | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/main/idl')

diff --git a/src/main/idl/CommonExceptions.idl b/src/main/idl/CommonExceptions.idl
index d5abb1d..88f2ef3 100644
--- a/src/main/idl/CommonExceptions.idl
+++ b/src/main/idl/CommonExceptions.idl
@@ -38,7 +38,7 @@ module common
     * change, either because it is a client process, or its management objects
     * are incorrect.
     **************************************************************************/
-    exception CannotManage
+    exception CannotManageException
     {
     };
 
@@ -49,7 +49,7 @@ module common
     * Most commonly occurs when the Activity is in a different state than the
     * caller has assumed.
     **************************************************************************/
-    exception InvalidTransition
+    exception InvalidTransitionException
     {
     };
     
@@ -65,7 +65,7 @@ module common
     /**************************************************************************
     * Either the supplied data, or the relevant description, was invalid.
     **************************************************************************/
-    exception InvalidData
+    exception InvalidDataException
     {
     };
 
@@ -81,7 +81,7 @@ module common
     /**************************************************************************
     * The requested object was not found
     **************************************************************************/
-    exception ObjectNotFound
+    exception ObjectNotFoundException
     {
     };
 
@@ -96,7 +96,7 @@ module common
     /**************************************************************************
     * The object already exists.
     **************************************************************************/
-    exception ObjectAlreadyExists
+    exception ObjectAlreadyExistsException
     {
     };
 
diff --git a/src/main/idl/Entity.idl b/src/main/idl/Entity.idl
index ff0dad3..ef2efbc 100644
--- a/src/main/idl/Entity.idl
+++ b/src/main/idl/Entity.idl
@@ -64,9 +64,9 @@ module entity
                          in string             workflow,
                          in string             collections )
             raises( common::AccessRightsException,
-                    common::InvalidData,
+                    common::InvalidDataException,
                     common::PersistencyException,
-                    common::ObjectNotFound,
+                    common::ObjectNotFoundException,
                     common::InvalidCollectionModification );
                     
         /**
@@ -91,7 +91,7 @@ module entity
         **/
         string queryData( in string path )
             raises( common::AccessRightsException,
-                    common::ObjectNotFound,
+                    common::ObjectNotFoundException,
                     common::PersistencyException );
 
         /**
@@ -129,11 +129,11 @@ module entity
                             in string    			requestData
                           )
             raises( common::AccessRightsException,
-                    common::InvalidTransition,
-                    common::ObjectNotFound,
-                    common::InvalidData,
+                    common::InvalidTransitionException,
+                    common::ObjectNotFoundException,
+                    common::InvalidDataException,
                     common::PersistencyException,
-                    common::ObjectAlreadyExists,
+                    common::ObjectAlreadyExistsException,
                     common::InvalidCollectionModification);
 
 
@@ -152,7 +152,7 @@ module entity
         string queryLifeCycle( in common::SystemKey   agentKey,                              
                                in boolean             filter )
             raises( common::AccessRightsException,
-                    common::ObjectNotFound,
+                    common::ObjectNotFoundException,
                     common::PersistencyException );                    
     };
 
@@ -182,16 +182,16 @@ module entity
 		  * @throws CannotManageException when an error occurs writing the data to LDAP
 		  **/
 		void addRole( in string roleName )
-			raises( common::ObjectNotFound,
-					common::CannotManage );
+			raises( common::ObjectNotFoundException,
+					common::CannotManageException );
 
 		/** 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::ObjectNotFound,
-					common::CannotManage );
+			raises( common::ObjectNotFoundException,
+					common::CannotManageException );
     };
 
 }; //end of module entity
-- 
cgit v1.2.3