X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.equinox%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fequinox%2FExecutionCommandProvider.java;h=bf32d16d5bda934d934de2f40fac2e94b53ea755;hb=58e0e18d64a2080680a9f8397b0dfa2894519910;hp=a63708286ce9bad66d75d4bab8b7679c5a49fecd;hpb=6c05406b172b751251acca37f37e2bb3a62ff03f;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
index a63708286..bf32d16d5 100644
--- a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
+++ b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
@@ -1,46 +1,101 @@
+/*
+ * 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.equinox;
 
-import java.util.List;
-
-import org.argeo.slc.execution.ExecutionFlowDescriptor;
-import org.argeo.slc.execution.ExecutionModule;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.SlcException;
+import org.argeo.slc.execution.RealizedFlow;
+import org.argeo.slc.osgi.OsgiExecutionModulesManager;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 
+@SuppressWarnings("restriction")
 public class ExecutionCommandProvider implements CommandProvider {
-	private List<ExecutionModule> executionModules;
+	private final static Log log = LogFactory
+			.getLog(ExecutionCommandProvider.class);
 
-	public Object _slc_execute(CommandInterpreter ci) {
-		String moduleName = ci.nextArgument();
-		String executionName = ci.nextArgument();
-		
-		ExecutionModule module = null;
-		for (ExecutionModule moduleT : executionModules) {
-			if(moduleT.getName().equals(moduleName)){
-				// TODO: check version
-				module = moduleT;
-				break;
+	private final static String SLC_WITH_REFRESH = "slc";
+	private final static String SLC_NO_REFRESH = "slcnr";
+
+	private OsgiExecutionModulesManager modulesManager;
+
+	private RealizedFlow lastLaunch = null;
+
+	public Object _slc(CommandInterpreter ci) {
+		return exec(SLC_WITH_REFRESH, ci);
+	}
+
+	public Object _slcnr(CommandInterpreter ci) {
+		return exec(SLC_NO_REFRESH, ci);
+	}
+
+	protected Object exec(String slcCommand, CommandInterpreter ci) {
+		// TODO: check version
+		String firstArg = ci.nextArgument();
+		if (firstArg == null) {
+			if (lastLaunch != null) {
+				String cmd = slcCommand + " " + lastLaunch.getModuleName()
+						+ " " + lastLaunch.getFlowDescriptor().getName();
+				if (log.isDebugEnabled())
+					log.debug("Execute again last command: " + cmd);
+				return ci.execute(cmd);
+			} else {
+				ci.execute("help");
+				throw new SlcException("Command not properly formatted");
 			}
 		}
+		String executionName = ci.nextArgument();
+
+		launch(slcCommand, firstArg, executionName);
+		return "COMMAND COMPLETED";
+	}
+
+	protected void launch(String slcCommand, String firstArg,
+			String executionName) {
+		lastLaunch = modulesManager.findRealizedFlow(firstArg, executionName);
+		if (lastLaunch == null)
+			throw new SlcException("Cannot find launch for " + firstArg + " "
+					+ executionName);
 
-		ExecutionFlowDescriptor descriptor = new ExecutionFlowDescriptor();
-		descriptor.setName(executionName);
-		if(module!=null)
-			module.execute(descriptor);
-		
-		return null;
+		// Execute
+		if (SLC_WITH_REFRESH.equals(slcCommand)) {
+			modulesManager.upgrade(lastLaunch.getModuleNameVersion());
+			modulesManager.execute(lastLaunch);
+		} else if (SLC_NO_REFRESH.equals(slcCommand))
+			modulesManager.execute(lastLaunch);
+		else
+			throw new SlcException("Unrecognized SLC command " + slcCommand);
 	}
 
 	public String getHelp() {
 		StringBuffer buf = new StringBuffer();
 		buf.append("---SLC Execution Commands---\n");
-		buf.append("\tslc_execute - Execute an execution flow\n");
+		buf
+				.append("\tslc (<id>|<segment of bsn>) <execution bean>"
+						+ "  - refresh the bundle, execute an execution flow (without arg, execute last)\n");
+		buf
+				.append("\tslcnr (<id>|<segment of bsn>) <execution bean>"
+						+ "  - execute an execution flow (without arg, execute last)\n");
 		return buf.toString();
 
 	}
 
-	public void setExecutionModules(List<ExecutionModule> executionModules) {
-		this.executionModules = executionModules;
+	public void setModulesManager(OsgiExecutionModulesManager osgiModulesManager) {
+		this.modulesManager = osgiModulesManager;
 	}
 
 }