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

SWF-930 Development mode flag not set for flows registered using flow-location-pattern

Browse Source 
Pattern locations now accepts an AttribtueMap for flow attributes.  This map is passed to each flow resource found by the pattern.
This commit is contained in:
Scott Andrews
2008-11-03 14:39:57 +00:00
parent 49d1679b16
commit 7b8cf2e953
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResourceFactory.java
View File

@@ -119,9 +119,10 @@ public class FlowDefinitionResourceFactory {
/**
* Create an array of flow definition resources from the path pattern location provided.
* @param pattern the encoded {@link Resource} path pattern.
* @param attributes the flow definition meta attributes to configure
* @return the flow definition resources
*/
public FlowDefinitionResource[] createResources(String pattern) throws IOException {
public FlowDefinitionResource[] createResources(String pattern, AttributeMap attributes) throws IOException {
if (resourceLoader instanceof ResourcePatternResolver) {
ResourcePatternResolver resolver = (ResourcePatternResolver) resourceLoader;
Resource[] resources;
@@ -137,7 +138,7 @@ public class FlowDefinitionResourceFactory {
FlowDefinitionResource[] flowResources = new FlowDefinitionResource[resources.length];
for (int i = 0; i < resources.length; i++) {
Resource resource = resources[i];
flowResources[i] = new FlowDefinitionResource(getFlowId(resource), resource, null);
flowResources[i] = new FlowDefinitionResource(getFlowId(resource), resource, attributes);
}
return flowResources;
} else {

4
spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java
View File

@@ -16,6 +16,7 @@
package org.springframework.webflow.config;
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
@@ -167,8 +168,9 @@ class FlowRegistryFactoryBean implements FactoryBean, BeanClassLoaderAware, Init
for (int i = 0; i < flowLocationPatterns.length; i++) {
String pattern = flowLocationPatterns[i];
FlowDefinitionResource[] resources;
AttributeMap attributes = getFlowAttributes(Collections.EMPTY_SET);
try {
resources = flowResourceFactory.createResources(pattern);
resources = flowResourceFactory.createResources(pattern, attributes);
} catch (IOException e) {
IllegalStateException ise = new IllegalStateException(
"An I/O Exception occurred resolving the flow location pattern '" + pattern + "'");