Fix SLC

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.jcr / src / main / java / org / argeo / slc / jcr / execution / JcrAgent.java

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 9327f8b6abd47f6a9650819d2b5419d65ac74627..6be4bc86a374c79286b6672ab8320a0659250a9e 100644 (file)
--- 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,49 +4,79 @@ import java.util.List;
 import java.util.UUID;
 
 import javax.jcr.Node;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+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 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);
-                       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);
                }
        }
 
-       public void dispose() {
+       @Override
+       public void destroy() {
+               super.destroy();
+       }
 
+       /*
+        * SLC AGENT
+        */
+       @Override
+       protected ProcessThread createProcessThread(
+                       ThreadGroup processesThreadGroup,
+                       ExecutionModulesManager modulesManager, ExecutionProcess process) {
+               return new JcrProcessThread(processesThreadGroup, modulesManager,
+                               (JcrExecutionProcess) process);
        }
 
        /*
         * 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;
        }
 
@@ -55,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;
        }
 
 }