Rolled back the renaming of existing exceptions.

6 files changed, 38 insertions, 38 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
index 57de2a1..e6bfba9 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
@@ -23,9 +23,9 @@ package com.c2kernel.lifecycle.instance.predefined.server;
 import java.util.Arrays;

 import java.util.Stack;

 

-import com.c2kernel.common.CannotManage;

-import com.c2kernel.common.InvalidData;

-import com.c2kernel.common.ObjectAlreadyExists;

+import com.c2kernel.common.CannotManageException;

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectAlreadyExistsException;

 import com.c2kernel.common.ObjectCannotBeUpdated;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

@@ -42,15 +42,15 @@ public class AddDomainContext extends PredefinedStep {
 	

 	@Override

 	protected String runActivityLogic(AgentPath agent, ItemPath item,

-			int transitionID, String requestData) throws InvalidData, ObjectCannotBeUpdated, ObjectAlreadyExists, CannotManage {

+			int transitionID, String requestData) throws InvalidDataException, ObjectCannotBeUpdated, ObjectAlreadyExistsException, CannotManageException {

 	

 		String[] params = getDataList(requestData);

         if (Logger.doLog(3)) Logger.msg(3, "AddDomainContext: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));

-        if (params.length != 1) throw new InvalidData("AddDomainContext: Invalid parameters "+Arrays.toString(params));

+        if (params.length != 1) throw new InvalidDataException("AddDomainContext: Invalid parameters "+Arrays.toString(params));

 		

 		DomainPath pathToAdd = new DomainPath(params);

 		if (pathToAdd.exists())

-			throw new ObjectAlreadyExists("Context "+pathToAdd+" already exists");

+			throw new ObjectAlreadyExistsException("Context "+pathToAdd+" already exists");

 		// collect parent paths if they don't exist

 		Stack<DomainPath> pathsToAdd = new Stack<DomainPath>();

 		while(pathToAdd!= null && !pathToAdd.exists()) { 

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
index ffe8950..92f4357 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
@@ -20,11 +20,11 @@
  */

 package com.c2kernel.lifecycle.instance.predefined.server;

 

-import com.c2kernel.common.CannotManage;

-import com.c2kernel.common.InvalidData;

-import com.c2kernel.common.ObjectAlreadyExists;

+import com.c2kernel.common.CannotManageException;

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectAlreadyExistsException;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.imports.ImportAgent;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

@@ -43,7 +43,7 @@ public class CreateNewAgent extends PredefinedStep
 	//requestdata is xmlstring

     @Override

 	protected String runActivityLogic(AgentPath agent, ItemPath item,

-			int transitionID, String requestData) throws InvalidData, ObjectNotFound, ObjectCannotBeUpdated, CannotManage, ObjectAlreadyExists {

+			int transitionID, String requestData) throws InvalidDataException, ObjectNotFoundException, ObjectCannotBeUpdated, CannotManageException, ObjectAlreadyExistsException {

     	

         String redactedRequestData;

 

@@ -52,7 +52,7 @@ public class CreateNewAgent extends PredefinedStep
 			newAgent = (ImportAgent)Gateway.getMarshaller().unmarshall(requestData);

 		} catch (Exception e1) {

 			Logger.error(e1);

-			throw new InvalidData("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);

+			throw new InvalidDataException("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);

 		}

         newAgent.create(agent, true);

         newAgent.setPassword("REDACTED");

@@ -60,7 +60,7 @@ public class CreateNewAgent extends PredefinedStep
 			redactedRequestData = Gateway.getMarshaller().marshall(newAgent);

 		} catch (Exception e) {

 			Logger.error(e);

-			throw new InvalidData("CreateNewAgent: Couldn't marshall new Agent for outcome: "+newAgent);

+			throw new InvalidDataException("CreateNewAgent: Couldn't marshall new Agent for outcome: "+newAgent);

 		}

         return redactedRequestData;

     }

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
index 5e0505e..fde9f82 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
@@ -23,12 +23,12 @@ package com.c2kernel.lifecycle.instance.predefined.server;
 

 

 

-import com.c2kernel.common.CannotManage;

+import com.c2kernel.common.CannotManageException;

 import com.c2kernel.common.InvalidCollectionModification;

-import com.c2kernel.common.InvalidData;

-import com.c2kernel.common.ObjectAlreadyExists;

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectAlreadyExistsException;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.imports.ImportItem;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

@@ -47,14 +47,14 @@ public class CreateNewItem extends PredefinedStep
 	//requestdata is xmlstring

     @Override

 	protected String runActivityLogic(AgentPath agent, ItemPath item,

-			int transitionID, String requestData) throws InvalidData, ObjectCannotBeUpdated, ObjectNotFound, CannotManage, ObjectAlreadyExists, InvalidCollectionModification {

+			int transitionID, String requestData) throws InvalidDataException, ObjectCannotBeUpdated, ObjectNotFoundException, CannotManageException, ObjectAlreadyExistsException, InvalidCollectionModification {

     	

         ImportItem newItem;

 		try {

 			newItem = (ImportItem)Gateway.getMarshaller().unmarshall(requestData);

 		} catch (Exception e) {

 			Logger.error(e);

-			throw new InvalidData("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);

+			throw new InvalidDataException("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);

 		}

         newItem.create(agent, false);

         return requestData;

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
index de05dec..f99e54c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewRole.java
@@ -20,11 +20,11 @@
  */

 package com.c2kernel.lifecycle.instance.predefined.server;

 

-import com.c2kernel.common.CannotManage;

-import com.c2kernel.common.InvalidData;

-import com.c2kernel.common.ObjectAlreadyExists;

+import com.c2kernel.common.CannotManageException;

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectAlreadyExistsException;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.imports.ImportRole;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

@@ -43,7 +43,7 @@ public class CreateNewRole extends PredefinedStep
 	//requestdata is xmlstring

     @Override

 	protected String runActivityLogic(AgentPath agent, ItemPath item,

-			int transitionID, String requestData) throws InvalidData, ObjectAlreadyExists, ObjectCannotBeUpdated, CannotManage, ObjectNotFound {

+			int transitionID, String requestData) throws InvalidDataException, ObjectAlreadyExistsException, ObjectCannotBeUpdated, CannotManageException, ObjectNotFoundException {

     	

 

     	ImportRole newRole;

@@ -51,7 +51,7 @@ public class CreateNewRole extends PredefinedStep
 			newRole = (ImportRole)Gateway.getMarshaller().unmarshall(requestData);

 		} catch (Exception e) {

 			Logger.error(e);

-			throw new InvalidData("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);

+			throw new InvalidDataException("CreateNewAgent: Couldn't unmarshall new Agent: "+requestData);

 		}

     	newRole.create(agent, true);

     	return requestData;

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
index 2d78e69..a4520aa 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
@@ -22,10 +22,10 @@ package com.c2kernel.lifecycle.instance.predefined.server;
 

 import java.util.Arrays;

 

-import com.c2kernel.common.CannotManage;

-import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.CannotManageException;

+import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

@@ -40,20 +40,20 @@ public class RemoveDomainContext extends PredefinedStep {
 	

 	@Override

 	protected String runActivityLogic(AgentPath agent, ItemPath item,

-			int transitionID, String requestData) throws InvalidData, ObjectNotFound, ObjectCannotBeUpdated, CannotManage {

+			int transitionID, String requestData) throws InvalidDataException, ObjectNotFoundException, ObjectCannotBeUpdated, CannotManageException {

 	

 		String[] params = getDataList(requestData);

         if (Logger.doLog(3)) Logger.msg(3, "RemoveDomainContext: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));

-        if (params.length != 1) throw new InvalidData("RemoveDomainContext: Invalid parameters "+Arrays.toString(params));

+        if (params.length != 1) throw new InvalidDataException("RemoveDomainContext: Invalid parameters "+Arrays.toString(params));

         

 		DomainPath pathToDelete = new DomainPath(params[0]);

 		if (!pathToDelete.exists())

-			throw new ObjectNotFound("Context "+pathToDelete+" does not exist");

+			throw new ObjectNotFoundException("Context "+pathToDelete+" does not exist");

 		

 		try {

 			pathToDelete.getItemPath();

-			throw new InvalidData("Path "+pathToDelete+" is an Entity. Use its own Erase step instead, or RemoveAgent.");

-		} catch (ObjectNotFound ex) { }

+			throw new InvalidDataException("Path "+pathToDelete+" is an Entity. Use its own Erase step instead, or RemoveAgent.");

+		} catch (ObjectNotFoundException ex) { }

 		

 		if (Gateway.getLookup().getChildren(pathToDelete).hasNext())

 			throw new ObjectCannotBeUpdated("Context "+pathToDelete+" is not empty. Cannot delete.");

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java
index 7aeda55..a75b98c 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveRole.java
@@ -22,10 +22,10 @@ package com.c2kernel.lifecycle.instance.predefined.server;
 

 import java.util.Arrays;

 

-import com.c2kernel.common.CannotManage;

-import com.c2kernel.common.InvalidData;

+import com.c2kernel.common.CannotManageException;

+import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.ObjectCannotBeUpdated;

-import com.c2kernel.common.ObjectNotFound;

+import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.ItemPath;

@@ -44,11 +44,11 @@ public class RemoveRole extends PredefinedStep
 	//requestdata is xmlstring

     @Override

 	protected String runActivityLogic(AgentPath agent, ItemPath item,

-			int transitionID, String requestData) throws InvalidData, CannotManage, ObjectNotFound, ObjectCannotBeUpdated {

+			int transitionID, String requestData) throws InvalidDataException, CannotManageException, ObjectNotFoundException, ObjectCannotBeUpdated {

     	

 		String[] params = getDataList(requestData);

         if (Logger.doLog(3)) Logger.msg(3, "RemoveRole: called by "+agent+" on "+item+" with parameters "+Arrays.toString(params));

-        if (params.length != 1) throw new InvalidData("RemoveRole: Invalid parameters "+Arrays.toString(params));

+        if (params.length != 1) throw new InvalidDataException("RemoveRole: Invalid parameters "+Arrays.toString(params));

         

     	LookupManager lookup = Gateway.getLookupManager();