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=8b9378e17267856d7a1a83269775a4f1cc950d1c;hpb=c092f2c4564f7238f2960bc005c5a2202732f44e;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 8b9378e17..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,11 +1,25 @@ +/* + * 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.RealizedFlow; 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; @@ -84,31 +98,4 @@ public class ExecutionCommandProvider implements CommandProvider { this.modulesManager = osgiModulesManager; } - 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(); - } - - } }