+/*
+ * 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;
+ executionName);
// Execute
- if (SLC_WITH_REFRESH.equals(slcCommand))
- modulesManager.updateAndExecute(lastLaunch);
- else if (SLC_NO_REFRESH.equals(slcCommand))
+ 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);
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();
- }
-
- }
}