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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java b/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java
index 402c466..c9ede04 100644
--- a/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java
+++ b/src/main/java/com/c2kernel/persistency/ClusterStorageManager.java
@@ -10,12 +10,12 @@ import java.util.StringTokenizer;
 import com.c2kernel.common.ObjectNotFoundException;

 import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.entity.agent.JobList;

-import com.c2kernel.entity.proxy.EntityProxyManager;

 import com.c2kernel.entity.proxy.ProxyMessage;

 import com.c2kernel.events.History;

 import com.c2kernel.persistency.outcome.Outcome;

 import com.c2kernel.persistency.outcome.Viewpoint;

 import com.c2kernel.process.Gateway;

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

 import com.c2kernel.utils.Logger;

 import com.c2kernel.utils.SoftCache;

 import com.c2kernel.utils.WeakCache;

@@ -39,7 +39,7 @@ public class ClusterStorageManager {
      * Initialises all ClusterStorage handlers listed by class name in the property "ClusterStorages"

      * This property is usually process specific, and so should be in the server/client.conf and not the connect file.

      */

-    public ClusterStorageManager() throws ClusterStorageException {

+    public ClusterStorageManager(Authenticator auth) throws ClusterStorageException {

     	Object clusterStorageProp = Gateway.getProperties().getObject("ClusterStorage");

         if (clusterStorageProp == null || clusterStorageProp.equals("")) {

             throw new ClusterStorageException("ClusterStorageManager.init() - no ClusterStorages defined. No persistency!");

@@ -65,7 +65,7 @@ public class ClusterStorageManager {
         int clusterNo = 0;

         for (ClusterStorage newStorage : rootStores) {

         	try {

-        		newStorage.open();

+        		newStorage.open(auth);

         	} catch (ClusterStorageException ex) {

         		Logger.error(ex);

                 throw new ClusterStorageException("ClusterStorageManager.init() - Error initialising storage handler " + newStorage.getClass().getName() +

@@ -173,7 +173,7 @@ public class ClusterStorageManager {
     					}

                 }

             } catch (ClusterStorageException e) {

-                Logger.error("ClusterStorageManager.getClusterContents() - reader " + thisReader.getName() +

+                Logger.msg(5, "ClusterStorageManager.getClusterContents() - reader " + thisReader.getName() +

                     " could not retrieve contents of " + sysKey + "/" + path + ": " + e.getMessage());

             }

         }

@@ -291,7 +291,7 @@ public class ClusterStorageManager {
         if (Logger.doLog(9)) dumpCacheContents(9);

 

         // transmit proxy event

-        EntityProxyManager.sendProxyEvent( new ProxyMessage(sysKeyIntObj.intValue(), path, ProxyMessage.ADDED));

+        Gateway.getProxyServer().sendProxyEvent( new ProxyMessage(sysKeyIntObj.intValue(), path, ProxyMessage.ADDED));

     }

 

     /** Deletes a cluster from all writers */

@@ -317,7 +317,7 @@ public class ClusterStorageManager {
 

 

         // transmit proxy event

-        EntityProxyManager.sendProxyEvent( new ProxyMessage(sysKeyIntObj.intValue(), path, ProxyMessage.DELETED));

+        Gateway.getProxyServer().sendProxyEvent( new ProxyMessage(sysKeyIntObj.intValue(), path, ProxyMessage.DELETED));

     }

 

     public void clearCache(Integer sysKeyIntObj, String path) {