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=8b9378e17267856d7a1a83269775a4f1cc950d1c;hb=c092f2c4564f7238f2960bc005c5a2202732f44e;hp=3c6912b2187019de8c160f7970c0af9d7976d56f;hpb=e7ddf0b3a271a2f22108ee5b9fba69888f5c78ec;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 3c6912b21..8b9378e17 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 @@ -3,49 +3,39 @@ 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.BundlesManager; -import org.argeo.slc.osgi.OsgiExecutionLauncher; +import org.argeo.slc.osgi.OsgiExecutionModulesManager; +import org.argeo.slc.process.RealizedFlow; import org.eclipse.core.runtime.adaptor.EclipseStarter; -import org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; -import org.eclipse.osgi.framework.launcher.Launcher; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.ApplicationContext; -import org.springframework.osgi.context.BundleContextAware; - -public class ExecutionCommandProvider implements CommandProvider, - InitializingBean { + +@SuppressWarnings("restriction") +public class ExecutionCommandProvider implements CommandProvider { private final static Log log = LogFactory .getLog(ExecutionCommandProvider.class); - // private BundleContext bundleContext; - // private BundlesManager bundlesManager; + private final static String SLC_WITH_REFRESH = "slc"; + private final static String SLC_NO_REFRESH = "slcnr"; - private OsgiExecutionLauncher executionLauncher; + private OsgiExecutionModulesManager modulesManager; - private OsgiExecutionLauncher.Launch lastLaunch = null; + private RealizedFlow lastLaunch = null; - // private String lastModuleName = null; - // private String lastExecutionName = null; + public Object _slc(CommandInterpreter ci) { + return exec(SLC_WITH_REFRESH, ci); + } - /** @deprecated Use slc command instead. */ - public Object _slc_exec(CommandInterpreter ci) { - return _slc(ci); + public Object _slcnr(CommandInterpreter ci) { + return exec(SLC_NO_REFRESH, ci); } - public Object _slc(CommandInterpreter ci) { + protected Object exec(String slcCommand, CommandInterpreter ci) { // TODO: check version String firstArg = ci.nextArgument(); if (firstArg == null) { if (lastLaunch != null) { - String cmd = "slc " + lastLaunch.getModuleName() + " " - + lastLaunch.getExecutionName(); + String cmd = slcCommand + " " + lastLaunch.getModuleName() + + " " + lastLaunch.getFlowDescriptor().getName(); if (log.isDebugEnabled()) log.debug("Execute again last command: " + cmd); return ci.execute(cmd); @@ -56,86 +46,45 @@ public class ExecutionCommandProvider implements CommandProvider, } String executionName = ci.nextArgument(); - launch(firstArg, executionName); - /* - * String moduleName = null; - * - * // First check whether we have a bundleId Long bundleId = null; try { - * bundleId = Long.parseLong(firstArg); } catch (NumberFormatException - * e) { // silent } - * - * // Look for bundle names containing pattern Bundle bundle = null; if - * (bundleId != null) { bundle = bundleContext.getBundle(bundleId); } - * else { for (Bundle b : bundleContext.getBundles()) { if - * (b.getSymbolicName().contains(firstArg)) { bundle = b; break; } } } - * - * if (bundle != null) { moduleName = bundle.getSymbolicName(); - * lastModuleName = moduleName; lastExecutionName = executionName; } - * else { log - * .warn("Could not find any execution module matching these requirements." - * ); return null; } - * - * // Find module ExecutionModule module = null; ServiceReference - * serviceRef = null; try { bundlesManager.stopSynchronous(bundle); - * bundlesManager.updateSynchronous(bundle); // Refresh in case there - * are fragments bundlesManager.refreshSynchronous(bundle); - * bundlesManager.startSynchronous(bundle); - * - * String filter = "(Bundle-SymbolicName=" + moduleName + ")"; // Wait - * for application context to be ready - * bundlesManager.getServiceRefSynchronous(ApplicationContext.class - * .getName(), filter); - * - * if (log.isDebugEnabled()) log.debug("Bundle " + - * bundle.getSymbolicName() + " ready to be used at latest version."); - * - * ServiceReference[] sfs = bundlesManager.getServiceRefSynchronous( - * ExecutionModule.class.getName(), filter); - * - * if (sfs.length > 1) log - * .warn("More than one execution module service found in module " + - * moduleName); - * - * if (sfs.length > 0) { serviceRef = sfs[0]; module = (ExecutionModule) - * bundleContext.getService(serviceRef); } - * - * if (module != null) { ExecutionFlowDescriptor descriptor = new - * ExecutionFlowDescriptor(); descriptor.setName(executionName); - * module.execute(descriptor); log.info("Executed " + executionName + - * " from " + moduleName); } - * - * } catch (Exception e) { throw new - * SlcException("Cannot find or update module.", e); } finally { if - * (serviceRef != null) bundleContext.ungetService(serviceRef); } - */ - + launch(slcCommand, firstArg, executionName); return "COMMAND COMPLETED"; } - protected void launch(String firstArg, String executionName) { - lastLaunch = executionLauncher.findLaunch(firstArg, executionName); + 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); - executionLauncher.launch(lastLaunch); - + // 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 an execution flow (without arg, execute last)\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 setExecutionLauncher(OsgiExecutionLauncher launcher) { - this.executionLauncher = launcher; + public void setModulesManager(OsgiExecutionModulesManager osgiModulesManager) { + this.modulesManager = osgiModulesManager; } - public void afterPropertiesSet() throws Exception { + public void init() throws Exception { final String module = System.getProperty("slc.launch.module"); final String executionName = System.getProperty("slc.launch.execution"); if (module != null) { @@ -144,7 +93,7 @@ public class ExecutionCommandProvider implements CommandProvider, @Override public void run() { try { - launch(module, executionName); + 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) { @@ -162,13 +111,4 @@ public class ExecutionCommandProvider implements CommandProvider, } } - - // public void setBundleContext(BundleContext bundleContext) { - // this.bundleContext = bundleContext; - // } - - // public void setBundlesManager(BundlesManager bundlesManager) { - // this.bundlesManager = bundlesManager; - // } - }