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=56bcc3c4f21c6cd3cd541aaf88f25d45350134b2;hpb=9c82ed02a7ee7b4a757853d8160587b27e493f1a;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 56bcc3c4f..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,27 +20,36 @@ 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;
-import org.springframework.beans.factory.InitializingBean;
 
-public class ExecutionCommandProvider implements CommandProvider,
-		InitializingBean {
+@SuppressWarnings("restriction")
+public class ExecutionCommandProvider implements CommandProvider {
 	private final static Log log = LogFactory
 			.getLog(ExecutionCommandProvider.class);
 
+	private final static String SLC_WITH_REFRESH = "slc";
+	private final static String SLC_NO_REFRESH = "slcnr";
+
 	private OsgiExecutionModulesManager modulesManager;
 
 	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 (lastLaunch != null) {
-				String cmd = "slc " + lastLaunch.getModuleName() + " "
-						+ lastLaunch.getFlowDescriptor().getName();
+				String cmd = slcCommand + " " + lastLaunch.getModuleName()
+						+ " " + lastLaunch.getFlowDescriptor().getName();
 				if (log.isDebugEnabled())
 					log.debug("Execute again last command: " + cmd);
 				return ci.execute(cmd);
@@ -36,25 +60,36 @@ public class ExecutionCommandProvider implements CommandProvider,
 		}
 		String executionName = ci.nextArgument();
 
-		launch(firstArg, executionName);
+		launch(slcCommand, firstArg, executionName);
 		return "COMMAND COMPLETED";
 	}
 
-	protected void launch(String firstArg, String 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);
 
-		modulesManager.updateAndExecute(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 (<id>|<segment of bsn>) <execution bean>  - execute an execution flow (without arg, execute last)\n");
+				.append("\tslc (<id>|<segment of bsn>) <execution bean>"
+						+ "  - refresh the bundle, execute an execution flow (without arg, execute last)\n");
+		buf
+				.append("\tslcnr (<id>|<segment of bsn>) <execution bean>"
+						+ "  - execute an execution flow (without arg, execute last)\n");
 		return buf.toString();
 
 	}
@@ -63,31 +98,4 @@ public class ExecutionCommandProvider implements CommandProvider,
 		this.modulesManager = osgiModulesManager;
 	}
 
-	public void afterPropertiesSet() 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(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();
-		}
-
-	}
 }