import org.argeo.slc.execution.ExecutionSpec;
import org.argeo.slc.execution.ExecutionSpecAttribute;
import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.validation.MapBindingResult;
/** Default implementation of an execution flow. */
-public class DefaultExecutionFlow implements ExecutionFlow, BeanNameAware {
+public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
+ BeanNameAware {
private final static Log log = LogFactory
.getLog(DefaultExecutionFlow.class);
private Map<String, Object> parameters = new HashMap<String, Object>();
private List<Runnable> executables = new ArrayList<Runnable>();
+ private String path;
+
private Boolean failOnError = true;
public DefaultExecutionFlow() {
runnable.run();
}
+ public void afterPropertiesSet() throws Exception {
+ if (path == null) {
+ if (name.charAt(0) == '/') {
+ path = name.substring(0, name.lastIndexOf('/'));
+ }
+ }
+
+ if (path != null) {
+ for (Runnable executable : executables) {
+ if (executable instanceof DefaultExecutionFlow) {
+ // so we don't need to have DefaultExecutionFlow
+ // implementing StructureAware
+ // FIXME: probably has side effects
+ DefaultExecutionFlow flow = (DefaultExecutionFlow) executable;
+ String newPath = path + '/' + flow.getName();
+ flow.setPath(newPath);
+ log.warn(newPath + " was forcibly set on " + flow);
+ }
+ }
+ }
+ }
+
public void setBeanName(String name) {
this.name = name;
}
return name.hashCode();
}
- /** @deprecated does nothing */
- @Deprecated
+ public String getPath() {
+ return path;
+ }
+
public void setPath(String path) {
+ this.path = path;
}
public Boolean getFailOnError() {
md.getExecutionFlows().addAll(set);
}
+ @SuppressWarnings("deprecation")
public ExecutionFlowDescriptor getExecutionFlowDescriptor(
ExecutionFlow executionFlow) {
if (executionFlow.getName() == null)
ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(name, values,
executionSpec);
-// if (executionFlow.getPath() != null)
-// efd.setPath(executionFlow.getPath());
-// else
-// efd.setPath("");
+ if (executionFlow.getPath() != null)
+ efd.setPath(executionFlow.getPath());
+ else
+ efd.setPath("");
// Takes description from spring
BeanFactory bf = getBeanFactory();
mpv.addPropertyValue("runnableCalls", flowDescriptor.getRunnableCalls());\r
mpv.addPropertyValue("sharedContextValuesMap", new RuntimeBeanReference(contextValuesBeanName));\r
\r
- mpv.addPropertyValue("name", flowDescriptor.getPath() + "/" + beanName);\r
+ mpv.addPropertyValue("name", beanName);\r
+ mpv.addPropertyValue("path", flowDescriptor.getPath());\r
\r
mpv.addPropertyValue("executionContext", new RuntimeBeanReference(executionContextBeanName));\r
\r
AbstractSingleBeanDefinitionParser {
private Log log = LogFactory.getLog(FlowBeanDefinitionParser.class);
+ /** Whether the user has already be warned on path attribute usage. */
+ private Boolean warnedAboutPathAttribute = false;
+
@SuppressWarnings("unchecked")
@Override
protected void doParse(Element element, ParserContext parserContext,
BeanDefinitionBuilder builder) {
String path = element.getAttribute("path");
- if (StringUtils.hasText(path))
- log.warn("The 'path' attribute is not used anymore to build flows");
+ if (StringUtils.hasText(path)) {
+ builder.addPropertyValue("path", path);
+
+ // warns user only once
+ if (!warnedAboutPathAttribute)
+ log.warn("The path=\"\" attribute is deprecated"
+ + " and will be removed in a later release."
+ + " Use <flow:flow name=\"/my/path/flowName\">.");
+ warnedAboutPathAttribute = true;
+ }
String spec = element.getAttribute("spec");
if (StringUtils.hasText(spec))
* interpreted by UIs as a hierarchy;
*/
public String getName();
+
+ /**
+ * @deprecated will be removed in SLC 2.0, the path should be the part of
+ * the name with '/'
+ */
+ public String getPath();
}
String relativePath, ExecutionFlowDescriptor efd)
throws RepositoryException {
Node flowNode = null;
- // if (relativePath.startsWith("/"))
- // relativePath = relativePath.substring(1);
- // if (relativePath.endsWith("/"))
- // relativePath = relativePath.substring(0, relativePath.length() - 1);
-
Iterator<String> names = Arrays.asList(relativePath.split("/"))
.iterator();
// create intermediary paths
* UTILITIES
*/
/** @return the relative path, never starts with '/' */
+ @SuppressWarnings("deprecation")
protected String getExecutionFlowRelativePath(
ExecutionFlowDescriptor executionFlow) {
- String relativePath = executionFlow.getName();
+ String relativePath = executionFlow.getPath() == null ? executionFlow
+ .getName() : executionFlow.getPath() + '/'
+ + executionFlow.getName();
// we assume that it is more than one char long
if (relativePath.charAt(0) == '/')
relativePath = relativePath.substring(1);
}
}
+ @SuppressWarnings("deprecation")
protected ObjectName flowMBeanName(Module module,
ExecutionFlow executionFlow) {
String executionModulesPrefix = "SLCExecutionModules";
- // String path = executionFlow.getPath();
+ String path = executionFlow.getPath();
String name = executionFlow.getName();
- // if (path == null && name.indexOf('/') >= 0) {
- // path = name.substring(0, name.lastIndexOf('/'));
- // name = name.substring(name.lastIndexOf('/'));
- // }
+ if (path == null && name.indexOf('/') >= 0) {
+ path = name.substring(0, name.lastIndexOf('/'));
+ name = name.substring(name.lastIndexOf('/'));
+ }
StringBuffer buf = new StringBuffer(executionModulesPrefix + ":"
+ "module=" + module.getName() + " [" + module.getVersion()
+ "],");
- // if (path != null && !path.equals("")) {
- // int depth = 0;
- // for (String token : path.split("/")) {
- // if (!token.equals("")) {
- // buf.append("path").append(depth).append('=');
- // // in order to have directories first
- // buf.append('/');
- // buf.append(token).append(',');
- // depth++;
- // }
- // }
- // }
-
- // FIXME deal with /
-
+ if (path != null && !path.equals("")) {
+ int depth = 0;
+ for (String token : path.split("/")) {
+ if (!token.equals("")) {
+ buf.append("path").append(depth).append('=');
+ // in order to have directories first
+ buf.append('/');
+ buf.append(token).append(',');
+ depth++;
+ }
+ }
+ }
buf.append("name=").append(name);
try {
return new ObjectName(buf.toString());
projects / gpl / argeo-slc.git / commitdiff