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=6be4bc86a374c79286b6672ab8320a0659250a9e;hb=cffd700ca670610a1f81e021f82542dc6bf5c810;hp=b75b04a08850cb5d9f6d2a0ed319987e1ccfeee3;hpb=a181e3d059185a9dc108e81f38c66f48f4e4aac8;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 b75b04a08..6be4bc86a 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
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.UUID;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
@@ -14,51 +15,68 @@ 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 agent synchronizing with a JCR repository. */
-public class JcrAgent extends DefaultAgent implements SlcAgentFactory {
-	private Session session;
+/** SLC VM agent synchronizing with a JCR repository. */
+public class JcrAgent extends DefaultAgent implements SlcAgentFactory, SlcNames {
+	private Repository repository;
+
+	/** only one agent per VM is currently supported */
+	private final String agentNodeName = "default";
 
 	/*
 	 * LIFECYCLE
 	 */
 	protected String initAgentUuid() {
+		Session session = null;
 		try {
-			Node vmAgentFactoryNode = JcrUtils.mkdirs(session,
-					SlcJcrConstants.VM_AGENT_FACTORY_PATH);
-			vmAgentFactoryNode.addMixin(SlcTypes.SLC_AGENT_PROXY);
-			if (!vmAgentFactoryNode.hasNodes()) {
+			session = repository.login();
+			Node vmAgentFactoryNode = JcrUtils.mkdirsSafe(session,
+					SlcJcrConstants.VM_AGENT_FACTORY_PATH,
+					SlcTypes.SLC_AGENT_FACTORY);
+			if (!vmAgentFactoryNode.hasNode(agentNodeName)) {
 				String uuid = UUID.randomUUID().toString();
-				vmAgentFactoryNode.addNode(uuid);
+				Node agentNode = vmAgentFactoryNode.addNode(agentNodeName,
+						SlcTypes.SLC_AGENT);
+				agentNode.setProperty(SLC_UUID, uuid);
 			}
 			session.save();
-
-			return vmAgentFactoryNode.getNodes().nextNode().getName();
+			return vmAgentFactoryNode.getNode(agentNodeName)
+					.getProperty(SLC_UUID).getString();
 		} catch (RepositoryException e) {
+			JcrUtils.discardQuietly(session);
 			throw new SlcException("Cannot find JCR agent UUID", e);
 		} finally {
-			JcrUtils.discardQuietly(session);
+			JcrUtils.logoutQuietly(session);
 		}
 	}
 
+	@Override
+	public void destroy() {
+		super.destroy();
+	}
+
+	/*
+	 * SLC AGENT
+	 */
 	@Override
 	protected ProcessThread createProcessThread(
+			ThreadGroup processesThreadGroup,
 			ExecutionModulesManager modulesManager, ExecutionProcess process) {
-		return new JcrProcessThread(modulesManager,
+		return new JcrProcessThread(processesThreadGroup, modulesManager,
 				(JcrExecutionProcess) process);
 	}
 
-	public void dispose() {
-
-	}
-
 	/*
 	 * SLC AGENT FACTORY
 	 */
 	public SlcAgent getAgent(String uuid) {
+		if (!uuid.equals(getAgentUuid()))
+			throw new SlcException("Internal UUID " + getAgentUuid()
+					+ " is different from argument UUID " + uuid);
 		return this;
 	}
 
@@ -67,10 +85,21 @@ public class JcrAgent extends DefaultAgent implements SlcAgentFactory {
 	}
 
 	/*
-	 * BEAN METHODS
+	 * UTILITIES
 	 */
-	public void setSession(Session session) {
-		this.session = session;
+	public String getNodePath() {
+		return SlcJcrConstants.VM_AGENT_FACTORY_PATH + '/' + getAgentNodeName();
+	}
+
+	/*
+	 * BEAN
+	 */
+	public String getAgentNodeName() {
+		return agentNodeName;
+	}
+
+	public void setRepository(Repository repository) {
+		this.repository = repository;
 	}
 
 }