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=ce9aa1da391f9cd425f9540be0d43714dc57ce88;hb=99acd32f30678d05eaacc6c5db41d6134d9ce6f9;hp=de023cefa1ed1f3b42e829a003bb8655125e9959;hpb=86c47402780f41526382267ff1597d2f3a0d0dd7;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 de023cefa..ce9aa1da3 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
@@ -13,10 +13,10 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.DefaultExecutionSpec;
 import org.argeo.slc.core.execution.PrimitiveSpecAttribute;
 import org.argeo.slc.core.execution.PrimitiveUtils;
-import org.argeo.slc.core.execution.PrimitiveValue;
 import org.argeo.slc.core.execution.ProcessThread;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionModulesManager;
+import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.jcr.SlcJcrUtils;
 import org.argeo.slc.jcr.SlcNames;
@@ -26,19 +26,47 @@ 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);
 	}
 
 	@Override
-	protected void process() {
+	protected void process() throws InterruptedException {
 		try {
-			Node realizedFlowNode = getNode().getNode(SLC_FLOW);
+			Node rootRealizedFlowNode = getNode().getNode(SLC_FLOW);
 			// we just manage one level for the time being
-			NodeIterator nit = realizedFlowNode.getNodes(SLC_FLOW);
+			NodeIterator nit = rootRealizedFlowNode.getNodes(SLC_FLOW);
 			while (nit.hasNext()) {
-				process(nit.nextNode());
+				Node realizedFlowNode = nit.nextNode();
+
+				// set status on realized flow
+				realizedFlowNode.setProperty(SLC_STATUS,
+						ExecutionProcess.RUNNING);
+				realizedFlowNode.getSession().save();
+				try {
+					execute(realizedFlowNode);
+
+					// set status on realized flow
+					realizedFlowNode.setProperty(SLC_STATUS,
+							ExecutionProcess.COMPLETED);
+					realizedFlowNode.getSession().save();
+				} catch (RepositoryException e) {
+					throw e;
+				} catch (InterruptedException e) {
+					// set status on realized flow
+					realizedFlowNode.setProperty(SLC_STATUS,
+							ExecutionProcess.KILLED);
+					realizedFlowNode.getSession().save();
+					throw e;
+				} catch (RuntimeException e) {
+					// set status on realized flow
+					realizedFlowNode.setProperty(SLC_STATUS,
+							ExecutionProcess.ERROR);
+					realizedFlowNode.getSession().save();
+					throw e;
+				}
 			}
 		} catch (RepositoryException e) {
 			throw new ArgeoException("Cannot process " + getNode(), e);
@@ -46,7 +74,8 @@ public class JcrProcessThread extends ProcessThread implements SlcNames {
 	}
 
 	/** Configure the realized flows */
-	protected void process(Node realizedFlowNode) throws RepositoryException {
+	protected void execute(Node realizedFlowNode) throws RepositoryException,
+			InterruptedException {
 		if (realizedFlowNode.hasNode(SLC_ADDRESS)) {
 			String flowPath = realizedFlowNode.getNode(SLC_ADDRESS)
 					.getProperty(Property.JCR_PATH).getString();
@@ -64,6 +93,7 @@ public class JcrProcessThread extends ProcessThread implements SlcNames {
 			realizedFlow.setModuleName(executionModuleName);
 			realizedFlow.setModuleVersion(executionModuleVersion);
 
+			// retrieve execution spec
 			DefaultExecutionSpec executionSpec = null;
 			if (flowNode.hasProperty(SlcNames.SLC_SPEC)) {
 				Node executionSpecNode = flowNode.getProperty(SLC_SPEC)
@@ -78,18 +108,33 @@ public class JcrProcessThread extends ProcessThread implements SlcNames {
 			Map<String, ExecutionSpecAttribute> attrs = readExecutionSpecAttributes(realizedFlowNode);
 			Map<String, Object> values = new HashMap<String, Object>();
 			for (String attrName : attrs.keySet()) {
-				ExecutionSpecAttribute attr = attrs.get(attrName);
-				Object value = attr.getValue();
-				values.put(attrName,value);
+//				if (flowNode.hasNode(attrName)) {
+//					// we assume this is a primitive
+//					// since ref are not yet implemented
+//					Node valueNode = flowNode.getNode(attrName);
+//					String type = valueNode.getProperty(SLC_TYPE).getString();
+//					String valueStr = valueNode.getProperty(SLC_VALUE)
+//							.getString();
+//					Object value = PrimitiveUtils.convert(type, valueStr);
+//					values.put(attrName, value);
+//				} else {
+					ExecutionSpecAttribute attr = attrs.get(attrName);
+					Object value = attr.getValue();
+					values.put(attrName, value);
+//				}
 			}
-			
-//			if(executionSpec!=null)
-//				executionSpec.setAttributes(attrs);
+
+			// if(executionSpec!=null)
+			// executionSpec.setAttributes(attrs);
 			ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(flowName,
 					values, executionSpec);
 			realizedFlow.setFlowDescriptor(efd);
 
+			//
+			// EXECUTE THE FLOW
+			//
 			execute(realizedFlow, true);
+			//
 		}
 	}
 
@@ -103,14 +148,15 @@ public class JcrProcessThread extends ProcessThread implements SlcNames {
 						.isNodeType(SlcTypes.SLC_PRIMITIVE_SPEC_ATTRIBUTE)) {
 					String type = specAttrNode.getProperty(SLC_TYPE)
 							.getString();
+					Object value = null;
 					if (specAttrNode.hasProperty(SLC_VALUE)) {
 						String valueStr = specAttrNode.getProperty(SLC_VALUE)
 								.getString();
-						Object value = PrimitiveUtils.convert(type, valueStr);
-						PrimitiveSpecAttribute specAttr = new PrimitiveSpecAttribute(
-								type, value);
-						attrs.put(specAttrNode.getName(), specAttr);
+						value = PrimitiveUtils.convert(type, valueStr);
 					}
+					PrimitiveSpecAttribute specAttr = new PrimitiveSpecAttribute(
+							type, value);
+					attrs.put(specAttrNode.getName(), specAttr);
 				}
 
 			}