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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/com/c2kernel/process/UserCodeProcess.java b/src/main/java/com/c2kernel/process/UserCodeProcess.java
index f7bbe74..0d35025 100644
--- a/src/main/java/com/c2kernel/process/UserCodeProcess.java
+++ b/src/main/java/com/c2kernel/process/UserCodeProcess.java
@@ -9,8 +9,8 @@ import com.c2kernel.common.InvalidTransitionException;
 import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.entity.agent.Job;

 import com.c2kernel.entity.proxy.AgentProxy;

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

 import com.c2kernel.entity.proxy.MemberSubscription;

+import com.c2kernel.entity.proxy.ProxyObserver;

 import com.c2kernel.persistency.ClusterStorage;

 import com.c2kernel.scripting.ErrorInfo;

 import com.c2kernel.scripting.ScriptErrorException;

@@ -24,7 +24,7 @@ import com.c2kernel.utils.Logger;
  * Copyright (C) 2003 CERN - European Organization for Nuclear Research

  * All rights reserved.

  **************************************************************************/

-public class UserCodeProcess extends StandardClient implements EntityProxyObserver<Job>, Runnable {

+public class UserCodeProcess extends StandardClient implements ProxyObserver<Job>, Runnable {

 	

 	// Default state machine transitions

     private static final int START = 1;

@@ -38,12 +38,12 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv
     HashMap<String, ErrorInfo> errors = new HashMap<String, ErrorInfo>();

     HashMap<String, C2KLocalObject> jobs;

 

-    public UserCodeProcess(String agentName, String agentPass) {

+    public UserCodeProcess(String agentName, String agentPass, String resource) {

         // login - try for a while in case server hasn't imported our user yet

         for (int i=1;i<6;i++) {

             try {

                 Logger.msg("Login attempt "+i+" of 5");

-                agent = Gateway.connect(agentName, agentPass);

+                agent = Gateway.connect(agentName, agentPass, resource);

                 break;

             } catch (Exception ex) {

                 Logger.error("Could not log in.");

@@ -209,7 +209,7 @@ public class UserCodeProcess extends StandardClient implements EntityProxyObserv
     }

 

     public static UserCodeProcess getInstance() throws UnknownHostException {

-        return new UserCodeProcess(InetAddress.getLocalHost().getHostName(), "uc");

+        return new UserCodeProcess(InetAddress.getLocalHost().getHostName(), "uc", Gateway.getProperties().getProperty("AuthResource", "Cristal"));

     }

 

     static public void main(String[] args)