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=0a23b37a032f5cd990159ed28c9dccc81a6d9f4d;hb=32f9566efa0d0ce29b31ee0779faf2b42f46321a;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..0a23b37a0 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,3 +1,19 @@
+/*
+ * 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;
@@ -5,6 +21,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.execution.DefaultExecutionFlow;
 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;
@@ -21,19 +38,22 @@ 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;
-		}
+		// 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);
@@ -44,12 +64,20 @@ public class AsFlowDecorator implements BeanDefinitionDecorator {
 		BeanDefinitionBuilder flow = BeanDefinitionBuilder
 				.rootBeanDefinition(DefaultExecutionFlow.class);
 		ManagedList executables = new ManagedList(1);
-		executables.add(bean.getBeanDefinition());
+
+		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;
 	}