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=7ac259910114d4ffafd31fc01a5235bbc7d1c006;hb=74904a755b5b344238eafa798419b80c5e74f7ed;hp=ab30014f9de8338d65808546f37cf9da882d6895;hpb=65b258f2b5e46acb8325d3b8f471a9f8361132d1;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 ab30014f9..7ac259910 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,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 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.
+ */
 package org.argeo.slc.equinox;
 
 import org.apache.commons.logging.Log;
@@ -5,10 +20,10 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 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;
 
+@SuppressWarnings("restriction")
 public class ExecutionCommandProvider implements CommandProvider {
 	private final static Log log = LogFactory
 			.getLog(ExecutionCommandProvider.class);
@@ -57,9 +72,10 @@ public class ExecutionCommandProvider implements 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);
@@ -82,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();
-		}
-
-	}
 }