X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Fxml%2FAsFlowDecorator.java;h=d88792d9e68a78e496c2f285146670510071f39f;hb=60677ee743e6d54ceda3187824cef28cf844ccc0;hp=0a23b37a032f5cd990159ed28c9dccc81a6d9f4d;hpb=13e60ab2bd66f0e8f23c7fca0791e2c382a49cfd;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/AsFlowDecorator.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/AsFlowDecorator.java index 0a23b37a0..d88792d9e 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/AsFlowDecorator.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/AsFlowDecorator.java @@ -20,6 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.DefaultExecutionFlow; +import org.argeo.slc.execution.ExecutionFlow; import org.springframework.beans.factory.config.BeanDefinitionHolder; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -29,6 +30,7 @@ import org.springframework.beans.factory.xml.ParserContext; import org.w3c.dom.Attr; import org.w3c.dom.Node; +/** Publishes a {@link Runnable} as an {@link ExecutionFlow} */ public class AsFlowDecorator implements BeanDefinitionDecorator { private Log log = LogFactory.getLog(AsFlowDecorator.class); @@ -38,25 +40,10 @@ public class AsFlowDecorator implements BeanDefinitionDecorator { String attrValue = ((Attr) node).getValue(); if (attrValue.charAt(attrValue.length() - 1) == '/') throw new SlcException(attrValue + " cannot end with a path"); - // int lastSlash = attrValue.lastIndexOf('/'); - // String path; - // String flowBeanName; - // if (lastSlash > 0) { - // flowBeanName = attrValue.substring(lastSlash + 1); - // path = attrValue.substring(0, lastSlash); - // } else if (lastSlash == 0) { - // flowBeanName = attrValue.substring(lastSlash + 1); - // path = null; - // } else { - // flowBeanName = attrValue; - // path = null; - // } - // final String flowBeanName = attrValue; - final String path = null; if (log.isTraceEnabled()) - log.debug("path=" + path + ", flowBeanName=" + flowBeanName); + log.trace("flowBeanName=" + flowBeanName); if (ctx.getRegistry().containsBeanDefinition(flowBeanName)) throw new SlcException("A bean named " + flowBeanName @@ -71,8 +58,8 @@ public class AsFlowDecorator implements BeanDefinitionDecorator { else executables.add(new RuntimeBeanReference(beanName)); - if (path != null) - flow.addPropertyValue("path", path); + // if (path != null) + // flow.addPropertyValue("path", path); flow.addPropertyValue("executables", executables); if (beanName != null)