From a1f0ecbb6a2bea6aa214322c412af2f3c5ce124b Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Wed, 7 May 2014 17:33:13 +0200
Subject: Agent now extends Item, so they can have workflows. All traces of the
 old 'Entity' superclasses should be removed, including proxies and paths.
 Very large change, breaks API compatibility with CRISTAL 2.x. Fixes #135

---
 src/main/java/com/c2kernel/entity/transfer/TransferItem.java | 9 ++++++---
 src/main/java/com/c2kernel/entity/transfer/TransferSet.java  | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com/c2kernel/entity/transfer')

diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
index 520063a..df81721 100644
--- a/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
+++ b/src/main/java/com/c2kernel/entity/transfer/TransferItem.java
@@ -9,7 +9,7 @@ import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.entity.TraceableEntity;
 import com.c2kernel.lifecycle.instance.Workflow;
 import com.c2kernel.lookup.DomainPath;
-import com.c2kernel.lookup.EntityPath;
+import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.lookup.Path;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.outcome.Outcome;
@@ -89,7 +89,7 @@ public class TransferItem {
         }
 
         // create item
-        EntityPath entityPath = new EntityPath(sysKey);
+        ItemPath entityPath = new ItemPath(sysKey);
         TraceableEntity newItem = (TraceableEntity)Gateway.getCorbaServer().createEntity(entityPath);
         Gateway.getLDAPLookup().add(entityPath);
 
@@ -107,7 +107,10 @@ public class TransferItem {
             throw new Exception("No workflow found in import for "+sysKey);
 
         // init item
-        newItem.initialise(importAgentId, Gateway.getMarshaller().marshall(props), Gateway.getMarshaller().marshall(wf.search("workflow/domain")));
+        newItem.initialise(importAgentId, 
+        		Gateway.getMarshaller().marshall(props), 
+        		Gateway.getMarshaller().marshall(wf.search("workflow/domain")),
+        		null);
 
         // store objects
         importByType(ClusterStorage.COLLECTION, objects);
diff --git a/src/main/java/com/c2kernel/entity/transfer/TransferSet.java b/src/main/java/com/c2kernel/entity/transfer/TransferSet.java
index 7a3ba2e..a7d81b6 100644
--- a/src/main/java/com/c2kernel/entity/transfer/TransferSet.java
+++ b/src/main/java/com/c2kernel/entity/transfer/TransferSet.java
@@ -3,7 +3,7 @@ package com.c2kernel.entity.transfer;
 import java.io.File;
 import java.util.ArrayList;
 
-import com.c2kernel.lookup.EntityPath;
+import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.lookup.NextKeyManager;
 import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.FileStringUtility;
@@ -85,7 +85,7 @@ public class TransferSet {
         try
         {   // find the current last key
             NextKeyManager nextKeyMan = Gateway.getLDAPLookup().getNextKeyManager();
-            EntityPath lastKey = nextKeyMan.getLastEntityPath();
+            ItemPath lastKey = nextKeyMan.getLastEntityPath();
             Logger.msg(1, "Last key imported was "+packageLastKey+". LDAP lastkey was "+lastKey.getSysKey());
 
 
-- 
cgit v1.2.3