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=2a265bb9151789f7c3b7eea30efe888a8557fa05;hb=afb6d7b61d38bdb104414601d296070c893ece8c;hp=3a90807807225921eee47c728f3d25446e61712a;hpb=c83e59caa846134d0a2d5eff2485d994255c12cc;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 3a9080780..2a265bb91 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,109 +1,130 @@ -package org.argeo.slc.equinox; +/* + * Copyright (C) 2010 Mathieu Baudier + * + * 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. + */ -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +package org.argeo.slc.equinox; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; -import org.argeo.slc.execution.ExecutionFlowDescriptor; -import org.argeo.slc.execution.ExecutionModule; +import org.argeo.slc.osgi.OsgiExecutionModulesManager; +import org.argeo.slc.process.RealizedFlow; +import org.eclipse.core.runtime.adaptor.EclipseStarter; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.ServiceReference; -import org.springframework.osgi.context.BundleContextAware; - -public class ExecutionCommandProvider implements CommandProvider, - BundleContextAware { - private List executionModules; - private BundleContext bundleContext; - - public Object _slc_exec(CommandInterpreter ci) { - // TODO: check version - String firstArg = ci.nextArgument(); - String executionName = ci.nextArgument(); - String moduleName = null; - Long bundleId = null; - try { - bundleId = Long.parseLong(firstArg); - } catch (NumberFormatException e) { - // silent - } +@SuppressWarnings("restriction") +public class ExecutionCommandProvider implements CommandProvider { + private final static Log log = LogFactory + .getLog(ExecutionCommandProvider.class); - Bundle bundle = null; - if (bundleId != null) { - bundle = bundleContext.getBundle(bundleId); - } else { - for (Bundle b : bundleContext.getBundles()) { - if (b.getSymbolicName().contains(firstArg)) { - bundle = b; - break; - } - } - } + private final static String SLC_WITH_REFRESH = "slc"; + private final static String SLC_NO_REFRESH = "slcnr"; - if (bundle != null) { - moduleName = bundle.getSymbolicName(); -// try { -// bundle.stop(); -// bundle.update(); -// bundle.start(); -// -// // FIXME: potential infinite loop -// while (bundle.getState() == Bundle.STARTING) { -// try { -// Thread.sleep(500); -// } catch (InterruptedException e) { -// // silent -// } -// } -// } catch (BundleException e) { -// throw new SlcException( -// "Could not update the bundle for module " + moduleName, -// e); -// } - } + private OsgiExecutionModulesManager modulesManager; - // Find module - ExecutionModule module = null; - if (moduleName != null) { - for (Iterator it = executionModules.iterator(); it - .hasNext();) { - ExecutionModule moduleT = it.next(); - if (moduleT.getName().equals(moduleName)) { - module = moduleT; - break; - } + 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(); - if (module != null) { - ExecutionFlowDescriptor descriptor = new ExecutionFlowDescriptor(); - descriptor.setName(executionName); - module.execute(descriptor); - return "Executed " + executionName + " from " + moduleName; - } else - return "Could not find any execution module matching these requirements."; + 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); + + // 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_exec (|) - execute an execution flow\n"); + .append("\tslc (|) " + + " - refresh the bundle, execute an execution flow (without arg, execute last)\n"); + buf + .append("\tslcnr (|) " + + " - execute an execution flow (without arg, execute last)\n"); return buf.toString(); } - public void setExecutionModules(List executionModules) { - this.executionModules = executionModules; + public void setModulesManager(OsgiExecutionModulesManager osgiModulesManager) { + this.modulesManager = osgiModulesManager; } - public void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } + public void init() throws Exception { + final String module = System.getProperty("slc.launch.module"); + final String executionName = System.getProperty("slc.launch.execution"); + if (module != null) { + new Thread() { + + @Override + public void run() { + try { + launch(SLC_NO_REFRESH, module, executionName); + // in case of failure OSGi runtime stays up and last + // launch can be used to debug by calling 'slc' + } catch (Exception e) { + throw new SlcException("Error when executing " + + executionName + " on " + module, e); + } + try { + EclipseStarter.shutdown(); + } catch (Exception e) { + throw new SlcException("Cannot shutdown equinox.", e); + } + } + }.start(); + } + + } }