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.

10 files changed, 78 insertions, 77 deletions

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index 6f70867..eebdc47 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/com/c2kernel/process/Bootstrap.java
@@ -30,8 +30,8 @@ import java.util.UUID;
 import org.custommonkey.xmlunit.Diff;

 import org.custommonkey.xmlunit.XMLUnit;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.entity.proxy.AgentProxy;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.events.Event;

@@ -176,7 +176,7 @@ public class Bootstrap
 	                	Logger.error("Bootstrap.verifyResource() - Module clash! Resource '"+itemName+"' included in module "+moduleName+" but is assigned to '"+itemModule+"'. Not overwriting.");

 	                	return path;

 	                }

-	            } catch (ObjectNotFoundException ex) { 

+	            } catch (ObjectNotFound ex) { 

 	            	itemModule = "";

 	            }

 	            

@@ -214,7 +214,7 @@ public class Bootstrap
                     	}

                     }

                     

-                } catch (ObjectNotFoundException ex) {

+                } catch (ObjectNotFound ex) {

                     Logger.msg("Bootstrap.verifyResource() - Item "+itemName+" exists but version "+version+" not found! Attempting to insert new.");

                 }

             

@@ -225,7 +225,7 @@ public class Bootstrap
             		String error = validator.validate(newOutcome.getData());

             		if (error.length() > 0) {

             			Logger.error("Outcome not valid: \n " + error);

-            			throw new InvalidDataException(error, "");

+            			throw new InvalidData(error);

             		}

             	}

                 

@@ -287,7 +287,7 @@ public class Bootstrap
         if (ns!=null && Gateway.getProperties().getBoolean("Module.debug", false))

         	try {

         		ca = (CompositeActivity) ((CompositeActivityDef)LocalObjectLoader.getActDef(impHandler.getWorkflowName(), 0)).instantiate();

-        	} catch (ObjectNotFoundException ex) {

+        	} catch (ObjectNotFound ex) {

         		Logger.error("Module resource workflow "+impHandler.getWorkflowName()+" not found. Using empty.");

         	}

 

@@ -313,7 +313,7 @@ public class Bootstrap
              systemAgents.put(name, Gateway.getProxyManager().getAgentProxy(lookup.getAgentPath(name)));

              Logger.msg(3, "Bootstrap.checkAgent() - User '"+name+"' found.");

              return;

-         } catch (ObjectNotFoundException ex) { }

+         } catch (ObjectNotFound ex) { }

          

          Logger.msg("Bootstrap.checkAgent() - User '"+name+"' not found. Creating.");

 

@@ -365,7 +365,7 @@ public class Bootstrap
         ItemPath serverEntity;

         try {

             serverEntity = thisServerPath.getItemPath();

-        } catch (ObjectNotFoundException ex) {

+        } catch (ObjectNotFound ex) {

             Logger.msg("Creating server item "+thisServerPath);

             serverEntity = new ItemPath();

             Gateway.getCorbaServer().createItem(serverEntity);

diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java
index 50075c0..25f5d9a 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -29,9 +29,10 @@ import java.net.MalformedURLException;
 import java.util.Enumeration;

 import java.util.Properties;

 

-import com.c2kernel.common.CannotManageException;

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.CannotManage;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.PersistencyException;

 import com.c2kernel.entity.CorbaServer;

 import com.c2kernel.entity.proxy.AgentProxy;

 import com.c2kernel.entity.proxy.ProxyManager;

@@ -39,7 +40,6 @@ import com.c2kernel.entity.proxy.ProxyServer;
 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.Lookup;

 import com.c2kernel.lookup.LookupManager;

-import com.c2kernel.persistency.ClusterStorageException;

 import com.c2kernel.persistency.TransactionManager;

 import com.c2kernel.process.auth.Authenticator;

 import com.c2kernel.process.module.ModuleManager;

@@ -97,9 +97,9 @@ public class Gateway
      *

      * @param props - java.util.Properties containing all application properties.

      * If null, the java system properties are used

-     * @throws InvalidDataException - invalid properties caused a failure in initialisation

+     * @throws InvalidData - invalid properties caused a failure in initialisation

      */

-    static public void init(Properties props) throws InvalidDataException {

+    static public void init(Properties props) throws InvalidData {

     	init(props, null);

     }

     

@@ -111,9 +111,9 @@ public class Gateway
      * If null, the java system properties are used

      * @param res - ResourceLoader for the kernel to use to resolve all class resource requests

      * such as for bootstrap descriptions and version information

-     * @throws InvalidDataException - invalid properties caused a failure in initialisation

+     * @throws InvalidData - invalid properties caused a failure in initialisation

      */    

-    static public void init(Properties props, ResourceLoader res) throws InvalidDataException {

+    static public void init(Properties props, ResourceLoader res) throws InvalidData {

     	

         // Init properties & resources

         mC2KProps.clear();

@@ -130,7 +130,7 @@ public class Gateway
         try {

         	mMarshaller = new CastorXMLUtility(mResource, props, mResource.getKernelResourceURL("mapFiles/"));

         } catch (MalformedURLException e1) {

-            throw new InvalidDataException("Invalid Resource Location", "");

+            throw new InvalidData("Invalid Resource Location");

         }

 

         

@@ -139,7 +139,7 @@ public class Gateway
 			mModules = new ModuleManager(mResource.getModuleDefURLs(), AbstractMain.isServer);

 		} catch (Exception e) {

 			Logger.error(e);

-			throw new InvalidDataException("Could not load module definitions.", "");

+			throw new InvalidData("Could not load module definitions.");

 		}

 

         // merge in module props

@@ -168,9 +168,9 @@ public class Gateway
      * bootstrap to create the root LDAP contexts, initialises the CORBA server and

      * time-out manager.

      *

-     * @throws InvalidDataException - error initialising

+     * @throws InvalidData - error initialising

      */

-    static public void startServer(Authenticator auth) throws InvalidDataException, CannotManageException {

+    static public void startServer(Authenticator auth) throws InvalidData, CannotManage {

         try {

             // check top level directory contexts

         	if (mLookup instanceof LookupManager) {

@@ -178,7 +178,7 @@ public class Gateway
         		mLookupManager.initializeDirectory();

         	}

         	else {

-        		throw new CannotManageException("Lookup implementation is not a LookupManager. Cannot write to directory");

+        		throw new CannotManage("Lookup implementation is not a LookupManager. Cannot write to directory");

         	}

             		

             // start entity proxy server

@@ -222,12 +222,12 @@ public class Gateway
      * Connects to the LDAP server in an administrative context - using the admin username and

      * password given in the LDAP.user and LDAP.password props of the kernel properties.

      *

-     * @throws InvalidDataException - bad params

-     * @throws ClusterStorageException - error starting storages

+     * @throws InvalidData - bad params

+     * @throws PersistencyException - error starting storages

      */

     static public Authenticator connect()

-        throws InvalidDataException,

-               ClusterStorageException

+        throws InvalidData,

+               PersistencyException

     {

     	try {

     		Authenticator auth = (Authenticator)mC2KProps.getInstance("Authenticator");

@@ -242,7 +242,7 @@ public class Gateway
             return auth;

     	} catch (Exception ex) {

             Logger.error(ex);

-            throw new InvalidDataException("Cannot connect server process. Please check config.", "");

+            throw new InvalidData("Cannot connect server process. Please check config.");

         }

 

 

@@ -254,18 +254,18 @@ public class Gateway
      * @param agentName - username

      * @param agentPassword - password

      * @return an AgentProxy on the requested user

-     * @throws InvalidDataException

-     * @throws ClusterStorageException 

+     * @throws InvalidData

+     * @throws PersistencyException 

      * @throws ClassNotFoundException 

      * @throws IllegalAccessException 

      * @throws InstantiationException 

      */

     static public AgentProxy connect(String agentName, String agentPassword, String resource)

-    throws InvalidDataException, ObjectNotFoundException, ClusterStorageException, InstantiationException, IllegalAccessException, ClassNotFoundException

+    throws InvalidData, ObjectNotFound, PersistencyException, InstantiationException, IllegalAccessException, ClassNotFoundException

     {

         Authenticator auth = (Authenticator)mC2KProps.getInstance("Authenticator");

         if (!auth.authenticate(agentName, agentPassword, resource))

-        	throw new InvalidDataException("Login failed", "");

+        	throw new InvalidData("Login failed");

         

         mLookup = (Lookup)mC2KProps.getInstance("Lookup");

         mLookup.open(auth);

@@ -286,7 +286,7 @@ public class Gateway
     }

     

     static public AgentProxy connect(String agentName, String agentPassword) 

-    		throws InvalidDataException, ObjectNotFoundException, ClusterStorageException, InstantiationException, IllegalAccessException, ClassNotFoundException

+    		throws InvalidData, ObjectNotFound, PersistencyException, InstantiationException, IllegalAccessException, ClassNotFoundException

     {

     	return connect(agentName, agentPassword, null);

     }

@@ -358,10 +358,10 @@ public class Gateway
         return mLookup;

     }

 

-    static public LookupManager getLookupManager() throws CannotManageException

+    static public LookupManager getLookupManager() throws CannotManage

     {

         if (mLookupManager == null)

-        	throw new CannotManageException("No Lookup Manager created. Not a server process.", "");

+        	throw new CannotManage("No Lookup Manager created. Not a server process.");

         else

         	return mLookupManager;

     }

diff --git a/src/main/java/com/c2kernel/process/UserCodeProcess.java b/src/main/java/com/c2kernel/process/UserCodeProcess.java
index bc7e23e..4a4d7f4 100644
--- a/src/main/java/com/c2kernel/process/UserCodeProcess.java
+++ b/src/main/java/com/c2kernel/process/UserCodeProcess.java
@@ -25,7 +25,7 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;

 import java.util.HashMap;

 

-import com.c2kernel.common.InvalidTransitionException;

+import com.c2kernel.common.InvalidTransition;

 import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.entity.agent.Job;

 import com.c2kernel.entity.proxy.AgentProxy;

@@ -139,7 +139,7 @@ public class UserCodeProcess extends StandardClient implements ProxyObserver<Job
                 } catch (ScriptErrorException ex) {

                 	errors.put(jobKey, ex.getErrors());

                 	ignoredPaths.add(jobKey);

-                } catch (InvalidTransitionException ex) {

+                } catch (InvalidTransition ex) {

                     // must have already been done by someone else - ignore

                 } catch (Throwable ex) {

                     Logger.error("Error executing "+thisJob.getTransition().getName()+" job:");

diff --git a/src/main/java/com/c2kernel/process/auth/Authenticator.java b/src/main/java/com/c2kernel/process/auth/Authenticator.java
index 4578744..8e06da0 100644
--- a/src/main/java/com/c2kernel/process/auth/Authenticator.java
+++ b/src/main/java/com/c2kernel/process/auth/Authenticator.java
@@ -20,8 +20,8 @@
  */

 package com.c2kernel.process.auth;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectNotFound;

 

 /**

  * This interface is used by the kernel to store an authenticated connection

@@ -55,14 +55,14 @@ public interface Authenticator {
 	 *            method if required. May be null.

 	 * @return a boolean indicating if the authentication was successful. If so,

 	 *         then the Gateway will generate an AgentProxy for the given user.

-	 * @throws ObjectNotFoundException

+	 * @throws ObjectNotFound

 	 *             When the Agent doesn't exist

-	 * @throws InvalidDataException

+	 * @throws InvalidData

 	 *             When authentication fails for another reason

 	 */

 	public boolean authenticate(String agentName, String password,

-			String resource) throws InvalidDataException,

-			ObjectNotFoundException;

+			String resource) throws InvalidData,

+			ObjectNotFound;

 

 	/**

 	 * Authenticates a superuser connection for the server. It must be able to

@@ -71,11 +71,11 @@ public interface Authenticator {
 	 * 

 	 * @param resource

 	 * @return

-	 * @throws InvalidDataException

-	 * @throws ObjectNotFoundException

+	 * @throws InvalidData

+	 * @throws ObjectNotFound

 	 */

-	public boolean authenticate(String resource) throws InvalidDataException,

-			ObjectNotFoundException;

+	public boolean authenticate(String resource) throws InvalidData,

+			ObjectNotFound;

 

 	/**

 	 * Lookup and storage implementations that need to use user or superuser

diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java
index a1a11c7..b18b443 100644
--- a/src/main/java/com/c2kernel/process/module/Module.java
+++ b/src/main/java/com/c2kernel/process/module/Module.java
@@ -23,7 +23,7 @@ package com.c2kernel.process.module;
 import java.util.ArrayList;

 import java.util.Properties;

 

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.entity.imports.ImportAgent;

 import com.c2kernel.entity.imports.ImportDependency;

 import com.c2kernel.entity.imports.ImportDependencyMember;

@@ -127,7 +127,7 @@ public class Module extends ImportItem {
 					rolePath.setHasJobList(thisRole.hasJobList());

 					Gateway.getLookupManager().createRole(rolePath);

 				}

-			} catch (ObjectNotFoundException ex) {

+			} catch (ObjectNotFound ex) {

 				Logger.msg("Module.importAll() - Role '"+thisRole.name+"' not found. Creating.");

 				thisRole.create(systemAgent.getPath(), reset);

 			}

@@ -138,7 +138,7 @@ public class Module extends ImportItem {
 				Gateway.getLookup().getAgentPath(thisAgent.name);

 			    Logger.msg(3, "Module.importAll() - User '"+thisAgent.name+"' found.");

 			    continue;

-			 } catch (ObjectNotFoundException ex) { }

+			 } catch (ObjectNotFound ex) { }

 			 Logger.msg("Module.importAll() - User '"+thisAgent.name+"' not found. Creating.");

 			thisAgent.create(systemAgent.getPath(), reset);

 		}

diff --git a/src/main/java/com/c2kernel/process/module/ModuleImport.java b/src/main/java/com/c2kernel/process/module/ModuleImport.java
index 02440f4..18a0289 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleImport.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleImport.java
@@ -20,10 +20,11 @@
  */

 package com.c2kernel.process.module;

 

-import com.c2kernel.common.CannotManageException;

-import com.c2kernel.common.ObjectAlreadyExistsException;

+import com.c2kernel.common.CannotManage;

+import com.c2kernel.common.InvalidCollectionModification;

+import com.c2kernel.common.ObjectAlreadyExists;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.lookup.InvalidItemPathException;

@@ -39,8 +40,8 @@ public abstract class ModuleImport {
 	public ModuleImport() {

 	}

     

-	public abstract void create(AgentPath agentPath, boolean reset) throws ObjectNotFoundException,

-			ObjectCannotBeUpdated, CannotManageException, ObjectAlreadyExistsException;

+	public abstract void create(AgentPath agentPath, boolean reset) throws ObjectNotFound,

+			ObjectCannotBeUpdated, CannotManage, ObjectAlreadyExists, InvalidCollectionModification;

 	

     public void setID( String uuid ) throws InvalidItemPathException 

     {

diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java
index 8153033..24dd610 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleManager.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java
@@ -27,8 +27,8 @@ import java.util.Enumeration;
 import java.util.HashMap;

 import java.util.Properties;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.entity.proxy.AgentProxy;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.lookup.DomainPath;

@@ -53,7 +53,7 @@ public class ModuleManager {
 			Schema moduleSchema = new Schema("Module", 0,

 					FileStringUtility.url2String(Gateway.getResource().getKernelResourceURL("boot/OD/Module.xsd")));

 			moduleValidator = new OutcomeValidator(moduleSchema);

-		} catch (InvalidDataException ex) {

+		} catch (InvalidData ex) {

 			Logger.error(ex);

 			throw new ModuleException("Module Schema is not valid");

 		} catch (IOException ex) {

@@ -165,7 +165,7 @@ public class ModuleManager {
 		ItemProxy serverEntity;

 		try {

 			serverEntity = Gateway.getProxyManager().getProxy(new DomainPath("/servers/"+Gateway.getProperties().getString("ItemServer.name")));

-		} catch (ObjectNotFoundException e) {

+		} catch (ObjectNotFound e) {

 			throw new ModuleException("Cannot find local server name.");

 		}

 		Logger.debug(3, "Registering modules");

diff --git a/src/main/java/com/c2kernel/process/module/ModuleResource.java b/src/main/java/com/c2kernel/process/module/ModuleResource.java
index da40403..63710db 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleResource.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleResource.java
@@ -20,10 +20,10 @@
  */

 package com.c2kernel.process.module;

 

-import com.c2kernel.common.CannotManageException;

-import com.c2kernel.common.ObjectAlreadyExistsException;

+import com.c2kernel.common.CannotManage;

+import com.c2kernel.common.ObjectAlreadyExists;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.process.Bootstrap;

 import com.c2kernel.utils.Logger;

@@ -41,13 +41,13 @@ public class ModuleResource extends ModuleImport {
 

 	@Override

 	public void create(AgentPath agentPath, boolean reset)

-			throws ObjectNotFoundException, ObjectCannotBeUpdated,

-			CannotManageException, ObjectAlreadyExistsException {

+			throws ObjectNotFound, ObjectCannotBeUpdated,

+			CannotManage, ObjectAlreadyExists {

 		try {

 			domainPath = Bootstrap.verifyResource(ns, name, version, resourceType, itemPath, resourceLocation, reset);

 		} catch (Exception e) {

 			Logger.error(e);

-			throw new CannotManageException("Exception verifying module resource "+ns+"/"+name);

+			throw new CannotManage("Exception verifying module resource "+ns+"/"+name);

 		}

 	}

 

diff --git a/src/main/java/com/c2kernel/process/resource/Resource.java b/src/main/java/com/c2kernel/process/resource/Resource.java
index 750c690..2a6e41c 100644
--- a/src/main/java/com/c2kernel/process/resource/Resource.java
+++ b/src/main/java/com/c2kernel/process/resource/Resource.java
@@ -27,8 +27,8 @@ import java.util.Enumeration;
 import java.util.HashMap;

 import java.util.Hashtable;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectNotFound;

 import com.c2kernel.utils.FileStringUtility;

 import com.c2kernel.utils.Logger;

 

@@ -44,7 +44,7 @@ public class Resource implements ResourceLoader {
     private final HashMap<String, URL> moduleBaseURLs = new HashMap<String, URL>();

     private final HashMap<String, URL> allBaseURLs = new HashMap<String, URL>();

 

-    public Resource() throws InvalidDataException {

+    public Resource() throws InvalidData {

     	baseURL = getURLorResURL("com/c2kernel/utils/resources/");

     	allBaseURLs.put(null, baseURL);

     }

@@ -89,7 +89,7 @@ public class Resource implements ResourceLoader {
 	 * @see com.c2kernel.utils.ResourceLoader#addModuleBaseURL(java.lang.String, java.lang.String)

 	 */

     @Override

-	public void addModuleBaseURL(String ns, String newBaseURL) throws InvalidDataException {

+	public void addModuleBaseURL(String ns, String newBaseURL) throws InvalidData {

     	addModuleBaseURL(ns, getURLorResURL(newBaseURL));

     }

     

@@ -113,7 +113,7 @@ public class Resource implements ResourceLoader {
         return new URL(moduleBaseURLs.get(ns), resName);

     }

 

-    static private URL getURLorResURL(String newURL) throws InvalidDataException {

+    static private URL getURLorResURL(String newURL) throws InvalidData {

         URL result;

         try {

             result = new URL(newURL);

@@ -124,7 +124,7 @@ public class Resource implements ResourceLoader {
         }

         if (result == null) {

         	Logger.error("URL "+newURL+" could not be found");

-        	throw new InvalidDataException();

+        	throw new InvalidData();

         }

         return result;

     }

@@ -137,7 +137,7 @@ public class Resource implements ResourceLoader {
     	for (String ns : getAllBaseURLs().keySet()) {

     		try {

     			return getTextResource(ns, resName);

-    		} catch (ObjectNotFoundException ex) { }

+    		} catch (ObjectNotFound ex) { }

     	}

         Logger.warning("Text resource '"+resName+"' not found.");

         return null;

@@ -152,7 +152,7 @@ public class Resource implements ResourceLoader {
     	for (String ns : getAllBaseURLs().keySet()) {

         	try {

         		results.put(ns, getTextResource(ns, resName));

-        	} catch (ObjectNotFoundException ex) { }

+        	} catch (ObjectNotFound ex) { }

     	}

     	return results;

     }

@@ -161,7 +161,7 @@ public class Resource implements ResourceLoader {
 	 * @see com.c2kernel.utils.ResourceLoader#getTextResource(java.lang.String, java.lang.String)

 	 */

     @Override

-	public String getTextResource(String ns, String resName) throws ObjectNotFoundException

+	public String getTextResource(String ns, String resName) throws ObjectNotFound

     //        throws IOException

     {

         Logger.msg(8, "Resource::getTextResource() - Getting resource from "+ns+": " + resName);

@@ -184,7 +184,7 @@ public class Resource implements ResourceLoader {
             txtCache.put(ns+'/'+resName, newRes);

             return newRes;

         } catch (Exception e) {

-            throw new ObjectNotFoundException(e.getMessage(),null);

+            throw new ObjectNotFound(e.getMessage());

         }

     }

 

diff --git a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java b/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
index d05831a..ff5b489 100644
--- a/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
+++ b/src/main/java/com/c2kernel/process/resource/ResourceLoader.java
@@ -25,8 +25,8 @@ import java.net.URL;
 import java.util.Enumeration;

 import java.util.HashMap;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectNotFound;

 

 public interface ResourceLoader {

 

@@ -38,7 +38,7 @@ public interface ResourceLoader {
 	public void addModuleBaseURL(String ns, URL newBaseURL);

 

 	public void addModuleBaseURL(String ns, String newBaseURL)

-			throws InvalidDataException;

+			throws InvalidData;

 

 	public HashMap<String, URL> getModuleBaseURLs();

 

@@ -54,7 +54,7 @@ public interface ResourceLoader {
 	public HashMap<String, String> getAllTextResources(String resName);

 

 	public String getTextResource(String ns, String resName)

-			throws ObjectNotFoundException;

+			throws ObjectNotFound;

 	

 	public Class<?> getClassForName(String name)

 			throws ClassNotFoundException;