Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-573

Browse Source
This commit is contained in:
Keith Donald
2008-04-11 16:15:36 +00:00
parent d53167b00a
commit 65ced6b3aa
5 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorBeanDefinitionParser.java
View File

@@ -41,7 +41,7 @@ class FlowExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionParse
private static final String EXECUTION_ATTRIBUTES_ELEMENT = "flow-execution-attributes";
private static final String ALWAYS_REDIRECT_ON_PAUSE_ELEMENT = "alwaysRedirectOnPause";
private static final String ALWAYS_REDIRECT_ON_PAUSE_ELEMENT = "always-redirect-on-pause";
private static final String ATTRIBUTE_ELEMENT = "attribute";
@@ -57,7 +57,7 @@ class FlowExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionParse
private static final String MAX_CONVERSATIONS_ATTRIBUTE = "max-conversations";
private static final String REGISTRY_REF_ATTRIBUTE = "flow-registry";
private static final String REGISTRY_ATTRIBUTE = "flow-registry";
private static final String REPOSITORY_ELEMENT = "flow-execution-repository";
@@ -82,7 +82,7 @@ class FlowExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionParse
}
protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder definitionBuilder) {
definitionBuilder.addPropertyReference(DEFINITION_LOCATOR_PROPERTY, getRegistryRef(element, parserContext));
definitionBuilder.addPropertyReference(DEFINITION_LOCATOR_PROPERTY, getRegistry(element, parserContext));
definitionBuilder.addPropertyValue(EXECUTION_ATTRIBUTES_PROPERTY, parseAttributes(element));
addExecutionListenerLoader(element, parserContext, definitionBuilder);
configureRepository(element, definitionBuilder, parserContext);
@@ -98,7 +98,10 @@ class FlowExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionParse
ParserContext parserContext) {
Element repositoryElement = DomUtils.getChildElementByTagName(element, REPOSITORY_ELEMENT);
if (repositoryElement != null) {
definitionBuilder.addPropertyValue(REPOSITORY_TYPE_PROPERTY, getType(repositoryElement));
String type = getType(element);
if (StringUtils.hasText(type)) {
definitionBuilder.addPropertyValue(REPOSITORY_TYPE_PROPERTY, type);
}
configureContinuations(repositoryElement, definitionBuilder, parserContext);
configureConversationManager(repositoryElement, definitionBuilder, parserContext);
}
@@ -114,9 +117,10 @@ class FlowExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionParse
ParserContext parserContext) {
String maxContinuations = getMaxContinuations(repositoryElement);
if (StringUtils.hasText(maxContinuations)) {
if (!getType(repositoryElement).equals("CONTINUATION")) {
String type = getType(repositoryElement);
if (StringUtils.hasText(type) && !type.toLowerCase().equals("CONTINUATION")) {
parserContext.getReaderContext().error(
"The 'max-continuations' attribute of the 'repository' element must not "
"The 'max-continuations' attribute of the 'flow-execution-repository' element must not "
+ "have a value if the 'type' attribute is not 'continuation'", repositoryElement);
}
definitionBuilder.addPropertyValue(MAX_CONTINUATIONS_PROPERTY, maxContinuations);
@@ -136,8 +140,8 @@ class FlowExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionParse
if (StringUtils.hasText(conversationManagerRef)) {
if (StringUtils.hasText(maxConversations)) {
parserContext.getReaderContext().error(
"The 'max-conversations' attribute of the 'repository' element must not "
+ "have a value if there is a value for the 'conversation-manager-ref' attribute",
"The 'max-conversations' attribute of the 'flow-execution-repository' element must not "
+ "have a value if there is a value for the 'conversation-manager' attribute",
repositoryElement);
}
definitionBuilder.addPropertyReference(CONVERSATION_MANAGER_PROPERTY, conversationManagerRef);
@@ -152,13 +156,13 @@ class FlowExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionParse
* @return the name of the registry
* @param parserContext the parserContext
*/
private String getRegistryRef(Element element, ParserContext parserContext) {
String registryRef = element.getAttribute(REGISTRY_REF_ATTRIBUTE);
if (!StringUtils.hasText(registryRef)) {
parserContext.getReaderContext().error(
"The 'registry-ref' attribute of the 'flow-executor' element must have a value", element);
private String getRegistry(Element element, ParserContext parserContext) {
String registry = element.getAttribute(REGISTRY_ATTRIBUTE);
if (!StringUtils.hasText(registry)) {
return "flowRegistry";
} else {
return registry;
}
return registryRef;
}
/**
@@ -167,7 +171,7 @@ class FlowExecutorBeanDefinitionParser extends AbstractSingleBeanDefinitionParse
* @return the type of the repository
*/
private String getType(Element element) {
return element.getAttribute(TYPE_ATTRIBUTE).toUpperCase();
return element.getAttribute(TYPE_ATTRIBUTE);
}
/**

2
spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java
View File

@@ -264,7 +264,7 @@ class FlowExecutorFactoryBean implements FactoryBean, InitializingBean {
if (conversationManager == null) {
conversationManager = createDefaultConversationManager();
}
if (repositoryType == FlowExecutionRepositoryType.CONTINUATION) {
if (repositoryType == null || repositoryType == FlowExecutionRepositoryType.CONTINUATION) {
DefaultFlowExecutionRepository repository = new DefaultFlowExecutionRepository(conversationManager,
executionStateRestorer);
if (maxContinuations != null) {

2
spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd
View File

@@ -388,7 +388,7 @@ Example: 'flow1,flow2,flow3'.
<xsd:complexType name="flowExecutionAttributesType">
<xsd:sequence>
<xsd:element name="alwaysRedirectOnPause" type="alwaysRedirectOnPauseType" minOccurs="0">
<xsd:element name="always-redirect-on-pause" type="alwaysRedirectOnPauseType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
<![CDATA[

4
spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorBeanDefinitionParserTests.java
View File

@@ -7,6 +7,7 @@ import org.springframework.webflow.definition.FlowDefinition;
import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
import org.springframework.webflow.execution.RequestContext;
import org.springframework.webflow.executor.FlowExecutor;
import org.springframework.webflow.test.MockExternalContext;
public class FlowExecutorBeanDefinitionParserTests extends TestCase {
private ClassPathXmlApplicationContext context;
@@ -16,7 +17,8 @@ public class FlowExecutorBeanDefinitionParserTests extends TestCase {
}
public void testConfigOk() {
context.getBean("flowExecutor", FlowExecutor.class);
FlowExecutor executor = (FlowExecutor) context.getBean("flowExecutor", FlowExecutor.class);
executor.launchExecution("flow", null, new MockExternalContext());
}
public static class ConfigurationListener extends FlowExecutionListenerAdapter {

4
spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml
View File

@@ -9,9 +9,9 @@
http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
<webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry">
<webflow:flow-execution-repository type="continuation" max-conversations="1" max-continuations="2"/>
<webflow:flow-execution-repository max-conversations="1" max-continuations="2"/>
<webflow:flow-execution-attributes>
<webflow:alwaysRedirectOnPause value="false"/>
<webflow:always-redirect-on-pause value="false"/>
<webflow:attribute name="foo" value="bar"/>
<webflow:attribute name="bar" value="2" type="integer"/>
</webflow:flow-execution-attributes>