}\r
\r
public void flowInitializationStarted(ExecutionFlow flow, String flowName) {\r
- if (log.isTraceEnabled())\r
- log.trace("Start initialization of " + flow.hashCode() + " ("\r
- + flow + " - " + flow.getClass() + ")");\r
-\r
// set the flow name if it is DefaultExecutionFlow\r
if (flow instanceof DefaultExecutionFlow) {\r
((DefaultExecutionFlow) flow).setBeanName(flowName);\r
}\r
+ \r
+ if (log.isTraceEnabled())\r
+ log.trace("Start initialization of " + flow.hashCode() + " ("\r
+ + flow + " - " + flow.getClass() + ")");\r
\r
// log.info("# flowInitializationStarted " + flowName);\r
// create a stack for this thread if there is none\r
if (log.isTraceEnabled())\r
log.trace("Finish initialization of " + flow.hashCode() + " ("\r
+ flow + " - " + flow.getClass() + ")");\r
- ExecutionFlow registeredFlow = flowStack.get().pop();\r
- if (registeredFlow != null) {\r
- if (!flow.getName().equals(registeredFlow.getName()))\r
- throw new SlcException("Current flow is " + flow);\r
- // log.info("# flowInitializationFinished " + flowName);\r
- // initializingFlow.set(null);\r
+ \r
+ if(flowStack.get() != null) {\r
+ ExecutionFlow registeredFlow = flowStack.get().pop();\r
+ if (registeredFlow != null) {\r
+ if (!flow.getName().equals(registeredFlow.getName()))\r
+ throw new SlcException("Current flow is " + flow);\r
+ // log.info("# flowInitializationFinished " + flowName);\r
+ // initializingFlow.set(null);\r
+ }\r
+ }\r
+ else {\r
+ // happens for flows imported as services\r
+ log.warn("flowInitializationFinished - Flow Stack is null");\r
}\r
}\r
\r
--- /dev/null
+package org.argeo.slc.core.execution.xml;\r
+\r
+import org.apache.commons.logging.Log;\r
+import org.apache.commons.logging.LogFactory;\r
+import org.springframework.aop.scope.ScopedProxyUtils;\r
+import org.springframework.beans.factory.config.BeanDefinitionHolder;\r
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;\r
+import org.springframework.beans.factory.xml.BeanDefinitionDecorator;\r
+import org.springframework.beans.factory.xml.ParserContext;\r
+import org.w3c.dom.Node;\r
+\r
+/**\r
+ * Inspired by org.springframework.aop.config.AopNamespaceHandler\r
+ * Conceived to replace Element "aop:scoped-proxy" by an attribute.\r
+ * Does not work correctly with other attribute decorators (e.g. \r
+ * p namespace) since this decorator needs to be called after all\r
+ * properties have been set on target bean. \r
+ */\r
+public class ExecutionScopeDecorator implements BeanDefinitionDecorator {\r
+ private Log log = LogFactory.getLog(ExecutionScopeDecorator.class);\r
+ \r
+ public BeanDefinitionHolder decorate(Node node,\r
+ BeanDefinitionHolder definition, ParserContext parserContext) {\r
+ \r
+ Boolean isVar = Boolean.valueOf(node.getNodeValue());\r
+ \r
+ if(isVar) {\r
+ definition.getBeanDefinition().setScope("execution");\r
+ \r
+ boolean proxyTargetClass = true;\r
+ \r
+ // Register the original bean definition as it will be referenced by the scoped proxy and is relevant for tooling (validation, navigation).\r
+ String targetBeanName = ScopedProxyUtils.getTargetBeanName(definition.getBeanName());\r
+ parserContext.getReaderContext().fireComponentRegistered(new BeanComponentDefinition(definition.getBeanDefinition(), targetBeanName));\r
+ \r
+ log.debug("Decorating bean " + definition.getBeanName());\r
+ \r
+ return ScopedProxyUtils.createScopedProxy(definition, parserContext.getRegistry(), proxyTargetClass); \r
+ }\r
+ else {\r
+ return definition;\r
+ }\r
+ }\r
+}\r
if (StringUtils.hasText(parent))
builder.setParentName(parent);
+
+ builder.getBeanDefinition().setDescription(DomUtils.getChildElementValueByTagName(element,
+ "description"));
+
List<Element> execElems = new ArrayList<Element>();
List<Element> argsElems = new ArrayList<Element>();
NodeList nodeList = element.getChildNodes();
if (node instanceof Element) {
if (DomUtils.nodeNameEquals(node, "arg"))
argsElems.add((Element) node);
- else
+ else if(!DomUtils.nodeNameEquals(node, "description"))
execElems.add((Element) node);
}
}
// Executables
if (execElems.size() != 0) {
ManagedList executables = new ManagedList(execElems.size());
- for (int i = 0; i < execElems.size(); i++) {
- Element child = execElems.get(i);
- String name = child.getLocalName();
- if (DomUtils.nodeNameEquals(child, "bean")
- || DomUtils.nodeNameEquals(child, "ref")) {
- // Object target = parseBeanReference((Element) child,
- // parserContext, builder);
- executables.add(NamespaceUtils.parseBeanOrReference(child,
- parserContext, builder.getBeanDefinition()));
- } else if (DomUtils.nodeNameEquals(child, "flow")) {
- throw new SlcException(
- "Nested flows are not yet supported, use a standard ref to another flow.");
- } else {
- throw new SlcException("Unsupported child '" + name + "'");
- }
+ for(Element child : execElems) {
+ // child validity check is performed in xsd
+ executables.add(NamespaceUtils.parseBeanOrReference(child,
+ parserContext, builder.getBeanDefinition()));
}
builder.addPropertyValue("executables", executables);
}
registerBeanDefinitionDecoratorForAttribute("as-flow",
new AsFlowDecorator());
registerBeanDefinitionParser("param", new ParamDecorator());
+// registerBeanDefinitionDecoratorForAttribute("var", new ExecutionScopeDecorator());
}
}
@Override
protected void doParse(Element element, ParserContext parserContext,
BeanDefinitionBuilder builder) {
+ builder.getBeanDefinition().setDescription(DomUtils.getChildElementValueByTagName(element,
+ "description"));
+
ManagedMap attributes = new ManagedMap();
// Primitives
<xsd:complexContent>
<xsd:extension base="beans:identifiedType">
<xsd:sequence>
+ <xsd:element ref="beans:description" minOccurs="0"/>
<xsd:sequence>
<xsd:element name="arg" minOccurs="0" maxOccurs="unbounded"
type="flow:argType">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element ref="beans:bean" />
<xsd:element ref="beans:ref" />
+ <xsd:element ref="flow:flow" />
</xsd:choice>
<!--
<xsd:any namespace="##other" processContents="strict"
<xsd:complexContent>
<xsd:extension base="beans:identifiedType">
<xsd:sequence>
+ <xsd:element ref="beans:description" minOccurs="0"/>
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element name="primitive" type="flow:primitiveSpecAttributeType"
minOccurs="0" maxOccurs="unbounded">
<xsd:choice minOccurs="0" maxOccurs="1">
<xsd:element ref="beans:bean" />
<xsd:element ref="beans:ref" />
+ <xsd:element ref="flow:param" />
</xsd:choice>
<xsd:attribute name="name" use="required" type="xsd:string">
<xsd:annotation>
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
-
+<!--
+ <xsd:attribute name="var" type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+ If true, the decorated bean is set to scope execution and proxied.
+ ]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+-->
<xsd:element name="param">
<xsd:annotation>
<xsd:documentation><
projects / gpl / argeo-slc.git / commitdiff