From: Mathieu Baudier Date: Sat, 27 Oct 2012 12:40:55 +0000 (+0000) Subject: Move ReailizedFlow to execution package X-Git-Tag: argeo-slc-2.1.7~577 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=645840383404d5962ca2af85c2020c3d66219518;p=gpl%2Fargeo-slc.git Move ReailizedFlow to execution package git-svn-id: https://svn.argeo.org/slc/trunk@5670 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml b/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml index 873f6f242..027f184d9 100644 --- a/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml +++ b/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - + + + + + + diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RunSlcFlow.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RunSlcFlow.java index 4ae7f97e6..5f783a7a2 100644 --- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RunSlcFlow.java +++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/RunSlcFlow.java @@ -22,7 +22,7 @@ import java.util.Map; import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionModulesManager; -import org.argeo.slc.process.RealizedFlow; +import org.argeo.slc.execution.RealizedFlow; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ExecutionEvent; diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java index c4832dbc4..98e5c5be2 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/AbstractExecutionModulesManager.java @@ -31,7 +31,7 @@ import org.argeo.slc.execution.ExecutionModulesManager; import org.argeo.slc.execution.ExecutionProcess; import org.argeo.slc.execution.ExecutionProcessNotifier; import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.process.RealizedFlow; +import org.argeo.slc.execution.RealizedFlow; import org.argeo.slc.process.SlcExecutionNotifier; /** Provides the base feature of an execution module manager. */ diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java index 48e4ce56d..190481b71 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionThread.java @@ -20,7 +20,7 @@ import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.process.RealizedFlow; +import org.argeo.slc.execution.RealizedFlow; import org.springframework.security.Authentication; import org.springframework.security.context.SecurityContextHolder; diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java index 428cfd178..a53ff7d48 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThread.java @@ -27,7 +27,7 @@ import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionModulesManager; import org.argeo.slc.execution.ExecutionProcess; import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.process.RealizedFlow; +import org.argeo.slc.execution.RealizedFlow; import org.argeo.slc.process.SlcExecution; import org.springframework.security.Authentication; import org.springframework.security.context.SecurityContextHolder; diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java index 2df18bf24..8c63c9bb8 100644 --- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java +++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java @@ -15,7 +15,9 @@ */ package org.argeo.slc.cli; +import java.io.File; import java.io.FileInputStream; +import java.util.List; import java.util.Properties; import org.apache.commons.cli.CommandLine; @@ -27,7 +29,13 @@ import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.io.IOUtils; +import org.argeo.osgi.boot.OsgiBoot; import org.argeo.slc.SlcException; +import org.argeo.slc.execution.ExecutionModulesManager; +import org.eclipse.core.runtime.adaptor.EclipseStarter; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; @SuppressWarnings("static-access") public class SlcMain { @@ -74,71 +82,154 @@ public class SlcMain { private final static String commandName = "slc"; + private static String bundlesToInstall = "/usr/share/osgi;in=*.jar"; + + private static String bundlesToStart = "org.springframework.osgi.extender," + + "org.argeo.node.repofactory.jackrabbit," + + "org.argeo.node.repo.jackrabbit," + "org.argeo.security.dao.os," + + "org.argeo.slc.node.jackrabbit," + "org.argeo.slc.agent," + + "org.argeo.slc.agent.jcr"; + static { options = new Options(); - options.addOption(typeOpt); - options.addOption(moduleOpt); - options.addOption(flowsOpt); - options.addOption(propertyOpt); - options.addOption(propertiesOpt); - options.addOption(runtimeOpt); + // options.addOption(typeOpt); + // options.addOption(moduleOpt); + // options.addOption(flowsOpt); + // options.addOption(propertyOpt); + // options.addOption(propertiesOpt); + // options.addOption(runtimeOpt); } public static void main(String[] args) { - Type type = null; - Properties properties = new Properties(); + // Type type = null; + // Properties properties = new Properties(); + // String flows = null; + // String urlStr = null; + String module = null; - String flows = null; - String urlStr = null; + String moduleUrl = null; + String flow = null; try { CommandLineParser clParser = new GnuParser(); CommandLine cl = clParser.parse(options, args); - // Mode - String typeStr = cl.getOptionValue(typeOpt.getOpt()); - if (typeStr == null) { - type = Type.standalone; + List arguments = cl.getArgList(); + if (arguments.size() == 0) { + // TODO default behaviour } else { - try { - type = Type.valueOf(typeStr); - } catch (IllegalArgumentException e) { - throw new SlcException("Unrecognized mode '" + typeStr - + "'", e); + module = arguments.get(0); + File moduleFile = new File(module); + if (moduleFile.exists()) { + if (moduleFile.isDirectory()) { + moduleUrl = "reference:file:" + + moduleFile.getCanonicalPath(); + } else { + moduleUrl = "file:" + moduleFile.getCanonicalPath(); + } } - } - // Script - if (type.equals(Type.standalone)) { - if (!cl.hasOption(moduleOpt.getOpt())) - throw new SlcException("Type " + Type.standalone - + " requires option '" + moduleOpt.getLongOpt() - + "'"); - module = cl.getOptionValue(moduleOpt.getOpt()); - - // Targets - if (cl.hasOption(flowsOpt.getOpt())) - flows = cl.getOptionValue(flowsOpt.getOpt()); - } - - // Properties - if (cl.hasOption(propertiesOpt.getOpt())) { - for (String propertyFile : cl.getOptionValues(propertiesOpt - .getOpt())) { - loadPropertyFile(properties, propertyFile); + if (arguments.size() == 1) { + // TODO module info + } else { + flow = arguments.get(1); } } - if (cl.hasOption(propertyOpt.getOpt())) { - for (String property : cl.getOptionValues(propertyOpt.getOpt())) { - addProperty(properties, property); - } + + // System.setProperty( + // ExecutionModulesManager.UNIQUE_LAUNCH_MODULE_PROPERTY, + // module); + // System.setProperty( + // ExecutionModulesManager.UNIQUE_LAUNCH_FLOW_PROPERTY, flow); + + String executionDir = System.getProperty("user.dir"); + File slcDir = new File(executionDir, ".slc"); + File dataDir = new File(slcDir, "data"); + if (!dataDir.exists()) + dataDir.mkdirs(); + File confDir = new File(slcDir, "conf"); + if (!confDir.exists()) + confDir.mkdirs(); + + BundleContext bundleContext = null; + try { + String[] osgiRuntimeArgs = { "-configuration", + confDir.getCanonicalPath(), "-data", + dataDir.getCanonicalPath(), "-console", "-clean" }; + bundleContext = EclipseStarter.startup(osgiRuntimeArgs, null); + } catch (Exception e) { + throw new RuntimeException("Cannot start Equinox.", e); } - // Runtime - if (cl.hasOption(runtimeOpt.getOpt())) { - urlStr = cl.getOptionValue(runtimeOpt.getOpt()); + // OSGi bootstrap + OsgiBoot osgiBoot = new OsgiBoot(bundleContext); + osgiBoot.installUrls(osgiBoot.getBundlesUrls(bundlesToInstall)); + osgiBoot.startBundles(bundlesToStart); + + if (moduleUrl != null) { + Bundle bundle = osgiBoot.installUrl(moduleUrl); + module = bundle.getSymbolicName(); + // TODO deal with version } + + // retrieve modulesManager + ServiceReference sr = bundleContext + .getServiceReference(ExecutionModulesManager.class + .getName()); + ExecutionModulesManager modulesManager = (ExecutionModulesManager) bundleContext + .getService(sr); + + + modulesManager.execute(null); + + // osgiBoot.bootstrap(); + // osgiBoot.bootstrap(); + + // Mode + // String typeStr = cl.getOptionValue(typeOpt.getOpt()); + // if (typeStr == null) { + // type = Type.standalone; + // } else { + // try { + // type = Type.valueOf(typeStr); + // } catch (IllegalArgumentException e) { + // throw new SlcException("Unrecognized mode '" + typeStr + // + "'", e); + // } + // } + // + // // Script + // if (type.equals(Type.standalone)) { + // if (!cl.hasOption(moduleOpt.getOpt())) + // throw new SlcException("Type " + Type.standalone + // + " requires option '" + moduleOpt.getLongOpt() + // + "'"); + // module = cl.getOptionValue(moduleOpt.getOpt()); + // + // // Targets + // if (cl.hasOption(flowsOpt.getOpt())) + // flows = cl.getOptionValue(flowsOpt.getOpt()); + // } + // + // // Properties + // if (cl.hasOption(propertiesOpt.getOpt())) { + // for (String propertyFile : cl.getOptionValues(propertiesOpt + // .getOpt())) { + // loadPropertyFile(properties, propertyFile); + // } + // } + // if (cl.hasOption(propertyOpt.getOpt())) { + // for (String property : cl.getOptionValues(propertyOpt.getOpt())) + // { + // addProperty(properties, property); + // } + // } + // + // // Runtime + // if (cl.hasOption(runtimeOpt.getOpt())) { + // urlStr = cl.getOptionValue(runtimeOpt.getOpt()); + // } } catch (ParseException e) { System.err.println("Problem with command line arguments. " + e.getMessage()); @@ -152,23 +243,23 @@ public class SlcMain { badExit(); } - if (debug) { - debug("Mode: " + type); - if (urlStr != null) - debug("Runtime: " + urlStr); - debug("User properties: " + properties); - if (module != null) - debug("Module: " + module); - if (flows != null) - debug("Flows: " + flows); - } - - // Standalone - if (type.equals(Type.standalone)) { - } - // Agent - else if (type.equals(Type.agent)) { - } + // if (debug) { + // debug("Mode: " + type); + // if (urlStr != null) + // debug("Runtime: " + urlStr); + // debug("User properties: " + properties); + // if (module != null) + // debug("Module: " + module); + // if (flows != null) + // debug("Flows: " + flows); + // } + // + // // Standalone + // if (type.equals(Type.standalone)) { + // } + // // Agent + // else if (type.equals(Type.agent)) { + // } } public static void printUsage() { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java index df298ed0a..cafd4d408 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java @@ -19,7 +19,6 @@ import java.util.List; import java.util.Map; import org.argeo.slc.deploy.ModulesManager; -import org.argeo.slc.process.RealizedFlow; /** Provides access to the execution modules */ public interface ExecutionModulesManager extends ModulesManager { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/RealizedFlow.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/RealizedFlow.java new file mode 100644 index 000000000..a2e33fa88 --- /dev/null +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/RealizedFlow.java @@ -0,0 +1,58 @@ +/* + * 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.execution; + +import java.io.Serializable; + +import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.NameVersion; + +/** A fully configured execution flow, ready to be executed. */ +public class RealizedFlow implements Serializable { + private static final long serialVersionUID = 1L; + + private String moduleName; + private String moduleVersion; + private ExecutionFlowDescriptor flowDescriptor; + + public String getModuleName() { + return moduleName; + } + + public void setModuleName(String moduleName) { + this.moduleName = moduleName; + } + + public NameVersion getModuleNameVersion() { + return new BasicNameVersion(getModuleName(), getModuleVersion()); + } + + public String getModuleVersion() { + return moduleVersion; + } + + public void setModuleVersion(String moduleVersion) { + this.moduleVersion = moduleVersion; + } + + public ExecutionFlowDescriptor getFlowDescriptor() { + return flowDescriptor; + } + + public void setFlowDescriptor(ExecutionFlowDescriptor flowDescriptor) { + this.flowDescriptor = flowDescriptor; + } +} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/RealizedFlow.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/RealizedFlow.java deleted file mode 100644 index 57bb79065..000000000 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/RealizedFlow.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.process; - -import java.io.Serializable; - -import org.argeo.slc.BasicNameVersion; -import org.argeo.slc.NameVersion; -import org.argeo.slc.execution.ExecutionFlowDescriptor; - -/** A fully configured execution flow, ready to be executed. */ -public class RealizedFlow implements Serializable { - private static final long serialVersionUID = 1L; - - private String moduleName; - private String moduleVersion; - private ExecutionFlowDescriptor flowDescriptor; - - public String getModuleName() { - return moduleName; - } - - public void setModuleName(String moduleName) { - this.moduleName = moduleName; - } - - public NameVersion getModuleNameVersion() { - return new BasicNameVersion(getModuleName(), getModuleVersion()); - } - - public String getModuleVersion() { - return moduleVersion; - } - - public void setModuleVersion(String moduleVersion) { - this.moduleVersion = moduleVersion; - } - - public ExecutionFlowDescriptor getFlowDescriptor() { - return flowDescriptor; - } - - public void setFlowDescriptor(ExecutionFlowDescriptor flowDescriptor) { - this.flowDescriptor = flowDescriptor; - } -} diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java index 703d8f839..2f19a78f4 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecution.java @@ -24,6 +24,7 @@ import java.util.TreeMap; import org.argeo.slc.execution.ExecutionProcess; import org.argeo.slc.execution.ExecutionStep; +import org.argeo.slc.execution.RealizedFlow; /** @deprecated use other implementations of {@link ExecutionProcess} */ public class SlcExecution implements ExecutionProcess, Serializable { diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionRelated.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionRelated.java index 05907fd68..9d6b7e1e4 100644 --- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionRelated.java +++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/process/SlcExecutionRelated.java @@ -15,6 +15,7 @@ */ package org.argeo.slc.process; +@Deprecated public interface SlcExecutionRelated { public String getSlcExecutionUuid(); 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 7ac259910..c9fe33122 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 @@ -18,8 +18,8 @@ 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.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; diff --git a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java index 4bc8c5e38..d86091700 100644 --- a/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java +++ b/runtime/org.argeo.slc.support.equinox/src/test/java/org/argeo/slc/osgi/test/HelloTest.java @@ -27,14 +27,13 @@ public class HelloTest extends AbstractOsgiRuntimeTestCase { } protected void installBundles() throws Exception { -// System.out.println("java.class.path=" -// + System.getProperty("java.class.path")); + // System.out.println("java.class.path=" + // + System.getProperty("java.class.path")); osgiBoot.installUrls(osgiBoot.getLocationsUrls( - OsgiBoot.DEFAULT_BASE_URL, System - .getProperty("java.class.path"))); - osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, - "src/test/bundles;in=*")); + OsgiBoot.DEFAULT_BASE_URL, + System.getProperty("java.class.path"))); + osgiBoot.installUrls(osgiBoot.getBundlesUrls("src/test/bundles;in=*")); // Map sysProps = new TreeMap(System.getProperties()); // for (String key : sysProps.keySet()) { diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java index 0fcca4504..545deba92 100644 --- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java +++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/execution/JcrProcessThread.java @@ -34,10 +34,10 @@ import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionModulesManager; import org.argeo.slc.execution.ExecutionProcess; import org.argeo.slc.execution.ExecutionSpecAttribute; +import org.argeo.slc.execution.RealizedFlow; import org.argeo.slc.jcr.SlcJcrUtils; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; -import org.argeo.slc.process.RealizedFlow; /** Where the actual execution takes place */ public class JcrProcessThread extends ProcessThread implements SlcNames { diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java index 420c7ad3d..920cbd0b2 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiBundle.java @@ -23,7 +23,7 @@ import org.argeo.slc.deploy.DeploymentData; import org.argeo.slc.deploy.Module; import org.argeo.slc.deploy.ModuleDescriptor; import org.argeo.slc.deploy.TargetData; -import org.argeo.slc.process.RealizedFlow; +import org.argeo.slc.execution.RealizedFlow; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; import org.springframework.core.io.Resource; diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java index 3df33cab8..bd38e6ca8 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java @@ -45,7 +45,7 @@ import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionFlowDescriptorConverter; import org.argeo.slc.execution.ExecutionModuleDescriptor; import org.argeo.slc.execution.ExecutionModulesListener; -import org.argeo.slc.process.RealizedFlow; +import org.argeo.slc.execution.RealizedFlow; import org.osgi.framework.Bundle; import org.osgi.framework.BundleEvent; import org.osgi.framework.BundleException; diff --git a/runtime/org.argeo.slc.support.osgi/src/main/resources/org/argeo/slc/osgi/manager.xml b/runtime/org.argeo.slc.support.osgi/src/main/resources/org/argeo/slc/osgi/manager.xml deleted file mode 100644 index f58d3efc1..000000000 --- a/runtime/org.argeo.slc.support.osgi/src/main/resources/org/argeo/slc/osgi/manager.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java index ea4910b6f..541840578 100644 --- a/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java +++ b/runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/unit/process/SlcExecutionTestUtils.java @@ -25,7 +25,7 @@ import java.util.UUID; import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.process.RealizedFlow; +import org.argeo.slc.execution.RealizedFlow; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.process.SlcExecutionStep; import org.argeo.slc.unit.execution.ExecutionFlowDescriptorTestUtils;