1 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/com/c2kernel/persistency/ProxyLoader.java b/src/main/java/com/c2kernel/persistency/ProxyLoader.java
index 4324e94..9c14df5 100644
--- a/src/main/java/com/c2kernel/persistency/ProxyLoader.java
+++ b/src/main/java/com/c2kernel/persistency/ProxyLoader.java
@@ -5,9 +5,9 @@ import java.util.StringTokenizer;
 import com.c2kernel.common.ObjectNotFoundException;
 import com.c2kernel.entity.AgentHelper;
 import com.c2kernel.entity.C2KLocalObject;
+import com.c2kernel.entity.Item;
 import com.c2kernel.entity.ItemHelper;
-import com.c2kernel.entity.ManageableEntity;
-import com.c2kernel.lookup.EntityPath;
+import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.lookup.LDAPLookup;
 import com.c2kernel.persistency.outcome.Outcome;
 import com.c2kernel.process.Gateway;
@@ -18,7 +18,7 @@ import com.c2kernel.utils.Logger;
 */
 
 public class ProxyLoader extends ClusterStorage {
-    HashMap<Integer, ManageableEntity> entities = new HashMap<Integer, ManageableEntity>();
+    HashMap<Integer, Item> entities = new HashMap<Integer, Item>();
     LDAPLookup lookup;
 
     @Override
@@ -49,7 +49,7 @@ public class ProxyLoader extends ClusterStorage {
     @Override
 	public C2KLocalObject get(Integer sysKey, String path) throws ClusterStorageException {
         try {
-            ManageableEntity thisEntity = getIOR(sysKey);
+            Item thisEntity = getIOR(sysKey);
             String type = getClusterType(path);
 
             // fetch the xml from the item
@@ -90,7 +90,7 @@ public class ProxyLoader extends ClusterStorage {
     @Override
 	public String[] getClusterContents(Integer sysKey, String path) throws ClusterStorageException {
         try {
-            ManageableEntity thisEntity = getIOR(sysKey);
+            Item thisEntity = getIOR(sysKey);
             String contents = thisEntity.queryData(path+"/all");
             StringTokenizer tok = new StringTokenizer(contents, ",");
             String[] result = new String[tok.countTokens()];
@@ -104,7 +104,7 @@ public class ProxyLoader extends ClusterStorage {
         }
     }
 
-    private ManageableEntity getIOR(Integer sysKey) throws ClusterStorageException {
+    private Item getIOR(Integer sysKey) throws ClusterStorageException {
         if (entities.containsKey(sysKey)) {
             // check the cache
             Logger.msg(7, "ProxyLoader.getIOR() - "+sysKey+" cached.");
@@ -113,22 +113,22 @@ public class ProxyLoader extends ClusterStorage {
 
         try {
             Logger.msg(7, "ProxyLoader.getIOR() - Resolving "+sysKey+".");
-            org.omg.CORBA.Object ior = lookup.getIOR(new EntityPath(sysKey.intValue()));
+            org.omg.CORBA.Object ior = lookup.getIOR(new ItemPath(sysKey.intValue()));
 
-            ManageableEntity thisEntity = null;
+            Item thisItem = null;
             try {
-                thisEntity = ItemHelper.narrow(ior);
+            	thisItem = ItemHelper.narrow(ior);
             } catch (org.omg.CORBA.BAD_PARAM ex) {
                 try {
-                    thisEntity =  AgentHelper.narrow(ior);
+                	thisItem =  AgentHelper.narrow(ior);
                 } catch (org.omg.CORBA.BAD_PARAM ex2) {
                     throw new ClusterStorageException ("Could not narrow "+sysKey+" as a known Entity type");
                 }
             }
 
             Logger.msg(7, "ProxyLoader.getIOR() - Found "+sysKey+".");
-            entities.put(sysKey, thisEntity);
-            return thisEntity;
+            entities.put(sysKey, thisItem);
+            return thisItem;
         } catch (Exception e) {
             throw new ClusterStorageException("Error narrowing "+sysKey+": "+e.getMessage());
         }