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.

1 files changed, 15 insertions, 15 deletions

diff --git a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
index 445f5cd..434c24d 100644
--- a/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
+++ b/src/main/java/com/c2kernel/utils/LocalObjectLoader.java
@@ -22,15 +22,15 @@ package com.c2kernel.utils;
 
 import java.util.Iterator;

 

-import com.c2kernel.common.InvalidDataException;

-import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.PersistencyException;

 import com.c2kernel.entity.proxy.ItemProxy;

 import com.c2kernel.lifecycle.ActivityDef;

 import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;

 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.lookup.Path;

 import com.c2kernel.persistency.ClusterStorage;

-import com.c2kernel.persistency.ClusterStorageException;

 import com.c2kernel.persistency.outcome.Schema;

 import com.c2kernel.persistency.outcome.Viewpoint;

 import com.c2kernel.process.Gateway;

@@ -40,35 +40,35 @@ public class LocalObjectLoader {
 	private static StateMachineCache smCache = new StateMachineCache();

 

 	static public ItemProxy loadLocalObjectDef(String root, String name)

-		throws ObjectNotFoundException

+		throws ObjectNotFound

 	{

 		DomainPath defRoot = new DomainPath(root);

 	    Iterator<Path> e = Gateway.getLookup().search(defRoot, name);

 	    if (e.hasNext()) {

 	    	DomainPath defPath = (DomainPath)e.next();

-		    if (e.hasNext()) throw new ObjectNotFoundException("Too many matches for "+name+" in "+root, "");

+		    if (e.hasNext()) throw new ObjectNotFound("Too many matches for "+name+" in "+root);

 		    return Gateway.getProxyManager().getProxy(defPath);

 	    }

 	    else {

-	    	throw new ObjectNotFoundException("No match for "+name+" in "+root, "");

+	    	throw new ObjectNotFound("No match for "+name+" in "+root);

 	    }

 
 	}

 

-	static public String getScript(String scriptName, int scriptVersion) throws ObjectNotFoundException {

+	static public String getScript(String scriptName, int scriptVersion) throws ObjectNotFound {

 	    Logger.msg(5, "Loading script "+scriptName+" v"+scriptVersion);

 	    try {

 	    	ItemProxy script = loadLocalObjectDef("/desc/Script/", scriptName);

    	        Viewpoint scriptView = (Viewpoint)script.getObject(ClusterStorage.VIEWPOINT + "/Script/" + scriptVersion);

 	    	return scriptView.getOutcome().getData();

-	    } catch (ClusterStorageException ex) {

+	    } catch (PersistencyException ex) {

 	    	Logger.error(ex);

-	        throw new ObjectNotFoundException("Error loading script " + scriptName + " version " + scriptVersion, "");

+	        throw new ObjectNotFound("Error loading script " + scriptName + " version " + scriptVersion);

 	    }

 

 	}

 

-	static public Schema getSchema(String schemaName, int schemaVersion) throws ObjectNotFoundException {

+	static public Schema getSchema(String schemaName, int schemaVersion) throws ObjectNotFound {

 		Logger.msg(5, "Loading schema "+schemaName+" v"+schemaVersion);

 	    

 	    String docType = schemaName;

@@ -83,9 +83,9 @@ public class LocalObjectLoader {
         Viewpoint schemaView = (Viewpoint)schema.getObject(ClusterStorage.VIEWPOINT + "/Schema/" + schemaVersion);

         try {

         	schemaData = schemaView.getOutcome().getData();

-        } catch (ClusterStorageException ex) {

+        } catch (PersistencyException ex) {

         	Logger.error(ex);

-        	throw new ObjectNotFoundException("Problem loading schema "+schemaName+" v"+schemaVersion+": "+ex.getMessage(), "");

+        	throw new ObjectNotFound("Problem loading schema "+schemaName+" v"+schemaVersion+": "+ex.getMessage());

         }

 	    return new Schema(docType, docVersion, schemaData);

 	}

@@ -96,14 +96,14 @@ public class LocalObjectLoader {
 	 * @param actName - activity name

 	 * @param version - named version (String)

 	 * @return ActivityDef

-	 * @throws ObjectNotFoundException - When activity or version does not exist

+	 * @throws ObjectNotFound - When activity or version does not exist

 	 */

-	static public ActivityDef getActDef(String actName, int actVersion) throws ObjectNotFoundException, InvalidDataException {

+	static public ActivityDef getActDef(String actName, int actVersion) throws ObjectNotFound, InvalidData {

 		Logger.msg(5, "Loading activity def "+actName+" v"+actVersion);

 		return actCache.get(actName, actVersion);

 	}

 	

-	static public StateMachine getStateMachine(String smName, int smVersion) throws ObjectNotFoundException, InvalidDataException {

+	static public StateMachine getStateMachine(String smName, int smVersion) throws ObjectNotFound, InvalidData {

 		Logger.msg(5, "Loading activity def "+smName+" v"+smVersion);

 		return smCache.get(smName, smVersion);

 	}