Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

1 files changed, 6 insertions, 5 deletions

diff --git a/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java b/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java
index f63dac6..e6c6e9f 100644
--- a/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java
+++ b/src/main/java/com/c2kernel/persistency/XMLClusterStorage.java
@@ -3,10 +3,11 @@ import java.io.File;
 import java.util.ArrayList;

 

 import com.c2kernel.entity.C2KLocalObject;

-import com.c2kernel.lookup.EntityPath;

-import com.c2kernel.lookup.InvalidEntityPathException;

+import com.c2kernel.lookup.InvalidItemPathException;

+import com.c2kernel.lookup.ItemPath;

 import com.c2kernel.persistency.outcome.Outcome;

 import com.c2kernel.process.Gateway;

+import com.c2kernel.process.auth.Authenticator;

 import com.c2kernel.utils.FileStringUtility;

 import com.c2kernel.utils.Logger;

 

@@ -17,7 +18,7 @@ public class XMLClusterStorage extends ClusterStorage {
     }

 

     @Override

-	public void open() throws ClusterStorageException {

+	public void open(Authenticator auth) throws ClusterStorageException {

         String rootProp = Gateway.getProperties().getProperty("XMLStorage.root");

         if (rootProp == null)

             throw new ClusterStorageException("XMLClusterStorage.open() - Root path not given in config file.");

@@ -145,8 +146,8 @@ public class XMLClusterStorage extends ClusterStorage {
         }

     }

 

-    protected String getFilePath(Integer sysKey, String path) throws InvalidEntityPathException {

-        EntityPath thisEntity = new EntityPath(sysKey.intValue());

+    protected String getFilePath(Integer sysKey, String path) throws InvalidItemPathException {

+        ItemPath thisEntity = new ItemPath(sysKey.intValue());

         if (path.length() == 0 || path.charAt(0) != '/') path = "/"+path;

         String filePath = rootDir+thisEntity.toString()+path;

         Logger.msg(8, "XMLClusterStorage.getFilePath() - "+filePath);