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=462e2901601a82766fae0fbe47291b91d0e513fd;hpb=7cfc96d546250d5ffde3ffac53199f95b99380ab;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 462e29016..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,41 +1,55 @@ +/* + * 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 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.execution.RealizedFlow; +import org.argeo.slc.osgi.OsgiExecutionModulesManager; 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.ServiceReference; -import org.springframework.context.ApplicationContext; -import org.springframework.osgi.context.BundleContextAware; -public class ExecutionCommandProvider implements CommandProvider, - BundleContextAware { +@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 String lastModuleName = null; - private String lastExecutionName = null; + private OsgiExecutionModulesManager modulesManager; - /** @deprecated Use slc command instead. */ - public Object _slc_exec(CommandInterpreter ci) { - return _slc(ci); - } + 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 (lastModuleName != null) { - String cmd = "slc " + lastModuleName + " " + lastExecutionName; + 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); @@ -46,103 +60,42 @@ public class ExecutionCommandProvider implements CommandProvider, } String executionName = ci.nextArgument(); - 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 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 (|) - 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 setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - - public void setBundlesManager(BundlesManager bundlesManager) { - this.bundlesManager = bundlesManager; + public void setModulesManager(OsgiExecutionModulesManager osgiModulesManager) { + this.modulesManager = osgiModulesManager; } }