X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Fxml%2FAsFlowDecorator.java;h=d88792d9e68a78e496c2f285146670510071f39f;hb=60677ee743e6d54ceda3187824cef28cf844ccc0;hp=2c548857686f10946cd163fe0855b58eaa371fc5;hpb=127abccfe9353dc0593911a53488cb1659d38e31;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 2c5488576..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
@@ -1,10 +1,28 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * 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.core.execution.xml;
 
 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;
 import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.xml.BeanDefinitionDecorator;
@@ -12,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);
 
@@ -21,22 +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;
 
 		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
@@ -44,12 +51,20 @@ public class AsFlowDecorator implements BeanDefinitionDecorator {
 		BeanDefinitionBuilder flow = BeanDefinitionBuilder
 				.rootBeanDefinition(DefaultExecutionFlow.class);
 		ManagedList executables = new ManagedList(1);
-		executables.add(bean.getBeanDefinition());
-		if (path != null)
-			flow.addPropertyValue("path", path);
+
+		String beanName = bean.getBeanName();
+		if (beanName == null)
+			executables.add(bean.getBeanDefinition());
+		else
+			executables.add(new RuntimeBeanReference(beanName));
+
+		// if (path != null)
+		// flow.addPropertyValue("path", path);
 		flow.addPropertyValue("executables", executables);
-		ctx.getRegistry().registerBeanDefinition(flowBeanName,
-				flow.getBeanDefinition());
+
+		if (beanName != null)
+			ctx.getRegistry().registerBeanDefinition(flowBeanName,
+					flow.getBeanDefinition());
 		return bean;
 	}