From a1f0ecbb6a2bea6aa214322c412af2f3c5ce124b Mon Sep 17 00:00:00 2001 From: Andrew Branson 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 --- .../c2kernel/persistency/LDAPClusterStorage.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java') diff --git a/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java b/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java index 5a305f9..2c10bbf 100644 --- a/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java +++ b/src/main/java/com/c2kernel/persistency/LDAPClusterStorage.java @@ -4,8 +4,8 @@ import java.util.StringTokenizer; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.entity.C2KLocalObject; -import com.c2kernel.lookup.EntityPath; -import com.c2kernel.lookup.InvalidEntityPathException; +import com.c2kernel.lookup.ItemPath; +import com.c2kernel.lookup.InvalidItemPathException; import com.c2kernel.lookup.LDAPPropertyManager; import com.c2kernel.process.Gateway; import com.c2kernel.property.Property; @@ -53,10 +53,10 @@ public class LDAPClusterStorage extends ClusterStorage { throw new ClusterStorageException("Path length was invalid: "+path); String type = tok.nextToken(); - EntityPath thisEntity; + ItemPath thisEntity; try { - thisEntity = new EntityPath(sysKey.intValue()); - } catch (InvalidEntityPathException e) { + thisEntity = new ItemPath(sysKey.intValue()); + } catch (InvalidItemPathException e) { throw new ClusterStorageException("Invalid Syskey:"+sysKey); } @@ -84,10 +84,10 @@ public class LDAPClusterStorage extends ClusterStorage { String type = obj.getClusterType(); - EntityPath thisEntity; + ItemPath thisEntity; try { - thisEntity = new EntityPath(sysKey.intValue()); - } catch (InvalidEntityPathException e) { + thisEntity = new ItemPath(sysKey.intValue()); + } catch (InvalidItemPathException e) { throw new ClusterStorageException("Invalid Syskey:"+sysKey); } @@ -112,10 +112,10 @@ public class LDAPClusterStorage extends ClusterStorage { throw new ClusterStorageException("Path length was invalid: "+path); String type = tok.nextToken(); - EntityPath thisEntity; + ItemPath thisEntity; try { - thisEntity = new EntityPath(sysKey.intValue()); - } catch (InvalidEntityPathException e) { + thisEntity = new ItemPath(sysKey.intValue()); + } catch (InvalidItemPathException e) { throw new ClusterStorageException("Invalid Syskey:"+sysKey); } @@ -146,7 +146,7 @@ public class LDAPClusterStorage extends ClusterStorage { String type = getClusterType(path); try { - EntityPath thisEntity = new EntityPath(sysKey.intValue()); + ItemPath thisEntity = new ItemPath(sysKey.intValue()); if (type.equals(PROPERTY)) return ldapStore.getPropertyNames(thisEntity); else @@ -160,7 +160,7 @@ public class LDAPClusterStorage extends ClusterStorage { } else throw new ClusterStorageException("Cluster type "+type+" not supported."); - } catch (InvalidEntityPathException e) { + } catch (InvalidItemPathException e) { throw new ClusterStorageException("Invalid Syskey:"+sysKey); } catch (ObjectNotFoundException e) { throw new ClusterStorageException("Entity "+sysKey+" does not exist"); -- cgit v1.2.3