Replaced int sysKey Item identifier with UUID, which is now portable.

ItemPath objects are now used to identify Items throughout the kernel,
replacing ints and Integers.

4 files changed, 13 insertions, 9 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 585f96f..35438e8 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
@@ -9,6 +9,7 @@ import com.c2kernel.common.ObjectCannotBeUpdated;
 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

+import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -19,7 +20,7 @@ public class AddDomainContext extends PredefinedStep {
 	}

 	

 	@Override

-	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+	protected String runActivityLogic(AgentPath agent, ItemPath item,

 			int transitionID, String requestData) throws InvalidDataException {

 	

 		Logger.msg(1, "AddDomainContext::request() - Starting.");

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 f2396da..45ae445 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
@@ -11,6 +11,7 @@ import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.entity.imports.ImportAgent;

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

 import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -24,14 +25,14 @@ public class CreateNewAgent extends PredefinedStep
 

 	//requestdata is xmlstring

     @Override

-	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+	protected String runActivityLogic(AgentPath agent, ItemPath item,

 			int transitionID, String requestData) throws InvalidDataException {

     	

         String redactedRequestData;

         try {

             ImportAgent newAgent = (ImportAgent)Gateway.getMarshaller().unmarshall(requestData);

-            newAgent.create(agent.getSysKey());

-            newAgent.password = "REDACTED";

+            newAgent.create(agent, true);

+            newAgent.setPassword("REDACTED");

             redactedRequestData = Gateway.getMarshaller().marshall(newAgent);

             return redactedRequestData;

         } catch (Exception ex) {

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 19fd80a..a1d1755 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
@@ -14,6 +14,7 @@ import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.entity.imports.ImportItem;

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

 import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -27,12 +28,12 @@ public class CreateNewItem extends PredefinedStep
 

 	//requestdata is xmlstring

     @Override

-	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+	protected String runActivityLogic(AgentPath agent, ItemPath item,

 			int transitionID, String requestData) throws InvalidDataException {

     	

         try {

-            ImportItem item = (ImportItem)Gateway.getMarshaller().unmarshall(requestData);

-            item.create(agent.getSysKey(), false);

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

+            newItem.create(agent, false);

             return requestData;

         } catch (Exception ex) {

             Logger.error(ex);

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 956166a..05d399c 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
@@ -7,6 +7,7 @@ import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

 import com.c2kernel.lookup.AgentPath;

 import com.c2kernel.lookup.DomainPath;

+import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.Logger;

 

@@ -16,7 +17,7 @@ public class RemoveDomainContext extends PredefinedStep {
 	}

 	

 	@Override

-	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+	protected String runActivityLogic(AgentPath agent, ItemPath item,

 			int transitionID, String requestData) throws InvalidDataException {

 	

 		Logger.msg(1, "RemoveDomainContext::request() - Starting.");

@@ -25,7 +26,7 @@ public class RemoveDomainContext extends PredefinedStep {
 		if (!pathToDelete.exists())

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

 		try {

-			pathToDelete.getEntity();

+			pathToDelete.getItemPath();

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