X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjcr%2Fexecution%2FJcrProcessThread.java;h=8755829e7bba6e213b896c1d142ca82d65c22c45;hb=b7ad99f6fc4414eeb82b9a4ae65aa20e02af66ce;hp=34685fff0973a9c01e6c33048e86bebe3ce24ac4;hpb=a181e3d059185a9dc108e81f38c66f48f4e4aac8;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java
index 34685fff0..8755829e7 100644
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java
@@ -1,66 +1,95 @@
+/*
+
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.jcr.execution;
 
+import java.util.List;
+
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.Property;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 
 import org.argeo.ArgeoException;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.core.execution.ProcessThread;
-import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionModulesManager;
-import org.argeo.slc.jcr.SlcJcrUtils;
+import org.argeo.slc.execution.ExecutionProcess;
+import org.argeo.slc.execution.RealizedFlow;
 import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.process.RealizedFlow;
 
+/** Where the actual execution takes place */
 public class JcrProcessThread extends ProcessThread implements SlcNames {
 
-	public JcrProcessThread(ExecutionModulesManager executionModulesManager,
+	public JcrProcessThread(ThreadGroup processesThreadGroup,
+			ExecutionModulesManager executionModulesManager,
 			JcrExecutionProcess process) {
-		super(executionModulesManager, process);
+		super(processesThreadGroup, executionModulesManager, process);
 	}
 
+	/** Overridden in order to set progress status on realized flow nodes. */
 	@Override
-	protected void process() {
-		try {
-			Node realizedFlowNode = getNode().getNode(SLC_FLOW);
-			// we just manage one level for the time being
-			NodeIterator nit = realizedFlowNode.getNodes(SLC_FLOW);
-			while (nit.hasNext()) {
-				process(nit.nextNode());
-			}
-		} catch (RepositoryException e) {
-			throw new ArgeoException("Cannot process " + getNode(), e);
-		}
-	}
+	protected void process() throws InterruptedException {
+		Session session = null;
+		if (getProcess() instanceof JcrExecutionProcess)
+			try {
+				session = ((JcrExecutionProcess) getProcess()).getRepository()
+						.login();
 
-	protected void process(Node realizedFlowNode) throws RepositoryException {
-		if (realizedFlowNode.hasNode(SLC_ADDRESS)) {
-			String flowPath = realizedFlowNode.getNode(SLC_ADDRESS)
-					.getProperty(Property.JCR_PATH).getString();
-			// TODO: convert to local path if remote
+				List<RealizedFlow> realizedFlows = getProcess()
+						.getRealizedFlows();
+				for (RealizedFlow realizedFlow : realizedFlows) {
+					Node realizedFlowNode = session
+							.getNode(((JcrRealizedFlow) realizedFlow).getPath());
+					setFlowStatus(realizedFlowNode, ExecutionProcess.RUNNING);
 
-			Node flowNode = realizedFlowNode.getSession().getNode(flowPath);
-			String flowName = flowNode.getProperty(SLC_NAME).getString();
+					try {
+						//
+						// EXECUTE THE FLOW
+						//
+						execute(realizedFlow, true);
 
-			String executionModuleName = SlcJcrUtils
-					.flowExecutionModuleName(flowPath);
-			String executionModuleVersion = SlcJcrUtils
-					.flowExecutionModuleVersion(flowPath);
-
-			RealizedFlow realizedFlow = new RealizedFlow();
-			realizedFlow.setModuleName(executionModuleName);
-			realizedFlow.setModuleVersion(executionModuleVersion);
-
-			ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(flowName,
-					null, null);
-			realizedFlow.setFlowDescriptor(efd);
+						setFlowStatus(realizedFlowNode,
+								ExecutionProcess.COMPLETED);
+					} catch (RepositoryException e) {
+						throw e;
+					} catch (InterruptedException e) {
+						setFlowStatus(realizedFlowNode, ExecutionProcess.KILLED);
+						throw e;
+					} catch (RuntimeException e) {
+						setFlowStatus(realizedFlowNode, ExecutionProcess.ERROR);
+						throw e;
+					}
+				}
+			} catch (RepositoryException e) {
+				throw new ArgeoException("Cannot process "
+						+ getJcrExecutionProcess().getNodePath(), e);
+			} finally {
+				JcrUtils.logoutQuietly(session);
+			}
+		else
+			super.process();
+	}
 
-			execute(realizedFlow, true);
-		}
+	protected void setFlowStatus(Node realizedFlowNode, String status)
+			throws RepositoryException {
+		realizedFlowNode.setProperty(SLC_STATUS, status);
+		realizedFlowNode.getSession().save();
 	}
 
-	protected Node getNode() {
-		return ((JcrExecutionProcess) getProcess()).getNode();
+	protected JcrExecutionProcess getJcrExecutionProcess() {
+		return (JcrExecutionProcess) getProcess();
 	}
 }