X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fexecution%2FJcrAgent.java;h=008b1c5f1bb9c9364a558ca99cfec44fa02987f9;hb=dbb420ec2208b2c4cd3ed64c3fe99c4e6f1644be;hp=c0fce506debfaa2774d083cf6ccb506d1b01497c;hpb=58e0e18d64a2080680a9f8397b0dfa2894519910;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
index c0fce506d..008b1c5f1 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrAgent.java
@@ -15,7 +15,8 @@
  */
 package org.argeo.slc.jcr.execution;
 
-import java.util.List;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.UUID;
 
 import javax.jcr.Node;
@@ -25,22 +26,22 @@ import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.core.execution.DefaultAgent;
 import org.argeo.slc.core.execution.ProcessThread;
-import org.argeo.slc.core.runtime.DefaultAgent;
 import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.jcr.SlcJcrConstants;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
-import org.argeo.slc.runtime.SlcAgent;
-import org.argeo.slc.runtime.SlcAgentFactory;
 
 /** SLC VM agent synchronizing with a JCR repository. */
-public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames {
+public class JcrAgent extends DefaultAgent implements SlcNames {
+	// final static String ROLE_REMOTE = "ROLE_REMOTE";
+	final static String NODE_REPO_URI = "argeo.node.repo.uri";
+
 	private Repository repository;
 
-	/** only one agent per VM is currently supported */
-	private final String agentNodeName = "default";
+	private String agentNodeName = "default";
 
 	/*
 	 * LIFECYCLE
@@ -49,9 +50,10 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames
 		Session session = null;
 		try {
 			session = repository.login();
+
+			String agentFactoryPath = getAgentFactoryPath();
 			Node vmAgentFactoryNode = JcrUtils.mkdirsSafe(session,
-					SlcJcrConstants.VM_AGENT_FACTORY_PATH,
-					SlcTypes.SLC_AGENT_FACTORY);
+					agentFactoryPath, SlcTypes.SLC_AGENT_FACTORY);
 			if (!vmAgentFactoryNode.hasNode(agentNodeName)) {
 				String uuid = UUID.randomUUID().toString();
 				Node agentNode = vmAgentFactoryNode.addNode(agentNodeName,
@@ -81,29 +83,41 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames
 	protected ProcessThread createProcessThread(
 			ThreadGroup processesThreadGroup,
 			ExecutionModulesManager modulesManager, ExecutionProcess process) {
-		return new JcrProcessThread(processesThreadGroup, modulesManager,
-				(JcrExecutionProcess) process);
+		if (process instanceof JcrProcessThread)
+			return new JcrProcessThread(processesThreadGroup, modulesManager,
+					(JcrExecutionProcess) process);
+		else
+			return super.createProcessThread(processesThreadGroup,
+					modulesManager, process);
 	}
 
 	/*
-	 * SLC AGENT FACTORY
+	 * UTILITIES
 	 */
-	public SlcAgent getAgent(String uuid) {
-		if (!uuid.equals(getAgentUuid()))
-			throw new SlcException("Internal UUID " + getAgentUuid()
-					+ " is different from argument UUID " + uuid);
-		return this;
+	public String getNodePath() {
+		return getAgentFactoryPath() + '/' + getAgentNodeName();
 	}
 
-	public void pingAll(List<String> activeAgentIds) {
-		ping();
-	}
+	public String getAgentFactoryPath() {
+		try {
+			Boolean isRemote = System.getProperty(NODE_REPO_URI) != null;
+			String agentFactoryPath;
+			if (isRemote) {
+				InetAddress localhost = InetAddress.getLocalHost();
+				agentFactoryPath = SlcJcrConstants.AGENTS_BASE_PATH + "/"
+						+ localhost.getCanonicalHostName();
 
-	/*
-	 * UTILITIES
-	 */
-	public String getNodePath() {
-		return SlcJcrConstants.VM_AGENT_FACTORY_PATH + '/' + getAgentNodeName();
+				if (agentFactoryPath
+						.equals(SlcJcrConstants.VM_AGENT_FACTORY_PATH))
+					throw new SlcException("Unsupported hostname "
+							+ localhost.getCanonicalHostName());
+			} else {// local
+				agentFactoryPath = SlcJcrConstants.VM_AGENT_FACTORY_PATH;
+			}
+			return agentFactoryPath;
+		} catch (UnknownHostException e) {
+			throw new SlcException("Cannot find agent factory base path", e);
+		}
 	}
 
 	/*
@@ -117,4 +131,7 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames
 		this.repository = repository;
 	}
 
+	public void setAgentNodeName(String agentNodeName) {
+		this.agentNodeName = agentNodeName;
+	}
 }