X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultAgentCli.java;h=c902ad3a37c4fef3a0808753571df77d7578e7fa;hb=4216976fae84a1b9a7a7c83111b9dd95c7825cf9;hp=823207e87193e0c342b85ba6fc081e0d2d2ba752;hpb=a17824ea2422474f25e2ea0eeae310f4dd9e6361;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultAgentCli.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultAgentCli.java
index 823207e87..c902ad3a3 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultAgentCli.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultAgentCli.java
@@ -7,15 +7,27 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.security.OsAuthenticationToken;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.execution.ExecutionFlowDescriptor;
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
+import org.argeo.slc.execution.ExecutionSpec;
+import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.execution.SlcAgent;
 import org.argeo.slc.execution.SlcAgentCli;
 import org.springframework.security.Authentication;
 import org.springframework.security.AuthenticationManager;
 import org.springframework.security.context.SecurityContextHolder;
 
+/**
+ * Authenticates thread and executes synchronously a command line execution.
+ * Reference implementation of args to URIs algorithm.
+ */
 public class DefaultAgentCli implements SlcAgentCli {
+	private final static Log log = LogFactory.getLog(DefaultAgentCli.class);
+
 	private final static String UTF8 = "UTF-8";
 	private SlcAgent agent;
 	private AuthenticationManager authenticationManager;
@@ -23,14 +35,25 @@ public class DefaultAgentCli implements SlcAgentCli {
 	private Long timeout = 24 * 60 * 60 * 1000l;
 
 	public String process(String[] args) {
-		OsAuthenticationToken oat = new OsAuthenticationToken();
-		Authentication authentication = authenticationManager.authenticate(oat);
-		SecurityContextHolder.getContext().setAuthentication(authentication);
+		if (SecurityContextHolder.getContext().getAuthentication() == null) {
+			OsAuthenticationToken oat = new OsAuthenticationToken();
+			Authentication authentication = authenticationManager
+					.authenticate(oat);
+			SecurityContextHolder.getContext()
+					.setAuthentication(authentication);
+		}
 
-		List<URI> uris = asURIs(args);
-		String processUuid = agent.process(uris);
-		agent.waitFor(processUuid, timeout);
-		return processUuid;
+		if (args.length > 0 && args[0].equals("help")) {
+			StringBuilder buf = new StringBuilder();
+			help(args, buf);
+			log.info(buf);
+			return buf.toString();
+		} else {
+			List<URI> uris = asURIs(args);
+			String processUuid = agent.process(uris);
+			agent.waitFor(processUuid, timeout);
+			return processUuid;
+		}
 	}
 
 	public static List<URI> asURIs(String[] args) {
@@ -103,6 +126,83 @@ public class DefaultAgentCli implements SlcAgentCli {
 		}
 	}
 
+	protected void help(String[] rawArgs, StringBuilder buf) {
+		String[] args = Arrays.copyOfRange(rawArgs, 1, rawArgs.length);
+		List<URI> uris = asURIs(args);
+		uris: for (URI uri : uris) {
+			String[] path = uri.getPath().split("/");
+			if (path.length < 2) {
+				for (ExecutionModuleDescriptor emd : agent
+						.listExecutionModuleDescriptors()) {
+					buf.append(
+							"# Execution Module " + emd.getName() + " v"
+									+ emd.getVersion()).append('\n');
+					if (emd.getDescription() != null
+							&& !emd.getDescription().trim().equals(""))
+						buf.append(emd.getDescription()).append('\n');
+				}
+				continue uris;
+			}
+
+			String moduleName = path[1];
+			// TODO process version
+			String moduleVersion = null;
+
+			ExecutionModuleDescriptor emd = agent.getExecutionModuleDescriptor(
+					moduleName, moduleVersion);
+
+			if (path.length >= 2) {
+				StringBuilder flow = new StringBuilder();
+				for (int i = 2; i < path.length; i++)
+					flow.append('/').append(path[i]);
+				String flowPath = flow.toString();
+				ExecutionFlowDescriptor flowDescriptor = null;
+				for (ExecutionFlowDescriptor efd : emd.getExecutionFlows()) {
+					if (efd.getName().equals(flowPath)) {
+						flowDescriptor = efd;
+						break;
+					}
+				}
+				if (flowDescriptor == null)
+					throw new SlcException("Flow " + uri + " not found");
+
+				buf.append(
+						"# Execution Module " + emd.getName() + " v"
+								+ emd.getVersion()).append('\n');
+				buf.append(" Flow ").append(flowDescriptor.getName());
+				if (flowDescriptor.getDescription() != null
+						&& !flowDescriptor.getDescription().trim().equals(""))
+					buf.append(" ").append(flowDescriptor.getDescription());
+				buf.append('\n');
+				ExecutionSpec spec = flowDescriptor.getExecutionSpec();
+				for (String attrKey : spec.getAttributes().keySet()) {
+					ExecutionSpecAttribute esa = spec.getAttributes().get(
+							attrKey);
+					buf.append("  --").append(attrKey);
+					// TODO check values in query part
+					if (esa.getValue() != null)
+						buf.append(" ").append(esa.getValue());
+					buf.append('\n');
+				}
+			} else {
+				// module only
+				buf.append(
+						"# Execution Module " + emd.getName() + " v"
+								+ emd.getVersion()).append('\n');
+				if (emd.getDescription() != null
+						&& !emd.getDescription().trim().equals(""))
+					buf.append(emd.getDescription()).append('\n');
+				for (ExecutionFlowDescriptor efd : emd.getExecutionFlows()) {
+					buf.append(" ").append(efd.getName());
+					if (efd.getDescription() != null
+							&& !efd.getDescription().trim().equals(""))
+						buf.append(" ").append(efd.getDescription());
+				}
+				buf.append('\n');
+			}
+		}
+	}
+
 	public void setAgent(SlcAgent agent) {
 		this.agent = agent;
 	}