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.

4 files changed, 19 insertions, 18 deletions

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);

 		}

 	}