diff --git a/spring-binding/.classpath b/spring-binding/.classpath index 696357d8..40e0e526 100644 --- a/spring-binding/.classpath +++ b/spring-binding/.classpath @@ -7,8 +7,8 @@ - - + + diff --git a/spring-binding/src/main/java/org/springframework/binding/convert/support/TextToExpression.java b/spring-binding/src/main/java/org/springframework/binding/convert/support/TextToExpression.java index 311d3d36..747c3d87 100644 --- a/spring-binding/src/main/java/org/springframework/binding/convert/support/TextToExpression.java +++ b/spring-binding/src/main/java/org/springframework/binding/convert/support/TextToExpression.java @@ -18,15 +18,12 @@ package org.springframework.binding.convert.support; import org.springframework.binding.convert.ConversionContext; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ExpressionParser; -import org.springframework.binding.expression.SettableExpression; -import org.springframework.binding.expression.support.StaticExpression; import org.springframework.util.Assert; /** * Converter that converts a String into an Expression object. * * @see org.springframework.binding.expression.Expression - * @see org.springframework.binding.expression.SettableExpression * * @author Erwin Vervaet */ @@ -58,15 +55,11 @@ public class TextToExpression extends AbstractConverter { } public Class[] getTargetClasses() { - return new Class[] { Expression.class, SettableExpression.class }; + return new Class[] { Expression.class }; } protected Object doConvert(Object source, Class targetClass, ConversionContext context) throws Exception { String expressionString = (String) source; - if (getExpressionParser().isDelimitedExpression(expressionString)) { - return getExpressionParser().parseExpression((String) source); - } else { - return new StaticExpression(expressionString); - } + return expressionParser.parseExpression(expressionString, Object.class, Object.class, null); } } \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationAttempt.java b/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationAttempt.java index f2a50bc3..76777a2e 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationAttempt.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationAttempt.java @@ -34,21 +34,14 @@ public class EvaluationAttempt { */ private Object target; - /** - * The evaluation context. - */ - private EvaluationContext context; - /** * Create an evaluation attempt. * @param expression the expression that failed to evaluate * @param target the target of the expression - * @param context the context attributes that might have affected evaluation behavior */ - public EvaluationAttempt(Expression expression, Object target, EvaluationContext context) { + public EvaluationAttempt(Expression expression, Object target) { this.expression = expression; this.target = target; - this.context = context; } /** @@ -65,18 +58,11 @@ public class EvaluationAttempt { return target; } - /** - * Returns context attributes that may have influenced the evaluation process. - */ - public EvaluationContext getContext() { - return context; - } - public String toString() { return createToString(new ToStringCreator(this)).toString(); } protected ToStringCreator createToString(ToStringCreator creator) { - return creator.append("expression", expression).append("target", target).append("context", context); + return creator.append("expression", expression).append("target", target); } } \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/Expression.java b/spring-binding/src/main/java/org/springframework/binding/expression/Expression.java index 62c00e8c..e98e32d6 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/Expression.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/Expression.java @@ -27,9 +27,16 @@ public interface Expression { * Evaluate the expression encapsulated by this evaluator against the provided target object and return the result * of the evaluation. * @param target the target of the expression - * @param context the expression evaluation context * @return the evaluation result * @throws EvaluationException an exception occured during evaluation */ - public Object evaluate(Object target, EvaluationContext context) throws EvaluationException; + public Object getValue(Object target) throws EvaluationException; + + /** + * Evaluate this expression against the target object to set its value to the value provided. + * @param target the target object + * @param value the new value to be set + * @throws EvaluationException an exception occurred during evaluation + */ + public void setValue(Object target, Object value) throws EvaluationException; } \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/ExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/ExpressionParser.java index 8692af31..0f5b3092 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/ExpressionParser.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/ExpressionParser.java @@ -16,7 +16,7 @@ package org.springframework.binding.expression; /** - * Parses expression strings, returing a configured evaluator instance capable of performing parsed expression + * Parses expression strings, returning a configured evaluator instance capable of performing parsed expression * evaluation in a thread safe way. * * @author Keith Donald @@ -24,30 +24,38 @@ package org.springframework.binding.expression; public interface ExpressionParser { /** - * Is this expression string delimited in a manner that indicates it is a parseable expression? For example - * "${expression}". - * @param expressionString the proposed expression string - * @return true if yes, false if not + * Is the provided expression string an "eval" expression: meaning an expression that validates to a dynamic value, + * and not a literal expression? "Eval" expressions are normally enclosed in delimiters like #{}, where literal + * expressions are not delimited. + * @param string the string + * @return true if the expression is an eval expression string, false otherwise. */ - public boolean isDelimitedExpression(String expressionString); + public boolean isEvalExpressionString(String string); /** - * Parse the provided expression string, returning an evaluator capable of evaluating it against input. - * @param expressionString the parseable expression string - * @return the evaluator for the parsed expression - * @throws ParserException an exception occured during parsing + * Parse the raw string into an "eval" expression string that when parsed produces a dynamic value when evaluated + * against a target object. For example, the raw expression string "person.id" might become #{person.id}. If the + * string is already an eval expression string, the string argument is returned unchanged. If the string is an + * composite expression string that mixes eval and literal expressions, a parser exception is thrown. + * @param string the raw string to be transformed into a parseable eval expression string + * @return the eval expression spring + * @throws ParserException an exception occurred during parsing */ - public Expression parseExpression(String expressionString) throws ParserException; + public String parseEvalExpressionString(String string) throws ParserException; /** - * Parse the provided settable expression string, returning an evaluator capable of evaluating its value as well as - * setting its value. + * Parse the provided expression string, returning an expression evaluator capable of evaluating it. The expression + * string may be a literal expression string like "foo", an eval-expression string like #{foo}, or a + * composite-expression string like "foo#{foo}bar#{bar}". * @param expressionString the parseable expression string + * @param expressionTargetType the class of target object this expression can successfully evaluate; for example, + * Map.class for an expression that is expected to evaluate against Maps. + * @param expectedEvaluationResultType the class of object this expression is expected to return or set: for + * example, Boolean.class for an expression that is expected to get or set a boolean value. + * @param expressionVariables variables providing aliases for this expression during evaluation parsing. Optional. * @return the evaluator for the parsed expression - * @throws ParserException an exception occured during parsing - * @throws UnsupportedOperationException this parser does not support settable expressions + * @throws ParserException an exception occurred during parsing */ - public SettableExpression parseSettableExpression(String expressionString) throws ParserException, - UnsupportedOperationException; - + public Expression parseExpression(String expressionString, Class expressionTargetType, + Class expectedEvaluationResultType, ExpressionVariable[] expressionVariables) throws ParserException; } \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/ExpressionVariable.java b/spring-binding/src/main/java/org/springframework/binding/expression/ExpressionVariable.java new file mode 100644 index 00000000..65820c80 --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/expression/ExpressionVariable.java @@ -0,0 +1,61 @@ +package org.springframework.binding.expression; + +import org.springframework.util.Assert; + +/** + * A simple, convenient alias for a more-complex expression. + * + * TODO - consider making the valueExpressionString a parsed Expression object for more flexibility. + * + * @author Keith Donald + */ +public class ExpressionVariable { + + private String name; + + private String valueExpressionString; + + /** + * Creates a new expression variable + * @param name the name of the variable, acting as an convenient alias + * @param valueExpressionString the complex expression to be aliased in string form + */ + public ExpressionVariable(String name, String valueExpressionString) { + Assert.hasText(name, "The expression variable must be named"); + Assert.hasText(valueExpressionString, "The expression value expression string is required"); + this.name = name; + this.valueExpressionString = valueExpressionString; + } + + /** + * Returns the variable name, typically vary simple like "index". + * @return the variable name + */ + public String getName() { + return name; + } + + /** + * Returns the expression that will be evaluated when the variable is referenced by its name in another expression. + * @return the expression value. + */ + public String getValueExpressionString() { + return valueExpressionString; + } + + public boolean equals(Object o) { + if (!(o instanceof ExpressionVariable)) { + return false; + } + ExpressionVariable var = (ExpressionVariable) o; + return name.equals(var.name); + } + + public int hashCode() { + return name.hashCode(); + } + + public String toString() { + return "[Expression Variable '" + name + "']"; + } +} diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/SetValueAttempt.java b/spring-binding/src/main/java/org/springframework/binding/expression/SetValueAttempt.java index e4b2b9cd..24eabe4b 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/SetValueAttempt.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/SetValueAttempt.java @@ -34,10 +34,9 @@ public class SetValueAttempt extends EvaluationAttempt { * @param expression the settable expression * @param target the target of the expression * @param value the value that was attempted to be set - * @param context context attributes that may have influenced the evaluation and set process */ - public SetValueAttempt(SettableExpression expression, Object target, Object value, EvaluationContext context) { - super(expression, target, context); + public SetValueAttempt(Expression expression, Object target, Object value) { + super(expression, target); this.value = value; } diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java deleted file mode 100644 index 76f95d30..00000000 --- a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.springframework.binding.expression.el; - -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.FunctionMapper; -import javax.el.VariableMapper; - -/** - * A default {@link ELContextFactory} for facilitating use of EL for expression evaluation. - * @author Jeremy Grelle - * - */ -public class DefaultELContextFactory implements ELContextFactory { - - /** - * Configures and returns a simple EL context to use to parse EL expressions. - * @return The configured simple ELContext instance. - */ - public ELContext getParseContext() { - return new SimpleELContext(); - } - - /** - * Configures and returns a simple EL context to use to evaluate EL expressions on the given base target object. - * @return The configured simple ELContext instance. - */ - public ELContext getEvaluationContext(Object target) { - return new SimpleELContext(target); - } - - private static class SimpleELContext extends ELContext { - private DefaultELResolver resolver = new DefaultELResolver(); - - public SimpleELContext() { - - } - - public SimpleELContext(Object target) { - this.resolver.setTarget(target); - } - - public ELResolver getELResolver() { - return resolver; - } - - public FunctionMapper getFunctionMapper() { - return null; - } - - public VariableMapper getVariableMapper() { - return null; - } - } -} \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java index 9a45eb17..8fb98122 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELResolver.java @@ -1,17 +1,17 @@ package org.springframework.binding.expression.el; +import java.util.Iterator; +import java.util.List; + import javax.el.ArrayELResolver; import javax.el.BeanELResolver; import javax.el.CompositeELResolver; import javax.el.ELContext; +import javax.el.ELResolver; import javax.el.ListELResolver; import javax.el.MapELResolver; -import javax.el.PropertyNotFoundException; -import javax.el.PropertyNotWritableException; import javax.el.ResourceBundleELResolver; -import org.springframework.binding.collection.MapAdaptable; - /** * A generic ELResolver to be used as a default when no other ELResolvers have been configured by the client * application. @@ -27,55 +27,48 @@ public class DefaultELResolver extends CompositeELResolver { private Object target; - public DefaultELResolver() { - configureResolvers(); - } - - public Class getType(ELContext context, Object base, Object property) { - return super.getType(context, adaptIfNecessary(base), property); - } - - public Object getValue(ELContext context, Object base, Object property) { - if (base == null) { - try { - return super.getValue(context, target, property); - } catch (PropertyNotFoundException ex) { - context.setPropertyResolved(false); - } - } - return super.getValue(context, adaptIfNecessary(base), property); - } - - public void setValue(ELContext context, Object base, Object property, Object val) { - if (base == null) { - try { - super.setValue(context, target, property, val); - if (context.isPropertyResolved()) - return; - } catch (PropertyNotWritableException ex) { - context.setPropertyResolved(false); - } - } - super.setValue(context, adaptIfNecessary(base), property, val); + /** + * Creates a new default EL resolver for resolving properties of the root object. + * @param target the target, or "root", object of the expression + */ + public DefaultELResolver(Object target, List customResolvers) { + this.target = target; + configureResolvers(customResolvers); } public Object getTarget() { return target; } - public void setTarget(Object target) { - this.target = adaptIfNecessary(target); + public Class getType(ELContext context, Object base, Object property) { + return super.getType(context, base, property); } - private Object adaptIfNecessary(Object base) { - if (base instanceof MapAdaptable) { - return ((MapAdaptable) base).asMap(); + public Object getValue(ELContext context, Object base, Object property) { + if (base == null) { + return super.getValue(context, target, property); } else { - return base; + return super.getValue(context, base, property); } } - private void configureResolvers() { + public void setValue(ELContext context, Object base, Object property, Object val) { + if (base == null) { + super.setValue(context, target, property, val); + } else { + super.setValue(context, base, property, val); + } + } + + private void configureResolvers(List customResolvers) { + if (customResolvers != null) { + Iterator i = customResolvers.iterator(); + while (i.hasNext()) { + ELResolver resolver = (ELResolver) i.next(); + add(resolver); + } + } + add(new MapAdaptableELResolver()); add(new ArrayELResolver()); add(new ListELResolver()); add(new MapELResolver()); @@ -83,4 +76,4 @@ public class DefaultELResolver extends CompositeELResolver { add(new BeanELResolver()); } -} +} \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java index 3abfa434..01508de7 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java @@ -2,6 +2,7 @@ package org.springframework.binding.expression.el; import javax.el.ELContext; import javax.el.ELResolver; +import javax.el.VariableMapper; /** * A factory for creating a EL context object that will be used to evaluate a target object of an EL expression. @@ -10,19 +11,14 @@ import javax.el.ELResolver; */ public interface ELContextFactory { - /** - * Configures and returns an {@link ELContext} to be used in parsing EL expressions. - * @return ELContext The configured ELContext instance for parsing expressions. - */ - public ELContext getParseContext(); - /** * Configures and returns an {@link ELContext} to be used in evaluating EL expressions on the given base target * object. In certain environments the target will be null and the base object of the expression is expected to be * resolved via the ELContext's {@link ELResolver} chain. - * @param target The base object for the expression evaluation. + * @param target The base object for the expression evaluation + * @param variableMapper The mapping storing variables needed during expression evaluation * @return ELContext The configured ELContext instance for evaluating expressions. */ - public ELContext getEvaluationContext(Object target); + public ELContext getELContext(Object target, VariableMapper variableMapper); } \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java index 7f9d7c7f..0edddb6a 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java @@ -3,68 +3,60 @@ package org.springframework.binding.expression.el; import javax.el.ELContext; import javax.el.ELException; import javax.el.ValueExpression; +import javax.el.VariableMapper; import org.springframework.binding.expression.EvaluationAttempt; -import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.EvaluationException; -import org.springframework.binding.expression.SettableExpression; +import org.springframework.binding.expression.Expression; +import org.springframework.util.Assert; /** * Evaluates a parsed EL expression. * * @author Jeremy Grelle */ -public class ELExpression implements SettableExpression { +public class ELExpression implements Expression { - private ELContextFactory factory; + private ELContextFactory elContextFactory; - private ValueExpression expression; + private ValueExpression valueExpression; - public ELExpression(ELContextFactory factory, ValueExpression expression) { - this.factory = factory; - this.expression = expression; - } - - public void evaluateToSet(Object target, Object value, EvaluationContext context) throws EvaluationException { - ELContext ctx = getELContext(target); - try { - expression.setValue(ctx, value); - } catch (ELException ex) { - throw new EvaluationException(new EvaluationAttempt(this, target, context), ex); - } - } - - public Object evaluate(Object target, EvaluationContext context) throws EvaluationException { - ELContext ctx = getELContext(target); - try { - return expression.getValue(ctx); - } catch (ELException ex) { - throw new EvaluationException(new EvaluationAttempt(this, target, context), ex); - } - } - - protected Class getType(Object target, EvaluationContext context) throws EvaluationException { - ELContext ctx = getELContext(target); - try { - return expression.getType(ctx); - } catch (ELException ex) { - throw new EvaluationException(new EvaluationAttempt(this, target, context), ex); - } - } + private VariableMapper variableMapper; /** - * Retrieves an {@link ELContext} instance, configured with a DefaultELResolver if no other resolvers have been - * configured. - * - * @return {@link ELContext} The thread-bound {@link ELContext} instance. + * Creates a new el expression + * @param factory the el context factory for creating the EL context that will be used during expression evaluation + * @param valueExpression the value expression to evaluate + * @param variableMapper the variable mapper containing variables needed during expression evaluation */ - protected ELContext getELContext(Object target) { - ELContext ctx = factory.getEvaluationContext(target); - return ctx; + public ELExpression(ELContextFactory factory, ValueExpression valueExpression, VariableMapper variableMapper) { + Assert.notNull(factory, "The ELContextFactory is required to evaluate EL expressions"); + Assert.notNull(valueExpression, "The EL value expression is required for evaluation"); + this.elContextFactory = factory; + this.valueExpression = valueExpression; + this.variableMapper = variableMapper; + } + + public Object getValue(Object target) throws EvaluationException { + ELContext ctx = elContextFactory.getELContext(target, variableMapper); + try { + return valueExpression.getValue(ctx); + } catch (ELException ex) { + throw new EvaluationException(new EvaluationAttempt(this, target), ex); + } + } + + public void setValue(Object target, Object value) throws EvaluationException { + ELContext ctx = elContextFactory.getELContext(target, variableMapper); + try { + valueExpression.setValue(ctx, value); + } catch (ELException ex) { + throw new EvaluationException(new EvaluationAttempt(this, target), ex); + } } public int hashCode() { - return expression.hashCode(); + return valueExpression.hashCode(); } public boolean equals(Object o) { @@ -72,11 +64,11 @@ public class ELExpression implements SettableExpression { return false; } ELExpression other = (ELExpression) o; - return expression.equals(other.expression); + return valueExpression.equals(other.valueExpression); } public String toString() { - return expression.getExpressionString(); + return valueExpression.getExpressionString(); } -} +} \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java index 3f383446..e9d6af6f 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java @@ -1,13 +1,20 @@ package org.springframework.binding.expression.el; +import java.util.HashMap; +import java.util.Map; + import javax.el.ELContext; import javax.el.ELException; +import javax.el.ELResolver; import javax.el.ExpressionFactory; +import javax.el.FunctionMapper; +import javax.el.ValueExpression; +import javax.el.VariableMapper; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ExpressionParser; +import org.springframework.binding.expression.ExpressionVariable; import org.springframework.binding.expression.ParserException; -import org.springframework.binding.expression.SettableExpression; /** * An expression parser that parses EL expressions. @@ -16,90 +23,118 @@ import org.springframework.binding.expression.SettableExpression; public class ELExpressionParser implements ExpressionParser { /** - * The expression prefix for deferred EL expressions. + * The expression prefix. */ - private static final String DEFERRED_EL_EXPRESSION_PREFIX = "#{"; + private static final String EXPRESSION_PREFIX = "#{"; /** - * The expression suffix for deferred EL expressions. + * The expression suffix. */ - private static final String DEFERRED_EL_EXPRESSION_SUFFIX = "}"; - - /** - * The marked expression delimiter prefix. - */ - private String expressionPrefix = DEFERRED_EL_EXPRESSION_PREFIX; - - /** - * The marked expression delimiter suffix. - */ - private String expressionSuffix = DEFERRED_EL_EXPRESSION_SUFFIX; - - /** - * The {@link ELContextFactory} for retrieving a configured ELContext. - */ - private ELContextFactory contextFactory; + private static final String EXPRESSION_SUFFIX = "}"; /** * The ExpressionFactory for constructing EL expressions */ private ExpressionFactory expressionFactory; + private Map contextFactories = new HashMap(); + /** * Creates a new EL expression parser for standalone usage. */ public ELExpressionParser(ExpressionFactory expressionFactory) { this.expressionFactory = expressionFactory; - this.contextFactory = new DefaultELContextFactory(); } /** - * Creates a new EL expression parser with a custom context factory for a specific environment. - * - * @param contextFactory the context factory + * Register the ELContextFactory for expressions that evaluate the given class of target object. + * @param expressionTargetType the expression target class + * @param contextFactory the context factory to use for expressions that evaluate those types of targets */ - public ELExpressionParser(ExpressionFactory expressionFactory, ELContextFactory contextFactory) { - this.expressionFactory = expressionFactory; - this.contextFactory = contextFactory; + public void putContextFactory(Class expressionTargetType, ELContextFactory contextFactory) { + this.contextFactories.put(expressionTargetType, contextFactory); } - /** - * Check whether or not given criteria are expressed as an expression. - */ - public boolean isDelimitedExpression(String expressionString) { - int prefixIndex = expressionString.indexOf(expressionPrefix); - if (prefixIndex == -1) { - return false; - } - int suffixIndex = expressionString.indexOf(expressionSuffix, prefixIndex); - if (suffixIndex == -1) { - return false; - } else { - if (suffixIndex == prefixIndex + expressionPrefix.length()) { - return false; - } else { - return true; - } - } + public boolean isEvalExpressionString(String expressionString) { + return expressionString.startsWith(EXPRESSION_PREFIX) && expressionString.endsWith(EXPRESSION_SUFFIX); } - public final Expression parseExpression(String expressionString) throws ParserException { - return parseSettableExpression(expressionString); + public String parseEvalExpressionString(String string) { + return encloseInDelimitersIfNecessary(string); } - /** - * Parses the expression string into an EL value expression. - * @param expressionString - * @throws ParserException - */ - public final SettableExpression parseSettableExpression(String expressionString) throws ParserException, - UnsupportedOperationException { - ELContext ctx = contextFactory.getParseContext(); + public Expression parseExpression(String expressionString, Class expressionTargetType, + Class expectedEvaluationResultType, ExpressionVariable[] expressionVariables) throws ParserException { + ParserELContext context = new ParserELContext(); try { - return new ELExpression(contextFactory, expressionFactory.createValueExpression(ctx, expressionString, - Object.class)); + context.mapVariables(expressionVariables, expressionFactory); + ValueExpression expression = expressionFactory.createValueExpression(context, expressionString, + expectedEvaluationResultType); + ELContextFactory contextFactory = getContextFactory(expressionString, expressionTargetType); + return new ELExpression(contextFactory, expression, context.getVariableMapper()); } catch (ELException ex) { throw new ParserException(expressionString, ex); } } + + private String encloseInDelimitersIfNecessary(String expressionString) { + if (isEvalExpressionString(expressionString)) { + return expressionString; + } else { + return EXPRESSION_PREFIX + expressionString + EXPRESSION_SUFFIX; + } + } + + private ELContextFactory getContextFactory(String expressionString, Class expressionTargetType) { + if (!contextFactories.containsKey(expressionTargetType)) { + throw new ParserException(expressionString, new IllegalArgumentException( + "No ELContextFactory registered for expressionTargetType [" + expressionTargetType + "]")); + } + return (ELContextFactory) contextFactories.get(expressionTargetType); + } + + private static class ParserELContext extends ELContext { + private VariableMapper variableMapper; + + public ELResolver getELResolver() { + return null; + } + + public FunctionMapper getFunctionMapper() { + return null; + } + + public VariableMapper getVariableMapper() { + return variableMapper; + } + + public void mapVariables(ExpressionVariable[] variables, ExpressionFactory expressionFactory) { + if (variables != null && variables.length > 0) { + variableMapper = new VariableMapperImpl(); + for (int i = 0; i < variables.length; i++) { + ExpressionVariable var = variables[i]; + ValueExpression expr = expressionFactory.createValueExpression(this, + var.getValueExpressionString(), Object.class); + variableMapper.setVariable(var.getName(), expr); + } + } + } + } + + private static class VariableMapperImpl extends VariableMapper { + private Map variables = new HashMap(); + + public ValueExpression resolveVariable(String name) { + return (ValueExpression) variables.get(name); + } + + public ValueExpression setVariable(String name, ValueExpression value) { + return (ValueExpression) variables.put(name, value); + } + + public String toString() { + return variables.toString(); + } + } + } diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/MapAdaptableELResolver.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/MapAdaptableELResolver.java new file mode 100644 index 00000000..83fc6374 --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/MapAdaptableELResolver.java @@ -0,0 +1,52 @@ +package org.springframework.binding.expression.el; + +import java.util.Map; + +import javax.el.ELContext; +import javax.el.ELResolver; +import javax.el.MapELResolver; + +import org.springframework.binding.collection.MapAdaptable; + +/** + * An {@link ELResolver} for properly resolving variables in an instance of {@link MapAdaptable} + * @author Jeremy Grelle + */ +public class MapAdaptableELResolver extends MapELResolver { + + public Class getType(ELContext context, Object base, Object property) { + if (base instanceof MapAdaptable) { + return super.getType(context, adapt(base), property); + } else { + return null; + } + } + + public Object getValue(ELContext context, Object base, Object property) { + if (base instanceof MapAdaptable) { + return super.getValue(context, adapt(base), property); + } else { + return null; + } + } + + public boolean isReadOnly(ELContext context, Object base, Object property) { + if (base instanceof MapAdaptable) { + return super.isReadOnly(context, adapt(base), property); + } else { + return false; + } + } + + public void setValue(ELContext context, Object base, Object property, Object value) { + if (base instanceof MapAdaptable) { + super.setValue(context, adapt(base), property, value); + } + } + + private Map adapt(Object base) { + MapAdaptable adaptable = (MapAdaptable) base; + return adaptable.asMap(); + } + +} diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java index d3c0198d..5fca7b5f 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpression.java @@ -16,16 +16,14 @@ package org.springframework.binding.expression.ognl; import java.util.Collections; -import java.util.Map; import ognl.Ognl; import ognl.OgnlException; import org.springframework.binding.expression.EvaluationAttempt; -import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.EvaluationException; +import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.SetValueAttempt; -import org.springframework.binding.expression.SettableExpression; import org.springframework.util.Assert; /** @@ -36,7 +34,7 @@ import org.springframework.util.Assert; * * @author Keith Donald */ -class OgnlExpression implements SettableExpression { +class OgnlExpression implements Expression { /** * The expression. @@ -65,29 +63,29 @@ class OgnlExpression implements SettableExpression { return expression.equals(other.expression); } - public Object evaluate(Object target, EvaluationContext context) throws EvaluationException { + public Object getValue(Object target) throws EvaluationException { Assert.notNull(target, "The target object to evaluate is required"); - Map contextAttributes = (context != null ? context.getAttributes() : Collections.EMPTY_MAP); try { - return Ognl.getValue(expression, contextAttributes, target); + // TODO context map + return Ognl.getValue(expression, Collections.EMPTY_MAP, target); } catch (OgnlException e) { if (e.getReason() != null && e.getReason() != e) { // unwrap the OgnlException since the actual exception is wrapped inside it // and there is not generic (getCause) way to get to it later on - throw new EvaluationException(new EvaluationAttempt(this, target, context), e.getReason()); + throw new EvaluationException(new EvaluationAttempt(this, target), e.getReason()); } else { - throw new EvaluationException(new EvaluationAttempt(this, target, context), e); + throw new EvaluationException(new EvaluationAttempt(this, target), e); } } } - public void evaluateToSet(Object target, Object value, EvaluationContext context) { + public void setValue(Object target, Object value) { Assert.notNull(target, "The target object to evaluate is required"); - Map contextAttributes = (context != null ? context.getAttributes() : Collections.EMPTY_MAP); try { - Ognl.setValue(expression, contextAttributes, target, value); + // TODO context map + Ognl.setValue(expression, Collections.EMPTY_MAP, target, value); } catch (OgnlException e) { - throw new EvaluationException(new SetValueAttempt(this, target, value, context), e); + throw new EvaluationException(new SetValueAttempt(this, target, value), e); } } diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java index 195e08e5..49583209 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/ognl/OgnlExpressionParser.java @@ -22,7 +22,6 @@ import ognl.PropertyAccessor; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ParserException; -import org.springframework.binding.expression.SettableExpression; import org.springframework.binding.expression.support.AbstractExpressionParser; /** @@ -33,10 +32,6 @@ import org.springframework.binding.expression.support.AbstractExpressionParser; public class OgnlExpressionParser extends AbstractExpressionParser { protected Expression doParseExpression(String expressionString) throws ParserException { - return doParseSettableExpression(expressionString); - } - - public SettableExpression doParseSettableExpression(String expressionString) throws ParserException { try { return new OgnlExpression(Ognl.parseExpression(expressionString)); } catch (OgnlException e) { diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/AbstractExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/support/AbstractExpressionParser.java index e2cddb83..5dca7269 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/support/AbstractExpressionParser.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/support/AbstractExpressionParser.java @@ -20,8 +20,8 @@ import java.util.List; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ExpressionParser; +import org.springframework.binding.expression.ExpressionVariable; import org.springframework.binding.expression.ParserException; -import org.springframework.binding.expression.SettableExpression; import org.springframework.util.StringUtils; /** @@ -80,27 +80,17 @@ public abstract class AbstractExpressionParser implements ExpressionParser { this.expressionSuffix = expressionSuffix; } - /** - * Check whether or not given criteria are expressed as an expression. - */ - public boolean isDelimitedExpression(String expressionString) { - int prefixIndex = expressionString.indexOf(getExpressionPrefix()); - if (prefixIndex == -1) { - return false; - } - int suffixIndex = expressionString.indexOf(getExpressionSuffix(), prefixIndex); - if (suffixIndex == -1) { - return false; - } else { - if (suffixIndex == prefixIndex + getExpressionPrefix().length()) { - return false; - } else { - return true; - } - } + public boolean isEvalExpressionString(String string) { + return string.startsWith(expressionPrefix) && string.endsWith(expressionSuffix); } - public final Expression parseExpression(String expressionString) throws ParserException { + public String parseEvalExpressionString(String string) { + return encloseInDelimitersIfNecessary(string); + } + + public Expression parseExpression(String expressionString, Class expressionTargetType, + Class expectedEvaluationResultType, ExpressionVariable[] expressionVariables) throws ParserException { + // TODO variables Expression[] expressions = parseExpressions(expressionString); if (expressions.length == 1) { return expressions[0]; @@ -109,15 +99,12 @@ public abstract class AbstractExpressionParser implements ExpressionParser { } } - public final SettableExpression parseSettableExpression(String expressionString) throws ParserException, - UnsupportedOperationException { - expressionString = expressionString.trim(); - // a settable expression should just be a single expression - if (expressionString.startsWith(getExpressionPrefix()) && expressionString.endsWith(getExpressionSuffix())) { - expressionString = expressionString.substring(getExpressionPrefix().length(), expressionString.length() - - getExpressionSuffix().length()); + private String encloseInDelimitersIfNecessary(String expressionString) { + if (isEvalExpressionString(expressionString)) { + return expressionString; + } else { + return expressionPrefix + expressionString + expressionSuffix; } - return doParseSettableExpression(expressionString); } /** @@ -191,14 +178,4 @@ public abstract class AbstractExpressionParser implements ExpressionParser { */ protected abstract Expression doParseExpression(String expressionString) throws ParserException; - /** - * Template method for parsing a filtered settable expression string. Subclasses should override. - * @param expressionString the expression string - * @return the parsed expression - * @throws ParserException an exception occured during parsing - * @throws UnsupportedOperationException this parser does not support settable expressions - */ - protected abstract SettableExpression doParseSettableExpression(String expressionString) throws ParserException, - UnsupportedOperationException; - } \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/BeanWrapperExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/support/BeanWrapperExpression.java deleted file mode 100644 index 1e67ed4c..00000000 --- a/spring-binding/src/main/java/org/springframework/binding/expression/support/BeanWrapperExpression.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.binding.expression.support; - -import org.springframework.beans.BeanWrapperImpl; -import org.springframework.beans.BeansException; -import org.springframework.binding.expression.EvaluationAttempt; -import org.springframework.binding.expression.EvaluationContext; -import org.springframework.binding.expression.EvaluationException; -import org.springframework.binding.expression.SetValueAttempt; -import org.springframework.binding.expression.SettableExpression; -import org.springframework.util.Assert; - -/** - * An expression evaluator that uses the Spring bean wrapper. - * - * @author Keith Donald - */ -class BeanWrapperExpression implements SettableExpression { - - /** - * The expression. - */ - private String expression; - - public BeanWrapperExpression(String expression) { - this.expression = expression; - } - - public int hashCode() { - return expression.hashCode(); - } - - public boolean equals(Object o) { - if (!(o instanceof BeanWrapperExpression)) { - return false; - } - BeanWrapperExpression other = (BeanWrapperExpression) o; - return expression.equals(other.expression); - } - - public Object evaluate(Object target, EvaluationContext context) throws EvaluationException { - try { - return new BeanWrapperImpl(target).getPropertyValue(expression); - } catch (BeansException e) { - throw new EvaluationException(new EvaluationAttempt(this, target, context), e); - } - } - - public void evaluateToSet(Object target, Object value, EvaluationContext context) throws EvaluationException { - try { - Assert.notNull(target, "The target object to evaluate is required"); - new BeanWrapperImpl(target).setPropertyValue(expression, value); - } catch (BeansException e) { - throw new EvaluationException(new SetValueAttempt(this, target, value, context), e); - } - } - - public String toString() { - return expression; - } -} \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/BeanWrapperExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/support/BeanWrapperExpressionParser.java deleted file mode 100644 index bd4f6b96..00000000 --- a/spring-binding/src/main/java/org/springframework/binding/expression/support/BeanWrapperExpressionParser.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.binding.expression.support; - -import org.springframework.binding.expression.Expression; -import org.springframework.binding.expression.ParserException; -import org.springframework.binding.expression.SettableExpression; - -/** - * An expression parser that parses bean wrapper expressions. - * - * @author Keith Donald - */ -public class BeanWrapperExpressionParser extends AbstractExpressionParser { - - protected Expression doParseExpression(String expressionString) throws ParserException { - return doParseSettableExpression(expressionString); - } - - public SettableExpression doParseSettableExpression(String expressionString) throws ParserException { - return new BeanWrapperExpression(expressionString); - } -} \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/CollectionAddingExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/support/CollectionAddingExpression.java index e18136a6..4950828b 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/support/CollectionAddingExpression.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/support/CollectionAddingExpression.java @@ -17,11 +17,9 @@ package org.springframework.binding.expression.support; import java.util.Collection; -import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.EvaluationException; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.SetValueAttempt; -import org.springframework.binding.expression.SettableExpression; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; @@ -30,7 +28,7 @@ import org.springframework.util.Assert; * * @author Keith Donald */ -public class CollectionAddingExpression implements SettableExpression { +public class CollectionAddingExpression implements Expression { /** * The expression that resolves a mutable collection reference. @@ -45,14 +43,14 @@ public class CollectionAddingExpression implements SettableExpression { this.collectionExpression = collectionExpression; } - public Object evaluate(Object target, EvaluationContext context) throws EvaluationException { - return collectionExpression.evaluate(target, context); + public Object getValue(Object target) throws EvaluationException { + return collectionExpression.getValue(target); } - public void evaluateToSet(Object target, Object value, EvaluationContext context) throws EvaluationException { - Object result = evaluate(target, context); + public void setValue(Object target, Object value) throws EvaluationException { + Object result = getValue(target); if (result == null) { - throw new EvaluationException(new SetValueAttempt(this, target, value, null), new IllegalArgumentException( + throw new EvaluationException(new SetValueAttempt(this, target, value), new IllegalArgumentException( "The collection expression evaluated to a [null] reference")); } Assert.isInstanceOf(Collection.class, result, "Not a collection: "); diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/CompositeStringExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/support/CompositeStringExpression.java index 89ce2581..72795c28 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/support/CompositeStringExpression.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/support/CompositeStringExpression.java @@ -15,7 +15,6 @@ */ package org.springframework.binding.expression.support; -import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.EvaluationException; import org.springframework.binding.expression.Expression; import org.springframework.core.style.ToStringCreator; @@ -41,14 +40,18 @@ public class CompositeStringExpression implements Expression { this.expressions = expressions; } - public Object evaluate(Object target, EvaluationContext evaluationContext) throws EvaluationException { + public Object getValue(Object target) throws EvaluationException { StringBuffer buffer = new StringBuffer(128); for (int i = 0; i < expressions.length; i++) { - buffer.append(expressions[i].evaluate(target, evaluationContext)); + buffer.append(expressions[i].getValue(target)); } return buffer.toString(); } + public void setValue(Object target, Object value) throws EvaluationException { + throw new UnsupportedOperationException("Cannot set a composite string expression value"); + } + public String toString() { return new ToStringCreator(this).append("expressions", expressions).toString(); } diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/support/StaticExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/support/StaticExpression.java index 7ed9bdf9..c7496cd5 100644 --- a/spring-binding/src/main/java/org/springframework/binding/expression/support/StaticExpression.java +++ b/spring-binding/src/main/java/org/springframework/binding/expression/support/StaticExpression.java @@ -15,7 +15,6 @@ */ package org.springframework.binding.expression.support; -import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.EvaluationException; import org.springframework.binding.expression.Expression; import org.springframework.util.ObjectUtils; @@ -25,7 +24,7 @@ import org.springframework.util.ObjectUtils; * * @author Keith Donald */ -public class StaticExpression implements Expression { +public final class StaticExpression implements Expression { /** * The value expression. @@ -56,10 +55,14 @@ public class StaticExpression implements Expression { return ObjectUtils.nullSafeEquals(value, other.value); } - public Object evaluate(Object target, EvaluationContext context) throws EvaluationException { + public Object getValue(Object target) throws EvaluationException { return value; } + public void setValue(Object target, Object value) throws EvaluationException { + this.value = value; + } + public String toString() { return String.valueOf(value); } diff --git a/spring-binding/src/main/java/org/springframework/binding/mapping/Mapping.java b/spring-binding/src/main/java/org/springframework/binding/mapping/Mapping.java index c58db23b..d8dce049 100644 --- a/spring-binding/src/main/java/org/springframework/binding/mapping/Mapping.java +++ b/spring-binding/src/main/java/org/springframework/binding/mapping/Mapping.java @@ -19,7 +19,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.binding.convert.ConversionExecutor; import org.springframework.binding.expression.Expression; -import org.springframework.binding.expression.SettableExpression; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; @@ -41,7 +40,7 @@ public class Mapping implements AttributeMapper { /** * The target expression to set on a target object to map to. */ - private final SettableExpression targetExpression; + private final Expression targetExpression; /** * A type converter to apply during the mapping process. @@ -59,7 +58,7 @@ public class Mapping implements AttributeMapper { * @param targetExpression the target expression * @param typeConverter a type converter */ - public Mapping(Expression sourceExpression, SettableExpression targetExpression, ConversionExecutor typeConverter) { + public Mapping(Expression sourceExpression, Expression targetExpression, ConversionExecutor typeConverter) { this(sourceExpression, targetExpression, typeConverter, false); } @@ -70,8 +69,8 @@ public class Mapping implements AttributeMapper { * @param typeConverter a type converter * @param required whether or not this mapping is required */ - protected Mapping(Expression sourceExpression, SettableExpression targetExpression, - ConversionExecutor typeConverter, boolean required) { + protected Mapping(Expression sourceExpression, Expression targetExpression, ConversionExecutor typeConverter, + boolean required) { Assert.notNull(sourceExpression, "The source expression is required"); Assert.notNull(targetExpression, "The target expression is required"); this.sourceExpression = sourceExpression; @@ -88,7 +87,7 @@ public class Mapping implements AttributeMapper { */ public void map(Object source, Object target, MappingContext context) { // get source value - Object sourceValue = sourceExpression.evaluate(source, null); + Object sourceValue = sourceExpression.getValue(source); if (sourceValue == null) { if (required) { throw new RequiredMappingException("This mapping is required; evaluation of expression '" @@ -108,7 +107,7 @@ public class Mapping implements AttributeMapper { logger.debug("Mapping '" + sourceExpression + "' value [" + sourceValue + "] to target property '" + targetExpression + "'; setting property value to [" + targetValue + "]"); } - targetExpression.evaluateToSet(target, targetValue, null); + targetExpression.setValue(target, targetValue); } public boolean equals(Object o) { diff --git a/spring-binding/src/main/java/org/springframework/binding/mapping/MappingBuilder.java b/spring-binding/src/main/java/org/springframework/binding/mapping/MappingBuilder.java index 6d836956..7ce80446 100644 --- a/spring-binding/src/main/java/org/springframework/binding/mapping/MappingBuilder.java +++ b/spring-binding/src/main/java/org/springframework/binding/mapping/MappingBuilder.java @@ -20,7 +20,6 @@ import org.springframework.binding.convert.ConversionService; import org.springframework.binding.convert.support.DefaultConversionService; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ExpressionParser; -import org.springframework.binding.expression.SettableExpression; import org.springframework.binding.expression.support.CollectionAddingExpression; import org.springframework.util.Assert; @@ -61,7 +60,7 @@ public class MappingBuilder { /** * The target mapping settable expression. */ - private SettableExpression targetExpression; + private Expression targetExpression; /** * The type of the object returned by evaluating the source expression. @@ -102,7 +101,7 @@ public class MappingBuilder { * @return this, to support call-chaining */ public MappingBuilder source(String expressionString) { - sourceExpression = expressionParser.parseExpression(expressionString); + sourceExpression = expressionParser.parseExpression(expressionString, Object.class, Object.class, null); return this; } @@ -112,7 +111,7 @@ public class MappingBuilder { * @return this, to support call-chaining */ public MappingBuilder target(String expressionString) { - targetExpression = (SettableExpression) expressionParser.parseExpression(expressionString); + targetExpression = expressionParser.parseExpression(expressionString, Object.class, Object.class, null); return this; } @@ -122,7 +121,8 @@ public class MappingBuilder { * @return this, to support call-chaining */ public MappingBuilder targetCollection(String expressionString) { - targetExpression = new CollectionAddingExpression(expressionParser.parseSettableExpression(expressionString)); + targetExpression = new CollectionAddingExpression(expressionParser.parseExpression(expressionString, + Object.class, Object.class, null)); return this; } @@ -164,7 +164,7 @@ public class MappingBuilder { public Mapping value() { Assert.notNull(sourceExpression, "The source expression must be set at a minimum"); if (targetExpression == null) { - targetExpression = (SettableExpression) sourceExpression; + targetExpression = sourceExpression; } ConversionExecutor typeConverter = null; if (sourceType != null) { diff --git a/spring-binding/src/main/java/org/springframework/binding/mapping/RequiredMapping.java b/spring-binding/src/main/java/org/springframework/binding/mapping/RequiredMapping.java index 0e659319..39410065 100644 --- a/spring-binding/src/main/java/org/springframework/binding/mapping/RequiredMapping.java +++ b/spring-binding/src/main/java/org/springframework/binding/mapping/RequiredMapping.java @@ -17,7 +17,6 @@ package org.springframework.binding.mapping; import org.springframework.binding.convert.ConversionExecutor; import org.springframework.binding.expression.Expression; -import org.springframework.binding.expression.SettableExpression; /** * A mapping that is required. @@ -32,7 +31,7 @@ public class RequiredMapping extends Mapping { * @param targetPropertyExpression the target property expression * @param typeConverter a type converter */ - public RequiredMapping(Expression sourceExpression, SettableExpression targetPropertyExpression, + public RequiredMapping(Expression sourceExpression, Expression targetPropertyExpression, ConversionExecutor typeConverter) { super(sourceExpression, targetPropertyExpression, typeConverter, true); } diff --git a/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContextFactory.java b/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContextFactory.java new file mode 100644 index 00000000..221956cb --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/message/DefaultMessageContextFactory.java @@ -0,0 +1,88 @@ +package org.springframework.binding.message; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import org.springframework.context.MessageSource; +import org.springframework.context.i18n.LocaleContextHolder; +import org.springframework.util.Assert; +import org.springframework.util.CachingMapDecorator; + +/** + * Default message context factory that simply stores messages indexed in a map by their source. Suitable for use in + * most Spring applications that use Spring message sources for message resource bundles. Holds a reference to a Spring + * message resource bundle for performing message text resolution. + * + * @author Keith Donald + */ +public class DefaultMessageContextFactory implements MessageContextFactory { + + private MessageSource messageSource; + + /** + * Create a new message context factory. + * @param messageSource + */ + public DefaultMessageContextFactory(MessageSource messageSource) { + Assert.notNull(messageSource, "The message source is required"); + this.messageSource = messageSource; + } + + public StateManageableMessageContext createMessageContext() { + return new MessageContextImpl(messageSource); + } + + private static class MessageContextImpl implements StateManageableMessageContext { + + private MessageSource messageSource; + + private Map objectMessages = new CachingMapDecorator() { + protected Object create(Object objectId) { + return new ArrayList(); + } + }; + + public MessageContextImpl(MessageSource messageSource) { + this.messageSource = messageSource; + } + + public Serializable createMessagesMemento() { + return new HashMap(objectMessages); + } + + public void restoreMessages(Serializable messagesMemento) { + this.objectMessages.putAll((Map) messagesMemento); + } + + public void addMessage(MessageResolver messageResolver) { + Locale currentLocale = LocaleContextHolder.getLocale(); + Message message = messageResolver.resolveMessage(messageSource, currentLocale); + List messages = (List) objectMessages.get(message.getSource()); + messages.add(message); + } + + public Message[] getMessages() { + List messages = new ArrayList(); + Iterator i = objectMessages.keySet().iterator(); + while (i.hasNext()) { + messages.addAll((List) objectMessages.get(i.next())); + } + return (Message[]) messages.toArray(new Message[messages.size()]); + } + + public Message[] getMessages(Object source) { + List messages = (List) objectMessages.get(source); + return (Message[]) messages.toArray(new Message[messages.size()]); + } + + public void clearMessages() { + objectMessages.clear(); + } + + } +} \ No newline at end of file diff --git a/spring-binding/src/main/java/org/springframework/binding/message/Message.java b/spring-binding/src/main/java/org/springframework/binding/message/Message.java new file mode 100644 index 00000000..35d24c14 --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/message/Message.java @@ -0,0 +1,57 @@ +package org.springframework.binding.message; + +import java.io.Serializable; + +/** + * An object of communication that provides text information from a source. For example, a validation message may inform + * a web application user a business rule was violated. A messages comes from a source, has text providing the basis for + * communication, and has severity indicating the priority or intensity of the message for its receiver. + * + * @author Keith Donald + */ +public class Message implements Serializable { + + private Object source; + + private String text; + + private Severity severity; + + /** + * Creates a new message. + * @param source the source of the message + * @param text the message text + * @param severity the message severity + */ + public Message(Object source, String text, Severity severity) { + super(); + this.source = source; + this.text = text; + this.severity = severity; + } + + /** + * Returns the source of this message. The source is the object that sent the message. + * @return the source + */ + public Object getSource() { + return source; + } + + /** + * Returns the message text. The text is the message's communication payload. + * @return the message text + */ + public String getText() { + return text; + } + + /** + * Returns the severity of this message. The severity indicates the intensity or priority of the communication. + * @return the message severity + */ + public Severity getSeverity() { + return severity; + } + +} diff --git a/spring-binding/src/main/java/org/springframework/binding/message/MessageContext.java b/spring-binding/src/main/java/org/springframework/binding/message/MessageContext.java new file mode 100644 index 00000000..7440999c --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/message/MessageContext.java @@ -0,0 +1,32 @@ +package org.springframework.binding.message; + +/** + * A context for recording and retrieving messages for display. + */ +public interface MessageContext { + + /** + * Get all messages in this context. The messages returned should be suitable for display as-is. + * @return the messages + */ + public Message[] getMessages(); + + /** + * Get all messages in this context from the source provided. + * @param source the source that recorded the message + * @return the source's messages + */ + public Message[] getMessages(Object source); + + /** + * Add a new message to this context. + * @param messageResolver the resolver that will resolve the message to be added + */ + public void addMessage(MessageResolver messageResolver); + + /** + * Clear all messages added to this context. + */ + public void clearMessages(); + +} diff --git a/spring-binding/src/main/java/org/springframework/binding/message/MessageContextFactory.java b/spring-binding/src/main/java/org/springframework/binding/message/MessageContextFactory.java new file mode 100644 index 00000000..5226fc1b --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/message/MessageContextFactory.java @@ -0,0 +1,16 @@ +package org.springframework.binding.message; + +/** + * A factory for creating message context's whose internal state can be externally managed. Encapsulates the message + * context implementation used in a given environment. + * + * @author Keith Donald + */ +public interface MessageContextFactory { + + /** + * Create a new message context. + * @return the message context, initially empty, capable of having its state managed by an external care-taker. + */ + public StateManageableMessageContext createMessageContext(); +} diff --git a/spring-binding/src/main/java/org/springframework/binding/message/MessageResolver.java b/spring-binding/src/main/java/org/springframework/binding/message/MessageResolver.java new file mode 100644 index 00000000..7d3eab92 --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/message/MessageResolver.java @@ -0,0 +1,24 @@ +package org.springframework.binding.message; + +import java.util.Locale; + +import org.springframework.context.MessageSource; + +/** + * A factory for a Message. Allows a Message to be internationalized and to be resolved from a + * {@link MessageSource message resource bundle}. + * + * @author Keith Donald + * @see Message + * @see MessageSource + */ +public interface MessageResolver { + + /** + * Resolve the message from the message source using the current locale. + * @param messageSource the message source, an abstraction for a resource bundle + * @param locale the current locale of this request + * @return the resolved message + */ + public Message resolveMessage(MessageSource messageSource, Locale locale); +} diff --git a/spring-binding/src/main/java/org/springframework/binding/message/Messages.java b/spring-binding/src/main/java/org/springframework/binding/message/Messages.java new file mode 100644 index 00000000..ccb8c72f --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/message/Messages.java @@ -0,0 +1,225 @@ +package org.springframework.binding.message; + +import java.util.Locale; + +import org.springframework.context.MessageSource; + +/** + * A convenient factory for creating {@link MessageResolver} objects programmatically. Often used by model code such as + * validation logic to conveniently record validation messages. Supports the production of "text" message resolvers that + * hard-code their message text, as well as message resolvers that retrieve their text from a + * {@link MessageSource message resource bundle}. + * + * @author Keith Donald + */ +public class Messages implements MessageResolver { + + private Object source; + + private String code; + + private Severity severity; + + private Object[] args; + + private String defaultText; + + private Messages(Object source, String code, Severity severity, Object[] args, String defaultText) { + this.source = source; + this.code = code; + this.severity = severity; + this.args = args; + this.defaultText = defaultText; + } + + public Message resolveMessage(MessageSource messageSource, Locale locale) { + if (messageSource != null && (code != null && code.length() > 0)) { + return new Message(source, getMessageText(messageSource, locale), severity); + } else { + return new Message(source, defaultText, severity); + } + } + + /** + * Creates a message resolver that creates a INFO {@link Message} with the text provided. + * @param text the raw message text that will be used as-is + * @return the message resolver + */ + public static Messages text(String text) { + return new Messages(null, null, Severity.INFO, null, text); + } + + /** + * Creates a message resolver that creates a {@link Message} with the text and severity provided. + * @param text the raw message text that will be used as-is + * @param severity the desired message severity + * @return the message resolver + */ + public static Messages text(String text, Severity severity) { + return new Messages(null, null, severity, null, text); + } + + /** + * Creates a message resolver that creates a {@link Severity#INFO info} {@link Message message} with its text + * resolved from a message bundle by using the provided message code. + * @param code the message code + * @return the message resolver + */ + public static Messages info(String code) { + return new Messages(null, code, Severity.INFO, null, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#WARNING warning} {@link Message message} with its text + * resolved from a message bundle by using the provided message code. + * @param code the message code + * @return the message resolver + */ + public static Messages warning(String code) { + return new Messages(null, code, Severity.WARNING, null, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#ERROR error} {@link Message message} with its text + * resolved from a message bundle by using the provided message code. + * @param code the message code + * @return the message resolver + */ + public static Messages error(String code) { + return new Messages(null, code, Severity.ERROR, null, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#INFO info} {@link Message message} with its text + * resolved from a message bundle by using the provided message code and message arguments. + * @param code the message code + * @param args the message arguments + * @return the message resolver + */ + public static Messages info(String code, Object[] args) { + return new Messages(null, code, Severity.INFO, args, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#WARNING warning} {@link Message message} with its text + * resolved from a message bundle by using the provided message code and message arguments. + * @param code the message code + * @param args the message arguments + * @return the message resolver + */ + public static Messages warning(String code, Object[] args) { + return new Messages(null, code, Severity.WARNING, args, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#ERROR error} {@link Message message} with its text + * resolved from a message bundle by using the provided message code and message arguments. + * @param code the message code + * @param args the message arguments + * @return the message resolver + */ + public static Messages error(String code, Object[] args) { + return new Messages(null, code, Severity.ERROR, args, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#INFO info} {@link Message message} from the source with + * the text provided. + * @param source the source of the message + * @param text the message text + * @return the message resolver + */ + public static Messages text(Object source, String text) { + return new Messages(source, null, Severity.INFO, null, text); + } + + /** + * Creates a message resolver that creates a {@link Message message} from the source with the text and severity + * provided. + * @param source the source of the message + * @param text the message text + * @param severity the message severity + * @return the message resolver + */ + public static Messages text(Object source, String text, Severity severity) { + return new Messages(source, null, severity, null, text); + } + + /** + * Creates a message resolver that creates a {@link Severity#INFO info} {@link Message message} from the source with + * its text resolved from a message bundle by using the provided message code. + * @param source the source of the message + * @param code the message code + * @return the message resolver + */ + public static Messages info(Object source, String code) { + return new Messages(source, code, Severity.INFO, null, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#WARNING warning} {@link Message message} from the + * source with its text resolved from a message bundle by using the provided message code. + * @param source the source of the message + * @param code the message code + * @return the message resolver + */ + public static Messages warning(Object source, String code) { + return new Messages(source, code, Severity.WARNING, null, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#ERROR error} {@link Message message} from the source + * with its text resolved from a message bundle by using the provided message code. + * @param source the source of the message + * @param code the message code + * @return the message resolver + */ + public static Messages error(Object source, String code) { + return new Messages(source, code, Severity.ERROR, null, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#INFO info} {@link Message message} from the source with + * its text resolved from a message bundle by using the provided message code and message arguments. + * @param source the source of the message + * @param code the message code + * @param args the message arguments + * @return the message resolver + */ + public static Messages info(Object source, String code, Object[] args) { + return new Messages(source, code, Severity.INFO, args, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#WARNING warning} {@link Message message} from the + * source with its text resolved from a message bundle by using the provided message code and message arguments. + * @param source the source of the message + * @param code the message code + * @param args the message arguments + * @return the message resolver + */ + public static Messages warning(Object source, String code, Object[] args) { + return new Messages(source, code, Severity.WARNING, args, null); + } + + /** + * Creates a message resolver that creates a {@link Severity#ERROR error} {@link Message message} from the source + * with its text resolved from a message bundle by using the provided message code and message arguments. + * @param source the source of the message + * @param code the message code + * @param args the message arguments + * @return the message resolver + */ + public static Messages error(Object source, String code, Object[] args) { + return new Messages(source, code, Severity.ERROR, args, null); + } + + private String getMessageText(MessageSource source, Locale locale) { + if (defaultText == null) { + return source.getMessage(code, args, locale); + } else { + return source.getMessage(code, args, defaultText, locale); + } + } + +} diff --git a/spring-binding/src/main/java/org/springframework/binding/message/Severity.java b/spring-binding/src/main/java/org/springframework/binding/message/Severity.java new file mode 100644 index 00000000..de7a64a6 --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/message/Severity.java @@ -0,0 +1,32 @@ +package org.springframework.binding.message; + +import org.springframework.core.enums.StaticLabeledEnum; + +/** + * Enum exposing supported message severities. + * + * @author Keith Donald + * @see Message + */ +public class Severity extends StaticLabeledEnum { + + /** + * The "Informational" severity. Used to indicate a successful operation or result. + */ + public static final Severity INFO = new Severity(0, "Info"); + + /** + * The "Warning" severity. Used to indicate there is a minor problem, or to inform the message receiver of possible + * misuse, or to indicate a problem may arise in the future. + */ + public static final Severity WARNING = new Severity(1, "Warning"); + + /** + * THe "Error" severity. Used to indicate a significant problem like a business rule violation. + */ + public static final Severity ERROR = new Severity(2, "Error"); + + private Severity(int code, String label) { + super(code, label); + } +} diff --git a/spring-binding/src/main/java/org/springframework/binding/message/StateManageableMessageContext.java b/spring-binding/src/main/java/org/springframework/binding/message/StateManageableMessageContext.java new file mode 100644 index 00000000..67aa21a7 --- /dev/null +++ b/spring-binding/src/main/java/org/springframework/binding/message/StateManageableMessageContext.java @@ -0,0 +1,26 @@ +package org.springframework.binding.message; + +import java.io.Serializable; + +/** + * A message context whose internal state can be managed by an external care-taker. State management employs the GOF + * Memento pattern. This context can produce a serializable memento representing its internal state at any time. A + * care-taker can then use that memento at a later time to restore any context instance to a previous state. + * + * @author Keith Donald + */ +public interface StateManageableMessageContext extends MessageContext { + + /** + * Create a serializable memento (token) representing a snapshot of the internal state of this message context. + * @return the messages memento + */ + public Serializable createMessagesMemento(); + + /** + * Set the state of this context from the memento provided. After this call, the messages in this context will match + * what is encapsulated inside the memento. Any previous state will be overridden. + * @param messagesMemento the messages memento + */ + public void restoreMessages(Serializable messagesMemento); +} diff --git a/spring-binding/src/main/java/org/springframework/binding/method/MethodInvoker.java b/spring-binding/src/main/java/org/springframework/binding/method/MethodInvoker.java index 28e30520..67e71790 100644 --- a/spring-binding/src/main/java/org/springframework/binding/method/MethodInvoker.java +++ b/spring-binding/src/main/java/org/springframework/binding/method/MethodInvoker.java @@ -70,7 +70,7 @@ public class MethodInvoker { Object[] arguments = new Object[parameters.size()]; for (int i = 0; i < parameters.size(); i++) { Parameter parameter = parameters.getParameter(i); - Object argument = parameter.evaluateArgument(argumentSource, null); + Object argument = parameter.evaluateArgument(argumentSource); arguments[i] = applyTypeConversion(argument, parameter.getType()); } Class[] parameterTypes = parameters.getTypesArray(); diff --git a/spring-binding/src/main/java/org/springframework/binding/method/Parameter.java b/spring-binding/src/main/java/org/springframework/binding/method/Parameter.java index 45888eef..455d7541 100644 --- a/spring-binding/src/main/java/org/springframework/binding/method/Parameter.java +++ b/spring-binding/src/main/java/org/springframework/binding/method/Parameter.java @@ -15,7 +15,6 @@ */ package org.springframework.binding.method; -import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.Expression; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; @@ -66,12 +65,11 @@ public class Parameter { /** * Evaluate this method parameter against the provided argument source, returning a single method argument value. - * @param argumentSource the meyhod argument source - * @param context the evaluation context + * @param argumentSource the method argument source * @return the method argument value */ - public Object evaluateArgument(Object argumentSource, EvaluationContext context) { - return name.evaluate(argumentSource, context); + public Object evaluateArgument(Object argumentSource) { + return name.getValue(argumentSource); } public boolean equals(Object obj) { diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/el/ELExpressionParserTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/el/ELExpressionParserTests.java index 236d9553..a8938d41 100644 --- a/spring-binding/src/test/java/org/springframework/binding/expression/el/ELExpressionParserTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/expression/el/ELExpressionParserTests.java @@ -1,92 +1,160 @@ package org.springframework.binding.expression.el; -import java.util.HashMap; -import java.util.Map; +import java.util.ArrayList; +import java.util.List; + +import javax.el.ELContext; +import javax.el.ELResolver; +import javax.el.FunctionMapper; +import javax.el.VariableMapper; import junit.framework.TestCase; -import org.easymock.EasyMock; import org.jboss.el.ExpressionFactoryImpl; import org.springframework.binding.expression.Expression; -import org.springframework.binding.expression.support.TestBean; -import org.springframework.binding.expression.support.TestMethods; +import org.springframework.binding.expression.ExpressionVariable; -/** - * Tests to exercise the extended method invoking expression extensions of JBoss-el. - * @author Jeremy Grelle - */ public class ELExpressionParserTests extends TestCase { - ELExpressionParser parser = new ELExpressionParser(new ExpressionFactoryImpl()); + private ELExpressionParser parser = new ELExpressionParser(new ExpressionFactoryImpl()); - Map context; - - Map container; - - TestMethods target; - - protected void setUp() throws Exception { - context = new HashMap(); - container = new HashMap(); - target = (TestMethods) EasyMock.createMock(TestMethods.class); - context.put("container", container); - container.put("myObject", target); + public void setUp() { + parser.putContextFactory(TestBean.class, new TestELContextFactory()); } - public void testWithIntParam() { - String expression = "#{container.myObject.doSomethingWithInt(container.param1)}"; - int param = 5; - container.put("param1", new Integer(param)); - target.doSomethingWithInt(param); - EasyMock.replay(new Object[] { target }); + private static class TestELContextFactory implements ELContextFactory { + public ELContext getELContext(final Object target, final VariableMapper variableMapper) { + return new ELContext() { + public ELResolver getELResolver() { + return new DefaultELResolver(target, null); + } - parser.parseExpression(expression).evaluate(context, null); - EasyMock.verify(new Object[] { target }); + public FunctionMapper getFunctionMapper() { + return null; + } + public VariableMapper getVariableMapper() { + return variableMapper; + } + }; + } } - public void testReturnWithIntParam() { - String expected = "sucess"; - String expression = "#{container.myObject.returnStringFromInt(container.param1)}"; - int param = 5; - container.put("param1", new Integer(param)); - EasyMock.expect(target.returnStringFromInt(param)).andReturn(expected); - EasyMock.replay(new Object[] { target }); - - String result = (String) parser.parseExpression(expression).evaluate(context, null); - EasyMock.verify(new Object[] { target }); - assertEquals(expected, result); + public void testParseEvalExpression() { + String expressionString = "#{value}"; + Class expressionTargetType = TestBean.class; + Class expectedEvaluationResultType = String.class; + ExpressionVariable[] expressionVariables = null; + Expression exp = parser.parseExpression(expressionString, expressionTargetType, expectedEvaluationResultType, + expressionVariables); + TestBean target = new TestBean(); + assertEquals("foo", exp.getValue(target)); } - public void testReturnWithIntAndObject() { - String expected = "success"; - String expression = "#{container.myObject.returnStringFromIntAndObject(container.param1, container.param2)}"; - int param1 = 5; - container.put("param1", new Integer(param1)); - TestBean param2 = new TestBean(); - container.put("param2", param2); - EasyMock.expect(target.returnStringFromIntAndObject(param1, param2)).andReturn(expected); - EasyMock.replay(new Object[] { target }); - - String result = (String) parser.parseExpression(expression).evaluate(context, null); - EasyMock.verify(new Object[] { target }); - assertEquals(expected, result); + public void testParseLiteralExpressionStringAsEvalExpression() { + String expressionString = "value"; + Class expressionTargetType = TestBean.class; + Class expectedEvaluationResultType = String.class; + ExpressionVariable[] expressionVariables = null; + Expression exp = parser.parseExpression(parser.parseEvalExpressionString(expressionString), + expressionTargetType, expectedEvaluationResultType, expressionVariables); + TestBean target = new TestBean(); + assertEquals("foo", exp.getValue(target)); } - public void testEmptyMethod() { - - String expStr1 = "#{foo.bar()}"; - Expression result1 = parser.parseExpression(expStr1); - assertNotNull(result1); - assertEquals(expStr1, result1.toString()); + public void testParseLiteralExpression() { + String expressionString = "value"; + Class expressionTargetType = TestBean.class; + Class expectedEvaluationResultType = String.class; + ExpressionVariable[] expressionVariables = null; + Expression exp = parser.parseExpression(expressionString, expressionTargetType, expectedEvaluationResultType, + expressionVariables); + TestBean target = new TestBean(); + assertEquals("value", exp.getValue(target)); } - public void testMethodWithParams() { - - String expStr1 = "#{foo.bar(moe.curly, groucho.harpo)}"; - Expression result1 = parser.parseExpression(expStr1); - assertNotNull(result1); - assertEquals(expStr1, result1.toString()); + public void testParseExpressionWithVariables() { + String expressionString = "#{value}#{max}"; + Class expressionTargetType = TestBean.class; + Class expectedEvaluationResultType = String.class; + ExpressionVariable[] expressionVariables = new ExpressionVariable[] { new ExpressionVariable("max", + "#{maximum}") }; + Expression exp = parser.parseExpression(expressionString, expressionTargetType, expectedEvaluationResultType, + expressionVariables); + TestBean target = new TestBean(); + assertEquals("foo2", exp.getValue(target)); } + public void testParseExpressionWithVariables2() { + String expressionString = "#{value}#{bean.encode(value)}"; + Class expressionTargetType = TestBean.class; + Class expectedEvaluationResultType = String.class; + ExpressionVariable[] expressionVariables = null; + Expression exp = parser.parseExpression(expressionString, expressionTargetType, expectedEvaluationResultType, + expressionVariables); + TestBean target = new TestBean(new TestBean()); + assertEquals("foo!foo", exp.getValue(target)); + } + + public void testParseExpressionCoerceToInteger() { + String expressionString = "#{maximum}#{max}"; + Class expressionTargetType = TestBean.class; + Class expectedEvaluationResultType = Integer.class; + ExpressionVariable[] expressionVariables = new ExpressionVariable[] { new ExpressionVariable("max", + "#{maximum}") }; + Expression exp = parser.parseExpression(expressionString, expressionTargetType, expectedEvaluationResultType, + expressionVariables); + TestBean target = new TestBean(); + assertEquals(new Integer(22), exp.getValue(target)); + } + + public static class TestBean { + private String value = "foo"; + + private int maximum = 2; + + private TestBean bean; + + private List list = new ArrayList(); + + public TestBean() { + initList(); + } + + public TestBean(TestBean bean) { + this.bean = bean; + initList(); + } + + private void initList() { + list.add("1"); + list.add("2"); + list.add("3"); + } + + public TestBean getBean() { + return bean; + } + + public String getValue() { + return value; + } + + public String encode(String data) { + return "!" + data; + } + + public void setValue(String value) { + + } + + public int getMaximum() { + return maximum; + } + + public void setMaximum(int maximum) { + this.maximum = maximum; + } + + } } diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/ognl/OgnlExpressionParserTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/ognl/OgnlExpressionParserTests.java index 92d104a5..bd0220c5 100644 --- a/spring-binding/src/test/java/org/springframework/binding/expression/ognl/OgnlExpressionParserTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/expression/ognl/OgnlExpressionParserTests.java @@ -19,8 +19,6 @@ import junit.framework.TestCase; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ParserException; -import org.springframework.binding.expression.ognl.OgnlExpressionParser; -import org.springframework.binding.expression.support.TestBean; /** * Unit tests for {@link org.springframework.binding.expression.ognl.OgnlExpressionParser}. @@ -33,44 +31,44 @@ public class OgnlExpressionParserTests extends TestCase { public void testParseSimpleDelimited() { String exp = "${flag}"; - Expression e = parser.parseExpression(exp); + Expression e = parser.parseExpression(exp, null, null, null); assertNotNull(e); - Boolean b = (Boolean) e.evaluate(bean, null); + Boolean b = (Boolean) e.getValue(bean); assertFalse(b.booleanValue()); } public void testParseSimple() { String exp = "flag"; - Expression e = parser.parseExpression(exp); + Expression e = parser.parseExpression(exp, null, null, null); assertNotNull(e); - Boolean b = (Boolean) e.evaluate(bean, null); + Boolean b = (Boolean) e.getValue(bean); assertFalse(b.booleanValue()); } public void testParseNull() { - Expression e = parser.parseExpression(null); + Expression e = parser.parseExpression(null, null, null, null); assertNotNull(e); - assertNull(e.evaluate(bean, null)); + assertNull(e.getValue(bean)); } public void testParseEmpty() { - Expression e = parser.parseExpression(""); + Expression e = parser.parseExpression("", null, null, null); assertNotNull(e); - assertEquals("", e.evaluate(bean, null)); + assertEquals("", e.getValue(bean)); } public void testParseComposite() { String exp = "hello ${flag} ${flag} ${flag}"; - Expression e = parser.parseExpression(exp); + Expression e = parser.parseExpression(exp, null, null, null); assertNotNull(e); - String str = (String) e.evaluate(bean, null); + String str = (String) e.getValue(bean); assertEquals("hello false false false", str); } public void testEnclosedCompositeNotSupported() { String exp = "${hello ${flag} ${flag} ${flag}}"; try { - parser.parseExpression(exp); + parser.parseExpression(exp, null, null, null); fail("Should've failed - not intended use"); } catch (ParserException e) { } @@ -78,14 +76,13 @@ public class OgnlExpressionParserTests extends TestCase { public void testSyntaxError1() { try { - parser.parseExpression("${"); + parser.parseExpression("${", null, null, null); fail(); } catch (ParserException e) { } - try { String exp = "hello ${flag} ${abcd defg"; - parser.parseExpression(exp); + parser.parseExpression(exp, null, null, null); fail("Should've failed - not intended use"); } catch (ParserException e) { } @@ -93,50 +90,38 @@ public class OgnlExpressionParserTests extends TestCase { public void testSyntaxError2() { try { - parser.parseExpression("${}"); + parser.parseExpression("${}", null, null, null); fail("Should've failed - not intended use"); } catch (ParserException e) { } - try { String exp = "hello ${flag} ${}"; - parser.parseExpression(exp); + parser.parseExpression(exp, null, null, null); fail("Should've failed - not intended use"); } catch (ParserException e) { } } - public void testIsDelimitedExpression() { - assertTrue(parser.isDelimitedExpression("${foo}")); - assertTrue(parser.isDelimitedExpression("${foo ${foo}}")); - assertTrue(parser.isDelimitedExpression("foo ${bar}")); - } - - public void testIsNotDelimitedExpression() { - assertFalse(parser.isDelimitedExpression("foo")); - assertFalse(parser.isDelimitedExpression("foo ${")); - assertFalse(parser.isDelimitedExpression("$foo}")); - assertFalse(parser.isDelimitedExpression("foo ${}")); - } - - public void testCollectionContructionSyntax() { + public void testCollectionConstructionSyntax() { // lists - parser.parseExpression("name in {null, \"Untitled\"}"); - parser.parseExpression("${name in {null, \"Untitled\"}}"); + parser.parseExpression("name in {null, \"Untitled\"}", null, null, null); + parser.parseExpression("${name in {null, \"Untitled\"}}", null, null, null); // native arrays - parser.parseExpression("new int[] {1, 2, 3}"); - parser.parseExpression("${new int[] {1, 2, 3}}"); + parser.parseExpression("new int[] {1, 2, 3}", null, null, null); + parser.parseExpression("${new int[] {1, 2, 3}}", null, null, null); // maps - parser.parseExpression("#{ 'foo' : 'foo value', 'bar' : 'bar value' }"); - parser.parseExpression("${#{ 'foo' : 'foo value', 'bar' : 'bar value' }}"); - parser.parseExpression("#@java.util.LinkedHashMap@{ 'foo' : 'foo value', 'bar' : 'bar value' }"); - parser.parseExpression("${#@java.util.LinkedHashMap@{ 'foo' : 'foo value', 'bar' : 'bar value' }}"); + parser.parseExpression("#{ 'foo' : 'foo value', 'bar' : 'bar value' }", null, null, null); + parser.parseExpression("${#{ 'foo' : 'foo value', 'bar' : 'bar value' }}", null, null, null); + parser.parseExpression("#@java.util.LinkedHashMap@{ 'foo' : 'foo value', 'bar' : 'bar value' }", null, null, + null); + parser.parseExpression("${#@java.util.LinkedHashMap@{ 'foo' : 'foo value', 'bar' : 'bar value' }}", null, null, + null); // complex examples - parser.parseExpression("b,#{1:2}"); - parser.parseExpression("${b,#{1:2}}"); - parser.parseExpression("a${b,#{1:2},e}f${g,#{3:4},j}k"); + parser.parseExpression("b,#{1:2}", null, null, null); + parser.parseExpression("${b,#{1:2}}", null, null, null); + parser.parseExpression("a${b,#{1:2},e}f${g,#{3:4},j}k", null, null, null); } } \ No newline at end of file diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/TestBean.java b/spring-binding/src/test/java/org/springframework/binding/expression/ognl/TestBean.java similarity index 94% rename from spring-binding/src/test/java/org/springframework/binding/expression/support/TestBean.java rename to spring-binding/src/test/java/org/springframework/binding/expression/ognl/TestBean.java index e8f97636..8b6f5a9d 100644 --- a/spring-binding/src/test/java/org/springframework/binding/expression/support/TestBean.java +++ b/spring-binding/src/test/java/org/springframework/binding/expression/ognl/TestBean.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.binding.expression.support; +package org.springframework.binding.expression.ognl; import java.util.ArrayList; import java.util.List; diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/CollectionAddingExpressionTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/support/CollectionAddingExpressionTests.java deleted file mode 100644 index 5cf232bd..00000000 --- a/spring-binding/src/test/java/org/springframework/binding/expression/support/CollectionAddingExpressionTests.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.binding.expression.support; - -import java.util.ArrayList; - -import junit.framework.TestCase; - -import org.springframework.binding.expression.Expression; -import org.springframework.binding.expression.ExpressionParser; - -/** - * Unit tests for {@link org.springframework.binding.expression.support.CollectionAddingExpression}. - */ -public class CollectionAddingExpressionTests extends TestCase { - - ExpressionParser parser = new BeanWrapperExpressionParser(); - - TestBean bean = new TestBean(); - - Expression exp = parser.parseExpression("list"); - - public void testEvaluation() { - ArrayList list = new ArrayList(); - bean.setList(list); - CollectionAddingExpression colExp = new CollectionAddingExpression(exp); - assertSame(list, colExp.evaluate(bean, null)); - } - - public void testAddToCollection() { - CollectionAddingExpression colExp = new CollectionAddingExpression(exp); - colExp.evaluateToSet(bean, "1", null); - colExp.evaluateToSet(bean, "2", null); - assertEquals("1", bean.getList().get(0)); - assertEquals("2", bean.getList().get(1)); - } - - public void testNotACollection() { - Expression exp = parser.parseExpression("flag"); - CollectionAddingExpression colExp = new CollectionAddingExpression(exp); - try { - colExp.evaluateToSet(bean, "1", null); - fail("not a collection"); - } catch (IllegalArgumentException e) { - } - } - - public void testNoAddOnNullValue() { - CollectionAddingExpression colExp = new CollectionAddingExpression(exp); - colExp.evaluateToSet(bean, null, null); - colExp.evaluateToSet(bean, "2", null); - assertEquals("2", bean.getList().get(0)); - } -} \ No newline at end of file diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/SimpleExpressionTests.java b/spring-binding/src/test/java/org/springframework/binding/expression/support/SimpleExpressionTests.java deleted file mode 100644 index 18576100..00000000 --- a/spring-binding/src/test/java/org/springframework/binding/expression/support/SimpleExpressionTests.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.binding.expression.support; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.el.ExpressionFactoryImpl; -import org.springframework.binding.expression.EvaluationException; -import org.springframework.binding.expression.ExpressionParser; -import org.springframework.binding.expression.ParserException; -import org.springframework.binding.expression.el.ELExpressionParser; -import org.springframework.binding.expression.ognl.OgnlExpressionParser; - -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Tests simple expressions. Any expression language capable enough for real life usage should be able to pass these - * tests. - * - * @author Erwin Vervaet - * @author Jeremy Grelle - */ -public class SimpleExpressionTests extends TestCase { - - private ExpressionParser expressionParser; - private String expressionPrefix; - private TestBean bean; - - public static TestSuite suite() { - TestSuite suite = new TestSuite(); - suite.addTest(new SimpleExpressionTests("testGetValue", new OgnlExpressionParser(), "$")); - suite.addTest(new SimpleExpressionTests("testSetValue", new OgnlExpressionParser(), "$")); - suite.addTest(new SimpleExpressionTests("testSyntaxError", new OgnlExpressionParser(), "$")); - suite.addTest(new SimpleExpressionTests("testGetValue", new BeanWrapperExpressionParser(), "$")); - suite.addTest(new SimpleExpressionTests("testSetValue", new BeanWrapperExpressionParser(), "$")); - suite.addTest(new SimpleExpressionTests("testSyntaxError", new BeanWrapperExpressionParser(), "$")); - suite.addTest(new SimpleExpressionTests("testGetValue", new ELExpressionParser(new ExpressionFactoryImpl()), - "#")); - suite.addTest(new SimpleExpressionTests("testSetValue", new ELExpressionParser(new ExpressionFactoryImpl()), - "#")); - suite.addTest(new SimpleExpressionTests("testSyntaxError", new ELExpressionParser(new ExpressionFactoryImpl()), - "#")); - return suite; - } - - public SimpleExpressionTests(String name, ExpressionParser expressionParser, String expressionPrefix) { - super(name); - this.expressionParser = expressionParser; - this.expressionPrefix = expressionPrefix; - } - - protected void setUp() throws Exception { - bean = new TestBean(); - bean.setFlag(true); - List list = new ArrayList(); - list.add("foo"); - list.add("bar"); - bean.setList(list); - } - - public void testGetValue() { - assertEquals(Boolean.TRUE, expressionParser.parseExpression(expressionPrefix + "{flag}").evaluate(bean, null)); - assertSame(bean.getList(), expressionParser.parseExpression(expressionPrefix + "{list}").evaluate(bean, null)); - assertEquals("foo", expressionParser.parseExpression(expressionPrefix + "{list[0]}").evaluate(bean, null)); - } - - public void testSetValue() { - expressionParser.parseSettableExpression(expressionPrefix + "{flag}").evaluateToSet(bean, Boolean.FALSE, null); - assertFalse(bean.isFlag()); - List newList = new ArrayList(); - newList.add("boo"); - expressionParser.parseSettableExpression(expressionPrefix + "{list}").evaluateToSet(bean, newList, null); - assertSame(newList, bean.getList()); - expressionParser.parseSettableExpression(expressionPrefix + "{list[0]}").evaluateToSet(bean, "baa", null); - assertEquals("baa", bean.getList().get(0)); - } - - public void testSyntaxError() { - try { - expressionParser.parseExpression(expressionPrefix + "{foo(}").evaluate(bean, null); - fail("should have failed"); - } catch (ParserException e) { - } catch (EvaluationException e) { - } - } -} diff --git a/spring-binding/src/test/java/org/springframework/binding/expression/support/TestMethods.java b/spring-binding/src/test/java/org/springframework/binding/expression/support/TestMethods.java deleted file mode 100644 index 478e6080..00000000 --- a/spring-binding/src/test/java/org/springframework/binding/expression/support/TestMethods.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.springframework.binding.expression.support; - -public interface TestMethods { - - public void doSomethingWithInt(int arg); - - public String returnStringFromInt(int arg); - - public String returnStringFromIntAndObject(int arg, TestBean bean); -} diff --git a/spring-binding/src/test/java/org/springframework/binding/method/TextToMethodSignatureTests.java b/spring-binding/src/test/java/org/springframework/binding/method/TextToMethodSignatureTests.java index 577a9c6e..76764291 100644 --- a/spring-binding/src/test/java/org/springframework/binding/method/TextToMethodSignatureTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/method/TextToMethodSignatureTests.java @@ -103,7 +103,7 @@ public class TextToMethodSignatureTests extends TestCase { assertEquals("foo", signature.getMethodName()); assertEquals(1, signature.getParameters().size()); assertNull(signature.getParameters().getParameter(0).getType()); - assertEquals("{1, 2, 3}", signature.getParameters().getParameter(0).getName().toString()); + assertEquals("{ 1, 2, 3 }", signature.getParameters().getParameter(0).getName().toString()); } public void testCollectionConstructionSyntaxWithType() { @@ -111,7 +111,7 @@ public class TextToMethodSignatureTests extends TestCase { assertEquals("foo", signature.getMethodName()); assertEquals(1, signature.getParameters().size()); assertEquals(java.util.List.class, signature.getParameters().getParameter(0).getType()); - assertEquals("{1, 2, 3}", signature.getParameters().getParameter(0).getName().toString()); + assertEquals("{ 1, 2, 3 }", signature.getParameters().getParameter(0).getName().toString()); signature = (MethodSignature) converter.convert("foo(a${b,#{1:2},e}f${g,#{3:4},j}k)"); } diff --git a/spring-faces/.classpath b/spring-faces/.classpath index aa7873af..8e880c82 100644 --- a/spring-faces/.classpath +++ b/spring-faces/.classpath @@ -6,11 +6,9 @@ - - @@ -32,5 +30,7 @@ + + diff --git a/spring-faces/.settings/org.eclipse.jdt.core.prefs b/spring-faces/.settings/org.eclipse.jdt.core.prefs index c416b20c..32388fa4 100644 --- a/spring-faces/.settings/org.eclipse.jdt.core.prefs +++ b/spring-faces/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Wed Aug 15 08:35:04 EDT 2007 +#Tue Sep 25 14:10:50 EDT 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= @@ -9,9 +9,9 @@ org.eclipse.jdt.core.codeComplete.localSuffixes= org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.3 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.3 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -79,7 +79,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/spring-faces/.settings/org.eclipse.jdt.ui.prefs b/spring-faces/.settings/org.eclipse.jdt.ui.prefs index 02fbb7e9..77e40833 100644 --- a/spring-faces/.settings/org.eclipse.jdt.ui.prefs +++ b/spring-faces/.settings/org.eclipse.jdt.ui.prefs @@ -1,14 +1,13 @@ -#Wed Aug 15 08:38:35 EDT 2007 +#Tue Sep 25 14:14:24 EDT 2007 eclipse.preferences.version=1 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true formatter_profile=_Spring Java Conventions formatter_settings_version=11 -internal.default.compliance=user org.eclipse.jdt.ui.exception.name=e org.eclipse.jdt.ui.gettersetter.use.is=false org.eclipse.jdt.ui.javadoc=false org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true +org.eclipse.jdt.ui.overrideannotation=false org.eclipse.jdt.ui.text.custom_code_templates= sp_cleanup.add_default_serial_version_id=true sp_cleanup.add_generated_serial_version_id=false diff --git a/spring-faces/project.properties b/spring-faces/project.properties index 7319dec3..01ae0b16 100644 --- a/spring-faces/project.properties +++ b/spring-faces/project.properties @@ -7,5 +7,5 @@ project.base.version=2.0-m2-SNAPSHOT #project.version=${project.base.version} #ivy.status=release -javac.source=1.4 -javac.target=1.4 +javac.source=1.5 +javac.target=1.5 diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/ext.js b/spring-faces/src/main/java/META-INF/ext/ext.js similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/ext.js rename to spring-faces/src/main/java/META-INF/ext/ext.js diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/css/ext-all.css b/spring-faces/src/main/java/META-INF/ext/resources/css/ext-all.css similarity index 82% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/css/ext-all.css rename to spring-faces/src/main/java/META-INF/ext/resources/css/ext-all.css index 600915f9..f894f842 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/css/ext-all.css +++ b/spring-faces/src/main/java/META-INF/ext/resources/css/ext-all.css @@ -26,7 +26,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot top: 0; left: 0; border:1px solid #6593cf; - background: #c3daf9 url(../images/default/box/tb-blue.gif.spring) repeat-x 0 -16px; + background: #c3daf9 url(../images/default/box/tb-blue.gif) repeat-x 0 -16px; padding:2px; } .ext-el-mask-msg div { @@ -51,7 +51,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .x-mask-loading div { padding:5px 10px 5px 25px; - background: #eee url( '../images/default/grid/loading.gif.spring' ) no-repeat 5px 5px; + background: #eee url( '../images/default/grid/loading.gif' ) no-repeat 5px 5px; line-height: 16px; } @@ -210,7 +210,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .x-shadow .xsmc { float: left; height: 100%; - background: transparent url( ../images/default/shadow-c.png.spring ); + background: transparent url( ../images/default/shadow-c.png ); } .x-shadow .xst, .x-shadow .xsb { @@ -220,40 +220,40 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot } .x-shadow .xsml { - background: transparent url( ../images/default/shadow-lr.png.spring ) repeat-y 0 0; + background: transparent url( ../images/default/shadow-lr.png ) repeat-y 0 0; } .x-shadow .xsmr { - background: transparent url( ../images/default/shadow-lr.png.spring ) repeat-y -6px 0; + background: transparent url( ../images/default/shadow-lr.png ) repeat-y -6px 0; } .x-shadow .xstl { - background: transparent url( ../images/default/shadow.png.spring ) no-repeat 0 0; + background: transparent url( ../images/default/shadow.png ) no-repeat 0 0; } .x-shadow .xstc { - background: transparent url( ../images/default/shadow.png.spring ) repeat-x 0 -30px; + background: transparent url( ../images/default/shadow.png ) repeat-x 0 -30px; } .x-shadow .xstr { - background: transparent url( ../images/default/shadow.png.spring ) repeat-x 0 -18px; + background: transparent url( ../images/default/shadow.png ) repeat-x 0 -18px; } .x-shadow .xsbl { - background: transparent url( ../images/default/shadow.png.spring ) no-repeat 0 -12px; + background: transparent url( ../images/default/shadow.png ) no-repeat 0 -12px; } .x-shadow .xsbc { - background: transparent url( ../images/default/shadow.png.spring ) repeat-x 0 -36px; + background: transparent url( ../images/default/shadow.png ) repeat-x 0 -36px; } .x-shadow .xsbr { - background: transparent url( ../images/default/shadow.png.spring ) repeat-x 0 -6px; + background: transparent url( ../images/default/shadow.png ) repeat-x 0 -6px; } .loading-indicator { font-size: 11px; - background-image: url( '../images/default/grid/loading.gif.spring' ); + background-image: url( '../images/default/grid/loading.gif' ); background-repeat: no-repeat; background-position: left; padding-left: 20px; @@ -336,16 +336,16 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot } .x-tabs-strip .on .x-tabs-right { - background: url(../images/default/tabs/tab-sprite.gif.spring) no-repeat right 0; + background: url(../images/default/tabs/tab-sprite.gif) no-repeat right 0; } .x-tabs-strip .on .x-tabs-left { - background: url(../images/default/tabs/tab-sprite.gif.spring) no-repeat 0 -100px; + background: url(../images/default/tabs/tab-sprite.gif) no-repeat 0 -100px; } .x-tabs-strip .x-tabs-right { - background: url(../images/default/tabs/tab-sprite.gif.spring) no-repeat right -50px; + background: url(../images/default/tabs/tab-sprite.gif) no-repeat right -50px; } .x-tabs-strip .x-tabs-left { - background: url(../images/default/tabs/tab-sprite.gif.spring) no-repeat 0 -150px; + background: url(../images/default/tabs/tab-sprite.gif) no-repeat 0 -150px; } .x-tabs-strip a { @@ -366,7 +366,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .x-tabs-strip .x-tabs-closable .close-icon{ line-height: 1px; font-size:1px; - background-image:url(../images/default/layout/tab-close.gif.spring); + background-image:url(../images/default/layout/tab-close.gif); display:block; position:absolute; right:5px;top:4px; @@ -374,10 +374,10 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot cursor:pointer; } .x-tabs-strip .on .close-icon{ - background-image:url(../images/default/layout/tab-close-on.gif.spring); + background-image:url(../images/default/layout/tab-close-on.gif); } .x-tabs-strip .x-tabs-closable .close-over{ - background-image:url(../images/default/layout/tab-close-on.gif.spring); + background-image:url(../images/default/layout/tab-close-on.gif); } .x-tabs-body { border:1px solid #6593cf; @@ -390,16 +390,16 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot padding-bottom:2px; } .x-tabs-bottom .x-tabs-strip .x-tabs-right { - background: url(../images/default/tabs/tab-btm-inactive-right-bg.gif.spring) no-repeat bottom left; + background: url(../images/default/tabs/tab-btm-inactive-right-bg.gif) no-repeat bottom left; } .x-tabs-bottom .x-tabs-strip .x-tabs-left { - background: url(../images/default/tabs/tab-btm-inactive-left-bg.gif.spring) no-repeat bottom right; + background: url(../images/default/tabs/tab-btm-inactive-left-bg.gif) no-repeat bottom right; } .x-tabs-bottom .x-tabs-strip .on .x-tabs-right { - background: url(../images/default/tabs/tab-btm-right-bg.gif.spring) no-repeat bottom left; + background: url(../images/default/tabs/tab-btm-right-bg.gif) no-repeat bottom left; } .x-tabs-bottom .x-tabs-strip .on .x-tabs-left { - background: url(../images/default/tabs/tab-btm-left-bg.gif.spring) no-repeat bottom right; + background: url(../images/default/tabs/tab-btm-left-bg.gif) no-repeat bottom right; } .x-tabs-bottom .x-tabs-strip a { position:relative; @@ -427,7 +427,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .x-form-text, textarea.x-form-field{ padding: 1px 3px; - background:#fff url(../images/default/form/text-bg.gif.spring) repeat-x 0 0; + background:#fff url(../images/default/form/text-bg.gif) repeat-x 0 0; border: 1px solid #B5B8C8; } .x-form-text { @@ -489,7 +489,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot width:17px; height:21px; border:0; - background:transparent url(../images/default/form/trigger.gif.spring) no-repeat 0 0; + background:transparent url(../images/default/form/trigger.gif) no-repeat 0 0; cursor:pointer; border-bottom: 1px solid #B5B8C8; position:absolute; @@ -500,15 +500,15 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot } .x-form-field-wrap .x-form-date-trigger{ - background-image: url(../images/default/form/date-trigger.gif.spring); + background-image: url(../images/default/form/date-trigger.gif); cursor:pointer; } .x-form-field-wrap .x-form-clear-trigger{ - background-image: url(../images/default/form/clear-trigger.gif.spring); + background-image: url(../images/default/form/clear-trigger.gif); cursor:pointer; } .x-form-field-wrap .x-form-search-trigger{ - background-image: url(../images/default/form/search-trigger.gif.spring); + background-image: url(../images/default/form/search-trigger.gif); cursor:pointer; } .ext-safari .x-form-field-wrap .x-form-trigger{ @@ -560,7 +560,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .x-form-invalid, textarea.x-form-invalid{ - background:#fff url(../images/default/grid/invalid_line.gif.spring) repeat-x bottom; + background:#fff url(../images/default/grid/invalid_line.gif) repeat-x bottom; border: 1px solid #dd7870; } .ext-safari .x-form-invalid{ @@ -638,7 +638,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot padding:2px; padding-left:18px; font:normal 11px tahoma, arial, helvetica, sans-serif; - background: transparent url(../images/default/shared/warning.gif.spring) no-repeat 0 2px; + background: transparent url(../images/default/shared/warning.gif) no-repeat 0 2px; line-height:16px; width:200px; } @@ -809,7 +809,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot left:0; top:0; display:block; - background:transparent url(../images/default/form/exclamation.gif.spring) no-repeat 0 2px; + background:transparent url(../images/default/form/exclamation.gif) no-repeat 0 2px; } .x-btn{ font:normal 11px tahoma, verdana, helvetica; @@ -875,12 +875,12 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .x-btn-left{ width:3px; height:21px; - background:url(../images/default/basic-dialog/btn-sprite.gif.spring) no-repeat 0 0; + background:url(../images/default/basic-dialog/btn-sprite.gif) no-repeat 0 0; } .x-btn-right{ width:3px; height:21px; - background:url(../images/default/basic-dialog/btn-sprite.gif.spring) no-repeat 0 -21px; + background:url(../images/default/basic-dialog/btn-sprite.gif) no-repeat 0 -21px; } .x-btn-left i, .x-btn-right i{ display:block; @@ -890,7 +890,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot line-height:1px; } .x-btn-center{ - background:url(../images/default/basic-dialog/btn-sprite.gif.spring) repeat-x 0 -42px; + background:url(../images/default/basic-dialog/btn-sprite.gif) repeat-x 0 -42px; vertical-align: middle; text-align:center; padding:0 5px; @@ -927,20 +927,20 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot height:21px; padding:0 !important; display:block; - background:transparent url(../images/default/basic-dialog/btn-arrow.gif.spring) no-repeat left 3px; + background:transparent url(../images/default/basic-dialog/btn-arrow.gif) no-repeat left 3px; } .x-btn-with-menu .x-btn-center { padding-right:2px !important; } .x-btn-with-menu .x-btn-center em { display:block; - background:transparent url(../images/default/toolbar/btn-arrow.gif.spring) no-repeat right 0; + background:transparent url(../images/default/toolbar/btn-arrow.gif) no-repeat right 0; padding-right:10px; } .x-btn-text-icon .x-btn-with-menu .x-btn-center em { display:block; - background:transparent url(../images/default/toolbar/btn-arrow.gif.spring) no-repeat right 3px; + background:transparent url(../images/default/toolbar/btn-arrow.gif) no-repeat right 3px; padding-right:10px; } .x-toolbar{ @@ -948,7 +948,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot border-bottom: 1px solid #a9bfd3; display: block; padding:2px; - background:#d0def0 url(../images/default/layout/panel-title-light-bg.gif.spring) repeat-x; + background:#d0def0 url(../images/default/layout/panel-title-light-bg.gif) repeat-x; position:relative; zoom:1; } @@ -962,7 +962,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot } .mso .x-toolbar, .x-grid-mso .x-toolbar{ border: 0 none; - background: url(../images/default/grid/mso-hd.gif.spring); + background: url(../images/default/grid/mso-hd.gif); } .x-toolbar td, .x-toolbar span, .x-toolbar input, .x-toolbar div, .x-toolbar select, .x-toolbar label{ white-space: nowrap; @@ -1001,33 +1001,33 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot } .x-toolbar .x-btn-menu-arrow-wrap .x-btn-center button { width:12px; - background:transparent url(../images/default/toolbar/btn-arrow.gif.spring) no-repeat 0 3px; + background:transparent url(../images/default/toolbar/btn-arrow.gif) no-repeat 0 3px; } .x-toolbar .x-btn-text-icon .x-btn-menu-arrow-wrap .x-btn-center button { width:12px; - background:transparent url(../images/default/toolbar/btn-arrow.gif.spring) no-repeat 0 3px; + background:transparent url(../images/default/toolbar/btn-arrow.gif) no-repeat 0 3px; } .x-toolbar .x-btn-over .x-btn-menu-arrow-wrap .x-btn-center button { background-position: 0 -47px; } .x-toolbar .x-btn-over .x-btn-left{ - background:url(../images/default/toolbar/tb-btn-sprite.gif.spring) no-repeat 0 0; + background:url(../images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 0; } .x-toolbar .x-btn-over .x-btn-right{ - background:url(../images/default/toolbar/tb-btn-sprite.gif.spring) no-repeat 0 -21px; + background:url(../images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -21px; } .x-toolbar .x-btn-over .x-btn-center{ - background:url(../images/default/toolbar/tb-btn-sprite.gif.spring) repeat-x 0 -42px; + background:url(../images/default/toolbar/tb-btn-sprite.gif) repeat-x 0 -42px; } .x-toolbar .x-btn-click .x-btn-left, .x-toolbar .x-btn-pressed .x-btn-left, .x-toolbar .x-btn-menu-active .x-btn-left{ - background:url(../images/default/toolbar/tb-btn-sprite.gif.spring) no-repeat 0 -63px; + background:url(../images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -63px; } .x-toolbar .x-btn-click .x-btn-right, .x-toolbar .x-btn-pressed .x-btn-right, .x-toolbar .x-btn-menu-active .x-btn-right{ - background:url(../images/default/toolbar/tb-btn-sprite.gif.spring) no-repeat 0 -84px; + background:url(../images/default/toolbar/tb-btn-sprite.gif) no-repeat 0 -84px; } .x-toolbar .x-btn-click .x-btn-center, .x-toolbar .x-btn-pressed .x-btn-center, .x-toolbar .x-btn-menu-active .x-btn-center{ - background:url(../images/default/toolbar/tb-btn-sprite.gif.spring) repeat-x 0 -105px; + background:url(../images/default/toolbar/tb-btn-sprite.gif) repeat-x 0 -105px; } .x-toolbar .x-btn-with-menu .x-btn-center em{ @@ -1038,7 +1038,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot padding:2px; } .x-toolbar .ytb-sep { - background-image: url(../images/default/grid/grid-split.gif.spring); + background-image: url(../images/default/grid/grid-split.gif); background-position: center; background-repeat: no-repeat; display: block; @@ -1054,7 +1054,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot width:2px; } .mso .x-toolbar .ytb-sep, .x-grid-mso .x-toolbar .ytb-sep{ - background-image: url(../images/default/grid/grid-blue-split.gif.spring); + background-image: url(../images/default/grid/grid-blue-split.gif); } @@ -1075,34 +1075,34 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot height:14px; } .x-grid-page-first .x-btn-text{ - background-image: url(../images/default/grid/page-first.gif.spring); + background-image: url(../images/default/grid/page-first.gif); } .x-grid-loading .x-btn-text{ - background-image: url(../images/default/grid/done.gif.spring); + background-image: url(../images/default/grid/done.gif); } .x-grid-page-last .x-btn-text{ - background-image: url(../images/default/grid/page-last.gif.spring); + background-image: url(../images/default/grid/page-last.gif); } .x-grid-page-next .x-btn-text{ - background-image: url(../images/default/grid/page-next.gif.spring); + background-image: url(../images/default/grid/page-next.gif); } .x-grid-page-prev .x-btn-text{ - background-image: url(../images/default/grid/page-prev.gif.spring); + background-image: url(../images/default/grid/page-prev.gif); } .x-item-disabled .x-grid-loading .x-btn-text{ - background-image: url(../images/default/grid/loading.gif.spring); + background-image: url(../images/default/grid/loading.gif); } .x-item-disabled .x-grid-page-first .x-btn-text{ - background-image: url(../images/default/grid/page-first-disabled.gif.spring); + background-image: url(../images/default/grid/page-first-disabled.gif); } .x-item-disabled .x-grid-page-last .x-btn-text{ - background-image: url(../images/default/grid/page-last-disabled.gif.spring); + background-image: url(../images/default/grid/page-last-disabled.gif); } .x-item-disabled .x-grid-page-next .x-btn-text{ - background-image: url(../images/default/grid/page-next-disabled.gif.spring); + background-image: url(../images/default/grid/page-next-disabled.gif); } .x-item-disabled .x-grid-page-prev .x-btn-text{ - background-image: url(../images/default/grid/page-prev-disabled.gif.spring); + background-image: url(../images/default/grid/page-prev-disabled.gif); } .x-paging-info { position:absolute; @@ -1194,35 +1194,35 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot opacity:1; } .x-resizable-over .x-resizable-handle-east, .x-resizable-pinned .x-resizable-handle-east{ - background:url(../images/default/sizer/e-handle.gif.spring); + background:url(../images/default/sizer/e-handle.gif); background-position: left; } .x-resizable-over .x-resizable-handle-west, .x-resizable-pinned .x-resizable-handle-west{ - background:url(../images/default/sizer/e-handle.gif.spring); + background:url(../images/default/sizer/e-handle.gif); background-position: left; } .x-resizable-over .x-resizable-handle-south, .x-resizable-pinned .x-resizable-handle-south{ - background:url(../images/default/sizer/s-handle.gif.spring); + background:url(../images/default/sizer/s-handle.gif); background-position: top; } .x-resizable-over .x-resizable-handle-north, .x-resizable-pinned .x-resizable-handle-north{ - background:url(../images/default/sizer/s-handle.gif.spring); + background:url(../images/default/sizer/s-handle.gif); background-position: top; } .x-resizable-over .x-resizable-handle-southeast, .x-resizable-pinned .x-resizable-handle-southeast{ - background:url(../images/default/sizer/se-handle.gif.spring); + background:url(../images/default/sizer/se-handle.gif); background-position: top left; } .x-resizable-over .x-resizable-handle-northwest, .x-resizable-pinned .x-resizable-handle-northwest{ - background:url(../images/default/sizer/nw-handle.gif.spring); + background:url(../images/default/sizer/nw-handle.gif); background-position:bottom right; } .x-resizable-over .x-resizable-handle-northeast, .x-resizable-pinned .x-resizable-handle-northeast{ - background:url(../images/default/sizer/ne-handle.gif.spring); + background:url(../images/default/sizer/ne-handle.gif); background-position: bottom left; } .x-resizable-over .x-resizable-handle-southwest, .x-resizable-pinned .x-resizable-handle-southwest{ - background:url(../images/default/sizer/sw-handle.gif.spring); + background:url(../images/default/sizer/sw-handle.gif); background-position: top right; } .x-resizable-proxy{ @@ -1340,7 +1340,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .x-grid-header{ - background: #ebeadb url(../images/default/grid/grid-hrow.gif.spring) repeat-x; + background: #ebeadb url(../images/default/grid/grid-hrow.gif) repeat-x; overflow:hidden; position:relative; cursor:default; @@ -1356,7 +1356,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot border-bottom: 1px solid #c3daf9; } .x-grid-hd-over .x-grid-hd-text { - background: #fafafa url(../images/default/grid/grid-hrow.gif.spring) repeat-x 0 1px; + background: #fafafa url(../images/default/grid/grid-hrow.gif) repeat-x 0 1px; padding-bottom:1px; border-bottom: 1px solid #b3cae9; } @@ -1369,11 +1369,11 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot vertical-align: middle; } .x-grid-header .sort-asc .x-grid-sort-icon { - background-image: url(../images/default/grid/sort_asc.gif.spring); + background-image: url(../images/default/grid/sort_asc.gif); display: inline; } .x-grid-header .sort-desc .x-grid-sort-icon { - background-image: url(../images/default/grid/sort_desc.gif.spring); + background-image: url(../images/default/grid/sort_desc.gif); display: inline; } @@ -1396,7 +1396,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot padding-top:4px; } .x-grid-split { - background-image: url(../images/default/grid/grid-split.gif.spring); + background-image: url(../images/default/grid/grid-split.gif); background-position: center; background-repeat: no-repeat; cursor: e-resize; @@ -1416,7 +1416,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot } .x-dd-drag-proxy .x-grid-hd-inner{ - background: #ebeadb url(../images/default/grid/grid-hrow.gif.spring) repeat-x; + background: #ebeadb url(../images/default/grid/grid-hrow.gif) repeat-x; height:22px; width:120px; } @@ -1433,10 +1433,10 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot z-index:20000; } .col-move-top{ - background:transparent url(../images/default/grid/col-move-top.gif.spring) no-repeat left top; + background:transparent url(../images/default/grid/col-move-top.gif) no-repeat left top; } .col-move-bottom{ - background:transparent url(../images/default/grid/col-move-bottom.gif.spring) no-repeat left top; + background:transparent url(../images/default/grid/col-move-bottom.gif) no-repeat left top; } @@ -1462,7 +1462,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot } .x-grid-locked td.x-grid-row-marker, .x-grid-locked .x-grid-row-selected td.x-grid-row-marker{ - background: #ebeadb url(../images/default/grid/grid-hrow.gif.spring) repeat-x 0 bottom !important; + background: #ebeadb url(../images/default/grid/grid-hrow.gif) repeat-x 0 bottom !important; vertical-align:middle !important; color:black; padding:0; @@ -1479,7 +1479,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .x-grid-dirty-cell { - background: transparent url(../images/default/grid/dirty.gif.spring) no-repeat 0 0; + background: transparent url(../images/default/grid/dirty.gif) no-repeat 0 0; } .x-grid-row-alt .x-grid-dirty-cell{ @@ -1521,16 +1521,16 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot .xg-hmenu-sort-asc .x-menu-item-icon{ - background-image: url(../images/default/grid/hmenu-asc.gif.spring); + background-image: url(../images/default/grid/hmenu-asc.gif); } .xg-hmenu-sort-desc .x-menu-item-icon{ - background-image: url(../images/default/grid/hmenu-desc.gif.spring); + background-image: url(../images/default/grid/hmenu-desc.gif); } .xg-hmenu-lock .x-menu-item-icon{ - background-image: url(../images/default/grid/hmenu-lock.gif.spring); + background-image: url(../images/default/grid/hmenu-lock.gif); } .xg-hmenu-unlock .x-menu-item-icon{ - background-image: url(../images/default/grid/hmenu-unlock.gif.spring); + background-image: url(../images/default/grid/hmenu-unlock.gif); } @@ -1624,7 +1624,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot background-color:#c3daf9; } .x-layout-panel-hd{ - background-image: url(../images/default/layout/panel-title-light-bg.gif.spring); + background-image: url(../images/default/layout/panel-title-light-bg.gif); color: black; border-bottom:1px solid #98c0f4; position:relative; @@ -1665,33 +1665,33 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot background-position:center; } .x-layout-close{ - background-image:url(../images/default/layout/panel-close.gif.spring); + background-image:url(../images/default/layout/panel-close.gif); } .x-layout-stick{ - background-image:url(../images/default/layout/stick.gif.spring); + background-image:url(../images/default/layout/stick.gif); } .x-layout-collapse-west,.x-layout-expand-east{ - background-image:url(../images/default/layout/collapse.gif.spring); + background-image:url(../images/default/layout/collapse.gif); } .x-layout-expand-west,.x-layout-collapse-east{ - background-image:url(../images/default/layout/expand.gif.spring); + background-image:url(../images/default/layout/expand.gif); } .x-layout-collapse-north,.x-layout-expand-south{ - background-image:url(../images/default/layout/ns-collapse.gif.spring); + background-image:url(../images/default/layout/ns-collapse.gif); } .x-layout-expand-north,.x-layout-collapse-south{ - background-image:url(../images/default/layout/ns-expand.gif.spring); + background-image:url(../images/default/layout/ns-expand.gif); } .x-layout-split-h{ - background-image:url(../images/default/sizer/e-handle.gif.spring); + background-image:url(../images/default/sizer/e-handle.gif); background-position: left; } .x-layout-split-v{ - background-image:url(../images/default/sizer/s-handle.gif.spring); + background-image:url(../images/default/sizer/s-handle.gif); background-position: top; } .x-layout-panel .x-tabs-wrap{ - background:url(../images/default/layout/gradient-bg.gif.spring); + background:url(../images/default/layout/gradient-bg.gif); } .x-layout-panel .x-tabs-body { background-color:white; @@ -1724,7 +1724,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot border: 2px solid #6593cf; } .x-layout-panel-proxy { - background-image: url(../images/default/layout/gradient-bg.gif.spring); + background-image: url(../images/default/layout/gradient-bg.gif); background-color:#c3daf9; border:1px dashed #6593cf; z-index:10001; @@ -1782,7 +1782,7 @@ html,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquot border:1px solid #99bbe8; } .x-dlg-proxy { - background-image: url(../images/default/gradient-bg.gif.spring); + background-image: url(../images/default/gradient-bg.gif); background-color:#c3daf9; border:1px solid #6593cf; z-index:10001; @@ -1829,7 +1829,7 @@ body.x-body-masked .x-dlg select { left:300;top:0; } .x-dlg .x-dlg-hd { - background: url(../images/default/basic-dialog/hd-sprite.gif.spring) repeat-x 0 -82px; + background: url(../images/default/basic-dialog/hd-sprite.gif) repeat-x 0 -82px; background-color:navy; color:#FFF; font:bold 12px "sans serif", tahoma, verdana, helvetica; @@ -1838,16 +1838,16 @@ body.x-body-masked .x-dlg select { white-space: nowrap; } .x-dlg .x-dlg-hd-left { - background: url(../images/default/basic-dialog/hd-sprite.gif.spring) no-repeat 0 -41px; + background: url(../images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px; padding-left:3px; margin:0; } .x-dlg .x-dlg-hd-right { - background: url(../images/default/basic-dialog/hd-sprite.gif.spring) no-repeat right 0; + background: url(../images/default/basic-dialog/hd-sprite.gif) no-repeat right 0; padding-right:3px; } .x-dlg .x-dlg-dlg-body{ - background:url(../images/default/layout/gradient-bg.gif.spring); + background:url(../images/default/layout/gradient-bg.gif); border:1px solid #6593cf; border-top:0 none; padding:10px; @@ -1961,54 +1961,54 @@ body.x-body-masked .x-dlg select { visibility:inherit; } .x-dlg .x-dlg-close { - background-image:url(../images/default/basic-dialog/close.gif.spring); + background-image:url(../images/default/basic-dialog/close.gif); } .x-dlg .x-dlg-collapse { - background-image:url(../images/default/basic-dialog/collapse.gif.spring); + background-image:url(../images/default/basic-dialog/collapse.gif); } .x-dlg-collapsed .x-dlg-collapse { - background-image:url(../images/default/basic-dialog/expand.gif.spring); + background-image:url(../images/default/basic-dialog/expand.gif); } .x-dlg .x-dlg-close-over, .x-dlg .x-dlg-collapse-over { } .x-dlg div.x-resizable-handle-east{ - background-image:url(../images/default/basic-dialog/e-handle.gif.spring); + background-image:url(../images/default/basic-dialog/e-handle.gif); border:0; background-position:right; margin-right:0; } .x-dlg div.x-resizable-handle-south{ - background-image:url(../images/default/sizer/s-handle-dark.gif.spring); + background-image:url(../images/default/sizer/s-handle-dark.gif); border:0; height:6px; } .x-dlg div.x-resizable-handle-west{ - background-image:url(../images/default/basic-dialog/e-handle.gif.spring); + background-image:url(../images/default/basic-dialog/e-handle.gif); border:0; background-position:1px; } .x-dlg div.x-resizable-handle-north{ - background-image:url(../images/default/s.gif.spring); + background-image:url(../images/default/s.gif); border:0; } .x-dlg div.x-resizable-handle-northeast, .xtheme-gray .x-dlg div.x-resizable-handle-northeast{ - background-image:url(../images/default/s.gif.spring); + background-image:url(../images/default/s.gif); border:0; } .x-dlg div.x-resizable-handle-northwest, .xtheme-gray .x-dlg div.x-resizable-handle-northwest{ - background-image:url(../images/default/s.gif.spring); + background-image:url(../images/default/s.gif); border:0; } .x-dlg div.x-resizable-handle-southeast{ - background-image:url(../images/default/basic-dialog/se-handle.gif.spring); + background-image:url(../images/default/basic-dialog/se-handle.gif); background-position: bottom right; width:8px; height:8px; border:0; } .x-dlg div.x-resizable-handle-southwest{ - background-image:url(../images/default/sizer/sw-handle-dark.gif.spring); + background-image:url(../images/default/sizer/sw-handle-dark.gif); background-position: top right; margin-left:1px; margin-bottom:1px; @@ -2040,7 +2040,7 @@ body.x-body-masked .x-dlg select { } #x-msg-box .ext-mb-progress { height:18px; - background: #e0e8f3 url(../images/default/qtip/bg.gif.spring) repeat-x; + background: #e0e8f3 url(../images/default/qtip/bg.gif) repeat-x; } #x-msg-box .ext-mb-progress-bar { height:18px; @@ -2053,7 +2053,7 @@ body.x-body-masked .x-dlg select { } #x-msg-box .x-msg-box-wait { - background: transparent url(../images/default/grid/loading.gif.spring) no-repeat left; + background: transparent url(../images/default/grid/loading.gif) no-repeat left; display:block; width:300px; padding-left:18px; @@ -2104,13 +2104,13 @@ body.x-body-masked .x-dlg select { z-index:1; } .x-dd-drop-nodrop .x-dd-drop-icon{ - background-image: url(../images/default/dd/drop-no.gif.spring); + background-image: url(../images/default/dd/drop-no.gif); } .x-dd-drop-ok .x-dd-drop-icon{ - background-image: url(../images/default/dd/drop-yes.gif.spring); + background-image: url(../images/default/dd/drop-yes.gif); } .x-dd-drop-ok-add .x-dd-drop-icon{ - background-image: url(../images/default/dd/drop-add.gif.spring); + background-image: url(../images/default/dd/drop-add.gif); } .x-tree-icon, .x-tree-ec-icon, .x-tree-elbow-line, .x-tree-elbow, .x-tree-elbow-end, .x-tree-elbow-plus, .x-tree-elbow-minus, .x-tree-elbow-end-plus, .x-tree-elbow-end-minus{ border: 0 none; @@ -2134,13 +2134,13 @@ body.x-body-masked .x-dlg select { .x-tree-node-collapsed .x-tree-node-icon{ - background-image:url(../images/default/tree/folder.gif.spring); + background-image:url(../images/default/tree/folder.gif); } .x-tree-node-expanded .x-tree-node-icon{ - background-image:url(../images/default/tree/folder-open.gif.spring); + background-image:url(../images/default/tree/folder-open.gif); } .x-tree-node-leaf .x-tree-node-icon{ - background-image:url(../images/default/tree/leaf.gif.spring); + background-image:url(../images/default/tree/leaf.gif); } @@ -2161,7 +2161,7 @@ input.x-tree-node-cb { } .x-tree-node-loading .x-tree-node-icon{ - background-image:url(../images/default/tree/loading.gif.spring) !important; + background-image:url(../images/default/tree/loading.gif) !important; } .x-tree-node-loading a span{ font-style: italic; @@ -2170,25 +2170,25 @@ input.x-tree-node-cb { .x-tree-lines .x-tree-elbow{ - background-image:url(../images/default/tree/elbow.gif.spring); + background-image:url(../images/default/tree/elbow.gif); } .x-tree-lines .x-tree-elbow-plus{ - background-image:url(../images/default/tree/elbow-plus.gif.spring); + background-image:url(../images/default/tree/elbow-plus.gif); } .x-tree-lines .x-tree-elbow-minus{ - background-image:url(../images/default/tree/elbow-minus.gif.spring); + background-image:url(../images/default/tree/elbow-minus.gif); } .x-tree-lines .x-tree-elbow-end{ - background-image:url(../images/default/tree/elbow-end.gif.spring); + background-image:url(../images/default/tree/elbow-end.gif); } .x-tree-lines .x-tree-elbow-end-plus{ - background-image:url(../images/default/tree/elbow-end-plus.gif.spring); + background-image:url(../images/default/tree/elbow-end-plus.gif); } .x-tree-lines .x-tree-elbow-end-minus{ - background-image:url(../images/default/tree/elbow-end-minus.gif.spring); + background-image:url(../images/default/tree/elbow-end-minus.gif); } .x-tree-lines .x-tree-elbow-line{ - background-image:url(../images/default/tree/elbow-line.gif.spring); + background-image:url(../images/default/tree/elbow-line.gif); } @@ -2196,19 +2196,19 @@ input.x-tree-node-cb { background:transparent; } .x-tree-no-lines .x-tree-elbow-plus{ - background-image:url(../images/default/tree/elbow-plus-nl.gif.spring); + background-image:url(../images/default/tree/elbow-plus-nl.gif); } .x-tree-no-lines .x-tree-elbow-minus{ - background-image:url(../images/default/tree/elbow-minus-nl.gif.spring); + background-image:url(../images/default/tree/elbow-minus-nl.gif); } .x-tree-no-lines .x-tree-elbow-end{ background:transparent; } .x-tree-no-lines .x-tree-elbow-end-plus{ - background-image:url(../images/default/tree/elbow-end-plus-nl.gif.spring); + background-image:url(../images/default/tree/elbow-end-plus-nl.gif); } .x-tree-no-lines .x-tree-elbow-end-minus{ - background-image:url(../images/default/tree/elbow-end-minus-nl.gif.spring); + background-image:url(../images/default/tree/elbow-end-minus-nl.gif); } .x-tree-no-lines .x-tree-elbow-line{ background:transparent; @@ -2285,16 +2285,16 @@ input.x-tree-node-cb { display:none !important; } .x-tree-drop-ok-append .x-dd-drop-icon{ - background-image: url(../images/default/tree/drop-add.gif.spring); + background-image: url(../images/default/tree/drop-add.gif); } .x-tree-drop-ok-above .x-dd-drop-icon{ - background-image: url(../images/default/tree/drop-over.gif.spring); + background-image: url(../images/default/tree/drop-over.gif); } .x-tree-drop-ok-below .x-dd-drop-icon{ - background-image: url(../images/default/tree/drop-under.gif.spring); + background-image: url(../images/default/tree/drop-under.gif); } .x-tree-drop-ok-between .x-dd-drop-icon{ - background-image: url(../images/default/tree/drop-between.gif.spring); + background-image: url(../images/default/tree/drop-between.gif); } .x-tip{ @@ -2306,7 +2306,7 @@ input.x-tree-node-cb { border:0 none; } .x-tip .x-tip-close{ - background-image: url(../images/default/qtip/close.gif.spring); + background-image: url(../images/default/qtip/close.gif); height: 15px; float:right; width: 15px; @@ -2315,32 +2315,32 @@ input.x-tree-node-cb { display:none; } .x-tip .x-tip-top { - background: transparent url(../images/default/qtip/tip-sprite.gif.spring) no-repeat 0 -12px; + background: transparent url(../images/default/qtip/tip-sprite.gif) no-repeat 0 -12px; height:6px; overflow:hidden; } .x-tip .x-tip-top-left { - background: transparent url(../images/default/qtip/tip-sprite.gif.spring) no-repeat 0 0; + background: transparent url(../images/default/qtip/tip-sprite.gif) no-repeat 0 0; padding-left:6px; zoom:1; } .x-tip .x-tip-top-right { - background: transparent url(../images/default/qtip/tip-sprite.gif.spring) no-repeat right 0; + background: transparent url(../images/default/qtip/tip-sprite.gif) no-repeat right 0; padding-right:6px; zoom:1; } .x-tip .x-tip-ft { - background: transparent url(../images/default/qtip/tip-sprite.gif.spring) no-repeat 0 -18px; + background: transparent url(../images/default/qtip/tip-sprite.gif) no-repeat 0 -18px; height:6px; overflow:hidden; } .x-tip .x-tip-ft-left { - background: transparent url(../images/default/qtip/tip-sprite.gif.spring) no-repeat 0 -6px; + background: transparent url(../images/default/qtip/tip-sprite.gif) no-repeat 0 -6px; padding-left:6px; zoom:1; } .x-tip .x-tip-ft-right { - background: transparent url(../images/default/qtip/tip-sprite.gif.spring) no-repeat right -6px; + background: transparent url(../images/default/qtip/tip-sprite.gif) no-repeat right -6px; padding-right:6px; zoom:1; } @@ -2349,12 +2349,12 @@ input.x-tree-node-cb { font: normal 11px tahoma,arial,helvetica,sans-serif; } .x-tip .x-tip-bd-left { - background: #fff url(../images/default/qtip/tip-sprite.gif.spring) no-repeat 0 -24px; + background: #fff url(../images/default/qtip/tip-sprite.gif) no-repeat 0 -24px; padding-left:6px; zoom:1; } .x-tip .x-tip-bd-right { - background: transparent url(../images/default/qtip/tip-sprite.gif.spring) no-repeat right -24px; + background: transparent url(../images/default/qtip/tip-sprite.gif) no-repeat right -24px; padding-right:6px; zoom:1; } @@ -2379,32 +2379,32 @@ input.x-tree-node-cb { } .x-form-invalid-tip .x-tip-top { - background-image: url(../images/default/form/error-tip-corners.gif.spring); + background-image: url(../images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-top-left { - background-image: url(../images/default/form/error-tip-corners.gif.spring); + background-image: url(../images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-top-right { - background-image: url(../images/default/form/error-tip-corners.gif.spring); + background-image: url(../images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-ft { - background-image: url(../images/default/form/error-tip-corners.gif.spring); + background-image: url(../images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-ft-left { - background-image: url(../images/default/form/error-tip-corners.gif.spring); + background-image: url(../images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-ft-right { - background-image: url(../images/default/form/error-tip-corners.gif.spring); + background-image: url(../images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-bd-left { - background-image: url(../images/default/form/error-tip-corners.gif.spring); + background-image: url(../images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-bd-right { - background-image: url(../images/default/form/error-tip-corners.gif.spring); + background-image: url(../images/default/form/error-tip-corners.gif); } .x-form-invalid-tip .x-tip-bd .x-tip-bd-inner { padding-left:24px; - background:transparent url(../images/default/form/exclamation.gif.spring) no-repeat 2px 2px; + background:transparent url(../images/default/form/exclamation.gif) no-repeat 2px 2px; } .x-form-invalid-tip .x-tip-bd-inner { padding:2px; @@ -2423,7 +2423,7 @@ input.x-tree-node-cb { border-collapse:separate; } .x-date-middle,.x-date-left,.x-date-right { - background: url(../images/default/basic-dialog/hd-sprite.gif.spring) repeat-x 0 -83px; + background: url(../images/default/basic-dialog/hd-sprite.gif) repeat-x 0 -83px; color:#FFF; font:bold 11px "sans serif", tahoma, verdana, helvetica; overflow:hidden; @@ -2437,7 +2437,7 @@ input.x-tree-node-cb { color:#fff; } .x-date-middle .x-btn-with-menu .x-btn-center em { - background:transparent url(../images/default/toolbar/btn-arrow-light.gif.spring) no-repeat right 0; + background:transparent url(../images/default/toolbar/btn-arrow-light.gif) no-repeat right 0; } .x-date-right, .x-date-left { width:18px; @@ -2465,12 +2465,12 @@ input.x-tree-node-cb { filter: alpha(opacity=100); } .x-date-right a { - background-image: url(../images/default/shared/right-btn.gif.spring); + background-image: url(../images/default/shared/right-btn.gif); margin-right:2px; text-decoration:none !important; } .x-date-left a{ - background-image: url(../images/default/shared/left-btn.gif.spring); + background-image: url(../images/default/shared/left-btn.gif); margin-left:2px; text-decoration:none !important; } @@ -2482,7 +2482,7 @@ table.x-date-inner { width:25px; } .x-date-inner th { - background: #dfecfb url(../images/default/shared/glass-bg.gif.spring) repeat-x left top; + background: #dfecfb url(../images/default/shared/glass-bg.gif) repeat-x left top; text-align:right !important; border-bottom: 1px solid #a3bad9; font:normal 10px arial, helvetica,tahoma,sans-serif; @@ -2515,7 +2515,7 @@ table.x-date-inner { color:black; } .x-date-inner .x-date-selected a{ - background: #dfecfb url(../images/default/shared/glass-bg.gif.spring) repeat-x left top; + background: #dfecfb url(../images/default/shared/glass-bg.gif) repeat-x left top; border:1px solid #8db2e3; padding:1px 4px; } @@ -2533,7 +2533,7 @@ table.x-date-inner { .x-date-bottom { padding:4px; border-top: 1px solid #a3bad9; - background: #dfecfb url(../images/default/shared/glass-bg.gif.spring) repeat-x left top; + background: #dfecfb url(../images/default/shared/glass-bg.gif) repeat-x left top; } .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{ @@ -2594,7 +2594,7 @@ td.x-date-mp-month,td.x-date-mp-year,td.x-date-mp-ybtn { cursor:pointer; } .x-date-mp-btns { - background: #dfecfb url(../images/default/shared/glass-bg.gif.spring) repeat-x left top; + background: #dfecfb url(../images/default/shared/glass-bg.gif) repeat-x left top; } .x-date-mp-btns td { border-top: 1px solid #c5d2df; @@ -2617,7 +2617,7 @@ td.x-date-mp-month a:hover,td.x-date-mp-year a:hover { td.x-date-mp-sel a { padding:1px 3px; - background: #dfecfb url(../images/default/shared/glass-bg.gif.spring) repeat-x left top; + background: #dfecfb url(../images/default/shared/glass-bg.gif) repeat-x left top; border:1px solid #8db2e3; } .x-date-mp-ybtn a { @@ -2625,7 +2625,7 @@ td.x-date-mp-sel a { width:15px; height:15px; cursor:pointer; - background:transparent url(../images/default/panel/tool-sprites.gif.spring) no-repeat; + background:transparent url(../images/default/panel/tool-sprites.gif) no-repeat; display:block; margin:0 auto; } @@ -2650,7 +2650,7 @@ td.x-date-mp-sep { .x-menu { border:1px solid #718bb7; z-index: 15000; - background: #fff url(../images/default/menu/menu.gif.spring) repeat-y; + background: #fff url(../images/default/menu/menu.gif) repeat-y; } .ext-ie .x-menu { zoom:1; @@ -2675,7 +2675,7 @@ td.x-date-mp-sep { padding:1px; } .x-menu-item-arrow{ - background:transparent url(../images/default/menu/menu-parent.gif.spring) no-repeat right; + background:transparent url(../images/default/menu/menu-parent.gif) no-repeat right; } .x-menu-sep { display:block; @@ -2721,18 +2721,18 @@ td.x-date-mp-sep { } .x-menu-check-item .x-menu-item-icon{ - background: transparent url(../images/default/menu/unchecked.gif.spring) no-repeat center; + background: transparent url(../images/default/menu/unchecked.gif) no-repeat center; } .x-menu-item-checked .x-menu-item-icon{ - background-image:url(../images/default/menu/checked.gif.spring); + background-image:url(../images/default/menu/checked.gif); } .x-menu-group-item .x-menu-item-icon{ background: transparent; } .x-menu-item-checked .x-menu-group-item .x-menu-item-icon{ - background: transparent url(../images/default/menu/group-checked.gif.spring) no-repeat center; + background: transparent url(../images/default/menu/group-checked.gif) no-repeat center; } .x-menu-plain { @@ -2762,29 +2762,29 @@ td.x-date-mp-sep { .x-box-tl { - background: transparent url(../images/default/box/corners.gif.spring) no-repeat 0 0; + background: transparent url(../images/default/box/corners.gif) no-repeat 0 0; zoom:1; } .x-box-tc { height: 8px; - background: transparent url(../images/default/box/tb.gif.spring) repeat-x 0 0; + background: transparent url(../images/default/box/tb.gif) repeat-x 0 0; overflow: hidden; } .x-box-tr { - background: transparent url(../images/default/box/corners.gif.spring) no-repeat right -8px; + background: transparent url(../images/default/box/corners.gif) no-repeat right -8px; } .x-box-ml { - background: transparent url(../images/default/box/l.gif.spring) repeat-y 0; + background: transparent url(../images/default/box/l.gif) repeat-y 0; padding-left: 4px; overflow: hidden; zoom:1; } .x-box-mc { - background: #eee url(../images/default/box/tb.gif.spring) repeat-x 0 -16px; + background: #eee url(../images/default/box/tb.gif) repeat-x 0 -16px; padding: 4px 10px; font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif; color: #393939; @@ -2799,24 +2799,24 @@ td.x-date-mp-sep { } .x-box-mr { - background: transparent url(../images/default/box/r.gif.spring) repeat-y right; + background: transparent url(../images/default/box/r.gif) repeat-y right; padding-right: 4px; overflow: hidden; } .x-box-bl { - background: transparent url(../images/default/box/corners.gif.spring) no-repeat 0 -16px; + background: transparent url(../images/default/box/corners.gif) no-repeat 0 -16px; zoom:1; } .x-box-bc { - background: transparent url(../images/default/box/tb.gif.spring) repeat-x 0 -8px; + background: transparent url(../images/default/box/tb.gif) repeat-x 0 -8px; height: 8px; overflow: hidden; } .x-box-br { - background: transparent url(../images/default/box/corners.gif.spring) no-repeat right -24px; + background: transparent url(../images/default/box/corners.gif) no-repeat right -24px; } .x-box-tl, .x-box-bl { @@ -2830,11 +2830,11 @@ td.x-date-mp-sep { } .x-box-blue .x-box-bl, .x-box-blue .x-box-br, .x-box-blue .x-box-tl, .x-box-blue .x-box-tr { - background-image: url(../images/default/box/corners-blue.gif.spring); + background-image: url(../images/default/box/corners-blue.gif); } .x-box-blue .x-box-bc, .x-box-blue .x-box-mc, .x-box-blue .x-box-tc { - background-image: url(../images/default/box/tb-blue.gif.spring); + background-image: url(../images/default/box/tb-blue.gif); } .x-box-blue .x-box-mc { @@ -2846,11 +2846,11 @@ td.x-date-mp-sep { } .x-box-blue .x-box-ml { - background-image: url(../images/default/box/l-blue.gif.spring); + background-image: url(../images/default/box/l-blue.gif); } .x-box-blue .x-box-mr { - background-image: url(../images/default/box/r-blue.gif.spring); + background-image: url(../images/default/box/r-blue.gif); } #x-debug-browser .x-tree .x-tree-node a span { color:#222297; @@ -2915,7 +2915,7 @@ td.x-date-mp-sep { .x-combo-list-hd { font:bold 11px tahoma, arial, helvetica, sans-serif; color:#15428b; - background-image: url(../images/default/layout/panel-title-light-bg.gif.spring); + background-image: url(../images/default/layout/panel-title-light-bg.gif); border-bottom:1px solid #98c0f4; padding:3px; } @@ -2946,7 +2946,7 @@ td.x-date-mp-sep { background:white; } .x-html-editor-tb .x-btn-text { - background:transparent url(../images/default/editor/tb-sprite.gif.spring) no-repeat; + background:transparent url(../images/default/editor/tb-sprite.gif) no-repeat; } .x-html-editor-tb .x-edit-bold .x-btn-text { background-position:0 0; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-arrow.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/btn-arrow.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-arrow.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/btn-arrow.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-sprite.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/btn-sprite.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/btn-sprite.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/btn-sprite.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/close.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/close.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/close.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/close.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/collapse.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/collapse.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/collapse.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/collapse.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/e-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/e-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/e-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/e-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/expand.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/expand.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/expand.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/expand.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/hd-sprite.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/hd-sprite.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/hd-sprite.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/hd-sprite.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/progress.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/progress.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress2.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/progress2.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/progress2.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/progress2.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/s-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/s-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/s-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/s-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/se-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/se-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/basic-dialog/se-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/basic-dialog/se-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners-blue.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/box/corners-blue.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners-blue.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/box/corners-blue.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/box/corners.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/corners.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/box/corners.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l-blue.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/box/l-blue.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l-blue.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/box/l-blue.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/box/l.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/l.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/box/l.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r-blue.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/box/r-blue.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r-blue.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/box/r-blue.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/box/r.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/r.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/box/r.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb-blue.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/box/tb-blue.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb-blue.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/box/tb-blue.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/box/tb.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/box/tb.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/box/tb.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-add.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/dd/drop-add.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-add.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/dd/drop-add.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-no.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/dd/drop-no.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-no.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/dd/drop-no.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-yes.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/dd/drop-yes.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/dd/drop-yes.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/dd/drop-yes.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/editor/tb-sprite.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/editor/tb-sprite.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/editor/tb-sprite.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/editor/tb-sprite.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/clear-trigger.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/clear-trigger.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.psd b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/clear-trigger.psd similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/clear-trigger.psd rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/clear-trigger.psd diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/date-trigger.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/date-trigger.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.psd b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/date-trigger.psd similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/date-trigger.psd rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/date-trigger.psd diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/error-tip-corners.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/error-tip-corners.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/error-tip-corners.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/error-tip-corners.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/exclamation.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/exclamation.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/exclamation.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/exclamation.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/search-trigger.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/search-trigger.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.psd b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/search-trigger.psd similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/search-trigger.psd rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/search-trigger.psd diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/text-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/text-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/text-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/text-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger-tpl.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/trigger-tpl.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger-tpl.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/trigger-tpl.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/trigger.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/trigger.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.psd b/spring-faces/src/main/java/META-INF/ext/resources/images/default/form/trigger.psd similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/form/trigger.psd rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/form/trigger.psd diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/gradient-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/gradient-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/gradient-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/gradient-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/Thumbs.db b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/Thumbs.db similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/Thumbs.db rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/Thumbs.db diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-left-white.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/arrow-left-white.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-left-white.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/arrow-left-white.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-right-white.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/arrow-right-white.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/arrow-right-white.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/arrow-right-white.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-bottom.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/col-move-bottom.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-bottom.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/col-move-bottom.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-top.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/col-move-top.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/col-move-top.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/col-move-top.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/dirty.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/dirty.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/dirty.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/dirty.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/done.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/done.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/done.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/done.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-no.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/drop-no.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-no.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/drop-no.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-yes.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/drop-yes.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/drop-yes.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/drop-yes.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/footer-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/footer-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/footer-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/footer-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-hd.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-blue-hd.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-hd.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-blue-hd.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-split.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-blue-split.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-blue-split.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-blue-split.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-hrow.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-hrow.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-hrow.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-hrow.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-loading.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-loading.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-loading.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-loading.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-split.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-split.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-split.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-split.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-vista-hd.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-vista-hd.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid-vista-hd.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid-vista-hd.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hd-btn.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-hd-btn.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hd-btn.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-hd-btn.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow-over.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-hrow-over.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow-over.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-hrow-over.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-hrow.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-hrow.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-hrow.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-special-col-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-special-col-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/grid3-special-col-sel-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hd-pop.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hd-pop.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hd-pop.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hd-pop.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-asc.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-asc.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-asc.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-asc.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-desc.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-desc.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-desc.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-desc.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-lock.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-lock.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.png b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-lock.png similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-lock.png rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-lock.png diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-unlock.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-unlock.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.png b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-unlock.png similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/hmenu-unlock.png rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/hmenu-unlock.png diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/invalid_line.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/invalid_line.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/invalid_line.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/invalid_line.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/loading.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/loading.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/loading.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/loading.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/mso-hd.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/mso-hd.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/mso-hd.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/mso-hd.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/nowait.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/nowait.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/nowait.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/nowait.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first-disabled.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-first-disabled.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first-disabled.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-first-disabled.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-first.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-first.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-first.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last-disabled.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-last-disabled.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last-disabled.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-last-disabled.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-last.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-last.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-last.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next-disabled.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-next-disabled.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next-disabled.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-next-disabled.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-next.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-next.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-next.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev-disabled.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-prev-disabled.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev-disabled.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-prev-disabled.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-prev.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/page-prev.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/page-prev.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/pick-button.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/pick-button.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/pick-button.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/pick-button.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/refresh.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/refresh.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/refresh.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/refresh.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-check-sprite.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/row-check-sprite.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-check-sprite.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/row-check-sprite.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-expand-sprite.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/row-expand-sprite.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-expand-sprite.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/row-expand-sprite.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-over.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/row-over.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-over.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/row-over.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-sel.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/row-sel.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/row-sel.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/row-sel.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_asc.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/sort_asc.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_asc.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/sort_asc.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_desc.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/sort_desc.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/sort_desc.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/sort_desc.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/wait.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/wait.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/grid/wait.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/grid/wait.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/collapse.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/collapse.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/collapse.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/collapse.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/expand.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/expand.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/expand.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/expand.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/gradient-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/gradient-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/gradient-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/gradient-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-collapse.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/ns-collapse.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-collapse.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/ns-collapse.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-expand.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/ns-expand.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/ns-expand.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/ns-expand.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-close.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/panel-close.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-close.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/panel-close.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/panel-title-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/panel-title-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-light-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/panel-title-light-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/panel-title-light-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/panel-title-light-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stick.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/stick.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stick.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/stick.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stuck.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/stuck.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/stuck.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/stuck.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close-on.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/tab-close-on.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close-on.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/tab-close-on.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/tab-close.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/layout/tab-close.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/layout/tab-close.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/checked.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/checked.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/checked.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/checked.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/group-checked.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/group-checked.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/group-checked.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/group-checked.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu-parent.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/menu-parent.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu-parent.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/menu-parent.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/menu.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/menu.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/menu.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/unchecked.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/unchecked.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/menu/unchecked.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/menu/unchecked.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/panel/tool-sprites.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/panel/tool-sprites.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/panel/tool-sprites.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/panel/tool-sprites.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/qtip/bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/qtip/bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/close.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/qtip/close.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/close.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/qtip/close.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/tip-sprite.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/qtip/tip-sprite.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/qtip/tip-sprite.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/qtip/tip-sprite.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/s.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/s.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/s.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/s.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-c.png b/spring-faces/src/main/java/META-INF/ext/resources/images/default/shadow-c.png similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-c.png rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/shadow-c.png diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-lr.png b/spring-faces/src/main/java/META-INF/ext/resources/images/default/shadow-lr.png similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow-lr.png rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/shadow-lr.png diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow.png b/spring-faces/src/main/java/META-INF/ext/resources/images/default/shadow.png similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shadow.png rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/shadow.png diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/calendar.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/calendar.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/calendar.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/calendar.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/glass-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/glass-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/glass-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/glass-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/left-btn.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/left-btn.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/left-btn.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/left-btn.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/right-btn.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/right-btn.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/right-btn.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/right-btn.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/warning.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/warning.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/shared/warning.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/shared/warning.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle-dark.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/e-handle-dark.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle-dark.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/e-handle-dark.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/e-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/e-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/e-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle-dark.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/ne-handle-dark.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle-dark.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/ne-handle-dark.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/ne-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/ne-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/ne-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle-dark.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/nw-handle-dark.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle-dark.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/nw-handle-dark.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/nw-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/nw-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/nw-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle-dark.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/s-handle-dark.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle-dark.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/s-handle-dark.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/s-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/s-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/s-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle-dark.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/se-handle-dark.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle-dark.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/se-handle-dark.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/se-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/se-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/se-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/square.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/square.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/square.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/square.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle-dark.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/sw-handle-dark.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle-dark.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/sw-handle-dark.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/sw-handle.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/sizer/sw-handle.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/sizer/sw-handle.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-btm-inactive-left-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-btm-inactive-right-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-left-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-btm-left-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-left-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-btm-left-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-right-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-btm-right-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-btm-right-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-btm-right-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-sprite.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-sprite.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tabs/tab-sprite.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tabs/tab-sprite.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow-light.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/btn-arrow-light.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow-light.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/btn-arrow-light.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/btn-arrow.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-arrow.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/btn-arrow.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-over-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/btn-over-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/btn-over-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/btn-over-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/gray-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/gray-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/gray-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/gray-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-bg.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/tb-bg.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-bg.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/tb-bg.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-btn-sprite.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/tb-btn-sprite.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/toolbar/tb-btn-sprite.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/toolbar/tb-btn-sprite.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-add.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-add.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-add.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-add.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-between.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-between.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-between.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-between.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-no.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-no.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-no.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-no.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-over.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-over.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-over.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-over.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-under.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-under.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-under.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-under.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-yes.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-yes.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/drop-yes.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/drop-yes.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus-nl.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end-minus-nl.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus-nl.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end-minus-nl.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end-minus.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-minus.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end-minus.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus-nl.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end-plus-nl.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus-nl.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end-plus-nl.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end-plus.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end-plus.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end-plus.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-end.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-end.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-line.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-line.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-line.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-line.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus-nl.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-minus-nl.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus-nl.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-minus-nl.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-minus.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-minus.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-minus.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus-nl.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-plus-nl.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus-nl.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-plus-nl.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-plus.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow-plus.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow-plus.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/elbow.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/elbow.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder-open.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/folder-open.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder-open.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/folder-open.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/folder.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/folder.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/folder.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/leaf.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/leaf.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/leaf.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/leaf.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/loading.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/loading.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/loading.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/loading.gif diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/s.gif b/spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/s.gif similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/ext/resources/images/default/tree/s.gif rename to spring-faces/src/main/java/META-INF/ext/resources/images/default/tree/s.gif diff --git a/spring-faces/src/main/java/META-INF/faces-config.xml b/spring-faces/src/main/java/META-INF/faces-config.xml index 0d8ebe24..22ac2fa0 100644 --- a/spring-faces/src/main/java/META-INF/faces-config.xml +++ b/spring-faces/src/main/java/META-INF/faces-config.xml @@ -1,19 +1,21 @@ - + - - - - org.springframework.faces.webflow.FlowNavigationHandler - org.springframework.faces.webflow.el.DelegatingFlowVariableResolver - org.springframework.web.jsf.DelegatingVariableResolver - + + org.springframework.faces.webflow.FlowLifecycleFactory + org.springframework.faces.webflow.FlowFacesContextFactory + org.springframework.faces.webflow.FlowRenderKitFactory + - - org.springframework.faces.webflow.FlowPhaseListener - + + org.springframework.faces.webflow.FlowActionListener + org.springframework.webflow.core.expression.el.RequestContextELResolver + org.springframework.webflow.core.expression.el.ScopeSearchingELResolver + org.springframework.faces.webflow.FlowExecutionViewHandler + spring.faces.ClientTextValidator diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/SpringFaces.js b/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces.js similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/ui/SpringFaces.js rename to spring-faces/src/main/java/META-INF/spring-faces/SpringFaces.js diff --git a/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELExpressionParser.java b/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELExpressionParser.java deleted file mode 100644 index a840e5e8..00000000 --- a/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELExpressionParser.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.springframework.faces.el; - -import javax.el.ELContext; -import javax.el.ELResolver; -import javax.el.ExpressionFactory; -import javax.el.FunctionMapper; -import javax.el.VariableMapper; -import javax.faces.context.FacesContext; - -import org.springframework.binding.expression.el.DefaultELContextFactory; -import org.springframework.binding.expression.el.ELExpressionParser; - -/** - * A JSF-aware ExpressionParser that allows JSF 1.1 managed beans to be referenced in expressions in the FlowDefinition. - * @author Jeremy Grelle - */ -public class Jsf11ELExpressionParser extends ELExpressionParser { - - /** - * Creates a new JSF 1.1 compatible expression parser - * @param expressionFactory the unified EL expression factory implementation - */ - public Jsf11ELExpressionParser(ExpressionFactory expressionFactory) { - super(expressionFactory, new Jsf11ELContextFactory()); - } - - /** - * Inner helper class that plus in the EL Resolver that resolves expressions using JSF 1.1 APIs. - */ - private static class Jsf11ELContextFactory extends DefaultELContextFactory { - - public ELContext getEvaluationContext(Object target) { - return new Jsf11ELContext(FacesContext.getCurrentInstance()); - } - - private static class Jsf11ELContext extends ELContext { - - private ELResolver baseResolver; - - public Jsf11ELContext(FacesContext context) { - baseResolver = new Jsf11ELResolverAdapter(context); - } - - public ELResolver getELResolver() { - return baseResolver; - } - - public FunctionMapper getFunctionMapper() { - return null; - } - - public VariableMapper getVariableMapper() { - return null; - } - } - } - -} diff --git a/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELResolverAdapter.java b/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELResolverAdapter.java deleted file mode 100644 index 7628ab23..00000000 --- a/spring-faces/src/main/java/org/springframework/faces/el/Jsf11ELResolverAdapter.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.springframework.faces.el; - -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import javax.el.ELContext; -import javax.el.ELException; -import javax.el.ELResolver; -import javax.el.PropertyNotWritableException; -import javax.faces.context.FacesContext; -import javax.faces.el.EvaluationException; -import javax.faces.el.PropertyNotFoundException; -import javax.faces.el.PropertyResolver; -import javax.faces.el.VariableResolver; - -/** - * An adapter for using JSF 1.1 {@link VariableResolver}s and {@link PropertyResolver}s in an {@link ELContext}. - * @author Jeremy Grelle0 - */ -public class Jsf11ELResolverAdapter extends ELResolver { - - private FacesContext facesContext; - - /** - * Creates a new adapter that adapts JSF 1.1 EL constructs to the Unified EL Resolver construct. - * @param facesContext the current faces context - */ - public Jsf11ELResolverAdapter(FacesContext facesContext) { - this.facesContext = facesContext; - } - - public Class getCommonPropertyType(ELContext context, Object base) { - return Object.class; - } - - public Iterator getFeatureDescriptors(ELContext context, Object base) { - return Collections.EMPTY_LIST.iterator(); - } - - public Class getType(ELContext context, Object base, Object property) { - if (property == null) { - return null; - } - try { - context.setPropertyResolved(true); - if (base == null) { - Object var = getVariableResolver().resolveVariable(facesContext, property.toString()); - return (var != null) ? var.getClass() : null; - } else { - if (base instanceof List || base.getClass().isArray()) { - return getPropertyResolver().getType(base, Integer.parseInt(property.toString())); - } else { - return getPropertyResolver().getType(base, property); - } - } - } catch (PropertyNotFoundException ex) { - throw new javax.el.PropertyNotFoundException(ex.getMessage(), ex.getCause()); - } catch (EvaluationException ex) { - throw new ELException(ex.getMessage(), ex.getCause()); - } - } - - public Object getValue(ELContext context, Object base, Object property) { - if (property == null) { - return null; - } - try { - context.setPropertyResolved(true); - if (base == null) { - return getVariableResolver().resolveVariable(facesContext, property.toString()); - } else { - if (base instanceof List || base.getClass().isArray()) { - return getPropertyResolver().getValue(base, Integer.parseInt(property.toString())); - } else { - return getPropertyResolver().getValue(base, property); - } - } - } catch (PropertyNotFoundException ex) { - throw new javax.el.PropertyNotFoundException(ex.getMessage(), ex.getCause()); - } catch (EvaluationException ex) { - throw new ELException(ex.getMessage(), ex.getCause()); - } - } - - public boolean isReadOnly(ELContext context, Object base, Object property) { - if (property == null) { - return true; - } - try { - context.setPropertyResolved(true); - if (base == null) { - return false; // VariableResolver provides no way to determine isReadOnly - } else { - if (base instanceof List || base.getClass().isArray()) { - return getPropertyResolver().isReadOnly(base, Integer.parseInt(property.toString())); - } else { - return getPropertyResolver().isReadOnly(base, property); - } - } - } catch (PropertyNotFoundException ex) { - throw new javax.el.PropertyNotFoundException(ex.getMessage(), ex.getCause()); - } catch (EvaluationException ex) { - throw new ELException(ex.getMessage(), ex.getCause()); - } - } - - public void setValue(ELContext context, Object base, Object property, Object value) { - if (property == null) { - throw new PropertyNotWritableException("Property is Null"); - } - try { - context.setPropertyResolved(true); - if (base instanceof List || base.getClass().isArray()) { - getPropertyResolver().setValue(base, Integer.parseInt(property.toString()), value); - } else { - getPropertyResolver().setValue(base, property, value); - } - - } catch (PropertyNotFoundException ex) { - throw new javax.el.PropertyNotFoundException(ex.getMessage(), ex.getCause()); - } catch (EvaluationException ex) { - throw new ELException(ex.getMessage(), ex.getCause()); - } - } - - private VariableResolver getVariableResolver() { - return facesContext.getApplication().getVariableResolver(); - } - - private PropertyResolver getPropertyResolver() { - return facesContext.getApplication().getPropertyResolver(); - } - -} diff --git a/spring-faces/src/main/java/org/springframework/faces/el/Jsf12ELExpressionParser.java b/spring-faces/src/main/java/org/springframework/faces/el/Jsf12ELExpressionParser.java deleted file mode 100644 index 2772044c..00000000 --- a/spring-faces/src/main/java/org/springframework/faces/el/Jsf12ELExpressionParser.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.springframework.faces.el; - -import javax.el.ELContext; -import javax.el.ExpressionFactory; -import javax.faces.context.FacesContext; - -import org.springframework.binding.expression.el.DefaultELContextFactory; -import org.springframework.binding.expression.el.ELExpressionParser; - -/** - * A JSF-aware ExpressionParser that allows JSF 1.2 managed beans to be referenced in expressions in the FlowDefinition. - * @author Jeremy Grelle - */ -public class Jsf12ELExpressionParser extends ELExpressionParser { - - /** - * Creates a JSF 1.2 expression parser - * @param expressionFactory the unified EL expression factory implementation to use - */ - public Jsf12ELExpressionParser(ExpressionFactory expressionFactory) { - super(expressionFactory, new Jsf12ELContextFactory()); - } - - /** - * Simple little helper that grabs the current EL context from the faces context to support EL expression - * evaluation. - */ - private static class Jsf12ELContextFactory extends DefaultELContextFactory { - public ELContext getEvaluationContext(Object target) { - return FacesContext.getCurrentInstance().getELContext(); - } - } - -} diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java index 94c460e9..9906753f 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java @@ -4,34 +4,32 @@ import java.io.IOException; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; import javax.faces.render.Renderer; -import org.apache.shale.remoting.Mechanism; -import org.apache.shale.remoting.XhtmlHelper; +import org.springframework.faces.ui.resource.FlowResourceHelper; public class ExtJsRenderer extends Renderer { - private static final String EXT_CSS = "/org/springframework/faces/ui/ext/resources/css/ext-all.css"; + private static final String EXT_CSS = "/ext/resources/css/ext-all.css"; - private static final String EXT_SCRIPT = "/org/springframework/faces/ui/ext/ext.js"; + private static final String EXT_SCRIPT = "/ext/ext.js"; - private static final String SPRING_FACES_SCRIPT = "/org/springframework/faces/ui/SpringFaces.js"; + private static final String SPRING_FACES_SCRIPT = "/spring-faces/SpringFaces.js"; - private XhtmlHelper resourceHelper = new XhtmlHelper(); + private FlowResourceHelper resourceHelper = new FlowResourceHelper(); public void encodeBegin(FacesContext context, UIComponent component) throws IOException { ExtJsComponent extJsComponent = (ExtJsComponent) component; - ResponseWriter writer = context.getResponseWriter(); + if (extJsComponent.getIncludeExtStyles().equals(Boolean.TRUE)) { + resourceHelper.renderStyleLink(context, EXT_CSS); + } - if (extJsComponent.getIncludeExtStyles().equals(Boolean.TRUE)) - resourceHelper.linkStylesheet(context, extJsComponent, writer, Mechanism.CLASS_RESOURCE, EXT_CSS); + if (extJsComponent.getIncludeExtScript().equals(Boolean.TRUE)) { + resourceHelper.renderScriptLink(context, EXT_SCRIPT); + } - if (extJsComponent.getIncludeExtScript().equals(Boolean.TRUE)) - resourceHelper.linkJavascript(context, extJsComponent, writer, Mechanism.CLASS_RESOURCE, EXT_SCRIPT); - - resourceHelper.linkJavascript(context, extJsComponent, writer, Mechanism.CLASS_RESOURCE, SPRING_FACES_SCRIPT); + resourceHelper.renderScriptLink(context, SPRING_FACES_SCRIPT); } } diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ExtValidateAllRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ExtValidateAllRenderer.java index 8f2fe2aa..8eadf286 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ExtValidateAllRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/ExtValidateAllRenderer.java @@ -16,11 +16,13 @@ public class ExtValidateAllRenderer extends ExtJsRenderer { ResponseWriter writer = context.getResponseWriter(); - if (component.getChildCount() == 0) + if (component.getChildCount() == 0) { throw new FacesException("A Spring Faces advisor expects to have at least one child component."); + } - if (!(component.getChildren().get(0) instanceof UICommand)) + if (!(component.getChildren().get(0) instanceof UICommand)) { throw new FacesException("ValidateAll expects to have a child of type UICommand."); + } UIComponent advisedChild = (UIComponent) component.getChildren().get(0); diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/resource/FlowResourceHelper.java b/spring-faces/src/main/java/org/springframework/faces/ui/resource/FlowResourceHelper.java new file mode 100644 index 00000000..0829eaab --- /dev/null +++ b/spring-faces/src/main/java/org/springframework/faces/ui/resource/FlowResourceHelper.java @@ -0,0 +1,104 @@ +package org.springframework.faces.ui.resource; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Set; + +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.springframework.webflow.context.FlowDefinitionRequestInfo; +import org.springframework.webflow.context.RequestPath; +import org.springframework.webflow.execution.RequestContext; +import org.springframework.webflow.execution.RequestContextHolder; + +/** + * Helper used by Spring Faces component renderers to add links to javascript and css resources. The resource links will + * be rendered in the correct format for the requests to be handled by Web Flow and routed to a special "resources" flow + * that is engineered at runtime. The resource paths are cached so that a particular resource link is only rendered once + * per request. + * @author Jeremy Grelle + * + */ +public class FlowResourceHelper { + + private static final String RENDERED_RESOURCES_KEY = "org.springframework.faces.RenderedResources"; + + /** + * Render a - - \ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectPackageDetails.jsp b/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectPackageDetails.jsp deleted file mode 100644 index 250b5f66..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectPackageDetails.jsp +++ /dev/null @@ -1,46 +0,0 @@ -<%@ page contentType="text/html" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - -
- - - -
- Select package details - - - - - - ${status.errorMessage} - -
- - - - - - - ${status.errorMessage} - -
- - - - -
- - - - - -
\ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectReceiver.jsp b/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectReceiver.jsp deleted file mode 100644 index 197bf5db..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectReceiver.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%@ page contentType="text/html" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - -
- - - -
- Select receiver location - - - - - ${status.errorMessage} - -
- - - - - - ${status.errorMessage} - -
- - - -
- - - - - -
\ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectSender.jsp b/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectSender.jsp deleted file mode 100644 index 1afdc31b..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/selectSender.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%@ page contentType="text/html" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - -
- - - -
- Select sender location - - - - - ${status.errorMessage} - -
- - - - - - ${status.errorMessage} - -
- - - -
- - - - - -
\ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/showRate.jsp b/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/showRate.jsp deleted file mode 100644 index 5e828735..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/jsp/showRate.jsp +++ /dev/null @@ -1,13 +0,0 @@ -<%@ page contentType="text/html" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - -
- -
- Rate details - ${rate} -
- -
\ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/shippingrate-servlet.xml b/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/shippingrate-servlet.xml deleted file mode 100644 index 1a33afb0..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/shippingrate-servlet.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 5a379a2f..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - contextConfigLocation - - classpath:org/springframework/webflow/samples/shippingrate/domain/services.xml - - - - - org.springframework.web.context.ContextLoaderListener - - - - shippingrate - org.springframework.web.servlet.DispatcherServlet - - - - shippingrate - *.htm - - - - index.jsp - - - \ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/images/spring-logo.jpg b/spring-webflow-samples/shippingrate/src/main/webapp/images/spring-logo.jpg deleted file mode 100644 index 62be3983..00000000 Binary files a/spring-webflow-samples/shippingrate/src/main/webapp/images/spring-logo.jpg and /dev/null differ diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/images/webflow-logo.jpg b/spring-webflow-samples/shippingrate/src/main/webapp/images/webflow-logo.jpg deleted file mode 100644 index ed76bae0..00000000 Binary files a/spring-webflow-samples/shippingrate/src/main/webapp/images/webflow-logo.jpg and /dev/null differ diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/index.jsp b/spring-webflow-samples/shippingrate/src/main/webapp/index.jsp deleted file mode 100644 index d6ee283f..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/index.jsp +++ /dev/null @@ -1,49 +0,0 @@ - - - Shipping Rate - An Ajax-enabled Spring Web Flow Sample - - - - -
Shipping Rate - An Ajax-enabled Spring Web Flow Sample
- -
- -
-

- This sample application demonstrates use of Spring Web Flow - in combination with Ajaxian techniques. Specfically, it illustrates a - wizard embedded in a zone of this page that makes Ajax calls to the server to - participate in a executing flow. To complete processing, this wizard takes - the details about a shipment and calls a service to get the shipping rate. -

-

- The techniques demonstrated are: -

-
    -
  • - Using a JavaScript component to submit regular forms through an AJAX request, and inserting the HTML - received from the server into a DIV tag. -
    • -
  • - Using the "_flowId" request parameter to let the view tell the web - flow controller which flow needs to be started. -
    • -
  • - Implementing a wizard using Spring Web Flow. -
    • -
-
- -
- -
- -
- - - \ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/prototype.js b/spring-webflow-samples/shippingrate/src/main/webapp/prototype.js deleted file mode 100644 index 0e85338b..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/prototype.js +++ /dev/null @@ -1,1781 +0,0 @@ -/* Prototype JavaScript framework, version 1.4.0 - * (c) 2005 Sam Stephenson - * - * Prototype is freely distributable under the terms of an MIT-style license. - * For details, see the Prototype web site: http://prototype.conio.net/ - * -/*--------------------------------------------------------------------------*/ - -var Prototype = { - Version: '1.4.0', - ScriptFragment: '(?:)((\n|\r|.)*?)(?:<\/script>)', - - emptyFunction: function() {}, - K: function(x) {return x} -} - -var Class = { - create: function() { - return function() { - this.initialize.apply(this, arguments); - } - } -} - -var Abstract = new Object(); - -Object.extend = function(destination, source) { - for (property in source) { - destination[property] = source[property]; - } - return destination; -} - -Object.inspect = function(object) { - try { - if (object == undefined) return 'undefined'; - if (object == null) return 'null'; - return object.inspect ? object.inspect() : object.toString(); - } catch (e) { - if (e instanceof RangeError) return '...'; - throw e; - } -} - -Function.prototype.bind = function() { - var __method = this, args = $A(arguments), object = args.shift(); - return function() { - return __method.apply(object, args.concat($A(arguments))); - } -} - -Function.prototype.bindAsEventListener = function(object) { - var __method = this; - return function(event) { - return __method.call(object, event || window.event); - } -} - -Object.extend(Number.prototype, { - toColorPart: function() { - var digits = this.toString(16); - if (this < 16) return '0' + digits; - return digits; - }, - - succ: function() { - return this + 1; - }, - - times: function(iterator) { - $R(0, this, true).each(iterator); - return this; - } -}); - -var Try = { - these: function() { - var returnValue; - - for (var i = 0; i < arguments.length; i++) { - var lambda = arguments[i]; - try { - returnValue = lambda(); - break; - } catch (e) {} - } - - return returnValue; - } -} - -/*--------------------------------------------------------------------------*/ - -var PeriodicalExecuter = Class.create(); -PeriodicalExecuter.prototype = { - initialize: function(callback, frequency) { - this.callback = callback; - this.frequency = frequency; - this.currentlyExecuting = false; - - this.registerCallback(); - }, - - registerCallback: function() { - setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); - }, - - onTimerEvent: function() { - if (!this.currentlyExecuting) { - try { - this.currentlyExecuting = true; - this.callback(); - } finally { - this.currentlyExecuting = false; - } - } - } -} - -/*--------------------------------------------------------------------------*/ - -function $() { - var elements = new Array(); - - for (var i = 0; i < arguments.length; i++) { - var element = arguments[i]; - if (typeof element == 'string') - element = document.getElementById(element); - - if (arguments.length == 1) - return element; - - elements.push(element); - } - - return elements; -} -Object.extend(String.prototype, { - stripTags: function() { - return this.replace(/<\/?[^>]+>/gi, ''); - }, - - stripScripts: function() { - return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), ''); - }, - - extractScripts: function() { - var matchAll = new RegExp(Prototype.ScriptFragment, 'img'); - var matchOne = new RegExp(Prototype.ScriptFragment, 'im'); - return (this.match(matchAll) || []).map(function(scriptTag) { - return (scriptTag.match(matchOne) || ['', ''])[1]; - }); - }, - - evalScripts: function() { - return this.extractScripts().map(eval); - }, - - escapeHTML: function() { - var div = document.createElement('div'); - var text = document.createTextNode(this); - div.appendChild(text); - return div.innerHTML; - }, - - unescapeHTML: function() { - var div = document.createElement('div'); - div.innerHTML = this.stripTags(); - return div.childNodes[0] ? div.childNodes[0].nodeValue : ''; - }, - - toQueryParams: function() { - var pairs = this.match(/^\??(.*)$/)[1].split('&'); - return pairs.inject({}, function(params, pairString) { - var pair = pairString.split('='); - params[pair[0]] = pair[1]; - return params; - }); - }, - - toArray: function() { - return this.split(''); - }, - - camelize: function() { - var oStringList = this.split('-'); - if (oStringList.length == 1) return oStringList[0]; - - var camelizedString = this.indexOf('-') == 0 - ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1) - : oStringList[0]; - - for (var i = 1, len = oStringList.length; i < len; i++) { - var s = oStringList[i]; - camelizedString += s.charAt(0).toUpperCase() + s.substring(1); - } - - return camelizedString; - }, - - inspect: function() { - return "'" + this.replace('\\', '\\\\').replace("'", '\\\'') + "'"; - } -}); - -String.prototype.parseQuery = String.prototype.toQueryParams; - -var $break = new Object(); -var $continue = new Object(); - -var Enumerable = { - each: function(iterator) { - var index = 0; - try { - this._each(function(value) { - try { - iterator(value, index++); - } catch (e) { - if (e != $continue) throw e; - } - }); - } catch (e) { - if (e != $break) throw e; - } - }, - - all: function(iterator) { - var result = true; - this.each(function(value, index) { - result = result && !!(iterator || Prototype.K)(value, index); - if (!result) throw $break; - }); - return result; - }, - - any: function(iterator) { - var result = true; - this.each(function(value, index) { - if (result = !!(iterator || Prototype.K)(value, index)) - throw $break; - }); - return result; - }, - - collect: function(iterator) { - var results = []; - this.each(function(value, index) { - results.push(iterator(value, index)); - }); - return results; - }, - - detect: function (iterator) { - var result; - this.each(function(value, index) { - if (iterator(value, index)) { - result = value; - throw $break; - } - }); - return result; - }, - - findAll: function(iterator) { - var results = []; - this.each(function(value, index) { - if (iterator(value, index)) - results.push(value); - }); - return results; - }, - - grep: function(pattern, iterator) { - var results = []; - this.each(function(value, index) { - var stringValue = value.toString(); - if (stringValue.match(pattern)) - results.push((iterator || Prototype.K)(value, index)); - }) - return results; - }, - - include: function(object) { - var found = false; - this.each(function(value) { - if (value == object) { - found = true; - throw $break; - } - }); - return found; - }, - - inject: function(memo, iterator) { - this.each(function(value, index) { - memo = iterator(memo, value, index); - }); - return memo; - }, - - invoke: function(method) { - var args = $A(arguments).slice(1); - return this.collect(function(value) { - return value[method].apply(value, args); - }); - }, - - max: function(iterator) { - var result; - this.each(function(value, index) { - value = (iterator || Prototype.K)(value, index); - if (value >= (result || value)) - result = value; - }); - return result; - }, - - min: function(iterator) { - var result; - this.each(function(value, index) { - value = (iterator || Prototype.K)(value, index); - if (value <= (result || value)) - result = value; - }); - return result; - }, - - partition: function(iterator) { - var trues = [], falses = []; - this.each(function(value, index) { - ((iterator || Prototype.K)(value, index) ? - trues : falses).push(value); - }); - return [trues, falses]; - }, - - pluck: function(property) { - var results = []; - this.each(function(value, index) { - results.push(value[property]); - }); - return results; - }, - - reject: function(iterator) { - var results = []; - this.each(function(value, index) { - if (!iterator(value, index)) - results.push(value); - }); - return results; - }, - - sortBy: function(iterator) { - return this.collect(function(value, index) { - return {value: value, criteria: iterator(value, index)}; - }).sort(function(left, right) { - var a = left.criteria, b = right.criteria; - return a < b ? -1 : a > b ? 1 : 0; - }).pluck('value'); - }, - - toArray: function() { - return this.collect(Prototype.K); - }, - - zip: function() { - var iterator = Prototype.K, args = $A(arguments); - if (typeof args.last() == 'function') - iterator = args.pop(); - - var collections = [this].concat(args).map($A); - return this.map(function(value, index) { - iterator(value = collections.pluck(index)); - return value; - }); - }, - - inspect: function() { - return '#'; - } -} - -Object.extend(Enumerable, { - map: Enumerable.collect, - find: Enumerable.detect, - select: Enumerable.findAll, - member: Enumerable.include, - entries: Enumerable.toArray -}); -var $A = Array.from = function(iterable) { - if (!iterable) return []; - if (iterable.toArray) { - return iterable.toArray(); - } else { - var results = []; - for (var i = 0; i < iterable.length; i++) - results.push(iterable[i]); - return results; - } -} - -Object.extend(Array.prototype, Enumerable); - -Array.prototype._reverse = Array.prototype.reverse; - -Object.extend(Array.prototype, { - _each: function(iterator) { - for (var i = 0; i < this.length; i++) - iterator(this[i]); - }, - - clear: function() { - this.length = 0; - return this; - }, - - first: function() { - return this[0]; - }, - - last: function() { - return this[this.length - 1]; - }, - - compact: function() { - return this.select(function(value) { - return value != undefined || value != null; - }); - }, - - flatten: function() { - return this.inject([], function(array, value) { - return array.concat(value.constructor == Array ? - value.flatten() : [value]); - }); - }, - - without: function() { - var values = $A(arguments); - return this.select(function(value) { - return !values.include(value); - }); - }, - - indexOf: function(object) { - for (var i = 0; i < this.length; i++) - if (this[i] == object) return i; - return -1; - }, - - reverse: function(inline) { - return (inline !== false ? this : this.toArray())._reverse(); - }, - - shift: function() { - var result = this[0]; - for (var i = 0; i < this.length - 1; i++) - this[i] = this[i + 1]; - this.length--; - return result; - }, - - inspect: function() { - return '[' + this.map(Object.inspect).join(', ') + ']'; - } -}); -var Hash = { - _each: function(iterator) { - for (key in this) { - var value = this[key]; - if (typeof value == 'function') continue; - - var pair = [key, value]; - pair.key = key; - pair.value = value; - iterator(pair); - } - }, - - keys: function() { - return this.pluck('key'); - }, - - values: function() { - return this.pluck('value'); - }, - - merge: function(hash) { - return $H(hash).inject($H(this), function(mergedHash, pair) { - mergedHash[pair.key] = pair.value; - return mergedHash; - }); - }, - - toQueryString: function() { - return this.map(function(pair) { - return pair.map(encodeURIComponent).join('='); - }).join('&'); - }, - - inspect: function() { - return '#'; - } -} - -function $H(object) { - var hash = Object.extend({}, object || {}); - Object.extend(hash, Enumerable); - Object.extend(hash, Hash); - return hash; -} -ObjectRange = Class.create(); -Object.extend(ObjectRange.prototype, Enumerable); -Object.extend(ObjectRange.prototype, { - initialize: function(start, end, exclusive) { - this.start = start; - this.end = end; - this.exclusive = exclusive; - }, - - _each: function(iterator) { - var value = this.start; - do { - iterator(value); - value = value.succ(); - } while (this.include(value)); - }, - - include: function(value) { - if (value < this.start) - return false; - if (this.exclusive) - return value < this.end; - return value <= this.end; - } -}); - -var $R = function(start, end, exclusive) { - return new ObjectRange(start, end, exclusive); -} - -var Ajax = { - getTransport: function() { - return Try.these( - function() {return new ActiveXObject('Msxml2.XMLHTTP')}, - function() {return new ActiveXObject('Microsoft.XMLHTTP')}, - function() {return new XMLHttpRequest()} - ) || false; - }, - - activeRequestCount: 0 -} - -Ajax.Responders = { - responders: [], - - _each: function(iterator) { - this.responders._each(iterator); - }, - - register: function(responderToAdd) { - if (!this.include(responderToAdd)) - this.responders.push(responderToAdd); - }, - - unregister: function(responderToRemove) { - this.responders = this.responders.without(responderToRemove); - }, - - dispatch: function(callback, request, transport, json) { - this.each(function(responder) { - if (responder[callback] && typeof responder[callback] == 'function') { - try { - responder[callback].apply(responder, [request, transport, json]); - } catch (e) {} - } - }); - } -}; - -Object.extend(Ajax.Responders, Enumerable); - -Ajax.Responders.register({ - onCreate: function() { - Ajax.activeRequestCount++; - }, - - onComplete: function() { - Ajax.activeRequestCount--; - } -}); - -Ajax.Base = function() {}; -Ajax.Base.prototype = { - setOptions: function(options) { - this.options = { - method: 'post', - asynchronous: true, - parameters: '' - } - Object.extend(this.options, options || {}); - }, - - responseIsSuccess: function() { - return this.transport.status == undefined - || this.transport.status == 0 - || (this.transport.status >= 200 && this.transport.status < 300); - }, - - responseIsFailure: function() { - return !this.responseIsSuccess(); - } -} - -Ajax.Request = Class.create(); -Ajax.Request.Events = - ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete']; - -Ajax.Request.prototype = Object.extend(new Ajax.Base(), { - initialize: function(url, options) { - this.transport = Ajax.getTransport(); - this.setOptions(options); - this.request(url); - }, - - request: function(url) { - var parameters = this.options.parameters || ''; - if (parameters.length > 0) parameters += '&_='; - - try { - this.url = url; - if (this.options.method == 'get' && parameters.length > 0) - this.url += (this.url.match(/\?/) ? '&' : '?') + parameters; - - Ajax.Responders.dispatch('onCreate', this, this.transport); - - this.transport.open(this.options.method, this.url, - this.options.asynchronous); - - if (this.options.asynchronous) { - this.transport.onreadystatechange = this.onStateChange.bind(this); - setTimeout((function() {this.respondToReadyState(1)}).bind(this), 10); - } - - this.setRequestHeaders(); - - var body = this.options.postBody ? this.options.postBody : parameters; - this.transport.send(this.options.method == 'post' ? body : null); - - } catch (e) { - this.dispatchException(e); - } - }, - - setRequestHeaders: function() { - var requestHeaders = - ['X-Requested-With', 'XMLHttpRequest', - 'X-Prototype-Version', Prototype.Version]; - - if (this.options.method == 'post') { - requestHeaders.push('Content-type', - 'application/x-www-form-urlencoded'); - - /* Force "Connection: close" for Mozilla browsers to work around - * a bug where XMLHttpReqeuest sends an incorrect Content-length - * header. See Mozilla Bugzilla #246651. - */ - if (this.transport.overrideMimeType) - requestHeaders.push('Connection', 'close'); - } - - if (this.options.requestHeaders) - requestHeaders.push.apply(requestHeaders, this.options.requestHeaders); - - for (var i = 0; i < requestHeaders.length; i += 2) - this.transport.setRequestHeader(requestHeaders[i], requestHeaders[i+1]); - }, - - onStateChange: function() { - var readyState = this.transport.readyState; - if (readyState != 1) - this.respondToReadyState(this.transport.readyState); - }, - - header: function(name) { - try { - return this.transport.getResponseHeader(name); - } catch (e) {} - }, - - evalJSON: function() { - try { - return eval(this.header('X-JSON')); - } catch (e) {} - }, - - evalResponse: function() { - try { - return eval(this.transport.responseText); - } catch (e) { - this.dispatchException(e); - } - }, - - respondToReadyState: function(readyState) { - var event = Ajax.Request.Events[readyState]; - var transport = this.transport, json = this.evalJSON(); - - if (event == 'Complete') { - try { - (this.options['on' + this.transport.status] - || this.options['on' + (this.responseIsSuccess() ? 'Success' : 'Failure')] - || Prototype.emptyFunction)(transport, json); - } catch (e) { - this.dispatchException(e); - } - - if ((this.header('Content-type') || '').match(/^text\/javascript/i)) - this.evalResponse(); - } - - try { - (this.options['on' + event] || Prototype.emptyFunction)(transport, json); - Ajax.Responders.dispatch('on' + event, this, transport, json); - } catch (e) { - this.dispatchException(e); - } - - /* Avoid memory leak in MSIE: clean up the oncomplete event handler */ - if (event == 'Complete') - this.transport.onreadystatechange = Prototype.emptyFunction; - }, - - dispatchException: function(exception) { - (this.options.onException || Prototype.emptyFunction)(this, exception); - Ajax.Responders.dispatch('onException', this, exception); - } -}); - -Ajax.Updater = Class.create(); - -Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), { - initialize: function(container, url, options) { - this.containers = { - success: container.success ? $(container.success) : $(container), - failure: container.failure ? $(container.failure) : - (container.success ? null : $(container)) - } - - this.transport = Ajax.getTransport(); - this.setOptions(options); - - var onComplete = this.options.onComplete || Prototype.emptyFunction; - this.options.onComplete = (function(transport, object) { - this.updateContent(); - onComplete(transport, object); - }).bind(this); - - this.request(url); - }, - - updateContent: function() { - var receiver = this.responseIsSuccess() ? - this.containers.success : this.containers.failure; - var response = this.transport.responseText; - - if (!this.options.evalScripts) - response = response.stripScripts(); - - if (receiver) { - if (this.options.insertion) { - new this.options.insertion(receiver, response); - } else { - Element.update(receiver, response); - } - } - - if (this.responseIsSuccess()) { - if (this.onComplete) - setTimeout(this.onComplete.bind(this), 10); - } - } -}); - -Ajax.PeriodicalUpdater = Class.create(); -Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), { - initialize: function(container, url, options) { - this.setOptions(options); - this.onComplete = this.options.onComplete; - - this.frequency = (this.options.frequency || 2); - this.decay = (this.options.decay || 1); - - this.updater = {}; - this.container = container; - this.url = url; - - this.start(); - }, - - start: function() { - this.options.onComplete = this.updateComplete.bind(this); - this.onTimerEvent(); - }, - - stop: function() { - this.updater.onComplete = undefined; - clearTimeout(this.timer); - (this.onComplete || Prototype.emptyFunction).apply(this, arguments); - }, - - updateComplete: function(request) { - if (this.options.decay) { - this.decay = (request.responseText == this.lastText ? - this.decay * this.options.decay : 1); - - this.lastText = request.responseText; - } - this.timer = setTimeout(this.onTimerEvent.bind(this), - this.decay * this.frequency * 1000); - }, - - onTimerEvent: function() { - this.updater = new Ajax.Updater(this.container, this.url, this.options); - } -}); -document.getElementsByClassName = function(className, parentElement) { - var children = ($(parentElement) || document.body).getElementsByTagName('*'); - return $A(children).inject([], function(elements, child) { - if (child.className.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))) - elements.push(child); - return elements; - }); -} - -/*--------------------------------------------------------------------------*/ - -if (!window.Element) { - var Element = new Object(); -} - -Object.extend(Element, { - visible: function(element) { - return $(element).style.display != 'none'; - }, - - toggle: function() { - for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); - Element[Element.visible(element) ? 'hide' : 'show'](element); - } - }, - - hide: function() { - for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); - element.style.display = 'none'; - } - }, - - show: function() { - for (var i = 0; i < arguments.length; i++) { - var element = $(arguments[i]); - element.style.display = ''; - } - }, - - remove: function(element) { - element = $(element); - element.parentNode.removeChild(element); - }, - - update: function(element, html) { - $(element).innerHTML = html.stripScripts(); - setTimeout(function() {html.evalScripts()}, 10); - }, - - getHeight: function(element) { - element = $(element); - return element.offsetHeight; - }, - - classNames: function(element) { - return new Element.ClassNames(element); - }, - - hasClassName: function(element, className) { - if (!(element = $(element))) return; - return Element.classNames(element).include(className); - }, - - addClassName: function(element, className) { - if (!(element = $(element))) return; - return Element.classNames(element).add(className); - }, - - removeClassName: function(element, className) { - if (!(element = $(element))) return; - return Element.classNames(element).remove(className); - }, - - // removes whitespace-only text node children - cleanWhitespace: function(element) { - element = $(element); - for (var i = 0; i < element.childNodes.length; i++) { - var node = element.childNodes[i]; - if (node.nodeType == 3 && !/\S/.test(node.nodeValue)) - Element.remove(node); - } - }, - - empty: function(element) { - return $(element).innerHTML.match(/^\s*$/); - }, - - scrollTo: function(element) { - element = $(element); - var x = element.x ? element.x : element.offsetLeft, - y = element.y ? element.y : element.offsetTop; - window.scrollTo(x, y); - }, - - getStyle: function(element, style) { - element = $(element); - var value = element.style[style.camelize()]; - if (!value) { - if (document.defaultView && document.defaultView.getComputedStyle) { - var css = document.defaultView.getComputedStyle(element, null); - value = css ? css.getPropertyValue(style) : null; - } else if (element.currentStyle) { - value = element.currentStyle[style.camelize()]; - } - } - - if (window.opera && ['left', 'top', 'right', 'bottom'].include(style)) - if (Element.getStyle(element, 'position') == 'static') value = 'auto'; - - return value == 'auto' ? null : value; - }, - - setStyle: function(element, style) { - element = $(element); - for (name in style) - element.style[name.camelize()] = style[name]; - }, - - getDimensions: function(element) { - element = $(element); - if (Element.getStyle(element, 'display') != 'none') - return {width: element.offsetWidth, height: element.offsetHeight}; - - // All *Width and *Height properties give 0 on elements with display none, - // so enable the element temporarily - var els = element.style; - var originalVisibility = els.visibility; - var originalPosition = els.position; - els.visibility = 'hidden'; - els.position = 'absolute'; - els.display = ''; - var originalWidth = element.clientWidth; - var originalHeight = element.clientHeight; - els.display = 'none'; - els.position = originalPosition; - els.visibility = originalVisibility; - return {width: originalWidth, height: originalHeight}; - }, - - makePositioned: function(element) { - element = $(element); - var pos = Element.getStyle(element, 'position'); - if (pos == 'static' || !pos) { - element._madePositioned = true; - element.style.position = 'relative'; - // Opera returns the offset relative to the positioning context, when an - // element is position relative but top and left have not been defined - if (window.opera) { - element.style.top = 0; - element.style.left = 0; - } - } - }, - - undoPositioned: function(element) { - element = $(element); - if (element._madePositioned) { - element._madePositioned = undefined; - element.style.position = - element.style.top = - element.style.left = - element.style.bottom = - element.style.right = ''; - } - }, - - makeClipping: function(element) { - element = $(element); - if (element._overflow) return; - element._overflow = element.style.overflow; - if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden') - element.style.overflow = 'hidden'; - }, - - undoClipping: function(element) { - element = $(element); - if (element._overflow) return; - element.style.overflow = element._overflow; - element._overflow = undefined; - } -}); - -var Toggle = new Object(); -Toggle.display = Element.toggle; - -/*--------------------------------------------------------------------------*/ - -Abstract.Insertion = function(adjacency) { - this.adjacency = adjacency; -} - -Abstract.Insertion.prototype = { - initialize: function(element, content) { - this.element = $(element); - this.content = content.stripScripts(); - - if (this.adjacency && this.element.insertAdjacentHTML) { - try { - this.element.insertAdjacentHTML(this.adjacency, this.content); - } catch (e) { - if (this.element.tagName.toLowerCase() == 'tbody') { - this.insertContent(this.contentFromAnonymousTable()); - } else { - throw e; - } - } - } else { - this.range = this.element.ownerDocument.createRange(); - if (this.initializeRange) this.initializeRange(); - this.insertContent([this.range.createContextualFragment(this.content)]); - } - - setTimeout(function() {content.evalScripts()}, 10); - }, - - contentFromAnonymousTable: function() { - var div = document.createElement('div'); - div.innerHTML = '' + this.content + '
'; - return $A(div.childNodes[0].childNodes[0].childNodes); - } -} - -var Insertion = new Object(); - -Insertion.Before = Class.create(); -Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), { - initializeRange: function() { - this.range.setStartBefore(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.parentNode.insertBefore(fragment, this.element); - }).bind(this)); - } -}); - -Insertion.Top = Class.create(); -Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), { - initializeRange: function() { - this.range.selectNodeContents(this.element); - this.range.collapse(true); - }, - - insertContent: function(fragments) { - fragments.reverse(false).each((function(fragment) { - this.element.insertBefore(fragment, this.element.firstChild); - }).bind(this)); - } -}); - -Insertion.Bottom = Class.create(); -Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), { - initializeRange: function() { - this.range.selectNodeContents(this.element); - this.range.collapse(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.appendChild(fragment); - }).bind(this)); - } -}); - -Insertion.After = Class.create(); -Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), { - initializeRange: function() { - this.range.setStartAfter(this.element); - }, - - insertContent: function(fragments) { - fragments.each((function(fragment) { - this.element.parentNode.insertBefore(fragment, - this.element.nextSibling); - }).bind(this)); - } -}); - -/*--------------------------------------------------------------------------*/ - -Element.ClassNames = Class.create(); -Element.ClassNames.prototype = { - initialize: function(element) { - this.element = $(element); - }, - - _each: function(iterator) { - this.element.className.split(/\s+/).select(function(name) { - return name.length > 0; - })._each(iterator); - }, - - set: function(className) { - this.element.className = className; - }, - - add: function(classNameToAdd) { - if (this.include(classNameToAdd)) return; - this.set(this.toArray().concat(classNameToAdd).join(' ')); - }, - - remove: function(classNameToRemove) { - if (!this.include(classNameToRemove)) return; - this.set(this.select(function(className) { - return className != classNameToRemove; - }).join(' ')); - }, - - toString: function() { - return this.toArray().join(' '); - } -} - -Object.extend(Element.ClassNames.prototype, Enumerable); -var Field = { - clear: function() { - for (var i = 0; i < arguments.length; i++) - $(arguments[i]).value = ''; - }, - - focus: function(element) { - $(element).focus(); - }, - - present: function() { - for (var i = 0; i < arguments.length; i++) - if ($(arguments[i]).value == '') return false; - return true; - }, - - select: function(element) { - $(element).select(); - }, - - activate: function(element) { - element = $(element); - element.focus(); - if (element.select) - element.select(); - } -} - -/*--------------------------------------------------------------------------*/ - -var Form = { - serialize: function(form) { - var elements = Form.getElements($(form)); - var queryComponents = new Array(); - - for (var i = 0; i < elements.length; i++) { - var queryComponent = Form.Element.serialize(elements[i]); - if (queryComponent) - queryComponents.push(queryComponent); - } - - return queryComponents.join('&'); - }, - - getElements: function(form) { - form = $(form); - var elements = new Array(); - - for (tagName in Form.Element.Serializers) { - var tagElements = form.getElementsByTagName(tagName); - for (var j = 0; j < tagElements.length; j++) - elements.push(tagElements[j]); - } - return elements; - }, - - getInputs: function(form, typeName, name) { - form = $(form); - var inputs = form.getElementsByTagName('input'); - - if (!typeName && !name) - return inputs; - - var matchingInputs = new Array(); - for (var i = 0; i < inputs.length; i++) { - var input = inputs[i]; - if ((typeName && input.type != typeName) || - (name && input.name != name)) - continue; - matchingInputs.push(input); - } - - return matchingInputs; - }, - - disable: function(form) { - var elements = Form.getElements(form); - for (var i = 0; i < elements.length; i++) { - var element = elements[i]; - element.blur(); - element.disabled = 'true'; - } - }, - - enable: function(form) { - var elements = Form.getElements(form); - for (var i = 0; i < elements.length; i++) { - var element = elements[i]; - element.disabled = ''; - } - }, - - findFirstElement: function(form) { - return Form.getElements(form).find(function(element) { - return element.type != 'hidden' && !element.disabled && - ['input', 'select', 'textarea'].include(element.tagName.toLowerCase()); - }); - }, - - focusFirstElement: function(form) { - Field.activate(Form.findFirstElement(form)); - }, - - reset: function(form) { - $(form).reset(); - } -} - -Form.Element = { - serialize: function(element) { - element = $(element); - var method = element.tagName.toLowerCase(); - var parameter = Form.Element.Serializers[method](element); - - if (parameter) { - var key = encodeURIComponent(parameter[0]); - if (key.length == 0) return; - - if (parameter[1].constructor != Array) - parameter[1] = [parameter[1]]; - - return parameter[1].map(function(value) { - return key + '=' + encodeURIComponent(value); - }).join('&'); - } - }, - - getValue: function(element) { - element = $(element); - var method = element.tagName.toLowerCase(); - var parameter = Form.Element.Serializers[method](element); - - if (parameter) - return parameter[1]; - } -} - -Form.Element.Serializers = { - input: function(element) { - switch (element.type.toLowerCase()) { - case 'submit': - case 'hidden': - case 'password': - case 'text': - return Form.Element.Serializers.textarea(element); - case 'checkbox': - case 'radio': - return Form.Element.Serializers.inputSelector(element); - } - return false; - }, - - inputSelector: function(element) { - if (element.checked) - return [element.name, element.value]; - }, - - textarea: function(element) { - return [element.name, element.value]; - }, - - select: function(element) { - return Form.Element.Serializers[element.type == 'select-one' ? - 'selectOne' : 'selectMany'](element); - }, - - selectOne: function(element) { - var value = '', opt, index = element.selectedIndex; - if (index >= 0) { - opt = element.options[index]; - value = opt.value; - if (!value && !('value' in opt)) - value = opt.text; - } - return [element.name, value]; - }, - - selectMany: function(element) { - var value = new Array(); - for (var i = 0; i < element.length; i++) { - var opt = element.options[i]; - if (opt.selected) { - var optValue = opt.value; - if (!optValue && !('value' in opt)) - optValue = opt.text; - value.push(optValue); - } - } - return [element.name, value]; - } -} - -/*--------------------------------------------------------------------------*/ - -var $F = Form.Element.getValue; - -/*--------------------------------------------------------------------------*/ - -Abstract.TimedObserver = function() {} -Abstract.TimedObserver.prototype = { - initialize: function(element, frequency, callback) { - this.frequency = frequency; - this.element = $(element); - this.callback = callback; - - this.lastValue = this.getValue(); - this.registerCallback(); - }, - - registerCallback: function() { - setInterval(this.onTimerEvent.bind(this), this.frequency * 1000); - }, - - onTimerEvent: function() { - var value = this.getValue(); - if (this.lastValue != value) { - this.callback(this.element, value); - this.lastValue = value; - } - } -} - -Form.Element.Observer = Class.create(); -Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { - getValue: function() { - return Form.Element.getValue(this.element); - } -}); - -Form.Observer = Class.create(); -Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), { - getValue: function() { - return Form.serialize(this.element); - } -}); - -/*--------------------------------------------------------------------------*/ - -Abstract.EventObserver = function() {} -Abstract.EventObserver.prototype = { - initialize: function(element, callback) { - this.element = $(element); - this.callback = callback; - - this.lastValue = this.getValue(); - if (this.element.tagName.toLowerCase() == 'form') - this.registerFormCallbacks(); - else - this.registerCallback(this.element); - }, - - onElementEvent: function() { - var value = this.getValue(); - if (this.lastValue != value) { - this.callback(this.element, value); - this.lastValue = value; - } - }, - - registerFormCallbacks: function() { - var elements = Form.getElements(this.element); - for (var i = 0; i < elements.length; i++) - this.registerCallback(elements[i]); - }, - - registerCallback: function(element) { - if (element.type) { - switch (element.type.toLowerCase()) { - case 'checkbox': - case 'radio': - Event.observe(element, 'click', this.onElementEvent.bind(this)); - break; - case 'password': - case 'text': - case 'textarea': - case 'select-one': - case 'select-multiple': - Event.observe(element, 'change', this.onElementEvent.bind(this)); - break; - } - } - } -} - -Form.Element.EventObserver = Class.create(); -Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), { - getValue: function() { - return Form.Element.getValue(this.element); - } -}); - -Form.EventObserver = Class.create(); -Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), { - getValue: function() { - return Form.serialize(this.element); - } -}); -if (!window.Event) { - var Event = new Object(); -} - -Object.extend(Event, { - KEY_BACKSPACE: 8, - KEY_TAB: 9, - KEY_RETURN: 13, - KEY_ESC: 27, - KEY_LEFT: 37, - KEY_UP: 38, - KEY_RIGHT: 39, - KEY_DOWN: 40, - KEY_DELETE: 46, - - element: function(event) { - return event.target || event.srcElement; - }, - - isLeftClick: function(event) { - return (((event.which) && (event.which == 1)) || - ((event.button) && (event.button == 1))); - }, - - pointerX: function(event) { - return event.pageX || (event.clientX + - (document.documentElement.scrollLeft || document.body.scrollLeft)); - }, - - pointerY: function(event) { - return event.pageY || (event.clientY + - (document.documentElement.scrollTop || document.body.scrollTop)); - }, - - stop: function(event) { - if (event.preventDefault) { - event.preventDefault(); - event.stopPropagation(); - } else { - event.returnValue = false; - event.cancelBubble = true; - } - }, - - // find the first node with the given tagName, starting from the - // node the event was triggered on; traverses the DOM upwards - findElement: function(event, tagName) { - var element = Event.element(event); - while (element.parentNode && (!element.tagName || - (element.tagName.toUpperCase() != tagName.toUpperCase()))) - element = element.parentNode; - return element; - }, - - observers: false, - - _observeAndCache: function(element, name, observer, useCapture) { - if (!this.observers) this.observers = []; - if (element.addEventListener) { - this.observers.push([element, name, observer, useCapture]); - element.addEventListener(name, observer, useCapture); - } else if (element.attachEvent) { - this.observers.push([element, name, observer, useCapture]); - element.attachEvent('on' + name, observer); - } - }, - - unloadCache: function() { - if (!Event.observers) return; - for (var i = 0; i < Event.observers.length; i++) { - Event.stopObserving.apply(this, Event.observers[i]); - Event.observers[i][0] = null; - } - Event.observers = false; - }, - - observe: function(element, name, observer, useCapture) { - var element = $(element); - useCapture = useCapture || false; - - if (name == 'keypress' && - (navigator.appVersion.match(/Konqueror|Safari|KHTML/) - || element.attachEvent)) - name = 'keydown'; - - this._observeAndCache(element, name, observer, useCapture); - }, - - stopObserving: function(element, name, observer, useCapture) { - var element = $(element); - useCapture = useCapture || false; - - if (name == 'keypress' && - (navigator.appVersion.match(/Konqueror|Safari|KHTML/) - || element.detachEvent)) - name = 'keydown'; - - if (element.removeEventListener) { - element.removeEventListener(name, observer, useCapture); - } else if (element.detachEvent) { - element.detachEvent('on' + name, observer); - } - } -}); - -/* prevent memory leaks in IE */ -Event.observe(window, 'unload', Event.unloadCache, false); -var Position = { - // set to true if needed, warning: firefox performance problems - // NOT neeeded for page scrolling, only if draggable contained in - // scrollable elements - includeScrollOffsets: false, - - // must be called before calling withinIncludingScrolloffset, every time the - // page is scrolled - prepare: function() { - this.deltaX = window.pageXOffset - || document.documentElement.scrollLeft - || document.body.scrollLeft - || 0; - this.deltaY = window.pageYOffset - || document.documentElement.scrollTop - || document.body.scrollTop - || 0; - }, - - realOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.scrollTop || 0; - valueL += element.scrollLeft || 0; - element = element.parentNode; - } while (element); - return [valueL, valueT]; - }, - - cumulativeOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - } while (element); - return [valueL, valueT]; - }, - - positionedOffset: function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - element = element.offsetParent; - if (element) { - p = Element.getStyle(element, 'position'); - if (p == 'relative' || p == 'absolute') break; - } - } while (element); - return [valueL, valueT]; - }, - - offsetParent: function(element) { - if (element.offsetParent) return element.offsetParent; - if (element == document.body) return element; - - while ((element = element.parentNode) && element != document.body) - if (Element.getStyle(element, 'position') != 'static') - return element; - - return document.body; - }, - - // caches x/y coordinate pair to use with overlap - within: function(element, x, y) { - if (this.includeScrollOffsets) - return this.withinIncludingScrolloffsets(element, x, y); - this.xcomp = x; - this.ycomp = y; - this.offset = this.cumulativeOffset(element); - - return (y >= this.offset[1] && - y < this.offset[1] + element.offsetHeight && - x >= this.offset[0] && - x < this.offset[0] + element.offsetWidth); - }, - - withinIncludingScrolloffsets: function(element, x, y) { - var offsetcache = this.realOffset(element); - - this.xcomp = x + offsetcache[0] - this.deltaX; - this.ycomp = y + offsetcache[1] - this.deltaY; - this.offset = this.cumulativeOffset(element); - - return (this.ycomp >= this.offset[1] && - this.ycomp < this.offset[1] + element.offsetHeight && - this.xcomp >= this.offset[0] && - this.xcomp < this.offset[0] + element.offsetWidth); - }, - - // within must be called directly before - overlap: function(mode, element) { - if (!mode) return 0; - if (mode == 'vertical') - return ((this.offset[1] + element.offsetHeight) - this.ycomp) / - element.offsetHeight; - if (mode == 'horizontal') - return ((this.offset[0] + element.offsetWidth) - this.xcomp) / - element.offsetWidth; - }, - - clone: function(source, target) { - source = $(source); - target = $(target); - target.style.position = 'absolute'; - var offsets = this.cumulativeOffset(source); - target.style.top = offsets[1] + 'px'; - target.style.left = offsets[0] + 'px'; - target.style.width = source.offsetWidth + 'px'; - target.style.height = source.offsetHeight + 'px'; - }, - - page: function(forElement) { - var valueT = 0, valueL = 0; - - var element = forElement; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - - // Safari fix - if (element.offsetParent==document.body) - if (Element.getStyle(element,'position')=='absolute') break; - - } while (element = element.offsetParent); - - element = forElement; - do { - valueT -= element.scrollTop || 0; - valueL -= element.scrollLeft || 0; - } while (element = element.parentNode); - - return [valueL, valueT]; - }, - - clone: function(source, target) { - var options = Object.extend({ - setLeft: true, - setTop: true, - setWidth: true, - setHeight: true, - offsetTop: 0, - offsetLeft: 0 - }, arguments[2] || {}) - - // find page position of source - source = $(source); - var p = Position.page(source); - - // find coordinate system to use - target = $(target); - var delta = [0, 0]; - var parent = null; - // delta [0,0] will do fine with position: fixed elements, - // position:absolute needs offsetParent deltas - if (Element.getStyle(target,'position') == 'absolute') { - parent = Position.offsetParent(target); - delta = Position.page(parent); - } - - // correct by body offsets (fixes Safari) - if (parent == document.body) { - delta[0] -= document.body.offsetLeft; - delta[1] -= document.body.offsetTop; - } - - // set position - if(options.setLeft) target.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px'; - if(options.setTop) target.style.top = (p[1] - delta[1] + options.offsetTop) + 'px'; - if(options.setWidth) target.style.width = source.offsetWidth + 'px'; - if(options.setHeight) target.style.height = source.offsetHeight + 'px'; - }, - - absolutize: function(element) { - element = $(element); - if (element.style.position == 'absolute') return; - Position.prepare(); - - var offsets = Position.positionedOffset(element); - var top = offsets[1]; - var left = offsets[0]; - var width = element.clientWidth; - var height = element.clientHeight; - - element._originalLeft = left - parseFloat(element.style.left || 0); - element._originalTop = top - parseFloat(element.style.top || 0); - element._originalWidth = element.style.width; - element._originalHeight = element.style.height; - - element.style.position = 'absolute'; - element.style.top = top + 'px';; - element.style.left = left + 'px';; - element.style.width = width + 'px';; - element.style.height = height + 'px';; - }, - - relativize: function(element) { - element = $(element); - if (element.style.position == 'relative') return; - Position.prepare(); - - element.style.position = 'relative'; - var top = parseFloat(element.style.top || 0) - (element._originalTop || 0); - var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0); - - element.style.top = top + 'px'; - element.style.left = left + 'px'; - element.style.height = element._originalHeight; - element.style.width = element._originalWidth; - } -} - -// Safari returns margins on body which is incorrect if the child is absolutely -// positioned. For performance reasons, redefine Position.cumulativeOffset for -// KHTML/WebKit only. -if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) { - Position.cumulativeOffset = function(element) { - var valueT = 0, valueL = 0; - do { - valueT += element.offsetTop || 0; - valueL += element.offsetLeft || 0; - if (element.offsetParent == document.body) - if (Element.getStyle(element, 'position') == 'absolute') break; - - element = element.offsetParent; - } while (element); - - return [valueL, valueT]; - } -} \ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/style.css b/spring-webflow-samples/shippingrate/src/main/webapp/style.css deleted file mode 100644 index fd4e8b5e..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/style.css +++ /dev/null @@ -1,60 +0,0 @@ -body { - width: 720px; - margin: 0px; - padding: 0px; - font-size: 10px; -} - -div#logo { - width: 720px; - height: 65px; - background: #86AEA5; -} - -div#navigation { - width: 720px; - height: 20px; - background: #E2F3B8; - text-align: right; -} - -div#content { - width: 720px; - padding: 5px; -} - -div#insert { - width: 120; - float: right; - text-align: right; -} - -.buttonBar { - height: 1.5em; - text-align: right; -} - -div#copyright { - width: 720px; -} - -div#copyright p { - text-align: center; - font-family: Tahoma, sans-serif; - font-size: 90%; - color: div#336633; - margin-left: 5px; - font-weight: bold; - clear: both; -} - -.readOnly { - color: rgb(192, 192, 192); -} - -.error { - color: red; - font-weight: bold; - font-family: Arial, sans-serif; - font-size: 90%; -} \ No newline at end of file diff --git a/spring-webflow-samples/shippingrate/src/main/webapp/swf_ajax.js b/spring-webflow-samples/shippingrate/src/main/webapp/swf_ajax.js deleted file mode 100644 index 136862ab..00000000 --- a/spring-webflow-samples/shippingrate/src/main/webapp/swf_ajax.js +++ /dev/null @@ -1,64 +0,0 @@ - var SimpleRequest = function(targetElementId, url, method, parameters) { - var targetElement = $(targetElementId); - if (targetElement == null) { - throw 'Target element is null!'; - } - if (url == null) { - throw 'URL has to be provided'; - } - if (method == null) { - method = 'get'; - } else if (method != 'get' && method != 'post') { - throw 'Method should be get or post'; - } - var myAjax = new Ajax.Updater( - { success: targetElement }, - url, - { - method: method, - parameters: parameters, - onFailure: errFunc, - evalScripts: true - }); - }; - - function formRequest(formElementId) { - Event.observe(formElementId, 'submit', handleSubmitEvent, true); - } - - function handleSubmitEvent(event) { - var formElement = Event.element(event); - if (formElement.tagName.toLowerCase() != 'form') { - throw 'Element ' + formElement + ' is not a FORM element!'; - } - var method = formElement.method; - if (method == null) { - method = 'get'; - } - var url = formElement.action; - if (url == null) { - throw 'No action defined on ' + formElement; - } - try { - Event.stop(event); - var myRequest = new Ajax.Updater( - { success: formElement.parentNode }, - url, - { - method: method, - parameters: Form.serialize(formElement), - evalScripts: true, - onFailure: errFunc - }); - } finally { - return false; - } - } - - var handlerFunc = function(t) { - alert(t.responseText); - } - - var errFunc = function(t) { - alert('Error ' + t.status + ' -- ' + t.statusText); - } \ No newline at end of file diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath index 663323f9..1d8071e7 100644 --- a/spring-webflow/.classpath +++ b/spring-webflow/.classpath @@ -2,49 +2,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - + + + + + + diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml index dc033178..e7d64489 100644 --- a/spring-webflow/ivy.xml +++ b/spring-webflow/ivy.xml @@ -48,6 +48,7 @@ + diff --git a/spring-webflow/readme.txt b/spring-webflow/readme.txt index 49570198..58d42376 100644 --- a/spring-webflow/readme.txt +++ b/spring-webflow/readme.txt @@ -1,4 +1,4 @@ -SPRING WEB FLOW 2.0-m2 (October 2007) +SPRING WEB FLOW 2.0-M2 (October 2007) ---------------------------------- http://www.springframework.org/webflow http://forum.springframework.org diff --git a/spring-webflow/src/main/java/META-INF/spring.schemas b/spring-webflow/src/main/java/META-INF/spring.schemas index e39bc683..e4fce8cd 100644 --- a/spring-webflow/src/main/java/META-INF/spring.schemas +++ b/spring-webflow/src/main/java/META-INF/spring.schemas @@ -1,2 +1 @@ -http\://www.springframework.org/schema/webflow-config/spring-webflow-config-1.0.xsd=org/springframework/webflow/config/spring-webflow-config-1.0.xsd http\://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd=org/springframework/webflow/config/spring-webflow-config-2.0.xsd \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/AbstractAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/AbstractAction.java index 0bdcf91f..0dcc25ce 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/AbstractAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/AbstractAction.java @@ -24,7 +24,6 @@ import org.springframework.webflow.core.collection.AttributeMap; import org.springframework.webflow.execution.Action; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; -import org.springframework.webflow.execution.support.EventFactorySupport; /** * Base action that provides assistance commonly needed by action implementations. This includes: @@ -62,7 +61,7 @@ public abstract class AbstractAction implements Action, InitializingBean { } /** - * Action initializing callback, may be overriden by subclasses to perform custom initialization logic. + * Action initializing callback, may be overridden by subclasses to perform custom initialization logic. *

* Keep in mind that this hook will only be invoked when this action is deployed in a Spring application context * since it uses the Spring {@link InitializingBean} mechanism to trigger action initialisation. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/EvaluateAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/EvaluateAction.java index 0c5aee4f..27c8b40e 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/EvaluateAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/EvaluateAction.java @@ -15,7 +15,6 @@ */ package org.springframework.webflow.action; -import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.Expression; import org.springframework.util.Assert; import org.springframework.webflow.execution.Event; @@ -70,20 +69,10 @@ public class EvaluateAction extends AbstractAction { } protected Event doExecute(RequestContext context) throws Exception { - Object result = expression.evaluate(context, getEvaluationContext(context)); + Object result = expression.getValue(context); if (evaluationResultExposer != null) { evaluationResultExposer.exposeResult(result, context); } return resultEventFactorySelector.forResult(result).createResultEvent(this, result, context); } - - /** - * Template method subclasses may override to customize the expressin evaluation context. This implementation - * returns null. - * @param context the request context - * @return the evaluation context - */ - protected EvaluationContext getEvaluationContext(RequestContext context) { - return null; - } } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/EventFactorySupport.java b/spring-webflow/src/main/java/org/springframework/webflow/action/EventFactorySupport.java similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/execution/support/EventFactorySupport.java rename to spring-webflow/src/main/java/org/springframework/webflow/action/EventFactorySupport.java index 7b6b8b81..6e805831 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/EventFactorySupport.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/EventFactorySupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.webflow.execution.support; +package org.springframework.webflow.action; import org.springframework.webflow.core.collection.AttributeMap; import org.springframework.webflow.core.collection.CollectionUtils; diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/ExternalRedirectAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/ExternalRedirectAction.java new file mode 100644 index 00000000..3dc2dd6d --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/ExternalRedirectAction.java @@ -0,0 +1,23 @@ +package org.springframework.webflow.action; + +import org.springframework.binding.expression.Expression; +import org.springframework.util.Assert; +import org.springframework.webflow.execution.Event; +import org.springframework.webflow.execution.RequestContext; + +public class ExternalRedirectAction extends AbstractAction { + + private Expression resourceUri; + + public ExternalRedirectAction(Expression resourceUri) { + Assert.notNull(resourceUri, "The URI of the resource to redirect to is required"); + this.resourceUri = resourceUri; + } + + protected Event doExecute(RequestContext context) throws Exception { + String resourceUri = (String) this.resourceUri.getValue(context); + context.getExternalContext().sendExternalRedirect(resourceUri); + return success(); + } + +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/FlowDefinitionRedirectAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/FlowDefinitionRedirectAction.java new file mode 100644 index 00000000..374485dd --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/FlowDefinitionRedirectAction.java @@ -0,0 +1,70 @@ +package org.springframework.webflow.action; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.springframework.binding.expression.Expression; +import org.springframework.util.Assert; +import org.springframework.webflow.context.FlowDefinitionRequestInfo; +import org.springframework.webflow.context.RequestPath; +import org.springframework.webflow.core.collection.LocalParameterMap; +import org.springframework.webflow.core.collection.ParameterMap; +import org.springframework.webflow.execution.Event; +import org.springframework.webflow.execution.RequestContext; + +public class FlowDefinitionRedirectAction extends AbstractAction { + private Expression flowId; + private Expression[] requestElements; + private Map requestParameters; + + public FlowDefinitionRedirectAction(Expression flowId, Expression[] requestElements, Map requestParameters) { + Assert.notNull(flowId, "The flow id to redirect to is required"); + this.flowId = flowId; + this.requestElements = requestElements; + this.requestParameters = requestParameters; + } + + protected Event doExecute(RequestContext context) throws Exception { + String flowId = (String) this.flowId.getValue(context); + RequestPath requestPath = evaluateRequestPath(context); + ParameterMap requestParameters = evaluateRequestParameters(context); + context.getExternalContext().sendFlowDefinitionRedirect( + new FlowDefinitionRequestInfo(flowId, requestPath, requestParameters, null)); + return success(); + } + + private RequestPath evaluateRequestPath(RequestContext context) { + if (this.requestElements == null || this.requestElements.length == 0) { + return null; + } + String[] requestElements = new String[this.requestElements.length]; + for (int i = 0; i < this.requestElements.length; i++) { + Expression element = this.requestElements[i]; + requestElements[i] = (String) element.getValue(context); + } + return RequestPath.valueOf(requestElements); + } + + private ParameterMap evaluateRequestParameters(RequestContext context) { + if (this.requestParameters == null) { + return null; + } else { + Map requestParameters = new HashMap(); + for (Iterator it = this.requestParameters.entrySet().iterator(); it.hasNext();) { + Map.Entry entry = (Map.Entry) it.next(); + Expression name = (Expression) entry.getKey(); + Expression value = (Expression) entry.getValue(); + String paramName = (String) name.getValue(context); + String paramValue = (String) value.getValue(context); + requestParameters.put(paramName, paramValue); + } + return new LocalParameterMap(requestParameters); + } + } + + public static FlowDefinitionRedirectAction create(String encodedFlowRedirect) { + // TODO + return null; + } +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java index fc259bf0..222dfa31 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/FormAction.java @@ -15,8 +15,6 @@ */ package org.springframework.webflow.action; -import java.lang.reflect.Method; - import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyEditorRegistrar; import org.springframework.beans.PropertyEditorRegistry; @@ -26,7 +24,7 @@ import org.springframework.core.style.StylerUtils; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; -import org.springframework.validation.BindException; +import org.springframework.validation.BindingResult; import org.springframework.validation.DataBinder; import org.springframework.validation.Errors; import org.springframework.validation.MessageCodesResolver; @@ -36,7 +34,6 @@ import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.ScopeType; import org.springframework.webflow.util.DispatchMethodInvoker; -import org.springframework.webflow.util.ReflectionUtils; /** * Multi-action that implements common logic dealing with input forms. This class leverages the Spring Web data binding @@ -242,20 +239,6 @@ import org.springframework.webflow.util.ReflectionUtils; */ public class FormAction extends MultiAction implements InitializingBean { - /* - * Implementation note: Uses deprecated DataBinder.getErrors() to remain compatible with Spring 1.2.x. - */ - - /* - * Implementation note: Introspects BindException at class init time to preserve 1.2.x compatability. - */ - private static boolean hasPropertyEditorRegistryAccessor; - - static { - hasPropertyEditorRegistryAccessor = ClassUtils - .hasMethod(BindException.class, "getPropertyEditorRegistry", null); - } - /** * The default form object name ("formObject"). */ @@ -510,7 +493,7 @@ public class FormAction extends MultiAction implements InitializingBean { if (logger.isDebugEnabled()) { logger.debug("Executing validation"); } - doValidate(context, formObject, binder.getErrors()); + doValidate(context, formObject, binder.getBindingResult()); } else { if (logger.isDebugEnabled()) { if (getValidator() == null) { @@ -520,8 +503,8 @@ public class FormAction extends MultiAction implements InitializingBean { } } } - putFormErrors(context, binder.getErrors()); - return binder.getErrors().hasErrors() ? error() : success(); + putFormErrors(context, binder.getBindingResult()); + return binder.getBindingResult().hasErrors() ? error() : success(); } /** @@ -542,8 +525,8 @@ public class FormAction extends MultiAction implements InitializingBean { Object formObject = getFormObject(context); DataBinder binder = createBinder(context, formObject); doBind(context, binder); - putFormErrors(context, binder.getErrors()); - return binder.getErrors().hasErrors() ? error() : success(); + putFormErrors(context, binder.getBindingResult()); + return binder.getBindingResult().hasErrors() ? error() : success(); } /** @@ -635,7 +618,7 @@ public class FormAction extends MultiAction implements InitializingBean { if (logger.isDebugEnabled()) { logger.debug("Creating new form errors for object with name '" + getFormObjectName() + "'"); } - Errors errors = createBinder(context, formObject).getErrors(); + Errors errors = createBinder(context, formObject).getBindingResult(); putFormErrors(context, errors); return errors; } @@ -691,8 +674,8 @@ public class FormAction extends MultiAction implements InitializingBean { */ private boolean formErrorsValid(RequestContext context, Object formObject) { Errors errors = getFormObjectAccessor(context).getFormErrors(getFormObjectName(), getFormErrorsScope()); - if (errors instanceof BindException) { - BindException be = (BindException) errors; + if (errors instanceof BindingResult) { + BindingResult be = (BindingResult) errors; if (be.getTarget() != formObject) { if (logger.isInfoEnabled()) { logger.info("Inconsistency detected: the Errors instance in '" + getFormErrorsScope() @@ -715,29 +698,9 @@ public class FormAction extends MultiAction implements InitializingBean { * @param context the flow execution request context */ private void reinstallPropertyEditors(RequestContext context) { - BindException errors = (BindException) getFormObjectAccessor(context).getFormErrors(getFormObjectName(), + BindingResult errors = (BindingResult) getFormObjectAccessor(context).getFormErrors(getFormObjectName(), getFormErrorsScope()); - registerPropertyEditors(context, getPropertyEditorRegistry(errors)); - } - - /** - * Obtain a property editor registry from given bind exception (errors instance). - */ - private PropertyEditorRegistry getPropertyEditorRegistry(BindException errors) { - Method accessor; - try { - if (hasPropertyEditorRegistryAccessor) { - accessor = errors.getClass().getMethod("getPropertyEditorRegistry", null); - } else { - // only way to get at the registry in 1.2.8 or <. - accessor = errors.getClass().getDeclaredMethod("getBeanWrapper", null); - accessor.setAccessible(true); - } - } catch (NoSuchMethodException e) { - throw new IllegalStateException( - "Unable to resolve property editor registry accessor method as expected - this should not happen"); - } - return (PropertyEditorRegistry) ReflectionUtils.invokeMethod(accessor, errors); + registerPropertyEditors(context, errors.getPropertyEditorRegistry()); } /** @@ -852,8 +815,8 @@ public class FormAction extends MultiAction implements InitializingBean { if (logger.isDebugEnabled()) { logger.debug("Binding completed for form object with name '" + binder.getObjectName() + "', post-bind formObject toString = " + binder.getTarget()); - logger.debug("There are [" + binder.getErrors().getErrorCount() + "] errors, details: " - + binder.getErrors().getAllErrors()); + logger.debug("There are [" + binder.getBindingResult().getErrorCount() + "] errors, details: " + + binder.getBindingResult().getAllErrors()); } } diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/FormObjectAccessor.java b/spring-webflow/src/main/java/org/springframework/webflow/action/FormObjectAccessor.java index 2d4e2fab..f7de5f65 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/FormObjectAccessor.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/FormObjectAccessor.java @@ -15,7 +15,7 @@ */ package org.springframework.webflow.action; -import org.springframework.validation.BindException; +import org.springframework.validation.BindingResult; import org.springframework.validation.Errors; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.ScopeType; @@ -24,10 +24,10 @@ import org.springframework.webflow.execution.ScopeType; * Convenience helper that encapsulates logic on how to retrieve and expose form objects and associated errors to and * from a flow execution request context. *

- * Note: The form object available under the well known attribute name {@link #CURRENT_FORM_OBJECT_ATTRIBUTE} - * will be the last ("current") form object set in the request context. The same is true for the associated errors - * object. This implies that special care should be taken when accessing the form object using this alias if there are - * multiple form objects available in the flow execution request context! + * Note: The form object available under the well known attribute name will be the last ("current") form object + * set in the request context. The same is true for the associated errors object. This implies that special care should + * be taken when accessing the form object using this alias if there are multiple form objects available in the flow + * execution request context! * * @see org.springframework.webflow.execution.RequestContext * @see org.springframework.validation.Errors @@ -53,8 +53,7 @@ public class FormObjectAccessor { /** * The errors prefix. */ - // use deprecated API to remain compatible with Spring 1.2.x - private static final String ERRORS_PREFIX = BindException.ERROR_KEY_PREFIX; + private static final String ERRORS_PREFIX = BindingResult.MODEL_KEY_PREFIX; /** * The wrapped request context. @@ -86,8 +85,7 @@ public class FormObjectAccessor { } /** - * Gets the form object from the context, using the well-known attribute name {@link #CURRENT_FORM_OBJECT_ATTRIBUTE}. - * Will try all scopes. + * Gets the form object from the context, using the well-known attribute name. Will try all scopes. * @return the form object, or null if not found */ public Object getCurrentFormObject() { @@ -107,7 +105,7 @@ public class FormObjectAccessor { } /** - * Gets the form object from the context, using the well-known attribute name {@link #CURRENT_FORM_OBJECT_ATTRIBUTE}. + * Gets the form object from the context, using the well-known attribute name. * @param scopeType the scope to obtain the form object from * @return the form object, or null if not found */ @@ -116,8 +114,7 @@ public class FormObjectAccessor { } /** - * Expose given form object using the well known alias {@link #CURRENT_FORM_OBJECT_ATTRIBUTE} in the specified - * scope. + * Expose given form object using the well known alias in the specified scope. * @param formObject the form object * @param scopeType the scope in which to expose the form object */ @@ -160,8 +157,8 @@ public class FormObjectAccessor { } /** - * Gets the form object Errors tracker from the context, using the form object name - * {@link #CURRENT_FORM_OBJECT_ATTRIBUTE}. This method will search all scopes. + * Gets the form object Errors tracker from the context, using the form object name. This method will + * search all scopes. * @return the form object Errors tracker, or null if not found */ public Errors getCurrentFormErrors() { @@ -181,8 +178,7 @@ public class FormObjectAccessor { } /** - * Gets the form object Errors tracker from the context, using the form object name - * {@link #CURRENT_FORM_OBJECT_ATTRIBUTE}. + * Gets the form object Errors tracker from the context, using the form object name. * @param scopeType the scope to obtain the errors from * @return the form object Errors tracker, or null if not found */ @@ -191,8 +187,7 @@ public class FormObjectAccessor { } /** - * Expose given errors instance using the well known alias {@link #CURRENT_FORM_OBJECT_ATTRIBUTE} in the specified - * scope. + * Expose given errors instance using the well known alias in the specified scope. * @param errors the errors instance * @param scopeType the scope in which to expose the errors instance */ @@ -203,7 +198,7 @@ public class FormObjectAccessor { /** * Gets the form object Errors tracker from the context, using the specified form object name. * @param formObjectName the name of the Errors object, which will be prefixed with - * {@link BindException#ERROR_KEY_PREFIX} + * {@link BindingResult#MODEL_KEY_PREFIX} * @param scopeType the scope to obtain the errors from * @return the form object errors instance, or null if not found */ diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/ResultObjectBasedEventFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/action/ResultObjectBasedEventFactory.java index 239d0032..63f693f3 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/ResultObjectBasedEventFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/ResultObjectBasedEventFactory.java @@ -19,7 +19,6 @@ import org.springframework.core.JdkVersion; import org.springframework.core.enums.LabeledEnum; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; -import org.springframework.webflow.execution.support.EventFactorySupport; /** * Result object-to-event adapter interface that tries to do a sensible conversion of the result object into a web flow @@ -31,13 +30,13 @@ import org.springframework.webflow.execution.support.EventFactorySupport; * * * null - * {@link org.springframework.webflow.execution.support.EventFactorySupport#getNullEventId()} + * {@link org.springframework.webflow.action.EventFactorySupport#getNullEventId()} *   * * * {@link java.lang.Boolean} or boolean - * {@link org.springframework.webflow.execution.support.EventFactorySupport#getYesEventId()}/ - * {@link org.springframework.webflow.execution.support.EventFactorySupport#getNoEventId()} + * {@link org.springframework.webflow.action.EventFactorySupport#getYesEventId()}/ + * {@link org.springframework.webflow.action.EventFactorySupport#getNoEventId()} *   * * diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/SetAction.java b/spring-webflow/src/main/java/org/springframework/webflow/action/SetAction.java index 02e50fb3..ec956752 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/SetAction.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/SetAction.java @@ -15,9 +15,7 @@ */ package org.springframework.webflow.action; -import org.springframework.binding.expression.EvaluationContext; import org.springframework.binding.expression.Expression; -import org.springframework.binding.expression.SettableExpression; import org.springframework.util.Assert; import org.springframework.webflow.core.collection.MutableAttributeMap; import org.springframework.webflow.execution.Event; @@ -34,7 +32,7 @@ public class SetAction extends AbstractAction { /** * The expression for setting the scoped attribute value. */ - private SettableExpression attributeExpression; + private Expression attributeExpression; /** * The target scope. @@ -52,7 +50,7 @@ public class SetAction extends AbstractAction { * @param scope the target scope of the attribute * @param valueExpression the evaluatable attribute value expression */ - public SetAction(SettableExpression attributeExpression, ScopeType scope, Expression valueExpression) { + public SetAction(Expression attributeExpression, ScopeType scope, Expression valueExpression) { Assert.notNull(attributeExpression, "The attribute expression is required"); Assert.notNull(scope, "The scope type is required"); Assert.notNull(valueExpression, "The value expression is required"); @@ -62,20 +60,9 @@ public class SetAction extends AbstractAction { } protected Event doExecute(RequestContext context) throws Exception { - EvaluationContext evaluationContext = getEvaluationContext(context); - Object value = valueExpression.evaluate(context, evaluationContext); + Object value = valueExpression.getValue(context); MutableAttributeMap scopeMap = scope.getScope(context); - attributeExpression.evaluateToSet(scopeMap, value, evaluationContext); + attributeExpression.setValue(scopeMap, value); return success(); } - - /** - * Template method subclasses may override to customize the expression evaluation context. This implementation - * returns null. - * @param context the request context - * @return the evaluation context - */ - protected EvaluationContext getEvaluationContext(RequestContext context) { - return null; - } } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/action/SuccessEventFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/action/SuccessEventFactory.java index 62159d01..ede7781d 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/action/SuccessEventFactory.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/action/SuccessEventFactory.java @@ -17,7 +17,6 @@ package org.springframework.webflow.action; import org.springframework.webflow.execution.Event; import org.springframework.webflow.execution.RequestContext; -import org.springframework.webflow.execution.support.EventFactorySupport; /** * Default implementation of the resultObject-to-event mapping interface. Always returns the "success" event. diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/EnableScopesBeanDefinitionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/config/EnableScopesBeanDefinitionParser.java deleted file mode 100644 index 2d33670d..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/EnableScopesBeanDefinitionParser.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.config; - -import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; -import org.springframework.beans.factory.xml.BeanDefinitionParser; -import org.springframework.webflow.config.scope.ScopeRegistrar; -import org.w3c.dom.Element; - -/** - * {@link BeanDefinitionParser} for the <enable-scopes> tag. - * - * @author Ben Hale - */ -class EnableScopesBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { - - protected Class getBeanClass(Element element) { - return ScopeRegistrar.class; - } - - protected boolean shouldGenerateId() { - return true; - } - -} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/ExecutionAttributesBeanDefinitionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/config/ExecutionAttributesBeanDefinitionParser.java deleted file mode 100644 index 541e76be..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/ExecutionAttributesBeanDefinitionParser.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.config; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.config.MapFactoryBean; -import org.springframework.beans.factory.config.TypedStringValue; -import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.support.ManagedMap; -import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; -import org.springframework.beans.factory.xml.BeanDefinitionParser; -import org.springframework.util.StringUtils; -import org.springframework.util.xml.DomUtils; -import org.springframework.webflow.engine.support.ApplicationViewSelector; -import org.w3c.dom.Element; - -/** - * {@link BeanDefinitionParser} for the <execution-attributes> tag. - * - * @author Ben Hale - */ -class ExecutionAttributesBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { - - // elements and attributes - - private static final String ATTRIBUTE_ELEMENT = "attribute"; - - private static final String NAME_ATTRIBUTE = "name"; - - private static final String TYPE_ATTRIBUTE = "type"; - - private static final String VALUE_ATTRIBUTE = "value"; - - // properties - - private static final String SOURCE_MAP_PROPERTY = "sourceMap"; - - protected Class getBeanClass(Element element) { - return MapFactoryBean.class; - } - - protected void doParse(Element element, BeanDefinitionBuilder definitionBuilder) { - List attributeElements = DomUtils.getChildElementsByTagName(element, ATTRIBUTE_ELEMENT); - Map attributeMap = new ManagedMap(attributeElements.size()); - putAttributes(attributeMap, attributeElements); - putSpecialAttributes(attributeMap, element); - definitionBuilder.addPropertyValue(SOURCE_MAP_PROPERTY, attributeMap); - } - - /** - * Add all attributes defined in given list of attribute elements to given map. - */ - private void putAttributes(Map attributeMap, List attributeElements) { - for (Iterator i = attributeElements.iterator(); i.hasNext();) { - Element attributeElement = (Element) i.next(); - String type = attributeElement.getAttribute(TYPE_ATTRIBUTE); - Object value; - if (StringUtils.hasText(type)) { - value = new TypedStringValue(attributeElement.getAttribute(VALUE_ATTRIBUTE), type); - } else { - value = attributeElement.getAttribute(VALUE_ATTRIBUTE); - } - attributeMap.put(attributeElement.getAttribute(NAME_ATTRIBUTE), value); - } - } - - /** - * Add all non-generic (special) attributes defined in given element to given map. - */ - private void putSpecialAttributes(Map attributeMap, Element element) { - putAlwaysRedirectOnPauseAttribute(attributeMap, DomUtils.getChildElementByTagName(element, - ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE)); - } - - /** - * Parse the "alwaysRedirectOnPause" attribute from given element and add it to given map. - */ - private void putAlwaysRedirectOnPauseAttribute(Map attributeMap, Element element) { - if (element != null) { - Boolean value = Boolean.valueOf(element.getAttribute(VALUE_ATTRIBUTE)); - attributeMap.put(ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE, value); - } - } -} \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowBuilderInfo.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowBuilderInfo.java new file mode 100644 index 00000000..50370963 --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowBuilderInfo.java @@ -0,0 +1,59 @@ +package org.springframework.webflow.config; + +import java.util.Collections; +import java.util.Set; + +import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; +import org.springframework.util.StringUtils; + +/** + * A low-level pointer to a flow definition that will be registered in a flow registry and built by a concrete flow + * builder implementation class. + * + * @author Keith Donald + */ +class FlowBuilderInfo { + + /** + * The id to assign to the flow definition. + */ + private String id; + + /** + * The fully-qualified flow builder implementation class. + */ + private String className; + + /** + * Attributes to assign to the flow definition. + */ + private Set attributes; + + public FlowBuilderInfo(String id, String className, Set attributes) { + Assert.hasText(className, "The fully-qualified FlowBuilder class name is required"); + this.className = className; + setId(id); + this.attributes = (attributes != null ? attributes : Collections.EMPTY_SET); + } + + private void setId(String id) { + if (StringUtils.hasText(id)) { + this.id = id; + } else { + this.id = StringUtils.uncapitalize(StringUtils.delete(ClassUtils.getShortName(className), "FlowBuilder")); + } + } + + public String getId() { + return id; + } + + public String getClassName() { + return className; + } + + public Set getAttributes() { + return attributes; + } +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResource.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResource.java new file mode 100644 index 00000000..0cee41a7 --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResource.java @@ -0,0 +1,56 @@ +package org.springframework.webflow.config; + +import org.springframework.core.io.Resource; +import org.springframework.webflow.core.collection.AttributeMap; + +/** + * An abstract representation of an externalized flow definition resource. Holds the data necessary to build a flow + * definition from an external file, and register the flow definition in a flow definition registry. + * + * Flow definition resources are created by a {@link FlowDefinitionResourceFactory}. + * + * @author Keith Donald + * @see FlowDefinitionResource + */ +public class FlowDefinitionResource { + + private String id; + + private Resource path; + + private AttributeMap attributes; + + FlowDefinitionResource(String flowId, Resource path, AttributeMap attributes) { + this.id = flowId; + this.path = path; + this.attributes = attributes; + } + + /** + * Returns the identifier to be assigned to the flow definition. + * @return the flow definition identifier + */ + public String getId() { + return id; + } + + /** + * Returns the path to the flow definition resource. + * @return the path location + */ + public Resource getPath() { + return path; + } + + /** + * Returns attributes to assign the flow definition. + * @return flow definition attributes + */ + public AttributeMap getAttributes() { + return attributes; + } + + public String toString() { + return path.toString(); + } +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResourceFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResourceFactory.java new file mode 100644 index 00000000..76494728 --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowDefinitionResourceFactory.java @@ -0,0 +1,79 @@ +package org.springframework.webflow.config; + +import java.io.File; +import java.io.IOException; + +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; +import org.springframework.core.io.support.ResourcePatternResolver; +import org.springframework.util.Assert; +import org.springframework.webflow.core.collection.AttributeMap; + +public class FlowDefinitionResourceFactory { + private ResourceLoader resourceLoader; + + public FlowDefinitionResourceFactory() { + this.resourceLoader = new DefaultResourceLoader(); + } + + public FlowDefinitionResourceFactory(ResourceLoader resourceLoader) { + Assert.notNull(resourceLoader, "The resource loader cannot be null"); + this.resourceLoader = resourceLoader; + } + + public FlowDefinitionResource createResource(String path) { + return createResource(path, null, null); + } + + public FlowDefinitionResource createResource(String path, AttributeMap attributes) { + return createResource(path, attributes, null); + } + + public FlowDefinitionResource createResource(String path, AttributeMap attributes, String flowId) { + Resource resource = resourceLoader.getResource(path); + if (flowId == null || flowId.length() == 0) { + flowId = getFlowId(resource); + } + return new FlowDefinitionResource(flowId, resource, attributes); + } + + public FlowDefinitionResource[] createResources(String pattern) throws IOException { + if (resourceLoader instanceof ResourcePatternResolver) { + ResourcePatternResolver resolver = (ResourcePatternResolver) resourceLoader; + Resource[] resources = resolver.getResources(pattern); + 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); + } + return flowResources; + } else { + throw new IllegalStateException( + "Cannot create flow definition resources from patterns without a ResourceLoader configured that is a ResourcePatternResolver"); + } + } + + public FlowDefinitionResource createFileResource(String path) { + Resource resource = new FileSystemResource(new File(path)); + return new FlowDefinitionResource(getFlowId(resource), resource, null); + } + + public FlowDefinitionResource createClassPathResource(String path, Class clazz) { + Resource resource = new ClassPathResource(path, clazz); + return new FlowDefinitionResource(getFlowId(resource), resource, null); + } + + private String getFlowId(Resource flowResource) { + String fileName = flowResource.getFilename(); + int extensionIndex = fileName.lastIndexOf('.'); + if (extensionIndex != -1) { + return fileName.substring(0, extensionIndex); + } else { + return fileName; + } + } + +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowElementAttribute.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowElementAttribute.java new file mode 100644 index 00000000..dd89da0f --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowElementAttribute.java @@ -0,0 +1,65 @@ +/* + * Copyright 2004-2007 the original author or authors. + * + * 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.springframework.webflow.config; + +import org.springframework.util.Assert; + +/** + * A low-level definition of a attribute describing a flow artifact. + * + * @author Keith Donald + */ +class FlowElementAttribute { + + /** + * The name of the attribute. + */ + private String name; + + /** + * The value of the attribute before type-conversion. + */ + private String value; + + /** + * The attribute type, optional, but necessary for type conversion. + */ + private String type; + + public FlowElementAttribute(String name, String value, String type) { + Assert.hasText(name, "The name is required"); + Assert.hasText(value, "The value is required"); + this.name = name; + this.value = value; + this.type = type; + } + + public String getName() { + return name; + } + + public String getValue() { + return value; + } + + public String getType() { + return type; + } + + public boolean needsTypeConversion() { + return type != null && type.length() > 0; + } +} \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/ExecutionListenersBeanDefinitionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionListenerLoaderBeanDefinitionParser.java similarity index 89% rename from spring-webflow/src/main/java/org/springframework/webflow/config/ExecutionListenersBeanDefinitionParser.java rename to spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionListenerLoaderBeanDefinitionParser.java index e81094ae..b79a61fe 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/ExecutionListenersBeanDefinitionParser.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionListenerLoaderBeanDefinitionParser.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.support.ManagedMap; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.util.xml.DomUtils; -import org.springframework.webflow.execution.factory.ConditionalFlowExecutionListenerLoader; import org.w3c.dom.Element; /** @@ -33,22 +32,22 @@ import org.w3c.dom.Element; * * @author Ben Hale */ -class ExecutionListenersBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { +class FlowExecutionListenerLoaderBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { // elements and attributes private static final String LISTENER_ELEMENT = "listener"; - // properties - - private static final String LISTENERS_PROPERTY = "listeners"; - private static final String CRITERIA_ATTRIBUTE = "criteria"; private static final String REF_ATTRIBUTE = "ref"; + // properties + + private static final String LISTENERS_PROPERTY = "listeners"; + protected Class getBeanClass(Element element) { - return ConditionalFlowExecutionListenerLoader.class; + return FlowExecutionListenerLoaderFactoryBean.class; } protected void doParse(Element element, BeanDefinitionBuilder definitionBuilder) { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionListenerLoaderFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionListenerLoaderFactoryBean.java new file mode 100644 index 00000000..68a2e8fc --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionListenerLoaderFactoryBean.java @@ -0,0 +1,68 @@ +package org.springframework.webflow.config; + +import java.util.Iterator; +import java.util.Map; + +import org.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.webflow.execution.FlowExecutionListener; +import org.springframework.webflow.execution.factory.ConditionalFlowExecutionListenerLoader; +import org.springframework.webflow.execution.factory.FlowExecutionListenerCriteriaFactory; +import org.springframework.webflow.execution.factory.FlowExecutionListenerLoader; + +/** + * A factory for a flow execution listener loader. Is a Spring FactoryBean, for provision by the flow execution listener + * loader bean definition parser. Is package-private, as people should not be using this class directly, but rather + * through the higher-level webflow-config Spring 2.x configuration namespace. + * + * @author Keith Donald + */ +class FlowExecutionListenerLoaderFactoryBean implements FactoryBean, InitializingBean { + + /** + * The configured execution listeners and the criteria determining when they apply. + */ + private Map listenersWithCriteria; + + /** + * The listener loader created by this factory. Is conditional, allowing listeners to apply to flow executions + * selectively based on some criteria expression. + */ + private ConditionalFlowExecutionListenerLoader listenerLoader; + + /** + * A helper factory for converting string-encoded listener criteria to a FlowExecutionListenerCriteria object. + */ + private FlowExecutionListenerCriteriaFactory listenerCriteriaFactory = new FlowExecutionListenerCriteriaFactory(); + + /** + * Sets the listeners eligible for loading, and the criteria for when they should be loaded. + * @param listenersWithCriteria the listener-to-criteria map + */ + public void setListeners(Map listenersWithCriteria) { + this.listenersWithCriteria = listenersWithCriteria; + } + + public void afterPropertiesSet() { + listenerLoader = new ConditionalFlowExecutionListenerLoader(); + Iterator it = listenersWithCriteria.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = (Map.Entry) it.next(); + FlowExecutionListener listener = (FlowExecutionListener) entry.getKey(); + String criteria = (String) entry.getValue(); + listenerLoader.addListener(listener, listenerCriteriaFactory.getListenerCriteria(criteria)); + } + } + + public Object getObject() throws Exception { + return listenerLoader; + } + + public Class getObjectType() { + return FlowExecutionListenerLoader.class; + } + + public boolean isSingleton() { + return true; + } +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/RepositoryType.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionRepositoryType.java similarity index 54% rename from spring-webflow/src/main/java/org/springframework/webflow/config/RepositoryType.java rename to spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionRepositoryType.java index 7d86ce4d..da7fc663 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/RepositoryType.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutionRepositoryType.java @@ -16,9 +16,6 @@ package org.springframework.webflow.config; import org.springframework.core.enums.StaticLabeledEnum; -import org.springframework.webflow.execution.repository.continuation.ClientContinuationFlowExecutionRepository; -import org.springframework.webflow.execution.repository.continuation.ContinuationFlowExecutionRepository; -import org.springframework.webflow.execution.repository.support.SimpleFlowExecutionRepository; /** * Type-safe enumeration of logical flow execution repository types. @@ -27,37 +24,32 @@ import org.springframework.webflow.execution.repository.support.SimpleFlowExecut * * @author Keith Donald */ -public class RepositoryType extends StaticLabeledEnum { +public class FlowExecutionRepositoryType extends StaticLabeledEnum { /** * The 'simple' flow execution repository type. - * @see SimpleFlowExecutionRepository */ - public static final RepositoryType SIMPLE = new RepositoryType(0, "Simple"); + public static final FlowExecutionRepositoryType SIMPLE = new FlowExecutionRepositoryType(0, "Simple"); /** * The 'continuation' flow execution repository type. - * @see ContinuationFlowExecutionRepository */ - public static final RepositoryType CONTINUATION = new RepositoryType(1, "Continuation"); + public static final FlowExecutionRepositoryType CONTINUATION = new FlowExecutionRepositoryType(1, "Continuation"); /** * The 'client' (continuation) flow execution repository type. - * @see ClientContinuationFlowExecutionRepository */ - public static final RepositoryType CLIENT = new RepositoryType(2, "Client"); + public static final FlowExecutionRepositoryType CLIENT = new FlowExecutionRepositoryType(2, "Client"); /** * The 'singleKey' flow execution repository type. - * @see SimpleFlowExecutionRepository - * @see SimpleFlowExecutionRepository#setAlwaysGenerateNewNextKey(boolean) */ - public static final RepositoryType SINGLEKEY = new RepositoryType(3, "Single Key"); + public static final FlowExecutionRepositoryType SINGLEKEY = new FlowExecutionRepositoryType(3, "Single Key"); /** * Private constructor because this is a typesafe enum! */ - private RepositoryType(int code, String label) { + private FlowExecutionRepositoryType(int code, String label) { super(code, label); } } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/ExecutorBeanDefinitionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorBeanDefinitionParser.java similarity index 74% rename from spring-webflow/src/main/java/org/springframework/webflow/config/ExecutorBeanDefinitionParser.java rename to spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorBeanDefinitionParser.java index 6e32a8c9..98f3d9e9 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/ExecutorBeanDefinitionParser.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorBeanDefinitionParser.java @@ -15,6 +15,11 @@ */ package org.springframework.webflow.config; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; @@ -25,55 +30,60 @@ import org.springframework.util.xml.DomUtils; import org.w3c.dom.Element; /** - * {@link BeanDefinitionParser} for the <executor> tag. + * {@link BeanDefinitionParser} for the <flow-executor> tag. * - * @author Ben Hale - * @author Christian Dupuis + * @author Keith Donald */ -class ExecutorBeanDefinitionParser extends AbstractBeanDefinitionParser { +class FlowExecutorBeanDefinitionParser extends AbstractBeanDefinitionParser { // elements and attributes - private static final String CONVERSATION_MANAGER_REF_ATTRIBUTE = "conversation-manager-ref"; + private static final String CONVERSATION_MANAGER_REF_ATTRIBUTE = "conversation-manager"; - private static final String EXECUTION_ATTRIBUTES_ELEMENT = "execution-attributes"; + private static final String EXECUTION_ATTRIBUTES_ELEMENT = "flow-execution-attributes"; - private static final String EXECUTION_LISTENERS_ELEMENT = "execution-listeners"; + private static final String ALWAYS_REDIRECT_ON_PAUSE_ELEMENT = "alwaysRedirectOnPause"; + + private static final String ATTRIBUTE_ELEMENT = "attribute"; + + private static final String NAME_ATTRIBUTE = "name"; + + private static final String VALUE_ATTRIBUTE = "value"; + + private static final String TYPE_ATTRIBUTE = "type"; + + private static final String EXECUTION_LISTENERS_ELEMENT = "flow-execution-listeners"; private static final String MAX_CONTINUATIONS_ATTRIBUTE = "max-continuations"; private static final String MAX_CONVERSATIONS_ATTRIBUTE = "max-conversations"; - private static final String REGISTRY_REF_ATTRIBUTE = "registry-ref"; + private static final String REGISTRY_REF_ATTRIBUTE = "flow-registry"; - private static final String REPOSITORY_ELEMENT = "repository"; - - private static final String REPOSITORY_TYPE_ATTRIBUTE = "repository-type"; - - private static final String TYPE_ATTRIBUTE = "type"; + private static final String REPOSITORY_ELEMENT = "flow-execution-repository"; // properties private static final String CONVERSATION_MANAGER_PROPERTY = "conversationManager"; - private static final String DEFINITION_LOCATOR_PROPERTY = "definitionLocator"; + private static final String DEFINITION_LOCATOR_PROPERTY = "flowDefinitionLocator"; - private static final String EXECUTION_ATTRIBUTES_PROPERTY = "executionAttributes"; + private static final String REPOSITORY_TYPE_PROPERTY = "flowExecutionRepositoryType"; - private static final String EXECUTION_LISTENER_LOADER_PROPERTY = "executionListenerLoader"; + private static final String EXECUTION_ATTRIBUTES_PROPERTY = "flowExecutionAttributes"; + + private static final String EXECUTION_LISTENER_LOADER_PROPERTY = "flowExecutionListenerLoader"; private static final String MAX_CONTINUATIONS_PROPERTY = "maxContinuations"; private static final String MAX_CONVERSATIONS_PROPERTY = "maxConversations"; - private static final String REPOSITORY_TYPE_PROPERTY = "repositoryType"; - protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { BeanDefinitionBuilder definitionBuilder = BeanDefinitionBuilder .rootBeanDefinition(FlowExecutorFactoryBean.class); definitionBuilder.setSource(parserContext.extractSource(element)); definitionBuilder.addPropertyReference(DEFINITION_LOCATOR_PROPERTY, getRegistryRef(element, parserContext)); - addExecutionAttributes(element, parserContext, definitionBuilder); + definitionBuilder.addPropertyValue(EXECUTION_ATTRIBUTES_PROPERTY, parseAttributes(element)); addExecutionListenerLoader(element, parserContext, definitionBuilder); configureRepository(element, definitionBuilder, parserContext); return definitionBuilder.getBeanDefinition(); @@ -88,18 +98,10 @@ class ExecutorBeanDefinitionParser extends AbstractBeanDefinitionParser { private void configureRepository(Element element, BeanDefinitionBuilder definitionBuilder, ParserContext parserContext) { Element repositoryElement = DomUtils.getChildElementByTagName(element, REPOSITORY_ELEMENT); - String repositoryTypeAttribute = getRepositoryType(element); if (repositoryElement != null) { - if (StringUtils.hasText(repositoryTypeAttribute)) { - parserContext.getReaderContext().error( - "The 'repositoryType' attribute of the 'executor' element must " - + "not have a value if there is a 'repository' element", element); - } definitionBuilder.addPropertyValue(REPOSITORY_TYPE_PROPERTY, getType(repositoryElement)); configureContinuations(repositoryElement, definitionBuilder, parserContext); configureConversationManager(repositoryElement, definitionBuilder, parserContext); - } else if (StringUtils.hasText(repositoryTypeAttribute)) { - definitionBuilder.addPropertyValue(REPOSITORY_TYPE_PROPERTY, repositoryTypeAttribute); } } @@ -155,20 +157,11 @@ class ExecutorBeanDefinitionParser extends AbstractBeanDefinitionParser { String registryRef = element.getAttribute(REGISTRY_REF_ATTRIBUTE); if (!StringUtils.hasText(registryRef)) { parserContext.getReaderContext().error( - "The 'registry-ref' attribute of the 'executor' element must have a value", element); + "The 'registry-ref' attribute of the 'flow-executor' element must have a value", element); } return registryRef; } - /** - * Returns the name of the repository type enum field detailed in the bean definition. - * @param element the element to extract the repository type from - * @return the type of the repository - */ - private String getRepositoryType(Element element) { - return element.getAttribute(REPOSITORY_TYPE_ATTRIBUTE).toUpperCase(); - } - /** * Returns the name of the repository type enum field detailed in the bean definition. * @param element the element to extract the repository type from @@ -205,18 +198,6 @@ class ExecutorBeanDefinitionParser extends AbstractBeanDefinitionParser { return element.getAttribute(CONVERSATION_MANAGER_REF_ATTRIBUTE); } - /** - * Parse execution attribute definitions contained in given element. - */ - private void addExecutionAttributes(Element element, ParserContext parserContext, - BeanDefinitionBuilder definitionBuilder) { - Element attributesElement = DomUtils.getChildElementByTagName(element, EXECUTION_ATTRIBUTES_ELEMENT); - if (attributesElement != null) { - definitionBuilder.addPropertyValue(EXECUTION_ATTRIBUTES_PROPERTY, parserContext.getDelegate() - .parseCustomElement(attributesElement, definitionBuilder.getBeanDefinition())); - } - } - /** * Parse execution listener definitions contained in given element. */ @@ -228,4 +209,28 @@ class ExecutorBeanDefinitionParser extends AbstractBeanDefinitionParser { .parseCustomElement(listenersElement, definitionBuilder.getBeanDefinition())); } } + + private Set parseAttributes(Element element) { + Element executionAttributesElement = DomUtils.getChildElementByTagName(element, EXECUTION_ATTRIBUTES_ELEMENT); + if (executionAttributesElement != null) { + HashSet attributes = new HashSet(); + Element redirectElement = DomUtils.getChildElementByTagName(executionAttributesElement, + ALWAYS_REDIRECT_ON_PAUSE_ELEMENT); + if (redirectElement != null) { + String value = redirectElement.getAttribute(VALUE_ATTRIBUTE); + attributes.add(new FlowElementAttribute("alwaysRedirectOnPause", value, "boolean")); + } + List attributeElements = DomUtils.getChildElementsByTagName(executionAttributesElement, ATTRIBUTE_ELEMENT); + for (Iterator it = attributeElements.iterator(); it.hasNext();) { + Element attributeElement = (Element) it.next(); + String name = attributeElement.getAttribute(NAME_ATTRIBUTE); + String value = attributeElement.getAttribute(VALUE_ATTRIBUTE); + String type = attributeElement.getAttribute(TYPE_ATTRIBUTE); + attributes.add(new FlowElementAttribute(name, value, type)); + } + return attributes; + } else { + return null; + } + } } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java index 6c3d8813..8ae608ef 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorFactoryBean.java @@ -15,13 +15,15 @@ */ package org.springframework.webflow.config; -import java.util.Map; +import java.util.Iterator; +import java.util.Set; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.binding.mapping.AttributeMapper; +import org.springframework.binding.convert.ConversionExecutor; +import org.springframework.binding.convert.ConversionService; +import org.springframework.binding.convert.support.DefaultConversionService; import org.springframework.util.Assert; -import org.springframework.webflow.context.ExternalContext; import org.springframework.webflow.conversation.ConversationManager; import org.springframework.webflow.conversation.impl.SessionBindingConversationManager; import org.springframework.webflow.core.collection.AttributeMap; @@ -31,16 +33,13 @@ import org.springframework.webflow.definition.registry.FlowDefinitionLocator; import org.springframework.webflow.definition.registry.FlowDefinitionRegistry; import org.springframework.webflow.engine.impl.FlowExecutionImplFactory; import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer; -import org.springframework.webflow.execution.FlowExecution; import org.springframework.webflow.execution.FlowExecutionFactory; -import org.springframework.webflow.execution.FlowExecutionListener; +import org.springframework.webflow.execution.FlowExecutionKeyFactory; import org.springframework.webflow.execution.factory.FlowExecutionListenerLoader; -import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader; import org.springframework.webflow.execution.repository.FlowExecutionRepository; -import org.springframework.webflow.execution.repository.continuation.ClientContinuationFlowExecutionRepository; -import org.springframework.webflow.execution.repository.continuation.ContinuationFlowExecutionRepository; +import org.springframework.webflow.execution.repository.impl.ClientFlowExecutionRepository; +import org.springframework.webflow.execution.repository.impl.DefaultFlowExecutionRepository; import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer; -import org.springframework.webflow.execution.repository.support.SimpleFlowExecutionRepository; import org.springframework.webflow.executor.FlowExecutor; import org.springframework.webflow.executor.FlowExecutorImpl; @@ -51,8 +50,7 @@ import org.springframework.webflow.executor.FlowExecutorImpl; * This factory encapsulates the construction and assembly of a {@link FlowExecutor}, including the provision of its * {@link FlowExecutionRepository} strategy. *

- * The {@link #setDefinitionLocator(FlowDefinitionLocator) definition locator} property is required, all other - * properties are optional. + * The definition locator property is required, all other properties are optional. *

* This class has been designed with subclassing in mind. If you want to do advanced Spring Web Flow customization, e.g. * using a custom {@link org.springframework.webflow.executor.FlowExecutor} implementation, consider subclassing this @@ -61,22 +59,22 @@ import org.springframework.webflow.executor.FlowExecutorImpl; * @author Keith Donald * @author Erwin Vervaet */ -public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { +class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { /** * The locator the executor will use to access flow definitions registered in a central registry. Required. */ - private FlowDefinitionLocator definitionLocator; + private FlowDefinitionLocator flowDefinitionLocator; /** * Execution attributes to apply. */ - private MutableAttributeMap executionAttributes; + private Set flowExecutionAttributes; /** * The loader that will determine which listeners to attach to flow definition executions. */ - private FlowExecutionListenerLoader executionListenerLoader; + private FlowExecutionListenerLoader flowExecutionListenerLoader; /** * The conversation manager to be used by the flow execution repository to store state associated with conversations @@ -93,67 +91,40 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * The type of execution repository to configure with executors created by this factory. Optional. Will fallback to * default value if not set. */ - private RepositoryType repositoryType; + private FlowExecutionRepositoryType flowExecutionRepositoryType; /** * The maximum number of allowed continuations for a single conversation. Only used when the repository type is - * {@link RepositoryType#CONTINUATION}. + * {@link FlowExecutionRepositoryType#CONTINUATION}. */ private Integer maxContinuations; /** - * A custom attribute mapper to use for mapping attributes of an {@link ExternalContext} to a new - * {@link FlowExecution} during the {@link FlowExecutor#launch(String, ExternalContext) launch flow} operation. + * The conversion service to use for type conversion of flow execution attribute values. */ - private AttributeMapper inputMapper; + private ConversionService conversionService = new DefaultConversionService(); /** * The flow executor this factory bean creates. */ private FlowExecutor flowExecutor; - /** - * Spring Web Flow executor system defaults. - */ - private FlowSystemDefaults defaults = new FlowSystemDefaults(); - /** * Sets the flow definition locator that will locate flow definitions needed for execution. Typically also a * {@link FlowDefinitionRegistry}. Required. - * @param definitionLocator the flow definition locator (registry) + * @param flowDefinitionLocator the flow definition locator (registry) */ - public void setDefinitionLocator(FlowDefinitionLocator definitionLocator) { - this.definitionLocator = definitionLocator; + public void setFlowDefinitionLocator(FlowDefinitionLocator flowDefinitionLocator) { + this.flowDefinitionLocator = flowDefinitionLocator; } /** * Sets the system attributes that apply to flow executions launched by the executor created by this factory. * Execution attributes may affect flow execution behavior. - *

- * Note: this method simply accepts a generic java.util.Map to allow for easy configuration by - * Spring. The map entries should consist of non-null String keys with object values. - * @param executionAttributes the flow execution system attributes + * @param flowExecutionAttributes the flow execution system attributes */ - public void setExecutionAttributes(Map executionAttributes) { - this.executionAttributes = new LocalAttributeMap(executionAttributes); - } - - /** - * Convenience setter that sets a single listener that always applies to flow executions launched by the executor - * created by this factory. - * @param executionListener the flow execution listener - */ - public void setExecutionListener(FlowExecutionListener executionListener) { - setExecutionListeners(new FlowExecutionListener[] { executionListener }); - } - - /** - * Convenience setter that sets a list of listeners that always apply to flow executions launched by the executor - * created by this factory. - * @param executionListeners the flow execution listeners - */ - public void setExecutionListeners(FlowExecutionListener[] executionListeners) { - setExecutionListenerLoader(new StaticFlowExecutionListenerLoader(executionListeners)); + public void setFlowExecutionAttributes(Set flowExecutionAttributes) { + this.flowExecutionAttributes = flowExecutionAttributes; } /** @@ -161,8 +132,8 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * control over what listeners should apply to executions of a flow definition launched by the executor created by * this factory. */ - public void setExecutionListenerLoader(FlowExecutionListenerLoader executionListenerLoader) { - this.executionListenerLoader = executionListenerLoader; + public void setFlowExecutionListenerLoader(FlowExecutionListenerLoader flowExecutionListenerLoader) { + this.flowExecutionListenerLoader = flowExecutionListenerLoader; } /** @@ -171,28 +142,25 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * provided type. * @param repositoryType the flow execution repository type */ - public void setRepositoryType(RepositoryType repositoryType) { - this.repositoryType = repositoryType; + public void setFlowExecutionRepositoryType(FlowExecutionRepositoryType repositoryType) { + this.flowExecutionRepositoryType = repositoryType; } /** * Set the maximum number of continuation snapshots allowed for a single conversation when using the - * {@link RepositoryType#CONTINUATION continuation} flow execution repository. - * @see ContinuationFlowExecutionRepository#setMaxContinuations(int) - * @since 1.0.1 */ public void setMaxContinuations(int maxContinuations) { this.maxContinuations = new Integer(maxContinuations); } /** - * Returns the configured maximum number of continuation snapshots allowed for a single conversation when using the - * {@link RepositoryType#CONTINUATION continuation} flow execution repository. - * @return the configured value or null if the user did not explicitly specify a value and wants to use the default - * @since 1.0.1 + * Set the maximum number of allowed concurrent conversations in the session. This is a convenience setter to allow + * easy configuration of the maxConversations property of the default {@link SessionBindingConversationManager}. Do + * not use this when an explicit conversation manager is configured. + * @see SessionBindingConversationManager#setMaxConversations(int) */ - protected Integer getMaxContinuations() { - return maxContinuations; + public void setMaxConversations(int maxConversations) { + this.maxConversations = new Integer(maxConversations); } /** @@ -202,122 +170,67 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * The conversation manager is used by the flow execution repository subsystem to begin and end new conversations * that store execution state. *

- * By default, a {@link SessionBindingConversationManager} is used. Do not use {@link #setMaxConversations(int)} - * when using this method. + * By default, a {@link SessionBindingConversationManager} is used. Do not use setMaxConversations when using this + * method. */ public void setConversationManager(ConversationManager conversationManager) { this.conversationManager = conversationManager; } /** - * Set the maximum number of allowed concurrent conversations in the session. This is a convenience setter to allow - * easy configuration of the maxConversations property of the default {@link SessionBindingConversationManager}. Do - * not use this when using {@link #setConversationManager(ConversationManager)}. - * @see SessionBindingConversationManager#setMaxConversations(int) - * @since 1.0.1 + * Sets the conversion service for converting string-encoded flow execution attributes to typed values. + * @param conversionService the conversion service */ - public void setMaxConversations(int maxConversations) { - this.maxConversations = new Integer(maxConversations); - } - - /** - * Returns the configured maximum number of allowed concurrent conversations in the session. Will only be used when - * using the default conversation manager, e.g. when no explicit conversation manager has been configured using - * {@link #setConversationManager(ConversationManager)}. - * @return the configured value or null if the user did not explicitly specify a value and wants to use the default - * @since 1.0.1 - */ - protected Integer getMaxConversations() { - return maxConversations; - } - - /** - * Set the service responsible for mapping attributes of an {@link ExternalContext} to a new {@link FlowExecution} - * during the {@link FlowExecutor#launch(String, ExternalContext) launch flow} operation. - *

- * This is optional. If not set, a default implementation will be used that simply exposes all request parameters as - * flow execution input attributes. - */ - public void setInputMapper(AttributeMapper inputMapper) { - this.inputMapper = inputMapper; - } - - /** - * Return the configured input mapper. - */ - protected AttributeMapper getInputMapper() { - return inputMapper; - } - - /** - * Set system defaults that should be used. - * @param defaults the defaults to use. - */ - public void setDefaults(FlowSystemDefaults defaults) { - this.defaults = defaults; + public void setConversionService(ConversionService conversionService) { + this.conversionService = conversionService; } // implementing InitializingBean public void afterPropertiesSet() throws Exception { - Assert.notNull(definitionLocator, "The flow definition locator is required"); + Assert.notNull(flowDefinitionLocator, "The flow definition locator property is required"); // apply defaults - executionAttributes = defaults.applyExecutionAttributes(executionAttributes); - repositoryType = defaults.applyIfNecessary(repositoryType); + FlowExecutorSystemDefaults defaults = new FlowExecutorSystemDefaults(); + + MutableAttributeMap executionAttributes = defaults.applyExecutionAttributes(createExecutionAttributeMap()); + flowExecutionRepositoryType = defaults.applyIfNecessary(flowExecutionRepositoryType); // pass all available parameters to the hook methods so that they // can participate in the construction process - // a factory for flow executions - FlowExecutionFactory executionFactory = createFlowExecutionFactory(executionAttributes, executionListenerLoader); - // a strategy to restore deserialized flow executions - FlowExecutionStateRestorer executionStateRestorer = createFlowExecutionStateRestorer(definitionLocator, - executionAttributes, executionListenerLoader); + FlowExecutionStateRestorer executionStateRestorer = createFlowExecutionStateRestorer(flowDefinitionLocator, + executionAttributes, flowExecutionListenerLoader); // a repository to store flow executions - FlowExecutionRepository executionRepository = createExecutionRepository(repositoryType, executionStateRestorer, - conversationManager); + FlowExecutionRepository executionRepository = createFlowExecutionRepository(flowExecutionRepositoryType, + executionStateRestorer, conversationManager); + + // a factory for flow executions + FlowExecutionFactory executionFactory = createFlowExecutionFactory(executionAttributes, + flowExecutionListenerLoader, (FlowExecutionKeyFactory) executionRepository); // combine all pieces of the puzzle to get an operational flow executor - flowExecutor = createFlowExecutor(definitionLocator, executionFactory, executionRepository); + flowExecutor = createFlowExecutor(flowDefinitionLocator, executionFactory, executionRepository); + } + + // implementing FactoryBean + + public Class getObjectType() { + return FlowExecutor.class; + } + + public boolean isSingleton() { + return true; + } + + public Object getObject() throws Exception { + return flowExecutor; } // subclassing hook methods - /** - * Create the conversation manager to be used in the default case, e.g. when no explicit conversation manager has - * been configured using {@link #setConversationManager(ConversationManager)}. This implementation return a - * {@link SessionBindingConversationManager}. - * @return the default conversation manager - */ - protected ConversationManager createDefaultConversationManager() { - SessionBindingConversationManager conversationManager = new SessionBindingConversationManager(); - if (getMaxConversations() != null) { - conversationManager.setMaxConversations(getMaxConversations().intValue()); - } - return conversationManager; - } - - /** - * Create the flow execution factory to be used by the executor produced by this factory bean. Configure the - * execution factory appropriately. Subclasses may override if they which to use a custom execution factory, e.g. to - * use a custom FlowExecution implementation. - * @param executionAttributes execution attributes to apply to created executions - * @param executionListenerLoader decides which listeners to apply to created executions - * @return a new flow execution factory instance - */ - protected FlowExecutionFactory createFlowExecutionFactory(AttributeMap executionAttributes, - FlowExecutionListenerLoader executionListenerLoader) { - FlowExecutionImplFactory executionFactory = new FlowExecutionImplFactory(); - executionFactory.setExecutionAttributes(executionAttributes); - if (executionListenerLoader != null) { - executionFactory.setExecutionListenerLoader(executionListenerLoader); - } - return executionFactory; - } - /** * Create the flow execution state restorer to be used by the executor produced by this factory bean. Configure the * state restorer appropriately. Subclasses may override if they which to use a custom state restorer @@ -346,15 +259,15 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { * default conversation manager should be used * @return a new flow execution repository instance */ - protected FlowExecutionRepository createExecutionRepository(RepositoryType repositoryType, + protected FlowExecutionRepository createFlowExecutionRepository(FlowExecutionRepositoryType repositoryType, FlowExecutionStateRestorer executionStateRestorer, ConversationManager conversationManager) { - if (repositoryType == RepositoryType.CLIENT) { + if (repositoryType == FlowExecutionRepositoryType.CLIENT) { if (conversationManager == null) { // use the default no-op conversation manager - return new ClientContinuationFlowExecutionRepository(executionStateRestorer); + return new ClientFlowExecutionRepository(executionStateRestorer); } else { // use the conversation manager specified by the user - return new ClientContinuationFlowExecutionRepository(executionStateRestorer, conversationManager); + return new ClientFlowExecutionRepository(conversationManager, executionStateRestorer); } } else { // determine the conversation manager to use @@ -362,19 +275,21 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { if (conversationManagerToUse == null) { conversationManagerToUse = createDefaultConversationManager(); } - - if (repositoryType == RepositoryType.SIMPLE) { - return new SimpleFlowExecutionRepository(executionStateRestorer, conversationManagerToUse); - } else if (repositoryType == RepositoryType.CONTINUATION) { - ContinuationFlowExecutionRepository repository = new ContinuationFlowExecutionRepository( - executionStateRestorer, conversationManagerToUse); - if (getMaxContinuations() != null) { - repository.setMaxContinuations(getMaxContinuations().intValue()); + if (repositoryType == FlowExecutionRepositoryType.SIMPLE) { + DefaultFlowExecutionRepository repository = new DefaultFlowExecutionRepository( + conversationManagerToUse, executionStateRestorer); + repository.setMaxContinuations(1); + return repository; + } else if (repositoryType == FlowExecutionRepositoryType.CONTINUATION) { + DefaultFlowExecutionRepository repository = new DefaultFlowExecutionRepository( + conversationManagerToUse, executionStateRestorer); + if (maxContinuations != null) { + repository.setMaxContinuations(maxContinuations.intValue()); } return repository; - } else if (repositoryType == RepositoryType.SINGLEKEY) { - SimpleFlowExecutionRepository repository = new SimpleFlowExecutionRepository(executionStateRestorer, - conversationManagerToUse); + } else if (repositoryType == FlowExecutionRepositoryType.SINGLEKEY) { + DefaultFlowExecutionRepository repository = new DefaultFlowExecutionRepository( + conversationManagerToUse, executionStateRestorer); repository.setAlwaysGenerateNewNextKey(false); return repository; } else { @@ -384,6 +299,38 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { } } + /** + * Create the conversation manager to be used in the default case, e.g. when no explicit conversation manager has + * been configured. This implementation return a {@link SessionBindingConversationManager}. + * @return the default conversation manager + */ + protected ConversationManager createDefaultConversationManager() { + SessionBindingConversationManager conversationManager = new SessionBindingConversationManager(); + if (maxConversations != null) { + conversationManager.setMaxConversations(maxConversations.intValue()); + } + return conversationManager; + } + + /** + * Create the flow execution factory to be used by the executor produced by this factory bean. Configure the + * execution factory appropriately. Subclasses may override if they which to use a custom execution factory, e.g. to + * use a custom FlowExecution implementation. + * @param executionAttributes execution attributes to apply to created executions + * @param executionListenerLoader decides which listeners to apply to created executions + * @return a new flow execution factory instance + */ + protected FlowExecutionFactory createFlowExecutionFactory(AttributeMap executionAttributes, + FlowExecutionListenerLoader executionListenerLoader, FlowExecutionKeyFactory keyFactory) { + FlowExecutionImplFactory executionFactory = new FlowExecutionImplFactory(); + executionFactory.setExecutionAttributes(executionAttributes); + if (executionListenerLoader != null) { + executionFactory.setExecutionListenerLoader(executionListenerLoader); + } + executionFactory.setExecutionKeyFactory(keyFactory); + return executionFactory; + } + /** * Create the flow executor instance created by this factory bean and configure it appropriately. Subclasses may * override if they which to use a custom executor implementation. @@ -394,32 +341,27 @@ public class FlowExecutorFactoryBean implements FactoryBean, InitializingBean { */ protected FlowExecutor createFlowExecutor(FlowDefinitionLocator definitionLocator, FlowExecutionFactory executionFactory, FlowExecutionRepository executionRepository) { - FlowExecutorImpl flowExecutor = new FlowExecutorImpl(definitionLocator, executionFactory, executionRepository); - if (getInputMapper() != null) { - flowExecutor.setInputMapper(inputMapper); + return new FlowExecutorImpl(definitionLocator, executionFactory, executionRepository); + } + + private MutableAttributeMap createExecutionAttributeMap() { + LocalAttributeMap executionAttributes = new LocalAttributeMap(); + if (flowExecutionAttributes != null) { + for (Iterator it = flowExecutionAttributes.iterator(); it.hasNext();) { + FlowElementAttribute attribute = (FlowElementAttribute) it.next(); + executionAttributes.put(attribute.getName(), getConvertedValue(attribute)); + } } - return flowExecutor; + return executionAttributes; } - // implementing FactoryBean - - public Class getObjectType() { - return FlowExecutor.class; - } - - public boolean isSingleton() { - return true; - } - - public Object getObject() throws Exception { - return getFlowExecutor(); - } - - /** - * Returns the flow executor constructed by the factory bean. - * @since 1.0.2 - */ - public FlowExecutor getFlowExecutor() { - return flowExecutor; + private Object getConvertedValue(FlowElementAttribute attribute) { + if (attribute.needsTypeConversion()) { + ConversionExecutor converter = conversionService.getConversionExecutorByTargetAlias(String.class, attribute + .getType()); + return converter.execute(attribute.getValue()); + } else { + return attribute.getValue(); + } } } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowSystemDefaults.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorSystemDefaults.java similarity index 79% rename from spring-webflow/src/main/java/org/springframework/webflow/config/FlowSystemDefaults.java rename to spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorSystemDefaults.java index cdea8900..42151854 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowSystemDefaults.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowExecutorSystemDefaults.java @@ -20,7 +20,6 @@ import java.io.Serializable; import org.springframework.core.style.ToStringCreator; import org.springframework.webflow.core.collection.LocalAttributeMap; import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.engine.support.ApplicationViewSelector; /** * Encapsulates overall flow system configuration defaults. Allows for centralized application of, and if necessary, @@ -28,7 +27,7 @@ import org.springframework.webflow.engine.support.ApplicationViewSelector; * * @author Keith Donald */ -public class FlowSystemDefaults implements Serializable { +class FlowExecutorSystemDefaults implements Serializable { /** * The default 'alwaysRedirectOnPause' execution attribute value. @@ -38,12 +37,11 @@ public class FlowSystemDefaults implements Serializable { /** * The default flow execution repository type. */ - private RepositoryType repositoryType = RepositoryType.CONTINUATION; + private FlowExecutionRepositoryType repositoryType = FlowExecutionRepositoryType.CONTINUATION; /** * Overrides the alwaysRedirectOnPause execution attribute default. Defaults to "true". * @param alwaysRedirectOnPause the new default value - * @see ApplicationViewSelector#ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE */ public void setAlwaysRedirectOnPause(boolean alwaysRedirectOnPause) { this.alwaysRedirectOnPause = alwaysRedirectOnPause; @@ -53,7 +51,7 @@ public class FlowSystemDefaults implements Serializable { * Overrides the default repository type. * @param repositoryType the new default value */ - public void setRepositoryType(RepositoryType repositoryType) { + public void setRepositoryType(FlowExecutionRepositoryType repositoryType) { this.repositoryType = repositoryType; } @@ -67,9 +65,8 @@ public class FlowSystemDefaults implements Serializable { if (executionAttributes == null) { executionAttributes = new LocalAttributeMap(1, 1); } - if (!executionAttributes.contains(ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE)) { - executionAttributes.put(ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE, new Boolean( - alwaysRedirectOnPause)); + if (!executionAttributes.contains("alwaysRedirectOnPause")) { + executionAttributes.put("alwaysRedirectOnPause", new Boolean(alwaysRedirectOnPause)); } return executionAttributes; } @@ -79,7 +76,7 @@ public class FlowSystemDefaults implements Serializable { * @param selectedType the selected repository type (may be null if no selection was made) * @return the repository type, with the default applied if necessary */ - public RepositoryType applyIfNecessary(RepositoryType selectedType) { + public FlowExecutionRepositoryType applyIfNecessary(FlowExecutionRepositoryType selectedType) { if (selectedType == null) { return repositoryType; } else { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowLocation.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowLocation.java new file mode 100644 index 00000000..0a0dcc20 --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowLocation.java @@ -0,0 +1,49 @@ +package org.springframework.webflow.config; + +import java.util.Collections; +import java.util.Set; + +import org.springframework.util.Assert; + +/** + * A low-level pointer to a flow definition that will be registered in a registry and built from an external file + * resource. + * + * @author Keith Donald + */ +class FlowLocation { + + /** + * The id to assign to the flow definition. + */ + private String id; + + /** + * The string-encoded path to the flow definition file resource. + */ + private String path; + + /** + * Attributes to assign to the flow definition. + */ + private Set attributes; + + public FlowLocation(String id, String path, Set attributes) { + Assert.hasText(path, "The path is required"); + this.id = id; + this.path = path; + this.attributes = (attributes != null ? attributes : Collections.EMPTY_SET); + } + + public String getId() { + return id; + } + + public String getPath() { + return path; + } + + public Set getAttributes() { + return attributes; + } +} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryBeanDefinitionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryBeanDefinitionParser.java new file mode 100644 index 00000000..868ca2d9 --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryBeanDefinitionParser.java @@ -0,0 +1,131 @@ +/* + * Copyright 2004-2007 the original author or authors. + * + * 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.springframework.webflow.config; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import org.springframework.beans.factory.support.BeanDefinitionBuilder; +import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; +import org.springframework.beans.factory.xml.BeanDefinitionParser; +import org.springframework.util.StringUtils; +import org.springframework.util.xml.DomUtils; +import org.w3c.dom.Element; + +/** + * {@link BeanDefinitionParser} for the flow <registry> tag. + * + * @author Keith Donald + */ +class FlowRegistryBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { + + private static final String FLOW_BUILDER_SERVICES_ATTRIBUTE = "flow-builder-services"; + + private static final String FLOW_LOCATION_ELEMENT = "flow-location"; + + private static final String FLOW_BUILDER_ELEMENT = "flow-builder"; + + private static final String ID_ATTRIBUTE = "id"; + + private static final String PATH_ATTRIBUTE = "path"; + + private static final String CLASS_ATTRIBUTE = "class"; + + private static final String DEFINITION_ATTRIBUTES_ELEMENT = "flow-definition-attributes"; + + private static final String ATTRIBUTE_ELEMENT = "attribute"; + + private static final String NAME_ATTRIBUTE = "name"; + + private static final String VALUE_ATTRIBUTE = "value"; + + private static final String TYPE_ATTRIBUTE = "type"; + + private static final String FLOW_LOCATIONS_PROPERTY = "flowLocations"; + + private static final String FLOW_BUILDERS_PROPERTY = "flowBuilders"; + + private static final String FLOW_BUILDER_SERVICES_PROPERTY = "flowBuilderServices"; + + protected Class getBeanClass(Element element) { + return FlowRegistryFactoryBean.class; + } + + protected void doParse(Element element, BeanDefinitionBuilder definitionBuilder) { + String flowBuilderServices = getFlowBuilderServicesAttribute(element); + if (StringUtils.hasText(flowBuilderServices)) { + definitionBuilder.addPropertyReference(FLOW_BUILDER_SERVICES_PROPERTY, flowBuilderServices); + } + definitionBuilder.addPropertyValue(FLOW_LOCATIONS_PROPERTY, parseLocations(element)); + definitionBuilder.addPropertyValue(FLOW_BUILDERS_PROPERTY, parseFlowBuilders(element)); + } + + private List parseLocations(Element element) { + List locationElements = DomUtils.getChildElementsByTagName(element, FLOW_LOCATION_ELEMENT); + if (locationElements.isEmpty()) { + return Collections.EMPTY_LIST; + } + List locations = new ArrayList(locationElements.size()); + for (Iterator it = locationElements.iterator(); it.hasNext();) { + Element locationElement = (Element) it.next(); + String id = locationElement.getAttribute(ID_ATTRIBUTE); + String path = locationElement.getAttribute(PATH_ATTRIBUTE); + locations.add(new FlowLocation(id, path, parseAttributes(locationElement))); + } + return locations; + } + + private Set parseAttributes(Element element) { + Element definitionAttributesElement = DomUtils.getChildElementByTagName(element, DEFINITION_ATTRIBUTES_ELEMENT); + if (definitionAttributesElement != null) { + List attributeElements = DomUtils.getChildElementsByTagName(definitionAttributesElement, ATTRIBUTE_ELEMENT); + HashSet attributes = new HashSet(attributeElements.size()); + for (Iterator it = attributeElements.iterator(); it.hasNext();) { + Element attributeElement = (Element) it.next(); + String name = attributeElement.getAttribute(NAME_ATTRIBUTE); + String value = attributeElement.getAttribute(VALUE_ATTRIBUTE); + String type = attributeElement.getAttribute(TYPE_ATTRIBUTE); + attributes.add(new FlowElementAttribute(name, value, type)); + } + return attributes; + } else { + return null; + } + } + + private List parseFlowBuilders(Element element) { + List builderElements = DomUtils.getChildElementsByTagName(element, FLOW_BUILDER_ELEMENT); + if (builderElements.isEmpty()) { + return Collections.EMPTY_LIST; + } + List builders = new ArrayList(builderElements.size()); + for (Iterator it = builderElements.iterator(); it.hasNext();) { + Element builderElement = (Element) it.next(); + String id = builderElement.getAttribute(ID_ATTRIBUTE); + String className = builderElement.getAttribute(CLASS_ATTRIBUTE); + builders.add(new FlowBuilderInfo(id, className, parseAttributes(builderElement))); + } + return builders; + } + + private String getFlowBuilderServicesAttribute(Element element) { + return element.getAttribute(FLOW_BUILDER_SERVICES_ATTRIBUTE); + } +} \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java new file mode 100644 index 00000000..f43cf3d6 --- /dev/null +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java @@ -0,0 +1,239 @@ +package org.springframework.webflow.config; + +import java.util.Iterator; +import java.util.Set; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.binding.convert.ConversionExecutor; +import org.springframework.context.ResourceLoaderAware; +import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; +import org.springframework.util.ClassUtils; +import org.springframework.webflow.core.collection.AttributeMap; +import org.springframework.webflow.core.collection.LocalAttributeMap; +import org.springframework.webflow.core.collection.MutableAttributeMap; +import org.springframework.webflow.definition.FlowDefinition; +import org.springframework.webflow.definition.registry.FlowDefinitionConstructionException; +import org.springframework.webflow.definition.registry.FlowDefinitionHolder; +import org.springframework.webflow.definition.registry.FlowDefinitionRegistry; +import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl; +import org.springframework.webflow.engine.builder.FlowAssembler; +import org.springframework.webflow.engine.builder.FlowBuilder; +import org.springframework.webflow.engine.builder.FlowBuilderContext; +import org.springframework.webflow.engine.builder.RefreshableFlowDefinitionHolder; +import org.springframework.webflow.engine.builder.support.FlowBuilderContextImpl; +import org.springframework.webflow.engine.builder.support.FlowBuilderServices; +import org.springframework.webflow.engine.builder.xml.XmlFlowBuilder; + +/** + * A factory for a flow definition registry. Is a Spring FactoryBean, for provision by the flow definition registry bean + * definition parser. Is package-private, as people should not be using this class directly, but rather through the + * higher-level webflow-config Spring 2.x configuration namespace. + * + * @author Keith Donald + */ +class FlowRegistryFactoryBean implements FactoryBean, ResourceLoaderAware, BeanFactoryAware, InitializingBean { + + /** + * The definition registry produced by this factory bean. + */ + private FlowDefinitionRegistry flowRegistry; + + /** + * Flow definitions defined in external files that should be registered in the registry produced by this factory + * bean. + */ + private FlowLocation[] flowLocations; + + /** + * Java {@link FlowBuilder flow builder} classes that should be registered in the registry produced by this factory + * bean. + */ + private FlowBuilderInfo[] flowBuilders; + + /** + * The holder for services needed to build flow definitions registered in this registry. + */ + private FlowBuilderServices flowBuilderServices; + + /** + * A helper for creating abstract representation of externalized flow definition resources. + */ + private FlowDefinitionResourceFactory flowResourceFactory; + + /** + * The container's resource loader. + */ + private ResourceLoader resourceLoader; + + /** + * The containing bean factory this factory bean was deployed in. + */ + private BeanFactory beanFactory; + + public void setFlowLocations(FlowLocation[] flowLocations) { + this.flowLocations = flowLocations; + } + + public void setFlowBuilders(FlowBuilderInfo[] flowBuilders) { + this.flowBuilders = flowBuilders; + } + + public void setFlowBuilderServices(FlowBuilderServices flowBuilderServices) { + this.flowBuilderServices = flowBuilderServices; + } + + public void setResourceLoader(ResourceLoader resourceLoader) { + this.resourceLoader = resourceLoader; + } + + public void setBeanFactory(BeanFactory beanFactory) throws BeansException { + this.beanFactory = beanFactory; + } + + public void afterPropertiesSet() throws Exception { + if (flowBuilderServices == null) { + initFlowBuilderServices(); + } + flowResourceFactory = new FlowDefinitionResourceFactory(resourceLoader); + flowRegistry = new FlowDefinitionRegistryImpl(); + registerFlowLocations(); + registerFlowBuilders(); + } + + public Object getObject() throws Exception { + return flowRegistry; + } + + public Class getObjectType() { + return FlowDefinitionRegistry.class; + } + + public boolean isSingleton() { + return true; + } + + private void registerFlowLocations() { + if (flowLocations != null) { + for (int i = 0; i < flowLocations.length; i++) { + FlowLocation location = flowLocations[i]; + flowRegistry.registerFlowDefinition(createFlowDefinitionHolder(location)); + } + } + } + + private void registerFlowBuilders() { + if (flowBuilders != null) { + for (int i = 0; i < flowBuilders.length; i++) { + FlowBuilderInfo builder = flowBuilders[i]; + flowRegistry.registerFlowDefinition(createFlowDefinitionHolder(builder)); + } + } + } + + private FlowDefinitionHolder createFlowDefinitionHolder(FlowLocation location) { + FlowDefinitionResource flowResource = createResource(location); + FlowBuilder builder = createFlowBuilder(flowResource); + FlowBuilderContext builderContext = new FlowBuilderContextImpl(flowResource.getId(), flowResource + .getAttributes(), flowRegistry, flowBuilderServices); + FlowAssembler assembler = new FlowAssembler(builder, builderContext); + return new RefreshableFlowDefinitionHolder(assembler); + } + + private FlowDefinitionResource createResource(FlowLocation location) { + AttributeMap flowAttributes = getFlowAttributes(location.getAttributes()); + return flowResourceFactory.createResource(location.getPath(), flowAttributes, location.getId()); + } + + private AttributeMap getFlowAttributes(Set attributes) { + MutableAttributeMap flowAttributes = null; + if (!attributes.isEmpty()) { + flowAttributes = new LocalAttributeMap(); + for (Iterator it = attributes.iterator(); it.hasNext();) { + FlowElementAttribute attribute = (FlowElementAttribute) it.next(); + flowAttributes.put(attribute.getName(), getConvertedValue(attribute)); + } + } + return flowAttributes; + } + + private FlowBuilder createFlowBuilder(FlowDefinitionResource resource) { + if (isXml(resource.getPath())) { + return new XmlFlowBuilder(resource.getPath()); + } else { + throw new IllegalArgumentException(resource + + " is not a supported resource type; supported types are [.xml]"); + } + } + + private boolean isXml(Resource flowResource) { + return flowResource.getFilename().endsWith(".xml"); + } + + private Object getConvertedValue(FlowElementAttribute attribute) { + if (attribute.needsTypeConversion()) { + ConversionExecutor converter = flowBuilderServices.getConversionService() + .getConversionExecutorByTargetAlias(String.class, attribute.getType()); + return converter.execute(attribute.getValue()); + } else { + return attribute.getValue(); + } + } + + private FlowDefinitionHolder createFlowDefinitionHolder(FlowBuilderInfo builder) { + ClassLoader classLoader = ClassUtils.getDefaultClassLoader(); + AttributeMap flowAttributes = getFlowAttributes(builder.getAttributes()); + FlowBuilderContext builderContext = new FlowBuilderContextImpl(builder.getId(), flowAttributes, flowRegistry, + flowBuilderServices); + return new FlowBuilderCreatingFlowDefinitionHolder(builder.getClassName(), classLoader, builderContext); + } + + private void initFlowBuilderServices() { + flowBuilderServices = new FlowBuilderServices(); + flowBuilderServices.setResourceLoader(resourceLoader); + flowBuilderServices.setBeanFactory(beanFactory); + } + + class FlowBuilderCreatingFlowDefinitionHolder implements FlowDefinitionHolder { + + private String flowBuilderClassName; + + private ClassLoader classLoader; + + private FlowBuilderContext builderContext; + + public FlowBuilderCreatingFlowDefinitionHolder(String flowBuilderClassName, ClassLoader classLoader, + FlowBuilderContext builderContext) { + this.flowBuilderClassName = flowBuilderClassName; + this.classLoader = classLoader; + this.builderContext = builderContext; + } + + public String getFlowDefinitionId() { + return builderContext.getFlowId(); + } + + public FlowDefinition getFlowDefinition() throws FlowDefinitionConstructionException { + try { + Class flowBuilderClass = classLoader.loadClass(flowBuilderClassName); + FlowBuilder builder = (FlowBuilder) flowBuilderClass.newInstance(); + FlowAssembler assembler = new FlowAssembler(builder, builderContext); + return assembler.assembleFlow(); + } catch (ClassNotFoundException e) { + throw new FlowDefinitionConstructionException(getFlowDefinitionId(), e); + } catch (InstantiationException e) { + throw new FlowDefinitionConstructionException(getFlowDefinitionId(), e); + } catch (IllegalAccessException e) { + throw new FlowDefinitionConstructionException(getFlowDefinitionId(), e); + } + } + + public void refresh() throws FlowDefinitionConstructionException { + } + + } +} \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/RegistryBeanDefinitionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/config/RegistryBeanDefinitionParser.java deleted file mode 100644 index 0e8e4834..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/RegistryBeanDefinitionParser.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.config; - -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.springframework.beans.factory.support.AbstractBeanDefinition; -import org.springframework.beans.factory.support.BeanDefinitionBuilder; -import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; -import org.springframework.beans.factory.xml.BeanDefinitionParser; -import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.core.io.Resource; -import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternUtils; -import org.springframework.util.xml.DomUtils; -import org.springframework.webflow.definition.registry.FlowDefinitionResource; -import org.springframework.webflow.engine.builder.FlowRegistryFactoryBean; -import org.w3c.dom.Element; - -/** - * {@link BeanDefinitionParser} for the <registry> tag. - * - * @author Ben Hale - */ -class RegistryBeanDefinitionParser extends AbstractBeanDefinitionParser { - - // elements - private static final String LOCATION_ELEMENT = "location"; - - private static final String NAMESPACE_ELEMENT = "namespace"; - - // attributes - private static final String ID_ATTRIBUTE = "id"; - - private static final String NAME_ATTRIBUTE = "name"; - - private static final String PATH_ATTRIBUTE = "path"; - - // Properties - private static final String XML_NAMESPACE_FLOW_MAPPINGS_PROPERTY = "xmlNamespaceFlowMappings"; - - protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { - BeanDefinitionBuilder definitionBuilder = BeanDefinitionBuilder - .rootBeanDefinition(FlowRegistryFactoryBean.class); - definitionBuilder.setSource(parserContext.extractSource(element)); - parseXml(element, definitionBuilder, parserContext); - return definitionBuilder.getBeanDefinition(); - } - - public void parseXml(Element element, BeanDefinitionBuilder definitionBuilder, ParserContext parserContext) { - Map xmlNamespaceFlowMappings = new HashMap(); - xmlNamespaceFlowMappings.put("", parseXmlElements( - DomUtils.getChildElementsByTagName(element, LOCATION_ELEMENT), parserContext)); - List namespaceElements = DomUtils.getChildElementsByTagName(element, NAMESPACE_ELEMENT); - for (Iterator it = namespaceElements.iterator(); it.hasNext();) { - Element namespaceElement = (Element) it.next(); - String namespace = namespaceElement.getAttribute(NAME_ATTRIBUTE); - xmlNamespaceFlowMappings.put(namespace, parseXmlElements(DomUtils.getChildElementsByTagName( - namespaceElement, LOCATION_ELEMENT), parserContext)); - } - definitionBuilder.addPropertyValue(XML_NAMESPACE_FLOW_MAPPINGS_PROPERTY, xmlNamespaceFlowMappings); - } - - private Set parseXmlElements(List locationElements, ParserContext parserContext) { - ResourcePatternResolver resolver = ResourcePatternUtils.getResourcePatternResolver(parserContext - .getReaderContext().getResourceLoader()); - Set resources = new HashSet(); - for (Iterator it = locationElements.iterator(); it.hasNext();) { - Element locationElement = (Element) it.next(); - try { - Resource[] locations = resolver.getResources(locationElement.getAttribute(PATH_ATTRIBUTE)); - if (locationElement.hasAttribute(ID_ATTRIBUTE)) { - if (locations.length != 1) { - parserContext.getReaderContext().error( - "The 'path' attribute of the 'location' element must point to a single value " - + "flow definition if an id has been specified", locationElement); - } else { - resources.add(new FlowDefinitionResource(locationElement.getAttribute(ID_ATTRIBUTE), - locations[0])); - } - } else { - for (int i = 0; i < locations.length; i++) { - resources.add(new FlowDefinitionResource(locations[i])); - } - } - } catch (IOException e) { - parserContext.getReaderContext().error( - "The 'path' attribute of the 'location' element must point to a valid flow definition " - + "or definitions", locationElement); - } - } - return resources; - } -} \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/WebFlowConfigNamespaceHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/config/WebFlowConfigNamespaceHandler.java index ba6a6b57..b29f34ed 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/WebFlowConfigNamespaceHandler.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/WebFlowConfigNamespaceHandler.java @@ -15,51 +15,18 @@ */ package org.springframework.webflow.config; -import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; /** * NamespaceHandler for the webflow-config namespace. - *

- * Provides {@link BeanDefinitionParser bean definition parsers} for the <executor> and - * <registry> tags. An executor tag can include an execution-listeners - * tag and a registry tag can include location tags. - *

- * Using the executor tag you can configure a {@link FlowExecutorFactoryBean} that creates a - * {@link org.springframework.webflow.executor.FlowExecutor}. The executor tag allows you to specify the - * repository type and a reference to a registry. - * - * 

- *       <flow:executor id="registry" registry-ref="registry" repository-type="continuation" >
- *           <flow:execution-listeners>
- *               <flow:listener ref="listener1" />
- *               <flow:listener ref="listener2" ref="*" />
- *               <flow:listener ref="listener3" ref="flow1, flow2, flow3" />
- *           <flow:execution-listeners />
- *       </flow:executor>
- *
- * - *

- * Using the registry tag you can configure an - * {@link org.springframework.webflow.engine.builder.xml.XmlFlowRegistryFactoryBean} to create a registry for use by any - * number of executors. The registry tag supports in-line flow definition locations. - * - * 

- *       <flow:registry id="registry">
- *           <flow:location path="/path/to/flow.xml" />
- *           <flow:location path="/path/with/wildcards/*-flow.xml" />
- *       </flow:registry>
- *
* + * @author Keith Donald * @author Ben Hale */ public class WebFlowConfigNamespaceHandler extends NamespaceHandlerSupport { - public void init() { - registerBeanDefinitionParser("execution-attributes", new ExecutionAttributesBeanDefinitionParser()); - registerBeanDefinitionParser("execution-listeners", new ExecutionListenersBeanDefinitionParser()); - registerBeanDefinitionParser("executor", new ExecutorBeanDefinitionParser()); - registerBeanDefinitionParser("registry", new RegistryBeanDefinitionParser()); - registerBeanDefinitionParser("enable-scopes", new EnableScopesBeanDefinitionParser()); + registerBeanDefinitionParser("flow-executor", new FlowExecutorBeanDefinitionParser()); + registerBeanDefinitionParser("flow-execution-listeners", new FlowExecutionListenerLoaderBeanDefinitionParser()); + registerBeanDefinitionParser("flow-registry", new FlowRegistryBeanDefinitionParser()); } } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/AbstractWebFlowScope.java b/spring-webflow/src/main/java/org/springframework/webflow/config/scope/AbstractWebFlowScope.java deleted file mode 100644 index 18bd7279..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/AbstractWebFlowScope.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.config.scope; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.ObjectFactory; -import org.springframework.beans.factory.config.Scope; -import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.execution.FlowExecutionContext; -import org.springframework.webflow.execution.FlowExecutionContextHolder; -import org.springframework.webflow.execution.FlowSession; - -/** - * Base class for {@link Scope} implementations that access a Web Flow scope from the current thread-bound - * {@link FlowExecutionContext} object. - *

- * Subclasses simply need to implement {@link #getScope()} to return the {@link MutableAttributeMap scope map} to - * access. - *

- * Relies on a thread-bound - * @{link FlowExecutionContext} instance located through the - * @{link FlowExecutionContextHolder}. - * - * @see FlowExecutionContext - * @see FlowExecutionContextHolder - * - * @author Ben Hale - */ -public abstract class AbstractWebFlowScope implements Scope { - - /** - * Logger, usable by subclasses. - */ - protected final Log logger = LogFactory.getLog(getClass()); - - public Object get(String name, ObjectFactory objectFactory) { - MutableAttributeMap scope = getScope(); - Object scopedObject = scope.get(name); - if (scopedObject == null) { - if (logger.isDebugEnabled()) { - logger.debug("No scoped instance '" + name + "' found; creating new instance"); - } - scopedObject = objectFactory.getObject(); - scope.put(name, scopedObject); - } else { - if (logger.isDebugEnabled()) { - logger.debug("Returning scoped instance '" + name + "'"); - } - } - return scopedObject; - } - - public Object remove(String name) { - return getScope().remove(name); - } - - /** - * Template method that returns the target scope map. - * @return the target scope map - * @see FlowExecutionContext#getConversationScope() - * @see FlowExecutionContext#getActiveSession() - * @see FlowSession#getFlashMap() - * @see FlowSession#getScope() - * @throws IllegalStateException if the scope could not be accessed - */ - protected abstract MutableAttributeMap getScope() throws IllegalStateException; - - /** - * Always returns null as most Spring Web Flow scopes do not have obvious conversation ids. - * Subclasses should override this method where conversation ids can be intelligently returned. - * @return always returns null - */ - public String getConversationId() { - return null; - } - - /** - * Will not register a destruction callback as Spring Web Flow does not support destruction of scoped beans. - * Subclasses should override this method where where destruction can adequately be accomplished. - * @param name the name of the bean to register the callback for - * @param callback the callback to execute - */ - public void registerDestructionCallback(String name, Runnable callback) { - logger.warn("Destruction callback for '" + name + "' was not registered. Spring Web Flow does not " - + "support destruction of scoped beans."); - } - - /** - * Returns the current flow execution context. Used by subclasses to easily get access to the thread-bound flow - * execution context. - * @return the current thread-bound flow execution context - * @throws IllegalStateException if the current flow execution context is not bound - */ - protected FlowExecutionContext getFlowExecutionContext() throws IllegalStateException { - return FlowExecutionContextHolder.getFlowExecutionContext(); - } - -} \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ConversationScope.java b/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ConversationScope.java deleted file mode 100644 index c4133c49..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ConversationScope.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.config.scope; - -import org.springframework.beans.factory.config.Scope; -import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.execution.FlowExecution; - -/** - * Conversation {@link Scope scope} implementation. - * - * @see FlowExecution#getConversationScope() - * - * @author Ben Hale - */ -public class ConversationScope extends AbstractWebFlowScope { - protected MutableAttributeMap getScope() { - return getFlowExecutionContext().getConversationScope(); - } -} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlashScope.java b/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlashScope.java deleted file mode 100644 index af5f5068..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlashScope.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.config.scope; - -import org.springframework.beans.factory.config.Scope; -import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.execution.FlowExecutionContext; - -/** - * Flash {@link Scope scope} implementation. - * - * @see FlowExecutionContext#getFlashScope() - * - * @author Ben Hale - */ -public class FlashScope extends AbstractWebFlowScope { - protected MutableAttributeMap getScope() { - return getFlowExecutionContext().getFlashScope(); - } -} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlowScope.java b/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlowScope.java deleted file mode 100644 index 52fe4bfc..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/FlowScope.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.config.scope; - -import org.springframework.beans.factory.config.Scope; -import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.execution.FlowSession; - -/** - * Flow {@link Scope scope} implementation. - * - * @see FlowSession#getScope() - * - * @author Ben Hale - */ -public class FlowScope extends AbstractWebFlowScope { - protected MutableAttributeMap getScope() { - return getFlowExecutionContext().getActiveSession().getScope(); - } -} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java b/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java deleted file mode 100644 index bf75d9ff..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/ScopeRegistrar.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.config.scope; - -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.beans.factory.config.Scope; -import org.springframework.core.Ordered; -import org.springframework.webflow.execution.ScopeType; - -/** - * Registers the Spring Web Flow bean scopes with a - * @{link ConfigurableListableBeanFactory}. - * - * @author Ben Hale - * @see Scope - */ -public class ScopeRegistrar implements BeanFactoryPostProcessor, Ordered { - - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { - beanFactory.registerScope(ScopeType.FLASH.getLabel().toLowerCase(), new FlashScope()); - beanFactory.registerScope(ScopeType.FLOW.getLabel().toLowerCase(), new FlowScope()); - beanFactory.registerScope(ScopeType.CONVERSATION.getLabel().toLowerCase(), new ConversationScope()); - } - - public int getOrder() { - return Ordered.LOWEST_PRECEDENCE; - } - -} diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/package.html b/spring-webflow/src/main/java/org/springframework/webflow/config/scope/package.html deleted file mode 100644 index 06917e9c..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/scope/package.html +++ /dev/null @@ -1,6 +0,0 @@ - - -Support code to allow access to the Spring Web Flow scopes (conversation, flow, flash) -from a Spring ApplicationContext. - - diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-1.0.xsd b/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-1.0.xsd deleted file mode 100644 index 9138f732..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-1.0.xsd +++ /dev/null @@ -1,345 +0,0 @@ - - - - - - -Provides an easy way to configure a flow executor and an XML flow definition registry. -]]> - - - - - - - - - -Each flow definition registered in this registry is assigned a unique identifier. By default, -this identifier is the name of the externalized resource minus its file extension. For example, -a registry containing flow definitions built from the files "orderitem-flow.xml" and "shipping-flow.xml" -would index those definitions by "orderitem-flow" and "shipping-flow" by default. -
-A flow registry is used by a flow executor at runtime to launch new executions of flow definitions. -]]> - - - - - - - - - - -Individual paths such as: -

-	/WEB-INF/flows/orderitem-flow.xml
-
-... are supported as well as wildcard paths such as: -
-	/WEB-INF/flows/**/*-flow.xml
-
-]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd b/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd index 74d8ecfa..096e2e67 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd +++ b/spring-webflow/src/main/java/org/springframework/webflow/config/spring-webflow-config-2.0.xsd @@ -18,21 +18,9 @@ Provides an easy way to configure a flow executor and an XML flow definition reg - + - - - - - - - - - + - - - - - + + + + + Individual paths such as: 
-	/WEB-INF/flows/orderitem-flow.xml
+	/WEB-INF/booking.xml
... are supported as well as wildcard paths such as: 
@@ -70,55 +58,43 @@ Individual paths such as:
 ]]>
 								
 							
-						
-						
-							
-								
-									
-Classes must be declared using a fully qualified path name such as
-
-	com.interface21.SellItemFlow
-

-]]>
-								
-							
-						
-						
-							
-								
-									
-Entities must be declared using a fully qualified path name such as
-
-	com.interface21.Account
-

-]]>
-								
-							
-						
-						
-							
-								
-									
-								
-							
-						
-					
-				
+						
+						
+							
+								
+									
+								
+							
+																		
+					
+					
+						
+							
+								
+							
+						
+					
+				
 			
 		
 	
 
-	
+	
+		
+			
+				
+					
+						
+					
+				
+			
+			
 		
 			
 				
@@ -140,82 +116,42 @@ that matches multiple resources.
 ]]>
 				
 			
-		
+		
 	
-	
-	
-		
-			
-				
-					
-				
-			
-		
-	
-
-	
-		
-			
-				
-					
-				
-			
-		
-	
-
-	
-		
-			
-				
-					
-						
-Individual paths such as:
-
-	/WEB-INF/flows/orderitem-flow.xml
-

-... are supported as well as wildcard paths such as:
-
-	/WEB-INF/flows/**/*-flow.xml
-

-]]>
-					
-				
-			
-			
-				
-					
-						
-Classes must be declared using a fully qualified path name such as
-
-	com.interface21.SellItemFlow
-

-]]>
-					
-				
-			
-		
-		
-			
-				
-					
-				
-			
-		
-	
-
-	
+
+	
+		
+			
+				
+					
+						
+					
+				
+			
+			
+		
+			
+				
+					
+				
+			
+			
+		
+			
+				
+				
+				
+			
+		
+	
+		
+	
 		
 			
 				
 				
 					
-						
+						
 							
 								
 									
 							
 						
-						
+						
 							
 								
 									
 							
 						
-						
+						
 							
 								
 									
 						
 					
-					
-						
-							
-						
-							
-									
-					
-					
+					
 						
 							
 								
 		
 	
-	
-	
-		
-			
-				
-					
-						
-					
-				
-			
-			
-				
-					
-						
-					
-				
-			
-			
-				
-					
-						
-					
-				
-			
-			
-				
-					
-						
-					
-				
-			
-		
-	
-	
-	
-		
+	
+	
+		
 			
 				
 					
 				
 				
 			
@@ -360,7 +241,7 @@ This attribute is only relevant when the repository type is 'continuation'.
 				
 			
 		
-		
+		
 			
 				
 				
 		
 	
-
-	
+
+	
+		
+			
+				
+					
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+	
+	
+	
 		
-			
+			
 				
 					
 						
 	
 
-	
+	
 		
 			
 				
@@ -410,7 +336,7 @@ Example: 'flow1,flow2,flow3'.
 		
 	
 
-	
+	
 		
 			
 				
@@ -447,7 +373,22 @@ true = always redirect on pause; false = do not, only redirect when explicitly i
 			
 		
 	
-
+
+	
+		
+			
+				
+					
+						
+					
+				
+			
+		
+	
+	
 	
 		
 			
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/AbstractFlowRequestInfo.java b/spring-webflow/src/main/java/org/springframework/webflow/context/AbstractFlowRequestInfo.java
new file mode 100644
index 00000000..73ad37f1
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/AbstractFlowRequestInfo.java
@@ -0,0 +1,74 @@
+package org.springframework.webflow.context;
+
+import org.springframework.webflow.core.collection.ParameterMap;
+
+/**
+ * An abstract representation request to be sent into the Spring Web Flow system at a later date. Used to request
+ * operations such as flow definition redirects, flow execution redirects, as well as to generate flow definition and
+ * flow execution URLs.
+ * 
+ * @author Keith Donald
+ */
+public abstract class AbstractFlowRequestInfo {
+
+	/**
+	 * The flow definition the request should be sent to.
+	 */
+	private String flowDefinitionId;
+
+	/**
+	 * Hierarchical data to be sent along in the request.
+	 */
+	private RequestPath requestPath;
+
+	/**
+	 * Query parameters to be sent along in the request.
+	 */
+	private ParameterMap requestParameters;
+
+	/**
+	 * An anchor fragment to be sent in the request, for interpretation by the agent that initiates the request.
+	 */
+	private String fragment;
+
+	protected AbstractFlowRequestInfo(String flowDefinitionId, RequestPath requestPath, ParameterMap requestParameters,
+			String fragment) {
+		this.flowDefinitionId = flowDefinitionId;
+		this.requestPath = requestPath;
+		this.requestParameters = requestParameters;
+		this.fragment = fragment;
+	}
+
+	/**
+	 * Returns the flow definition this request should be sent to.
+	 * @return the flow definition identifier
+	 */
+	public String getFlowDefinitionId() {
+		return flowDefinitionId;
+	}
+
+	/**
+	 * Returns hierarchical data to be sent along in the request.
+	 * @return the request path
+	 */
+	public RequestPath getRequestPath() {
+		return requestPath;
+	}
+
+	/**
+	 * Returns query parameters to send along in the request.
+	 * @return the request parameters
+	 */
+	public ParameterMap getRequestParameters() {
+		return requestParameters;
+	}
+
+	/**
+	 * Returns the fragment to be sent along in the request. A fragment is a free-form string value that may be
+	 * interpreted by the client agent that initiates the request.
+	 * @return the fragment
+	 */
+	public String getFragment() {
+		return fragment;
+	}
+}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/ExternalContext.java b/spring-webflow/src/main/java/org/springframework/webflow/context/ExternalContext.java
index 2131385d..57a2d0b6 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/context/ExternalContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/ExternalContext.java
@@ -15,12 +15,15 @@
  */
 package org.springframework.webflow.context;
 
+import java.io.PrintWriter;
+
+import org.springframework.webflow.core.FlowException;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.core.collection.ParameterMap;
 import org.springframework.webflow.core.collection.SharedAttributeMap;
 
 /**
- * A facade that provides normalized access to an external system that has interacted with Spring Web Flow.
+ * A facade that provides normalized access to an external system that has called into the Spring Web Flow system.
  * 

  * This context object provides a normalized interface for internal web flow artifacts to use to reason on and
  * manipulate the state of an external actor calling into SWF to execute flows. It represents the context about a
@@ -36,22 +39,31 @@ import org.springframework.webflow.core.collection.SharedAttributeMap;
 public interface ExternalContext {
 
 	/**
-	 * Returns the path (or identifier) of the application that is executing.
-	 * @return the application context path (e.g. "/myapp")
+	 * Returns the unique id of the flow definition invoked by this caller. For a "launch" request, this identifier is
+	 * used directly to create a new flow execution. For a "resume" request, this identifier provides additional flow
+	 * execution context.
+	 * @return the flow definition identifier, never null
+	 * @see #getFlowExecutionKey()
 	 */
-	public String getContextPath();
+	public String getFlowId();
 
 	/**
-	 * Returns the path (or identifier) of the dispatcher within the application that dispatched this request.
-	 * @return the dispatcher path (e.g. "/dispatcher")
+	 * Returns the unique key identifying the flow execution this client wishes to resume.
+	 * @return the flow execution key, may be null if this is not a resume request
 	 */
-	public String getDispatcherPath();
+	public String getFlowExecutionKey();
 
 	/**
-	 * Returns the path info of this external request. Could be null.
-	 * @return the request path info (e.g. "/flows.htm")
+	 * Returns the type of this client request. For example, this request may be a "GET" request or a "POST" request.
+	 * @return the request method
 	 */
-	public String getRequestPathInfo();
+	public String getRequestMethod();
+
+	/**
+	 * Returns the path of this request as a ordered list of fields.
+	 * @return the elements of the request path
+	 */
+	public RequestPath getRequestPath();
 
 	/**
 	 * Provides access to the parameters associated with the user request that led to SWF being called. This map is
@@ -92,4 +104,105 @@ public interface ExternalContext {
 	 */
 	public SharedAttributeMap getApplicationMap();
 
+	/**
+	 * Provides access to the context object for the current environment.
+	 * @return the environment specific context object
+	 */
+	public Object getContext();
+
+	/**
+	 * Provides access to the request object for the current environment.
+	 * @return the environment specific request object.
+	 */
+	public Object getRequest();
+
+	/**
+	 * Provides access to the response object for the current environment.
+	 * @return the environment specific response object.
+	 */
+	public Object getResponse();
+
+	/**
+	 * Get a writer for writing out a response.
+	 * @return the writer
+	 */
+	public PrintWriter getResponseWriter();
+
+	/**
+	 * Builds a context-relative flow definition URL, suitable for rendering links that a launch new execution of a flow
+	 * definition when accessed.
+	 * @param requestInfo data needed to build the flow definition path
+	 * @return the generated flow definition URL
+	 */
+	public String buildFlowDefinitionUrl(FlowDefinitionRequestInfo requestInfo);
+
+	/**
+	 * Builds a flow execution URL, suitable for rendering links that resume a paused flow execution when accessed.
+	 * @param requestInfo data needed to build the flow execution URL
+	 * @param contextRelative whether the URL returned should be relative to this external context or absolute.
+	 * @return the generated flow execution URL
+	 */
+	public String buildFlowExecutionUrl(FlowExecutionRequestInfo requestInfo, boolean contextRelative);
+
+	/**
+	 * Encode the provided string using the encoding scheme of this external context.
+	 * @param string the string
+	 * @return the encoded string
+	 */
+	public String encode(String string);
+
+	/**
+	 * Request that a flow execution redirect be sent as the response. A flow execution redirect tells the caller to
+	 * resume a flow execution in a new request. Sets response committed to true.
+	 * @param requestInfo data needed to issue the flow execution redirect
+	 * @see #isResponseCommitted()
+	 */
+	public void sendFlowExecutionRedirect(FlowExecutionRequestInfo requestInfo);
+
+	/**
+	 * Request that a flow definition redirect be sent as the response. A flow definition redirect tells the caller to
+	 * start a new execution of the flow definition with the input provided.
+	 * @param requestInfo data needed to issue the flow definition redirect
+	 */
+	public void sendFlowDefinitionRedirect(FlowDefinitionRequestInfo requestInfo);
+
+	/**
+	 * Request that a external redirect be sent as the response. An external redirect tells the caller to access the
+	 * resource at the given resource URL. Sets response committed to true. Note: no special encoding is performed on
+	 * the string argument. Callers must perform their own encoding when necessary.
+	 * @param resourceUrl the resource URL string
+	 * @see #isResponseCommitted()
+	 */
+	public void sendExternalRedirect(String resourceUrl);
+
+	/**
+	 * Report that flow execution request processing ended with a "paused" result, indicating the flow execution paused
+	 * and will be waiting to resume on a subsequent request.
+	 * @param flowExecutionKey the flow execution key
+	 */
+	public void setPausedResult(String flowExecutionKey);
+
+	/**
+	 * Report that flow execution request processing ended with a "ended" result, indicating the flow execution
+	 * terminated.
+	 * @param flowExecutionKey the flow execution key, now invalid or null if never assigned
+	 */
+	public void setEndedResult(String flowExecutionKey);
+
+	/**
+	 * Report that flow execution request processing ended with a flow exception.
+	 * @param e the flow exception
+	 */
+	public void setExceptionResult(FlowException e);
+
+	/**
+	 * Returns true if the current request has already provisioned the response that will be sent back to the calling
+	 * system.
+	 * @return true if the response has been committed, false otherwise
+	 * @see #sendFlowExecutionRedirect(FlowExecutionRequestInfo)
+	 * @see #sendFlowDefinitionRedirect(FlowDefinitionRequestInfo)
+	 * @see #sendExternalRedirect(String)
+	 */
+	public boolean isResponseCommitted();
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/FlowDefinitionRequestInfo.java b/spring-webflow/src/main/java/org/springframework/webflow/context/FlowDefinitionRequestInfo.java
new file mode 100644
index 00000000..717a17f2
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/FlowDefinitionRequestInfo.java
@@ -0,0 +1,25 @@
+package org.springframework.webflow.context;
+
+import org.springframework.util.Assert;
+import org.springframework.webflow.core.collection.ParameterMap;
+
+/**
+ * A request to launch a new execution of a flow definition.
+ * 
+ * @author Keith Donald
+ */
+public class FlowDefinitionRequestInfo extends AbstractFlowRequestInfo {
+
+	/**
+	 * Creates a new flow definition request.
+	 * @param flowDefinitionId the flow definition id (required)
+	 * @param requestPath the request path (optional)
+	 * @param requestParameters the request parameters (optional)
+	 * @param fragment the fragment (optional)
+	 */
+	public FlowDefinitionRequestInfo(String flowDefinitionId, RequestPath requestPath, ParameterMap requestParameters,
+			String fragment) {
+		super(flowDefinitionId, requestPath, requestParameters, fragment);
+		Assert.hasText(flowDefinitionId, "The id of the flow definition to redirect to is required");
+	}
+}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/FlowExecutionRequestInfo.java b/spring-webflow/src/main/java/org/springframework/webflow/context/FlowExecutionRequestInfo.java
new file mode 100644
index 00000000..dcc5bd61
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/FlowExecutionRequestInfo.java
@@ -0,0 +1,51 @@
+package org.springframework.webflow.context;
+
+import org.springframework.util.Assert;
+import org.springframework.webflow.core.collection.ParameterMap;
+
+/**
+ * A request to resume an existing flow execution that is currently paused.
+ * 
+ * @author Keith Donald
+ */
+public class FlowExecutionRequestInfo extends AbstractFlowRequestInfo {
+
+	/**
+	 * The key of the flow execution to resume.
+	 */
+	private String flowExecutionKey;
+
+	/**
+	 * Creates a new request to resume a flow execution.
+	 * @param flowDefinitionId the definition identifier of the execution (required)
+	 * @param flowExecutionKey the key of the flow execution (required)
+	 */
+	public FlowExecutionRequestInfo(String flowDefinitionId, String flowExecutionKey) {
+		this(flowDefinitionId, flowExecutionKey, null, null, null);
+	}
+
+	/**
+	 * Creates a new request to resume a flow execution.
+	 * @param flowDefinitionId the definition identifier of the execution (required)
+	 * @param flowExecutionKey the key of the flow execution (required)
+	 * @param requestPath the request path (optional)
+	 * @param requestParameters the request parameters (optional)
+	 * @param fragment the fragment (optional)
+	 */
+	public FlowExecutionRequestInfo(String flowDefinitionId, String flowExecutionKey, RequestPath requestPath,
+			ParameterMap requestParameters, String fragment) {
+		super(flowDefinitionId, requestPath, requestParameters, fragment);
+		Assert.hasText(flowDefinitionId,
+				"The definition identifier of the flow execution to redirect to cannot be null");
+		Assert.hasText(flowExecutionKey, "The flow execution key to redirect to cannot be null");
+		this.flowExecutionKey = flowExecutionKey;
+	}
+
+	/**
+	 * Returns the unique key of the flow execution to resume.
+	 * @return the flow execution key
+	 */
+	public String getFlowExecutionKey() {
+		return flowExecutionKey;
+	}
+}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/RequestPath.java b/spring-webflow/src/main/java/org/springframework/webflow/context/RequestPath.java
new file mode 100644
index 00000000..32baec76
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/RequestPath.java
@@ -0,0 +1,94 @@
+package org.springframework.webflow.context;
+
+import java.util.Arrays;
+
+import org.springframework.util.Assert;
+
+/**
+ * A representation of a flow request path. In a flow definition request URI,the request path is the portion after the
+ * flow definition identifier. For example, in a URI of http://host/booking-flow/1 the request path is "/1".
+ * 
+ * @author Keith Donald
+ */
+public class RequestPath {
+
+	private String[] elements;
+
+	public RequestPath(String path) {
+		Assert.notNull(path, "The path string cannot be null");
+		Assert.isTrue(path.startsWith("/"), "The path must start with a '/'");
+		this.elements = path.substring(1).split("/");
+	}
+
+	private RequestPath(String[] elements) {
+		this.elements = elements;
+	}
+
+	public RequestPath pop(int elementCount) {
+		if (elementCount < elements.length) {
+			String[] newElements = new String[elements.length - elementCount];
+			System.arraycopy(elements, elementCount, newElements, 0, newElements.length);
+			return new RequestPath(newElements);
+		} else {
+			return null;
+		}
+	}
+
+	public RequestPath pop() {
+		return pop(1);
+	}
+
+	public int getElementCount() {
+		return elements.length;
+	}
+
+	public String getFirstElement() {
+		return getElement(0);
+	}
+
+	/**
+	 * Get the elements of the request path.
+	 * @return parsed request path elements
+	 */
+	public String[] getElements() {
+		return elements;
+	}
+
+	/**
+	 * Gets the path element at the specified index.
+	 * @param index the element index
+	 * @return the element
+	 * @throws IndexOutOfBoundsException if the index is out of bounds
+	 */
+	public String getElement(int index) throws IndexOutOfBoundsException {
+		return elements[index];
+	}
+
+	public boolean equals(Object o) {
+		if (!(o instanceof RequestPath)) {
+			return false;
+		}
+		RequestPath other = (RequestPath) o;
+		return Arrays.equals(this.elements, other.elements);
+	}
+
+	public int hashCode() {
+		return Arrays.hashCode(elements);
+	}
+
+	public static RequestPath valueOf(String[] elements) {
+		return new RequestPath(elements);
+	}
+
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		buffer.append("/");
+		for (int i = 0; i < elements.length; i++) {
+			buffer.append(elements[i]);
+			if (i < (elements.length - 1)) {
+				buffer.append("/");
+			}
+		}
+		return buffer.toString();
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletExternalContext.java b/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletExternalContext.java
index 706730f5..efe73a9d 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletExternalContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/portlet/PortletExternalContext.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.webflow.context.portlet;
 
+import java.io.PrintWriter;
 import java.util.Map;
 
 import javax.portlet.PortletContext;
@@ -24,6 +25,10 @@ import javax.portlet.PortletSession;
 
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.webflow.context.ExternalContext;
+import org.springframework.webflow.context.FlowDefinitionRequestInfo;
+import org.springframework.webflow.context.FlowExecutionRequestInfo;
+import org.springframework.webflow.context.RequestPath;
+import org.springframework.webflow.core.FlowException;
 import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.LocalParameterMap;
 import org.springframework.webflow.core.collection.LocalSharedAttributeMap;
@@ -103,20 +108,6 @@ public class PortletExternalContext implements ExternalContext {
 		this.userInfoMap = userInfo != null ? new LocalAttributeMap(userInfo) : null;
 	}
 
-	public String getContextPath() {
-		return request.getContextPath();
-	}
-
-	public String getDispatcherPath() {
-		// returns null in a portlet environment
-		return null;
-	}
-
-	public String getRequestPathInfo() {
-		// returns null in a portlet environment
-		return null;
-	}
-
 	public ParameterMap getRequestParameterMap() {
 		return requestParameterMap;
 	}
@@ -148,25 +139,101 @@ public class PortletExternalContext implements ExternalContext {
 	/**
 	 * Returns the wrapped Portlet context.
 	 */
-	public PortletContext getContext() {
+	public Object getContext() {
 		return context;
 	}
 
 	/**
 	 * Returns the wrapped Portlet request.
 	 */
-	public PortletRequest getRequest() {
+	public Object getRequest() {
 		return request;
 	}
 
 	/**
 	 * Returns the wrapped Portlet response.
 	 */
-	public PortletResponse getResponse() {
+	public Object getResponse() {
 		return response;
 	}
 
+	public String getFlowId() {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public String getFlowExecutionKey() {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public RequestPath getRequestPath() {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public String getRequestMethod() {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public PrintWriter getResponseWriter() {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public String buildFlowDefinitionUrl(FlowDefinitionRequestInfo urlInfo) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public String buildFlowExecutionUrl(FlowExecutionRequestInfo urlInfo, boolean contextRelative) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public String encode(String string) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public void sendFlowDefinitionRedirect(FlowDefinitionRequestInfo urlInfo) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public void sendFlowExecutionRedirect(FlowExecutionRequestInfo urlInfo) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public void sendExternalRedirect(String resourceUrl) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public void setPausedResult(String flowExecutionKey) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public void setEndedResult(String flowExecutionKey) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public void setExceptionResult(FlowException e) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public boolean isResponseCommitted() {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
 	public String toString() {
 		return new ToStringCreator(this).append("requestParameterMap", getRequestParameterMap()).toString();
 	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/ServletExternalContext.java b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/ServletExternalContext.java
index 84bf02a6..c3d42b76 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/ServletExternalContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/context/servlet/ServletExternalContext.java
@@ -15,18 +15,34 @@
  */
 package org.springframework.webflow.context.servlet;
 
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Iterator;
+import java.util.Map;
+
 import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.core.style.ToStringCreator;
+import org.springframework.webflow.context.AbstractFlowRequestInfo;
 import org.springframework.webflow.context.ExternalContext;
+import org.springframework.webflow.context.ExternalContextHolder;
+import org.springframework.webflow.context.FlowDefinitionRequestInfo;
+import org.springframework.webflow.context.FlowExecutionRequestInfo;
+import org.springframework.webflow.context.RequestPath;
+import org.springframework.webflow.core.FlowException;
 import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.LocalParameterMap;
 import org.springframework.webflow.core.collection.LocalSharedAttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.core.collection.ParameterMap;
 import org.springframework.webflow.core.collection.SharedAttributeMap;
+import org.springframework.webflow.executor.FlowExecutor;
 
 /**
  * Provides contextual information about an HTTP Servlet environment that has interacted with Spring Web Flow.
@@ -36,6 +52,9 @@ import org.springframework.webflow.core.collection.SharedAttributeMap;
  */
 public class ServletExternalContext implements ExternalContext {
 
+	/** The default encoding scheme: UTF-8 */
+	private static final String DEFAULT_ENCODING_SCHEME = "UTF-8";
+
 	/**
 	 * The context.
 	 */
@@ -71,32 +90,61 @@ public class ServletExternalContext implements ExternalContext {
 	 */
 	private SharedAttributeMap applicationMap;
 
+	private String flowId;
+
+	private String flowExecutionKey;
+
+	private RequestPath requestPath;
+
+	private String encodingScheme = DEFAULT_ENCODING_SCHEME;
+
+	private FlowExecutionRedirector flowExecutionRedirector;
+
+	private FlowDefinitionRedirector flowDefinitionRedirector;
+
+	private String resourceUri;
+
+	private short result;
+
+	private String processedFlowExecutionKey;
+
+	private FlowException exception;
+
 	/**
 	 * Create a new external context wrapping given servlet HTTP request and response and given servlet context.
 	 * @param context the servlet context
-	 * @param request the HTTP request
-	 * @param response the HTTP response
+	 * @param request the servlet request
+	 * @param response the servlet response
 	 */
-	public ServletExternalContext(ServletContext context, HttpServletRequest request, HttpServletResponse response) {
+	public ServletExternalContext(ServletContext context, ServletRequest request, ServletResponse response) {
 		this.context = context;
-		this.request = request;
-		this.response = response;
-		this.requestParameterMap = new LocalParameterMap(new HttpServletRequestParameterMap(request));
-		this.requestMap = new LocalAttributeMap(new HttpServletRequestMap(request));
-		this.sessionMap = new LocalSharedAttributeMap(new HttpSessionMap(request));
+		try {
+			this.request = (HttpServletRequest) request;
+			this.response = (HttpServletResponse) response;
+		} catch (ClassCastException e) {
+			throw new IllegalArgumentException("Request and response objects must be HTTP objects", e);
+		}
+		this.requestParameterMap = new LocalParameterMap(new HttpServletRequestParameterMap(this.request));
+		this.requestMap = new LocalAttributeMap(new HttpServletRequestMap(this.request));
+		this.sessionMap = new LocalSharedAttributeMap(new HttpSessionMap(this.request));
 		this.applicationMap = new LocalSharedAttributeMap(new HttpServletContextMap(context));
+		parseRequestPathInfo();
 	}
 
-	public String getContextPath() {
-		return request.getContextPath();
+	public String getFlowId() {
+		return flowId;
 	}
 
-	public String getDispatcherPath() {
-		return request.getServletPath();
+	public String getFlowExecutionKey() {
+		return flowExecutionKey;
 	}
 
-	public String getRequestPathInfo() {
-		return request.getPathInfo();
+	public String getRequestMethod() {
+		return request.getMethod();
+	}
+
+	public RequestPath getRequestPath() {
+		return requestPath;
 	}
 
 	public ParameterMap getRequestParameterMap() {
@@ -119,28 +167,268 @@ public class ServletExternalContext implements ExternalContext {
 		return applicationMap;
 	}
 
-	/**
-	 * Return the wrapped HTTP servlet context.
-	 */
-	public ServletContext getContext() {
+	public Object getContext() {
 		return context;
 	}
 
-	/**
-	 * Return the wrapped HTTP servlet request.
-	 */
-	public HttpServletRequest getRequest() {
+	public Object getRequest() {
 		return request;
 	}
 
-	/**
-	 * Return the wrapped HTTP servlet response.
-	 */
-	public HttpServletResponse getResponse() {
+	public Object getResponse() {
 		return response;
 	}
 
+	public boolean isResponseCommitted() {
+		return flowExecutionRedirector != null || flowDefinitionRedirector != null || resourceUri != null;
+	}
+
+	// response requesters
+
+	public PrintWriter getResponseWriter() {
+		try {
+			return response.getWriter();
+		} catch (IOException e) {
+			// TODO - handle how?
+			throw new RuntimeException(e);
+		}
+	}
+
+	public void sendFlowExecutionRedirect(FlowExecutionRequestInfo request) {
+		flowExecutionRedirector = new FlowExecutionRedirector(request);
+	}
+
+	public void sendFlowDefinitionRedirect(FlowDefinitionRequestInfo request) {
+		flowDefinitionRedirector = new FlowDefinitionRedirector(request);
+	}
+
+	public void sendExternalRedirect(String resourceUri) {
+		this.resourceUri = resourceUri;
+	}
+
+	// helpers
+
+	public String encode(String string) {
+		try {
+			return URLEncoder.encode(string, encodingScheme);
+		} catch (UnsupportedEncodingException e) {
+			throw new IllegalStateException("Unsupported encoding errors should never happen", e);
+		}
+	}
+
+	public String buildFlowDefinitionUrl(FlowDefinitionRequestInfo requestInfo) {
+		return request.getContextPath() + request.getServletPath() + "/" + requestInfo.getFlowDefinitionId()
+				+ requestPath(requestInfo) + requestParameters(requestInfo) + fragment(requestInfo);
+	}
+
+	public String buildFlowExecutionUrl(FlowExecutionRequestInfo requestInfo, boolean contextRelative) {
+		String contextRelativeUrl = request.getContextPath() + request.getServletPath() + "/executions/"
+				+ requestInfo.getFlowDefinitionId() + "/" + requestInfo.getFlowExecutionKey()
+				+ requestPath(requestInfo) + requestParameters(requestInfo) + fragment(requestInfo);
+		if (contextRelative) {
+			return contextRelativeUrl;
+		} else {
+			return request.getScheme() + request.getServerName() + contextRelativeUrl;
+		}
+	}
+
+	// execution processing result setters
+
+	public void setPausedResult(String flowExecutionKey) {
+		result = 0;
+		processedFlowExecutionKey = flowExecutionKey;
+	}
+
+	public void setEndedResult(String flowExecutionKey) {
+		result = 1;
+		processedFlowExecutionKey = flowExecutionKey;
+	}
+
+	public void setExceptionResult(FlowException e) {
+		result = 2;
+		exception = e;
+		processedFlowExecutionKey = flowExecutionKey;
+	}
+
+	/**
+	 * Execute the flow request lifecycle, including provision of the final response.
+	 * @param flowExecutor the flow executor for calling into the Spring Web Flow system
+	 * @throws IOException an IOException occurred issuing the response
+	 */
+	public void executeFlowRequest(FlowExecutor flowExecutor) throws IOException {
+		ExternalContextHolder.setExternalContext(this);
+		try {
+			flowExecutor.execute(this);
+			if (isPausedResult()) {
+				if (flowExecutionRedirector != null) {
+					flowExecutionRedirector.issueRedirect();
+				} else if (flowDefinitionRedirector != null) {
+					flowDefinitionRedirector.issueRedirect();
+				} else if (resourceUri != null) {
+					sendRedirect(resourceUri);
+				} else {
+					// commit response?
+				}
+			} else if (isEndResult()) {
+				if (flowExecutionRedirector != null) {
+					if (flowExecutionRedirector.redirectsTo(processedFlowExecutionKey)) {
+						throw new IllegalStateException(
+								"You cannot send a flow execution redirect when this execution has ended - programmer error");
+					} else {
+						flowExecutionRedirector.issueRedirect();
+					}
+				} else if (flowDefinitionRedirector != null) {
+					flowDefinitionRedirector.issueRedirect();
+				} else if (resourceUri != null) {
+					sendRedirect(resourceUri);
+				} else {
+					// commit response?
+				}
+			} else if (isExceptionResult()) {
+				// response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, exception.getMessage());
+				throw exception;
+			}
+		} finally {
+			ExternalContextHolder.setExternalContext(null);
+		}
+	}
+
+	private void parseRequestPathInfo() {
+		String pathInfo = request.getPathInfo();
+		if (pathInfo == null) {
+			throw new IllegalArgumentException(
+					"The requestPathInfo is null: unable to extract flow definition id or flow execution key");
+		}
+		RequestPath path = new RequestPath(pathInfo);
+		if (path.getElement(0).equals("executions")) {
+			flowId = path.getElement(1);
+			flowExecutionKey = path.getElement(2);
+			if (path.getElementCount() > 3) {
+				requestPath = path.pop(3);
+			} else {
+				requestPath = null;
+			}
+		} else {
+			flowId = path.getElement(0);
+			if (path.getElementCount() > 1) {
+				requestPath = path.pop(1);
+			} else {
+				requestPath = null;
+			}
+		}
+	}
+
+	private boolean isPausedResult() {
+		return result == 0;
+	}
+
+	private boolean isEndResult() {
+		return result == 1;
+	}
+
+	private boolean isExceptionResult() {
+		return result == 2;
+	}
+
+	private String requestPath(AbstractFlowRequestInfo requestInfo) {
+		if (requestInfo.getRequestPath() == null) {
+			return "";
+		}
+		StringBuffer buffer = new StringBuffer();
+		String[] requestElements = requestInfo.getRequestPath().getElements();
+		for (int i = 0; i < requestElements.length; i++) {
+			buffer.append('/').append(encode(requestElements[i], encodingScheme));
+		}
+		return buffer.toString();
+	}
+
+	private String requestParameters(AbstractFlowRequestInfo requestInfo) {
+		if (requestInfo.getRequestParameters() == null) {
+			return "";
+		}
+		StringBuffer queryString = new StringBuffer();
+		queryString.append('?');
+		ParameterMap requestParameters = requestInfo.getRequestParameters();
+		Iterator it = requestParameters.asMap().entrySet().iterator();
+		while (it.hasNext()) {
+			Map.Entry entry = (Map.Entry) it.next();
+			String parameterName = encode((String) entry.getKey(), encodingScheme);
+			String parameterValue = encode((String) entry.getValue(), encodingScheme);
+			queryString.append(parameterName).append('=').append(parameterValue);
+			if (it.hasNext()) {
+				queryString.append('&');
+			}
+		}
+		return queryString.toString();
+	}
+
+	private String fragment(AbstractFlowRequestInfo requestInfo) {
+		if (requestInfo.getFragment() == null || requestInfo.getFragment().length() == 0) {
+			return "";
+		}
+		return "#" + requestInfo.getFragment();
+	}
+
+	private String encode(String value, String encodingScheme) {
+		try {
+			return URLEncoder.encode(value, encodingScheme);
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private void sendRedirect(String targetUrl) throws IOException {
+		response.sendRedirect(response.encodeRedirectURL(targetUrl));
+	}
+
 	public String toString() {
 		return new ToStringCreator(this).append("requestParameterMap", getRequestParameterMap()).toString();
 	}
+
+	private abstract class FlowRedirector {
+		private AbstractFlowRequestInfo requestInfo;
+
+		public FlowRedirector(AbstractFlowRequestInfo requestInfo) {
+			this.requestInfo = requestInfo;
+		}
+
+		protected AbstractFlowRequestInfo getRequestInfo() {
+			return requestInfo;
+		}
+
+		public abstract void issueRedirect() throws IOException;
+	}
+
+	private class FlowExecutionRedirector extends FlowRedirector {
+		public FlowExecutionRedirector(FlowExecutionRequestInfo requestInfo) {
+			super(requestInfo);
+		}
+
+		public boolean redirectsTo(String flowExecutionKey) {
+			FlowExecutionRequestInfo requestInfo = (FlowExecutionRequestInfo) getRequestInfo();
+			return requestInfo.getFlowExecutionKey().equals(flowExecutionKey);
+		}
+
+		public void issueRedirect() throws IOException {
+			FlowExecutionRequestInfo requestInfo = (FlowExecutionRequestInfo) getRequestInfo();
+			String targetUrl = request.getContextPath() + request.getServletPath() + "/executions/"
+					+ requestInfo.getFlowDefinitionId() + "/" + requestInfo.getFlowExecutionKey()
+					+ requestPath(getRequestInfo()) + requestParameters(getRequestInfo()) + fragment(getRequestInfo());
+			response.sendRedirect(response.encodeRedirectURL(targetUrl));
+		}
+	}
+
+	private class FlowDefinitionRedirector extends FlowRedirector {
+		public FlowDefinitionRedirector(FlowDefinitionRequestInfo redirect) {
+			super(redirect);
+		}
+
+		public void issueRedirect() throws IOException {
+			FlowDefinitionRequestInfo redirect = (FlowDefinitionRequestInfo) getRequestInfo();
+			String targetUrl = request.getContextPath() + request.getServletPath() + "/"
+					+ redirect.getFlowDefinitionId() + requestPath(getRequestInfo())
+					+ requestParameters(getRequestInfo()) + fragment(getRequestInfo());
+			response.sendRedirect(response.encodeRedirectURL(targetUrl));
+		}
+	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/core/DefaultExpressionParserFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/DefaultExpressionParserFactory.java
similarity index 79%
rename from spring-webflow/src/main/java/org/springframework/webflow/core/DefaultExpressionParserFactory.java
rename to spring-webflow/src/main/java/org/springframework/webflow/core/expression/DefaultExpressionParserFactory.java
index f142d024..4de5de52 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/core/DefaultExpressionParserFactory.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/DefaultExpressionParserFactory.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.core;
+package org.springframework.webflow.core.expression;
 
 import org.springframework.binding.expression.Expression;
 import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.binding.expression.ExpressionVariable;
 import org.springframework.binding.expression.ParserException;
-import org.springframework.binding.expression.SettableExpression;
 
 /**
  * Static helper factory that creates instances of the default expression parser used by Spring Web Flow when requested.
@@ -47,20 +47,22 @@ public final class DefaultExpressionParserFactory {
 	 */
 	public static synchronized ExpressionParser getExpressionParser() {
 		// return a wrapper that will lazily load the default expression parser
-		// this prevents the default OGNL-based parser from being intialized until it is actually used
+		// this prevents the default OGNL-based parser from being initialized until it is actually used
 		// which allows OGNL to be an optional dependency if the expression parser wrapper is replaced and never used
 		return new ExpressionParser() {
-			public boolean isDelimitedExpression(String expressionString) {
-				return getDefaultExpressionParser().isDelimitedExpression(expressionString);
+			public boolean isEvalExpressionString(String string) {
+				return getDefaultExpressionParser().isEvalExpressionString(string);
 			}
 
-			public Expression parseExpression(String expressionString) throws ParserException {
-				return getDefaultExpressionParser().parseExpression(expressionString);
+			public String parseEvalExpressionString(String string) throws ParserException {
+				return getDefaultExpressionParser().parseEvalExpressionString(string);
 			}
 
-			public SettableExpression parseSettableExpression(String expressionString) throws ParserException,
-					UnsupportedOperationException {
-				return getDefaultExpressionParser().parseSettableExpression(expressionString);
+			public Expression parseExpression(String expressionString, Class expressionTargetType,
+					Class expectedEvaluationResultType, ExpressionVariable[] expressionVariables)
+					throws ParserException {
+				return getDefaultExpressionParser().parseExpression(expressionString, expressionTargetType,
+						expectedEvaluationResultType, expressionVariables);
 			}
 		};
 	}
@@ -80,7 +82,7 @@ public final class DefaultExpressionParserFactory {
 	 * Create the default expression parser.
 	 * @return the default expression parser
 	 */
-	private static ExpressionParser createDefaultExpressionParser() {
+	private static ExpressionParser createDefaultExpressionParser() throws IllegalStateException {
 		try {
 			Class.forName("ognl.Ognl");
 			return new WebFlowOgnlExpressionParser();
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/core/WebFlowOgnlExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/WebFlowOgnlExpressionParser.java
similarity index 97%
rename from spring-webflow/src/main/java/org/springframework/webflow/core/WebFlowOgnlExpressionParser.java
rename to spring-webflow/src/main/java/org/springframework/webflow/core/expression/WebFlowOgnlExpressionParser.java
index 685d2371..6cae838d 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/core/WebFlowOgnlExpressionParser.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/WebFlowOgnlExpressionParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.core;
+package org.springframework.webflow.core.expression;
 
 import java.util.Map;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/RequestContextELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/RequestContextELResolver.java
new file mode 100644
index 00000000..39bd41b7
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/RequestContextELResolver.java
@@ -0,0 +1,65 @@
+package org.springframework.webflow.core.expression.el;
+
+import java.util.Iterator;
+
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.el.PropertyNotWritableException;
+
+import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.execution.RequestContextHolder;
+
+/**
+ * Custom EL resolver that resolves to a thread-bound RequestContext object for binding expressions prefixed with a
+ * {@link #REQUEST_CONTEXT_VARIABLE_NAME}. For instance "#{requestContext.conversationScope.myProperty}".
+ * @author Jeremy Grelle
+ */
+public class RequestContextELResolver extends ELResolver {
+
+	/**
+	 * Name of the request context variable.
+	 */
+	public static final String REQUEST_CONTEXT_VARIABLE_NAME = "requestContext";
+
+	public Class getCommonPropertyType(ELContext elContext, Object base) {
+		return Object.class;
+	}
+
+	public Iterator getFeatureDescriptors(ELContext elContext, Object base) {
+		return null;
+	}
+
+	public Class getType(ELContext elContext, Object base, Object property) {
+		if (base == null && REQUEST_CONTEXT_VARIABLE_NAME.equals(property)) {
+			elContext.setPropertyResolved(true);
+			return RequestContext.class;
+		} else {
+			return null;
+		}
+	}
+
+	public Object getValue(ELContext elContext, Object base, Object property) {
+		if (base == null && REQUEST_CONTEXT_VARIABLE_NAME.equals(property)) {
+			elContext.setPropertyResolved(true);
+			return RequestContextHolder.getRequestContext();
+		} else {
+			return null;
+		}
+	}
+
+	public boolean isReadOnly(ELContext elContext, Object base, Object property) {
+		if (base == null && REQUEST_CONTEXT_VARIABLE_NAME.equals(property)) {
+			elContext.setPropertyResolved(true);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public void setValue(ELContext elContext, Object base, Object property, Object value) {
+		if (base == null && REQUEST_CONTEXT_VARIABLE_NAME.equals(property)) {
+			elContext.setPropertyResolved(true);
+			throw new PropertyNotWritableException("The RequestContext cannot be set with an expression.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/ScopeSearchingELResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/ScopeSearchingELResolver.java
new file mode 100644
index 00000000..e5d4fa6a
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/ScopeSearchingELResolver.java
@@ -0,0 +1,150 @@
+package org.springframework.webflow.core.expression.el;
+
+import java.util.Iterator;
+
+import javax.el.ELContext;
+import javax.el.ELResolver;
+
+import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.execution.RequestContextHolder;
+
+/**
+ * Custom EL resolver that searches the current request context for variables to resolve. The search algorithm looks in
+ * request scope first, then flash scope, then flow scope, then conversation scope.
+ * 
+ * Suitable for use along side other variable resolvers to support EL binding expressions like "#{bean.property}" where
+ * "bean" could be a property in any supported scope.
+ * 
+ * @author Jeremy Grelle
+ */
+public class ScopeSearchingELResolver extends ELResolver {
+
+	public Class getCommonPropertyType(ELContext elContext, Object base) {
+		return Object.class;
+	}
+
+	public Iterator getFeatureDescriptors(ELContext elContext, Object base) {
+		return null;
+	}
+
+	public Class getType(ELContext elContext, Object base, Object property) {
+		RequestContext requestContext;
+		if (base != null && base instanceof RequestContext) {
+			requestContext = (RequestContext) base;
+		} else if (base == null) {
+			requestContext = RequestContextHolder.getRequestContext();
+		} else {
+			return null;
+		}
+		if (requestContext == null) {
+			return null;
+		}
+		// flow execution is active: try request/flash/flow/conversation scope
+		String name = property.toString();
+		if (requestContext.getRequestScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return requestContext.getRequestScope().get(name).getClass();
+		} else if (requestContext.getFlashScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return requestContext.getFlashScope().get(name).getClass();
+		} else if (requestContext.getFlowScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return requestContext.getFlowScope().get(name).getClass();
+		} else if (requestContext.getConversationScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return requestContext.getConversationScope().get(name).getClass();
+		} else {
+			return null;
+		}
+	}
+
+	public Object getValue(ELContext elContext, Object base, Object property) {
+		RequestContext requestContext;
+		if (base != null && base instanceof RequestContext) {
+			requestContext = (RequestContext) base;
+		} else if (base == null) {
+			requestContext = RequestContextHolder.getRequestContext();
+		} else {
+			return null;
+		}
+		if (requestContext == null) {
+			return null;
+		}
+		String name = property.toString();
+		if (requestContext.getRequestScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return requestContext.getRequestScope().get(name);
+		} else if (requestContext.getFlashScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return requestContext.getFlashScope().get(name);
+		} else if (requestContext.getFlowScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return requestContext.getFlowScope().get(name);
+		} else if (requestContext.getConversationScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return requestContext.getConversationScope().get(name);
+		} else {
+			return null;
+		}
+	}
+
+	public boolean isReadOnly(ELContext elContext, Object base, Object property) {
+		RequestContext requestContext;
+		if (base != null && base instanceof RequestContext) {
+			requestContext = (RequestContext) base;
+		} else if (base == null) {
+			requestContext = RequestContextHolder.getRequestContext();
+		} else {
+			return false;
+		}
+		if (requestContext == null) {
+			return false;
+		}
+		// flow execution is active: try request/flash/flow/conversation scope
+		String name = property.toString();
+		if (requestContext.getRequestScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return false;
+		} else if (requestContext.getFlashScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return false;
+		} else if (requestContext.getFlowScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return false;
+		} else if (requestContext.getConversationScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			return false;
+		} else {
+			return false;
+		}
+	}
+
+	public void setValue(ELContext elContext, Object base, Object property, Object value) {
+		RequestContext requestContext;
+		if (base != null && base instanceof RequestContext) {
+			requestContext = (RequestContext) base;
+		} else if (base == null) {
+			requestContext = RequestContextHolder.getRequestContext();
+		} else {
+			return;
+		}
+		if (requestContext == null) {
+			return;
+		}
+		// flow execution is active: try request/flash/flow/conversation scope
+		String name = property.toString();
+		if (requestContext.getRequestScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			requestContext.getRequestScope().put(name, value);
+		} else if (requestContext.getFlashScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			requestContext.getFlashScope().put(name, value);
+		} else if (requestContext.getFlowScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			requestContext.getFlowScope().put(name, value);
+		} else if (requestContext.getConversationScope().contains(name)) {
+			elContext.setPropertyResolved(true);
+			requestContext.getConversationScope().put(name, value);
+		}
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/WebFlowELExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/WebFlowELExpressionParser.java
new file mode 100644
index 00000000..f9edc469
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/core/expression/el/WebFlowELExpressionParser.java
@@ -0,0 +1,73 @@
+package org.springframework.webflow.core.expression.el;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.el.ELContext;
+import javax.el.ELResolver;
+import javax.el.ExpressionFactory;
+import javax.el.FunctionMapper;
+import javax.el.VariableMapper;
+
+import org.springframework.binding.expression.el.DefaultELResolver;
+import org.springframework.binding.expression.el.ELContextFactory;
+import org.springframework.binding.expression.el.ELExpressionParser;
+import org.springframework.webflow.core.collection.MutableAttributeMap;
+import org.springframework.webflow.execution.RequestContext;
+
+/**
+ * An ExpressionParser that allows Spring and Web Flow managed beans to be referenced in expressions in the
+ * FlowDefinition.
+ * 
+ * @author Jeremy Grelle
+ */
+public class WebFlowELExpressionParser extends ELExpressionParser {
+
+	public WebFlowELExpressionParser(ExpressionFactory expressionFactory) {
+		super(expressionFactory);
+		putContextFactory(RequestContext.class, new RequestContextELContextFactory());
+		putContextFactory(MutableAttributeMap.class, new AttributeMapELContextFactory());
+	}
+
+	private static class RequestContextELContextFactory implements ELContextFactory {
+		public ELContext getELContext(Object target, VariableMapper variableMapper) {
+			List customResolvers = new ArrayList();
+			customResolvers.add(new RequestContextELResolver());
+			customResolvers.add(new ScopeSearchingELResolver());
+			ELResolver resolver = new DefaultELResolver(target, customResolvers);
+			return new WebFlowELContext(resolver, variableMapper);
+		}
+	}
+
+	private static class AttributeMapELContextFactory implements ELContextFactory {
+		public ELContext getELContext(Object target, VariableMapper variableMapper) {
+			ELResolver resolver = new DefaultELResolver(target, null);
+			return new WebFlowELContext(resolver, variableMapper);
+		}
+	}
+
+	private static class WebFlowELContext extends ELContext {
+
+		VariableMapper variableMapper;
+
+		ELResolver resolver;
+
+		public WebFlowELContext(ELResolver resolver, VariableMapper variableMapper) {
+			this.resolver = resolver;
+			this.variableMapper = variableMapper;
+		}
+
+		public ELResolver getELResolver() {
+			return resolver;
+		}
+
+		public FunctionMapper getFunctionMapper() {
+			return null;
+		}
+
+		public VariableMapper getVariableMapper() {
+			return variableMapper;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/ExternalizedFlowDefinitionRegistrar.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/ExternalizedFlowDefinitionRegistrar.java
deleted file mode 100644
index 4ae093b5..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/ExternalizedFlowDefinitionRegistrar.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.definition.registry;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.core.io.Resource;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.webflow.engine.builder.FlowServiceLocator;
-
-/**
- * A flow definition registrar that populates a flow definition registry from flow definitions defined within
- * externalized resources. Encapsulates registration behavior common to all externalized registrars and is not tied to a
- * specific flow definition format (e.g. xml).
- * 

- * Concrete subclasses are expected to derive from this class to provide knowledge about a particular kind of definition
- * format by implementing the abstract template methods in this class.
- * 
- * @see org.springframework.webflow.definition.registry.FlowDefinitionResource
- * @see org.springframework.webflow.definition.registry.FlowDefinitionRegistry
- * 
- * @author Keith Donald
- * @author Ben Hale
- */
-public abstract class ExternalizedFlowDefinitionRegistrar implements FlowDefinitionRegistrar {
-
-	/**
-	 * The locator of services needed by flow definitions.
-	 */
-	private FlowServiceLocator flowServiceLocator;
-
-	/**
-	 * A set of mappings between a namespace and a set of externalized flow definitions. A map of Strings to Sets
-	 * containing {@link FlowDefinitionResource}s
-	 */
-	private Map namespaceFlowMappings;
-
-	/**
-	 * The default namespace for flows registered without an explicit namespace.
-	 */
-	private String defaultNamespace = "";
-
-	/**
-	 * Creates a new registrar with an empty initial set of namespace to flow mappings.
-	 */
-	public ExternalizedFlowDefinitionRegistrar() {
-		this(new HashMap());
-	}
-
-	/**
-	 * Creates a new registrar with an initial set of namespace to flow mappings.
-	 * @param namespaceFlowMappings the initial set of namespace to flow mappings
-	 */
-	public ExternalizedFlowDefinitionRegistrar(Map namespaceFlowMappings) {
-		this.namespaceFlowMappings = namespaceFlowMappings;
-	}
-
-	/**
-	 * Sets the default namespace to register flows in. If not set the default namespace is "" (an empty string).
-	 * @param defaultNamespace the default namespace
-	 */
-	public void setDefaultNamespace(String defaultNamespace) {
-		this.defaultNamespace = defaultNamespace;
-	}
-
-	public void setFlowServiceLocator(FlowServiceLocator flowServiceLocator) {
-		this.flowServiceLocator = flowServiceLocator;
-	}
-
-	/**
-	 * Returns the flow service locator for use by subclasses.
-	 */
-	protected FlowServiceLocator getFlowServiceLocator() {
-		return flowServiceLocator;
-	}
-
-	/**
-	 * Adds an externalized XML flow definition to be registered in the default namespace.
-	 * @param location the resource to register
-	 * @see #addLocation(Resource, String)
-	 * @see #setDefaultNamespace(String)
-	 */
-	public boolean addLocation(Resource location) {
-		return addLocation(location, defaultNamespace);
-	}
-
-	/**
-	 * Adds an externalized XML flow definition to be registered. The resource will be assigned a registry identifier
-	 * equal to the filename of the resource, minus the filename extension. For example, an XML-based flow definition
-	 * defined in the file flow1.xml will be identified as flow1 in the registry created
-	 * by this factory bean.
-	 * @param location the resource to register
-	 * @param namespace the namespace to register the flow definition in
-	 */
-	public boolean addLocation(Resource location, String namespace) {
-		return getFlows(namespace).add(new FlowDefinitionResource(location));
-	}
-
-	/**
-	 * Adds an externalized XML flow definition resource to be registered in the default namespace.
-	 * @param resource the flow definition resource to be registered
-	 * @see #addResource(FlowDefinitionResource, String)
-	 * @see #setDefaultNamespace(String)
-	 */
-	public boolean addResource(FlowDefinitionResource resource) {
-		return addResource(resource, defaultNamespace);
-	}
-
-	/**
-	 * Adds an externalized XML flow definition resource to be registered.
-	 * @param resource the flow definition resource to be registered
-	 * @param namespace the namespace to register the flow definition in
-	 */
-	public boolean addResource(FlowDefinitionResource resource, String namespace) {
-		return getFlows(namespace).add(resource);
-	}
-
-	public void registerFlowDefinitions(FlowDefinitionRegistry registry) {
-		for (Iterator mappings = namespaceFlowMappings.entrySet().iterator(); mappings.hasNext();) {
-			Map.Entry mapping = (Map.Entry) mappings.next();
-			String namespace = (String) mapping.getKey();
-			for (Iterator resources = ((Set) mapping.getValue()).iterator(); resources.hasNext();) {
-				FlowDefinitionResource resource = (FlowDefinitionResource) resources.next();
-				register(resource, namespace, registry);
-			}
-		}
-	}
-
-	/**
-	 * Registers a flow definition resource in a given namespace.
-	 * @param resource the resource to register
-	 * @param namespace the namespace to register in
-	 * @param registry the registry
-	 */
-	private void register(FlowDefinitionResource resource, String namespace, FlowDefinitionRegistry registry) {
-		registry.registerFlowDefinition(createFlowDefinitionHolder(resource), namespace);
-	}
-
-	/**
-	 * Returns the set of flows to be registered in a namespace.
-	 * @param namespace The namespace for the collection to be returned
-	 */
-	private Set getFlows(String namespace) {
-		if (!namespaceFlowMappings.containsKey(namespace)) {
-			namespaceFlowMappings.put(namespace, new HashSet());
-		}
-		return (Set) namespaceFlowMappings.get(namespace);
-	}
-
-	// sub-classing hooks
-
-	/**
-	 * Template factory method subclasses must override to return the holder for the flow definition to be registered
-	 * loaded from the specified resource.
-	 * @param resource the externalized resource
-	 * @return the flow definition holder
-	 */
-	protected abstract FlowDefinitionHolder createFlowDefinitionHolder(FlowDefinitionResource resource);
-
-	public String toString() {
-		return new ToStringCreator(this).append("namespaceFlowMappings", namespaceFlowMappings).toString();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionConstructionException.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionConstructionException.java
index 6bd4ff14..2feb8bda 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionConstructionException.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionConstructionException.java
@@ -23,28 +23,28 @@ import org.springframework.webflow.core.FlowException;
  * @author Keith Donald
  * @author Erwin Vervaet
  */
-public abstract class FlowDefinitionConstructionException extends FlowException {
+public class FlowDefinitionConstructionException extends FlowException {
 
 	/**
 	 * The id of the flow that could not be constructed.
 	 */
-	private String flowId;
+	private String flowDefinitionId;
 
 	/**
 	 * Creates an exception indicating a flow definition could not be constructed.
-	 * @param flowId the flow id
-	 * @param cause underlying cause of the exception
+	 * @param flowDefinitionId the flow definition identifier
+	 * @param cause the underlying cause of the exception
 	 */
-	public FlowDefinitionConstructionException(String flowId, Throwable cause) {
-		super("An exception occured constructing the flow with id '" + flowId + "'", cause);
-		this.flowId = flowId;
+	public FlowDefinitionConstructionException(String flowDefinitionId, Throwable cause) {
+		super("An exception occurred constructing the flow '" + flowDefinitionId + "'", cause);
+		this.flowDefinitionId = flowDefinitionId;
 	}
 
 	/**
 	 * Returns the id of the flow definition that could not be constructed.
 	 * @return the flow id
 	 */
-	public String getFlowId() {
-		return flowId;
+	public String getFlowDefinitionId() {
+		return flowDefinitionId;
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionLocator.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionLocator.java
index b93b21b3..82e19f31 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionLocator.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionLocator.java
@@ -18,10 +18,8 @@ package org.springframework.webflow.definition.registry;
 import org.springframework.webflow.definition.FlowDefinition;
 
 /**
- * A runtime service locator interface for retrieving flow definitions by id.
- * 

- * Flow locators are needed by flow executors at runtime to retrieve fully-configured flow definitions to support
- * launching new flow executions.
+ * A runtime service locator interface for retrieving flow definitions by id. Flow locators are needed
+ * by flow executors at runtime to retrieve fully-configured flow definitions to support launching new flow executions.
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
@@ -29,12 +27,12 @@ import org.springframework.webflow.definition.FlowDefinition;
 public interface FlowDefinitionLocator {
 
 	/**
-	 * Lookup the flow definition with the specified path.
-	 * @param flowPath the flow definition path
+	 * Lookup the flow definition with the specified id.
+	 * @param id the flow definition identifier
 	 * @return the flow definition
 	 * @throws NoSuchFlowDefinitionException when the flow definition with the specified id does not exist
 	 * @throws FlowDefinitionConstructionException if there is a problem constructing the identified flow definition
 	 */
-	public FlowDefinition getFlowDefinition(String flowPath) throws NoSuchFlowDefinitionException,
+	public FlowDefinition getFlowDefinition(String id) throws NoSuchFlowDefinitionException,
 			FlowDefinitionConstructionException;
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistrar.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistrar.java
deleted file mode 100644
index e359005b..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistrar.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.definition.registry;
-
-
-/**
- * A strategy to use to populate a flow definition registry with one or more flow definitions.
- * 

- * Flow definition registrars encapsulate the knowledge about the source of a set of flow definition resources and the
- * behavior necessary to add those resources to a flow definition registry.
- * 

- * The typical usage pattern is as follows:
- * 
    
- * 
  1. Create a new (initially empty) flow definition registry.
- * 
  2. Use any number of flow definition registrars to populate the registry by calling
- * {@link #registerFlowDefinitions(FlowDefinitionRegistry)}.
- * 

- * 

- * This design where various registrars populate a generic registry was inspired by Spring's GenericApplicationContext,
- * which can use any number of BeanDefinitionReaders to drive context population.
- * 
- * @see FlowDefinitionRegistry
- * 
- * @author Keith Donald
- */
-public interface FlowDefinitionRegistrar {
-
-	/**
-	 * Register flow definition resources managed by this registrar in the registry provided.
-	 * @param registry the registry to register flow definitions in
-	 */
-	public void registerFlowDefinitions(FlowDefinitionRegistry registry);
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistry.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistry.java
index 72ca7dad..2889f724 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistry.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistry.java
@@ -16,17 +16,15 @@
 package org.springframework.webflow.definition.registry;
 
 /**
- * A container of flow definitions. Extends the {@link FlowDefinitionRegistryMBean} management interface exposing
- * registry monitoring and management operations. Also extends {@link FlowDefinitionLocator} for accessing registered
- * Flow definitions for execution at runtime.
+ * A container of flow definitions. Extends {@link FlowDefinitionLocator} for accessing registered Flow definitions for
+ * execution at runtime.
  * 

  * Flow definition registries can be configured with a "parent" registry to provide a hook into a larger flow definition
  * registry hierarchy.
  * 
  * @author Keith Donald
- * @author Ben Hale
  */
-public interface FlowDefinitionRegistry extends FlowDefinitionLocator, FlowDefinitionRegistryMBean {
+public interface FlowDefinitionRegistry extends FlowDefinitionLocator {
 
 	/**
 	 * Sets this registry's parent registry. When asked by a client to locate a flow definition this registry will query
@@ -39,17 +37,8 @@ public interface FlowDefinitionRegistry extends FlowDefinitionLocator, FlowDefin
 	 * Register a flow definition in this registry. Registers a "holder", not the Flow definition itself. This allows
 	 * the actual Flow definition to be loaded lazily only when needed, and also rebuilt at runtime when its underlying
 	 * resource changes without re-deploy.
-	 * @param flowHolder a holder holding the flow definition to register
+	 * @param definitionHolder a holder holding the flow definition to register
 	 */
-	public void registerFlowDefinition(FlowDefinitionHolder flowHolder);
-
-	/**
-	 * Register a flow definition in this registry under a specific namespace. Registers a "holder", not the Flow
-	 * definition itself. This allows the actual Flow definition to be loaded lazily only when needed, and also rebuilt
-	 * at runtime when its underlying resource changes without re-deploy.
-	 * @param flowHolder a holder holding the flow definition to register
-	 * @param namespace the namespace to register the flow definition in
-	 */
-	public void registerFlowDefinition(FlowDefinitionHolder flowHolder, String namespace);
+	public void registerFlowDefinition(FlowDefinitionHolder definitionHolder);
 
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java
index 9f12b525..e3323e8e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java
@@ -15,9 +15,6 @@
  */
 package org.springframework.webflow.definition.registry;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -29,13 +26,8 @@ import org.springframework.webflow.definition.FlowDefinition;
 
 /**
  * A generic registry implementation for housing one or more flow definitions.
- * 

- * This registry may be refreshed at runtime to "hot reload" refreshable flow definitions. Note that the refresh will
- * only reload already registered flow definitions but will not detect any new flow definitions or remove flow
- * definitions that no longer exist.
  * 
  * @author Keith Donald
- * @author Ben Hale
  */
 public class FlowDefinitionRegistryImpl implements FlowDefinitionRegistry {
 
@@ -55,83 +47,22 @@ public class FlowDefinitionRegistryImpl implements FlowDefinitionRegistry {
 		flowDefinitions = new TreeMap();
 	}
 
-	// implementing FlowDefinitionRegistryMBean
-
-	public String[] getFlowDefinitionPaths() {
-		List flowPaths = new LinkedList();
-		for (Iterator namespaces = flowDefinitions.entrySet().iterator(); namespaces.hasNext();) {
-			Map.Entry namespaceEntry = (Map.Entry) namespaces.next();
-			String namespaceName = (String) namespaceEntry.getKey();
-			Map namespace = (Map) namespaceEntry.getValue();
-			for (Iterator ids = namespace.keySet().iterator(); ids.hasNext();) {
-				flowPaths.add(FlowPathUtils.buildFlowPath(namespaceName, (String) ids.next()));
-			}
-		}
-		return (String[]) flowPaths.toArray(new String[flowPaths.size()]);
-	}
-
-	public int getFlowDefinitionCount() {
-		int count = 0;
-		for (Iterator namespaces = flowDefinitions.values().iterator(); namespaces.hasNext();) {
-			Map namespace = (Map) namespaces.next();
-			count += namespace.size();
-		}
-		return count;
-	}
-
-	public boolean containsFlowDefinition(String flowPath) {
-		Assert.hasText(flowPath, "The flow path is required");
-		Map namespace = getNamespace(FlowPathUtils.extractFlowNamespace(flowPath));
-		return namespace.containsKey(FlowPathUtils.extractFlowId(flowPath));
-	}
-
-	public void refresh() throws FlowDefinitionConstructionException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Refreshing flow definition registry '" + this + "'");
-		}
-		for (Iterator namespaces = flowDefinitions.entrySet().iterator(); namespaces.hasNext();) {
-			Map.Entry namespaceEntry = (Map.Entry) namespaces.next();
-			String namespaceName = (String) namespaceEntry.getKey();
-			Map namespace = (Map) namespaceEntry.getValue();
-			for (Iterator ids = namespace.keySet().iterator(); ids.hasNext();) {
-				refresh(FlowPathUtils.buildFlowPath(namespaceName, (String) ids.next()));
-			}
-		}
-	}
-
-	public void refresh(String flowPath) throws NoSuchFlowDefinitionException, FlowDefinitionConstructionException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Refreshing flow with path '" + flowPath + "'");
-		}
-		ClassLoader loader = Thread.currentThread().getContextClassLoader();
-		try {
-			// workaround for JMX
-			Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-			FlowDefinitionHolder holder = getFlowDefinitionHolder(flowPath);
-			holder.refresh();
-			if (!holder.getFlowDefinitionId().equals(FlowPathUtils.extractFlowId(flowPath))) {
-				reindex(holder, FlowPathUtils.extractFlowNamespace(flowPath), flowPath);
-			}
-		} finally {
-			Thread.currentThread().setContextClassLoader(loader);
-		}
-	}
-
 	// implementing FlowDefinitionLocator
 
-	public FlowDefinition getFlowDefinition(String path) throws NoSuchFlowDefinitionException,
+	public FlowDefinition getFlowDefinition(String id) throws NoSuchFlowDefinitionException,
 			FlowDefinitionConstructionException {
-		Assert.hasText(path,
-				"Unable to load a flow definition: no flow path was provided.  Please provide a valid flow path.");
-		if (logger.isDebugEnabled()) {
-			logger.debug("Getting flow definition with path '" + path + "'");
-		}
 		try {
-			return getFlowDefinitionHolder(path).getFlowDefinition();
+			if (id == null) {
+				throw new IllegalArgumentException("The id of the flow to lookup is required");
+			}
+			if (logger.isDebugEnabled()) {
+				logger.debug("Getting flow definition with id '" + id + "'");
+			}
+			return getFlowDefinitionHolder(id).getFlowDefinition();
 		} catch (NoSuchFlowDefinitionException e) {
 			if (parent != null) {
 				// try parent
-				return parent.getFlowDefinition(path);
+				return parent.getFlowDefinition(id);
 			}
 			throw e;
 		}
@@ -140,84 +71,32 @@ public class FlowDefinitionRegistryImpl implements FlowDefinitionRegistry {
 	// implementing FlowDefinitionRegistry
 
 	public void setParent(FlowDefinitionRegistry parent) {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Setting parent flow definition registry to '" + parent + "'");
-		}
 		this.parent = parent;
 	}
 
-	public void registerFlowDefinition(FlowDefinitionHolder flowHolder) {
-		registerFlowDefinition(flowHolder, "");
+	public void registerFlowDefinition(FlowDefinitionHolder definitionHolder) {
+		Assert.notNull(definitionHolder, "The holder of the flow definition to register is required");
+		if (logger.isDebugEnabled()) {
+			logger.debug("Registering flow definition " + definitionHolder);
+		}
+		flowDefinitions.put(definitionHolder.getFlowDefinitionId(), definitionHolder);
 	}
 
-	public void registerFlowDefinition(FlowDefinitionHolder flowHolder, String namespace) {
-		Assert.notNull(flowHolder, "The flow definition holder to register is required");
-		Assert.notNull(namespace, "The flow namespace is required");
-		if (logger.isDebugEnabled()) {
-			logger.debug("Registering flow definition with id '" + flowHolder.getFlowDefinitionId()
-					+ "' in namespace '" + namespace + "'");
-		}
-		index(flowHolder, namespace);
-	}
-
-	/**
-	 * Remove identified flow definition from this registry. If the given id is not known in this registry, nothing will
-	 * happen.
-	 * @param flowPath the flow definition path
-	 */
-	public void removeFlowDefinition(String flowPath) {
-		Assert.hasText(flowPath, "The flow path is required");
-		if (logger.isDebugEnabled()) {
-			logger.debug("Removing flow definition with path '" + flowPath + "'");
-		}
-		Map namespace = getNamespace(FlowPathUtils.extractFlowNamespace(flowPath));
-		namespace.remove(FlowPathUtils.extractFlowId(flowPath));
+	public void registerFlowDefinition(FlowDefinition definition) {
+		registerFlowDefinition(new StaticFlowDefinitionHolder(definition));
 	}
 
 	// internal helpers
 
-	/**
-	 * Re-index given flow definition.
-	 * @param holder the holder holding the flow definition to re-index
-	 * @param namespace the namespace to index the new flow in
-	 * @param oldFlowPath the flowPath that was previously assigned to given flow definition
-	 */
-	private void reindex(FlowDefinitionHolder holder, String namespace, String oldFlowPath) {
-		removeFlowDefinition(oldFlowPath);
-		index(holder, namespace);
-	}
-
-	/**
-	 * Index given flow definition.
-	 * @param holder the holder holding the flow definition to index
-	 * @param namespaceName the namespace to index the flow definition in
-	 */
-	private void index(FlowDefinitionHolder holder, String namespaceName) {
-		Assert.hasText(holder.getFlowDefinitionId(), "The flow holder to index must return a non-blank flow id");
-		Map namespace = getNamespace(namespaceName);
-		namespace.put(holder.getFlowDefinitionId(), holder);
-	}
-
 	/**
 	 * Returns the identified flow definition holder. Throws an exception if it cannot be found.
 	 */
-	private FlowDefinitionHolder getFlowDefinitionHolder(String flowPath) throws NoSuchFlowDefinitionException {
-		Map namespace = getNamespace(FlowPathUtils.extractFlowNamespace(flowPath));
-		FlowDefinitionHolder flowHolder = (FlowDefinitionHolder) namespace.get(FlowPathUtils.extractFlowId(flowPath));
-		if (flowHolder == null) {
-			throw new NoSuchFlowDefinitionException(flowPath, getFlowDefinitionPaths());
+	private FlowDefinitionHolder getFlowDefinitionHolder(String id) throws NoSuchFlowDefinitionException {
+		FlowDefinitionHolder holder = (FlowDefinitionHolder) flowDefinitions.get(id);
+		if (holder == null) {
+			throw new NoSuchFlowDefinitionException(id);
 		}
-		return flowHolder;
-	}
-
-	/**
-	 * Returns the namespace map for a given namespace. Creates the map if it does not exist.
-	 */
-	private Map getNamespace(String namespace) {
-		if (!flowDefinitions.containsKey(namespace)) {
-			flowDefinitions.put(namespace, new TreeMap());
-		}
-		return (Map) flowDefinitions.get(namespace);
+		return holder;
 	}
 
 	public String toString() {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryMBean.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryMBean.java
deleted file mode 100644
index a6a60dda..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryMBean.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.definition.registry;
-
-/**
- * A management interface for managing flow definition registries at runtime. Provides the ability to query the size and
- * state of the registry, as well as refresh registered flow definitions at runtime.
- * 

- * Flow registries that implement this interface may be exposed for management over the JMX protocol. The following is
- * an example of using Spring's JMX MBeanExporter to export a flow registry to an MBeanServer:
- * 
- * 
- *     <!-- Creates the registry of flow definitions for this application -->
- *     <bean name="flowRegistry" class="org.springframework.webflow...XmlFlowRegistryFactoryBean">
- *         <property name="locations" value="/WEB-INF/flow1.xml"/>
- *     </bean>
- *  
- *     <!-- Automatically exports the created flowRegistry as an MBean -->
- *     <bean id="mbeanExporter" class="org.springframework.jmx.export.MBeanExporter">
- *         <property name="beans">
- *             <map>
- *                 <entry key="spring-webflow:name=flowRegistry" value-ref="flowRegistry"/>
- *             </map>
- *         </property>
- *         <property name="assembler">
- *             <bean class="org.springframework.jmx.export.assembler.InterfaceBasedMBeanInfoAssembler">
- *                 <property name="managedInterfaces"
- *                     value="org.springframework.webflow.definition.registry.FlowDefinitionRegistryMBean"/>
- *             </bean>
- *         </property>
- *     </bean>
- * 

- * 
- * With the above configuration, you may then use any JMX client (such as Sun's jConsole which ships with JDK 1.5) to
- * refresh flow definitions at runtime.
- * 
- * @author Keith Donald
- */
-public interface FlowDefinitionRegistryMBean {
-
-	/**
-	 * Returns the paths of the flow definitions registered in this registry.
-	 * @return the flow definition paths
-	 */
-	public String[] getFlowDefinitionPaths();
-
-	/**
-	 * Return the number of flow definitions registered in this registry.
-	 * @return the flow definition count
-	 */
-	public int getFlowDefinitionCount();
-
-	/**
-	 * Queries this registry to determine if a specific flow is contained within it.
-	 * @param flowPath the flow definition path
-	 * @return true if a flow definition is contained in this registry with the id provided
-	 */
-	public boolean containsFlowDefinition(String flowPath);
-
-	/**
-	 * Refresh this flow definition registry, reloading all Flow definitions from their externalized representations.
-	 */
-	public void refresh() throws FlowDefinitionConstructionException;
-
-	/**
-	 * Refresh the Flow definition in this registry with the path provided, reloading it from it's
-	 * externalized representation.
-	 * @param flowPath the path of the flow definition to refresh
-	 * @throws NoSuchFlowDefinitionException if a flow with the id provided is not stored in this registry
-	 */
-	public void refresh(String flowPath) throws NoSuchFlowDefinitionException, FlowDefinitionConstructionException;
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionResource.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionResource.java
deleted file mode 100644
index de74b185..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionResource.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.definition.registry;
-
-import java.io.Serializable;
-
-import org.springframework.core.io.Resource;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.util.Assert;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.CollectionUtils;
-
-/**
- * A pointer to an externalized flow definition resource. Adds assigned identification information about the resource
- * including the flow id and attributes.
- * 
- * @see ExternalizedFlowDefinitionRegistrar
- * 
- * @author Keith Donald
- */
-public class FlowDefinitionResource implements Serializable {
-
-	/**
-	 * The identifier to assign to the flow definition.
-	 */
-	private String id;
-
-	/**
-	 * Attributes that can be used to affect flow construction.
-	 */
-	private AttributeMap attributes;
-
-	/**
-	 * The externalized location of the flow definition resource.
-	 */
-	private Resource location;
-
-	/**
-	 * Creates a new externalized flow definition resource. The flow id assigned will be the same name as the
-	 * externalized resource's filename, excluding the extension.
-	 * @param location the flow resource location
-	 */
-	public FlowDefinitionResource(Resource location) {
-		init(conventionalFlowId(location), location, null);
-	}
-
-	/**
-	 * Creates a new externalized flow definition resource. The flow id assigned will be the same name as the
-	 * externalized resource's filename, excluding the extension.
-	 * @param location the flow resource location
-	 * @param attributes flow definition attributes to be assigned
-	 */
-	public FlowDefinitionResource(Resource location, AttributeMap attributes) {
-		init(conventionalFlowId(location), location, attributes);
-	}
-
-	/**
-	 * Creates a new externalized flow definition.
-	 * @param id the flow id to be assigned
-	 * @param location the flow resource location
-	 */
-	public FlowDefinitionResource(String id, Resource location) {
-		init(id, location, null);
-	}
-
-	/**
-	 * Creates a new externalized flow definition.
-	 * @param id the flow id to be assigned
-	 * @param location the flow resource location
-	 * @param attributes flow definition attributes to be assigned
-	 */
-	public FlowDefinitionResource(String id, Resource location, AttributeMap attributes) {
-		init(id, location, attributes);
-	}
-
-	/**
-	 * Returns the identifier to assign to the flow definition.
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * Returns the externalized flow definition resource location.
-	 */
-	public Resource getLocation() {
-		return location;
-	}
-
-	/**
-	 * Returns arbitrary flow definition attributes.
-	 */
-	public AttributeMap getAttributes() {
-		return attributes;
-	}
-
-	public boolean equals(Object o) {
-		if (!(o instanceof FlowDefinitionResource)) {
-			return false;
-		}
-		FlowDefinitionResource other = (FlowDefinitionResource) o;
-		return id.equals(other.id) && location.equals(other.location);
-	}
-
-	public int hashCode() {
-		return id.hashCode() + location.hashCode();
-	}
-
-	// internal helpers
-
-	/**
-	 * Initialize this object.
-	 */
-	private void init(String id, Resource location, AttributeMap attributes) {
-		Assert.hasText(id, "The id of the externalized flow definition is required");
-		Assert.notNull(location, "The location of the externalized flow definition is required");
-		this.id = id;
-		this.location = location;
-		if (attributes != null) {
-			this.attributes = attributes;
-		} else {
-			this.attributes = CollectionUtils.EMPTY_ATTRIBUTE_MAP;
-		}
-	}
-
-	// public utilities
-
-	/**
-	 * Returns the flow id assigned to the flow definition contained in given resource. By convention this will be the
-	 * filename of the resource, excluding extension.
-	 * @see FlowDefinitionResource#FlowDefinitionResource(Resource)
-	 * @see FlowDefinitionResource#FlowDefinitionResource(Resource, AttributeMap)
-	 * @since 1.0.1
-	 */
-	public static String conventionalFlowId(Resource location) {
-		String fileName = location.getFilename();
-		int extensionIndex = fileName.lastIndexOf('.');
-		if (extensionIndex != -1) {
-			return fileName.substring(0, extensionIndex);
-		} else {
-			return fileName;
-		}
-	}
-
-	public String toString() {
-		return new ToStringCreator(this).append("id", id).append("location", location).append("attributes", attributes)
-				.toString();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowPathUtils.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowPathUtils.java
deleted file mode 100644
index f93aa284..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowPathUtils.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.springframework.webflow.definition.registry;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple utility for working with flow paths. Only intended for internal use.
- * 
- * @author Ben Hale
- */
-class FlowPathUtils {
-
-	private static final String PATH_DELIMITER = "/";
-
-	/**
-	 * Parses a flow path and returns the namespace part of the path.
-	 * @param flowPath The path to parse
-	 * @return The namespace part of the path
-	 */
-	public static String extractFlowNamespace(String flowPath) {
-		Assert.hasText(flowPath, "The flow path must not be empty or null");
-		int index = flowPath.lastIndexOf(PATH_DELIMITER);
-		if (index == -1) {
-			return "";
-		} else {
-			return flowPath.substring(0, index);
-		}
-	}
-
-	/**
-	 * Parses a flow path and returns the id part of the path.
-	 * @param flowPath The path to parse
-	 * @return The id part of the path
-	 */
-	public static String extractFlowId(String flowPath) {
-		Assert.hasText(flowPath, "The flow path must not be empty or null");
-		int index = flowPath.lastIndexOf(PATH_DELIMITER);
-		if (index == -1) {
-			return flowPath;
-		} else {
-			return flowPath.substring(index + 1);
-		}
-	}
-
-	/**
-	 * Creates a flow path based on given namespace and id.
-	 * @param namespace The namespace of the path
-	 * @param id The id of the path
-	 * @return The complete flow path
-	 */
-	public static String buildFlowPath(String namespace, String id) {
-		Assert.notNull(namespace, "namespace must have some value");
-		Assert.hasText(id, "The id must not be empty or null");
-		return namespace + PATH_DELIMITER + id;
-	}
-}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/NoSuchFlowDefinitionException.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/NoSuchFlowDefinitionException.java
index 6eff6036..e017e3e1 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/NoSuchFlowDefinitionException.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/NoSuchFlowDefinitionException.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.webflow.definition.registry;
 
-import org.springframework.core.style.StylerUtils;
 import org.springframework.webflow.core.FlowException;
 
 /**
@@ -29,23 +28,21 @@ public class NoSuchFlowDefinitionException extends FlowException {
 	/**
 	 * The id of the flow definition that could not be located.
 	 */
-	private String flowId;
+	private String flowDefinitionId;
 
 	/**
 	 * Creates an exception indicating a flow definition could not be found.
-	 * @param flowId the flow id
-	 * @param availableFlowIds all flow ids available to the locator generating this exception
+	 * @param flowDefinitionId the flow definition id
 	 */
-	public NoSuchFlowDefinitionException(String flowId, String[] availableFlowIds) {
-		super("No such flow definition with id '" + flowId + "' found; the flows available are: "
-				+ StylerUtils.style(availableFlowIds));
-		this.flowId = flowId;
+	public NoSuchFlowDefinitionException(String flowDefinitionId) {
+		super("No flow definition '" + flowDefinitionId + "' found");
+		this.flowDefinitionId = flowDefinitionId;
 	}
 
 	/**
 	 * Returns the id of the flow definition that could not be found.
 	 */
-	public String getFlowId() {
-		return flowId;
+	public String getFlowDefinitionId() {
+		return flowDefinitionId;
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/StaticFlowDefinitionHolder.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/StaticFlowDefinitionHolder.java
index d26dea95..31baea8b 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/StaticFlowDefinitionHolder.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/StaticFlowDefinitionHolder.java
@@ -1,51 +1,48 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.definition.registry;
-
-import org.springframework.webflow.definition.FlowDefinition;
-
-/**
- * A simple flow definition holder that just holds a constant singleton reference to a flow definition.
- * 
- * @author Keith Donald
- */
-public final class StaticFlowDefinitionHolder implements FlowDefinitionHolder {
-
-	/**
-	 * The held flow definition.
-	 */
-	private final FlowDefinition flowDefinition;
-
-	/**
-	 * Creates the static flow definition holder.
-	 * @param flowDefinition the flow to hold
-	 */
-	public StaticFlowDefinitionHolder(FlowDefinition flowDefinition) {
-		this.flowDefinition = flowDefinition;
-	}
-
-	public String getFlowDefinitionId() {
-		return flowDefinition.getId();
-	}
-
-	public FlowDefinition getFlowDefinition() {
-		return flowDefinition;
-	}
-
-	public void refresh() {
-		// nothing to do
-	}
+package org.springframework.webflow.definition.registry;
+
+import org.springframework.webflow.definition.FlowDefinition;
+
+/**
+ * A simple flow definition holder that just holds a constant singleton reference to a flow definition.
+ * @author Keith Donald
+ */
+class StaticFlowDefinitionHolder implements FlowDefinitionHolder {
+
+	/**
+	 * The held flow definition.
+	 */
+	private final FlowDefinition flowDefinition;
+
+	/**
+	 * Creates the static flow definition holder.
+	 * @param flowDefinition the flow to hold
+	 */
+	public StaticFlowDefinitionHolder(FlowDefinition flowDefinition) {
+		this.flowDefinition = flowDefinition;
+	}
+
+	public String getFlowDefinitionId() {
+		return flowDefinition.getId();
+	}
+
+	public FlowDefinition getFlowDefinition() throws FlowDefinitionConstructionException {
+		return flowDefinition;
+	}
+
+	public void refresh() throws FlowDefinitionConstructionException {
+		// nothing to do
+	}
+
+	public boolean equals(Object o) {
+		if (!(o instanceof StaticFlowDefinitionHolder)) {
+			return false;
+		}
+		StaticFlowDefinitionHolder other = (StaticFlowDefinitionHolder) o;
+		return flowDefinition.equals(other.flowDefinition);
+	}
+
+	public int hashCode() {
+		return flowDefinition.hashCode();
+	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutor.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutor.java
index 50d67bbd..e72fcfdc 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutor.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionExecutor.java
@@ -15,8 +15,6 @@
  */
 package org.springframework.webflow.engine;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.webflow.execution.Action;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
@@ -30,8 +28,6 @@ import org.springframework.webflow.execution.RequestContext;
  */
 public class ActionExecutor {
 
-	private static final Log logger = LogFactory.getLog(ActionExecutor.class);
-
 	/**
 	 * Private constructor to avoid instantiation.
 	 */
@@ -48,14 +44,6 @@ public class ActionExecutor {
 	 */
 	public static Event execute(Action action, RequestContext context) throws ActionExecutionException {
 		try {
-			if (logger.isDebugEnabled()) {
-				if (context.getCurrentState() == null) {
-					logger.debug("Executing start " + action + " for flow '" + context.getActiveFlow().getId() + "'");
-				} else {
-					logger.debug("Executing " + action + " in state '" + context.getCurrentState().getId()
-							+ "' of flow '" + context.getActiveFlow().getId() + "'");
-				}
-			}
 			return action.execute(context);
 		} catch (ActionExecutionException e) {
 			throw e;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionState.java
index fb6985f7..3313e8b1 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionState.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ActionState.java
@@ -23,7 +23,6 @@ import org.springframework.webflow.execution.Action;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A transitionable state that executes one or more actions when entered. When the action(s) are executed this state
@@ -123,7 +122,7 @@ public class ActionState extends TransitionableState {
 
 	/*
 	 * Overrides getRequiredTransition(RequestContext) to throw a local NoMatchingActionResultTransitionException if a
-	 * transition on the occurence of an action result event cannot be matched. Used to facilitate an action invocation
+	 * transition on the occurrence of an action result event cannot be matched. Used to facilitate an action invocation
 	 * chain. 
Note that we cannot catch NoMatchingTransitionException since that could lead to unwanted situations
 	 * where we're catching an exception that's generated by another state, e.g. because of a configuration error!
 	 */
@@ -136,7 +135,7 @@ public class ActionState extends TransitionableState {
 	}
 
 	/**
-	 * Specialization of State's doEnter template method that executes behaviour specific to this state
+	 * Specialization of State's doEnter template method that executes behavior specific to this state
 	 * type in polymorphic fashion.
 	 * 

 	 * This implementation iterates over each configured Action instance and executes it. Execution
@@ -144,10 +143,9 @@ public class ActionState extends TransitionableState {
 	 * context, or the set of all actions is exhausted.
 	 * @param context the control context for the currently executing flow, used by this state to manipulate the flow
 	 * execution
-	 * @return a view selection signaling that control should be returned to the client and a view rendered
 	 * @throws FlowExecutionException if an exception occurs in this state
 	 */
-	protected ViewSelection doEnter(RequestControlContext context) throws FlowExecutionException {
+	protected void doEnter(RequestControlContext context) throws FlowExecutionException {
 		int executionCount = 0;
 		String[] eventIds = new String[actionList.size()];
 		Iterator it = actionList.iterator();
@@ -157,8 +155,8 @@ public class ActionState extends TransitionableState {
 			if (event != null) {
 				eventIds[executionCount] = event.getId();
 				try {
-					// will check both local state transitions and global transitions
-					return context.signalEvent(event);
+					context.handleEvent(event);
+					return;
 				} catch (NoMatchingActionResultTransitionException e) {
 					if (logger.isDebugEnabled()) {
 						logger.debug("Action execution ["
@@ -207,7 +205,6 @@ public class ActionState extends TransitionableState {
 	/**
 	 * Local "no transition found" exception used to report that an action result could not be mapped to a state
 	 * transition.
-	 * 
 	 * @author Keith Donald
 	 * @author Erwin Vervaet
 	 */
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/DecisionState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/DecisionState.java
index 494956fb..69241f3d 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/DecisionState.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/DecisionState.java
@@ -17,7 +17,6 @@ package org.springframework.webflow.engine;
 
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A simple transitionable state that when entered will execute the first transition whose matching criteria evaluates
@@ -40,17 +39,15 @@ public class DecisionState extends TransitionableState {
 	}
 
 	/**
-	 * Specialization of State's doEnter template method that executes behaviour specific to this state
+	 * Specialization of State's doEnter template method that executes behavior specific to this state
 	 * type in polymorphic fashion.
 	 * 

 	 * Simply looks up the first transition that matches the state of the context and executes it.
 	 * @param context the control context for the currently executing flow, used by this state to manipulate the flow
 	 * execution
-	 * @return a view selection containing model and view information needed to render the results of the state
-	 * execution
 	 * @throws FlowExecutionException if an exception occurs in this state
 	 */
-	protected ViewSelection doEnter(RequestControlContext context) throws FlowExecutionException {
-		return getRequiredTransition(context).execute(this, context);
+	protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+		getRequiredTransition(context).execute(this, context);
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/EndState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/EndState.java
index 064f7b60..11cb83b8 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/EndState.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/EndState.java
@@ -16,35 +16,28 @@
 package org.springframework.webflow.engine;
 
 import org.springframework.binding.mapping.AttributeMapper;
+import org.springframework.binding.mapping.MappingContext;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
 import org.springframework.webflow.core.collection.LocalAttributeMap;
+import org.springframework.webflow.execution.Action;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.FlowSession;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
- * A state that ends a flow when entered. More specifically, this state ends the active flow session of the active flow
- * execution associated with the current request context.
+ * A state that ends a flow when entered. This state ends the active flow session of an ongoing flow execution.
  * 

  * If the ended session is the "root flow session" the entire flow execution ends, signaling the end of a logical
  * conversation.
  * 

- * If the terminated session was acting as a subflow the flow execution continues and control is returned to the parent
- * flow session. In that case, this state returns an ending result event the resuming parent flow is expected to respond
- * to.
+ * If the terminated session was acting as a subflow, the flow execution continues and control is returned to the parent
+ * flow session. In that case, this state returns an ending result event the resuming parent flow responds to.
  * 

- * An end state may optionally be configured with the name of a view to render when entered. This view will be rendered
- * if the end state terminates the entire flow execution as a kind of flow ending "confirmation page".
- * 

- * Note: if no viewName property is specified and this end state terminates the entire flow
- * execution it is expected that some action has already written the response (or else a blank response will result). On
- * the other hand, if no viewName is specified and this end state relinquishes control back to a
- * parent flow, view selection responsibility falls on the parent flow.
+ * An end state may be configured with a renderer to render a final response. This renderer will be invoked if the end
+ * state terminates the entire flow execution.
  * 
- * @see org.springframework.webflow.engine.ViewSelector
  * @see org.springframework.webflow.engine.SubflowState
  * 
  * @author Keith Donald
@@ -54,14 +47,14 @@ import org.springframework.webflow.execution.ViewSelection;
 public class EndState extends State {
 
 	/**
-	 * The optional view selector that will select a view to render if this end state terminates a root flow session.
+	 * The renderer that will render the final response when a flow execution terminates.
 	 */
-	private ViewSelector viewSelector = NullViewSelector.INSTANCE;
+	private Action finalResponseAction = new NullFinalResponseAction();
 
 	/**
-	 * Attribute mapper for mapping output attributes exposed by this end state when it is entered.
+	 * The attribute mapper for mapping output attributes exposed by this end state when it is entered.
 	 */
-	private AttributeMapper outputMapper;
+	private AttributeMapper outputMapper = new NoOutputMapper();
 
 	/**
 	 * Create a new end state with no associated view.
@@ -69,7 +62,7 @@ public class EndState extends State {
 	 * @param id the state identifier (must be unique to the flow)
 	 * @throws IllegalArgumentException when this state cannot be added to given flow, e.g. because the id is not unique
 	 * @see State#State(Flow, String)
-	 * @see #setViewSelector(ViewSelector)
+	 * @see #setFinalResponseAction(Action)
 	 * @see #setOutputMapper(AttributeMapper)
 	 */
 	public EndState(Flow flow, String id) throws IllegalArgumentException {
@@ -77,58 +70,42 @@ public class EndState extends State {
 	}
 
 	/**
-	 * Returns the strategy used to select the view to render in this end state if it terminates a root flow.
+	 * Sets the renderer that will render the final flow execution response.
 	 */
-	public ViewSelector getViewSelector() {
-		return viewSelector;
-	}
-
-	/**
-	 * Sets the strategy used to select the view to render when this end state is entered and terminates a root flow.
-	 */
-	public void setViewSelector(ViewSelector viewSelector) {
-		Assert.notNull(viewSelector, "The view selector is required");
-		this.viewSelector = viewSelector;
-	}
-
-	/**
-	 * Returns the configured attribute mapper for mapping output attributes exposed by this end state when it is
-	 * entered.
-	 */
-	public AttributeMapper getOutputMapper() {
-		return outputMapper;
+	public void setFinalResponseAction(Action finalResponseAction) {
+		Assert.notNull(finalResponseAction, "The final response action is required");
+		this.finalResponseAction = finalResponseAction;
 	}
 
 	/**
 	 * Sets the attribute mapper to use for mapping output attributes exposed by this end state when it is entered.
 	 */
 	public void setOutputMapper(AttributeMapper outputMapper) {
+		Assert.notNull(outputMapper, "The flow session output mapper is required");
 		this.outputMapper = outputMapper;
 	}
 
 	/**
-	 * Specialization of State's doEnter template method that executes behaviour specific to this state
+	 * Specialization of State's doEnter template method that executes behavior specific to this state
 	 * type in polymorphic fashion.
 	 * 

 	 * This implementation pops the top (active) flow session off the execution stack, ending it, and resumes control in
-	 * the parent flow (if neccessary). If the ended session is the root flow, a {@link ViewSelection} is returned.
+	 * the parent flow (if necessary). If the ended session is the root flow, a final response is rendered.
 	 * @param context the control context for the currently executing flow, used by this state to manipulate the flow
 	 * execution
-	 * @return a view selection signaling that control should be returned to the client and a view rendered
 	 * @throws FlowExecutionException if an exception occurs in this state
 	 */
-	protected ViewSelection doEnter(RequestControlContext context) throws FlowExecutionException {
+	protected void doEnter(final RequestControlContext context) throws FlowExecutionException {
 		FlowSession activeSession = context.getFlowExecutionContext().getActiveSession();
 		if (activeSession.isRoot()) {
-			// entire flow execution is ending, return ending view if applicable
-			ViewSelection selectedView = viewSelector.makeEntrySelection(context);
+			// entire flow execution is ending; issue the final response
+			ActionExecutor.execute(finalResponseAction, context);
 			context.endActiveFlowSession(createSessionOutput(context));
-			return selectedView;
 		} else {
 			// there is a parent flow that will resume (this flow is a subflow)
 			LocalAttributeMap sessionOutput = createSessionOutput(context);
 			context.endActiveFlowSession(sessionOutput);
-			return context.signalEvent(new Event(this, getId(), sessionOutput));
+			context.handleEvent(new Event(this, getId(), sessionOutput));
 		}
 	}
 
@@ -138,13 +115,38 @@ public class EndState extends State {
 	 */
 	protected LocalAttributeMap createSessionOutput(RequestContext context) {
 		LocalAttributeMap outputMap = new LocalAttributeMap();
-		if (outputMapper != null) {
-			outputMapper.map(context, outputMap, null);
-		}
+		outputMapper.map(context, outputMap, null);
 		return outputMap;
 	}
 
 	protected void appendToString(ToStringCreator creator) {
-		creator.append("viewSelector", viewSelector).append("outputMapper", outputMapper);
+		creator.append("finalResponseAction", finalResponseAction).append("outputMapper", outputMapper);
+	}
+
+	/**
+	 * Renders no response. The default implementation.
+	 */
+	private class NullFinalResponseAction implements Action {
+		public Event execute(RequestContext context) {
+			logger.debug("Not issuing a final response");
+			return new Event(this, "success");
+		}
+
+		public String toString() {
+			return "none";
+		}
+	}
+
+	/**
+	 * Maps no output attributes. The default implementation.
+	 */
+	private class NoOutputMapper implements AttributeMapper {
+		public void map(Object source, Object target, MappingContext context) {
+			logger.debug("No output attributes mapped");
+		}
+
+		public String toString() {
+			return "none";
+		}
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java
index df1a989f..6a1ee352 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/Flow.java
@@ -21,17 +21,20 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.binding.mapping.AttributeMapper;
+import org.springframework.binding.mapping.MappingContext;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.style.StylerUtils;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
+import org.springframework.webflow.context.ExternalContext;
+import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.definition.StateDefinition;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A single flow definition. A Flow definition is a reusable, self-contained controller module that provides the blue
@@ -45,7 +48,7 @@ import org.springframework.webflow.execution.ViewSelection;
  * 

  * Especially in Intranet applications there are often "controlled navigations" where the user is not free to do what he
  * or she wants but must follow the guidelines provided by the system to complete a process that is transactional in
- * nature (the quinessential example would be a 'checkout' flow of a shopping cart application). This is a typical use
+ * nature (the quintessential example would be a 'checkout' flow of a shopping cart application). This is a typical use
  * case appropriate to model as a flow.
  * 

  * Structurally a Flow is composed of a set of states. A {@link State} is a point in a flow where a behavior is
@@ -55,7 +58,7 @@ import org.springframework.webflow.execution.ViewSelection;
  * Each {@link TransitionableState} type has one or more transitions that when executed move a flow to another state.
  * These transitions define the supported paths through the flow.
  * 

- * A state transition is triggered by the occurence of an event. An event is something that happens the flow should
+ * A state transition is triggered by the occurrence of an event. An event is something that happens the flow should
  * respond to, for example a user input event like ("submit") or an action execution result event like ("success"). When
  * an event occurs in a state of a Flow that event drives a state transition that decides what to do next.
  * 

@@ -76,14 +79,15 @@ import org.springframework.webflow.execution.ViewSelection;
  * the ability to design reusable, high-level controller modules that may be executed in any environment.
  * 

  * Note: flows are singleton definition objects so they should be thread-safe. You can think a flow definition as
- * analagous somewhat to a Java class, defining all the behavior of an application module. The core behaviors
- * {@link #start(RequestControlContext, MutableAttributeMap) start}, {@link #onEvent(RequestControlContext) on event},
- * and {@link #end(RequestControlContext, MutableAttributeMap) end} each accept a {@link RequestContext request context}
- * that allows for this flow to access execution state in a thread safe manner. A flow execution is what models a
- * running instance of this flow definition, somewhat analgous to a java object that is an instance of a class.
+ * analogous to a Java class, defining all the behavior of an application module. The core behaviors
+ * {@link #start(RequestControlContext, MutableAttributeMap) start}, {@link #resume(RequestControlContext)},
+ * {@link #handleEvent(RequestControlContext) on event}, {@link #end(RequestControlContext, MutableAttributeMap) end},
+ * and {@link #handleException(FlowExecutionException, RequestControlContext)}. Each method accepts a
+ * {@link RequestContext request context} that allows for this flow to access execution state in a thread safe manner. A
+ * flow execution is what models a running instance of this flow definition, somewhat analogous to a java object that is
+ * an instance of a class.
  * 
  * @see org.springframework.webflow.engine.State
- * @see org.springframework.webflow.engine.TransitionableState
  * @see org.springframework.webflow.engine.ActionState
  * @see org.springframework.webflow.engine.ViewState
  * @see org.springframework.webflow.engine.SubflowState
@@ -126,7 +130,7 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 	/**
 	 * The mapper to map flow input attributes.
 	 */
-	private AttributeMapper inputMapper;
+	private AttributeMapper inputMapper = new NoInputMapper();
 
 	/**
 	 * The list of actions to execute when this flow starts.
@@ -149,24 +153,34 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 	/**
 	 * The mapper to map flow output attributes.
 	 */
-	private AttributeMapper outputMapper;
+	private AttributeMapper outputMapper = new NoOutputMapper();
 
 	/**
 	 * The set of exception handlers for this flow.
 	 */
 	private FlowExecutionExceptionHandlerSet exceptionHandlerSet = new FlowExecutionExceptionHandlerSet();
 
-	/**
-	 * The set of inline flows contained by this flow.
-	 */
-	private Set inlineFlows = CollectionFactory.createLinkedSetIfPossible(3);
-
 	/**
 	 * Construct a new flow definition with the given id. The id should be unique among all flows.
 	 * @param id the flow identifier
 	 */
 	public Flow(String id) {
-		setId(id);
+		Assert.hasText(id, "This flow must be uniquely identified");
+		this.id = id;
+	}
+
+	// convenient static factory methods
+
+	/**
+	 * Create a new flow with the given id and attributes.
+	 * @param id the flow id
+	 * @param attributes the attributes
+	 * @return the flow
+	 */
+	public static Flow create(String id, AttributeMap attributes) {
+		Flow flow = new Flow(id);
+		flow.getAttributeMap().putAll(attributes);
+		return flow;
 	}
 
 	// implementing FlowDefinition
@@ -187,14 +201,6 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 		return getStateInstance(stateId);
 	}
 
-	/**
-	 * Set the unique id of this flow.
-	 */
-	protected void setId(String id) {
-		Assert.hasText(id, "This flow must have a unique, non-blank identifier");
-		this.id = id;
-	}
-
 	/**
 	 * Add given state definition to this flow definition. Marked protected, as this method is to be called by the
 	 * (privileged) state definition classes themselves during state construction as part of a FlowBuilder invocation.
@@ -358,6 +364,7 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 	 * @param inputMapper the input mapper
 	 */
 	public void setInputMapper(AttributeMapper inputMapper) {
+		Assert.notNull(inputMapper, "The input mapper cannot be null");
 		this.inputMapper = inputMapper;
 	}
 
@@ -392,6 +399,7 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 	 * @param outputMapper the output mapper
 	 */
 	public void setOutputMapper(AttributeMapper outputMapper) {
+		Assert.notNull(outputMapper, "The output mapper cannot be null");
 		this.outputMapper = outputMapper;
 	}
 
@@ -406,74 +414,6 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 		return exceptionHandlerSet;
 	}
 
-	/**
-	 * Adds an inline flow to this flow.
-	 * @param flow the inline flow to add
-	 */
-	public void addInlineFlow(Flow flow) {
-		inlineFlows.add(flow);
-	}
-
-	/**
-	 * Returns the list of inline flow ids.
-	 * @return a string array of inline flow identifiers
-	 */
-	public String[] getInlineFlowIds() {
-		String[] flowIds = new String[getInlineFlowCount()];
-		int i = 0;
-		Iterator it = inlineFlows.iterator();
-		while (it.hasNext()) {
-			flowIds[i++] = ((Flow) it.next()).getId();
-		}
-		return flowIds;
-	}
-
-	/**
-	 * Returns the list of inline flows.
-	 * @return the list of inline flows
-	 */
-	public Flow[] getInlineFlows() {
-		return (Flow[]) inlineFlows.toArray(new Flow[inlineFlows.size()]);
-	}
-
-	/**
-	 * Returns the count of registered inline flows.
-	 * @return the count
-	 */
-	public int getInlineFlowCount() {
-		return inlineFlows.size();
-	}
-
-	/**
-	 * Tests if this flow contains an in-line flow with the specified id.
-	 * @param id the inline flow id
-	 * @return true if this flow contains a inline flow with that id, false otherwise
-	 */
-	public boolean containsInlineFlow(String id) {
-		return getInlineFlow(id) != null;
-	}
-
-	/**
-	 * Returns the inline flow with the provided id, or null if no such inline flow exists.
-	 * @param id the inline flow id
-	 * @return the inline flow
-	 * @throws IllegalArgumentException when an invalid flow id is provided
-	 */
-	public Flow getInlineFlow(String id) throws IllegalArgumentException {
-		if (!StringUtils.hasText(id)) {
-			throw new IllegalArgumentException(
-					"The specified inline flowId is invalid: flow identifiers must be non-blank");
-		}
-		Iterator it = inlineFlows.iterator();
-		while (it.hasNext()) {
-			Flow flow = (Flow) it.next();
-			if (flow.getId().equals(id)) {
-				return flow;
-			}
-		}
-		return null;
-	}
-
 	/**
 	 * Returns the set of transitions eligible for execution by this flow if no state-level transition is matched. The
 	 * returned set is mutable.
@@ -499,12 +439,21 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 
 	// behavioral code, could be overridden in subclasses
 
+	/**
+	 * Factory method that creates the initial input map to pass to this flow when a new execution of this flow is
+	 * started. Allows this flow to assemble the input map from data in the external context representing the calling
+	 * environment.
+	 */
+	public MutableAttributeMap createExecutionInputMap(ExternalContext context) {
+		return new LocalAttributeMap();
+	}
+
 	/**
 	 * Start a new session for this flow in its start state. This boils down to the following:
 	 * 
    
 	 * 
  1. Create (setup) all registered flow variables ({@link #addVariable(FlowVariable)}) in flow scope.
    2. 
-	 * 
  2. Map provided input data into the flow execution control context. Typically data will be mapped into flow
-	 * scope using the registered input mapper ({@link #setInputMapper(AttributeMapper)}).
    3. 
+	 * 
  3. Map provided input data into the flow. Typically data will be mapped into flow scope using the registered
+	 * input mapper ({@link #setInputMapper(AttributeMapper)}).
    4. 
 	 * 
  4. Execute all registered start actions ({@link #getStartActionList()}).
    5. 
 	 * 
  5. Enter the configured start state ({@link #setStartState(State)})
    6. 
 	 * 

@@ -512,31 +461,36 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 	 * @param input eligible input into the session
 	 * @throws FlowExecutionException when an exception occurs starting the flow
 	 */
-	public ViewSelection start(RequestControlContext context, MutableAttributeMap input) throws FlowExecutionException {
+	public void start(RequestControlContext context, MutableAttributeMap input) throws FlowExecutionException {
+		assertStartStateSet();
 		createVariables(context);
-		if (inputMapper != null) {
-			inputMapper.map(input, context, null);
-		}
+		inputMapper.map(input, context, null);
 		startActionList.execute(context);
-		return startState.enter(context);
+		startState.enter(context);
 	}
 
 	/**
-	 * Inform this flow definition that an event was signaled in the current state of an active flow execution. The
-	 * signaled event is the last event available in given request context ({@link RequestContext#getLastEvent()}).
+	 * Resume a paused session for this flow in its current view state.
 	 * @param context the flow execution control context
-	 * @return the selected view
-	 * @throws FlowExecutionException when an exception occurs processing the event
+	 * @throws FlowExecutionException when an exception occurs during the resume operation
 	 */
-	public ViewSelection onEvent(RequestControlContext context) throws FlowExecutionException {
+	public void resume(RequestControlContext context) throws FlowExecutionException {
+		getCurrentViewState(context).resume(context);
+	}
+
+	/**
+	 * Handle the last event that occurred against an active session of this flow.
+	 * @param context the flow execution control context
+	 */
+	public void handleEvent(RequestControlContext context) {
 		TransitionableState currentState = getCurrentTransitionableState(context);
 		try {
-			return currentState.onEvent(context);
+			currentState.handleEvent(context);
 		} catch (NoMatchingTransitionException e) {
 			// try the flow level transition set for a match
 			Transition transition = globalTransitionSet.getTransition(context);
 			if (transition != null) {
-				return transition.execute(currentState, context);
+				transition.execute(currentState, context);
 			} else {
 				// no matching global transition => let the original exception
 				// propagate
@@ -559,25 +513,28 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 	 */
 	public void end(RequestControlContext context, MutableAttributeMap output) throws FlowExecutionException {
 		endActionList.execute(context);
-		if (outputMapper != null) {
-			outputMapper.map(context, output, null);
-		}
+		outputMapper.map(context, output, null);
 	}
 
 	/**
-	 * Handle an exception that occured during an execution of this flow.
-	 * @param exception the exception that occured
+	 * Handle an exception that occurred during an execution of this flow.
+	 * @param exception the exception that occurred
 	 * @param context the flow execution control context
-	 * @return the selected error view, or null if no handler matched or returned a non-null view
-	 * selection
 	 */
-	public ViewSelection handleException(FlowExecutionException exception, RequestControlContext context)
+	public boolean handleException(FlowExecutionException exception, RequestControlContext context)
 			throws FlowExecutionException {
 		return getExceptionHandlerSet().handleException(exception, context);
 	}
 
 	// internal helpers
 
+	private void assertStartStateSet() {
+		if (startState == null) {
+			throw new IllegalStateException("Unable to start flow '" + id
+					+ "'; the start state is not set -- flow builder configuration error?");
+		}
+	}
+
 	/**
 	 * Create (setup) all known flow variables in flow scope.
 	 */
@@ -592,6 +549,18 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 		}
 	}
 
+	/**
+	 * Returns the current state and makes sure it is a view state.
+	 */
+	private ViewState getCurrentViewState(RequestControlContext context) {
+		State currentState = (State) context.getCurrentState();
+		if (!(currentState instanceof ViewState)) {
+			throw new IllegalStateException("You can only resume paused view states, and state "
+					+ context.getCurrentState() + " is not a view state - programmer error");
+		}
+		return (ViewState) currentState;
+	}
+
 	/**
 	 * Returns the current state and makes sure it is transitionable.
 	 */
@@ -604,11 +573,39 @@ public class Flow extends AnnotatedObject implements FlowDefinition {
 		return (TransitionableState) currentState;
 	}
 
+	/**
+	 * Maps no input attributes. The default implementation.
+	 */
+	private class NoInputMapper implements AttributeMapper {
+		public void map(Object source, Object target, MappingContext context) {
+			logger.debug("No input attributes mapped");
+		}
+
+		public String toString() {
+			return "none";
+		}
+
+	}
+
+	/**
+	 * Maps no input attributes. The default implementation.
+	 */
+	private class NoOutputMapper implements AttributeMapper {
+		public void map(Object source, Object target, MappingContext context) {
+			logger.debug("No output attributes mapped");
+		}
+
+		public String toString() {
+			return "none";
+		}
+	}
+
 	public String toString() {
 		return new ToStringCreator(this).append("id", id).append("states", states).append("startState", startState)
 				.append("variables", variables).append("inputMapper", inputMapper).append("startActionList",
 						startActionList).append("exceptionHandlerSet", exceptionHandlerSet).append(
 						"globalTransitionSet", globalTransitionSet).append("endActionList", endActionList).append(
-						"outputMapper", outputMapper).append("inlineFlows", inlineFlows).toString();
+						"outputMapper", outputMapper).toString();
 	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandler.java
index d2e3d04e..d78f5191 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandler.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandler.java
@@ -16,7 +16,6 @@
 package org.springframework.webflow.engine;
 
 import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A strategy for handling an exception that occurs at runtime during the execution of a flow definition.
@@ -27,18 +26,16 @@ public interface FlowExecutionExceptionHandler {
 
 	/**
 	 * Can this handler handle the given exception?
-	 * @param exception the exception that occured
+	 * @param exception the exception that occurred
 	 * @return true if yes, false if no
 	 */
-	public boolean handles(FlowExecutionException exception);
+	public boolean canHandle(FlowExecutionException exception);
 
 	/**
 	 * Handle the exception in the context of the current request, optionally making an error view selection that should
 	 * be rendered.
-	 * @param exception the exception that occured
+	 * @param exception the exception that occurred
 	 * @param context the execution control context for this request
-	 * @return the selected error view that should be displayed (may be null if the handler chooses not to select a
-	 * view, in which case other exception handlers may be given a chance to handle the exception)
 	 */
-	public ViewSelection handle(FlowExecutionException exception, RequestControlContext context);
+	public void handle(FlowExecutionException exception, RequestControlContext context);
 }
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandlerSet.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandlerSet.java
index ade664ec..a23d8366 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandlerSet.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/FlowExecutionExceptionHandlerSet.java
@@ -22,7 +22,6 @@ import java.util.List;
 import org.springframework.core.style.StylerUtils;
 import org.springframework.webflow.core.collection.CollectionUtils;
 import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A typed set of state exception handlers, mainly for use internally by artifacts that can apply state exception
@@ -98,28 +97,24 @@ public class FlowExecutionExceptionHandlerSet {
 	}
 
 	/**
-	 * Handle an exception that occured during the context of the current flow execution request.
+	 * Handle an exception that occurred during the context of the current flow execution request.
 	 * 

 	 * This implementation iterates over the ordered set of exception handler objects, delegating to each handler in the
-	 * set until one handles the exception that occured and selects a non-null error view.
-	 * @param exception the exception that occured
+	 * set until one handles the exception that occurred.
+	 * @param exception the exception that occurred
 	 * @param context the flow execution control context
-	 * @return the selected error view, or null if no handler matched or returned a non-null view
-	 * selection
+	 * @return true if the exception was handled
 	 */
-	public ViewSelection handleException(FlowExecutionException exception, RequestControlContext context) {
+	public boolean handleException(FlowExecutionException exception, RequestControlContext context) {
 		Iterator it = exceptionHandlers.iterator();
 		while (it.hasNext()) {
 			FlowExecutionExceptionHandler handler = (FlowExecutionExceptionHandler) it.next();
-			if (handler.handles(exception)) {
-				ViewSelection result = handler.handle(exception, context);
-				if (result != null) {
-					return result;
-				}
-				// else continue with next handler
+			if (handler.canHandle(exception)) {
+				handler.handle(exception, context);
+				return true;
 			}
 		}
-		return null;
+		return false;
 	}
 
 	public String toString() {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/NoMatchingTransitionException.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/NoMatchingTransitionException.java
index 8c84a68b..4a067f9c 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/NoMatchingTransitionException.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/NoMatchingTransitionException.java
@@ -29,7 +29,7 @@ import org.springframework.webflow.execution.FlowExecutionException;
 public class NoMatchingTransitionException extends FlowExecutionException {
 
 	/**
-	 * The event that occured that could not be matched to a Transition.
+	 * The event that occurred that could not be matched to a Transition.
 	 */
 	private Event event;
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/NullViewSelector.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/NullViewSelector.java
deleted file mode 100644
index f0b8095b..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/NullViewSelector.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-
-/**
- * Makes a null view selection, indicating no response should be issued.
- * 
- * @see org.springframework.webflow.execution.ViewSelection#NULL_VIEW
- * 
- * @author Keith Donald
- */
-public final class NullViewSelector implements ViewSelector, Serializable {
-
-	/*
-	 * Implementation note: not located in webflow.execution.support package to avoid a cyclic dependency between
-	 * webflow.execution and webflow.execution.support.
-	 */
-
-	/**
-	 * The shared singleton {@link NullViewSelector} instance.
-	 */
-	public static final ViewSelector INSTANCE = new NullViewSelector();
-
-	/**
-	 * Private constructor since this is a singleton.
-	 */
-	private NullViewSelector() {
-	}
-
-	public boolean isEntrySelectionRenderable(RequestContext context) {
-		return true;
-	}
-
-	public ViewSelection makeEntrySelection(RequestContext context) {
-		return ViewSelection.NULL_VIEW;
-	}
-
-	public ViewSelection makeRefreshSelection(RequestContext context) {
-		return makeEntrySelection(context);
-	}
-
-	// resolve the singleton instance
-	private Object readResolve() throws ObjectStreamException {
-		return INSTANCE;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/RequestControlContext.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/RequestControlContext.java
index 3f7339b4..0a8391de 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/RequestControlContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/RequestControlContext.java
@@ -19,17 +19,16 @@ import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecutionContext;
 import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.FlowExecutionKey;
 import org.springframework.webflow.execution.FlowSession;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * Mutable control interface used to manipulate an ongoing flow execution in the context of one client request.
  * Primarily used internally by the various flow artifacts when they are invoked.
  * 

  * This interface acts as a facade for core definition constructs such as the central Flow and
- * State classes, abstracting away details about the runtime execution machine defined in the
- * {@link org.springframework.webflow.engine.impl execution engine implementation} package.
+ * State classes, abstracting away details about the runtime execution machine.
  * 

  * Note this type is not the same as the {@link FlowExecutionContext}. Objects of this type are request specific:
  * they provide a control interface for manipulating exactly one flow execution locally from exactly one request. A
@@ -47,12 +46,12 @@ import org.springframework.webflow.execution.ViewSelection;
 public interface RequestControlContext extends RequestContext {
 
 	/**
-	 * Record the last event signaled in the executing flow. This method will be called as part of signaling an event in
-	 * a flow to indicate the 'lastEvent' that was signaled.
-	 * @param lastEvent the last event signaled
-	 * @see Flow#onEvent(RequestControlContext)
+	 * Record the current state that has entered in the executing flow. This method will be called as part of entering a
+	 * new state by the State type itself.
+	 * @param state the current state
+	 * @see State#enter(RequestControlContext)
 	 */
-	public void setLastEvent(Event lastEvent);
+	public void setCurrentState(State state);
 
 	/**
 	 * Record the last transition that executed in the executing flow. This method will be called as part of executing a
@@ -63,12 +62,10 @@ public interface RequestControlContext extends RequestContext {
 	public void setLastTransition(Transition lastTransition);
 
 	/**
-	 * Record the current state that has entered in the executing flow. This method will be called as part of entering a
-	 * new state by the State type itself.
-	 * @param state the current state
-	 * @see State#enter(RequestControlContext)
+	 * Assign the ongoing flow execution its flow execution key. This method will be called before a state is about to
+	 * render a view and pause the flow execution.
 	 */
-	public void setCurrentState(State state);
+	public FlowExecutionKey assignFlowExecutionKey();
 
 	/**
 	 * Spawn a new flow session and activate it in the currently executing flow. Also transitions the spawned flow to
@@ -77,26 +74,22 @@ public interface RequestControlContext extends RequestContext {
 	 * This will start a new flow session in the current flow execution, which is already active.
 	 * @param flow the flow to start, its start() method will be called
 	 * @param input initial contents of the newly created flow session (may be null, e.g. empty)
-	 * @return the selected starting view, which returns control to the client and requests that a view be rendered with
-	 * model data
 	 * @throws FlowExecutionException if an exception was thrown within a state of the flow during execution of this
 	 * start operation
 	 * @see Flow#start(RequestControlContext, MutableAttributeMap)
 	 */
-	public ViewSelection start(Flow flow, MutableAttributeMap input) throws FlowExecutionException;
+	public void start(Flow flow, MutableAttributeMap input) throws FlowExecutionException;
 
 	/**
-	 * Signals the occurence of an event in the current state of this flow execution request context. This method should
-	 * be called by clients that report internal event occurences, such as action states. The onEvent()
-	 * method of the flow involved in the flow execution will be called.
-	 * @param event the event that occured
-	 * @return the next selected view, which returns control to the client and requests that a view be rendered with
-	 * model data
+	 * Signals the occurrence of an event in the current state of this flow execution request context. This method
+	 * should be called by clients that report internal event occurrences, such as action states. The
+	 * onEvent() method of the flow involved in the flow execution will be called.
+	 * @param event the event that occurred
 	 * @throws FlowExecutionException if an exception was thrown within a state of the flow during execution of this
 	 * signalEvent operation
-	 * @see Flow#onEvent(RequestControlContext)
+	 * @see Flow#handleEvent(RequestControlContext)
 	 */
-	public ViewSelection signalEvent(Event event) throws FlowExecutionException;
+	public void handleEvent(Event event) throws FlowExecutionException;
 
 	/**
 	 * End the active flow session of the current flow execution. This method should be called by clients that terminate
@@ -113,9 +106,21 @@ public interface RequestControlContext extends RequestContext {
 	 * Execute this transition out of the current source state. Allows for privileged execution of an arbitrary
 	 * transition.
 	 * @param transition the transition
-	 * @return a new view selection
 	 * @see Transition#execute(State, RequestControlContext)
 	 */
-	public ViewSelection execute(Transition transition);
+	public void execute(Transition transition);
+
+	/**
+	 * Returns true if the 'always redirect pause' flow execution attribute is set to true, false otherwise.
+	 * @return true or false
+	 */
+	public boolean getAlwaysRedirectOnPause();
+
+	/**
+	 * Request that a redirect be sent to this flow execution after the current request has processed. The current flow
+	 * execution must have its key assigned for this operation to be supported.
+	 * @throws IllegalStateException if the flow execution has not yet had its key assigned
+	 */
+	public void sendFlowExecutionRedirect() throws IllegalStateException;
 
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/State.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/State.java
index e075b8e3..ed2373fb 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/State.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/State.java
@@ -22,7 +22,6 @@ import org.springframework.util.Assert;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.definition.StateDefinition;
 import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A point in a flow where something happens. What happens is determined by a state's type. Standard types of states
@@ -32,8 +31,8 @@ import org.springframework.webflow.execution.ViewSelection;
  * configuration information needed for a specific kind of state.
  * 

  * Subclasses should implement the doEnter method to execute the processing that should occur when this
- * state is entered, acting on its configuration information. The ability to plugin custom state types that execute
- * different behaviour polymorphically is the classic GoF state pattern.
+ * state is entered, acting on its configuration information. The ability to plug-in custom state types that execute
+ * different behaviors is the classic GoF state pattern.
  * 

  * Equality: Two states are equal if they have the same id and are part of the same flow.
  * 
@@ -178,53 +177,47 @@ public abstract class State extends AnnotatedObject implements StateDefinition {
 	 * the entry actions.
 	 * @param context the control context for the currently executing flow, used by this state to manipulate the flow
 	 * execution
-	 * @return a view selection containing model and view information needed to render the results of the state
-	 * processing
 	 * @throws FlowExecutionException if an exception occurs in this state
 	 */
-	public final ViewSelection enter(RequestControlContext context) throws FlowExecutionException {
+	public final void enter(RequestControlContext context) throws FlowExecutionException {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Entering state '" + getId() + "' of flow '" + getFlow().getId() + "'");
 		}
 		context.setCurrentState(this);
 		entryActionList.execute(context);
-		return doEnter(context);
+		doEnter(context);
 	}
 
 	/**
-	 * Hook method to execute custom behaviour as a result of entering this state. By implementing this method
-	 * subclasses specialize the behaviour of the state.
+	 * Hook method to execute custom behavior as a result of entering this state. By implementing this method subclasses
+	 * specialize the behavior of the state.
 	 * @param context the control context for the currently executing flow, used by this state to manipulate the flow
 	 * execution
-	 * @return a view selection containing model and view information needed to render the results of the state
-	 * processing
 	 * @throws FlowExecutionException if an exception occurs in this state
 	 */
-	protected abstract ViewSelection doEnter(RequestControlContext context) throws FlowExecutionException;
+	protected abstract void doEnter(RequestControlContext context) throws FlowExecutionException;
 
 	/**
-	 * Handle an exception that occured in this state during the context of the current flow execution request.
-	 * @param exception the exception that occured
+	 * Handle an exception that occurred in this state during the context of the current flow execution request.
+	 * @param exception the exception that occurred
 	 * @param context the flow execution control context
-	 * @return the selected error view, or null if no handler matched or returned a non-null view
-	 * selection
 	 */
-	public ViewSelection handleException(FlowExecutionException exception, RequestControlContext context) {
+	public boolean handleException(FlowExecutionException exception, RequestControlContext context) {
 		return getExceptionHandlerSet().handleException(exception, context);
 	}
 
 	public String toString() {
-		String flowName = (flow == null ? "" : flow.getId());
-		ToStringCreator creator = new ToStringCreator(this).append("id", getId()).append("flow", flowName).append(
+		ToStringCreator creator = new ToStringCreator(this).append("id", getId()).append("flow", flow.getId()).append(
 				"entryActionList", entryActionList).append("exceptionHandlerSet", exceptionHandlerSet);
 		appendToString(creator);
 		return creator.toString();
 	}
 
 	/**
-	 * Subclasses may override this hook method to stringify their internal state. This default implementation does
-	 * nothing.
-	 * @param creator the toString creator, to stringify properties
+	 * Subclasses may override this hook method to print their internal state to a string. This default implementation
+	 * does nothing.
+	 * @param creator the toString creator, to print properties to string
+	 * @see #toString()
 	 */
 	protected void appendToString(ToStringCreator creator) {
 	}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/SubflowState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/SubflowState.java
index 154f05bb..40047a2f 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/SubflowState.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/SubflowState.java
@@ -18,10 +18,10 @@ package org.springframework.webflow.engine;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
 import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A transitionable state that spawns a subflow when executed. When the subflow this state spawns ends, the ending
@@ -41,14 +41,14 @@ import org.springframework.webflow.execution.ViewSelection;
 public class SubflowState extends TransitionableState {
 
 	/**
-	 * The subflow that should be spawned when this subflow state is entered.
+	 * The subflow that should be spawned when this subflow state is entered. TODO - late binding
 	 */
 	private Flow subflow;
 
 	/**
 	 * The attribute mapper that should map attributes from the parent flow down to the spawned subflow and visa versa.
 	 */
-	private FlowAttributeMapper attributeMapper;
+	private FlowAttributeMapper attributeMapper = new NoAttributeMapper();
 
 	/**
 	 * Create a new subflow state.
@@ -64,15 +64,7 @@ public class SubflowState extends TransitionableState {
 	}
 
 	/**
-	 * Returns the subflow spawned by this state.
-	 */
-	public Flow getSubflow() {
-		return subflow;
-	}
-
-	/**
-	 * Set the subflow that will be spawned by this state.
-	 * @param subflow the subflow to spawn
+	 * Set the subflow this state will call.
 	 */
 	private void setSubflow(Flow subflow) {
 		Assert.notNull(subflow, "A subflow state must have a subflow; the subflow is required");
@@ -80,17 +72,10 @@ public class SubflowState extends TransitionableState {
 	}
 
 	/**
-	 * Returns the attribute mapper used to map data between the parent and child flow, or null if no mapping is needed.
-	 */
-	public FlowAttributeMapper getAttributeMapper() {
-		return attributeMapper;
-	}
-
-	/**
-	 * Set the attribute mapper used to map model data between the parent and child flow. Can be null if no mapping is
-	 * needed.
+	 * Set the attribute mapper used to map model data between the parent and child flow.
 	 */
 	public void setAttributeMapper(FlowAttributeMapper attributeMapper) {
+		Assert.notNull(attributeMapper, "The attribute mapper is required");
 		this.attributeMapper = attributeMapper;
 	}
 
@@ -101,70 +86,41 @@ public class SubflowState extends TransitionableState {
 	 * Entering this state, creates the subflow input map and spawns the subflow in the current flow execution.
 	 * @param context the control context for the currently executing flow, used by this state to manipulate the flow
 	 * execution
-	 * @return a view selection containing model and view information needed to render the results of the state
-	 * execution
 	 * @throws FlowExecutionException if an exception occurs in this state
 	 */
-	protected ViewSelection doEnter(RequestControlContext context) throws FlowExecutionException {
+	protected void doEnter(RequestControlContext context) throws FlowExecutionException {
 		if (logger.isDebugEnabled()) {
-			logger.debug("Spawning subflow '" + getSubflow().getId() + "' within flow '" + getFlow().getId() + "'");
-		}
-		return context.start(getSubflow(), createSubflowInput(context));
-	}
-
-	/**
-	 * Create the input data map for the spawned subflow session. The returned map will be passed to
-	 * {@link Flow#start(RequestControlContext, MutableAttributeMap)}.
-	 */
-	protected MutableAttributeMap createSubflowInput(RequestContext context) {
-		if (getAttributeMapper() != null) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Messaging the configured attribute mapper to map attributes "
-						+ "down to the spawned subflow for access within the subflow");
-			}
-			return getAttributeMapper().createFlowInput(context);
-		} else {
-			if (logger.isDebugEnabled()) {
-				logger.debug("No attribute mapper configured for this subflow state '" + getId()
-						+ "' -- As a result, no attributes will be passed to the spawned subflow '" + subflow.getId()
-						+ "'");
-			}
-			return null;
+			logger.debug("Calling subflow '" + subflow.getId() + "'");
 		}
+		context.start(subflow, attributeMapper.createFlowInput(context));
 	}
 
 	/**
 	 * Called on completion of the subflow to handle the subflow result event as determined by the end state reached by
 	 * the subflow.
 	 */
-	public ViewSelection onEvent(RequestControlContext context) {
-		mapSubflowOutput(context.getLastEvent().getAttributes(), context);
-		return super.onEvent(context);
-	}
-
-	/**
-	 * Map the output data produced by the subflow back into the request context (typically flow scope).
-	 */
-	private void mapSubflowOutput(AttributeMap subflowOutput, RequestContext context) {
-		if (getAttributeMapper() != null) {
-			if (logger.isDebugEnabled()) {
-				logger
-						.debug("Messaging the configured attribute mapper to map subflow result attributes to the "
-								+ "resuming parent flow -- It will have access to attributes passed up by the completed subflow");
-			}
-			attributeMapper.mapFlowOutput(subflowOutput, context);
-		} else {
-			if (logger.isDebugEnabled()) {
-				logger
-						.debug("No attribute mapper is configured for the resuming subflow state '"
-								+ getId()
-								+ "' -- As a result, no attributes of the ending flow will be passed to the resuming parent flow");
-			}
-		}
+	public void handleEvent(RequestControlContext context) {
+		attributeMapper.mapFlowOutput(context.getLastEvent().getAttributes(), context);
+		super.handleEvent(context);
 	}
 
 	protected void appendToString(ToStringCreator creator) {
 		creator.append("subflow", subflow.getId()).append("attributeMapper", attributeMapper);
 		super.appendToString(creator);
 	}
+
+	/**
+	 * Maps no output attributes. The default implementation.
+	 */
+	private class NoAttributeMapper implements FlowAttributeMapper {
+		public MutableAttributeMap createFlowInput(RequestContext context) {
+			logger.debug("No input will be passed to subflow");
+			return new LocalAttributeMap();
+		}
+
+		public void mapFlowOutput(AttributeMap flowOutput, RequestContext context) {
+			logger.debug("No subflow output will be mapped");
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java
index 74534610..16f40554 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/Transition.java
@@ -23,13 +23,12 @@ import org.springframework.webflow.definition.TransitionDefinition;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A path from one {@link TransitionableState state} to another {@link State state}.
  * 

  * When executed a transition takes a flow execution from its current state, called the source state, to another
- * state, called the target state. A transition may become eligible for execution on the occurence of an
+ * state, called the target state. A transition may become eligible for execution on the occurrence of an
  * {@link Event} from within a transitionable source state.
  * 

  * When an event occurs within this transition's source TransitionableState the determination of the
@@ -163,7 +162,7 @@ public class Transition extends AnnotatedObject implements TransitionDefinition
 	}
 
 	/**
-	 * Checks if this transition is elligible for execution given the state of the provided flow execution request
+	 * Checks if this transition is eligible for execution given the state of the provided flow execution request
 	 * context.
 	 * @param context the flow execution request context
 	 * @return true if this transition should execute, false otherwise
@@ -183,15 +182,13 @@ public class Transition extends AnnotatedObject implements TransitionDefinition
 	}
 
 	/**
-	 * Execute this state transition. Will only be called if the {@link #matches(RequestContext)} method returns true
-	 * for given context.
+	 * Execute this state transition. Should only be called if the {@link #matches(RequestContext)} method returns true
+	 * for the given context.
+	 * @param sourceState the source state to transition from, may be null if the current state is null
 	 * @param context the flow execution control context
-	 * @return a view selection containing model and view information needed to render the results of the transition
-	 * execution
 	 * @throws FlowExecutionException when transition execution fails
 	 */
-	public ViewSelection execute(State sourceState, RequestControlContext context) throws FlowExecutionException {
-		ViewSelection selectedView;
+	public void execute(State sourceState, RequestControlContext context) throws FlowExecutionException {
 		if (canExecute(context)) {
 			if (sourceState != null) {
 				if (logger.isDebugEnabled()) {
@@ -209,11 +206,10 @@ public class Transition extends AnnotatedObject implements TransitionDefinition
 			State targetState = targetStateResolver.resolveTargetState(this, sourceState, context);
 			context.setLastTransition(this);
 			// enter the target state (note: any exceptions are propagated)
-			selectedView = targetState.enter(context);
+			targetState.enter(context);
 		} else {
 			if (sourceState != null && sourceState instanceof TransitionableState) {
-				// 'roll back' and re-enter the transitionable source state
-				selectedView = ((TransitionableState) sourceState).reenter(context);
+				((TransitionableState) sourceState).reenter(context);
 			} else {
 				throw new IllegalStateException("Execution of '" + this + "' was blocked by '" + getExecutionCriteria()
 						+ "', " + "; however, no source state is set at runtime.  "
@@ -222,13 +218,12 @@ public class Transition extends AnnotatedObject implements TransitionDefinition
 		}
 		if (logger.isDebugEnabled()) {
 			if (context.getFlowExecutionContext().isActive()) {
-				logger.debug("Completed execution of " + this + ", as a result the new state is '"
+				logger.debug("Completed execution of " + this + "; as a result, the new state is '"
 						+ context.getCurrentState().getId() + "' in flow '" + context.getActiveFlow().getId() + "'");
 			} else {
-				logger.debug("Completed execution of " + this + ", as a result the flow execution has ended");
+				logger.debug("Completed execution of " + this + "; as a result, the flow execution has ended");
 			}
 		}
-		return selectedView;
 	}
 
 	public String toString() {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/TransitionableState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/TransitionableState.java
index 8b01286f..5f37cefb 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/TransitionableState.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/TransitionableState.java
@@ -20,7 +20,6 @@ import org.springframework.core.style.ToStringCreator;
 import org.springframework.webflow.definition.TransitionDefinition;
 import org.springframework.webflow.definition.TransitionableStateDefinition;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * Abstract superclass for states that can execute a transition in response to an event.
@@ -100,11 +99,10 @@ public abstract class TransitionableState extends State implements Transitionabl
 	 * Inform this state definition that an event was signaled in it. The signaled event is the last event available in
 	 * given request context ({@link RequestContext#getLastEvent()}).
 	 * @param context the flow execution control context
-	 * @return the selected view
 	 * @throws NoMatchingTransitionException when a matching transition cannot be found
 	 */
-	public ViewSelection onEvent(RequestControlContext context) throws NoMatchingTransitionException {
-		return getRequiredTransition(context).execute(this, context);
+	public void handleEvent(RequestControlContext context) throws NoMatchingTransitionException {
+		context.execute(getRequiredTransition(context));
 	}
 
 	/**
@@ -113,11 +111,9 @@ public abstract class TransitionableState extends State implements Transitionabl
 	 * 

 	 * By default, this just calls enter().
 	 * @param context the flow control context in an executing flow (a client instance of a flow)
-	 * @return a view selection containing model and view information needed to render the results of the state
-	 * processing
 	 */
-	public ViewSelection reenter(RequestControlContext context) {
-		return enter(context);
+	public void reenter(RequestControlContext context) {
+		enter(context);
 	}
 
 	/**
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewSelector.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewSelector.java
deleted file mode 100644
index 20823526..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewSelector.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.engine;
-
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-
-/**
- * Factory that produces a new, configured {@link ViewSelection} object on each invocation, taking into account the
- * information in the provided flow execution request context.
- * 

- * Note: this class is a runtime factory. Instances are used at flow execution time by objects like the
- * {@link ViewState} to produce new {@link ViewSelection view selections}.
- * 

- * This class allows for easy insertion of dynamic view selection logic, for instance, letting you determine the view to
- * render or the available model data for rendering based on contextual information.
- * 
- * @see org.springframework.webflow.execution.ViewSelection
- * @see org.springframework.webflow.engine.ViewState
- * @see org.springframework.webflow.engine.EndState
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public interface ViewSelector {
-
-	/**
-	 * Will the primary selection returned by 'makeEntrySelection' for the given request context be renderable in this
-	 * request?
-	 * 

-	 * "Renderable" view selections typically can have 'render-actions' execute before they are created. An example
-	 * would be an ApplicationView that forwards to a view template like a JSP. "Non-renderable" view selections are
-	 * things like a flow execution redirect--no render actually occurs, but only a redirect--rendering happens on the
-	 * new redirect request.
-	 * @param context the current request context of the executing flow
-	 * @return true if yes, false otherwise
-	 */
-	public boolean isEntrySelectionRenderable(RequestContext context);
-
-	/**
-	 * Make a new "entry" view selection for the given request context. Called when a view-state, end-state, or other
-	 * interactive state type is entered.
-	 * @param context the current request context of the executing flow
-	 * @return the entry view selection
-	 */
-	public ViewSelection makeEntrySelection(RequestContext context);
-
-	/**
-	 * Reconstitute a renderable view selection for the given request context to support a ViewState 'refresh'
-	 * operation.
-	 * @param context the current request context of the executing flow
-	 * @return the view selection
-	 */
-	public ViewSelection makeRefreshSelection(RequestContext context);
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java
index f3671660..e93f727e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java
@@ -18,16 +18,14 @@ package org.springframework.webflow.engine;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
 import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
+import org.springframework.webflow.execution.View;
+import org.springframework.webflow.execution.ViewFactory;
 
 /**
- * A view state is a state that issues a response to the user, for example, for soliciting form input.
- * 

- * To accomplish this, a ViewState makes a {@link ViewSelection}, which contains the necessary
- * information to issue a suitable response.
+ * A view state is a state that issues a response to the user, for example, for soliciting form input. To accomplish
+ * this, a ViewState delegates to a {@link ViewFactory}.
  * 
- * @see org.springframework.webflow.engine.ViewSelector
+ * @see ViewFactory
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
@@ -40,33 +38,34 @@ public class ViewState extends TransitionableState {
 	private ActionList renderActionList = new ActionList();
 
 	/**
-	 * The factory for the view selection to return when this state is entered.
+	 * Whether or not a redirect should occur before the view is rendered.
 	 */
-	private ViewSelector viewSelector = NullViewSelector.INSTANCE;
+	private boolean redirect;
+
+	/**
+	 * A factory for creating and restoring the view rendered by this view state.
+	 */
+	private ViewFactory viewFactory;
 
 	/**
 	 * Create a new view state.
 	 * @param flow the owning flow
 	 * @param id the state identifier (must be unique to the flow)
+	 * @param viewFactory the view factory
 	 * @throws IllegalArgumentException when this state cannot be added to given flow, e.g. because the id is not unique
 	 */
-	public ViewState(Flow flow, String id) throws IllegalArgumentException {
+	public ViewState(Flow flow, String id, ViewFactory viewFactory) throws IllegalArgumentException {
 		super(flow, id);
+		Assert.notNull(viewFactory, "The view factory is required");
+		this.viewFactory = viewFactory;
 	}
 
 	/**
-	 * Returns the strategy used to select the view to render in this view state.
+	 * Sets whether this view state should send a flow execution redirect when entered.
+	 * @param redirect the redirect flag
 	 */
-	public ViewSelector getViewSelector() {
-		return viewSelector;
-	}
-
-	/**
-	 * Sets the strategy used to select the view to render in this view state.
-	 */
-	public void setViewSelector(ViewSelector viewSelector) {
-		Assert.notNull(viewSelector, "The view selector to make view selections is required");
-		this.viewSelector = viewSelector;
+	public void setRedirect(boolean redirect) {
+		this.redirect = redirect;
 	}
 
 	/**
@@ -77,40 +76,37 @@ public class ViewState extends TransitionableState {
 		return renderActionList;
 	}
 
-	/**
-	 * Specialization of State's doEnter template method that executes behavior specific to this state
-	 * type in polymorphic fashion.
-	 * 

-	 * Returns a view selection indicating a response to issue. The view selection typically contains all the data
-	 * necessary to issue the response.
-	 * @param context the control context for the currently executing flow, used by this state to manipulate the flow
-	 * execution
-	 * @return a view selection serving as a response instruction
-	 * @throws FlowExecutionException if an exception occurs in this state
-	 */
-	protected ViewSelection doEnter(RequestControlContext context) throws FlowExecutionException {
-		if (viewSelector.isEntrySelectionRenderable(context)) {
-			// the entry selection will be rendered!
+	protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+		context.assignFlowExecutionKey();
+		if (shouldRedirect(context)) {
+			context.sendFlowExecutionRedirect();
+		} else {
+			View view = viewFactory.getView(context);
 			renderActionList.execute(context);
+			view.render();
+			context.getMessageContext().clearMessages();
+			context.getFlashScope().clear();
 		}
-		return viewSelector.makeEntrySelection(context);
 	}
 
-	/**
-	 * Request that the current view selection be reconstituted to support reissuing the response. This is an idempotent
-	 * operation that may be safely called any number of times on a paused execution, used primarily to support a flow
-	 * execution redirect.
-	 * @param context the request context
-	 * @return the view selection
-	 * @throws FlowExecutionException if an exception occurs in this state
-	 */
-	public ViewSelection refresh(RequestContext context) throws FlowExecutionException {
-		renderActionList.execute(context);
-		return viewSelector.makeRefreshSelection(context);
+	public void resume(RequestControlContext context) {
+		View view = viewFactory.getView(context);
+		if (view.eventSignaled()) {
+			context.handleEvent(view.getEvent());
+		} else {
+			renderActionList.execute(context);
+			view.render();
+			context.getMessageContext().clearMessages();
+			context.getFlashScope().clear();
+		}
+	}
+
+	private boolean shouldRedirect(RequestControlContext context) {
+		return redirect || context.getAlwaysRedirectOnPause();
 	}
 
 	protected void appendToString(ToStringCreator creator) {
-		creator.append("viewSelector", viewSelector);
 		super.appendToString(creator);
+		creator.append("viewManager", viewFactory);
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilder.java
deleted file mode 100644
index b90cb51e..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/AbstractFlowBuilder.java
+++ /dev/null
@@ -1,881 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.SettableExpression;
-import org.springframework.binding.mapping.AttributeMapper;
-import org.springframework.binding.mapping.Mapping;
-import org.springframework.binding.mapping.MappingBuilder;
-import org.springframework.binding.method.MethodSignature;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.webflow.action.AbstractBeanInvokingAction;
-import org.springframework.webflow.action.ActionResultExposer;
-import org.springframework.webflow.action.BeanInvokingActionFactory;
-import org.springframework.webflow.action.EvaluateAction;
-import org.springframework.webflow.action.MultiAction;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.CollectionUtils;
-import org.springframework.webflow.engine.AnnotatedAction;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.FlowAttributeMapper;
-import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
-import org.springframework.webflow.engine.State;
-import org.springframework.webflow.engine.TargetStateResolver;
-import org.springframework.webflow.engine.Transition;
-import org.springframework.webflow.engine.TransitionCriteria;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.engine.support.ActionTransitionCriteria;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.ScopeType;
-import org.springframework.webflow.execution.support.EventFactorySupport;
-
-/**
- * Base class for flow builders that programmatically build flows in Java configuration code.
- * 

- * To give you an example of what a simple Java-based web flow builder definition might look like, the following example
- * defines the 'dynamic' web flow roughly equivalent to the work flow statically implemented in Spring MVC's simple form
- * controller:
- * 
- * 
- * public class CustomerDetailFlowBuilder extends AbstractFlowBuilder {
- * 	public void buildStates() {
- * 		// get customer information
- * 		addActionState("getDetails", action("customerAction"), transition(on(success()), to("displayDetails")));
- * 
- * 		// view customer information               
- * 		addViewState("displayDetails", "customerDetails", transition(on(submit()), to("bindAndValidate")));
- * 
- * 		// bind and validate customer information updates 
- * 		addActionState("bindAndValidate", action("customerAction"), new Transition[] {
- * 				transition(on(error()), to("displayDetails")), transition(on(success()), to("finish")) });
- * 
- * 		// finish
- * 		addEndState("finish");
- * 	}
- * }
- * 

- * 
- * What this Java-based FlowBuilder implementation does is add four states to a flow. These include a "get"
- * ActionState (the start state), a ViewState state, a "bind and validate"
- * ActionState, and an end marker state (EndState).
- * 

- * The first state, an action state, will be assigned the indentifier getDetails. This action state will
- * automatically be configured with the following defaults:
- * 
    
- * 
  1. The action instance with id customerAction. This is the Action implementation
- * that will execute when this state is entered. In this example, that Action will go out to the DB, load
- * the Customer, and put it in the Flow's request context.
- * 
  2. A success transition to a default view state, called displayDetails. This means
- * when the Action returns a success result event (aka outcome), the
- * displayDetails state will be entered.
- * 
  3. It will act as the start state for this flow (by default, the first state added to a flow during the build
- * process is treated as the start state).
- * 

- * 

- * The second state, a view state, will be identified as displayDetails. This view state will
- * automatically be configured with the following defaults:
- * 
    
- * 
  1. A view name called customerDetails. This is the logical name of a view resource. This logical
- * view name gets mapped to a physical view resource (jsp, etc.) by the calling front controller (via a Spring view
- * resolver, or a Struts action forward, for example).
- * 
  2. A submit transition to a bind and validate action state, indentified by the default id
- * bindAndValidate. This means when a submit event is signaled by the view (for example,
- * on a submit button click), the bindAndValidate action state will be entered and the bindAndValidate
- * method of the customerAction Action implementation will be executed.
- * 

- * 

- * The third state, an action state, will be indentified as bindAndValidate. This action state will
- * automatically be configured with the following defaults:
- * 
    
- * 
  1. An action bean named customerAction -- this is the name of the Action
- * implementation exported in the application context that will execute when this state is entered. In this example, the
- * Action has a "bindAndValidate" method that will bind form input in the HTTP request to a backing
- * Customer form object, validate it, and update the DB.
- * 
  2. A success transition to a default end state, called finish. This means if the
- * Action returns a success result, the finish end state will be
- * transitioned to and the flow will terminate.
- * 
  3. An error transition back to the form view. This means if the Action returns an
- * error event, the 
- * displayDetails view state will be transitioned back to.
- * 

- * 

- * The fourth and last state, an end state, will be indentified with the default end state id finish.
- * This end state is a marker that signals the end of the flow. When entered, the flow session terminates, and if this
- * flow is acting as a root flow in the current flow execution, any flow-allocated resources will be cleaned up. An end
- * state can optionally be configured with a logical view name to forward to when entered. It will also trigger a state
- * transition in a resuming parent flow if this flow was participating as a spawned 'subflow' within a suspended parent
- * flow.
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public abstract class AbstractFlowBuilder extends BaseFlowBuilder {
-
-	/**
-	 * A helper for creating commonly used event identifiers that drive transitions created by this builder.
-	 */
-	private EventFactorySupport eventFactorySupport = new EventFactorySupport();
-
-	/**
-	 * Default constructor for subclassing.
-	 */
-	protected AbstractFlowBuilder() {
-		super();
-	}
-
-	/**
-	 * Create an instance of an abstract flow builder, using the specified locator to obtain needed flow services at
-	 * build time.
-	 * @param flowServiceLocator the locator for services needed by this builder to build its Flow
-	 */
-	protected AbstractFlowBuilder(FlowServiceLocator flowServiceLocator) {
-		super(flowServiceLocator);
-	}
-
-	/**
-	 * Returns the configured event factory support helper for creating commonly used event identifiers that drive
-	 * transitions created by this builder.
-	 */
-	public EventFactorySupport getEventFactorySupport() {
-		return eventFactorySupport;
-	}
-
-	/**
-	 * Sets the event factory support helper to use to create commonly used event identifiers that drive transitions
-	 * created by this builder.
-	 */
-	public void setEventFactorySupport(EventFactorySupport eventFactorySupport) {
-		this.eventFactorySupport = eventFactorySupport;
-	}
-
-	public void init(String flowId, AttributeMap attributes) throws FlowBuilderException {
-		setFlow(getFlowArtifactFactory().createFlow(flowId, flowAttributes().union(attributes)));
-		initBuilder();
-	}
-
-	/**
-	 * Hook subclasses may override to provide additional properties for the flow built by this builder. Returns a empty
-	 * collection by default.
-	 * @return additional properties describing the flow being built, should not return null
-	 */
-	protected AttributeMap flowAttributes() {
-		return CollectionUtils.EMPTY_ATTRIBUTE_MAP;
-	}
-
-	/**
-	 * Hook method subclasses can override to initialize the flow builder. Will be called by
-	 * {@link #init(String, AttributeMap)} after creating the initial Flow object. As a consequence, {@link #getFlow()}
-	 * can be called to retrieve the Flow object under construction.
-	 */
-	protected void initBuilder() {
-	}
-
-	// view state
-
-	/**
-	 * Adds a view state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param viewName the string-encoded view selector
-	 * @param transition the sole transition (path) out of this state
-	 * @return the fully constructed view state instance
-	 */
-	protected State addViewState(String stateId, String viewName, Transition transition) {
-		return getFlowArtifactFactory().createViewState(stateId, getFlow(), null, viewSelector(viewName), null,
-				new Transition[] { transition }, null, null, null);
-	}
-
-	/**
-	 * Adds a view state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param viewName the string-encoded view selector
-	 * @param transitions the transitions (paths) out of this state
-	 * @return the fully constructed view state instance
-	 */
-	protected State addViewState(String stateId, String viewName, Transition[] transitions) {
-		return getFlowArtifactFactory().createViewState(stateId, getFlow(), null, viewSelector(viewName), null,
-				transitions, null, null, null);
-	}
-
-	/**
-	 * Adds a view state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param viewName the string-encoded view selector
-	 * @param renderAction the action to execute on state entry and refresh; may be null
-	 * @param transition the sole transition (path) out of this state
-	 * @return the fully constructed view state instance
-	 */
-	protected State addViewState(String stateId, String viewName, Action renderAction, Transition transition) {
-		return getFlowArtifactFactory().createViewState(stateId, getFlow(), null, viewSelector(viewName),
-				new Action[] { renderAction }, new Transition[] { transition }, null, null, null);
-	}
-
-	/**
-	 * Adds a view state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param viewName the string-encoded view selector
-	 * @param renderAction the action to execute on state entry and refresh; may be null
-	 * @param transitions the transitions (paths) out of this state
-	 * @return the fully constructed view state instance
-	 */
-	protected State addViewState(String stateId, String viewName, Action renderAction, Transition[] transitions) {
-		return getFlowArtifactFactory().createViewState(stateId, getFlow(), null, viewSelector(viewName),
-				new Action[] { renderAction }, transitions, null, null, null);
-	}
-
-	/**
-	 * Adds a view state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param entryActions the actions to execute when the state is entered
-	 * @param viewSelector the view selector that will make the view selection when the state is entered
-	 * @param renderActions any 'render actions' to execute on state entry and refresh; may be null
-	 * @param transitions the transitions (path) out of this state
-	 * @param exceptionHandlers any exception handlers to attach to the state
-	 * @param exitActions the actions to execute when the state exits
-	 * @param attributes attributes to assign to the state that may be used to affect state construction and execution
-	 * @return the fully constructed view state instance
-	 */
-	protected State addViewState(String stateId, Action[] entryActions, ViewSelector viewSelector,
-			Action[] renderActions, Transition[] transitions, FlowExecutionExceptionHandler[] exceptionHandlers,
-			Action[] exitActions, AttributeMap attributes) {
-		return getFlowArtifactFactory().createViewState(stateId, getFlow(), entryActions, viewSelector, renderActions,
-				transitions, exceptionHandlers, exitActions, attributes);
-	}
-
-	// action state
-
-	/**
-	 * Adds an action state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param action the single action to execute when the state is entered
-	 * @param transition the single transition (path) out of this state
-	 * @return the fully constructed action state instance
-	 */
-	protected State addActionState(String stateId, Action action, Transition transition) {
-		return getFlowArtifactFactory().createActionState(stateId, getFlow(), null, new Action[] { action },
-				new Transition[] { transition }, null, null, null);
-	}
-
-	/**
-	 * Adds an action state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param action the single action to execute when the state is entered
-	 * @param transitions the transitions (paths) out of this state
-	 * @return the fully constructed action state instance
-	 */
-	protected State addActionState(String stateId, Action action, Transition[] transitions) {
-		return getFlowArtifactFactory().createActionState(stateId, getFlow(), null, new Action[] { action },
-				transitions, null, null, null);
-	}
-
-	/**
-	 * Adds an action state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param action the single action to execute when the state is entered
-	 * @param transition the single transition (path) out of this state
-	 * @param exceptionHandler the exception handler to handle exceptions thrown by the action
-	 * @return the fully constructed action state instance
-	 */
-	protected State addActionState(String stateId, Action action, Transition transition,
-			FlowExecutionExceptionHandler exceptionHandler) {
-		return getFlowArtifactFactory().createActionState(stateId, getFlow(), null, new Action[] { action },
-				new Transition[] { transition }, new FlowExecutionExceptionHandler[] { exceptionHandler }, null, null);
-	}
-
-	/**
-	 * Adds an action state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param entryActions any generic entry actions to add to the state
-	 * @param actions the actions to execute in a chain when the state is entered
-	 * @param transitions the transitions (paths) out of this state
-	 * @param exceptionHandlers the exception handlers to handle exceptions thrown by the actions
-	 * @param exitActions the exit actions to execute when the state exits
-	 * @param attributes attributes to assign to the state that may be used to affect state construction and execution
-	 * @return the fully constructed action state instance
-	 */
-	protected State addActionState(String stateId, Action[] entryActions, Action[] actions, Transition[] transitions,
-			FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeMap attributes) {
-		return getFlowArtifactFactory().createActionState(stateId, getFlow(), entryActions, actions, transitions,
-				exceptionHandlers, exitActions, attributes);
-	}
-
-	// decision state
-
-	/**
-	 * Adds a decision state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param transitions the transitions (paths) out of this state
-	 * @return the fully constructed decision state instance
-	 */
-	protected State addDecisionState(String stateId, Transition[] transitions) {
-		return getFlowArtifactFactory().createDecisionState(stateId, getFlow(), null, transitions, null, null, null);
-	}
-
-	/**
-	 * Adds a decision state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param decisionCriteria the criteria that defines the decision
-	 * @param trueStateId the target state on a "true" decision
-	 * @param falseStateId the target state on a "false" decision
-	 * @return the fully constructed decision state instance
-	 */
-	protected State addDecisionState(String stateId, TransitionCriteria decisionCriteria, String trueStateId,
-			String falseStateId) {
-		Transition thenTransition = getFlowArtifactFactory().createTransition(to(trueStateId), decisionCriteria, null,
-				null);
-		Transition elseTransition = getFlowArtifactFactory().createTransition(to(falseStateId), null, null, null);
-		return getFlowArtifactFactory().createDecisionState(stateId, getFlow(), null,
-				new Transition[] { thenTransition, elseTransition }, null, null, null);
-	}
-
-	/**
-	 * Adds a decision state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param entryActions the entry actions to execute when the state enters
-	 * @param transitions the transitions (paths) out of this state
-	 * @param exceptionHandlers the exception handlers to handle exceptions thrown by the state
-	 * @param exitActions the exit actions to execute when the state exits
-	 * @param attributes attributes to assign to the state that may be used to affect state construction and execution
-	 * @return the fully constructed decision state instance
-	 */
-	protected State addDecisionState(String stateId, Action[] entryActions, Transition[] transitions,
-			FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeMap attributes) {
-		return getFlowArtifactFactory().createDecisionState(stateId, getFlow(), entryActions, transitions,
-				exceptionHandlers, exitActions, attributes);
-	}
-
-	// subflow state
-
-	/**
-	 * Adds a subflow state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param subflow the flow that will act as the subflow
-	 * @param attributeMapper the mapper to map subflow input and output attributes
-	 * @param transition the single transition (path) out of the state
-	 * @return the fully constructed subflow state instance
-	 */
-	protected State addSubflowState(String stateId, Flow subflow, FlowAttributeMapper attributeMapper,
-			Transition transition) {
-		return getFlowArtifactFactory().createSubflowState(stateId, getFlow(), null, subflow, attributeMapper,
-				new Transition[] { transition }, null, null, null);
-	}
-
-	/**
-	 * Adds a subflow state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param subflow the flow that will act as the subflow
-	 * @param attributeMapper the mapper to map subflow input and output attributes
-	 * @param transitions the transitions (paths) out of the state
-	 * @return the fully constructed subflow state instance
-	 */
-	protected State addSubflowState(String stateId, Flow subflow, FlowAttributeMapper attributeMapper,
-			Transition[] transitions) {
-		return getFlowArtifactFactory().createSubflowState(stateId, getFlow(), null, subflow, attributeMapper,
-				transitions, null, null, null);
-	}
-
-	/**
-	 * Adds a subflow state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param entryActions the entry actions to execute when the state enters
-	 * @param subflow the flow that will act as the subflow
-	 * @param attributeMapper the mapper to map subflow input and output attributes
-	 * @param transitions the transitions (paths) out of this state
-	 * @param exceptionHandlers the exception handlers to handle exceptions thrown by the state
-	 * @param exitActions the exit actions to execute when the state exits
-	 * @param attributes attributes to assign to the state that may be used to affect state construction and execution
-	 * @return the fully constructed subflow state instance
-	 */
-	protected State addSubflowState(String stateId, Action[] entryActions, Flow subflow,
-			FlowAttributeMapper attributeMapper, Transition[] transitions,
-			FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeMap attributes) {
-		return getFlowArtifactFactory().createSubflowState(stateId, getFlow(), entryActions, subflow, attributeMapper,
-				transitions, exceptionHandlers, exitActions, attributes);
-	}
-
-	// end state
-
-	/**
-	 * Adds an end state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @return the fully constructed end state instance
-	 */
-	protected State addEndState(String stateId) {
-		return getFlowArtifactFactory().createEndState(stateId, getFlow(), null, null, null, null, null);
-	}
-
-	/**
-	 * Adds an end state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param viewName the string-encoded view selector
-	 * @return the fully constructed end state instance
-	 */
-	protected State addEndState(String stateId, String viewName) {
-		return getFlowArtifactFactory().createEndState(stateId, getFlow(), null, viewSelector(viewName), null, null,
-				null);
-	}
-
-	/**
-	 * Adds an end state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param viewName the string-encoded view selector
-	 * @param outputMapper the output mapper to map output attributes for the end state (a flow outcome)
-	 * @return the fully constructed end state instance
-	 */
-	protected State addEndState(String stateId, String viewName, AttributeMapper outputMapper) {
-		return getFlowArtifactFactory().createEndState(stateId, getFlow(), null, viewSelector(viewName), outputMapper,
-				null, null);
-	}
-
-	/**
-	 * Adds an end state to the flow built by this builder.
-	 * @param stateId the state identifier
-	 * @param entryActions the actions to execute when the state is entered
-	 * @param viewSelector the view selector that will make the view selection when the state is entered
-	 * @param outputMapper the output mapper to map output attributes for the end state (a flow outcome)
-	 * @param exceptionHandlers any exception handlers to attach to the state
-	 * @param attributes attributes to assign to the state that may be used to affect state construction and execution
-	 * @return the fully constructed end state instance
-	 */
-	protected State addEndState(String stateId, Action[] entryActions, ViewSelector viewSelector,
-			AttributeMapper outputMapper, FlowExecutionExceptionHandler[] exceptionHandlers, AttributeMap attributes) {
-		return getFlowArtifactFactory().createEndState(stateId, getFlow(), entryActions, viewSelector, outputMapper,
-				exceptionHandlers, attributes);
-	}
-
-	// helpers to create misc. flow artifacts
-
-	/**
-	 * Factory method that creates a view selector from an encoded view name. See {@link TextToViewSelector} for
-	 * information on the conversion rules.
-	 * @param viewName the encoded view selector
-	 * @return the view selector
-	 */
-	public ViewSelector viewSelector(String viewName) {
-		return (ViewSelector) fromStringTo(ViewSelector.class).execute(viewName);
-	}
-
-	/**
-	 * Resolves the action with the specified id. Simply looks the action up by id and returns it.
-	 * @param id the action id
-	 * @return the action
-	 * @throws FlowArtifactLookupException the action could not be resolved
-	 */
-	protected Action action(String id) throws FlowArtifactLookupException {
-		return getFlowServiceLocator().getAction(id);
-	}
-
-	/**
-	 * Creates a bean invoking action that invokes the method identified by the signature on the bean associated with
-	 * the action identifier.
-	 * @param beanId the id identifying an arbitrary java.lang.Object to be used as an action
-	 * @param methodSignature the signature of the method to invoke on the POJO
-	 * @return the adapted bean invoking action
-	 * @throws FlowArtifactLookupException the action could not be resolved
-	 */
-	protected Action action(String beanId, MethodSignature methodSignature) throws FlowArtifactLookupException {
-		return getBeanInvokingActionFactory().createBeanInvokingAction(beanId,
-				getFlowServiceLocator().getBeanFactory(), methodSignature, null,
-				getFlowServiceLocator().getConversionService(), null);
-	}
-
-	/**
-	 * Creates a bean invoking action that invokes the method identified by the signature on the bean associated with
-	 * the action identifier.
-	 * @param beanId the id identifying an arbitrary java.lang.Object to be used as an action
-	 * @param methodSignature the signature of the method to invoke on the POJO
-	 * @return the adapted bean invoking action
-	 * @throws FlowArtifactLookupException the action could not be resolved
-	 */
-	protected Action action(String beanId, MethodSignature methodSignature, ActionResultExposer resultExposer)
-			throws FlowArtifactLookupException {
-		return getBeanInvokingActionFactory().createBeanInvokingAction(beanId,
-				getFlowServiceLocator().getBeanFactory(), methodSignature, resultExposer,
-				getFlowServiceLocator().getConversionService(), null);
-	}
-
-	/**
-	 * Creates an evaluate action that evaluates the expression when executed.
-	 * @param expression the expression to evaluate
-	 */
-	protected Action action(Expression expression) {
-		return action(expression, null);
-	}
-
-	/**
-	 * Creates an evaluate action that evaluates the expression when executed.
-	 * @param expression the expression to evaluate
-	 * @param resultExposer the evaluation result exposer
-	 */
-	protected Action action(Expression expression, ActionResultExposer resultExposer) {
-		return new EvaluateAction(expression, resultExposer);
-	}
-
-	/**
-	 * Parses the expression string into an evaluatable {@link Expression} object.
-	 * @param expressionString the expression string, e.g. flowScope.order.number
-	 * @return the evaluatable expression
-	 */
-	protected Expression expression(String expressionString) {
-		return getFlowServiceLocator().getExpressionParser().parseExpression(expressionString);
-	}
-
-	/**
-	 * Parses the expression string into a settable {@link Expression} object.
-	 * @param expressionString the expression string, e.g. flowScope.order.number
-	 * @return the evaluatable expression
-	 * @since 1.0.2
-	 */
-	protected SettableExpression settableExpression(String expressionString) {
-		return getFlowServiceLocator().getExpressionParser().parseSettableExpression(expressionString);
-	}
-
-	/**
-	 * Convert the encoded method signature string to a {@link MethodSignature} object. Method signatures are used to
-	 * match methods on POJO services to invoke on a {@link AbstractBeanInvokingAction bean invoking action}.
-	 * 

-	 * Encoded method signature format:
-	 * 
-	 * Method without arguments:
-	 * 
-	 * 
-	 *       ${methodName}
-	 * 

-	 * 
-	 * Method with arguments:
-	 * 
-	 * 
-	 *       ${methodName}(${arg1}, ${arg2}, ${arg n})
-	 * 

-	 * 
-	 * @param method the encoded method signature
-	 * @return the method signature
-	 * @see #action(String, MethodSignature, ActionResultExposer)
-	 */
-	protected MethodSignature method(String method) {
-		return (MethodSignature) fromStringTo(MethodSignature.class).execute(method);
-	}
-
-	/**
-	 * Factory method for a {@link ActionResultExposer result exposer}. A result exposer is used to expose an action
-	 * result such as a method return value or expression evaluation result to the calling flow.
-	 * @param resultName the result name
-	 * @return the result exposer
-	 * @see #action(String, MethodSignature, ActionResultExposer)
-	 */
-	protected ActionResultExposer result(String resultName) {
-		return result(resultName, ScopeType.REQUEST);
-	}
-
-	/**
-	 * Factory method for a {@link ActionResultExposer result exposer}. A result exposer is used to expose an action
-	 * result such as a method return value or expression evaluation result to the calling flow.
-	 * @param resultName the result name
-	 * @param resultScope the scope of the result
-	 * @return the result exposer
-	 * @see #action(String, MethodSignature, ActionResultExposer)
-	 */
-	protected ActionResultExposer result(String resultName, ScopeType resultScope) {
-		return new ActionResultExposer(resultName, resultScope);
-	}
-
-	/**
-	 * Wrap given action in an {@link AnnotatedAction}} to be able to annotate it with attributes.
-	 * @param action the action to annotate
-	 * @return the wrapped action
-	 * @since 1.0.4
-	 */
-	protected AnnotatedAction annotate(Action action) {
-		if (action instanceof AnnotatedAction) {
-			return (AnnotatedAction) action;
-		} else {
-			return new AnnotatedAction(action);
-		}
-	}
-
-	/**
-	 * Creates an annotated action decorator that instructs the specified method be invoked on the multi action when it
-	 * is executed. Use this when working with MultiActions to specify the method on the MultiAction to invoke for a
-	 * particular usage scenario. Use the {@link #method(String)} factory method when working with
-	 * {@link AbstractBeanInvokingAction bean invoking actions}.
-	 * @param methodName the name of the method on the multi action instance
-	 * @param multiAction the multi action
-	 * @return the annotated action that when invoked sets up a context property used by the multi action to instruct it
-	 * with what method to invoke
-	 * @since 1.0.4
-	 */
-	protected AnnotatedAction invoke(String methodName, Action multiAction) {
-		AnnotatedAction annotatedAction;
-		if (multiAction instanceof AnnotatedAction) {
-			// already wrapped in an AnnotatedAction
-			annotatedAction = (AnnotatedAction) multiAction;
-		} else {
-			annotatedAction = new AnnotatedAction(multiAction);
-		}
-		annotatedAction.setMethod(methodName);
-		return annotatedAction;
-	}
-
-	/**
-	 * Creates an annotated action decorator that instructs the specified method be invoked on the multi action when it
-	 * is executed. Use this when working with MultiActions to specify the method on the MultiAction to invoke for a
-	 * particular usage scenario. Use the {@link #method(String)} factory method when working with
-	 * {@link AbstractBeanInvokingAction bean invoking actions}.
-	 * @param methodName the name of the method on the multi action instance
-	 * @param multiAction the multi action
-	 * @return the annotated action that when invoked sets up a context property used by the multi action to instruct it
-	 * with what method to invoke
-	 */
-	protected AnnotatedAction invoke(String methodName, MultiAction multiAction) throws FlowArtifactLookupException {
-		return invoke(methodName, (Action) multiAction);
-	}
-
-	/**
-	 * Creates an annotated action decorator that makes the given action an named action.
-	 * @param name the action name
-	 * @param action the action to name
-	 * @return the annotated named action
-	 */
-	protected AnnotatedAction name(String name, Action action) {
-		AnnotatedAction annotatedAction;
-		if (action instanceof AnnotatedAction) {
-			// already wrapped in an AnnotatedAction
-			annotatedAction = (AnnotatedAction) action;
-		} else {
-			annotatedAction = new AnnotatedAction(action);
-		}
-		annotatedAction.setName(name);
-		return annotatedAction;
-	}
-
-	/**
-	 * Request that the attribute mapper with the specified name be used to map attributes between a parent flow and a
-	 * spawning subflow when the subflow state being constructed is entered.
-	 * @param id the id of the attribute mapper that will map attributes between the flow built by this builder and the
-	 * subflow
-	 * @return the attribute mapper
-	 * @throws FlowArtifactLookupException no FlowAttributeMapper implementation was exported with the specified id
-	 */
-	protected FlowAttributeMapper attributeMapper(String id) throws FlowArtifactLookupException {
-		return getFlowServiceLocator().getAttributeMapper(id);
-	}
-
-	/**
-	 * Request that the Flow with the specified flowId be spawned as a subflow when the subflow state
-	 * being built is entered. Simply resolves the subflow definition by id and returns it; throwing a fail-fast
-	 * exception if it does not exist.
-	 * @param id the flow definition id
-	 * @return the flow to be used as a subflow, this should be passed to a addSubflowState call
-	 * @throws FlowArtifactLookupException when the flow cannot be resolved
-	 */
-	protected Flow flow(String id) throws FlowArtifactLookupException {
-		return getFlowServiceLocator().getSubflow(id);
-	}
-
-	/**
-	 * Creates a transition criteria that is used to match a Transition. The criteria is based on the provided
-	 * expression string.
-	 * @param transitionCriteriaExpression the transition criteria expression, typically simply a static event
-	 * identifier (e.g. "submit")
-	 * @return the transition criteria
-	 * @see TextToTransitionCriteria
-	 */
-	protected TransitionCriteria on(String transitionCriteriaExpression) {
-		return (TransitionCriteria) fromStringTo(TransitionCriteria.class).execute(transitionCriteriaExpression);
-	}
-
-	/**
-	 * Creates a target state resolver for the given state id expression.
-	 * @param targetStateIdExpression the target state id expression
-	 * @return the target state resolver
-	 * @see TextToTargetStateResolver
-	 */
-	protected TargetStateResolver to(String targetStateIdExpression) {
-		return (TargetStateResolver) fromStringTo(TargetStateResolver.class).execute(targetStateIdExpression);
-	}
-
-	/**
-	 * Creates a new transition.
-	 * @param matchingCriteria the criteria that determines when the transition matches
-	 * @param targetStateResolver the resolver of the transition's target state
-	 * @return the transition
-	 */
-	protected Transition transition(TransitionCriteria matchingCriteria, TargetStateResolver targetStateResolver) {
-		return getFlowArtifactFactory().createTransition(targetStateResolver, matchingCriteria, null, null);
-	}
-
-	/**
-	 * Creates a new transition.
-	 * @param matchingCriteria the criteria that determines when the transition matches
-	 * @param targetStateResolver the resolver of the transition's target state
-	 * @param executionCriteria the criteria that determines if a matched transition is allowed to execute
-	 * @return the transition
-	 */
-	protected Transition transition(TransitionCriteria matchingCriteria, TargetStateResolver targetStateResolver,
-			TransitionCriteria executionCriteria) {
-		return getFlowArtifactFactory()
-				.createTransition(targetStateResolver, matchingCriteria, executionCriteria, null);
-	}
-
-	/**
-	 * Creates a new transition.
-	 * @param matchingCriteria the criteria that determines when the transition matches
-	 * @param targetStateResolver the resolver of the transition's target state
-	 * @param executionCriteria the criteria that determines if a matched transition is allowed to execute
-	 * @param attributes transition attributes
-	 * @return the transition
-	 */
-	protected Transition transition(TransitionCriteria matchingCriteria, TargetStateResolver targetStateResolver,
-			TransitionCriteria executionCriteria, AttributeMap attributes) {
-		return getFlowArtifactFactory().createTransition(targetStateResolver, matchingCriteria, executionCriteria,
-				attributes);
-	}
-
-	/**
-	 * Creates a TransitionCriteria that will execute the specified action when the Transition is
-	 * executed but before the transition's target state is entered.
-	 * 

-	 * This criteria will only allow the Transition to complete execution if the Action completes successfully.
-	 * @param action the action to execute after a transition is matched but before it transitions to its target state
-	 * @return the transition execution criteria
-	 */
-	protected TransitionCriteria ifReturnedSuccess(Action action) {
-		return new ActionTransitionCriteria(action);
-	}
-
-	/**
-	 * Creates the success event id. "Success" indicates that an action completed successfuly.
-	 * @return the event id
-	 */
-	protected String success() {
-		return eventFactorySupport.getSuccessEventId();
-	}
-
-	/**
-	 * Creates the error event id. "Error" indicates that an action completed with an error status.
-	 * @return the event id
-	 */
-	protected String error() {
-		return eventFactorySupport.getErrorEventId();
-	}
-
-	/**
-	 * Creates the submit event id. "Submit" indicates the user submitted a request (form) for
-	 * processing.
-	 * @return the event id
-	 */
-	protected String submit() {
-		return "submit";
-	}
-
-	/**
-	 * Creates the back event id. "Back" indicates the user wants to go to the previous step in the flow.
-	 * @return the event id
-	 */
-	protected String back() {
-		return "back";
-	}
-
-	/**
-	 * Creates the cancel event id. "Cancel" indicates the flow was aborted because the user changed
-	 * their mind.
-	 * @return the event id
-	 */
-	protected String cancel() {
-		return "cancel";
-	}
-
-	/**
-	 * Creates the finish event id. "Finish" indicates the flow has finished processing.
-	 * @return the event id
-	 */
-	protected String finish() {
-		return "finish";
-	}
-
-	/**
-	 * Creates the select event id. "Select" indicates an object was selected for processing or display.
-	 * @return the event id
-	 */
-	protected String select() {
-		return "select";
-	}
-
-	/**
-	 * Creates the edit event id. "Edit" indicates an object was selected for creation or updating.
-	 * @return the event id
-	 */
-	protected String edit() {
-		return "edit";
-	}
-
-	/**
-	 * Creates the add event id. "Add" indicates a child object is being added to a parent collection.
-	 * @return the event id
-	 */
-	protected String add() {
-		return "add";
-	}
-
-	/**
-	 * Creates the delete event id. "Delete" indicates a object is being removed.
-	 * @return the event id
-	 */
-	protected String delete() {
-		return "delete";
-	}
-
-	/**
-	 * Creates the yes event id. "Yes" indicates a true result was returned.
-	 * @return the event id
-	 */
-	protected String yes() {
-		return eventFactorySupport.getYesEventId();
-	}
-
-	/**
-	 * Creates the no event id. "False" indicates a false result was returned.
-	 * @return the event id
-	 */
-	protected String no() {
-		return eventFactorySupport.getNoEventId();
-	}
-
-	/**
-	 * Factory method that returns a new, fully configured mapping builder to assist with building {@link Mapping}
-	 * objects used by a {@link FlowAttributeMapper} to map attributes.
-	 * @return the mapping builder
-	 */
-	protected MappingBuilder mapping() {
-		MappingBuilder mapping = new MappingBuilder(getFlowServiceLocator().getExpressionParser());
-		mapping.setConversionService(getFlowServiceLocator().getConversionService());
-		return mapping;
-	}
-
-	public String toString() {
-		return new ToStringCreator(this).toString();
-	}
-
-	// internal helpers
-
-	private FlowArtifactFactory getFlowArtifactFactory() {
-		return getFlowServiceLocator().getFlowArtifactFactory();
-	}
-
-	private BeanInvokingActionFactory getBeanInvokingActionFactory() {
-		return getFlowServiceLocator().getBeanInvokingActionFactory();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/BaseFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/BaseFlowBuilder.java
deleted file mode 100644
index 4742e67e..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/BaseFlowBuilder.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.binding.convert.ConversionException;
-import org.springframework.binding.convert.ConversionExecutor;
-import org.springframework.util.Assert;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.engine.Flow;
-
-/**
- * Abstract base implementation of a flow builder defining common functionality needed by most concrete flow builder
- * implementations. This class implements all optional parts of the FlowBuilder process as no-op methods. Subclasses are
- * only required to implement {@link #init(String, AttributeMap)} and {@link #buildStates()}.
- * 

- * This class also provides a {@link FlowServiceLocator} for use by subclasses in the flow construction process.
- * 
- * @see org.springframework.webflow.engine.builder.FlowServiceLocator
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public abstract class BaseFlowBuilder implements FlowBuilder {
-
-	/**
-	 * The Flow built by this builder.
-	 */
-	private Flow flow;
-
-	/**
-	 * Locates actions, attribute mappers, and other artifacts needed by the flow built by this builder.
-	 */
-	private FlowServiceLocator flowServiceLocator;
-
-	/**
-	 * Default constructor for subclassing. Sets up use of a {@link BaseFlowServiceLocator}.
-	 * @see #setFlowServiceLocator(FlowServiceLocator)
-	 */
-	protected BaseFlowBuilder() {
-		setFlowServiceLocator(new BaseFlowServiceLocator());
-	}
-
-	/**
-	 * Creates a flow builder using the given locator to link in artifacts.
-	 * @param flowServiceLocator the locator for services needed by this builder to build its Flow
-	 */
-	protected BaseFlowBuilder(FlowServiceLocator flowServiceLocator) {
-		setFlowServiceLocator(flowServiceLocator);
-	}
-
-	/**
-	 * Returns the configured flow service locator.
-	 */
-	public FlowServiceLocator getFlowServiceLocator() {
-		return flowServiceLocator;
-	}
-
-	/**
-	 * Sets the flow service locator to use. Defaults to {@link BaseFlowServiceLocator}.
-	 */
-	public void setFlowServiceLocator(FlowServiceLocator flowServiceLocator) {
-		Assert.notNull(flowServiceLocator, "The flow service locator is required");
-		this.flowServiceLocator = flowServiceLocator;
-	}
-
-	/**
-	 * Set the flow being built by this builder. Typically called during initialization to set the initial flow
-	 * reference returned by {@link #getFlow()} after building.
-	 */
-	protected void setFlow(Flow flow) {
-		this.flow = flow;
-	}
-
-	public abstract void init(String flowId, AttributeMap attributes) throws FlowBuilderException;
-
-	public void buildVariables() throws FlowBuilderException {
-	}
-
-	public void buildInputMapper() throws FlowBuilderException {
-	}
-
-	public void buildStartActions() throws FlowBuilderException {
-	}
-
-	public void buildInlineFlows() throws FlowBuilderException {
-	}
-
-	public abstract void buildStates() throws FlowBuilderException;
-
-	public void buildGlobalTransitions() throws FlowBuilderException {
-	}
-
-	public void buildEndActions() throws FlowBuilderException {
-	}
-
-	public void buildOutputMapper() throws FlowBuilderException {
-	}
-
-	public void buildExceptionHandlers() throws FlowBuilderException {
-	}
-
-	/**
-	 * Get the flow (result) built by this builder.
-	 */
-	public Flow getFlow() {
-		return flow;
-	}
-
-	public void dispose() {
-		setFlow(null);
-	}
-
-	// helpers for use in subclasses
-
-	/**
-	 * Returns a conversion executor capable of converting string objects to the target class aliased by the provided
-	 * alias.
-	 * @param targetAlias the target class alias, e.g. "long" or "float"
-	 * @return the conversion executor, or null if no suitable converter exists for given alias
-	 */
-	protected ConversionExecutor fromStringTo(String targetAlias) {
-		return getFlowServiceLocator().getConversionService().getConversionExecutorByTargetAlias(String.class,
-				targetAlias);
-	}
-
-	/**
-	 * Returns a converter capable of converting a string value to the given type.
-	 * @param targetType the type you wish to convert to (from a string)
-	 * @return the converter
-	 * @throws ConversionException when the converter cannot be found
-	 */
-	protected ConversionExecutor fromStringTo(Class targetType) throws ConversionException {
-		return getFlowServiceLocator().getConversionService().getConversionExecutor(String.class, targetType);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/BaseFlowServiceLocator.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/BaseFlowServiceLocator.java
deleted file mode 100644
index 1dd29ece..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/BaseFlowServiceLocator.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.binding.convert.ConversionService;
-import org.springframework.binding.convert.support.CompositeConversionService;
-import org.springframework.binding.convert.support.DefaultConversionService;
-import org.springframework.binding.convert.support.GenericConversionService;
-import org.springframework.binding.convert.support.TextToExpression;
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.binding.method.TextToMethodSignature;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.Assert;
-import org.springframework.webflow.action.BeanInvokingActionFactory;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.FlowAttributeMapper;
-import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
-import org.springframework.webflow.engine.State;
-import org.springframework.webflow.engine.TargetStateResolver;
-import org.springframework.webflow.engine.TransitionCriteria;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.execution.Action;
-
-/**
- * Base implementation that implements a minimal set of the FlowServiceLocator interface, throwing
- * unsupported operation exceptions for some operations.
- * 

- * May be subclassed to offer additional factory/lookup support.
- * 
- * @author Keith Donald
- */
-public class BaseFlowServiceLocator implements FlowServiceLocator {
-
-	/**
-	 * The factory encapsulating the creation of central Flow artifacts such as {@link Flow flows} and
-	 * {@link State states}.
-	 */
-	private FlowArtifactFactory flowArtifactFactory = new FlowArtifactFactory();
-
-	/**
-	 * The factory encapsulating the creation of bean invoking actions, actions that adapt methods on objects to the
-	 * {@link Action} interface.
-	 */
-	private BeanInvokingActionFactory beanInvokingActionFactory = new BeanInvokingActionFactory();
-
-	/**
-	 * The parser for parsing expression strings into evaluatable expression objects.
-	 */
-	private ExpressionParser expressionParser = DefaultExpressionParserFactory.getExpressionParser();
-
-	/**
-	 * The conversion service configured by the user (none by default).
-	 */
-	private ConversionService userConversionService = null;
-
-	/**
-	 * A conversion service that can convert between types.
-	 */
-	private ConversionService conversionService = createConversionService(userConversionService);
-
-	/**
-	 * A resource loader that can load resources.
-	 */
-	private ResourceLoader resourceLoader = new DefaultResourceLoader();
-
-	/**
-	 * Sets the factory encapsulating the creation of central Flow artifacts such as {@link Flow flows} and
-	 * {@link State states}.
-	 */
-	public void setFlowArtifactFactory(FlowArtifactFactory flowArtifactFactory) {
-		Assert.notNull(flowArtifactFactory, "The flow artifact factory is required");
-		this.flowArtifactFactory = flowArtifactFactory;
-	}
-
-	/**
-	 * Sets the factory for creating bean invoking actions, actions that adapt methods on objects to the {@link Action}
-	 * interface.
-	 */
-	public void setBeanInvokingActionFactory(BeanInvokingActionFactory beanInvokingActionFactory) {
-		Assert.notNull(beanInvokingActionFactory, "The bean invoking action factory is required");
-		this.beanInvokingActionFactory = beanInvokingActionFactory;
-	}
-
-	/**
-	 * Set the expression parser responsible for parsing expression strings into evaluatable expression objects.
-	 */
-	public void setExpressionParser(ExpressionParser expressionParser) {
-		Assert.notNull(expressionParser, "The expression parser is required");
-		this.expressionParser = expressionParser;
-		// this has impact on the TextToExpression converter in the conversion service!
-		this.conversionService = createConversionService(userConversionService);
-	}
-
-	/**
-	 * Set the conversion service to use to convert between types; typically from string to a rich object type.
-	 */
-	public void setConversionService(ConversionService userConversionService) {
-		Assert.notNull(userConversionService, "The conversion service is required");
-		this.userConversionService = userConversionService;
-		this.conversionService = createConversionService(userConversionService);
-	}
-
-	/**
-	 * Set the resource loader to load file-based resources from string-encoded paths. This is optional.
-	 */
-	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourceLoader = resourceLoader;
-	}
-
-	public Flow getSubflow(String id) throws FlowArtifactLookupException {
-		throw new FlowArtifactLookupException(id, Flow.class, "Subflow lookup is not supported by this service locator");
-	}
-
-	public Action getAction(String id) throws FlowArtifactLookupException {
-		return (Action) getBean(id, Action.class);
-	}
-
-	public FlowAttributeMapper getAttributeMapper(String id) throws FlowArtifactLookupException {
-		return (FlowAttributeMapper) getBean(id, FlowAttributeMapper.class);
-	}
-
-	public TransitionCriteria getTransitionCriteria(String id) throws FlowArtifactLookupException {
-		return (TransitionCriteria) getBean(id, TransitionCriteria.class);
-	}
-
-	public TargetStateResolver getTargetStateResolver(String id) throws FlowArtifactLookupException {
-		return (TargetStateResolver) getBean(id, TargetStateResolver.class);
-	}
-
-	public ViewSelector getViewSelector(String id) throws FlowArtifactLookupException {
-		return (ViewSelector) getBean(id, ViewSelector.class);
-	}
-
-	public FlowExecutionExceptionHandler getExceptionHandler(String id) throws FlowArtifactLookupException {
-		return (FlowExecutionExceptionHandler) getBean(id, FlowExecutionExceptionHandler.class);
-	}
-
-	public FlowArtifactFactory getFlowArtifactFactory() {
-		return flowArtifactFactory;
-	}
-
-	public BeanInvokingActionFactory getBeanInvokingActionFactory() {
-		return beanInvokingActionFactory;
-	}
-
-	public BeanFactory getBeanFactory() throws UnsupportedOperationException {
-		throw new UnsupportedOperationException("Bean factory lookup is not supported by this service locator");
-	}
-
-	public ResourceLoader getResourceLoader() {
-		return resourceLoader;
-	}
-
-	public ExpressionParser getExpressionParser() {
-		return expressionParser;
-	}
-
-	public ConversionService getConversionService() {
-		return conversionService;
-	}
-
-	// helpers for use by subclasses
-
-	/**
-	 * Helper method for determining if the configured bean factory contains the provided bean.
-	 * @param id the id of the bean
-	 * @return true if yes, false otherwise
-	 */
-	protected boolean containsBean(String id) {
-		return getBeanFactory().containsBean(id);
-	}
-
-	/**
-	 * Helper method to lookup the bean representing a flow artifact of the specified type.
-	 * @param id the bean id
-	 * @param artifactType the bean type
-	 * @return the bean
-	 * @throws FlowArtifactLookupException an exception occurred
-	 */
-	protected Object getBean(String id, Class artifactType) throws FlowArtifactLookupException {
-		try {
-			return getBeanFactory().getBean(id, artifactType);
-		} catch (BeansException e) {
-			throw new FlowArtifactLookupException(id, artifactType, e);
-		}
-	}
-
-	/**
-	 * Helper method to lookup the type of the bean with the provided id.
-	 * @param id the bean id
-	 * @param artifactType the bean type
-	 * @return the bean's type
-	 * @throws FlowArtifactLookupException an exception occurred
-	 */
-	protected Class getBeanType(String id, Class artifactType) throws FlowArtifactLookupException {
-		try {
-			return getBeanFactory().getType(id);
-		} catch (BeansException e) {
-			throw new FlowArtifactLookupException(id, artifactType, e);
-		}
-	}
-
-	/**
-	 * Setup a conversion service used by this flow service locator.
-	 * @param userConversionService a user supplied conversion service, optional
-	 * @return the newly created conversion service
-	 */
-	protected ConversionService createConversionService(ConversionService userConversionService) {
-		DefaultConversionService defaultConversionService = new DefaultConversionService();
-		addWebFlowConverters(defaultConversionService);
-		if (userConversionService != null) {
-			return new CompositeConversionService(new ConversionService[] { userConversionService,
-					defaultConversionService });
-		} else {
-			return defaultConversionService;
-		}
-	}
-
-	/**
-	 * Add all web flow specific converters to given conversion service.
-	 */
-	protected void addWebFlowConverters(GenericConversionService conversionService) {
-		conversionService.addConverter(new TextToTransitionCriteria(this));
-		conversionService.addConverter(new TextToTargetStateResolver(this));
-		conversionService.addConverter(new TextToViewSelector(this));
-		conversionService.addConverter(new TextToExpression(getExpressionParser()));
-		conversionService.addConverter(new TextToMethodSignature(conversionService));
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/DefaultFlowServiceLocator.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/DefaultFlowServiceLocator.java
deleted file mode 100644
index 1da5f54e..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/DefaultFlowServiceLocator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.util.Assert;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
-import org.springframework.webflow.engine.Flow;
-
-/**
- * The default flow service locator implementation that obtains subflow definitions from a dedicated
- * {@link FlowDefinitionRegistry} and obtains the remaining services from a generic Spring {@link BeanFactory}.
- * 
- * @see FlowDefinitionRegistry
- * @see FlowServiceLocator#getSubflow(String)
- * @see BeanFactory
- * 
- * @author Keith Donald
- */
-public class DefaultFlowServiceLocator extends BaseFlowServiceLocator {
-
-	/**
-	 * The registry for locating subflows.
-	 */
-	private FlowDefinitionRegistry subflowRegistry;
-
-	/**
-	 * The Spring bean factory used.
-	 */
-	private BeanFactory beanFactory;
-
-	/**
-	 * Creates a flow service locator that retrieves subflows from the provided registry and additional artifacts from
-	 * the provided bean factory.
-	 * @param subflowRegistry the registry for loading subflows
-	 * @param beanFactory the spring bean factory
-	 */
-	public DefaultFlowServiceLocator(FlowDefinitionRegistry subflowRegistry, BeanFactory beanFactory) {
-		Assert.notNull(subflowRegistry, "The subflow registry is required");
-		Assert.notNull(beanFactory, "The bean factory is required");
-		this.subflowRegistry = subflowRegistry;
-		this.beanFactory = beanFactory;
-	}
-
-	/**
-	 * Convenience flow service locator constructor that looks up a flow definition registry using given bean id in
-	 * given bean factory. The registry is used to retrieve subflows. All additional artifacts are looked up in the
-	 * provided bean factory.
-	 * @param subflowRegistryBeanId the bean id of the subflow FlowDefinitionRegistry
-	 * @param beanFactory the Spring bean factory
-	 * @since 1.0.2
-	 */
-	public DefaultFlowServiceLocator(String subflowRegistryBeanId, BeanFactory beanFactory) {
-		Assert.notNull(subflowRegistryBeanId, "The subflow registry bean id is required");
-		Assert.notNull(beanFactory, "The bean factory is required");
-		this.subflowRegistry = (FlowDefinitionRegistry) beanFactory.getBean(subflowRegistryBeanId,
-				FlowDefinitionRegistry.class);
-		this.beanFactory = beanFactory;
-	}
-
-	public Flow getSubflow(String id) throws FlowArtifactLookupException {
-		try {
-			return (Flow) subflowRegistry.getFlowDefinition(id);
-		} catch (NoSuchFlowDefinitionException e) {
-			throw new FlowArtifactLookupException(id, Flow.class, "Could not locate subflow definition with id '" + id
-					+ "'", e);
-		}
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	/**
-	 * Returns the flow definition registry used to lookup subflows.
-	 * @return the flow definition registry
-	 */
-	protected FlowDefinitionRegistry getSubflowRegistry() {
-		return subflowRegistry;
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowArtifactFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowArtifactFactory.java
index 990fa475..202c92ba 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowArtifactFactory.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowArtifactFactory.java
@@ -29,9 +29,9 @@ import org.springframework.webflow.engine.TargetStateResolver;
 import org.springframework.webflow.engine.Transition;
 import org.springframework.webflow.engine.TransitionCriteria;
 import org.springframework.webflow.engine.TransitionableState;
-import org.springframework.webflow.engine.ViewSelector;
 import org.springframework.webflow.engine.ViewState;
 import org.springframework.webflow.execution.Action;
+import org.springframework.webflow.execution.ViewFactory;
 
 /**
  * A factory for core web flow elements such as {@link Flow flows}, {@link State states}, and
@@ -55,12 +55,9 @@ public class FlowArtifactFactory {
 	 * @param attributes attributes to assign to the Flow, which may also be used to affect flow construction; may be
 	 * null
 	 * @return the initial flow instance, ready for assembly by a FlowBuilder
-	 * @throws FlowArtifactLookupException an exception occured creating the Flow instance
 	 */
-	public Flow createFlow(String id, AttributeMap attributes) throws FlowArtifactLookupException {
-		Flow flow = new Flow(id);
-		flow.getAttributeMap().putAll(attributes);
-		return flow;
+	public Flow createFlow(String id, AttributeMap attributes) {
+		return Flow.create(id, attributes);
 	}
 
 	/**
@@ -70,7 +67,8 @@ public class FlowArtifactFactory {
 	 * @param id the identifier to assign to the state, must be unique to its owning flow (required)
 	 * @param flow the flow that will own (contain) this state (required)
 	 * @param entryActions any state entry actions; may be null
-	 * @param viewSelector the state view selector strategy; may be null
+	 * @param viewFactory the state view factory strategy
+	 * @param redirect whether to send a flow execution redirect before rendering
 	 * @param renderActions any 'render actions' to execute on entry and refresh; may be null
 	 * @param transitions any transitions (paths) out of this state; may be null
 	 * @param exceptionHandlers any exception handlers; may be null
@@ -78,15 +76,12 @@ public class FlowArtifactFactory {
 	 * @param attributes attributes to assign to the State, which may also be used to affect state construction; may be
 	 * null
 	 * @return the fully initialized view state instance
-	 * @throws FlowArtifactLookupException an exception occured creating the state
 	 */
-	public State createViewState(String id, Flow flow, Action[] entryActions, ViewSelector viewSelector,
-			Action[] renderActions, Transition[] transitions, FlowExecutionExceptionHandler[] exceptionHandlers,
-			Action[] exitActions, AttributeMap attributes) throws FlowArtifactLookupException {
-		ViewState viewState = new ViewState(flow, id);
-		if (viewSelector != null) {
-			viewState.setViewSelector(viewSelector);
-		}
+	public State createViewState(String id, Flow flow, Action[] entryActions, ViewFactory viewFactory,
+			boolean redirect, Action[] renderActions, Transition[] transitions,
+			FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeMap attributes) {
+		ViewState viewState = new ViewState(flow, id, viewFactory);
+		viewState.setRedirect(redirect);
 		viewState.getRenderActionList().addAll(renderActions);
 		configureCommonProperties(viewState, entryActions, transitions, exceptionHandlers, exitActions, attributes);
 		return viewState;
@@ -106,11 +101,10 @@ public class FlowArtifactFactory {
 	 * @param attributes attributes to assign to the State, which may also be used to affect state construction; may be
 	 * null
 	 * @return the fully initialized action state instance
-	 * @throws FlowArtifactLookupException an exception occured creating the state
 	 */
 	public State createActionState(String id, Flow flow, Action[] entryActions, Action[] actions,
 			Transition[] transitions, FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions,
-			AttributeMap attributes) throws FlowArtifactLookupException {
+			AttributeMap attributes) {
 		ActionState actionState = new ActionState(flow, id);
 		actionState.getActionList().addAll(actions);
 		configureCommonProperties(actionState, entryActions, transitions, exceptionHandlers, exitActions, attributes);
@@ -130,11 +124,9 @@ public class FlowArtifactFactory {
 	 * @param attributes attributes to assign to the State, which may also be used to affect state construction; may be
 	 * null
 	 * @return the fully initialized decision state instance
-	 * @throws FlowArtifactLookupException an exception occured creating the state
 	 */
 	public State createDecisionState(String id, Flow flow, Action[] entryActions, Transition[] transitions,
-			FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeMap attributes)
-			throws FlowArtifactLookupException {
+			FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeMap attributes) {
 		DecisionState decisionState = new DecisionState(flow, id);
 		configureCommonProperties(decisionState, entryActions, transitions, exceptionHandlers, exitActions, attributes);
 		return decisionState;
@@ -155,12 +147,10 @@ public class FlowArtifactFactory {
 	 * @param attributes attributes to assign to the State, which may also be used to affect state construction; may be
 	 * null
 	 * @return the fully initialized subflow state instance
-	 * @throws FlowArtifactLookupException an exception occured creating the state
 	 */
 	public State createSubflowState(String id, Flow flow, Action[] entryActions, Flow subflow,
 			FlowAttributeMapper attributeMapper, Transition[] transitions,
-			FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeMap attributes)
-			throws FlowArtifactLookupException {
+			FlowExecutionExceptionHandler[] exceptionHandlers, Action[] exitActions, AttributeMap attributes) {
 		SubflowState subflowState = new SubflowState(flow, id, subflow);
 		if (attributeMapper != null) {
 			subflowState.setAttributeMapper(attributeMapper);
@@ -176,20 +166,18 @@ public class FlowArtifactFactory {
 	 * @param id the identifier to assign to the state, must be unique to its owning flow (required)
 	 * @param flow the flow that will own (contain) this state (required)
 	 * @param entryActions any state entry actions; may be null
-	 * @param viewSelector the state confirmation view selector strategy; may be null
+	 * @param finalResponseAction the state response renderer; may be null
 	 * @param outputMapper the state output mapper; may be null
 	 * @param exceptionHandlers any exception handlers; may be null
 	 * @param attributes attributes to assign to the State, which may also be used to affect state construction; may be
 	 * null
 	 * @return the fully initialized subflow state instance
-	 * @throws FlowArtifactLookupException an exception occured creating the state
 	 */
-	public State createEndState(String id, Flow flow, Action[] entryActions, ViewSelector viewSelector,
-			AttributeMapper outputMapper, FlowExecutionExceptionHandler[] exceptionHandlers, AttributeMap attributes)
-			throws FlowArtifactLookupException {
+	public State createEndState(String id, Flow flow, Action[] entryActions, Action finalResponseAction,
+			AttributeMapper outputMapper, FlowExecutionExceptionHandler[] exceptionHandlers, AttributeMap attributes) {
 		EndState endState = new EndState(flow, id);
-		if (viewSelector != null) {
-			endState.setViewSelector(viewSelector);
+		if (finalResponseAction != null) {
+			endState.setFinalResponseAction(finalResponseAction);
 		}
 		if (outputMapper != null) {
 			endState.setOutputMapper(outputMapper);
@@ -208,10 +196,9 @@ public class FlowArtifactFactory {
 	 * @param attributes attributes to assign to the transition, which may also be used to affect transition
 	 * construction; may be null
 	 * @return the fully initialized transition instance
-	 * @throws FlowArtifactLookupException an exception occured creating the transition
 	 */
 	public Transition createTransition(TargetStateResolver targetStateResolver, TransitionCriteria matchingCriteria,
-			TransitionCriteria executionCriteria, AttributeMap attributes) throws FlowArtifactLookupException {
+			TransitionCriteria executionCriteria, AttributeMap attributes) {
 		Transition transition = new Transition(targetStateResolver);
 		if (matchingCriteria != null) {
 			transition.setMatchingCriteria(matchingCriteria);
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowArtifactLookupException.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowArtifactLookupException.java
deleted file mode 100644
index 8c81b143..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowArtifactLookupException.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.core.FlowException;
-import org.springframework.webflow.execution.FlowExecutionException;
-
-/**
- * A flow artifact lookup exception is thrown when an artifact (such as a flow, state, action, etc.) required by the
- * webflow system cannot be obtained.
- * 

- * Flow artifact lookup exceptions indicate unrecoverable problems with the flow definition, e.g. a required action of a
- * flow cannot be found. They're not used to signal problems related to execution of a client request. A
- * {@link FlowExecutionException} is used for that.
- * 
- * @see org.springframework.webflow.execution.FlowExecutionException
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class FlowArtifactLookupException extends FlowException {
-
-	/**
-	 * The id of the artifact that could not be retrieved.
-	 */
-	private String artifactId;
-
-	/**
-	 * The type of artifact that could not be retrieved.
-	 */
-	private Class artifactType;
-
-	/**
-	 * Create a new flow artifact lookup exception.
-	 * @param artifactId the id of the artifact
-	 * @param artifactType the expected artifact type
-	 */
-	public FlowArtifactLookupException(String artifactId, Class artifactType) {
-		this(artifactId, artifactType, null, null);
-	}
-
-	/**
-	 * Create a new flow artifact lookup exception.
-	 * @param artifactId the id of the artifact
-	 * @param artifactType the expected artifact type
-	 * @param cause the underlying cause of this exception
-	 */
-	public FlowArtifactLookupException(String artifactId, Class artifactType, Throwable cause) {
-		this(artifactId, artifactType, null, cause);
-	}
-
-	/**
-	 * Create a new flow artifact lookup exception.
-	 * @param artifactId the id of the artifact
-	 * @param artifactType the expected artifact type
-	 * @param message descriptive message
-	 */
-	public FlowArtifactLookupException(String artifactId, Class artifactType, String message) {
-		this(artifactId, artifactType, message, null);
-	}
-
-	/**
-	 * Create a new flow artifact lookup exception.
-	 * @param artifactId the id of the artifact
-	 * @param artifactType the expected artifact type
-	 * @param message descriptive message
-	 * @param cause the underlying cause of this exception
-	 */
-	public FlowArtifactLookupException(String artifactId, Class artifactType, String message, Throwable cause) {
-		super((StringUtils.hasText(message) ? message : "Unable to obtain a " + ClassUtils.getShortName(artifactType)
-				+ " flow artifact with id '" + artifactId + "': make sure there is a valid [" + artifactType
-				+ "] exported with this id"), cause);
-		this.artifactType = artifactType;
-		this.artifactId = artifactId;
-	}
-
-	/**
-	 * Returns the id of the artifact that cannot be found.
-	 */
-	public String getArtifactId() {
-		return artifactId;
-	}
-
-	/**
-	 * Returns the expected artifact type.
-	 */
-	public Class getArtifactType() {
-		return artifactType;
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowAssembler.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowAssembler.java
index 8c6ea243..a142bd54 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowAssembler.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowAssembler.java
@@ -15,11 +15,7 @@
  */
 package org.springframework.webflow.engine.builder;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.CollectionUtils;
 import org.springframework.webflow.engine.Flow;
 
 /**
@@ -31,7 +27,7 @@ import org.springframework.webflow.engine.Flow;
  * 
  * 
  *     FlowBuilder builder = ...;
- *     Flow flow = new FlowAssembler("myFlow", builder).assembleFlow();
+ *     Flow flow = new FlowAssembler("myFlow", builder, null).assembleFlow();
  * 

  * 
  * @see org.springframework.webflow.engine.builder.FlowBuilder
@@ -41,58 +37,26 @@ import org.springframework.webflow.engine.Flow;
  */
 public class FlowAssembler {
 
-	private static final Log logger = LogFactory.getLog(FlowAssembler.class);
-
-	/**
-	 * The identifier to assign to the flow.
-	 */
-	private String flowId;
-
-	/**
-	 * Attributes that can be used to affect flow construction.
-	 */
-	private AttributeMap flowAttributes;
-
 	/**
 	 * The flow builder strategy used to construct the flow from its component parts.
 	 */
 	private FlowBuilder flowBuilder;
 
 	/**
-	 * Create a new flow assembler that will direct Flow assembly using the specified builder strategy.
-	 * @param flowId the flow id to assign
-	 * @param flowBuilder the builder the factory will use to build flows
+	 * Context needed to initialize the builder so it can perform a build operation.
 	 */
-	public FlowAssembler(String flowId, FlowBuilder flowBuilder) {
-		this(flowId, null, flowBuilder);
-	}
+	private FlowBuilderContext flowBuilderContext;
 
 	/**
 	 * Create a new flow assembler that will direct Flow assembly using the specified builder strategy.
-	 * @param flowId the flow id to assign
-	 * @param flowAttributes externally assigned flow attributes that can affect flow construction
 	 * @param flowBuilder the builder the factory will use to build flows
+	 * @param flowBuilderContext context to influence the build process
 	 */
-	public FlowAssembler(String flowId, AttributeMap flowAttributes, FlowBuilder flowBuilder) {
-		Assert.hasText(flowId, "The flow id is required");
-		Assert.notNull(flowBuilder, "The flow builder is required");
-		this.flowId = flowId;
-		this.flowAttributes = (flowAttributes != null ? flowAttributes : CollectionUtils.EMPTY_ATTRIBUTE_MAP);
+	public FlowAssembler(FlowBuilder flowBuilder, FlowBuilderContext flowBuilderContext) {
+		Assert.notNull(flowBuilder, "A flow builder is required for flow assembly");
+		Assert.notNull(flowBuilderContext, "A flow builder context is required for flow assembly");
 		this.flowBuilder = flowBuilder;
-	}
-
-	/**
-	 * Returns the identifier to assign to the flow.
-	 */
-	public String getFlowId() {
-		return flowId;
-	}
-
-	/**
-	 * Returns externally assigned attributes that can be used to affect flow construction.
-	 */
-	public AttributeMap getFlowAttributes() {
-		return flowAttributes;
+		this.flowBuilderContext = flowBuilderContext;
 	}
 
 	/**
@@ -102,23 +66,27 @@ public class FlowAssembler {
 		return flowBuilder;
 	}
 
+	/**
+	 * Returns the flow builder context.
+	 * @return flow builder context
+	 */
+	public FlowBuilderContext getFlowBuilderContext() {
+		return flowBuilderContext;
+	}
+
 	/**
 	 * Assembles the flow, directing the construction process by delegating to the configured FlowBuilder. Every call to
 	 * this method will assemble the Flow instance.
 	 * 

 	 * This will drive the flow construction process as described in the {@link FlowBuilder} JavaDoc, starting with
-	 * builder initialisation using {@link FlowBuilder#init(String, AttributeMap)} and finishing by cleaning up the
+	 * builder initialization using {@link FlowBuilder#init(FlowBuilderContext)} and finishing by cleaning up the
 	 * builder with a call to {@link FlowBuilder#dispose()}.
 	 * @return the constructed flow
 	 * @throws FlowBuilderException when flow assembly fails
 	 */
 	public Flow assembleFlow() throws FlowBuilderException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Assembling flow definition with id '" + flowId + "' using flow builder '" + flowBuilder
-					+ "'; externally assigned flow attributes are '" + flowAttributes + "'");
-		}
 		try {
-			flowBuilder.init(flowId, flowAttributes);
+			flowBuilder.init(flowBuilderContext);
 			directAssembly();
 			return flowBuilder.getFlow();
 		} finally {
@@ -134,7 +102,6 @@ public class FlowAssembler {
 		flowBuilder.buildVariables();
 		flowBuilder.buildInputMapper();
 		flowBuilder.buildStartActions();
-		flowBuilder.buildInlineFlows();
 		flowBuilder.buildStates();
 		flowBuilder.buildGlobalTransitions();
 		flowBuilder.buildEndActions();
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowBuilder.java
index cb431097..ee8ab56e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowBuilder.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowBuilder.java
@@ -15,18 +15,15 @@
  */
 package org.springframework.webflow.engine.builder;
 
-import org.springframework.webflow.core.collection.AttributeMap;
 import org.springframework.webflow.engine.Flow;
 
 /**
  * Builder interface used to build a flow definition. The process of building a flow consists of the following steps:
  * 
    
- * 
  1.  Initialize this builder, creating the initial flow definition, by calling {@link #init(String, AttributeMap)}.
+ * 
  2.  Initialize this builder, creating the initial flow definition, by calling {@link #init(FlowBuilderContext)}.
  * 
  3.  Call {@link #buildVariables()} to create any variables of the flow and add them to the flow definition.
  * 
  4.  Call {@link #buildInputMapper()} to create and set the input mapper for the flow.
  * 
  5.  Call {@link #buildStartActions()} to create and add any start actions to the flow.
- * 
  6.  Call {@link #buildInlineFlows()} to create any inline flows encapsulated by the flow and add them to the flow
- * definition.
  * 
  7.  Call {@link #buildStates()} to create the states of the flow and add them to the flow definition.
  * 
  8.  Call {@link #buildGlobalTransitions()} to create the any transitions shared by all states of the flow and add
  * them to the flow definition.
@@ -43,17 +40,14 @@ import org.springframework.webflow.engine.Flow;
  * OrderFlowBuilder built in Java code, or a generic flow builder strategy, like the
  * XmlFlowBuilder, for building flows from an XML-definition.
  * 
    
- * Flow builders are used by the {@link org.springframework.webflow.engine.builder.FlowAssembler}, which acts as an
- * assembler (director). Flow Builders may be reused, however, exercise caution when doing this as these objects are not
- * thread safe. Also, for each use be sure to call init, followed by the build* methods, getFlow, and dispose completely
- * in that order.
+ * Flow builders are used by the {@link FlowAssembler}, which acts as an assembler (director). Flow Builders may be
+ * reused, however, exercise caution when doing this as these objects are not thread safe. Also, for each use be sure to
+ * call init, followed by the build* methods, getFlow, and dispose completely in that order.
  * 
    
  * This is an example of the classic GoF builder pattern.
  * 
  * @see Flow
- * @see org.springframework.webflow.engine.builder.FlowAssembler
- * @see org.springframework.webflow.engine.builder.AbstractFlowBuilder
- * @see org.springframework.webflow.engine.builder.xml.XmlFlowBuilder
+ * @see FlowAssembler
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
@@ -63,63 +57,56 @@ public interface FlowBuilder {
 	/**
 	 * Initialize this builder. This could cause the builder to open a stream to an externalized resource representing
 	 * the flow definition, for example.
-	 * @param flowId the identifier to assign to the flow
-	 * @param attributes custom attributes to assign to the flow
-	 * @throws FlowBuilderException an exception occured building the flow
+	 * @param context the flow builder context
+	 * @throws FlowBuilderException an exception occurred building the flow
 	 */
-	public void init(String flowId, AttributeMap attributes) throws FlowBuilderException;
+	public void init(FlowBuilderContext context) throws FlowBuilderException;
 
 	/**
 	 * Builds any variables initialized by the flow when it starts.
-	 * @throws FlowBuilderException an exception occured building the flow
+	 * @throws FlowBuilderException an exception occurred building the flow
 	 */
 	public void buildVariables() throws FlowBuilderException;
 
 	/**
 	 * Builds the input mapper responsible for mapping flow input on start.
-	 * @throws FlowBuilderException an exception occured building the flow
+	 * @throws FlowBuilderException an exception occurred building the flow
 	 */
 	public void buildInputMapper() throws FlowBuilderException;
 
 	/**
 	 * Builds any start actions to execute when the flow starts.
-	 * @throws FlowBuilderException an exception occured building the flow
+	 * @throws FlowBuilderException an exception occurred building the flow
 	 */
 	public void buildStartActions() throws FlowBuilderException;
 
-	/**
-	 * Builds any "in-line" flows encapsulated by the flow.
-	 * @throws FlowBuilderException an exception occured building the flow
-	 */
-	public void buildInlineFlows() throws FlowBuilderException;
-
 	/**
 	 * Builds the states of the flow.
-	 * @throws FlowBuilderException an exception occured building the flow
+	 * @throws FlowBuilderException an exception occurred building the flow
 	 */
 	public void buildStates() throws FlowBuilderException;
 
 	/**
 	 * Builds any transitions shared by all states of the flow.
-	 * @throws FlowBuilderException an exception occured building the flow
+	 * @throws FlowBuilderException an exception occurred building the flow
 	 */
 	public void buildGlobalTransitions() throws FlowBuilderException;
 
 	/**
 	 * Builds any end actions to execute when the flow ends.
-	 * @throws FlowBuilderException an exception occured building the flow
+	 * @throws FlowBuilderException an exception occurred building the flow
 	 */
 	public void buildEndActions() throws FlowBuilderException;
 
 	/**
 	 * Builds the output mapper responsible for mapping flow output on end.
-	 * @throws FlowBuilderException an exception occured building the flow
+	 * @throws FlowBuilderException an exception occurred building the flow
 	 */
 	public void buildOutputMapper() throws FlowBuilderException;
 
 	/**
 	 * Creates and adds all exception handlers to the flow built by this builder.
-	 * @throws FlowBuilderException an exception occured building this flow
+	 * @throws FlowBuilderException an exception occurred building this flow
 	 */
 	public void buildExceptionHandlers() throws FlowBuilderException;
 
@@ -132,7 +119,7 @@ public interface FlowBuilder {
 
 	/**
 	 * Shutdown the builder, releasing any resources it holds. A new flow construction process should start with another
-	 * call to the {@link #init(String, AttributeMap)} method.
+	 * call to the {@link #init(FlowBuilderContext)} method.
 	 */
 	public void dispose();
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowBuilderContext.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowBuilderContext.java
new file mode 100644
index 00000000..1a2614be
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowBuilderContext.java
@@ -0,0 +1,73 @@
+package org.springframework.webflow.engine.builder;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.binding.convert.ConversionService;
+import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.webflow.action.BeanInvokingActionFactory;
+import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
+
+public interface FlowBuilderContext {
+
+	/**
+	 * Returns an externally configured flow definition identifier to assign to the flow being built.
+	 * @return the flow id
+	 */
+	public String getFlowId();
+
+	/**
+	 * Returns externally configured attributes to assign to the flow definition being built.
+	 * @return the flow attributes
+	 */
+	public AttributeMap getFlowAttributes();
+
+	/**
+	 * Returns the locator for locating dependent flows (subflows).
+	 * @return the flow definition locator
+	 */
+	public FlowDefinitionLocator getFlowDefinitionLocator();
+
+	/**
+	 * Returns the factory for core flow artifacts such as Flow and State.
+	 * @return the flow artifact factory
+	 */
+	public FlowArtifactFactory getFlowArtifactFactory();
+
+	/**
+	 * Returns the factory for bean invoking actions.
+	 * @return the bean invoking action factory
+	 */
+	public BeanInvokingActionFactory getBeanInvokingActionFactory();
+
+	/**
+	 * Returns the view factory creator for configuring a ViewFactory per view state
+	 * @return the view factory creator
+	 */
+	public ViewFactoryCreator getViewFactoryCreator();
+
+	/**
+	 * Returns the expression parser for parsing expression strings.
+	 * @return the expression parser
+	 */
+	public ExpressionParser getExpressionParser();
+
+	/**
+	 * Returns a generic type conversion service for converting between types, typically from string to a rich value
+	 * object.
+	 * @return the generic conversion service
+	 */
+	public ConversionService getConversionService();
+
+	/**
+	 * Returns a generic resource loader for accessing file-based resources.
+	 * @return the generic resource loader
+	 */
+	public ResourceLoader getResourceLoader();
+
+	/**
+	 * Returns a generic bean factory for accessing arbitrary services by their id.
+	 * @return the bean factory
+	 */
+	public BeanFactory getBeanFactory();
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowRegistryFactoryBean.java
deleted file mode 100644
index 91c36d44..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowRegistryFactoryBean.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistrar;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.FlowDefinitionResource;
-import org.springframework.webflow.engine.builder.xml.XmlFlowRegistrar;
-
-/**
- * A factory bean that accepts an arbitrary list of {@link FlowDefinitionRegistrar}s and uses them to register flows.
- * This implementation should not be used programmatically but rather from the spring-webflow-config XML namespace.
- * 
    
- * Example Usage:
- * 
- * 
    - * <flow:registry id="flowRegistry">
- *     <flow:location path="flow1.xml"/>
- *     <flow:location id="foo" path="flow2.xml"/>
- *     <flow:class name="BarClass"/>
- *     <flow:crud entity="Account"/>
- *     <flow:namespace name="baz">
- *         <flow:location path="flow3.xml"/>
- *         <flow:class name="XyzClass"/>
- *     </flow:namespace>
- * </flow:registry>
- * 
    
- * 
- * @author Ben Hale
- */
-public class FlowRegistryFactoryBean implements FactoryBean, InitializingBean, BeanFactoryAware {
-
-	private FlowDefinitionRegistry registry;
-
-	private BeanFactory beanFactory;
-
-	private FlowServiceLocator flowServiceLocator;
-
-	private Map xmlNamespaceFlowMappings;
-
-	public void setFlowServiceLocator(FlowServiceLocator flowServiceLocator) {
-		this.flowServiceLocator = flowServiceLocator;
-	}
-
-	public void setXmlNamespaceFlowMappings(Map xmlNamespaceFlowMappings) {
-		this.xmlNamespaceFlowMappings = xmlNamespaceFlowMappings;
-	}
-
-	public void afterPropertiesSet() throws Exception {
-		this.registry = new FlowDefinitionRegistryImpl();
-		initXml(registry);
-	}
-
-	public Object getObject() throws Exception {
-		return registry;
-	}
-
-	public Class getObjectType() {
-		return FlowDefinitionRegistry.class;
-	}
-
-	public boolean isSingleton() {
-		return true;
-	}
-
-	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-		this.beanFactory = beanFactory;
-	}
-
-	private void initXml(FlowDefinitionRegistry registry) {
-		XmlFlowRegistrar registrar = new XmlFlowRegistrar(getFlowServiceLocator(registry));
-		for (Iterator mappings = xmlNamespaceFlowMappings.entrySet().iterator(); mappings.hasNext();) {
-			Map.Entry mapping = (Map.Entry) mappings.next();
-			String namespace = (String) mapping.getKey();
-			for (Iterator resources = ((Set) mapping.getValue()).iterator(); resources.hasNext();) {
-				FlowDefinitionResource resource = (FlowDefinitionResource) resources.next();
-				registrar.addResource(resource, namespace);
-			}
-		}
-		registrar.registerFlowDefinitions(registry);
-	}
-
-	private FlowServiceLocator getFlowServiceLocator(FlowDefinitionRegistry registry) {
-		if (flowServiceLocator == null) {
-			this.flowServiceLocator = new DefaultFlowServiceLocator(registry, beanFactory);
-		}
-		return flowServiceLocator;
-	}
-}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowRegistryFactoryBeanTests.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowRegistryFactoryBeanTests.java
deleted file mode 100644
index c973e95a..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowRegistryFactoryBeanTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionResource;
-import org.springframework.webflow.test.MockFlowServiceLocator;
-
-/**
- * Tests that the factory bean properly creates a {@link FlowDefinitionRegistry} with the proper definitions in it.
- */
-public class FlowRegistryFactoryBeanTests extends TestCase {
-
-	public void testXmlRegistrar() throws Exception {
-		Set emptyNamespace = new HashSet();
-		emptyNamespace.add(new FlowDefinitionResource(fromClassPath("flow1.xml")));
-		Set bookingNamespace = new HashSet();
-		bookingNamespace.add(new FlowDefinitionResource(fromClassPath("flow2.xml")));
-		Map xmlNamespaceFlowMappings = new HashMap();
-		xmlNamespaceFlowMappings.put("", emptyNamespace);
-		xmlNamespaceFlowMappings.put("booking", bookingNamespace);
-		FlowRegistryFactoryBean factoryBean = new FlowRegistryFactoryBean();
-		factoryBean.setFlowServiceLocator(new MockFlowServiceLocator());
-		factoryBean.setXmlNamespaceFlowMappings(xmlNamespaceFlowMappings);
-		factoryBean.afterPropertiesSet();
-		FlowDefinitionRegistry registry = (FlowDefinitionRegistry) factoryBean.getObject();
-		assertEquals("Incorrect number of flows", 2, registry.getFlowDefinitionCount());
-		assertTrue("Missing flow", registry.containsFlowDefinition("flow1"));
-		assertTrue("Missing flow", registry.containsFlowDefinition("booking/flow2"));
-	}
-
-	private Resource fromClassPath(String resourceName) {
-		return new ClassPathResource(resourceName, getClass());
-	}
-
-}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowServiceLocator.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowServiceLocator.java
deleted file mode 100644
index 46578206..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/FlowServiceLocator.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.binding.convert.ConversionService;
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.webflow.action.AbstractBeanInvokingAction;
-import org.springframework.webflow.action.BeanInvokingActionFactory;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.FlowAttributeMapper;
-import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
-import org.springframework.webflow.engine.State;
-import org.springframework.webflow.engine.TargetStateResolver;
-import org.springframework.webflow.engine.Transition;
-import org.springframework.webflow.engine.TransitionCriteria;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.execution.Action;
-
-/**
- * A support interface used by flow builders at configuration time. Acts as a "service locator" responsible for:
- * 
      
- * 
    1.  Retrieving dependent (but externally managed) flow services needed to configure flow and state definitions. Such
- * services are usually hosted in a backing registry and may be shared by multiple flows.
- * 
    2.  Providing access to abstract factories to create core flow definitional artifacts such as {@link Flow},
- * {@link State}, {@link Transition}, and {@link AbstractBeanInvokingAction bean invoking actions}. These artifacts
- * are unique to each flow and are typically not shared.
- * 
    
- * 
    
- * In general, implementations of this interface act as facades to accessing and creating flow artifacts during
- * {@link FlowAssembler flow assembly}.
- * 
    
- * Finally, this interface also exposes access to generic infrastructure services also needed by flow assemblers such as
- * a {@link ConversionService} and {@link ExpressionParser}.
- * 
- * @see org.springframework.webflow.engine.builder.FlowBuilder
- * @see org.springframework.webflow.engine.builder.BaseFlowBuilder
- * @see org.springframework.webflow.engine.builder.FlowAssembler
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public interface FlowServiceLocator {
-
-	/**
-	 * Returns the Flow to be used as a subflow with the provided id.
-	 * @param id the flow id
-	 * @return the flow to be used as a subflow
-	 * @throws FlowArtifactLookupException when no such flow is found
-	 */
-	public Flow getSubflow(String id) throws FlowArtifactLookupException;
-
-	/**
-	 * Retrieve an action to be executed within a flow with the assigned id.
-	 * @param id the id of the action
-	 * @throws FlowArtifactLookupException when no such action is found
-	 */
-	public Action getAction(String id) throws FlowArtifactLookupException;
-
-	/**
-	 * Returns the flow attribute mapper with the provided id. Flow attribute mappers are used from subflow states to
-	 * map input and output attributes.
-	 * @param id the attribute mapper id
-	 * @return the attribute mapper
-	 * @throws FlowArtifactLookupException when no such mapper is found
-	 */
-	public FlowAttributeMapper getAttributeMapper(String id) throws FlowArtifactLookupException;
-
-	/**
-	 * Returns the transition criteria to drive state transitions with the provided id.
-	 * @param id the transition criteria id
-	 * @return the transition criteria
-	 * @throws FlowArtifactLookupException when no such criteria is found
-	 */
-	public TransitionCriteria getTransitionCriteria(String id) throws FlowArtifactLookupException;
-
-	/**
-	 * Returns the transition target state resolver with the specified id.
-	 * @param id the target state resolver id
-	 * @return the target state resolver
-	 * @throws FlowArtifactLookupException when no such resolver is found
-	 */
-	public TargetStateResolver getTargetStateResolver(String id) throws FlowArtifactLookupException;
-
-	/**
-	 * Returns the view selector to make view selections in view states with the provided id.
-	 * @param id the view selector id
-	 * @return the view selector
-	 * @throws FlowArtifactLookupException when no such selector is found
-	 */
-	public ViewSelector getViewSelector(String id) throws FlowArtifactLookupException;
-
-	/**
-	 * Returns the exception handler to handle flow execution exceptions with the provided id.
-	 * @param id the exception handler id
-	 * @return the exception handler
-	 * @throws FlowArtifactLookupException when no such handler is found
-	 */
-	public FlowExecutionExceptionHandler getExceptionHandler(String id) throws FlowArtifactLookupException;
-
-	/**
-	 * Returns the factory for core flow artifacts such as Flow and State.
-	 * @return the flow artifact factory
-	 */
-	public FlowArtifactFactory getFlowArtifactFactory();
-
-	/**
-	 * Returns the factory for bean invoking actions.
-	 * @return the bean invoking action factory
-	 */
-	public BeanInvokingActionFactory getBeanInvokingActionFactory();
-
-	/**
-	 * Returns a generic bean (service) registry for accessing arbitrary beans.
-	 * @return the generic service registry
-	 * @throws UnsupportedOperationException when not supported by this locator
-	 */
-	public BeanFactory getBeanFactory() throws UnsupportedOperationException;
-
-	/**
-	 * Returns a generic resource loader for accessing file-based resources.
-	 * @return the generic resource loader
-	 */
-	public ResourceLoader getResourceLoader();
-
-	/**
-	 * Returns the expression parser for parsing expression strings.
-	 * @return the expression parser
-	 */
-	public ExpressionParser getExpressionParser();
-
-	/**
-	 * Returns a generic type conversion service for converting between types, typically from string to a rich value
-	 * object.
-	 * @return the generic conversion service
-	 */
-	public ConversionService getConversionService();
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/RefreshableFlowDefinitionHolder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/RefreshableFlowDefinitionHolder.java
index 3d187d05..522ee7d5 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/RefreshableFlowDefinitionHolder.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/RefreshableFlowDefinitionHolder.java
@@ -23,7 +23,6 @@ import org.springframework.core.io.Resource;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.definition.registry.FlowDefinitionConstructionException;
 import org.springframework.webflow.definition.registry.FlowDefinitionHolder;
-import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.util.ResourceHolder;
 
 /**
@@ -32,13 +31,11 @@ import org.springframework.webflow.util.ResourceHolder;
  * 
    
  * This class is thread-safe.
  * 
    
- * Note that this {@link FlowDefinition} holder uses a {@link Flow} assembler. This is normal since a {@link Flow} is a
- * {@link FlowDefinition}! This class bridges the abstract world of {@link FlowDefinition flow definitions}
- * with the concrete world of {@link Flow flow implementations}.
+ * Note that this {@link FlowDefinition} holder uses a {@link FlowAssembler}. This class bridges the abstract
+ * world of {@link FlowDefinition flow definitions} with the concrete world of flow implementations.
  * 
- * @see FlowDefinition
- * @see Flow
  * @see FlowAssembler
+ * @see FlowDefinition
  * 
  * @author Keith Donald
  */
@@ -77,7 +74,7 @@ public class RefreshableFlowDefinitionHolder implements FlowDefinitionHolder {
 	}
 
 	public String getFlowDefinitionId() {
-		return assembler.getFlowId();
+		return assembler.getFlowBuilderContext().getFlowId();
 	}
 
 	public synchronized FlowDefinition getFlowDefinition() throws FlowDefinitionConstructionException {
@@ -85,8 +82,9 @@ public class RefreshableFlowDefinitionHolder implements FlowDefinitionHolder {
 			// must return early assembly result
 			return getFlowBuilder().getFlow();
 		}
-		if (!isAssembled()) {
+		if (flowDefinition == null) {
 			lastModified = calculateLastModified();
+			logger.debug("Assembling the flow definition for the first time");
 			assembleFlow();
 		} else {
 			refreshIfChanged();
@@ -94,91 +92,66 @@ public class RefreshableFlowDefinitionHolder implements FlowDefinitionHolder {
 		return flowDefinition;
 	}
 
-	public synchronized void refresh() throws FlowBuilderException {
+	public synchronized void refresh() throws FlowDefinitionConstructionException {
 		assembleFlow();
 	}
 
 	// internal helpers
 
-	/**
-	 * Returns the flow builder that actually builds the Flow definition.
-	 */
-	protected FlowBuilder getFlowBuilder() {
-		return assembler.getFlowBuilder();
-	}
-
-	/**
-	 * Reassemble the flow if its underlying resource has changed.
-	 */
-	protected void refreshIfChanged() {
-		if (this.lastModified == -1) {
-			// just ignore, tracking last modified date not supported
-			return;
-		}
-		long calculatedLastModified = calculateLastModified();
-		if (this.lastModified < calculatedLastModified) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Resource modification detected, reloading flow definition with id '"
-						+ assembler.getFlowId() + "'");
-			}
-			assembleFlow();
-			this.lastModified = calculatedLastModified;
-		}
-	}
-
 	/**
 	 * Helper that retrieves the last modified date by querying the backing flow resource.
-	 * @return the last modified date, or -1 if it could not be retrieved
+	 * @return the last modified date, or 0L if it could not be retrieved
 	 */
-	protected long calculateLastModified() {
+	private long calculateLastModified() {
 		if (getFlowBuilder() instanceof ResourceHolder) {
 			Resource resource = ((ResourceHolder) getFlowBuilder()).getResource();
-			if (logger.isDebugEnabled()) {
-				logger.debug("Calculating last modified timestamp for flow definition resource '" + resource + "'");
-			}
 			try {
-				return resource.getFile().lastModified();
+				long lastModified = resource.getFile().lastModified();
+				if (logger.isDebugEnabled()) {
+					logger.debug("Flow definition [" + resource + "] was last modified on " + lastModified);
+				}
+				return lastModified;
 			} catch (IOException e) {
 				// ignore, last modified checks not supported
 			}
 		}
-		return -1;
-	}
-
-	/**
-	 * Returns the last modified date of the backed flow definition resource.
-	 * @return the last modified date
-	 */
-	protected long getLastModified() {
-		return lastModified;
+		return 0L;
 	}
 
 	/**
 	 * Assemble the held flow definition, delegating to the configured FlowAssembler (director).
 	 */
-	protected void assembleFlow() throws FlowBuilderException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Assembling flow definition with id '" + assembler.getFlowId() + "'");
-		}
+	private void assembleFlow() throws FlowDefinitionConstructionException {
 		try {
 			assembling = true;
 			flowDefinition = assembler.assembleFlow();
+		} catch (FlowBuilderException e) {
+			throw new FlowDefinitionConstructionException(assembler.getFlowBuilderContext().getFlowId(), e);
 		} finally {
 			assembling = false;
 		}
 	}
 
 	/**
-	 * Returns a flag indicating if this holder has performed and completed flow definition assembly.
+	 * Reassemble the flow if its underlying resource has changed.
 	 */
-	protected boolean isAssembled() {
-		return flowDefinition != null;
+	private void refreshIfChanged() {
+		long calculatedLastModified = calculateLastModified();
+		if (calculatedLastModified > lastModified) {
+			assembleFlow();
+			lastModified = calculatedLastModified;
+		}
 	}
 
 	/**
-	 * Returns a flag indicating if this holder is performing assembly.
+	 * Returns the flow builder that actually builds the Flow definition.
 	 */
-	protected boolean isAssembling() {
-		return assembling;
+	private FlowBuilder getFlowBuilder() {
+		return assembler.getFlowBuilder();
 	}
+
+	public String toString() {
+		return "'" + getFlowDefinitionId() + "'";
+	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToViewSelector.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToViewSelector.java
deleted file mode 100644
index 27ce7545..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToViewSelector.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.binding.convert.ConversionContext;
-import org.springframework.binding.convert.support.ConversionServiceAwareConverter;
-import org.springframework.binding.expression.Expression;
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.engine.NullViewSelector;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
-import org.springframework.webflow.engine.support.ExternalRedirectSelector;
-import org.springframework.webflow.engine.support.FlowDefinitionRedirectSelector;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-
-/**
- * Converter that converts an encoded string representation of a view selector into a {@link ViewSelector} object that
- * will make selections at runtime.
- * 
    
- * This converter supports the following encoded forms:
- * 
      
- * 
    • empty - will result in a {@link NullViewSelector}.
      • 
- * 
    • "viewName" - will result in an {@link ApplicationViewSelector} that returns an {@link ApplicationView}
- * ViewSelection with the provided view name expression.
      • 
- * 
    • "redirect:<viewName>" - will result in an {@link ApplicationViewSelector} that returns an
- * {@link FlowExecutionRedirect} to a flow execution URL.
      • 
- * 
    • "externalRedirect:<url>" - will result in an {@link ExternalRedirectSelector} that returns an
- * {@link ExternalRedirect} to a URL.
      • 
- * 
    • "flowRedirect:<flowId>" - will result in a {@link FlowDefinitionRedirectSelector} that returns a
- * {@link FlowDefinitionRedirect} to a flow.
      • 
- * 
    • "bean:<id>" - will result in usage of a custom ViewSelector bean implementation.
      • 
- * 
    
- * 
- * @see org.springframework.webflow.execution.ViewSelection
- * @see org.springframework.webflow.engine.ViewSelector
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class TextToViewSelector extends ConversionServiceAwareConverter {
-
-	/**
-	 * Prefix used when the encoded view name wants to specify that a redirect is required. ("redirect:")
-	 */
-	public static final String REDIRECT_PREFIX = "redirect:";
-
-	/**
-	 * Prefix used when the encoded view name wants to specify that a redirect to an external URL is required.
-	 * ("externalRedirect:")
-	 */
-	public static final String EXTERNAL_REDIRECT_PREFIX = "externalRedirect:";
-
-	/**
-	 * Prefix used when the encoded view name wants to specify that a redirect to a flow definition is requred.
-	 * ("flowRedirect:")
-	 */
-	public static final String FLOW_DEFINITION_REDIRECT_PREFIX = "flowRedirect:";
-
-	/**
-	 * Prefix used when the user wants to use a ViewSelector implementation managed by a bean factory. ("bean:")
-	 */
-	private static final String BEAN_PREFIX = "bean:";
-
-	/**
-	 * Locator to use for loading custom ViewSelector beans.
-	 */
-	private FlowServiceLocator flowServiceLocator;
-
-	/**
-	 * Create a new text to ViewSelector converter. Custom ViewSelector implemenations will be looked up using given
-	 * service locator.
-	 */
-	public TextToViewSelector(FlowServiceLocator flowServiceLocator) {
-		this.flowServiceLocator = flowServiceLocator;
-		setConversionService(flowServiceLocator.getConversionService());
-	}
-
-	public Class[] getSourceClasses() {
-		return new Class[] { String.class };
-	}
-
-	public Class[] getTargetClasses() {
-		return new Class[] { ViewSelector.class };
-	}
-
-	protected Object doConvert(Object source, Class targetClass, ConversionContext context) throws Exception {
-		String encodedView = (String) source;
-		if (!StringUtils.hasText(encodedView)) {
-			return NullViewSelector.INSTANCE;
-		} else {
-			return convertEncodedViewSelector(encodedView);
-		}
-	}
-
-	/**
-	 * Convert given encoded view into an appropriate view selector.
-	 * @param encodedView the encoded view selector
-	 * @return the view selector
-	 */
-	protected ViewSelector convertEncodedViewSelector(String encodedView) {
-		if (encodedView.startsWith(REDIRECT_PREFIX)) {
-			String viewName = encodedView.substring(REDIRECT_PREFIX.length());
-			Expression viewNameExpr = (Expression) fromStringTo(Expression.class).execute(viewName);
-			// just show the application view using a redirect
-			return new ApplicationViewSelector(viewNameExpr, true);
-		} else if (encodedView.startsWith(EXTERNAL_REDIRECT_PREFIX)) {
-			String externalUrl = encodedView.substring(EXTERNAL_REDIRECT_PREFIX.length());
-			Expression urlExpr = (Expression) fromStringTo(Expression.class).execute(externalUrl);
-			return new ExternalRedirectSelector(urlExpr);
-		} else if (encodedView.startsWith(FLOW_DEFINITION_REDIRECT_PREFIX)) {
-			String flowRedirect = encodedView.substring(FLOW_DEFINITION_REDIRECT_PREFIX.length());
-			Expression redirectExpr = (Expression) fromStringTo(Expression.class).execute(flowRedirect);
-			return new FlowDefinitionRedirectSelector(redirectExpr);
-		} else if (encodedView.startsWith(BEAN_PREFIX)) {
-			String id = encodedView.substring(BEAN_PREFIX.length());
-			return flowServiceLocator.getViewSelector(id);
-		} else {
-			Expression viewNameExpr = (Expression) fromStringTo(Expression.class).execute(encodedView);
-			return new ApplicationViewSelector(viewNameExpr);
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/ViewFactoryCreator.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/ViewFactoryCreator.java
new file mode 100644
index 00000000..a939b3d9
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/ViewFactoryCreator.java
@@ -0,0 +1,13 @@
+package org.springframework.webflow.engine.builder;
+
+import org.springframework.binding.expression.Expression;
+import org.springframework.webflow.execution.Action;
+import org.springframework.webflow.execution.ViewFactory;
+
+public interface ViewFactoryCreator {
+
+	public ViewFactory createViewFactory(Expression viewId);
+
+	public Action createFinalResponseAction(Expression viewId);
+
+}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/AbstractFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/AbstractFlowBuilder.java
new file mode 100644
index 00000000..776495ac
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/AbstractFlowBuilder.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.engine.builder.support;
+
+import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.engine.builder.FlowBuilder;
+import org.springframework.webflow.engine.builder.FlowBuilderContext;
+import org.springframework.webflow.engine.builder.FlowBuilderException;
+
+/**
+ * Abstract base implementation of a flow builder defining common functionality needed by most concrete flow builder
+ * implementations. This class implements all optional parts of the FlowBuilder process as no-op methods. Subclasses are
+ * only required to implement {@link #buildStates()}.
+ * 
+ * @author Keith Donald
+ * @author Erwin Vervaet
+ */
+public abstract class AbstractFlowBuilder implements FlowBuilder {
+
+	/**
+	 * The Flow built by this builder.
+	 */
+	private Flow flow;
+
+	private FlowBuilderContext context;
+
+	protected FlowBuilderContext getContext() {
+		return context;
+	}
+
+	public void init(FlowBuilderContext context) throws FlowBuilderException {
+		this.context = context;
+		doInit();
+		this.flow = createFlow();
+	}
+
+	protected void doInit() {
+
+	}
+
+	protected Flow createFlow() {
+		String id = getContext().getFlowId();
+		AttributeMap attributes = getContext().getFlowAttributes();
+		return getContext().getFlowArtifactFactory().createFlow(id, attributes);
+	}
+
+	public void buildVariables() throws FlowBuilderException {
+	}
+
+	public void buildInputMapper() throws FlowBuilderException {
+	}
+
+	public void buildStartActions() throws FlowBuilderException {
+	}
+
+	public abstract void buildStates() throws FlowBuilderException;
+
+	public void buildGlobalTransitions() throws FlowBuilderException {
+	}
+
+	public void buildEndActions() throws FlowBuilderException {
+	}
+
+	public void buildOutputMapper() throws FlowBuilderException {
+	}
+
+	public void buildExceptionHandlers() throws FlowBuilderException {
+	}
+
+	public Flow getFlow() {
+		return flow;
+	}
+
+	public void dispose() {
+		flow = null;
+		doDispose();
+	}
+
+	protected void doDispose() {
+
+	}
+
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/ActionInvokingViewFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/ActionInvokingViewFactory.java
new file mode 100644
index 00000000..d34dad86
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/ActionInvokingViewFactory.java
@@ -0,0 +1,50 @@
+package org.springframework.webflow.engine.builder.support;
+
+import org.springframework.webflow.execution.Action;
+import org.springframework.webflow.execution.Event;
+import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.execution.View;
+import org.springframework.webflow.execution.ViewFactory;
+
+public class ActionInvokingViewFactory implements ViewFactory {
+
+	private Action action;
+
+	public ActionInvokingViewFactory(Action action) {
+		this.action = action;
+	}
+
+	public View getView(RequestContext context) {
+		return new ActionExecutingView(action, context);
+	}
+
+	private static class ActionExecutingView implements View {
+
+		private Action action;
+
+		private RequestContext context;
+
+		private ActionExecutingView(Action action, RequestContext context) {
+			this.action = action;
+			this.context = context;
+		}
+
+		public boolean eventSignaled() {
+			return context.getExternalContext().getRequestParameterMap().contains("_eventId");
+		}
+
+		public Event getEvent() {
+			return new Event(this, context.getExternalContext().getRequestParameterMap().get("_eventId"));
+		}
+
+		public void render() {
+			try {
+				action.execute(context);
+			} catch (Exception e) {
+				// TODO
+			}
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/FlowBuilderContextImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/FlowBuilderContextImpl.java
new file mode 100644
index 00000000..05e2d02e
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/FlowBuilderContextImpl.java
@@ -0,0 +1,82 @@
+package org.springframework.webflow.engine.builder.support;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.binding.convert.ConversionService;
+import org.springframework.binding.convert.support.GenericConversionService;
+import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.webflow.action.BeanInvokingActionFactory;
+import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
+import org.springframework.webflow.engine.builder.FlowArtifactFactory;
+import org.springframework.webflow.engine.builder.FlowBuilderContext;
+import org.springframework.webflow.engine.builder.ViewFactoryCreator;
+
+public class FlowBuilderContextImpl implements FlowBuilderContext {
+
+	private String flowId;
+
+	private AttributeMap flowAttributes;
+
+	private FlowDefinitionLocator flowDefinitionLocator;
+
+	private FlowBuilderServices flowBuilderServices;
+
+	private GenericConversionService flowConversionService;
+
+	public FlowBuilderContextImpl(String flowId, AttributeMap flowAttributes,
+			FlowDefinitionLocator flowDefinitionLocator, FlowBuilderServices flowBuilderServices) {
+		this.flowId = flowId;
+		this.flowAttributes = flowAttributes;
+		this.flowDefinitionLocator = flowDefinitionLocator;
+		this.flowBuilderServices = flowBuilderServices;
+		flowConversionService = new GenericConversionService();
+		flowConversionService.addConverter(new TextToTransitionCriteria(this));
+		flowConversionService.addConverter(new TextToTargetStateResolver(this));
+		flowConversionService.setParent(this.flowBuilderServices.getConversionService());
+	}
+
+	public String getFlowId() {
+		return flowId;
+	}
+
+	public AttributeMap getFlowAttributes() {
+		return flowAttributes;
+	}
+
+	public FlowArtifactFactory getFlowArtifactFactory() {
+		return flowBuilderServices.getFlowArtifactFactory();
+	}
+
+	public BeanInvokingActionFactory getBeanInvokingActionFactory() {
+		return flowBuilderServices.getBeanInvokingActionFactory();
+	}
+
+	public ViewFactoryCreator getViewFactoryCreator() {
+		return flowBuilderServices.getViewFactoryCreator();
+	}
+
+	public ExpressionParser getExpressionParser() {
+		return flowBuilderServices.getExpressionParser();
+	}
+
+	public ConversionService getConversionService() {
+		return flowConversionService;
+	}
+
+	public ResourceLoader getResourceLoader() {
+		return flowBuilderServices.getResourceLoader();
+	}
+
+	public BeanFactory getBeanFactory() {
+		return flowBuilderServices.getBeanFactory();
+	}
+
+	public FlowDefinitionLocator getFlowDefinitionLocator() {
+		return flowDefinitionLocator;
+	}
+
+	public FlowBuilderServices getFlowBuilderServices() {
+		return flowBuilderServices;
+	}
+}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/FlowBuilderServices.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/FlowBuilderServices.java
new file mode 100644
index 00000000..1563a5f5
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/FlowBuilderServices.java
@@ -0,0 +1,121 @@
+package org.springframework.webflow.engine.builder.support;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.binding.convert.ConversionService;
+import org.springframework.binding.convert.support.DefaultConversionService;
+import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.context.ResourceLoaderAware;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.util.Assert;
+import org.springframework.webflow.action.BeanInvokingActionFactory;
+import org.springframework.webflow.core.expression.DefaultExpressionParserFactory;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.engine.State;
+import org.springframework.webflow.engine.builder.FlowArtifactFactory;
+import org.springframework.webflow.engine.builder.ViewFactoryCreator;
+import org.springframework.webflow.execution.Action;
+
+public class FlowBuilderServices implements ResourceLoaderAware, BeanFactoryAware {
+
+	/**
+	 * The factory encapsulating the creation of central Flow artifacts such as {@link Flow flows} and
+	 * {@link State states}.
+	 */
+	private FlowArtifactFactory flowArtifactFactory = new FlowArtifactFactory();
+
+	/**
+	 * The factory encapsulating the creation of bean invoking actions, actions that adapt methods on objects to the
+	 * {@link Action} interface.
+	 */
+	private BeanInvokingActionFactory beanInvokingActionFactory = new BeanInvokingActionFactory();
+
+	/**
+	 * The view factory creator.
+	 */
+	private ViewFactoryCreator viewFactoryCreator;
+
+	/**
+	 * The conversion service.
+	 */
+	private ConversionService conversionService = new DefaultConversionService();
+
+	/**
+	 * The parser for parsing expression strings into expression objects.
+	 */
+	private ExpressionParser expressionParser = DefaultExpressionParserFactory.getExpressionParser();
+
+	/**
+	 * A resource loader that can load resources.
+	 */
+	private ResourceLoader resourceLoader;
+
+	/**
+	 * The Spring bean factory used.
+	 */
+	private BeanFactory beanFactory;
+
+	public FlowArtifactFactory getFlowArtifactFactory() {
+		return flowArtifactFactory;
+	}
+
+	public void setFlowArtifactFactory(FlowArtifactFactory flowArtifactFactory) {
+		Assert.notNull(flowArtifactFactory, "The flow artifact factory is required");
+		this.flowArtifactFactory = flowArtifactFactory;
+	}
+
+	public BeanInvokingActionFactory getBeanInvokingActionFactory() {
+		return beanInvokingActionFactory;
+	}
+
+	public void setBeanInvokingActionFactory(BeanInvokingActionFactory beanInvokingActionFactory) {
+		Assert.notNull(beanInvokingActionFactory, "The bean invoking action factory is required");
+		this.beanInvokingActionFactory = beanInvokingActionFactory;
+	}
+
+	public ViewFactoryCreator getViewFactoryCreator() {
+		return viewFactoryCreator;
+	}
+
+	public void setViewFactoryCreator(ViewFactoryCreator viewFactoryCreator) {
+		Assert.notNull("The view factory creator cannot be null");
+		this.viewFactoryCreator = viewFactoryCreator;
+	}
+
+	public ConversionService getConversionService() {
+		return conversionService;
+	}
+
+	public void setConversionService(ConversionService conversionService) {
+		Assert.notNull(conversionService, "The type conversion service cannot be null");
+		this.conversionService = conversionService;
+	}
+
+	public ExpressionParser getExpressionParser() {
+		return expressionParser;
+	}
+
+	public void setExpressionParser(ExpressionParser expressionParser) {
+		Assert.notNull(expressionParser, "The expression parser cannot be null");
+		this.expressionParser = expressionParser;
+	}
+
+	public ResourceLoader getResourceLoader() {
+		return resourceLoader;
+	}
+
+	public void setResourceLoader(ResourceLoader resourceLoader) {
+		Assert.notNull("The resource loader cannot be null");
+		this.resourceLoader = resourceLoader;
+	}
+
+	public BeanFactory getBeanFactory() {
+		return beanFactory;
+	}
+
+	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		Assert.notNull("The bean factory cannot be null");
+		this.beanFactory = beanFactory;
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToTargetStateResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/TextToTargetStateResolver.java
similarity index 73%
rename from spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToTargetStateResolver.java
rename to spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/TextToTargetStateResolver.java
index 07c8da83..0ca991fc 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToTargetStateResolver.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/TextToTargetStateResolver.java
@@ -13,13 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.engine.builder;
+package org.springframework.webflow.engine.builder.support;
 
 import org.springframework.binding.convert.ConversionContext;
 import org.springframework.binding.convert.support.AbstractConverter;
 import org.springframework.binding.expression.Expression;
+import org.springframework.binding.expression.ExpressionParser;
 import org.springframework.webflow.engine.TargetStateResolver;
+import org.springframework.webflow.engine.builder.FlowBuilderContext;
 import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
+import org.springframework.webflow.execution.RequestContext;
 
 /**
  * Converter that takes an encoded string representation and produces a corresponding {@link TargetStateResolver}
@@ -37,7 +40,7 @@ import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
  * @author Keith Donald
  * @author Erwin Vervaet
  */
-public class TextToTargetStateResolver extends AbstractConverter {
+class TextToTargetStateResolver extends AbstractConverter {
 
 	/**
 	 * Prefix used when the user wants to use a custom TargetStateResolver implementation managed by a factory.
@@ -45,16 +48,16 @@ public class TextToTargetStateResolver extends AbstractConverter {
 	private static final String BEAN_PREFIX = "bean:";
 
 	/**
-	 * Locator to use for loading custom TargetStateResolver beans.
+	 * Context for flow builder services.
 	 */
-	private FlowServiceLocator flowServiceLocator;
+	private FlowBuilderContext flowBuilderContext;
 
 	/**
 	 * Create a new converter that converts strings to transition target state resolver objects. The given conversion
 	 * service will be used to do all necessary internal conversion (e.g. parsing expression strings).
 	 */
-	public TextToTargetStateResolver(FlowServiceLocator flowServiceLocator) {
-		this.flowServiceLocator = flowServiceLocator;
+	public TextToTargetStateResolver(FlowBuilderContext flowBuilderContext) {
+		this.flowBuilderContext = flowBuilderContext;
 	}
 
 	public Class[] getSourceClasses() {
@@ -67,11 +70,12 @@ public class TextToTargetStateResolver extends AbstractConverter {
 
 	protected Object doConvert(Object source, Class targetClass, ConversionContext context) throws Exception {
 		String targetStateId = (String) source;
-		if (flowServiceLocator.getExpressionParser().isDelimitedExpression(targetStateId)) {
-			Expression expression = flowServiceLocator.getExpressionParser().parseExpression(targetStateId);
+		ExpressionParser parser = flowBuilderContext.getExpressionParser();
+		if (parser.isEvalExpressionString(targetStateId)) {
+			Expression expression = parser.parseExpression(targetStateId, RequestContext.class, String.class, null);
 			return new DefaultTargetStateResolver(expression);
 		} else if (targetStateId.startsWith(BEAN_PREFIX)) {
-			return flowServiceLocator.getTargetStateResolver(targetStateId.substring(BEAN_PREFIX.length()));
+			return flowBuilderContext.getBeanFactory().getBean(targetStateId.substring(BEAN_PREFIX.length()));
 		} else {
 			return new DefaultTargetStateResolver(targetStateId);
 		}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToTransitionCriteria.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/TextToTransitionCriteria.java
similarity index 77%
rename from spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToTransitionCriteria.java
rename to spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/TextToTransitionCriteria.java
index f6a0a4ca..d6c198c9 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/TextToTransitionCriteria.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/support/TextToTransitionCriteria.java
@@ -13,17 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.engine.builder;
+package org.springframework.webflow.engine.builder.support;
 
 import org.springframework.binding.convert.ConversionContext;
 import org.springframework.binding.convert.ConversionException;
 import org.springframework.binding.convert.support.AbstractConverter;
 import org.springframework.binding.expression.Expression;
+import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.binding.expression.ExpressionVariable;
 import org.springframework.util.StringUtils;
 import org.springframework.webflow.engine.TransitionCriteria;
 import org.springframework.webflow.engine.WildcardTransitionCriteria;
+import org.springframework.webflow.engine.builder.FlowBuilderContext;
 import org.springframework.webflow.engine.support.BooleanExpressionTransitionCriteria;
 import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
+import org.springframework.webflow.execution.RequestContext;
 
 /**
  * Converter that takes an encoded string representation and produces a corresponding TransitionCriteria
@@ -45,7 +49,7 @@ import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
  * @author Keith Donald
  * @author Erwin Vervaet
  */
-public class TextToTransitionCriteria extends AbstractConverter {
+class TextToTransitionCriteria extends AbstractConverter {
 
 	/**
 	 * Prefix used when the user wants to use a custom TransitionCriteria implementation managed by a bean factory.
@@ -53,16 +57,16 @@ public class TextToTransitionCriteria extends AbstractConverter {
 	private static final String BEAN_PREFIX = "bean:";
 
 	/**
-	 * Locator to use for loading custom TransitionCriteria beans.
+	 * Context for flow builder services.
 	 */
-	private FlowServiceLocator flowServiceLocator;
+	private FlowBuilderContext flowBuilderContext;
 
 	/**
 	 * Create a new converter that converts strings to transition criteria objects. Custom transition criteria will be
 	 * looked up using given service locator.
 	 */
-	public TextToTransitionCriteria(FlowServiceLocator flowServiceLocator) {
-		this.flowServiceLocator = flowServiceLocator;
+	public TextToTransitionCriteria(FlowBuilderContext flowBuilderContext) {
+		this.flowBuilderContext = flowBuilderContext;
 	}
 
 	public Class[] getSourceClasses() {
@@ -75,14 +79,18 @@ public class TextToTransitionCriteria extends AbstractConverter {
 
 	protected Object doConvert(Object source, Class targetClass, ConversionContext context) throws Exception {
 		String encodedCriteria = (String) source;
+		ExpressionParser parser = flowBuilderContext.getExpressionParser();
 		if (!StringUtils.hasText(encodedCriteria)
 				|| WildcardTransitionCriteria.WILDCARD_EVENT_ID.equals(encodedCriteria)) {
 			return WildcardTransitionCriteria.INSTANCE;
-		} else if (flowServiceLocator.getExpressionParser().isDelimitedExpression(encodedCriteria)) {
-			Expression expression = flowServiceLocator.getExpressionParser().parseExpression(encodedCriteria);
+		} else if (parser.isEvalExpressionString(encodedCriteria)) {
+			ExpressionVariable[] variables = new ExpressionVariable[] { new ExpressionVariable("result", "lastEvent.id") };
+			Expression expression = parser.parseExpression(encodedCriteria, RequestContext.class, Boolean.class,
+					variables);
 			return createBooleanExpressionTransitionCriteria(expression);
 		} else if (encodedCriteria.startsWith(BEAN_PREFIX)) {
-			return flowServiceLocator.getTransitionCriteria(encodedCriteria.substring(BEAN_PREFIX.length()));
+			return flowBuilderContext.getBeanFactory().getBean(encodedCriteria.substring(BEAN_PREFIX.length()),
+					TransitionCriteria.class);
 		} else {
 			return createEventIdTransitionCriteria(encodedCriteria);
 		}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/DefaultDocumentLoader.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/DefaultDocumentLoader.java
index 4e5f8a83..ba739b5b 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/DefaultDocumentLoader.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/DefaultDocumentLoader.java
@@ -87,7 +87,6 @@ public class DefaultDocumentLoader implements DocumentLoader {
 	/**
 	 * Set a SAX entity resolver to be used for parsing. Can be overridden for custom entity resolution, for example
 	 * relative to some specific base path.
-	 * @see org.springframework.webflow.engine.builder.xml.WebFlowEntityResolver
 	 */
 	public void setEntityResolver(EntityResolver entityResolver) {
 		this.entityResolver = entityResolver;
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowBuilderContext.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowBuilderContext.java
new file mode 100644
index 00000000..2e8b1320
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowBuilderContext.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.engine.builder.xml;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.binding.convert.ConversionService;
+import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.webflow.action.BeanInvokingActionFactory;
+import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
+import org.springframework.webflow.engine.builder.FlowArtifactFactory;
+import org.springframework.webflow.engine.builder.FlowBuilderContext;
+import org.springframework.webflow.engine.builder.ViewFactoryCreator;
+
+class LocalFlowBuilderContext implements FlowBuilderContext {
+
+	private FlowBuilderContext parent;
+
+	private BeanFactory localFlowBeanFactory;
+
+	public LocalFlowBuilderContext(FlowBuilderContext parent, BeanFactory localFlowBeanFactory) {
+		this.parent = parent;
+		this.localFlowBeanFactory = localFlowBeanFactory;
+	}
+
+	public String getFlowId() {
+		return parent.getFlowId();
+	}
+
+	public AttributeMap getFlowAttributes() {
+		return parent.getFlowAttributes();
+	}
+
+	public FlowDefinitionLocator getFlowDefinitionLocator() {
+		return (FlowDefinitionLocator) localFlowBeanFactory.getBean("flowRegistry", FlowDefinitionLocator.class);
+	}
+
+	public FlowArtifactFactory getFlowArtifactFactory() {
+		if (localFlowBeanFactory.containsBean("flowArtifactFactory")) {
+			return (FlowArtifactFactory) localFlowBeanFactory.getBean("flowArtifactFactory", FlowArtifactFactory.class);
+		} else {
+			return parent.getFlowArtifactFactory();
+		}
+	}
+
+	public BeanInvokingActionFactory getBeanInvokingActionFactory() {
+		if (localFlowBeanFactory.containsBean("beanInvokingActionFactory")) {
+			return (BeanInvokingActionFactory) localFlowBeanFactory.getBean("beanInvokingActionFactory",
+					BeanInvokingActionFactory.class);
+		} else {
+			return parent.getBeanInvokingActionFactory();
+		}
+	}
+
+	public ViewFactoryCreator getViewFactoryCreator() {
+		if (localFlowBeanFactory.containsBean("viewFactoryCreator")) {
+			return (ViewFactoryCreator) localFlowBeanFactory.getBean("viewFactoryCreator", ViewFactoryCreator.class);
+		} else {
+			return parent.getViewFactoryCreator();
+		}
+	}
+
+	public ConversionService getConversionService() {
+		if (localFlowBeanFactory.containsBean("conversionService")) {
+			return (ConversionService) localFlowBeanFactory.getBean("conversionService", ConversionService.class);
+		} else {
+			return parent.getConversionService();
+		}
+	}
+
+	public ExpressionParser getExpressionParser() {
+		if (localFlowBeanFactory.containsBean("expressionParser")) {
+			return (ExpressionParser) localFlowBeanFactory.getBean("expressionParser", ExpressionParser.class);
+		} else {
+			return parent.getExpressionParser();
+		}
+	}
+
+	public ResourceLoader getResourceLoader() {
+		return (ResourceLoader) getBeanFactory();
+	}
+
+	public BeanFactory getBeanFactory() {
+		return localFlowBeanFactory;
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowServiceLocator.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowServiceLocator.java
deleted file mode 100644
index 1e055db3..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowServiceLocator.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import java.util.Stack;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.binding.convert.ConversionService;
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.webflow.action.BeanInvokingActionFactory;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.FlowAttributeMapper;
-import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
-import org.springframework.webflow.engine.TargetStateResolver;
-import org.springframework.webflow.engine.TransitionCriteria;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.engine.builder.FlowArtifactFactory;
-import org.springframework.webflow.engine.builder.FlowArtifactLookupException;
-import org.springframework.webflow.engine.builder.FlowServiceLocator;
-import org.springframework.webflow.execution.Action;
-
-/**
- * Flow service locator that searches flow-local registries first before querying the global, externally managed flow
- * service locator.
- * 
    
- * Internal helper class of the {@link org.springframework.webflow.engine.builder.xml.XmlFlowBuilder}. Package private
- * to highlight it's non-public nature.
- * 
- * @see org.springframework.webflow.engine.builder.xml.XmlFlowBuilder
- * 
- * @author Keith Donald
- */
-class LocalFlowServiceLocator implements FlowServiceLocator {
-
-	/**
-	 * The stack of registries.
-	 */
-	private Stack localRegistries = new Stack();
-
-	/**
-	 * The parent service locator.
-	 */
-	private FlowServiceLocator parent;
-
-	/**
-	 * Creates a new local service locator.
-	 * @param parent the parent service locator
-	 */
-	public LocalFlowServiceLocator(FlowServiceLocator parent) {
-		this.parent = parent;
-	}
-
-	/**
-	 * Push a new registry onto the stack.
-	 * @param registry the local registry
-	 */
-	public void push(LocalFlowServiceRegistry registry) {
-		localRegistries.push(registry);
-	}
-
-	/**
-	 * Pops all registries off the stack until the stack is empty.
-	 */
-	public void diposeOfAnyRegistries() {
-		while (!localRegistries.isEmpty()) {
-			pop();
-		}
-	}
-
-	/**
-	 * Pop a registry off the stack.
-	 */
-	public LocalFlowServiceRegistry pop() {
-		return (LocalFlowServiceRegistry) localRegistries.pop();
-	}
-
-	/**
-	 * Returns the top registry on the stack.
-	 */
-	public LocalFlowServiceRegistry top() {
-		return (LocalFlowServiceRegistry) localRegistries.peek();
-	}
-
-	/**
-	 * Returns true if this locator has no local registries.
-	 */
-	public boolean isEmpty() {
-		return localRegistries.isEmpty();
-	}
-
-	// implementing FlowServiceLocator
-
-	public Flow getSubflow(String id) throws FlowArtifactLookupException {
-		Flow currentFlow = getCurrentFlow();
-		// quick check for recursive subflow
-		if (currentFlow.getId().equals(id)) {
-			return currentFlow;
-		}
-		// check local inline flows
-		if (currentFlow.containsInlineFlow(id)) {
-			return currentFlow.getInlineFlow(id);
-		}
-		// check externally managed top-level flows
-		return parent.getSubflow(id);
-	}
-
-	public Action getAction(String id) throws FlowArtifactLookupException {
-		if (containsBean(id)) {
-			return (Action) getBean(id, Action.class);
-		} else {
-			return parent.getAction(id);
-		}
-	}
-
-	public FlowAttributeMapper getAttributeMapper(String id) throws FlowArtifactLookupException {
-		if (containsBean(id)) {
-			return (FlowAttributeMapper) getBean(id, FlowAttributeMapper.class);
-		} else {
-			return parent.getAttributeMapper(id);
-		}
-	}
-
-	public TransitionCriteria getTransitionCriteria(String id) throws FlowArtifactLookupException {
-		if (containsBean(id)) {
-			return (TransitionCriteria) getBean(id, TransitionCriteria.class);
-		} else {
-			return parent.getTransitionCriteria(id);
-		}
-	}
-
-	public TargetStateResolver getTargetStateResolver(String id) throws FlowArtifactLookupException {
-		if (containsBean(id)) {
-			return (TargetStateResolver) getBean(id, TargetStateResolver.class);
-		} else {
-			return parent.getTargetStateResolver(id);
-		}
-	}
-
-	public ViewSelector getViewSelector(String id) throws FlowArtifactLookupException {
-		if (containsBean(id)) {
-			return (ViewSelector) getBean(id, ViewSelector.class);
-		} else {
-			return parent.getViewSelector(id);
-		}
-	}
-
-	public FlowExecutionExceptionHandler getExceptionHandler(String id) throws FlowArtifactLookupException {
-		if (containsBean(id)) {
-			return (FlowExecutionExceptionHandler) getBean(id, FlowExecutionExceptionHandler.class);
-		} else {
-			return parent.getExceptionHandler(id);
-		}
-	}
-
-	public FlowArtifactFactory getFlowArtifactFactory() {
-		return parent.getFlowArtifactFactory();
-	}
-
-	public BeanInvokingActionFactory getBeanInvokingActionFactory() {
-		return parent.getBeanInvokingActionFactory();
-	}
-
-	public BeanFactory getBeanFactory() {
-		return top().getBeanFactory();
-	}
-
-	public ResourceLoader getResourceLoader() {
-		return parent.getResourceLoader();
-	}
-
-	public ExpressionParser getExpressionParser() {
-		return parent.getExpressionParser();
-	}
-
-	public ConversionService getConversionService() {
-		return parent.getConversionService();
-	}
-
-	// internal helpers
-
-	/**
-	 * Returns the flow for the registry at the top of the stack.
-	 */
-	protected Flow getCurrentFlow() {
-		return top().getFlow();
-	}
-
-	/**
-	 * Does this flow local service locator contain a bean defintion for the given id?
-	 */
-	protected boolean containsBean(String id) {
-		if (localRegistries.isEmpty()) {
-			return false;
-		} else {
-			return getBeanFactory().containsBean(id);
-		}
-	}
-
-	/**
-	 * Get the identified bean and make sure it is of the required type.
-	 */
-	protected Object getBean(String id, Class artifactType) throws FlowArtifactLookupException {
-		try {
-			return getBeanFactory().getBean(id, artifactType);
-		} catch (BeansException e) {
-			throw new FlowArtifactLookupException(id, artifactType, e);
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowServiceRegistry.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowServiceRegistry.java
deleted file mode 100644
index 8b9584f6..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/LocalFlowServiceRegistry.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.webflow.engine.Flow;
-
-/**
- * Simple object that holds a reference to a local bean factory housing services needed by a flow definition at
- * execution time.
- * 
    
- * Internal helper class of the {@link org.springframework.webflow.engine.builder.xml.XmlFlowBuilder}. Package private
- * to highlight it's non-public nature.
- * 
- * @see org.springframework.webflow.engine.builder.xml.XmlFlowBuilder
- * @see org.springframework.webflow.engine.builder.xml.LocalFlowServiceLocator
- * 
- * @author Keith Donald
- */
-class LocalFlowServiceRegistry {
-
-	/**
-	 * The flow this registry is for (and scoped by).
-	 */
-	private Flow flow;
-
-	/**
-	 * The local registry holding the artifacts local to the flow.
-	 */
-	private BeanFactory beanFactory;
-
-	/**
-	 * Create a new local service registry.
-	 * @param flow the flow this registry is for (and scoped by)
-	 * @param beanFactory the actual backing registry - a Spring bean factory
-	 */
-	public LocalFlowServiceRegistry(Flow flow, BeanFactory beanFactory) {
-		this.flow = flow;
-		this.beanFactory = beanFactory;
-	}
-
-	/**
-	 * Returns the flow this registry is for (and scoped by).
-	 */
-	public Flow getFlow() {
-		return flow;
-	}
-
-	/**
-	 * Returns the bean factory acting as the physical registry.
-	 */
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/WebFlowEntityResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/WebFlowEntityResolver.java
index 6ed9484b..493eff8e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/WebFlowEntityResolver.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/WebFlowEntityResolver.java
@@ -24,7 +24,7 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
- * EntityResolver implementation for the Spring Web Flow 1.0 XML Schema. This will load the XSD from the classpath.
+ * EntityResolver implementation for the Spring Web Flow 2.0 XML Schema. This will load the XSD from the classpath.
  * 
    
  * The xmlns of the XSD expected to be resolved:
  * 
@@ -33,15 +33,15 @@ import org.xml.sax.SAXException;
  *     <flow xmlns="http://www.springframework.org/schema/webflow"
  *           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  *           xsi:schemaLocation="http://www.springframework.org/schema/webflow
- *                               http://www.springframework.org/schema/webflow/spring-webflow-1.0.xsd">
+ *                               http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
  *
* * @author Erwin Vervaet * @author Ben Hale */ -public class WebFlowEntityResolver implements EntityResolver { +class WebFlowEntityResolver implements EntityResolver { - private static final String WEBFLOW_ELEMENT = "spring-webflow-1.0"; + private static final String WEBFLOW_ELEMENT = "spring-webflow-2.0"; public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { if (systemId != null && systemId.indexOf(WEBFLOW_ELEMENT) > systemId.lastIndexOf("/")) { diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java index abac845a..4b729067 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java @@ -27,11 +27,12 @@ import javax.xml.parsers.ParserConfigurationException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import org.springframework.binding.convert.ConversionException; import org.springframework.binding.convert.ConversionExecutor; import org.springframework.binding.convert.ConversionService; +import org.springframework.binding.expression.EvaluationException; import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ExpressionParser; -import org.springframework.binding.expression.SettableExpression; import org.springframework.binding.expression.support.CollectionAddingExpression; import org.springframework.binding.mapping.AttributeMapper; import org.springframework.binding.mapping.DefaultAttributeMapper; @@ -43,14 +44,18 @@ import org.springframework.binding.method.Parameters; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.Resource; +import org.springframework.core.io.ResourceLoader; import org.springframework.core.style.ToStringCreator; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.GenericWebApplicationContext; +import org.springframework.web.context.support.ServletContextResource; import org.springframework.webflow.action.ActionResultExposer; import org.springframework.webflow.action.EvaluateAction; +import org.springframework.webflow.action.ExternalRedirectAction; +import org.springframework.webflow.action.FlowDefinitionRedirectAction; import org.springframework.webflow.action.SetAction; import org.springframework.webflow.core.collection.AttributeMap; import org.springframework.webflow.core.collection.LocalAttributeMap; @@ -63,19 +68,19 @@ import org.springframework.webflow.engine.FlowVariable; import org.springframework.webflow.engine.TargetStateResolver; import org.springframework.webflow.engine.Transition; import org.springframework.webflow.engine.TransitionCriteria; -import org.springframework.webflow.engine.ViewSelector; -import org.springframework.webflow.engine.builder.BaseFlowBuilder; import org.springframework.webflow.engine.builder.FlowArtifactFactory; import org.springframework.webflow.engine.builder.FlowBuilderException; -import org.springframework.webflow.engine.builder.FlowServiceLocator; -import org.springframework.webflow.engine.support.AttributeExpression; +import org.springframework.webflow.engine.builder.support.AbstractFlowBuilder; +import org.springframework.webflow.engine.builder.support.ActionInvokingViewFactory; import org.springframework.webflow.engine.support.BeanFactoryFlowVariable; import org.springframework.webflow.engine.support.BooleanExpressionTransitionCriteria; import org.springframework.webflow.engine.support.SimpleFlowVariable; import org.springframework.webflow.engine.support.TransitionCriteriaChain; import org.springframework.webflow.engine.support.TransitionExecutingFlowExecutionExceptionHandler; import org.springframework.webflow.execution.Action; +import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.ScopeType; +import org.springframework.webflow.execution.ViewFactory; import org.springframework.webflow.util.ResourceHolder; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -102,13 +107,13 @@ import org.xml.sax.SAXException; *

* This builder will setup a flow-local bean factory for the flow being constructed. That flow-local bean factory will * be populated with XML bean definitions contained in files referenced using the "import" element. The flow-local bean - * factory will use the bean factory defining this flow builder as a parent. As such, the flow can access artifacts in - * either its flow-local bean factory or in the parent bean factory hierarchy, e.g. the bean factory of the dispatcher. + * factory will use the bean factory of this flow builder as a parent. As such, the flow can access artifacts in either + * its flow-local bean factory or in the parent bean factory hierarchy, e.g. the bean factory of the dispatcher. * * @author Erwin Vervaet * @author Keith Donald */ -public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { +public class XmlFlowBuilder extends AbstractFlowBuilder implements ResourceHolder { // recognized XML elements and attributes @@ -154,8 +159,6 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { private static final String VIEW_STATE_ELEMENT = "view-state"; - private static final String VIEW_ATTRIBUTE = "view"; - private static final String DECISION_STATE_ELEMENT = "decision-state"; private static final String IF_ELEMENT = "if"; @@ -230,23 +233,45 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { private static final String EXCEPTION_HANDLER_ELEMENT = "exception-handler"; - private static final String INLINE_FLOW_ELEMENT = "inline-flow"; - private static final String IMPORT_ELEMENT = "import"; private static final String RESOURCE_ATTRIBUTE = "resource"; + private static final String VIEW_ATTRIBUTE = "view"; + + /** + * Prefix used when the encoded view name wants to specify that a redirect is required. ("redirect:") + */ + private static final String REDIRECT_PREFIX = "redirect:"; + + /** + * Prefix used when the encoded view name wants to specify that a redirect to an external URL is required. + * ("externalRedirect:") + */ + private static final String EXTERNAL_REDIRECT_PREFIX = "externalRedirect:"; + + /** + * Prefix used when the encoded view name wants to specify that a redirect to a flow definition is requred. + * ("flowRedirect:") + */ + private static final String FLOW_DEFINITION_REDIRECT_PREFIX = "flowRedirect:"; + + /** + * Prefix used when the user wants to use a ViewSelector implementation managed by a bean factory. ("bean:") + */ + private static final String BEAN_PREFIX = "bean:"; + /** * The resource from which the document element being parsed was read. Used as a location for relative resource * lookup. */ - protected Resource location; + protected Resource resource; /** * A flow service locator local to this builder that first looks in a locally-managed Spring bean factory for * services before searching the externally managed {@link #getFlowServiceLocator() service locator}. */ - private LocalFlowServiceLocator localFlowServiceLocator; + private LocalFlowBuilderContext localFlowBuilderContext; /** * The loader for loading the flow definition resource XML document. @@ -258,40 +283,14 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { */ private Document document; - /** - * Create a new XML flow builder parsing the document at the specified location. - * @param location the location of the XML-based flow definition resource - */ - public XmlFlowBuilder(Resource location) { - setLocation(location); - } - /** * Create a new XML flow builder parsing the document at the specified location, using the provided service locator * to access externally managed flow artifacts. - * @param location the location of the XML-based flow definition resource - * @param flowServiceLocator the locator for services needed by this builder to build its Flow + * @param resource the location of the XML-based flow definition resource */ - public XmlFlowBuilder(Resource location, FlowServiceLocator flowServiceLocator) { - super(flowServiceLocator); - setLocation(location); - } - - /** - * Returns the resource from which the document element was loaded. This is used for location relative loading of - * other resources. - */ - public Resource getLocation() { - return location; - } - - /** - * Sets the resource from which the document element was loaded. This is used for location relative loading of other - * resources. - */ - public void setLocation(Resource location) { - Assert.notNull(location, "The resource location of the XML-based flow definition is required"); - this.location = location; + public XmlFlowBuilder(Resource resource) { + Assert.notNull(resource, "The resource location of the XML-based flow definition is required"); + this.resource = resource; } /** @@ -304,25 +303,24 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { this.documentLoader = documentLoader; } - public String toString() { - return new ToStringCreator(this).append("location", location).toString(); - } - // implementing FlowBuilder - public void init(String id, AttributeMap attributes) throws FlowBuilderException { - localFlowServiceLocator = new LocalFlowServiceLocator(getFlowServiceLocator()); + protected void doInit() throws FlowBuilderException { try { - document = documentLoader.loadDocument(location); + document = documentLoader.loadDocument(resource); + initLocalFlowContext(getDocumentElement()); } catch (IOException e) { - throw new FlowBuilderException("Could not access the XML flow definition resource at " + location, e); + throw new FlowBuilderException("Could not access the XML flow definition resource at " + resource, e); } catch (ParserConfigurationException e) { throw new FlowBuilderException("Could not configure the parser to parse the XML flow definition at " - + location, e); + + resource, e); } catch (SAXException e) { - throw new FlowBuilderException("Could not parse the XML flow definition document at " + location, e); + throw new FlowBuilderException("Could not parse the XML flow definition document at " + resource, e); } - setFlow(parseFlow(id, attributes, getDocumentElement())); + } + + protected Flow createFlow() { + return parseFlow(getDocumentElement()); } public void buildVariables() throws FlowBuilderException { @@ -330,17 +328,16 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } public void buildInputMapper() throws FlowBuilderException { - getFlow().setInputMapper(parseInputMapper(getDocumentElement())); + AttributeMapper inputMapper = parseInputMapper(getDocumentElement()); + if (inputMapper != null) { + getFlow().setInputMapper(inputMapper); + } } public void buildStartActions() throws FlowBuilderException { parseAndAddStartActions(getDocumentElement(), getFlow()); } - public void buildInlineFlows() throws FlowBuilderException { - parseAndAddInlineFlowDefinitions(getDocumentElement(), getFlow()); - } - public void buildStates() throws FlowBuilderException { parseAndAddStateDefinitions(getDocumentElement(), getFlow()); } @@ -354,23 +351,24 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } public void buildOutputMapper() throws FlowBuilderException { - getFlow().setOutputMapper(parseOutputMapper(getDocumentElement())); + AttributeMapper outputMapper = parseOutputMapper(getDocumentElement()); + if (outputMapper != null) { + getFlow().setOutputMapper(outputMapper); + } } public void buildExceptionHandlers() throws FlowBuilderException { getFlow().getExceptionHandlerSet().addAll(parseExceptionHandlers(getDocumentElement())); } - public void dispose() { - super.dispose(); - localFlowServiceLocator.diposeOfAnyRegistries(); + protected void doDispose() { document = null; } // implementing ResourceHolder public Resource getResource() { - return location; + return resource; } // helpers @@ -392,131 +390,84 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { /** * Returns the flow service locator local to this builder. */ - protected FlowServiceLocator getLocalFlowServiceLocator() { - return localFlowServiceLocator; + protected LocalFlowBuilderContext getLocalContext() { + return localFlowBuilderContext; } /** * Returns the artifact factory of the flow service locator local to this builder. */ protected FlowArtifactFactory getFlowArtifactFactory() { - return getLocalFlowServiceLocator().getFlowArtifactFactory(); - } - - // utility (from Spring 2.x DomUtils) - - /** - * Utility method that returns the first child element identified by its name. - * @param ele the DOM element to analyze - * @param childEleName the child element name to look for - * @return the org.w3c.dom.Element instance, or null if none found - */ - protected Element getChildElementByTagName(Element ele, String childEleName) { - NodeList nl = ele.getChildNodes(); - for (int i = 0; i < nl.getLength(); i++) { - Node node = nl.item(i); - if (node instanceof Element && nodeNameEquals(node, childEleName)) { - return (Element) node; - } - } - return null; - } - - /** - * Namespace-aware equals comparison. Returns true if either {@link Node#getLocalName} or - * {@link Node#getNodeName} equals desiredName, otherwise returns false. - */ - protected boolean nodeNameEquals(Node node, String desiredName) { - return desiredName.equals(node.getNodeName()) || desiredName.equals(node.getLocalName()); + return getLocalContext().getFlowArtifactFactory(); } // internal parsing logic and hook methods - private Flow parseFlow(String id, AttributeMap attributes, Element flowElement) { + private Flow parseFlow(Element flowElement) { if (!isFlowElement(flowElement)) { - throw new IllegalStateException("This is not the '" + FLOW_ELEMENT + "' element"); + throw new IllegalArgumentException("This is not the '" + FLOW_ELEMENT + "' element"); } - Flow flow = getFlowArtifactFactory().createFlow(id, parseAttributes(flowElement).union(attributes)); - initLocalServiceRegistry(flowElement, flow); - return flow; + String flowId = getLocalContext().getFlowId(); + AttributeMap externallyAssignedAttributes = getLocalContext().getFlowAttributes(); + AttributeMap flowAttributes = parseAttributes(flowElement).union(externallyAssignedAttributes); + return getFlowArtifactFactory().createFlow(flowId, flowAttributes); } private boolean isFlowElement(Element flowElement) { - return nodeNameEquals(flowElement, FLOW_ELEMENT); + return DomUtils.nodeNameEquals(flowElement, FLOW_ELEMENT); } - private void initLocalServiceRegistry(Element flowElement, Flow flow) { + private void initLocalFlowContext(Element flowElement) { List importElements = DomUtils.getChildElementsByTagName(flowElement, IMPORT_ELEMENT); Resource[] resources = new Resource[importElements.size()]; for (int i = 0; i < importElements.size(); i++) { Element importElement = (Element) importElements.get(i); try { - resources[i] = getLocation().createRelative(importElement.getAttribute(RESOURCE_ATTRIBUTE)); + resources[i] = getResource().createRelative(importElement.getAttribute(RESOURCE_ATTRIBUTE)); } catch (IOException e) { throw new FlowBuilderException("Could not access flow-relative artifact resource '" + importElement.getAttribute(RESOURCE_ATTRIBUTE) + "'", e); } } - localFlowServiceLocator.push(new LocalFlowServiceRegistry(flow, createLocalBeanFactory(flow, resources))); + this.localFlowBuilderContext = new LocalFlowBuilderContext(getContext(), createFlowBeanFactory(resources)); } - /** - * Create a bean factory serving as a local flow service registry. - * @param flow the current flow definition being built - * @param resources the file resources to assemble the bean factory from; typically XML-based - * @return the bean factory - * @since 1.0.4 - */ - protected BeanFactory createLocalBeanFactory(Flow flow, Resource[] resources) { + private BeanFactory createFlowBeanFactory(Resource[] resources) { // see if this factory has a parent - BeanFactory parent = null; - if (localFlowServiceLocator.isEmpty()) { - try { - parent = getFlowServiceLocator().getBeanFactory(); - } catch (UnsupportedOperationException e) { - // can't link to a parent - } - } else { - parent = localFlowServiceLocator.top().getBeanFactory(); - } + BeanFactory parent = getContext().getBeanFactory(); // determine the context implementation based on the current environment - GenericApplicationContext context; + GenericApplicationContext flowContext; if (parent instanceof WebApplicationContext) { GenericWebApplicationContext webContext = new GenericWebApplicationContext(); webContext.setServletContext(((WebApplicationContext) parent).getServletContext()); - context = webContext; + flowContext = webContext; } else { - context = new GenericApplicationContext(); + flowContext = new GenericApplicationContext(); } // set the parent if necessary if (parent instanceof ApplicationContext) { - context.setParent((ApplicationContext) parent); + flowContext.setParent((ApplicationContext) parent); } else { if (parent != null) { - context.getBeanFactory().setParentBeanFactory(parent); + flowContext.getBeanFactory().setParentBeanFactory(parent); } } - context.setResourceLoader(getFlowServiceLocator().getResourceLoader()); - new XmlBeanDefinitionReader(context).loadBeanDefinitions(resources); - registerLocalBeans(flow, context.getDefaultListableBeanFactory()); - context.refresh(); - return context; + flowContext.setResourceLoader(new FlowRelativeResourceLoader(resource)); + new XmlBeanDefinitionReader(flowContext).loadBeanDefinitions(resources); + registerFlowBeans(flowContext.getDefaultListableBeanFactory()); + flowContext.refresh(); + return flowContext; } /** * Register beans in the bean factory local to the flow definition being built. *

- * Subclasses may override this metod to customize the population of the bean factory local to the flow definition + * Subclasses may override this method to customize the population of the bean factory local to the flow definition * being built; for example, to register mock implementations of services in a test environment. - * @param flow the current flow definition being built * @param beanFactory the bean factory; register local beans with it using * {@link ConfigurableBeanFactory#registerSingleton(String, Object)} */ - protected void registerLocalBeans(Flow flow, ConfigurableBeanFactory beanFactory) { - } - - private void destroyLocalServiceRegistry() { - localFlowServiceLocator.pop(); + protected void registerFlowBeans(ConfigurableBeanFactory beanFactory) { } private void parseAndAddFlowVariables(Element flowElement, Flow flow) { @@ -529,82 +480,55 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { private FlowVariable parseVariable(Element element) { ScopeType scope = parseScope(element, ScopeType.FLOW); if (StringUtils.hasText(element.getAttribute(BEAN_ATTRIBUTE))) { - BeanFactory beanFactory = getLocalFlowServiceLocator().getBeanFactory(); return new BeanFactoryFlowVariable(element.getAttribute(NAME_ATTRIBUTE), element - .getAttribute(BEAN_ATTRIBUTE), beanFactory, scope); + .getAttribute(BEAN_ATTRIBUTE), getLocalContext().getBeanFactory(), scope); } else { if (StringUtils.hasText(element.getAttribute(CLASS_ATTRIBUTE))) { Class variableClass = (Class) fromStringTo(Class.class).execute(element.getAttribute(CLASS_ATTRIBUTE)); return new SimpleFlowVariable(element.getAttribute(NAME_ATTRIBUTE), variableClass, scope); } else { - BeanFactory beanFactory = getLocalFlowServiceLocator().getBeanFactory(); - return new BeanFactoryFlowVariable(element.getAttribute(NAME_ATTRIBUTE), null, beanFactory, scope); + return new BeanFactoryFlowVariable(element.getAttribute(NAME_ATTRIBUTE), null, getLocalContext() + .getBeanFactory(), scope); } } } private void parseAndAddStartActions(Element element, Flow flow) { - Element startElement = getChildElementByTagName(element, START_ACTIONS_ELEMENT); + Element startElement = DomUtils.getChildElementByTagName(element, START_ACTIONS_ELEMENT); if (startElement != null) { flow.getStartActionList().addAll(parseAnnotatedActions(startElement)); } } private void parseAndAddEndActions(Element element, Flow flow) { - Element endElement = getChildElementByTagName(element, END_ACTIONS_ELEMENT); + Element endElement = DomUtils.getChildElementByTagName(element, END_ACTIONS_ELEMENT); if (endElement != null) { flow.getEndActionList().addAll(parseAnnotatedActions(endElement)); } } private void parseAndAddGlobalTransitions(Element element, Flow flow) { - Element globalTransitionsElement = getChildElementByTagName(element, GLOBAL_TRANSITIONS_ELEMENT); + Element globalTransitionsElement = DomUtils.getChildElementByTagName(element, GLOBAL_TRANSITIONS_ELEMENT); if (globalTransitionsElement != null) { flow.getGlobalTransitionSet().addAll(parseTransitions(globalTransitionsElement)); } } - private void parseAndAddInlineFlowDefinitions(Element parentFlowElement, Flow flow) { - List inlineFlowElements = DomUtils.getChildElementsByTagName(parentFlowElement, INLINE_FLOW_ELEMENT); - for (Iterator it = inlineFlowElements.iterator(); it.hasNext();) { - Element inlineFlowElement = (Element) it.next(); - String inlineFlowId = inlineFlowElement.getAttribute(ID_ATTRIBUTE); - Element flowElement = getChildElementByTagName(inlineFlowElement, FLOW_ATTRIBUTE); - Flow inlineFlow = parseFlow(inlineFlowId, null, flowElement); - buildInlineFlow(flowElement, inlineFlow); - flow.addInlineFlow(inlineFlow); - } - } - - private void buildInlineFlow(Element flowElement, Flow inlineFlow) { - parseAndAddFlowVariables(flowElement, inlineFlow); - inlineFlow.setInputMapper(parseInputMapper(flowElement)); - parseAndAddStartActions(flowElement, inlineFlow); - parseAndAddInlineFlowDefinitions(flowElement, inlineFlow); - parseAndAddStateDefinitions(flowElement, inlineFlow); - parseAndAddGlobalTransitions(flowElement, inlineFlow); - parseAndAddEndActions(flowElement, inlineFlow); - inlineFlow.setOutputMapper(parseOutputMapper(flowElement)); - inlineFlow.getExceptionHandlerSet().addAll(parseExceptionHandlers(flowElement)); - - destroyLocalServiceRegistry(); - } - private void parseAndAddStateDefinitions(Element flowElement, Flow flow) { NodeList childNodeList = flowElement.getChildNodes(); for (int i = 0; i < childNodeList.getLength(); i++) { Node childNode = childNodeList.item(i); if (childNode instanceof Element) { Element stateElement = (Element) childNode; - if (nodeNameEquals(stateElement, ACTION_STATE_ELEMENT)) { + if (DomUtils.nodeNameEquals(stateElement, ACTION_STATE_ELEMENT)) { parseAndAddActionState(stateElement, flow); - } else if (nodeNameEquals(stateElement, VIEW_STATE_ELEMENT)) { + } else if (DomUtils.nodeNameEquals(stateElement, VIEW_STATE_ELEMENT)) { parseAndAddViewState(stateElement, flow); - } else if (nodeNameEquals(stateElement, DECISION_STATE_ELEMENT)) { + } else if (DomUtils.nodeNameEquals(stateElement, DECISION_STATE_ELEMENT)) { parseAndAddDecisionState(stateElement, flow); - } else if (nodeNameEquals(stateElement, SUBFLOW_STATE_ELEMENT)) { + } else if (DomUtils.nodeNameEquals(stateElement, SUBFLOW_STATE_ELEMENT)) { parseAndAddSubflowState(stateElement, flow); - } else if (nodeNameEquals(stateElement, END_STATE_ELEMENT)) { + } else if (DomUtils.nodeNameEquals(stateElement, END_STATE_ELEMENT)) { parseAndAddEndState(stateElement, flow); } } @@ -618,7 +542,7 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private String getStartStateId(Element element) { - Element startStateElement = getChildElementByTagName(element, START_STATE_ELEMENT); + Element startStateElement = DomUtils.getChildElementByTagName(element, START_STATE_ELEMENT); return startStateElement.getAttribute(IDREF_ATTRIBUTE); } @@ -629,8 +553,13 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private void parseAndAddViewState(Element element, Flow flow) { + ViewInfo viewInfo = parseViewInfo(element); + boolean redirect = false; + if (viewInfo.redirect != null) { + redirect = viewInfo.redirect.booleanValue(); + } getFlowArtifactFactory().createViewState(parseId(element), flow, parseEntryActions(element), - parseViewSelector(element), parseRenderActions(element), parseTransitions(element), + viewInfo.viewFactory, redirect, parseRenderActions(element), parseTransitions(element), parseExceptionHandlers(element), parseExitActions(element), parseAttributes(element)); } @@ -648,7 +577,7 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { private void parseAndAddEndState(Element element, Flow flow) { getFlowArtifactFactory().createEndState(parseId(element), flow, parseEntryActions(element), - parseViewSelector(element), parseOutputMapper(element), parseExceptionHandlers(element), + parseFinalResponseAction(element), parseOutputMapper(element), parseExceptionHandlers(element), parseAttributes(element)); } @@ -657,7 +586,7 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private Action[] parseEntryActions(Element element) { - Element entryActionsElement = getChildElementByTagName(element, ENTRY_ACTIONS_ELEMENT); + Element entryActionsElement = DomUtils.getChildElementByTagName(element, ENTRY_ACTIONS_ELEMENT); if (entryActionsElement != null) { return parseAnnotatedActions(entryActionsElement); } else { @@ -665,8 +594,67 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } } + private ViewInfo parseViewInfo(Element element) { + String encodedView = element.getAttribute(VIEW_ATTRIBUTE); + if (encodedView == null || encodedView.length() == 0) { + // TODO what to do here? + return null; + } else if (encodedView.startsWith(REDIRECT_PREFIX)) { + String encodedViewName = encodedView.substring(REDIRECT_PREFIX.length()); + Expression viewName = getExpressionParser().parseExpression(encodedViewName, RequestContext.class, + String.class, null); + Expression viewResource = new ViewResourceExpression(viewName, getLocalContext().getResourceLoader()); + ViewFactory viewFactory = getLocalContext().getViewFactoryCreator().createViewFactory(viewResource); + return new ViewInfo(viewFactory, Boolean.TRUE); + } else if (encodedView.startsWith(EXTERNAL_REDIRECT_PREFIX)) { + String encodedUrl = encodedView.substring(EXTERNAL_REDIRECT_PREFIX.length()); + Expression externalUrl = getExpressionParser().parseExpression(encodedUrl, RequestContext.class, + String.class, null); + ViewFactory viewFactory = new ActionInvokingViewFactory(new ExternalRedirectAction(externalUrl)); + return new ViewInfo(viewFactory, Boolean.FALSE); + } else if (encodedView.startsWith(FLOW_DEFINITION_REDIRECT_PREFIX)) { + String flowRedirect = encodedView.substring(FLOW_DEFINITION_REDIRECT_PREFIX.length()); + ViewFactory viewFactory = new ActionInvokingViewFactory(FlowDefinitionRedirectAction.create(flowRedirect)); + return new ViewInfo(viewFactory, Boolean.FALSE); + } else if (encodedView.startsWith(BEAN_PREFIX)) { + ViewFactory viewFactory = (ViewFactory) getLocalContext().getBeanFactory().getBean( + encodedView.substring(BEAN_PREFIX.length()), ViewFactory.class); + return new ViewInfo(viewFactory, Boolean.FALSE); + } else { + Expression viewName = getExpressionParser().parseExpression(encodedView, RequestContext.class, + String.class, null); + Expression viewResource = new ViewResourceExpression(viewName, getLocalContext().getResourceLoader()); + ViewFactory viewFactory = getLocalContext().getViewFactoryCreator().createViewFactory(viewResource); + return new ViewInfo(viewFactory, null); + } + } + + private Action parseFinalResponseAction(Element element) { + String encodedView = element.getAttribute(VIEW_ATTRIBUTE); + if (encodedView == null || encodedView.length() == 0) { + // null final responses are allowed + return null; + } else if (encodedView.startsWith(EXTERNAL_REDIRECT_PREFIX)) { + String encodedUrl = encodedView.substring(EXTERNAL_REDIRECT_PREFIX.length()); + Expression externalUrl = getExpressionParser().parseExpression(encodedUrl, RequestContext.class, + String.class, null); + return new ExternalRedirectAction(externalUrl); + } else if (encodedView.startsWith(FLOW_DEFINITION_REDIRECT_PREFIX)) { + String flowRedirect = encodedView.substring(FLOW_DEFINITION_REDIRECT_PREFIX.length()); + return FlowDefinitionRedirectAction.create(flowRedirect); + } else if (encodedView.startsWith(BEAN_PREFIX)) { + return (Action) getLocalContext().getBeanFactory().getBean(encodedView.substring(BEAN_PREFIX.length()), + Action.class); + } else { + Expression viewName = getExpressionParser().parseExpression(encodedView, RequestContext.class, + String.class, null); + Expression viewResource = new ViewResourceExpression(viewName, getLocalContext().getResourceLoader()); + return getLocalContext().getViewFactoryCreator().createFinalResponseAction(viewResource); + } + } + private Action[] parseRenderActions(Element element) { - Element renderActionsElement = getChildElementByTagName(element, RENDER_ACTIONS_ELEMENT); + Element renderActionsElement = DomUtils.getChildElementByTagName(element, RENDER_ACTIONS_ELEMENT); if (renderActionsElement != null) { return parseAnnotatedActions(renderActionsElement); } else { @@ -675,7 +663,7 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private Action[] parseExitActions(Element element) { - Element exitActionsElement = getChildElementByTagName(element, EXIT_ACTIONS_ELEMENT); + Element exitActionsElement = DomUtils.getChildElementByTagName(element, EXIT_ACTIONS_ELEMENT); if (exitActionsElement != null) { return parseAnnotatedActions(exitActionsElement); } else { @@ -689,8 +677,6 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { for (Iterator it = transitionElements.iterator(); it.hasNext();) { Element transitionElement = (Element) it.next(); if (!StringUtils.hasText(transitionElement.getAttribute(ON_EXCEPTION_ATTRIBUTE))) { - // the "on-exception transition" is not really a transition but rather - // a FlowExecutionExceptionHandler (see parseTransitionExecutingExceptionHandlers) transitions.add(parseTransition(transitionElement)); } } @@ -707,13 +693,9 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { parseAttributes(element)); } - private ViewSelector parseViewSelector(Element element) { - String viewName = element.getAttribute(VIEW_ATTRIBUTE); - return (ViewSelector) fromStringTo(ViewSelector.class).execute(viewName); - } - private Flow parseSubflow(Element element) { - return getLocalFlowServiceLocator().getSubflow(element.getAttribute(FLOW_ATTRIBUTE)); + return (Flow) getLocalContext().getFlowDefinitionLocator().getFlowDefinition( + element.getAttribute(FLOW_ATTRIBUTE)); } private AnnotatedAction[] parseAnnotatedActions(Element element) { @@ -724,17 +706,16 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { if (!(childNode instanceof Element)) { continue; } - - if (nodeNameEquals(childNode, ACTION_ELEMENT)) { + if (DomUtils.nodeNameEquals(childNode, ACTION_ELEMENT)) { // parse standard action actions.add(parseAnnotatedAction((Element) childNode)); - } else if (nodeNameEquals(childNode, BEAN_ACTION_ELEMENT)) { + } else if (DomUtils.nodeNameEquals(childNode, BEAN_ACTION_ELEMENT)) { // parse bean invoking action actions.add(parseAnnotatedBeanInvokingAction((Element) childNode)); - } else if (nodeNameEquals(childNode, EVALUATE_ACTION_ELEMENT)) { + } else if (DomUtils.nodeNameEquals(childNode, EVALUATE_ACTION_ELEMENT)) { // parse evaluate action actions.add(parseAnnotatedEvaluateAction((Element) childNode)); - } else if (nodeNameEquals(childNode, SET_ELEMENT)) { + } else if (DomUtils.nodeNameEquals(childNode, SET_ELEMENT)) { // parse set action actions.add(parseAnnotatedSetAction((Element) childNode)); } @@ -753,7 +734,7 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { private Action parseAction(Element element) { String actionId = element.getAttribute(BEAN_ATTRIBUTE); - return getLocalFlowServiceLocator().getAction(actionId); + return (Action) getLocalContext().getBeanFactory().getBean(actionId, Action.class); } private AnnotatedAction parseCommonProperties(Element element, AnnotatedAction annotated) { @@ -775,22 +756,24 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { Parameters parameters = parseMethodParameters(element); MethodSignature methodSignature = new MethodSignature(methodName, parameters); ActionResultExposer resultExposer = parseMethodResultExposer(element); - return getLocalFlowServiceLocator().getBeanInvokingActionFactory().createBeanInvokingAction(beanId, - getLocalFlowServiceLocator().getBeanFactory(), methodSignature, resultExposer, - getLocalFlowServiceLocator().getConversionService(), null); + return getLocalContext().getBeanInvokingActionFactory().createBeanInvokingAction(beanId, + getLocalContext().getBeanFactory(), methodSignature, resultExposer, + getLocalContext().getConversionService(), null); } private Parameters parseMethodParameters(Element element) { - Element methodArgumentsElement = getChildElementByTagName(element, METHOD_ARGUMENTS_ELEMENT); + Element methodArgumentsElement = DomUtils.getChildElementByTagName(element, METHOD_ARGUMENTS_ELEMENT); if (methodArgumentsElement == null) { return Parameters.NONE; } Parameters parameters = new Parameters(); Iterator it = DomUtils.getChildElementsByTagName(methodArgumentsElement, ARGUMENT_ELEMENT).iterator(); + ExpressionParser parser = getLocalContext().getExpressionParser(); while (it.hasNext()) { Element argumentElement = (Element) it.next(); - Expression name = getLocalFlowServiceLocator().getExpressionParser().parseExpression( - argumentElement.getAttribute(EXPRESSION_ATTRIBUTE)); + String expressionString = parser.parseEvalExpressionString(argumentElement + .getAttribute(EXPRESSION_ATTRIBUTE)); + Expression name = parser.parseExpression(expressionString, RequestContext.class, Object.class, null); Class type = null; if (argumentElement.hasAttribute(PARAMETER_TYPE_ATTRIBUTE)) { type = (Class) fromStringTo(Class.class) @@ -802,7 +785,7 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private ActionResultExposer parseMethodResultExposer(Element element) { - Element resultElement = getChildElementByTagName(element, METHOD_RESULT_ELEMENT); + Element resultElement = DomUtils.getChildElementByTagName(element, METHOD_RESULT_ELEMENT); if (resultElement != null) { return parseActionResultExposer(resultElement); } else { @@ -821,13 +804,19 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private Action parseEvaluateAction(Element element) { - String expressionString = element.getAttribute(EXPRESSION_ATTRIBUTE); - Expression expression = getLocalFlowServiceLocator().getExpressionParser().parseExpression(expressionString); + String expressionString = getExpressionParser().parseEvalExpressionString( + element.getAttribute(EXPRESSION_ATTRIBUTE)); + Expression expression = getExpressionParser().parseExpression(expressionString, RequestContext.class, + Object.class, null); return new EvaluateAction(expression, parseEvaluationResultExposer(element)); } + private ExpressionParser getExpressionParser() { + return getLocalContext().getExpressionParser(); + } + private ActionResultExposer parseEvaluationResultExposer(Element element) { - Element resultElement = getChildElementByTagName(element, EVALUATION_RESULT_ELEMENT); + Element resultElement = DomUtils.getChildElementByTagName(element, EVALUATION_RESULT_ELEMENT); if (resultElement != null) { return parseActionResultExposer(resultElement); } else { @@ -842,10 +831,10 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { private Action parseSetAction(Element element) { String attributeExpressionString = element.getAttribute(ATTRIBUTE_ATTRIBUTE); - SettableExpression attributeExpression = getLocalFlowServiceLocator().getExpressionParser() - .parseSettableExpression(attributeExpressionString); - Expression valueExpression = getLocalFlowServiceLocator().getExpressionParser().parseExpression( - element.getAttribute(VALUE_ATTRIBUTE)); + Expression attributeExpression = getExpressionParser().parseExpression(attributeExpressionString, + MutableAttributeMap.class, Object.class, null); + Expression valueExpression = getExpressionParser().parseExpression(element.getAttribute(VALUE_ATTRIBUTE), + RequestContext.class, Object.class, null); return new SetAction(attributeExpression, parseScope(element, ScopeType.REQUEST), valueExpression); } @@ -882,7 +871,6 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { private Object convertPropertyValue(Element element, String stringValue) { if (element.hasAttribute(TYPE_ATTRIBUTE)) { Class targetClass = (Class) fromStringTo(Class.class).execute(element.getAttribute(TYPE_ATTRIBUTE)); - // convert string value to instance of target class return fromStringTo(targetClass).execute(stringValue); } else { return stringValue; @@ -909,8 +897,9 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private Transition parseThen(Element element) { - Expression expression = getLocalFlowServiceLocator().getExpressionParser().parseExpression( - element.getAttribute(TEST_ATTRIBUTE)); + String expressionString = getExpressionParser().parseEvalExpressionString(element.getAttribute(TEST_ATTRIBUTE)); + Expression expression = getExpressionParser().parseExpression(expressionString, RequestContext.class, + Boolean.class, null); TransitionCriteria matchingCriteria = new BooleanExpressionTransitionCriteria(expression); TargetStateResolver targetStateResolver = (TargetStateResolver) fromStringTo(TargetStateResolver.class) .execute(element.getAttribute(THEN_ATTRIBUTE)); @@ -924,24 +913,25 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private FlowAttributeMapper parseFlowAttributeMapper(Element element) { - Element mapperElement = getChildElementByTagName(element, ATTRIBUTE_MAPPER_ELEMENT); + Element mapperElement = DomUtils.getChildElementByTagName(element, ATTRIBUTE_MAPPER_ELEMENT); if (mapperElement == null) { return null; } if (StringUtils.hasText(mapperElement.getAttribute(BEAN_ATTRIBUTE))) { - return getLocalFlowServiceLocator().getAttributeMapper(mapperElement.getAttribute(BEAN_ATTRIBUTE)); + return (FlowAttributeMapper) getLocalContext().getBeanFactory().getBean( + mapperElement.getAttribute(BEAN_ATTRIBUTE), FlowAttributeMapper.class); } else { return new ImmutableFlowAttributeMapper(parseInputMapper(mapperElement), parseOutputMapper(mapperElement)); } } private AttributeMapper parseInputMapper(Element element) { - Element mapperElement = getChildElementByTagName(element, INPUT_MAPPER_ELEMENT); + Element mapperElement = DomUtils.getChildElementByTagName(element, INPUT_MAPPER_ELEMENT); if (mapperElement != null) { DefaultAttributeMapper mapper = new DefaultAttributeMapper(); - parseSimpleAttributeMappings(mapper, DomUtils.getChildElementsByTagName(mapperElement, + parseSimpleInputAttributeMappings(mapper, DomUtils.getChildElementsByTagName(mapperElement, INPUT_ATTRIBUTE_ELEMENT)); - parseMappings(mapper, mapperElement); + parseMappings(mapper, mapperElement, MutableAttributeMap.class, RequestContext.class); return mapper; } else { return null; @@ -949,30 +939,33 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private AttributeMapper parseOutputMapper(Element element) { - Element mapperElement = getChildElementByTagName(element, OUTPUT_MAPPER_ELEMENT); + Element mapperElement = DomUtils.getChildElementByTagName(element, OUTPUT_MAPPER_ELEMENT); if (mapperElement != null) { DefaultAttributeMapper mapper = new DefaultAttributeMapper(); - parseSimpleAttributeMappings(mapper, DomUtils.getChildElementsByTagName(mapperElement, + parseSimpleOutputAttributeMappings(mapper, DomUtils.getChildElementsByTagName(mapperElement, OUTPUT_ATTRIBUTE_ELEMENT)); - parseMappings(mapper, mapperElement); + parseMappings(mapper, mapperElement, RequestContext.class, MutableAttributeMap.class); return mapper; } else { return null; } } - private void parseMappings(DefaultAttributeMapper mapper, Element element) { - ExpressionParser parser = getLocalFlowServiceLocator().getExpressionParser(); + private void parseMappings(DefaultAttributeMapper mapper, Element element, Class sourceClass, Class targetClass) { + ExpressionParser parser = getLocalContext().getExpressionParser(); List mappingElements = DomUtils.getChildElementsByTagName(element, MAPPING_ELEMENT); for (Iterator it = mappingElements.iterator(); it.hasNext();) { Element mappingElement = (Element) it.next(); - Expression source = parser.parseExpression(mappingElement.getAttribute(SOURCE_ATTRIBUTE)); - SettableExpression target = null; + Expression source = parser.parseExpression(parser.parseEvalExpressionString(mappingElement + .getAttribute(SOURCE_ATTRIBUTE)), sourceClass, Object.class, null); + Expression target = null; if (StringUtils.hasText(mappingElement.getAttribute(TARGET_ATTRIBUTE))) { - target = parser.parseSettableExpression(mappingElement.getAttribute(TARGET_ATTRIBUTE)); + target = parser.parseExpression(parser.parseEvalExpressionString(mappingElement + .getAttribute(TARGET_ATTRIBUTE)), targetClass, Object.class, null); } else if (StringUtils.hasText(mappingElement.getAttribute(TARGET_COLLECTION_ATTRIBUTE))) { - target = new CollectionAddingExpression(parser.parseSettableExpression(mappingElement - .getAttribute(TARGET_COLLECTION_ATTRIBUTE))); + target = new CollectionAddingExpression(parser.parseExpression(parser + .parseEvalExpressionString(mappingElement.getAttribute(TARGET_COLLECTION_ATTRIBUTE)), + targetClass, Object.class, null)); } if (getRequired(mappingElement, false)) { mapper.addMapping(new RequiredMapping(source, target, parseTypeConverter(mappingElement))); @@ -982,16 +975,36 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } } - private void parseSimpleAttributeMappings(DefaultAttributeMapper mapper, List elements) { - ExpressionParser parser = getLocalFlowServiceLocator().getExpressionParser(); + private void parseSimpleInputAttributeMappings(DefaultAttributeMapper mapper, List elements) { + ExpressionParser parser = getLocalContext().getExpressionParser(); for (Iterator it = elements.iterator(); it.hasNext();) { Element element = (Element) it.next(); - SettableExpression attribute = parser.parseSettableExpression(element.getAttribute(NAME_ATTRIBUTE)); - SettableExpression expression = new AttributeExpression(attribute, parseScope(element, ScopeType.FLOW)); + String expressionString = parser.parseEvalExpressionString(element.getAttribute(NAME_ATTRIBUTE)); + Expression attributeExpression = parser.parseExpression(expressionString, MutableAttributeMap.class, + Object.class, null); + Expression scopedAttributeExpression = new ScopedAttributeExpression(attributeExpression, parseScope( + element, ScopeType.FLOW)); if (getRequired(element, false)) { - mapper.addMapping(new RequiredMapping(expression, expression, null)); + mapper.addMapping(new RequiredMapping(attributeExpression, scopedAttributeExpression, null)); } else { - mapper.addMapping(new Mapping(expression, expression, null)); + mapper.addMapping(new Mapping(attributeExpression, scopedAttributeExpression, null)); + } + } + } + + private void parseSimpleOutputAttributeMappings(DefaultAttributeMapper mapper, List elements) { + ExpressionParser parser = getLocalContext().getExpressionParser(); + for (Iterator it = elements.iterator(); it.hasNext();) { + Element element = (Element) it.next(); + String expressionString = parser.parseEvalExpressionString(element.getAttribute(NAME_ATTRIBUTE)); + Expression attributeExpression = parser.parseExpression(expressionString, MutableAttributeMap.class, + Object.class, null); + Expression scopedAttributeExpression = new ScopedAttributeExpression(attributeExpression, parseScope( + element, ScopeType.FLOW)); + if (getRequired(element, false)) { + mapper.addMapping(new RequiredMapping(scopedAttributeExpression, attributeExpression, null)); + } else { + mapper.addMapping(new Mapping(scopedAttributeExpression, attributeExpression, null)); } } } @@ -1010,7 +1023,7 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { String to = element.getAttribute(TO_ATTRIBUTE); if (StringUtils.hasText(from)) { if (StringUtils.hasText(to)) { - ConversionService service = getLocalFlowServiceLocator().getConversionService(); + ConversionService service = getLocalContext().getConversionService(); Class sourceClass = (Class) fromStringTo(Class.class).execute(from); Class targetClass = (Class) fromStringTo(Class.class).execute(to); return service.getConversionExecutor(sourceClass, targetClass); @@ -1037,7 +1050,7 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { private FlowExecutionExceptionHandler[] parseTransitionExecutingExceptionHandlers(Element element) { List transitionElements = Collections.EMPTY_LIST; if (isFlowElement(element)) { - Element globalTransitionsElement = getChildElementByTagName(element, GLOBAL_TRANSITIONS_ELEMENT); + Element globalTransitionsElement = DomUtils.getChildElementByTagName(element, GLOBAL_TRANSITIONS_ELEMENT); if (globalTransitionsElement != null) { transitionElements = DomUtils.getChildElementsByTagName(globalTransitionsElement, TRANSITION_ELEMENT); } @@ -1048,8 +1061,6 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { for (Iterator it = transitionElements.iterator(); it.hasNext();) { Element transitionElement = (Element) it.next(); if (StringUtils.hasText(transitionElement.getAttribute(ON_EXCEPTION_ATTRIBUTE))) { - // the "on-exception transitions" are not really transitions but rather - // FlowExecutionExceptionHandlers exceptionHandlers.add(parseTransitionExecutingExceptionHandler(transitionElement)); } } @@ -1079,6 +1090,93 @@ public class XmlFlowBuilder extends BaseFlowBuilder implements ResourceHolder { } private FlowExecutionExceptionHandler parseCustomExceptionHandler(Element element) { - return getLocalFlowServiceLocator().getExceptionHandler(element.getAttribute(BEAN_ATTRIBUTE)); + return (FlowExecutionExceptionHandler) getLocalContext().getBeanFactory().getBean( + element.getAttribute(BEAN_ATTRIBUTE), FlowExecutionExceptionHandler.class); + } + + private ConversionExecutor fromStringTo(Class targetType) throws ConversionException { + return getLocalContext().getConversionService().getConversionExecutor(String.class, targetType); + } + + private static class ViewInfo { + + private ViewFactory viewFactory; + + private Boolean redirect; + + public ViewInfo(ViewFactory viewFactory, Boolean redirect) { + this.viewFactory = viewFactory; + this.redirect = redirect; + } + } + + private static class ScopedAttributeExpression implements Expression { + + private Expression scopeMapExpression; + + private ScopeType scopeType; + + public ScopedAttributeExpression(Expression scopeMapExpression, ScopeType scopeType) { + this.scopeMapExpression = scopeMapExpression; + this.scopeType = scopeType; + } + + public Object getValue(Object target) throws EvaluationException { + MutableAttributeMap scopeMap = scopeType.getScope((RequestContext) target); + return scopeMapExpression.getValue(scopeMap); + } + + public void setValue(Object target, Object value) throws EvaluationException { + MutableAttributeMap scopeMap = scopeType.getScope((RequestContext) target); + scopeMapExpression.setValue(scopeMap, value); + } + } + + private static class ViewResourceExpression implements Expression { + private Expression viewLocation; + private ResourceLoader viewResourceLoader; + + public ViewResourceExpression(Expression viewLocation, ResourceLoader viewResourceLoader) { + this.viewLocation = viewLocation; + this.viewResourceLoader = viewResourceLoader; + } + + public Object getValue(Object target) throws EvaluationException { + String location = (String) viewLocation.getValue(target); + Resource resource = viewResourceLoader.getResource(location); + if (resource instanceof ServletContextResource) { + return ((ServletContextResource) resource).getPath(); + } else { + throw new IllegalArgumentException("Unsupported resource " + resource); + } + } + + public void setValue(Object target, Object value) throws EvaluationException { + throw new UnsupportedOperationException("Set value not supported"); + } + } + + private static class FlowRelativeResourceLoader implements ResourceLoader { + private Resource resource; + + public FlowRelativeResourceLoader(Resource resource) { + this.resource = resource; + } + + public ClassLoader getClassLoader() { + return resource.getClass().getClassLoader(); + } + + public Resource getResource(String location) { + try { + return resource.createRelative(location); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + + public String toString() { + return new ToStringCreator(this).append("location", resource).toString(); } } \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistrar.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistrar.java deleted file mode 100644 index abb385cc..00000000 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistrar.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2004-2007 the original author or authors. - * - * 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.springframework.webflow.engine.builder.xml; - -import org.springframework.core.io.Resource; -import org.springframework.util.Assert; -import org.springframework.webflow.definition.registry.ExternalizedFlowDefinitionRegistrar; -import org.springframework.webflow.definition.registry.FlowDefinitionHolder; -import org.springframework.webflow.definition.registry.FlowDefinitionResource; -import org.springframework.webflow.engine.builder.FlowAssembler; -import org.springframework.webflow.engine.builder.FlowBuilder; -import org.springframework.webflow.engine.builder.FlowRegistryFactoryBean; -import org.springframework.webflow.engine.builder.FlowServiceLocator; -import org.springframework.webflow.engine.builder.RefreshableFlowDefinitionHolder; - -/** - * A flow definition registrar that populates a flow definition registry with flow definitions defined in externalized - * XML resources. Typically used in conjunction with a {@link FlowRegistryFactoryBean} but may also be used stand-alone - * in programmatic fashion. - *

- * By default, a flow definition added to this registrar with the {@link #addLocation(Resource, String)} method will be - * will be assigned a registry identifier equal to the filename of the underlying definition resource, minus the - * filename extension. For example, a XML-based flow definition defined in the file "flow1.xml" will be identified as - * "flow1" when registered in a registry. - *

- * Programmatic usage example: - * - * 

- *     BeanFactory beanFactory = ...
- *     FlowDefinitionRegistry registry = new FlowDefinitionRegistryImpl();
- *     FlowServiceLocator flowServiceLocator =
- *         new DefaultFlowServiceLocator(registry, beanFactory);
- *     XmlFlowRegistrar registrar = new XmlFlowRegistrar(flowServiceLocator);
- *     File parent = new File("src/webapp/WEB-INF");
- *     registrar.add(new FileSystemResource(new File(parent, "flow1.xml"));
- *     registrar.add(new FileSystemResource(new File(parent, "flow2.xml"));
- *     registrar.registerFlowDefinitions(registry);
- *
- * - * @author Keith Donald - * @author Ben Hale - */ -public class XmlFlowRegistrar extends ExternalizedFlowDefinitionRegistrar { - - /** - * The loader of XML-based flow definition documents. - */ - private DocumentLoader documentLoader; - - /** - * Creates a new XML flow registrar. - * @param flowServiceLocator the locator needed to support flow definition assembly - */ - public XmlFlowRegistrar(FlowServiceLocator flowServiceLocator) { - Assert.notNull(flowServiceLocator, "The flow service locator is required"); - setFlowServiceLocator(flowServiceLocator); - } - - /** - * Sets the loader to load XML-based flow definition documents during flow definition assembly. Allows for - * customization over how documents are loaded. Optional. - * @param documentLoader the document loader - */ - public void setDocumentLoader(DocumentLoader documentLoader) { - this.documentLoader = documentLoader; - } - - // hook methods - - protected FlowDefinitionHolder createFlowDefinitionHolder(FlowDefinitionResource resource) { - FlowBuilder builder = createFlowBuilder(resource.getLocation()); - FlowAssembler assembler = new FlowAssembler(resource.getId(), resource.getAttributes(), builder); - return new RefreshableFlowDefinitionHolder(assembler); - } - - /** - * Factory method that creates and fully initializes the XML-based flow definition builder. - * @param location the xml-based resource - * @return the builder to build the flow definition from the resource. - */ - protected FlowBuilder createFlowBuilder(Resource location) { - XmlFlowBuilder builder = new XmlFlowBuilder(location, getFlowServiceLocator()); - if (documentLoader != null) { - builder.setDocumentLoader(documentLoader); - } - return builder; - } -} \ No newline at end of file diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-1.0.xsd b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-2.0.xsd similarity index 95% rename from spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-1.0.xsd rename to spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-2.0.xsd index ff9d2ad6..6e2951c7 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-1.0.xsd +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-2.0.xsd @@ -3,7 +3,7 @@ xmlns="http://www.springframework.org/schema/webflow" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.springframework.org/schema/webflow" - version="1.0.1"> + version="2.0"> @@ -224,10 +224,6 @@ A flow may also exhibit the following characteristics: (such as actions, exception handlers, view selectors, transition criteria, etc). (See the <import/> element) -
  • Finally, a flow may nest one or more other flows within this document to -use as subflows, referred to as 'inline flows'. -(See the <inline-flow/> element) - ]]> @@ -452,15 +448,6 @@ execution of this flow definition. Exception handlers may be attached at the sta - - - - - - - @@ -1953,8 +1940,7 @@ The bean id of a custom exception handler implementation to attach. For example: 
    @@ -1968,24 +1954,4 @@ For example:
 		
 	
 
-	
-		
-			
-				
-					
-						
-							
-								
-									
-								
-							
-						
-					
-				
-			
-		
-	
-	
 
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java
index 13f7ccfb..d379b28d 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImpl.java
@@ -19,11 +19,15 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.ListIterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.binding.message.MessageContext;
+import org.springframework.binding.message.MessageContextFactory;
+import org.springframework.binding.message.StateManageableMessageContext;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
 import org.springframework.webflow.context.ExternalContext;
@@ -35,14 +39,16 @@ import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.engine.RequestControlContext;
 import org.springframework.webflow.engine.State;
-import org.springframework.webflow.engine.ViewState;
+import org.springframework.webflow.engine.Transition;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
 import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.FlowSession;
-import org.springframework.webflow.execution.FlowSessionStatus;
-import org.springframework.webflow.execution.ViewSelection;
+import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.execution.RequestContextHolder;
 
 /**
  * Default implementation of FlowExecution that uses a stack-based data structure to manage spawned flow sessions. This
@@ -59,7 +65,7 @@ import org.springframework.webflow.execution.ViewSelection;
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
- * @author Ben Hale
+ * @author Jeremy Grelle
  */
 public class FlowExecutionImpl implements FlowExecution, Externalizable {
 
@@ -72,6 +78,11 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
 	 */
 	private transient Flow flow;
 
+	/**
+	 * A flag indicating if this execution has started.
+	 */
+	private boolean started;
+
 	/**
 	 * The stack of active, currently executing flow sessions. As subflows are spawned, they are pushed onto the stack.
 	 * As they end, they are popped off the stack.
@@ -85,6 +96,21 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
 	 */
 	private transient FlowExecutionListeners listeners;
 
+	/**
+	 * The factory for getting the key to assign this flow execution when needed for persistence.
+	 */
+	private transient FlowExecutionKeyFactory keyFactory;
+
+	/**
+	 * The factory for message contexts for tracking flow execution messages.
+	 */
+	private transient MessageContextFactory messageContextFactory;
+
+	/**
+	 * The key assigned to this flow execution. May be null if a key has not been assigned.
+	 */
+	private transient FlowExecutionKey key;
+
 	/**
 	 * The flash map ("flash scope").
 	 */
@@ -109,6 +135,11 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
 	 */
 	private String flowId;
 
+	/**
+	 * Serializable snapshot of this flow execution's messages.
+	 */
+	private Serializable messagesMemento;
+
 	/**
 	 * Default constructor required for externalizable serialization. Should NOT be called programmatically.
 	 */
@@ -116,28 +147,21 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
 	}
 
 	/**
-	 * Create a new flow execution executing the provided flow. This constructor is mainly used for testing.
+	 * Create a new flow execution executing the provided flow. Flow executions are normally created by a flow execution
+	 * factory.
 	 * @param flow the root flow of this flow execution
 	 */
 	public FlowExecutionImpl(Flow flow) {
-		this(flow, new FlowExecutionListener[0], null);
+		setFlow(flow);
+		this.listeners = new FlowExecutionListeners();
+		this.attributes = CollectionUtils.EMPTY_ATTRIBUTE_MAP;
+		this.flowSessions = new LinkedList();
+		this.conversationScope = new LocalAttributeMap();
 	}
 
-	/**
-	 * Create a new flow execution executing the provided flow.
-	 * @param flow the root flow of this flow execution
-	 * @param listeners the listeners interested in flow execution lifecycle events
-	 * @param attributes flow execution system attributes
-	 */
-	public FlowExecutionImpl(Flow flow, FlowExecutionListener[] listeners, AttributeMap attributes) {
-		setFlow(flow);
-		this.flowSessions = new LinkedList();
-		this.listeners = new FlowExecutionListeners(listeners);
-		this.attributes = (attributes != null ? attributes : CollectionUtils.EMPTY_ATTRIBUTE_MAP);
-		this.conversationScope = new LocalAttributeMap();
-		if (logger.isDebugEnabled()) {
-			logger.debug("Created new execution of flow '" + flow.getId() + "'");
-		}
+	FlowExecutionImpl(String flowId, LinkedList flowSessions) {
+		this.flowId = flowId;
+		this.flowSessions = flowSessions;
 	}
 
 	public String getCaption() {
@@ -146,15 +170,30 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
 
 	// implementing FlowExecutionContext
 
+	public FlowExecutionKey getKey() {
+		return key;
+	}
+
 	public FlowDefinition getDefinition() {
 		return flow;
 	}
 
+	public boolean hasStarted() {
+		return started;
+	}
+
 	public boolean isActive() {
 		return !flowSessions.isEmpty();
 	}
 
 	public FlowSession getActiveSession() {
+		if (!isActive()) {
+			if (started) {
+				throw new IllegalStateException("No active session to access; this flow execution has ended");
+			} else {
+				throw new IllegalStateException("No active session to access; this flow execution has not been started");
+			}
+		}
 		return getActiveSessionInternal();
 	}
 
@@ -172,249 +211,98 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
 
 	// methods implementing FlowExecution
 
-	public ViewSelection start(MutableAttributeMap input, ExternalContext externalContext)
-			throws FlowExecutionException {
-		Assert.state(!isActive(), "This flow is already executing -- you cannot call 'start()' more than once");
+	public void start(ExternalContext externalContext) throws FlowExecutionException, IllegalStateException {
+		Assert.state(!started, "This flow has already been started; you cannot call 'start()' more than once");
 		if (logger.isDebugEnabled()) {
-			logger.debug("Starting execution with input '" + input + "'");
+			logger.debug("Starting execution in " + externalContext);
 		}
-		RequestControlContext context = createControlContext(externalContext);
-		getListeners().fireRequestSubmitted(context);
+		started = true;
+		RequestControlContext context = createControlContext(externalContext, createMessageContext());
+		RequestContextHolder.setRequestContext(context);
+		listeners.fireRequestSubmitted(context);
 		try {
-			try {
-				// launch a flow session for the root flow
-				ViewSelection selectedView = context.start(flow, input);
-				return pause(context, selectedView);
-			} catch (FlowExecutionException e) {
-				return pause(context, handleException(e, context));
-			} catch (Exception e) {
-				String flowId = context.getActiveFlow().getId();
-				String stateId = null;
-				if (context.getCurrentState() != null) {
-					stateId = context.getCurrentState().getId();
+			start(flow, flow.createExecutionInputMap(externalContext), context);
+		} catch (FlowExecutionException e) {
+			handleException(e, context);
+		} catch (Exception e) {
+			handleException(wrap(e), context);
+		} finally {
+			if (isActive()) {
+				saveMessages(context);
+				try {
+					listeners.firePaused(context);
+				} catch (Throwable e) {
+					logger.error("Flow execution listener threw exception", e);
 				}
-				FlowExecutionException flowException = new FlowExecutionException(flowId, stateId,
-						"Exception thrown in state '" + stateId + "' of flow '" + flowId + "'", e);
-				return pause(context, handleException(flowException, context));
 			}
-		} finally {
-			getListeners().fireRequestProcessed(context);
-		}
-	}
-
-	public ViewSelection signalEvent(String eventId, ExternalContext externalContext) throws FlowExecutionException {
-		assertActive();
-		if (logger.isDebugEnabled()) {
-			logger.debug("Resuming execution on user event '" + eventId + "'");
-		}
-		flashScope.clear();
-		RequestControlContext context = createControlContext(externalContext);
-		getListeners().fireRequestSubmitted(context);
-		try {
 			try {
-				resume(context);
-				Event event = new Event(externalContext, eventId, externalContext.getRequestParameterMap()
-						.asAttributeMap());
-				ViewSelection selectedView = context.signalEvent(event);
-				return pause(context, selectedView);
-			} catch (FlowExecutionException e) {
-				return pause(context, handleException(e, context));
-			} catch (Exception e) {
-				String flowId = context.getActiveFlow().getId();
-				String stateId = context.getCurrentState().getId();
-				FlowExecutionException flowException = new FlowExecutionException(flowId, stateId,
-						"Exception thrown in state '" + stateId + "' of flow '" + flowId + "'", e);
-				return pause(context, handleException(flowException, context));
+				listeners.fireRequestProcessed(context);
+			} catch (Throwable e) {
+				logger.error("Flow execution listener threw exception", e);
 			}
-		} finally {
-			getListeners().fireRequestProcessed(context);
+			RequestContextHolder.setRequestContext(null);
 		}
 	}
 
-	public ViewSelection refresh(ExternalContext externalContext) throws FlowExecutionException {
-		assertActive();
-		if (logger.isDebugEnabled()) {
-			logger.debug("Resuming execution for refresh");
-		}
-		RequestControlContext context = createControlContext(externalContext);
-		getListeners().fireRequestSubmitted(context);
-		try {
-			try {
-				resume(context);
-				State currentState = getCurrentState();
-				if (!(currentState instanceof ViewState)) {
-					throw new IllegalStateException("Current state is not a view state - cannot refresh; "
-							+ "perhaps an unhandled exception occured in another state?");
-				}
-				ViewSelection selectedView = ((ViewState) currentState).refresh(context);
-				return pause(context, selectedView);
-			} catch (FlowExecutionException e) {
-				return pause(context, handleException(e, context));
-			} catch (Exception e) {
-				String flowId = context.getActiveFlow().getId();
-				String stateId = context.getCurrentState().getId();
-				FlowExecutionException flowException = new FlowExecutionException(flowId, stateId,
-						"Exception thrown in state '" + stateId + "' of flow '" + flowId + "'", e);
-				return pause(context, handleException(flowException, context));
-			}
-		} finally {
-			getListeners().fireRequestProcessed(context);
-		}
-	}
-
-	/**
-	 * Returns the listener list.
-	 * @return the attached execution listeners.
-	 */
-	FlowExecutionListeners getListeners() {
-		return listeners;
-	}
-
-	/**
-	 * Resume this flow execution.
-	 * @param context the state request context
-	 */
-	protected void resume(RequestControlContext context) {
-		getActiveSessionInternal().setStatus(FlowSessionStatus.ACTIVE);
-		getListeners().fireResumed(context);
-	}
-
-	/**
-	 * Pause this flow execution.
-	 * @param context the request control context
-	 * @param selectedView the initial selected view to render
-	 * @return the selected view to render
-	 */
-	protected ViewSelection pause(RequestControlContext context, ViewSelection selectedView) {
+	public void resume(ExternalContext externalContext) throws FlowExecutionException, IllegalStateException {
 		if (!isActive()) {
-			// view selected by an end state
-			return selectedView;
-		}
-		getActiveSessionInternal().setStatus(FlowSessionStatus.PAUSED);
-		getListeners().firePaused(context, selectedView);
-		if (logger.isDebugEnabled()) {
-			if (selectedView != null) {
-				logger.debug("Paused to render " + selectedView + " and wait for user input");
+			if (started) {
+				throw new IllegalStateException("This flow execution cannot be resumed; it has ended");
 			} else {
-				logger.debug("Paused to wait for user input");
+				throw new IllegalStateException("This flow execution cannot be resumed; it has not been started");
 			}
 		}
-		return selectedView;
-	}
-
-	/**
-	 * Handles an exception that occured performing an operation on this flow execution. First trys the set of exception
-	 * handlers associated with the offending state, then the handlers at the flow level.
-	 * @param exception the exception that occured
-	 * @param context the request control context the exception occured in
-	 * @return the selected error view, never null
-	 * @throws FlowExecutionException rethrows the exception if it was not handled at the state or flow level
-	 */
-	protected ViewSelection handleException(FlowExecutionException exception, RequestControlContext context)
-			throws FlowExecutionException {
-		getListeners().fireExceptionThrown(context, exception);
 		if (logger.isDebugEnabled()) {
-			logger.debug("Attempting to handle [" + exception + "]");
+			logger.debug("Resuming execution in " + externalContext);
 		}
+		RequestControlContext context = createControlContext(externalContext, createMessageContext());
+		RequestContextHolder.setRequestContext(context);
+		listeners.fireRequestSubmitted(context);
 		try {
-			// the state could be null if the flow was attempting a start operation
-			ViewSelection selectedView = tryStateHandlers(exception, context);
-			if (selectedView != null) {
-				return selectedView;
-			}
-			selectedView = tryFlowHandlers(exception, context);
-			if (selectedView != null) {
-				return selectedView;
-			}
-		} catch (FlowExecutionException newException) {
-			// exception handling resulted in a new FlowExecutionException, try to handle it
-			return handleException(newException, context);
-		}
-		if (logger.isDebugEnabled()) {
-			logger.debug("Rethrowing unhandled flow execution exception");
-		}
-		throw exception;
-	}
-
-	/**
-	 * Try to handle given exception using execution exception handlers registered at the state level. Returns null if
-	 * no handler handled the exception.
-	 */
-	private ViewSelection tryStateHandlers(FlowExecutionException exception, RequestControlContext context) {
-		ViewSelection selectedView = null;
-		if (exception.getStateId() != null) {
-			selectedView = getActiveFlow().getStateInstance(exception.getStateId()).handleException(exception, context);
-			if (selectedView != null) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("State '" + exception.getStateId() + "' handled exception");
+			listeners.fireResuming(context);
+			getActiveSessionInternal().getFlow().resume(context);
+		} catch (FlowExecutionException e) {
+			handleException(e, context);
+		} catch (Exception e) {
+			handleException(wrap(e), context);
+		} finally {
+			if (isActive()) {
+				saveMessages(context);
+				try {
+					listeners.firePaused(context);
+				} catch (Throwable e) {
+					logger.error("Flow execution listener threw exception", e);
 				}
 			}
-		}
-		return selectedView;
-	}
-
-	/**
-	 * Try to handle given exception using execution exception handlers registered at the flow level. Returns null if no
-	 * handler handled the exception.
-	 */
-	private ViewSelection tryFlowHandlers(FlowExecutionException exception, RequestControlContext context) {
-		ViewSelection selectedView = getActiveFlow().handleException(exception, context);
-		if (selectedView != null) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Flow '" + exception.getFlowId() + "' handled exception");
+			try {
+				listeners.fireRequestProcessed(context);
+			} catch (Throwable e) {
+				logger.error("Flow execution listener threw exception", e);
 			}
+			RequestContextHolder.setRequestContext(null);
 		}
-		return selectedView;
 	}
 
-	// internal helpers
+	private MessageContext createMessageContext() {
+		StateManageableMessageContext messageContext = messageContextFactory.createMessageContext();
+		if (messagesMemento != null) {
+			messageContext.restoreMessages(messagesMemento);
+		}
+		return messageContext;
+	}
+
+	private void saveMessages(RequestContext context) {
+		messagesMemento = ((StateManageableMessageContext) context.getMessageContext()).createMessagesMemento();
+	}
+
+	// subclassing hooks
 
 	/**
 	 * Create a flow execution control context.
 	 * @param externalContext the external context triggering this request
 	 */
-	protected RequestControlContext createControlContext(ExternalContext externalContext) {
-		return new RequestControlContextImpl(this, externalContext);
-	}
-
-	/**
-	 * Returns the currently active flow session.
-	 * @throws IllegalStateException this execution is not active
-	 */
-	FlowSessionImpl getActiveSessionInternal() throws IllegalStateException {
-		assertActive();
-		return (FlowSessionImpl) flowSessions.getLast();
-	}
-
-	/**
-	 * Set the state that is currently active in this flow execution.
-	 * @param newState the new current state
-	 */
-	protected void setCurrentState(State newState) {
-		getActiveSessionInternal().setState(newState);
-	}
-
-	/**
-	 * Activate a new FlowSession for the flow definition. Creates the new flow session and pushes it
-	 * onto the stack.
-	 * @param flow the flow definition
-	 * @return the new flow session
-	 */
-	protected FlowSession activateSession(Flow flow) {
-		FlowSessionImpl session;
-		if (!flowSessions.isEmpty()) {
-			FlowSessionImpl parent = getActiveSessionInternal();
-			parent.setStatus(FlowSessionStatus.SUSPENDED);
-			session = createFlowSession(flow, parent);
-		} else {
-			session = createFlowSession(flow, null);
-		}
-		flowSessions.add(session);
-		session.setStatus(FlowSessionStatus.STARTING);
-		if (logger.isDebugEnabled()) {
-			logger.debug("Starting " + session);
-		}
-		return session;
+	protected RequestControlContext createControlContext(ExternalContext externalContext, MessageContext messageContext) {
+		return new RequestControlContextImpl(this, externalContext, messageContext);
 	}
 
 	/**
@@ -423,118 +311,100 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
 	 * @param parent the flow session that should be the parent of the newly created flow session (may be null)
 	 * @return the newly created flow session
 	 */
-	FlowSessionImpl createFlowSession(Flow flow, FlowSessionImpl parent) {
+	protected FlowSessionImpl createFlowSession(Flow flow, FlowSessionImpl parent) {
 		return new FlowSessionImpl(flow, parent);
 	}
 
-	/**
-	 * End the active flow session, popping it of the stack.
-	 * @return the ended session
-	 */
-	public FlowSession endActiveFlowSession() {
-		FlowSessionImpl endingSession = (FlowSessionImpl) flowSessions.removeLast();
-		endingSession.setStatus(FlowSessionStatus.ENDED);
-		if (!flowSessions.isEmpty()) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Resuming session '" + getActiveSessionInternal().getDefinition().getId() + "' in state '"
-						+ getActiveSessionInternal().getState().getId() + "'");
-			}
-			getActiveSessionInternal().setStatus(FlowSessionStatus.ACTIVE);
-		} else {
-			if (logger.isDebugEnabled()) {
-				logger.debug("[Ended] - this execution is now inactive");
-			}
+	// package private request control context callbacks
+
+	void start(Flow flow, MutableAttributeMap input, RequestControlContext context) {
+		listeners.fireSessionCreating(context, flow);
+		FlowSession session = activateSession(flow);
+		listeners.fireSessionStarting(context, session, input);
+		flow.start(context, input);
+		listeners.fireSessionStarted(context, session);
+	}
+
+	void setCurrentState(State newState, RequestContext context) {
+		listeners.fireStateEntering(context, newState);
+		FlowSessionImpl session = getActiveSessionInternal();
+		State previousState = (State) session.getState();
+		session.setState(newState);
+		listeners.fireStateEntered(context, previousState);
+	}
+
+	void handleEvent(Event event, RequestControlContext context) {
+		listeners.fireEventSignaled(context, event);
+		getActiveSessionInternal().getFlow().handleEvent(context);
+	}
+
+	void execute(Transition transition, RequestControlContext context) {
+		transition.execute(getCurrentState(), context);
+	}
+
+	FlowSession endActiveFlowSession(MutableAttributeMap output, RequestControlContext context) {
+		FlowSessionImpl session = getActiveSessionInternal();
+		listeners.fireSessionEnding(context, session, output);
+		session.getFlow().end(context, output);
+		flowSessions.removeLast();
+		listeners.fireSessionEnded(context, session, output);
+		return session;
+	}
+
+	FlowExecutionKey assignKey() {
+		this.key = keyFactory.getKey(this);
+		if (logger.isDebugEnabled()) {
+			logger.debug("Assigned key " + this.key);
 		}
-		return endingSession;
+		return this.key;
 	}
 
-	/**
-	 * Make sure that this flow execution is active and throw an exception if it's not.
-	 */
-	private void assertActive() throws IllegalStateException {
-		if (!isActive()) {
-			throw new IllegalStateException(
-					"This flow execution is not active, it has either ended or has never been started.");
-		}
+	// package private setters for restoring transient state used by FlowExecutionImplServicesConfigurer
+
+	FlowExecutionListener[] getListeners() {
+		return this.listeners.getArray();
 	}
 
-	/**
-	 * Returns the currently active flow.
-	 */
-	private Flow getActiveFlow() {
-		return (Flow) getActiveSessionInternal().getDefinition();
+	void setListeners(FlowExecutionListener[] listeners) {
+		this.listeners = new FlowExecutionListeners(listeners);
 	}
 
-	/**
-	 * Returns the current state of this flow execution.
-	 */
-	private State getCurrentState() {
-		return (State) getActiveSessionInternal().getState();
+	void setAttributes(AttributeMap attributes) {
+		this.attributes = attributes;
 	}
 
-	// custom serialization (implementation of Externalizable for optimized storage)
-
-	public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-		flowId = (String) in.readObject();
-		flowSessions = (LinkedList) in.readObject();
-		flashScope = (MutableAttributeMap) in.readObject();
+	void setKeyFactory(FlowExecutionKeyFactory keyFactory) {
+		this.keyFactory = keyFactory;
 	}
 
-	public void writeExternal(ObjectOutput out) throws IOException {
-		out.writeObject(flowId);
-		out.writeObject(flowSessions);
-		out.writeObject(flashScope);
+	void setMessageContextFactory(MessageContextFactory messageContextFactory) {
+		this.messageContextFactory = messageContextFactory;
 	}
 
-	public String toString() {
-		if (!isActive()) {
-			return "[Inactive " + getCaption() + "]";
-		} else {
-			if (flow != null) {
-				return new ToStringCreator(this).append("flow", flow.getId()).append("flowSessions", flowSessions)
-						.append("flashScope", flashScope).toString();
-			} else {
-				return "[Unhydrated " + getCaption() + "]";
-			}
-		}
-	}
-
-	// package private setters for restoring transient state
-	// used by FlowExecutionImplStateRestorer
+	// Used by FlowExecutionImplStateRestorer
 
 	/**
 	 * Restore the flow definition of this flow execution.
 	 */
 	void setFlow(Flow flow) {
-		Assert.notNull(flow, "The root flow definition is required");
 		this.flow = flow;
 		this.flowId = flow.getId();
 	}
 
-	/**
-	 * Restore the listeners of this flow execution.
-	 */
-	void setListeners(FlowExecutionListeners listeners) {
-		Assert.notNull(listeners, "The execution listener list is required");
-		this.listeners = listeners;
-	}
-
-	/**
-	 * Restore the execution attributes of this flow execution.
-	 */
-	void setAttributes(AttributeMap attributes) {
-		Assert.notNull(conversationScope, "The execution attribute map is required");
-		this.attributes = attributes;
-	}
-
 	/**
 	 * Restore conversation scope for this flow execution.
 	 */
 	void setConversationScope(MutableAttributeMap conversationScope) {
-		Assert.notNull(conversationScope, "The conversation scope map is required");
 		this.conversationScope = conversationScope;
 	}
 
+	/**
+	 * Restore the flow execution key.
+	 */
+	void setKey(FlowExecutionKey key) {
+		this.key = key;
+	}
+
 	/**
 	 * Returns the flow definition id of this flow execution.
 	 */
@@ -577,4 +447,143 @@ public class FlowExecutionImpl implements FlowExecution, Externalizable {
 		return flowSessions.listIterator(1);
 	}
 
+	// custom serialization (implementation of Externalizable for optimized storage)
+
+	public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+		started = in.readBoolean();
+		flowId = (String) in.readObject();
+		flowSessions = (LinkedList) in.readObject();
+		flashScope = (MutableAttributeMap) in.readObject();
+		messagesMemento = (Serializable) in.readObject();
+	}
+
+	public void writeExternal(ObjectOutput out) throws IOException {
+		out.writeBoolean(started);
+		out.writeObject(flowId);
+		out.writeObject(flowSessions);
+		out.writeObject(flashScope);
+		out.writeObject(messagesMemento);
+	}
+
+	public String toString() {
+		if (!isActive()) {
+			if (!hasStarted()) {
+				return "[Not yet started " + getCaption() + "]";
+			} else {
+				return "[Ended " + getCaption() + "]";
+			}
+		} else {
+			if (flow != null) {
+				return new ToStringCreator(this).append("flow", flow.getId()).append("flowSessions", flowSessions)
+						.append("flashScope", flashScope).toString();
+			} else {
+				return "[Unhydrated " + getCaption() + "]";
+			}
+		}
+	}
+
+	// internal helpers
+
+	/**
+	 * Activate a new FlowSession for the flow definition. Creates the new flow session and pushes it
+	 * onto the stack.
+	 * @param flow the flow definition
+	 * @return the new flow session
+	 */
+	private FlowSession activateSession(Flow flow) {
+		FlowSessionImpl session;
+		if (!flowSessions.isEmpty()) {
+			FlowSessionImpl parent = getActiveSessionInternal();
+			session = createFlowSession(flow, parent);
+		} else {
+			session = createFlowSession(flow, null);
+		}
+		flowSessions.add(session);
+		return session;
+	}
+
+	private FlowSessionImpl getActiveSessionInternal() {
+		return (FlowSessionImpl) flowSessions.getLast();
+	}
+
+	private FlowExecutionException wrap(Exception e) {
+		if (isActive()) {
+			FlowSessionImpl session = getActiveSessionInternal();
+			String flowId = session.getFlowId();
+			String stateId = session.getStateId();
+			return new FlowExecutionException(flowId, stateId, "Exception thrown in state '" + stateId + "' of flow '"
+					+ flowId + "'", e);
+		} else {
+			return new FlowExecutionException(flowId, null, "Exception thrown within inactive flow '" + flowId + "'");
+		}
+	}
+
+	/**
+	 * Handles an exception that occurred performing an operation on this flow execution. First tries the set of
+	 * exception handlers associated with the offending state, then the handlers at the flow level.
+	 * @param exception the exception that occurred
+	 * @param context the request control context the exception occurred in
+	 * @throws FlowExecutionException re-throws the exception if it was not handled at the state or flow level
+	 */
+	private void handleException(FlowExecutionException exception, RequestControlContext context)
+			throws FlowExecutionException {
+		listeners.fireExceptionThrown(context, exception);
+		if (logger.isDebugEnabled()) {
+			logger.debug("Attempting to handle [" + exception + "]");
+		}
+		boolean handled = false;
+		try {
+			if (tryStateHandlers(exception, context) || tryFlowHandlers(exception, context)) {
+				handled = true;
+			}
+		} catch (FlowExecutionException newException) {
+			// exception handling itself resulted in a new FlowExecutionException, try to handle it
+			handleException(newException, context);
+		}
+		if (!handled) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Rethrowing unhandled flow execution exception");
+			}
+			throw exception;
+		}
+	}
+
+	/**
+	 * Try to handle given exception using execution exception handlers registered at the state level. Returns null if
+	 * no handler handled the exception.
+	 * @return true if the exception was handled
+	 */
+	private boolean tryStateHandlers(FlowExecutionException exception, RequestControlContext context) {
+		if (exception.getStateId() != null) {
+			return getCurrentFlow().getStateInstance(exception.getStateId()).handleException(exception, context);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Try to handle given exception using execution exception handlers registered at the flow level. Returns null if no
+	 * handler handled the exception.
+	 * @return true if the exception was handled
+	 */
+	private boolean tryFlowHandlers(FlowExecutionException exception, RequestControlContext context) {
+		return getCurrentFlow().handleException(exception, context);
+	}
+
+	/**
+	 * Returns the current flow which may or may not yet be active.
+	 */
+	private Flow getCurrentFlow() {
+		if (isActive()) {
+			return getActiveSessionInternal().getFlow();
+		} else {
+			return flow;
+		}
+	}
+
+	private State getCurrentState() {
+		FlowSessionImpl session = getActiveSessionInternal();
+		State currentState = (State) session.getState();
+		return currentState;
+	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactory.java
index 7b19926d..3113ba59 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactory.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactory.java
@@ -15,96 +15,82 @@
  */
 package org.springframework.webflow.engine.impl;
 
-import java.util.Map;
+import java.io.Serializable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.CollectionUtils;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.FlowExecutionFactory;
-import org.springframework.webflow.execution.FlowExecutionListener;
-import org.springframework.webflow.execution.factory.FlowExecutionListenerLoader;
-import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
+import org.springframework.webflow.util.RandomGuidUidGenerator;
 
 /**
  * A factory for instances of the {@link FlowExecutionImpl default flow execution} implementation.
- * 
  * @author Keith Donald
  */
-public class FlowExecutionImplFactory implements FlowExecutionFactory {
+public class FlowExecutionImplFactory extends FlowExecutionImplServicesConfigurer implements FlowExecutionFactory {
 
 	private static final Log logger = LogFactory.getLog(FlowExecutionImplFactory.class);
 
 	/**
-	 * The strategy for loading listeners that should observe executions of a flow definition. The default simply loads
-	 * an empty static listener list.
+	 * The factory used to assign keys to flow executions that need to be persisted.
 	 */
-	private FlowExecutionListenerLoader executionListenerLoader = StaticFlowExecutionListenerLoader.EMPTY_INSTANCE;
+	private FlowExecutionKeyFactory executionKeyFactory = new RandomFlowExecutionKeyFactory();
 
 	/**
-	 * System execution attributes that may influence flow execution behavior. The default is an empty map.
+	 * Sets the strategy for generating flow execution keys for persistent flow executions.
 	 */
-	private AttributeMap executionAttributes = CollectionUtils.EMPTY_ATTRIBUTE_MAP;
-
-	/**
-	 * Returns the attributes to apply to flow executions created by this factory. Execution attributes may affect flow
-	 * execution behavior.
-	 * @return flow execution attributes
-	 */
-	public AttributeMap getExecutionAttributes() {
-		return executionAttributes;
-	}
-
-	/**
-	 * Sets the attributes to apply to flow executions created by this factory. Execution attributes may affect flow
-	 * execution behavior.
-	 * @param executionAttributes flow execution system attributes
-	 */
-	public void setExecutionAttributes(AttributeMap executionAttributes) {
-		Assert.notNull(executionAttributes, "The execution attributes map is required");
-		this.executionAttributes = executionAttributes;
-	}
-
-	/**
-	 * Sets the attributes to apply to flow executions created by this factory. Execution attributes may affect flow
-	 * execution behavior.
-	 * 
    
-	 * Convenience setter that takes a simple java.util.Map to ease bean style configuration.
-	 * @param executionAttributes flow execution system attributes
-	 */
-	public void setExecutionAttributesMap(Map executionAttributes) {
-		Assert.notNull(executionAttributes, "The execution attributes map is required");
-		this.executionAttributes = new LocalAttributeMap(executionAttributes);
-	}
-
-	/**
-	 * Returns the strategy for loading listeners that should observe executions of a flow definition. Allows full
-	 * control over what listeners should apply for executions of a flow definition.
-	 */
-	public FlowExecutionListenerLoader getExecutionListenerLoader() {
-		return executionListenerLoader;
-	}
-
-	/**
-	 * Sets the strategy for loading listeners that should observe executions of a flow definition. Allows full control
-	 * over what listeners should apply for executions of a flow definition.
-	 */
-	public void setExecutionListenerLoader(FlowExecutionListenerLoader listenerLoader) {
-		Assert.notNull(listenerLoader, "The listener loader is required");
-		this.executionListenerLoader = listenerLoader;
+	public void setExecutionKeyFactory(FlowExecutionKeyFactory executionKeyFactory) {
+		this.executionKeyFactory = executionKeyFactory;
 	}
 
 	public FlowExecution createFlowExecution(FlowDefinition flowDefinition) {
 		Assert.isInstanceOf(Flow.class, flowDefinition, "Flow definition is of wrong type: ");
 		if (logger.isDebugEnabled()) {
-			logger.debug("Creating flow execution for flow definition with id '" + flowDefinition.getId() + "'");
+			logger.debug("Creating new execution of '" + flowDefinition.getId() + "'");
+		}
+		FlowExecutionImpl execution = new FlowExecutionImpl((Flow) flowDefinition);
+		configureServices(execution);
+		execution.setKeyFactory(executionKeyFactory);
+		return execution;
+	}
+
+	/**
+	 * Generates random flow execution keys.
+	 */
+	private static class RandomFlowExecutionKeyFactory implements FlowExecutionKeyFactory {
+		private RandomGuidUidGenerator idGenerator = new RandomGuidUidGenerator();
+
+		public FlowExecutionKey getKey(FlowExecution execution) {
+			return new SimpleFlowExecutionKey(idGenerator.generateUid());
+		}
+
+		private static class SimpleFlowExecutionKey extends FlowExecutionKey {
+			private Serializable value;
+
+			public SimpleFlowExecutionKey(Serializable value) {
+				this.value = value;
+			}
+
+			public boolean equals(Object o) {
+				if (!(o instanceof SimpleFlowExecutionKey)) {
+					SimpleFlowExecutionKey key = (SimpleFlowExecutionKey) o;
+					return this.value.equals(key.value);
+				}
+				return false;
+			}
+
+			public int hashCode() {
+				return this.value.hashCode();
+			}
+
+			public String toString() {
+				return value.toString();
+			}
 		}
-		FlowExecutionListener[] listeners = executionListenerLoader.getListeners(flowDefinition);
-		return new FlowExecutionImpl((Flow) flowDefinition, listeners, executionAttributes);
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplServicesConfigurer.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplServicesConfigurer.java
new file mode 100644
index 00000000..23abdb5e
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplServicesConfigurer.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.engine.impl;
+
+import org.springframework.binding.message.DefaultMessageContextFactory;
+import org.springframework.binding.message.MessageContextFactory;
+import org.springframework.context.support.StaticMessageSource;
+import org.springframework.util.Assert;
+import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.core.collection.CollectionUtils;
+import org.springframework.webflow.execution.factory.FlowExecutionListenerLoader;
+import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
+
+abstract class FlowExecutionImplServicesConfigurer {
+
+	/**
+	 * System execution attributes that may influence flow execution behavior. The default is an empty map.
+	 */
+	private AttributeMap executionAttributes = CollectionUtils.EMPTY_ATTRIBUTE_MAP;
+
+	/**
+	 * The strategy for loading listeners that should observe executions of a flow definition. The default simply loads
+	 * an empty static listener list.
+	 */
+	private FlowExecutionListenerLoader executionListenerLoader = StaticFlowExecutionListenerLoader.EMPTY_INSTANCE;
+
+	/**
+	 * The factory for message contexts for tracking flow execution messages.
+	 */
+	private MessageContextFactory messageContextFactory = new DefaultMessageContextFactory(new StaticMessageSource());
+
+	/**
+	 * Sets the attributes to apply to flow executions created by this factory. Execution attributes may affect flow
+	 * execution behavior.
+	 * @param executionAttributes flow execution system attributes
+	 */
+	public void setExecutionAttributes(AttributeMap executionAttributes) {
+		Assert.notNull(executionAttributes, "The execution attributes map is required");
+		this.executionAttributes = executionAttributes;
+	}
+
+	/**
+	 * Sets the strategy for loading listeners that should observe executions of a flow definition. Allows full control
+	 * over what listeners should apply for executions of a flow definition.
+	 */
+	public void setExecutionListenerLoader(FlowExecutionListenerLoader executionListenerLoader) {
+		Assert.notNull(executionListenerLoader, "The execution listener loader is required");
+		this.executionListenerLoader = executionListenerLoader;
+	}
+
+	/**
+	 * Sets the strategy for creating message contexts that track flow execution messages.
+	 */
+	public void setMessageContextFactory(MessageContextFactory messageContextFactory) {
+		this.messageContextFactory = messageContextFactory;
+	}
+
+	/**
+	 * Called by subclasses to apply the configured set of standard services to the flow execution.
+	 * @param execution the flow execution
+	 */
+	protected void configureServices(FlowExecutionImpl execution) {
+		execution.setAttributes(executionAttributes);
+		execution.setListeners(executionListenerLoader.getListeners(execution.getDefinition()));
+		execution.setMessageContextFactory(messageContextFactory);
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorer.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorer.java
index 0cc16656..d1af7ca1 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorer.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorer.java
@@ -16,18 +16,15 @@
 package org.springframework.webflow.engine.impl;
 
 import java.util.ListIterator;
-import java.util.Map;
 
 import org.springframework.util.Assert;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.CollectionUtils;
 import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
 import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.factory.FlowExecutionListenerLoader;
-import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
 import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer;
 
 /**
@@ -35,23 +32,14 @@ import org.springframework.webflow.execution.repository.support.FlowExecutionSta
  * 
  * @author Keith Donald
  */
-public class FlowExecutionImplStateRestorer implements FlowExecutionStateRestorer {
+public class FlowExecutionImplStateRestorer extends FlowExecutionImplServicesConfigurer implements
+		FlowExecutionStateRestorer {
 
 	/**
 	 * Used to restore the flow execution's flow definition.
 	 */
 	private FlowDefinitionLocator definitionLocator;
 
-	/**
-	 * Used to restore the flow execution's listeners.
-	 */
-	private FlowExecutionListenerLoader executionListenerLoader = StaticFlowExecutionListenerLoader.EMPTY_INSTANCE;
-
-	/**
-	 * Used to restore the flow execution's system attributes.
-	 */
-	private AttributeMap executionAttributes = CollectionUtils.EMPTY_ATTRIBUTE_MAP;
-
 	/**
 	 * Creates a new execution transient state restorer.
 	 * @param definitionLocator the flow definition locator
@@ -61,40 +49,15 @@ public class FlowExecutionImplStateRestorer implements FlowExecutionStateRestore
 		this.definitionLocator = definitionLocator;
 	}
 
-	/**
-	 * Sets the attributes to apply to restored flow executions. Execution attributes may affect flow execution
-	 * behavior.
-	 * @param executionAttributes flow execution system attributes
-	 */
-	public void setExecutionAttributes(AttributeMap executionAttributes) {
-		Assert.notNull(executionAttributes, "The execution attributes map is required");
-		this.executionAttributes = executionAttributes;
-	}
-
-	/**
-	 * Sets the attributes to apply to restored flow executions. Execution attributes may affect flow execution
-	 * behavior.
-	 * 
    
-	 * Convenience setter that takes a simple java.util.Map to ease bean style configuration.
-	 * @param executionAttributes flow execution system attributes
-	 */
-	public void setExecutionAttributesMap(Map executionAttributes) {
-		Assert.notNull(executionAttributes, "The execution attributes map is required");
-		this.executionAttributes = new LocalAttributeMap(executionAttributes);
-	}
-
-	/**
-	 * Sets the strategy for loading listeners that should observe executions of a flow definition. Allows full control
-	 * over what listeners should apply. for executions of a flow definition.
-	 */
-	public void setExecutionListenerLoader(FlowExecutionListenerLoader executionListenerLoader) {
-		Assert.notNull(executionListenerLoader, "The listener loader is required");
-		this.executionListenerLoader = executionListenerLoader;
-	}
-
-	public FlowExecution restoreState(FlowExecution flowExecution, MutableAttributeMap conversationScope) {
+	public FlowExecution restoreState(FlowExecution flowExecution, FlowExecutionKey key,
+			MutableAttributeMap conversationScope, FlowExecutionKeyFactory keyFactory) {
 		FlowExecutionImpl impl = (FlowExecutionImpl) flowExecution;
-		// the root flow should be a top-level flow visible by the flow def locator
+		if (impl.getFlowId() == null) {
+			throw new IllegalStateException("Cannot restore flow execution impl: the flow id is null");
+		}
+		if (impl.getFlowSessions() == null) {
+			throw new IllegalStateException("Cannot restore flow execution impl: the flowSessions list is null");
+		}
 		Flow flow = (Flow) definitionLocator.getFlowDefinition(impl.getFlowId());
 		impl.setFlow(flow);
 		if (impl.hasSessions()) {
@@ -102,29 +65,22 @@ public class FlowExecutionImplStateRestorer implements FlowExecutionStateRestore
 			root.setFlow(flow);
 			root.setState(flow.getStateInstance(root.getStateId()));
 			if (impl.hasSubflowSessions()) {
-				Flow parent = flow;
 				for (ListIterator it = impl.getSubflowSessionIterator(); it.hasNext();) {
 					FlowSessionImpl subflow = (FlowSessionImpl) it.next();
-					Flow definition;
-					if (parent.containsInlineFlow(subflow.getFlowId())) {
-						// subflow is an inline flow of it's parent
-						definition = parent.getInlineFlow(subflow.getFlowId());
-					} else {
-						// subflow is a top-level flow
-						definition = (Flow) definitionLocator.getFlowDefinition(subflow.getFlowId());
-					}
+					// TODO subflows encapsulated by top-level flow
+					Flow definition = (Flow) definitionLocator.getFlowDefinition(subflow.getFlowId());
 					subflow.setFlow(definition);
 					subflow.setState(definition.getStateInstance(subflow.getStateId()));
-					parent = definition;
 				}
 			}
 		}
+		impl.setKey(key);
 		if (conversationScope == null) {
 			conversationScope = new LocalAttributeMap();
 		}
 		impl.setConversationScope(conversationScope);
-		impl.setListeners(new FlowExecutionListeners(executionListenerLoader.getListeners(flow)));
-		impl.setAttributes(executionAttributes);
-		return flowExecution;
+		configureServices(impl);
+		impl.setKeyFactory(keyFactory);
+		return impl;
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionListeners.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionListeners.java
index 966fde36..d0035ee9 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionListeners.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowExecutionListeners.java
@@ -24,7 +24,6 @@ import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.FlowSession;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A helper that aids in publishing events to an array of FlowExecutionListener objects.
@@ -36,6 +35,8 @@ import org.springframework.webflow.execution.ViewSelection;
  */
 class FlowExecutionListeners {
 
+	private FlowExecutionListener[] EMPTY_LISTENER_ARRAY = new FlowExecutionListener[0];
+
 	/**
 	 * The list of listeners that should receive event callbacks during managed flow executions.
 	 */
@@ -56,7 +57,7 @@ class FlowExecutionListeners {
 		if (listeners != null) {
 			this.listeners = listeners;
 		} else {
-			this.listeners = new FlowExecutionListener[0];
+			this.listeners = EMPTY_LISTENER_ARRAY;
 		}
 	}
 
@@ -98,9 +99,9 @@ class FlowExecutionListeners {
 	/**
 	 * Notify all interested listeners that a flow execution session is starting (about to be created).
 	 */
-	public void fireSessionStarting(RequestContext context, FlowDefinition flow, MutableAttributeMap input) {
+	public void fireSessionCreating(RequestContext context, FlowDefinition flow) {
 		for (int i = 0; i < listeners.length; i++) {
-			listeners[i].sessionStarting(context, flow, input);
+			listeners[i].sessionCreating(context, flow);
 		}
 	}
 
@@ -108,9 +109,9 @@ class FlowExecutionListeners {
 	 * Notify all interested listeners that a flow execution session has been activated (created, on the stack and about
 	 * to start).
 	 */
-	public void fireSessionCreated(RequestContext context, FlowSession session) {
+	public void fireSessionStarting(RequestContext context, FlowSession session, MutableAttributeMap input) {
 		for (int i = 0; i < listeners.length; i++) {
-			listeners[i].sessionCreated(context, session);
+			listeners[i].sessionStarting(context, session, input);
 		}
 	}
 
@@ -153,18 +154,18 @@ class FlowExecutionListeners {
 	/**
 	 * Notify all interested listeners that a flow session was paused in the flow execution.
 	 */
-	public void firePaused(RequestContext context, ViewSelection selectedView) {
+	public void firePaused(RequestContext context) {
 		for (int i = 0; i < listeners.length; i++) {
-			listeners[i].paused(context, selectedView);
+			listeners[i].paused(context);
 		}
 	}
 
 	/**
 	 * Notify all interested listeners that the flow execution was resumed.
 	 */
-	public void fireResumed(RequestContext context) {
+	public void fireResuming(RequestContext context) {
 		for (int i = 0; i < listeners.length; i++) {
-			listeners[i].resumed(context);
+			listeners[i].resuming(context);
 		}
 	}
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowSessionImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowSessionImpl.java
index c5fd990e..85e04763 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowSessionImpl.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/FlowSessionImpl.java
@@ -29,7 +29,6 @@ import org.springframework.webflow.definition.StateDefinition;
 import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.engine.State;
 import org.springframework.webflow.execution.FlowSession;
-import org.springframework.webflow.execution.FlowSessionStatus;
 
 /**
  * Implementation of the FlowSession interfaced used internally by the FlowExecutionImpl. This class is
@@ -38,7 +37,6 @@ import org.springframework.webflow.execution.FlowSessionStatus;
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
- * @author Ben Hale
  */
 class FlowSessionImpl implements FlowSession, Externalizable {
 
@@ -66,11 +64,6 @@ class FlowSessionImpl implements FlowSession, Externalizable {
 	 */
 	private String stateId;
 
-	/**
-	 * The session status; may be CREATED, STARTING, ACTIVE, PAUSED, SUSPENDED, or ENDED.
-	 */
-	private FlowSessionStatus status = FlowSessionStatus.CREATED;
-
 	/**
 	 * The session data model ("flow scope").
 	 */
@@ -107,10 +100,6 @@ class FlowSessionImpl implements FlowSession, Externalizable {
 		return state;
 	}
 
-	public FlowSessionStatus getStatus() {
-		return status;
-	}
-
 	public MutableAttributeMap getScope() {
 		return scope;
 	}
@@ -123,12 +112,17 @@ class FlowSessionImpl implements FlowSession, Externalizable {
 		return parent == null;
 	}
 
+	// package-private
+
+	Flow getFlow() {
+		return flow;
+	}
+
 	// custom serialization
 
 	public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
 		flowId = (String) in.readObject();
 		stateId = (String) in.readObject();
-		status = (FlowSessionStatus) in.readObject();
 		scope = (MutableAttributeMap) in.readObject();
 		parent = (FlowSessionImpl) in.readObject();
 	}
@@ -136,7 +130,6 @@ class FlowSessionImpl implements FlowSession, Externalizable {
 	public void writeExternal(ObjectOutput out) throws IOException {
 		out.writeObject(flowId);
 		out.writeObject(stateId);
-		out.writeObject(status);
 		out.writeObject(scope);
 		out.writeObject(parent);
 	}
@@ -169,15 +162,6 @@ class FlowSessionImpl implements FlowSession, Externalizable {
 		this.stateId = state.getId();
 	}
 
-	/**
-	 * Set the status of this flow session.
-	 * @param status the new status to set
-	 */
-	void setStatus(FlowSessionStatus status) {
-		Assert.notNull(status, "The flow session status is requred");
-		this.status = status;
-	}
-
 	/**
 	 * Returns the id of the flow of this session.
 	 */
@@ -193,7 +177,7 @@ class FlowSessionImpl implements FlowSession, Externalizable {
 	}
 
 	public String toString() {
-		return new ToStringCreator(this).append("flow", flowId).append("state", stateId).append("scope", scope).append(
-				"status", status).toString();
+		return new ToStringCreator(this).append("flow", flowId).append("state", stateId).append("scope", scope)
+				.toString();
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/RequestControlContextImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/RequestControlContextImpl.java
index 472a4e4c..bd5953e4 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/RequestControlContextImpl.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/RequestControlContextImpl.java
@@ -15,11 +15,10 @@
  */
 package org.springframework.webflow.engine.impl;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.springframework.binding.message.MessageContext;
 import org.springframework.core.style.ToStringCreator;
-import org.springframework.util.Assert;
 import org.springframework.webflow.context.ExternalContext;
+import org.springframework.webflow.context.FlowExecutionRequestInfo;
 import org.springframework.webflow.core.collection.AttributeMap;
 import org.springframework.webflow.core.collection.CollectionUtils;
 import org.springframework.webflow.core.collection.LocalAttributeMap;
@@ -35,9 +34,8 @@ import org.springframework.webflow.engine.Transition;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecutionContext;
 import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.FlowExecutionKey;
 import org.springframework.webflow.execution.FlowSession;
-import org.springframework.webflow.execution.FlowSessionStatus;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * Default request control context implementation used internally by the web flow system. This class is closely coupled
@@ -45,15 +43,12 @@ import org.springframework.webflow.execution.ViewSelection;
  * complete flow execution implementation based on a finite state machine.
  * 
  * @see FlowExecutionImpl
- * @see FlowSessionImpl
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
  */
 class RequestControlContextImpl implements RequestControlContext {
 
-	private static final Log logger = LogFactory.getLog(RequestControlContextImpl.class);
-
 	/**
 	 * The owning flow execution carrying out this request.
 	 */
@@ -64,6 +59,11 @@ class RequestControlContextImpl implements RequestControlContext {
 	 */
 	private ExternalContext externalContext;
 
+	/**
+	 * A source context for messages to record during this flow execution request.
+	 */
+	private MessageContext messageContext;
+
 	/**
 	 * The request scope data map. Never null, initially empty.
 	 */
@@ -89,11 +89,14 @@ class RequestControlContextImpl implements RequestControlContext {
 	 * Create a new request context.
 	 * @param flowExecution the owning flow execution
 	 * @param externalContext the external context that originated the flow execution request
+	 * @param messageContext the message context for recording status or validation messages during the execution of
+	 * this request
 	 */
-	public RequestControlContextImpl(FlowExecutionImpl flowExecution, ExternalContext externalContext) {
-		Assert.notNull(flowExecution, "The owning flow execution is required");
+	public RequestControlContextImpl(FlowExecutionImpl flowExecution, ExternalContext externalContext,
+			MessageContext messageContext) {
 		this.flowExecution = flowExecution;
 		this.externalContext = externalContext;
+		this.messageContext = messageContext;
 	}
 
 	// implementing RequestContext
@@ -130,6 +133,10 @@ class RequestControlContextImpl implements RequestControlContext {
 		return externalContext;
 	}
 
+	public MessageContext getMessageContext() {
+		return messageContext;
+	}
+
 	public FlowExecutionContext getFlowExecutionContext() {
 		return flowExecution;
 	}
@@ -154,102 +161,62 @@ class RequestControlContextImpl implements RequestControlContext {
 		}
 	}
 
-	public AttributeMap getModel() {
-		return getConversationScope().union(getFlowScope()).union(getFlashScope()).union(getRequestScope());
-	}
-
 	// implementing RequestControlContext
 
-	public void setLastEvent(Event lastEvent) {
-		this.lastEvent = lastEvent;
+	public String getFlowExecutionUrl() {
+		if (flowExecution.getKey() == null) {
+			throw new IllegalStateException(
+					"Flow execution key not yet assigned; unable to generate flow execution URL at this time");
+		} else {
+			FlowExecutionRequestInfo requestInfo = new FlowExecutionRequestInfo(flowExecution.getFlowId(),
+					flowExecution.getKey().toString());
+			return externalContext.buildFlowExecutionUrl(requestInfo, true);
+		}
+	}
+
+	public void sendFlowExecutionRedirect() {
+		if (flowExecution.getKey() == null) {
+			throw new IllegalStateException(
+					"Flow execution key not yet assigned; unable to send a flow execution redirect request");
+		} else {
+			FlowExecutionRequestInfo requestInfo = new FlowExecutionRequestInfo(flowExecution.getFlowId(),
+					flowExecution.getKey().toString());
+			externalContext.sendFlowExecutionRedirect(requestInfo);
+		}
+	}
+
+	public void setCurrentState(State state) {
+		flowExecution.setCurrentState(state, this);
 	}
 
 	public void setLastTransition(Transition lastTransition) {
 		this.lastTransition = lastTransition;
 	}
 
-	public void setCurrentState(State state) {
-		getExecutionListeners().fireStateEntering(this, state);
-		State previousState = getCurrentStateInternal();
-		flowExecution.setCurrentState(state);
-		if (previousState == null) {
-			getActiveSession().setStatus(FlowSessionStatus.ACTIVE);
-		}
-		getExecutionListeners().fireStateEntered(this, previousState);
+	public FlowExecutionKey assignFlowExecutionKey() {
+		return flowExecution.assignKey();
 	}
 
-	public ViewSelection start(Flow flow, MutableAttributeMap input) throws FlowExecutionException {
-		if (input == null) {
-			// create a mutable map so entries can be added by listeners!
-			input = new LocalAttributeMap();
-		}
-		if (logger.isDebugEnabled()) {
-			logger.debug("Activating new session for flow '" + flow.getId() + "' in state '"
-					+ flow.getStartState().getId() + "' with input " + input);
-		}
-		getExecutionListeners().fireSessionStarting(this, flow, input);
-		FlowSession session = flowExecution.activateSession(flow);
-		getExecutionListeners().fireSessionCreated(this, session);
-		ViewSelection selectedView = flow.start(this, input);
-		getExecutionListeners().fireSessionStarted(this, session);
-		return selectedView;
+	public boolean getAlwaysRedirectOnPause() {
+		Boolean redirectOnPause = flowExecution.getAttributes().getBoolean("alwaysRedirectOnPause");
+		return redirectOnPause != null ? redirectOnPause.booleanValue() : false;
 	}
 
-	public ViewSelection signalEvent(Event event) throws FlowExecutionException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Signaling event '" + event.getId() + "' in state '" + getCurrentState().getId()
-					+ "' of flow '" + getActiveFlow().getId() + "'");
-		}
-		setLastEvent(event);
-		getExecutionListeners().fireEventSignaled(this, event);
-		ViewSelection selectedView = getActiveFlowInternal().onEvent(this);
-		return selectedView;
+	public void start(Flow flow, MutableAttributeMap input) throws FlowExecutionException {
+		flowExecution.start(flow, input, this);
+	}
+
+	public void handleEvent(Event event) throws FlowExecutionException {
+		this.lastEvent = event;
+		flowExecution.handleEvent(event, this);
+	}
+
+	public void execute(Transition transition) {
+		flowExecution.execute(transition, this);
 	}
 
 	public FlowSession endActiveFlowSession(MutableAttributeMap output) throws IllegalStateException {
-		FlowSession session = getFlowExecutionContext().getActiveSession();
-		getExecutionListeners().fireSessionEnding(this, session, output);
-		getActiveFlowInternal().end(this, output);
-		if (logger.isDebugEnabled()) {
-			logger.debug("Ending active session " + session + "; exposed session output is " + output);
-		}
-		session = flowExecution.endActiveFlowSession();
-		getExecutionListeners().fireSessionEnded(this, session, output);
-		return session;
-	}
-
-	public ViewSelection execute(Transition transition) {
-		return transition.execute(getCurrentStateInternal(), this);
-	}
-
-	// internal helpers
-
-	/**
-	 * Returns the execution listeners for the flow execution of this request context.
-	 */
-	protected FlowExecutionListeners getExecutionListeners() {
-		return flowExecution.getListeners();
-	}
-
-	/**
-	 * Returns the active flow in the flow execution of this request context.
-	 */
-	protected Flow getActiveFlowInternal() {
-		return (Flow) getActiveSession().getDefinition();
-	}
-
-	/**
-	 * Returns the current state in the flow execution of this request context.
-	 */
-	protected State getCurrentStateInternal() {
-		return (State) getActiveSession().getState();
-	}
-
-	/**
-	 * Returns the active flow session in the flow execution of this request context.
-	 */
-	protected FlowSessionImpl getActiveSession() {
-		return flowExecution.getActiveSessionInternal();
+		return flowExecution.endActiveFlowSession(output, this);
 	}
 
 	public String toString() {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ApplicationViewSelector.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ApplicationViewSelector.java
deleted file mode 100644
index 436469b0..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ApplicationViewSelector.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import java.io.Serializable;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.engine.ViewState;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-
-/**
- * Simple view selector that makes an {@link ApplicationView} selection using a view name expression.
- * 
    
- * This factory will treat all attributes returned from calling {@link RequestContext#getModel()} as the application
- * model exposed to the view during rendering. This is typically the union of attributes in request, flow, and
- * conversation scope.
- * 
    
- * This selector also supports setting a redirect flag that can be used to trigger a redirect to the
- * {@link ApplicationView} at a bookmarkable URL using an {@link FlowExecutionRedirect}}.
- * 
- * @see org.springframework.webflow.execution.support.ApplicationView
- * @see org.springframework.webflow.execution.support.FlowExecutionRedirect
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class ApplicationViewSelector implements ViewSelector, Serializable {
-
-	/**
-	 * Flow execution attribute name that indicates that we should always render an application view via a redirect.
-	 */
-	public static final String ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE = "alwaysRedirectOnPause";
-
-	/**
-	 * The view name to render.
-	 */
-	private Expression viewName;
-
-	/**
-	 * A flag indicating if a redirect to the selected application view should be requested.
-	 * 
    
-	 * Setting this allows you to redirect while the flow is in progress to a stable URL that can be safely refreshed.
-	 */
-	private boolean redirect;
-
-	/**
-	 * Creates a application view selector that will make application view selections requesting that the specified view
-	 * be rendered.
-	 * @param viewName the view name expression
-	 */
-	public ApplicationViewSelector(Expression viewName) {
-		this(viewName, false);
-	}
-
-	/**
-	 * Creates a application view selector that will make application view selections requesting that the specified view
-	 * be rendered. No redirects will be done.
-	 * @param viewName the view name expression
-	 * @param redirect indicates if a redirect to the view should be initiated
-	 */
-	public ApplicationViewSelector(Expression viewName, boolean redirect) {
-		Assert.notNull(viewName, "The view name expression is required");
-		this.viewName = viewName;
-		this.redirect = redirect;
-	}
-
-	/**
-	 * Returns the name of the view that should be rendered.
-	 */
-	public Expression getViewName() {
-		return viewName;
-	}
-
-	/**
-	 * Returns if a redirect to the view should be done.
-	 */
-	public boolean isRedirect() {
-		return redirect;
-	}
-
-	public boolean isEntrySelectionRenderable(RequestContext context) {
-		return !shouldRedirect(context);
-	}
-
-	public ViewSelection makeEntrySelection(RequestContext context) {
-		if (shouldRedirect(context)) {
-			return FlowExecutionRedirect.INSTANCE;
-		} else {
-			return makeRefreshSelection(context);
-		}
-	}
-
-	public ViewSelection makeRefreshSelection(RequestContext context) {
-		String viewName = resolveViewName(context);
-		if (!StringUtils.hasText(viewName)) {
-			throw new IllegalStateException("Resolved application view name was empty; programmer error! -- "
-					+ "The expression that was evaluated against the request context was '" + getViewName() + "'");
-		}
-		return createApplicationView(viewName, context);
-	}
-
-	// internal helpers
-
-	/**
-	 * Resolves the application view name from the request context.
-	 * @param context the context
-	 * @return the view name
-	 */
-	protected String resolveViewName(RequestContext context) {
-		return (String) getViewName().evaluate(context, null);
-	}
-
-	/**
-	 * Creates the application view selection.
-	 * @param viewName the resolved view name
-	 * @param context the context
-	 * @return the application view
-	 */
-	protected ApplicationView createApplicationView(String viewName, RequestContext context) {
-		return new ApplicationView(viewName, context.getModel().asMap());
-	}
-
-	/**
-	 * Determine whether or not a redirect should be used to render the application view.
-	 * @param context the context
-	 * @return true or false
-	 */
-	protected boolean shouldRedirect(RequestContext context) {
-		return context.getCurrentState() instanceof ViewState && (redirect || alwaysRedirectOnPause(context));
-	}
-
-	/**
-	 * Checks the {@link #ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE} to see if every application view of the flow execution
-	 * should be rendered via a redirect.
-	 * @param context the flow execution request context
-	 * @return true or false
-	 */
-	protected boolean alwaysRedirectOnPause(RequestContext context) {
-		String attributeValue = String.valueOf(context.getFlowExecutionContext().getAttributes().get(
-				ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE, "false"));
-		return new Boolean(attributeValue).booleanValue();
-	}
-
-	public String toString() {
-		return new ToStringCreator(this).append("viewName", viewName).append("redirect", redirect).toString();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/AttributeExpression.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/AttributeExpression.java
deleted file mode 100644
index 07964a85..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/AttributeExpression.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import org.springframework.binding.expression.EvaluationContext;
-import org.springframework.binding.expression.EvaluationException;
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.SettableExpression;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.util.Assert;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ScopeType;
-
-/**
- * Expression evaluator that can evaluate attribute maps and supported request context scope types.
- * 
- * @see org.springframework.webflow.execution.RequestContext
- * @see org.springframework.webflow.core.collection.AttributeMap
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class AttributeExpression implements SettableExpression {
-
-	/**
-	 * The expression to evaluate.
-	 */
-	private Expression expression;
-
-	/**
-	 * The scope type.
-	 */
-	private ScopeType scopeType;
-
-	/**
-	 * Create a new expression evaluator that executes given expression in an attribute map. When using this wrapper to
-	 * set a property value, make sure the given expression is a {@link SettableExpression}}.
-	 * @param expression the nested evaluator to execute
-	 */
-	public AttributeExpression(Expression expression) {
-		this(expression, null);
-	}
-
-	/**
-	 * Create a new expression evaluator that executes given expression in the specified scope. When using this wrapper
-	 * to set a property value, make sure the given expression is a {@link SettableExpression}}.
-	 * @param expression the nested evaluator to execute
-	 * @param scopeType the scopeType
-	 */
-	public AttributeExpression(Expression expression, ScopeType scopeType) {
-		this.expression = expression;
-		this.scopeType = scopeType;
-	}
-
-	/**
-	 * Returns the expression that will be evaluated.
-	 */
-	protected Expression getExpression() {
-		return expression;
-	}
-
-	public Object evaluate(Object target, EvaluationContext context) throws EvaluationException {
-		if (target instanceof RequestContext) {
-			RequestContext requestContext = (RequestContext) target;
-			AttributeMap scope = scopeType.getScope(requestContext);
-			return expression.evaluate(scope, context);
-		} else if (target instanceof AttributeMap) {
-			return expression.evaluate(target, context);
-		} else {
-			throw new IllegalArgumentException(
-					"Only supports evaluation against a [RequestContext] or [AttributeMap] instance, but was a ["
-							+ target.getClass() + "]");
-		}
-	}
-
-	public void evaluateToSet(Object target, Object value, EvaluationContext context) throws EvaluationException {
-		Assert.isInstanceOf(SettableExpression.class, expression,
-				"When an AttributeExpression is used to set a property value, the nested expression needs "
-						+ "to be a SettableExpression");
-		if (target instanceof RequestContext) {
-			RequestContext requestContext = (RequestContext) target;
-			MutableAttributeMap scope = scopeType.getScope(requestContext);
-			((SettableExpression) expression).evaluateToSet(scope, value, context);
-		} else if (target instanceof AttributeMap) {
-			((SettableExpression) expression).evaluateToSet(target, value, context);
-		} else {
-			throw new IllegalArgumentException(
-					"Only supports evaluation against a [RequestContext] or [AttributeMap] instance, but was a ["
-							+ target.getClass() + "]");
-		}
-	}
-
-	public String toString() {
-		return new ToStringCreator(this).append("expression", expression).toString();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/BooleanExpressionTransitionCriteria.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/BooleanExpressionTransitionCriteria.java
index 6701872e..5b45a55e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/BooleanExpressionTransitionCriteria.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/BooleanExpressionTransitionCriteria.java
@@ -15,10 +15,6 @@
  */
 package org.springframework.webflow.engine.support;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.binding.expression.EvaluationContext;
 import org.springframework.binding.expression.Expression;
 import org.springframework.util.Assert;
 import org.springframework.webflow.engine.TransitionCriteria;
@@ -34,11 +30,6 @@ import org.springframework.webflow.execution.RequestContext;
  */
 public class BooleanExpressionTransitionCriteria implements TransitionCriteria {
 
-	/**
-	 * Constant alias that points to the id of the last event that occured in a web flow execution.
-	 */
-	private static final String RESULT_ALIAS = "result";
-
 	/**
 	 * The expression evaluator to use.
 	 */
@@ -55,25 +46,7 @@ public class BooleanExpressionTransitionCriteria implements TransitionCriteria {
 	}
 
 	public boolean test(RequestContext context) {
-		Object result = booleanExpression.evaluate(context, getEvaluationContext(context));
-		Assert.isInstanceOf(Boolean.class, result, "Impossible to determine result of boolean expression: ");
-		return ((Boolean) result).booleanValue();
-	}
-
-	/**
-	 * Setup a context with a few aliased values to make writing expression based transition conditions a bit easier.
-	 */
-	protected EvaluationContext getEvaluationContext(RequestContext context) {
-		final Map attributes = new HashMap(1, 1);
-		// ${#result == lastEvent.id}
-		if (context.getLastEvent() != null) {
-			attributes.put(RESULT_ALIAS, context.getLastEvent().getId());
-		}
-		return new EvaluationContext() {
-			public Map getAttributes() {
-				return attributes;
-			}
-		};
+		return ((Boolean) booleanExpression.getValue(context)).booleanValue();
 	}
 
 	public String toString() {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ConfigurableFlowAttributeMapper.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ConfigurableFlowAttributeMapper.java
deleted file mode 100644
index 7bdfa10e..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ConfigurableFlowAttributeMapper.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import java.io.Serializable;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.binding.expression.SettableExpression;
-import org.springframework.binding.mapping.AttributeMapper;
-import org.springframework.binding.mapping.DefaultAttributeMapper;
-import org.springframework.binding.mapping.Mapping;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.util.Assert;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.execution.ScopeType;
-
-/**
- * Generic flow attribute mapper implementation that allows mappings to be configured in a declarative fashion.
- * 
    
- * Two types of mappings may be configured, input mappings and output mappings:
- * 
      
- * 
    1. Input mappings define the rules for mapping attributes in a parent flow to a spawning subflow.
- * 
    2. Output mappings define the rules for mapping attributes returned from an ended subflow into the resuming parent.
- * 
    
- * 
    
- * The mappings defined using the configuration properties fully support bean property access. So an entry name in a
- * mapping can either be "beanName" or "beanName.propName". Nested property values are also supported
- * ("beanName.propName.nestedPropName"). When the from mapping string is enclosed in "${...}", it will be
- * interpreted as an expression that will be evaluated against the flow execution request context.
- * 
- * @see org.springframework.webflow.execution.RequestContext
- * 
- * @author Erwin Vervaet
- * @author Keith Donald
- * @author Colin Sampaleanu
- */
-public class ConfigurableFlowAttributeMapper extends AbstractFlowAttributeMapper implements Serializable {
-
-	/*
-	 * Note: no longer used by the Spring Web Flow code base. Kept around for possible usage by end users.
-	 */
-
-	/**
-	 * The expression parser that will parse input and output attribute expressions.
-	 */
-	private ExpressionParser expressionParser = DefaultExpressionParserFactory.getExpressionParser();
-
-	/**
-	 * The mapper that maps attributes into a spawning subflow.
-	 */
-	private DefaultAttributeMapper inputMapper = new DefaultAttributeMapper();
-
-	/**
-	 * The mapper that maps attributes returned by an ended subflow.
-	 */
-	private DefaultAttributeMapper outputMapper = new DefaultAttributeMapper();
-
-	/**
-	 * Set the expression parser responsible for parsing expression strings into evaluatable expression objects.
-	 */
-	public void setExpressionParser(ExpressionParser expressionParser) {
-		Assert.notNull(expressionParser, "The expression parser is required");
-		this.expressionParser = expressionParser;
-	}
-
-	/**
-	 * Adds a new input mapping. Use when you need full control over defining how a subflow input attribute mapping will
-	 * be perfomed.
-	 * @param inputMapping the input mapping
-	 * @return this, to support call chaining
-	 */
-	public ConfigurableFlowAttributeMapper addInputMapping(AttributeMapper inputMapping) {
-		inputMapper.addMapping(inputMapping);
-		return this;
-	}
-
-	/**
-	 * Adds a collection of input mappings. Use when you need full control over defining how a subflow input attribute
-	 * mapping will be perfomed.
-	 * @param inputMappings the input mappings
-	 */
-	public void addInputMappings(AttributeMapper[] inputMappings) {
-		inputMapper.addMappings(inputMappings);
-	}
-
-	/**
-	 * Adds a new output mapping. Use when you need full control over defining how a subflow output attribute mapping
-	 * will be perfomed.
-	 * @param outputMapping the output mapping
-	 * @return this, to support call chaining
-	 */
-	public ConfigurableFlowAttributeMapper addOutputMapping(AttributeMapper outputMapping) {
-		outputMapper.addMapping(outputMapping);
-		return this;
-	}
-
-	/**
-	 * Adds a collection of output mappings. Use when you need full control over defining how a subflow output attribute
-	 * mapping will be perfomed.
-	 * @param outputMappings the output mappings
-	 */
-	public void addOutputMappings(AttributeMapper[] outputMappings) {
-		outputMapper.addMappings(outputMappings);
-	}
-
-	/**
-	 * Adds an input mapping that maps a single attribute in parent flow scope into the subflow input map. For
-	 * instance: "x" will result in the "x" attribute in parent flow scope being mapped into the subflow input map as
-	 * "x".
-	 * @param attributeName the attribute in flow scope to map into the subflow
-	 * @return this, to support call chaining
-	 */
-	public ConfigurableFlowAttributeMapper addInputAttribute(String attributeName) {
-		SettableExpression attribute = expressionParser.parseSettableExpression(attributeName);
-		Expression scope = new AttributeExpression(attribute, ScopeType.FLOW);
-		addInputMapping(new Mapping(scope, attribute, null));
-		return this;
-	}
-
-	/**
-	 * Adds a collection of input mappings that map attributes in parent flow scope into the subflow input map.
-	 * For instance: "x" will result in the "x" attribute in parent flow scope being mapped into the subflow input map
-	 * as "x".
-	 * @param attributeNames the attributes in flow scope to map into the subflow
-	 */
-	public void addInputAttributes(String[] attributeNames) {
-		if (attributeNames == null) {
-			return;
-		}
-		for (int i = 0; i < attributeNames.length; i++) {
-			addInputAttribute(attributeNames[i]);
-		}
-	}
-
-	/**
-	 * Adds an output mapping that maps a single subflow output attribute into the flow scope of the resuming
-	 * parent flow. For instance: "y" will result in the "y" attribute of the subflow output map being mapped into the
-	 * flowscope of the resuming parent flow as "y".
-	 * @param attributeName the subflow output attribute to map into the parent flow scope
-	 * @return this, to support call chaining
-	 */
-	public ConfigurableFlowAttributeMapper addOutputAttribute(String attributeName) {
-		Expression attribute = expressionParser.parseExpression(attributeName);
-		SettableExpression scope = new AttributeExpression(attribute, ScopeType.FLOW);
-		addOutputMapping(new Mapping(attribute, scope, null));
-		return this;
-	}
-
-	/**
-	 * Adds a collection of output mappings that map subflow output attributes into the scope of the resuming parent
-	 * flow. For instance: "y" will result in the "y" attribute of the subflow output map being mapped into the
-	 * flowscope of the resuming parent flow as "y".
-	 * @param attributeNames the subflow output attributes to map into the parent flow
-	 */
-	public void addOutputAttributes(String[] attributeNames) {
-		if (attributeNames == null) {
-			return;
-		}
-		for (int i = 0; i < attributeNames.length; i++) {
-			addOutputAttribute(attributeNames[i]);
-		}
-	}
-
-	/**
-	 * Returns a typed-array of configured input mappings.
-	 * @return the configured input mappings
-	 */
-	public AttributeMapper[] getInputMappings() {
-		return inputMapper.getMappings();
-	}
-
-	/**
-	 * Returns a typed-array of configured output mappings.
-	 * @return the configured output mappings
-	 */
-	public AttributeMapper[] getOutputMappings() {
-		return outputMapper.getMappings();
-	}
-
-	/**
-	 * Returns the configured expression parser. Can be used by subclasses that build mappings.
-	 */
-	protected ExpressionParser getExpressionParser() {
-		return expressionParser;
-	}
-
-	protected AttributeMapper getInputMapper() {
-		return inputMapper;
-	}
-
-	protected AttributeMapper getOutputMapper() {
-		return outputMapper;
-	}
-
-	public String toString() {
-		return new ToStringCreator(this).append("inputMapper", inputMapper).append("outputMapper", outputMapper)
-				.toString();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/DefaultTargetStateResolver.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/DefaultTargetStateResolver.java
index b77c2139..000910eb 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/DefaultTargetStateResolver.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/DefaultTargetStateResolver.java
@@ -55,7 +55,7 @@ public class DefaultTargetStateResolver implements TargetStateResolver {
 	}
 
 	public State resolveTargetState(Transition transition, State sourceState, RequestContext context) {
-		String stateId = String.valueOf(targetStateIdExpression.evaluate(context, null));
+		String stateId = String.valueOf(targetStateIdExpression.getValue(context));
 		return ((Flow) context.getActiveFlow()).getStateInstance(stateId);
 	}
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ExternalRedirectSelector.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ExternalRedirectSelector.java
deleted file mode 100644
index 201a3c63..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/ExternalRedirectSelector.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import java.io.Serializable;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-
-/**
- * Makes view selections requesting a client side redirect to an external URL outside of the flow.
- * 
    
- * This selector is usefull when you wish to request a redirect after conversation completion as part of
- * entering an EndState.
- * 
    
- * This selector may also be used to redirect to an external URL from a ViewState of an active conversation. The
- * external system redirected to will be provided the flow execution context necessary to allow it to communicate back
- * to the executing flow at a later time.
- * 
- * @see org.springframework.webflow.execution.support.ExternalRedirect
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class ExternalRedirectSelector implements ViewSelector, Serializable {
-
-	/**
-	 * The parsed, evaluatable redirect URL expression.
-	 */
-	private Expression urlExpression;
-
-	/**
-	 * Create a new redirecting view selector that takes given URL expression as input. The expression is the parsed
-	 * form (expression-tokenized) of the encoded view (e.g. "/pathInfo?param0=value0¶m1=value1").
-	 * @param urlExpression the url expression
-	 */
-	public ExternalRedirectSelector(Expression urlExpression) {
-		this.urlExpression = urlExpression;
-	}
-
-	/**
-	 * Returns the expression used by this view selector.
-	 */
-	public Expression getUrlExpression() {
-		return urlExpression;
-	}
-
-	public boolean isEntrySelectionRenderable(RequestContext context) {
-		return true;
-	}
-
-	public ViewSelection makeEntrySelection(RequestContext context) {
-		String url = (String) urlExpression.evaluate(context, null);
-		return new ExternalRedirect(url);
-	}
-
-	public ViewSelection makeRefreshSelection(RequestContext context) {
-		return makeEntrySelection(context);
-	}
-
-	public String toString() {
-		return new ToStringCreator(this).append("urlExpression", urlExpression).toString();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/FlowDefinitionRedirectSelector.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/FlowDefinitionRedirectSelector.java
deleted file mode 100644
index 38488578..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/FlowDefinitionRedirectSelector.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.engine.support;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-
-/**
- * Makes a {@link FlowDefinitionRedirect} selection when requested, calculating the flowDefinitionId and
- * executionInput by evaluating an expression against the request context.
- * 
- * @see org.springframework.webflow.execution.support.FlowDefinitionRedirect
- * 
- * @author Keith Donald
- */
-public class FlowDefinitionRedirectSelector implements ViewSelector {
-
-	/**
-	 * The parsed flow expression, evaluatable to the string format:
-	 * flowDefinitionId?param1Name=parmValue¶m2Name=paramValue.
-	 */
-	private Expression expression;
-
-	/**
-	 * Creates a new launch flow redirect selector.
-	 * @param expression the parsed flow redirect expression, evaluatable to the string format:
-	 * flowDefinitionId?param1Name=parmValue¶m2Name=paramValue
-	 */
-	public FlowDefinitionRedirectSelector(Expression expression) {
-		this.expression = expression;
-	}
-
-	public boolean isEntrySelectionRenderable(RequestContext context) {
-		return true;
-	}
-
-	public ViewSelection makeEntrySelection(RequestContext context) {
-		String encodedRedirect = (String) expression.evaluate(context, null);
-		if (encodedRedirect == null) {
-			throw new IllegalStateException(
-					"Flow definition redirect expression evaluated to [null], the expression was " + expression);
-		}
-		// the encoded FlowDefinitionRedirect should look something like
-		// "flowDefinitionId?param0=value0¶m1=value1"
-		// now parse that and build a corresponding view selection
-		int index = encodedRedirect.indexOf('?');
-		String flowDefinitionId;
-		Map executionInput = null;
-		if (index != -1) {
-			flowDefinitionId = encodedRedirect.substring(0, index);
-			String[] parameters = StringUtils.delimitedListToStringArray(encodedRedirect.substring(index + 1), "&");
-			executionInput = new HashMap(parameters.length, 1);
-			for (int i = 0; i < parameters.length; i++) {
-				String nameAndValue = parameters[i];
-				index = nameAndValue.indexOf('=');
-				if (index != -1) {
-					executionInput.put(nameAndValue.substring(0, index), nameAndValue.substring(index + 1));
-				} else {
-					executionInput.put(nameAndValue, "");
-				}
-			}
-		} else {
-			flowDefinitionId = encodedRedirect;
-		}
-		if (!StringUtils.hasText(flowDefinitionId)) {
-			// equivalent to restart
-			flowDefinitionId = context.getFlowExecutionContext().getDefinition().getId();
-		}
-		return new FlowDefinitionRedirect(flowDefinitionId, executionInput);
-	}
-
-	public ViewSelection makeRefreshSelection(RequestContext context) {
-		return makeEntrySelection(context);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java
index c37e7f47..12438b4a 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandler.java
@@ -31,7 +31,6 @@ import org.springframework.webflow.engine.TargetStateResolver;
 import org.springframework.webflow.engine.Transition;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A flow execution exception handler that maps the occurrence of a specific type of exception to a transition to a new
@@ -100,17 +99,17 @@ public class TransitionExecutingFlowExecutionExceptionHandler implements FlowExe
 		return actionList;
 	}
 
-	public boolean handles(FlowExecutionException e) {
+	public boolean canHandle(FlowExecutionException e) {
 		return getTargetStateResolver(e) != null;
 	}
 
-	public ViewSelection handle(FlowExecutionException exception, RequestControlContext context) {
+	public void handle(FlowExecutionException exception, RequestControlContext context) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Handling flow execution exception " + exception, exception);
 		}
 		exposeException(context, exception, findRootCause(exception));
 		actionList.execute(context);
-		return context.execute(new Transition(getTargetStateResolver(exception)));
+		context.execute(new Transition(getTargetStateResolver(exception)));
 	}
 
 	// helpers
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/Action.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/Action.java
index c9edc514..b56eb530 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/Action.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/Action.java
@@ -94,9 +94,10 @@ public interface Action {
 	 * context information)
 	 * @return a logical result outcome, used as grounds for a transition in the calling flow (e.g. "success", "error",
 	 * "yes", "no", * ...)
-	 * @throws Exception a exception occured during action execution, either checked or unchecked; note, any
+	 * @throws Exception a exception occurred during action execution, either checked or unchecked; note, any
 	 * recoverable exceptions should be caught within this method and an appropriate result outcome returned
 	 * or be handled by the current state of the calling flow execution.
 	 */
+	// TODO consider changing the execute return value to a simple string for 2.0
 	public Event execute(RequestContext context) throws Exception;
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecution.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecution.java
index 3f833f05..0a578e9e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecution.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecution.java
@@ -16,44 +16,16 @@
 package org.springframework.webflow.execution;
 
 import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.execution.repository.FlowExecutionRepository;
 
 /**
- * A top-level instance of a flow definition that carries out definition execution on behalf of a single client.
- * Typically used to support the orchestration of a web conversation.
- * 
    
- * This is the central facade interface for manipulating one runtime execution of a flow definition. Implementations of
- * this interface are the finite state machine that is the heart of Spring Web Flow.
- * 
    
- * Typically, when a client wants to launch a flow execution at production time, she passes the id of the governing
- * {@link FlowDefinition flow definition} to a coordinating
- * {@link org.springframework.webflow.executor.FlowExecutor#launch(String, ExternalContext) flow executor}. This
- * coordinator then typically uses a {@link FlowExecutionFactory flow execution factory} to create an object
- * implementing this interface, initializing it with the requested flow definition which becomes the execution's "root"
- * or top-level flow.
- * 
    
- * After execution creation, the {@link #start(MutableAttributeMap, ExternalContext) start} operation is called, which
- * causes this execution to activate a new {@link FlowSession session} for its root flow definition. That session is
- * then said to become the active flow. An execution {@link RequestContext request context} is created, the
- * Flow's {@link FlowDefinition#getStartState() start state} is entered, and the request is processed.
- * 
    
- * In a distributed environment such as HTTP, after a call into this object has completed and control returns to the
- * caller, this execution object (if still active) is typically saved out to a repository before the server request
- * ends. For example it might be saved out to the HttpSession, a Database, or a client-side hidden form field for later
- * restoration and manipulation. This execution persistence is the responsibility of the
- * {@link org.springframework.webflow.execution.repository.FlowExecutionRepository flow execution repository} subsystem.
- * 
    
- * Subsequent requests from the client to manipulate this flow execution trigger restoration of this object, followed by
- * an invocation of the {@link #signalEvent(String, ExternalContext) signal event} operation. The signalEvent operation
- * resumes this execution by indicating what action the user took from within the current state; for example, the user
- * may have pressed the "submit" button, or pressed "cancel". After the user event is processed, control again goes back
- * to the caller and if this execution is still active, it is again saved out to the repository.
- * 
    
- * This process continues until a client event causes this flow execution to end (by the root flow reaching an end
- * state). At that time this object is no longer active, and is removed from the repository and discarded.
- * 
    
- * Flow executions can have their lifecycle observed by {@link FlowExecutionListener listeners}.
+ * An execution of a flow definition. This is the central interface for manipulating a runtime execution of a flow
+ * definition.
+ * 
+ * A FlowExecution instance is typically created by a {@link FlowExecutionFactory factory}. A FlowExecution instance is
+ * persisted using a {@link FlowExecutionRepository repository}. A FlowExecution's lifecycle is observed by zero or
+ * more {@link FlowExecutionListener listeners}
  * 
  * @see FlowDefinition
  * @see FlowSession
@@ -68,38 +40,26 @@ import org.springframework.webflow.definition.FlowDefinition;
 public interface FlowExecution extends FlowExecutionContext {
 
 	/**
-	 * Start this flow execution, transitioning it to the root flow's start state and returning the starting view
-	 * selection needed to issue an initial user response. Typically called by a flow executor on behalf of a browser
-	 * client, but also from test code.
+	 * Start this flow execution. This method should only be called once.
 	 * 
    
-	 * This will start the entire flow execution from scratch.
-	 * @param input input attributes to pass to the flow, which the flow may choose to map into its scope
-	 * @param context the external context in which the starting event occurred
-	 * @return the starting view selection, a value object to be used to issue a suitable response to the caller
+	 * When this method returns, execution status is either "paused" or "ended". If ended, the flow execution cannot be
+	 * used again. If "paused", the flow execution may be {@link #resume(ExternalContext)}.
+	 * @param context the external context representing the calling environment
 	 * @throws FlowExecutionException if an exception was thrown within a state of the flow execution during request
 	 * processing
 	 */
-	public ViewSelection start(MutableAttributeMap input, ExternalContext context) throws FlowExecutionException;
+	public void start(ExternalContext context) throws FlowExecutionException;
 
 	/**
-	 * Signal an occurrence of the specified user event in the current state of this executing flow. The event will be
-	 * processed in full and control will be returned once event processing is complete.
-	 * @param eventId the identifier of the user event that occurred
-	 * @param context the external context in which the event occurred
-	 * @return the next view selection to render, used by the calling executor to issue a suitable response to the
-	 * client
+	 * Resume this flow execution. May be called when the flow execution is paused.
+	 * 
+	 * When this method returns, execution status is either "paused" or "ended". If ended, the flow execution cannot be
+	 * used again. If "paused", the flow execution may be resumed again.
+	 * @param context the external context, representing the calling environment, where something happened this flow
+	 * execution should respond to
 	 * @throws FlowExecutionException if an exception was thrown within a state of the resumed flow execution during
 	 * event processing
 	 */
-	public ViewSelection signalEvent(String eventId, ExternalContext context) throws FlowExecutionException;
+	public void resume(ExternalContext context) throws FlowExecutionException;
 
-	/**
-	 * Refresh this flow execution, asking the current view selection to be reconstituted to support reissuing the last
-	 * response. This is an idempotent operation that may be safely called on a paused execution.
-	 * @param context the external context in which the refresh event occurred
-	 * @return the current view selection for this flow execution
-	 * @throws FlowExecutionException if an exception was thrown within a state of the resumed flow execution during
-	 * event processing
-	 */
-	public ViewSelection refresh(ExternalContext context) throws FlowExecutionException;
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionContext.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionContext.java
index 694275b5..db183d6c 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionContext.java
@@ -21,8 +21,8 @@ import org.springframework.webflow.definition.FlowDefinition;
 
 /**
  * Provides contextual information about a flow execution. A flow execution is an runnable instance of a
- * {@link FlowDefinition}. In other words, it is the central Spring Web Flow construct for carrying out a conversation
- * with a client. This immutable interface provides access to runtime information about the conversation, such as it's
+ * {@link FlowDefinition}. It is the central Spring Web Flow construct for carrying out a conversation with a client.
+ * This immutable interface provides access to runtime information about the conversation, such as it's
  * {@link #isActive() status} and {@link #getActiveSession() current state}.
  * 
    
  * An object implementing this interface is also traversable from a execution request context (see
@@ -41,6 +41,13 @@ import org.springframework.webflow.definition.FlowDefinition;
  */
 public interface FlowExecutionContext {
 
+	/**
+	 * Returns the key assigned to this flow execution. The flow execution key is the flow execution's persistent
+	 * identity.
+	 * @return the flow execution key; may be null if a key has not yet been assigned.
+	 */
+	public FlowExecutionKey getKey();
+
 	/**
 	 * Returns the root flow definition associated with this executing flow.
 	 * 
    
@@ -50,6 +57,14 @@ public interface FlowExecutionContext {
 	 */
 	public FlowDefinition getDefinition();
 
+	/**
+	 * Returns a flag indicating if this execution has been started. A flow execution that has started and is active is
+	 * currently in progress. A flow execution that has started and is not active has ended.
+	 * @see #isActive()
+	 * @return true if started, false if not started
+	 */
+	public boolean hasStarted();
+
 	/**
 	 * Is the flow execution active?
 	 * 
    
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionContextHolder.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionContextHolder.java
deleted file mode 100644
index a9bd95d1..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionContextHolder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution;
-
-import org.springframework.util.Assert;
-
-/**
- * Simple holder class that associates a {@link FlowExecutionContext} instance with the current thread. The
- * FlowExecutionContext will not be inherited by any child threads spawned by the current thread.
- * 
    
- * Used as a central holder for the current FlowExecutionContext in Spring Web Flow, wherever necessary. Often used by
- * artifacts needing to access the current active flow execution.
- * 
- * @see FlowExecutionContext
- * 
- * @author Ben Hale
- * @since 1.1
- */
-public class FlowExecutionContextHolder {
-
-	private static final ThreadLocal flowExecutionContextHolder = new ThreadLocal();
-
-	/**
-	 * Associate the given FlowExecutionContext with the current thread.
-	 * @param flowExecutionContext the current FlowExecutionContext, or null to reset the thread-bound
-	 * context
-	 */
-	public static void setFlowExecutionContext(FlowExecutionContext flowExecutionContext) {
-		flowExecutionContextHolder.set(flowExecutionContext);
-	}
-
-	/**
-	 * Return the FlowExecutionContext associated with the current thread, if any.
-	 * @return the current FlowExecutionContext
-	 * @throws IllegalStateException if no FlowExecutionContext is bound to this thread
-	 */
-	public static FlowExecutionContext getFlowExecutionContext() throws IllegalStateException {
-		Assert.state(flowExecutionContextHolder.get() != null, "No flow execution context is bound to this thread");
-		return (FlowExecutionContext) flowExecutionContextHolder.get();
-	}
-
-	// not instantiable
-	private FlowExecutionContextHolder() {
-	}
-}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionException.java
index 669fa20d..c551b656 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionException.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionException.java
@@ -22,7 +22,7 @@ import org.springframework.webflow.core.FlowException;
  * encouraged to create a specific subclass for a particular use case.
  * 
    
  * Execution exceptions occur at runtime when the flow is executing requests on behalf of a client. They signal that an
- * execution problem occured: e.g. action execution failed or no transition matched the current request context.
+ * execution problem occurred: e.g. action execution failed or no transition matched the current request context.
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
@@ -30,19 +30,19 @@ import org.springframework.webflow.core.FlowException;
 public class FlowExecutionException extends FlowException {
 
 	/**
-	 * The id of the flow definition in which the exception occured.
+	 * The id of the flow definition in which the exception occurred.
 	 */
 	private String flowId;
 
 	/**
-	 * The state of the flow where the exception occured (optional).
+	 * The state of the flow where the exception occurred (optional).
 	 */
 	private String stateId;
 
 	/**
 	 * Creates a new flow execution exception.
-	 * @param flowId the flow where the exception occured
-	 * @param stateId the state where the exception occured
+	 * @param flowId the flow where the exception occurred
+	 * @param stateId the state where the exception occurred
 	 * @param message a descriptive message
 	 */
 	public FlowExecutionException(String flowId, String stateId, String message) {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionFactory.java
index 7d144f4c..885b227f 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionFactory.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionFactory.java
@@ -18,7 +18,7 @@ package org.springframework.webflow.execution;
 import org.springframework.webflow.definition.FlowDefinition;
 
 /**
- * An abstract factory for creating flow exections. A flow execution represents a runtime, top-level instance of a flow
+ * An abstract factory for creating flow executions. A flow execution represents a runtime, top-level instance of a flow
  * definition.
  * 
    
  * This factory provides encapsulation of the flow execution implementation type, as well as its construction and
@@ -35,15 +35,10 @@ import org.springframework.webflow.definition.FlowDefinition;
  */
 public interface FlowExecutionFactory {
 
-	// TODO: should this class be moved to the execution.factory package for clarity
-	// and to align it with package structuring for flow execution repositories?
-
 	/**
 	 * Create a new flow execution product for the given flow definition.
 	 * @param flowDefinition the flow definition
 	 * @return the new flow execution, fully initialized and awaiting to be started
-	 * @see FlowExecution#start(org.springframework.webflow.core.collection.MutableAttributeMap,
-	 * org.springframework.webflow.context.ExternalContext)
 	 */
 	public FlowExecution createFlowExecution(FlowDefinition flowDefinition);
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionKey.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionKey.java
similarity index 80%
rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionKey.java
rename to spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionKey.java
index d479099d..a8ad95f4 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionKey.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionKey.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.execution.repository;
+package org.springframework.webflow.execution;
 
 import java.io.Serializable;
 
+import org.springframework.webflow.execution.repository.FlowExecutionRepository;
+
 /**
  * A key that uniquely identifies a flow execution in a managed {@link FlowExecutionRepository}. Serves as a flow
  * execution's persistent identity.
@@ -27,10 +29,9 @@ import java.io.Serializable;
  */
 public abstract class FlowExecutionKey implements Serializable {
 
-	/**
-	 * Subclasses should override toString to return a parseable string form of the key.
-	 * @see java.lang.Object#toString()
-	 * @see FlowExecutionRepository#parseFlowExecutionKey(String)
-	 */
+	public abstract boolean equals(Object o);
+
+	public abstract int hashCode();
+
 	public abstract String toString();
 }
\ No newline at end of file
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationContext.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionKeyFactory.java
similarity index 54%
rename from spring-binding/src/main/java/org/springframework/binding/expression/EvaluationContext.java
rename to spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionKeyFactory.java
index 26231287..7acb90f7 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/EvaluationContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionKeyFactory.java
@@ -1,37 +1,33 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.binding.expression;
-
-import java.util.Map;
-
-/**
- * A context object with two main responsibities:
- * 
      
- * 
    1. Exposing information to an expression to influence an evaluation attempt.
- * 
    2. Providing operations for recording progress or errors during the expression evaluation process.
- * 
    
- * 
- * @author Keith Donald
- */
-public interface EvaluationContext {
-
-	/**
-	 * Returns a map of attributes that can be used to influence expression evaluation.
-	 * @return the evaluation attributes
-	 */
-	public Map getAttributes();
-
-}
\ No newline at end of file
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.execution;
+
+/**
+ * A factory for creating flow execution keys. Used to generate a persistent identity for a flow execution that needs to
+ * be persisted.
+ * 
+ * @author Keith Donald
+ */
+public interface FlowExecutionKeyFactory {
+
+	/**
+	 * Get the key to assign to the flow execution. This factory simply generates the key to assign, it does not
+	 * actually perform the key assignment.
+	 * @param execution the flow execution
+	 * @return the key to assign to the flow execution
+	 */
+	public FlowExecutionKey getKey(FlowExecution execution);
+}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListener.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListener.java
index fd44986a..1aa7315c 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListener.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListener.java
@@ -29,7 +29,7 @@ import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
  * one or more well-defined flow execution lifecycles.
  * 
    
  * For example, one custom listener may apply security checks at the flow execution level, preventing a flow from
- * starting or a state from entering if the curent user does not have the necessary permissions. Another listener may
+ * starting or a state from entering if the current user does not have the necessary permissions. Another listener may
  * track flow execution navigation history to support bread crumbs. Another may perform auditing, or setup and tear down
  * connections to a transactional resource.
  * 
    
@@ -43,7 +43,6 @@ import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
  * @see FlowExecution
  * @see RequestContext
  * @see Event
- * @see ViewSelection
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
@@ -64,24 +63,23 @@ public interface FlowExecutionListener {
 	public void requestProcessed(RequestContext context);
 
 	/**
-	 * Called to indicate a new flow definition session is about to be created and started. Called before the session is
-	 * created. An exception may be thrown from this method to veto the start operation. Any type of runtime exception
-	 * can be used for this purpose.
+	 * Called to indicate a new flow definition session is about to be created. Called before the session is created. An
+	 * exception may be thrown from this method to veto the start operation. Any type of runtime exception can be used
+	 * for this purpose.
 	 * @param context the source of the event
 	 * @param definition the flow for which a new session is starting
-	 * @param input a mutable input map - attributes placed in this map are eligible for input mapping by the flow
-	 * definition at startup
 	 */
-	public void sessionStarting(RequestContext context, FlowDefinition definition, MutableAttributeMap input);
+	public void sessionCreating(RequestContext context, FlowDefinition definition);
 
 	/**
 	 * Called after a new flow session has been created but before it starts. Useful for setting arbitrary attributes in
 	 * the session before the flow starts.
 	 * @param context the source of the event
 	 * @param session the session that was created
-	 * @since 1.0.2
+	 * @param input a mutable input map - attributes placed in this map are eligible for input mapping by the flow
+	 * definition at startup
 	 */
-	public void sessionCreated(RequestContext context, FlowSession session);
+	public void sessionStarting(RequestContext context, FlowSession session, MutableAttributeMap input);
 
 	/**
 	 * Called after a new flow session has started. At this point the flow's start state has been entered and any other
@@ -117,15 +115,14 @@ public interface FlowExecutionListener {
 	/**
 	 * Called when a flow execution is paused, for instance when it is waiting for user input (after event processing).
 	 * @param context the source of the event
-	 * @param selectedView the view that will display
 	 */
-	public void paused(RequestContext context, ViewSelection selectedView);
+	public void paused(RequestContext context);
 
 	/**
 	 * Called after a flow execution is successfully reactivated after pause (but before event processing).
 	 * @param context the source of the event
 	 */
-	public void resumed(RequestContext context);
+	public void resuming(RequestContext context);
 
 	/**
 	 * Called when the active flow execution session has been asked to end but before it has ended.
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListenerAdapter.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListenerAdapter.java
index 6a6358e6..dd9f1077 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListenerAdapter.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowExecutionListenerAdapter.java
@@ -35,10 +35,10 @@ public abstract class FlowExecutionListenerAdapter implements FlowExecutionListe
 	public void requestProcessed(RequestContext context) {
 	}
 
-	public void sessionStarting(RequestContext context, FlowDefinition definition, MutableAttributeMap input) {
+	public void sessionCreating(RequestContext context, FlowDefinition definition) {
 	}
 
-	public void sessionCreated(RequestContext context, FlowSession session) {
+	public void sessionStarting(RequestContext context, FlowSession session, MutableAttributeMap input) {
 	}
 
 	public void sessionStarted(RequestContext context, FlowSession session) {
@@ -53,10 +53,10 @@ public abstract class FlowExecutionListenerAdapter implements FlowExecutionListe
 	public void stateEntered(RequestContext context, StateDefinition previousState, StateDefinition newState) {
 	}
 
-	public void resumed(RequestContext context) {
+	public void paused(RequestContext context) {
 	}
 
-	public void paused(RequestContext context, ViewSelection selectedView) {
+	public void resuming(RequestContext context) {
 	}
 
 	public void sessionEnding(RequestContext context, FlowSession session, MutableAttributeMap output) {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowSession.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowSession.java
index bb89d572..f3e0ef23 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowSession.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowSession.java
@@ -27,31 +27,11 @@ import org.springframework.webflow.definition.StateDefinition;
  * {@link #getScope() flow scope} lives for the life of this object and is cleaned up automatically when this object is
  * destroyed. Destruction happens when this session enters an end state.
  * 
    
- * A flow session will go through several status changes during its lifecycle. Initially it will be
- * {@link FlowSessionStatus#CREATED} when a new execution is started.
- * 
    
- * After passing through the {@link FlowSessionStatus#STARTING} status, the flow session is activated (about to be
- * manipulated) and its status becomes {@link FlowSessionStatus#ACTIVE}. In the case of a new execution session
- * activation happens immediately after creation to put the "root flow" at the top of the stack and transition it to its
- * start state.
- * 
    
- * When control returns to the client for user think time the status is updated to {@link FlowSessionStatus#PAUSED}.
- * The flow is no longer actively processing then, as it is stored off to a repository waiting on the user to resume.
- * 
    
- * If a flow session is pushed down in the stack because a subflow is spawned, its status becomes
- * {@link FlowSessionStatus#SUSPENDED} until the subflow returns (ends) and is popped off the stack. The resuming flow
- * session then becomes active once again.
- * 
    
- * When a flow session is terminated because an EndState is reached its status becomes {@link FlowSessionStatus#ENDED},
- * which ends its life. When this happens the session is popped off the stack and discarded, and any allocated resources
- * in "flow scope" are automatically cleaned up.
- * 
    
  * Note that a flow session is in no way linked to an HTTP session. It just uses the familiar "session" naming
  * convention to denote a stateful object.
  * 
  * @see FlowDefinition
  * @see FlowExecution
- * @see FlowSessionStatus
  * 
  * @author Keith Donald
  * @author Erwin Vervaet
@@ -68,11 +48,6 @@ public interface FlowSession {
 	 */
 	public StateDefinition getState();
 
-	/**
-	 * Returns the current status of this flow session. This value changes as the flow executes.
-	 */
-	public FlowSessionStatus getStatus();
-
 	/**
 	 * Return this session's local attributes; the basis for "flow scope" (flow session scope).
 	 * @return the flow scope attributes
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowSessionStatus.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowSessionStatus.java
deleted file mode 100644
index 5f3ca797..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/FlowSessionStatus.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution;
-
-import org.springframework.core.enums.StaticLabeledEnum;
-
-/**
- * Type-safe enumeration of possible flow session statuses. Consult the JavaDoc for the {@link FlowSession} for more
- * information on how these statuses are used during the life cycle of a flow session.
- * 
- * @see org.springframework.webflow.execution.FlowSession
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class FlowSessionStatus extends StaticLabeledEnum {
-
-	/**
-	 * Initial status of a flow session; the session has been created but not yet activated.
-	 */
-	public static final FlowSessionStatus CREATED = new FlowSessionStatus(0, "Created");
-
-	/**
-	 * A flow session with STARTING status is about to enter its start state.
-	 */
-	public static final FlowSessionStatus STARTING = new FlowSessionStatus(1, "Starting");
-
-	/**
-	 * A flow session with ACTIVE status is currently executing.
-	 */
-	public static final FlowSessionStatus ACTIVE = new FlowSessionStatus(2, "Active");
-
-	/**
-	 * A flow session with PAUSED status is currently waiting on the user to signal an event.
-	 */
-	public static final FlowSessionStatus PAUSED = new FlowSessionStatus(3, "Paused");
-
-	/**
-	 * A flow session that is SUSPENDED is not actively executing a flow. It is waiting for subflow execution to
-	 * complete before continuing.
-	 */
-	public static final FlowSessionStatus SUSPENDED = new FlowSessionStatus(4, "Suspended");
-
-	/**
-	 * A flow session that has ENDED is no longer actively executing a flow. This is the final status of a flow session.
-	 */
-	public static final FlowSessionStatus ENDED = new FlowSessionStatus(5, "Ended");
-
-	/**
-	 * Private constructor because this is a typesafe enum!
-	 */
-	private FlowSessionStatus(int code, String label) {
-		super(code, label);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/RequestContext.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/RequestContext.java
index 67f20899..f798bf99 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/RequestContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/RequestContext.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.webflow.execution;
 
+import org.springframework.binding.message.MessageContext;
 import org.springframework.webflow.context.ExternalContext;
 import org.springframework.webflow.core.collection.AttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
@@ -44,9 +45,7 @@ import org.springframework.webflow.definition.TransitionDefinition;
  * code, e.g. a view implementation (JSP).
  * 
    
  * The {@link #getRequestScope() requestScope} property may be used as a store for arbitrary data that should exist for
- * the life of this object. Request-scoped data, along with all data in {@link #getFlashScope() flash scope},
- * {@link #getFlowScope() flow scope} and {@link #getConversationScope() conversation scope} is available for exposing
- * to view templates via a {@link #getModel() model} property.
+ * the life of this object.
  * 
    
  * The web flow system will ensure that a RequestContext object is local to the current thread. It can be safely
  * manipulated without needing to worry about concurrent access.
@@ -77,22 +76,22 @@ public interface RequestContext {
 	public StateDefinition getCurrentState() throws IllegalStateException;
 
 	/**
-	 * Returns a mutable accessor for accessing and/or setting attributes in request scope. Request scoped attributes
+	 * Returns a mutable map for accessing and/or setting attributes in request scope. Request scoped attributes
 	 * exist for the duration of this request only.
 	 * @return the request scope
 	 */
 	public MutableAttributeMap getRequestScope();
 
 	/**
-	 * Returns a mutable accessor for accessing and/or setting attributes in flash scope. Flash scoped attributes
-	 * exist untill the next event is signaled in the flow execution.
+	 * Returns a mutable map for accessing and/or setting attributes in flash scope. Flash scoped attributes exist
+	 * until the next event is signaled in the flow execution.
 	 * @return the flash scope
 	 */
 	public MutableAttributeMap getFlashScope();
 
 	/**
-	 * Returns a mutable accessor for accessing and/or setting attributes in flow scope. Flow scoped attributes exist
-	 * for the life of the active flow session.
+	 * Returns a mutable map for accessing and/or setting attributes in flow scope. Flow scoped attributes exist for
+	 * the life of the active flow session.
 	 * @return the flow scope
 	 * @see FlowSession
 	 */
@@ -132,6 +131,13 @@ public interface RequestContext {
 	 */
 	public ExternalContext getExternalContext();
 
+	/**
+	 * Returns the message context of this request. Useful for recording messages during the course of flow execution
+	 * for display to the client.
+	 * @return the message context
+	 */
+	public MessageContext getMessageContext();
+
 	/**
 	 * Returns contextual information about the flow execution itself. Information in this context typically spans more
 	 * than one request.
@@ -148,7 +154,7 @@ public interface RequestContext {
 
 	/**
 	 * Returns the last state transition that executed in this request.
-	 * @return the last transition, or null if no transition has occured yet
+	 * @return the last transition, or null if no transition has occurred yet
 	 */
 	public TransitionDefinition getLastTransition();
 
@@ -166,11 +172,10 @@ public interface RequestContext {
 	public void setAttributes(AttributeMap attributes);
 
 	/**
-	 * Returns the data model capturing the state of this context, suitable for exposing to clients (mostly web views).
-	 * Typically the model will contain the union of the data available in request, flash, session and conversation
-	 * scope.
-	 * @return the model that can be exposed to a client view for rendering purposes
+	 * Returns the context-relative URL of this flow execution. Needed by response writers that write out the URL of
+	 * this flow execution to allow calling back this execution in a subsequent request.
+	 * @throws IllegalStateException if the flow execution has not yet had its key assigned
+	 * @return the flow execution URL
 	 */
-	public AttributeMap getModel();
-
+	public String getFlowExecutionUrl() throws IllegalStateException;
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/RequestContextHolder.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/RequestContextHolder.java
new file mode 100644
index 00000000..f162a76d
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/RequestContextHolder.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.execution;
+
+/**
+ * Simple holder class that associates a {@link RequestContext} instance with the current thread. The RequestContext
+ * will not be inherited by any child threads spawned by the current thread.
+ * 
    
+ * Used as a central holder for the current RequestContext in Spring Web Flow, wherever necessary. Often used by
+ * integration artifacts needing access to the current flow execution.
+ * 
+ * @see RequestContext
+ * 
+ * @author Jeremy Grelle
+ */
+public class RequestContextHolder {
+
+	private static final ThreadLocal requestContextHolder = new ThreadLocal();
+
+	/**
+	 * Associate the given RequestContext with the current thread.
+	 * @param requestContext the current RequestContext, or null to reset the thread-bound context
+	 */
+	public static void setRequestContext(RequestContext requestContext) {
+		requestContextHolder.set(requestContext);
+	}
+
+	/**
+	 * Return the RequestContext associated with the current thread, if any.
+	 * @return the current RequestContext
+	 * @throws IllegalStateException if no RequestContext is bound to this thread
+	 */
+	public static RequestContext getRequestContext() {
+		return (RequestContext) requestContextHolder.get();
+	}
+
+	// not instantiable
+	private RequestContextHolder() {
+	}
+}
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/SettableExpression.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/View.java
similarity index 51%
rename from spring-binding/src/main/java/org/springframework/binding/expression/SettableExpression.java
rename to spring-webflow/src/main/java/org/springframework/webflow/execution/View.java
index e5949084..de067cf8 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/SettableExpression.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/View.java
@@ -1,33 +1,44 @@
 /*
  * Copyright 2004-2007 the original author or authors.
- * 
+ *
  * 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.springframework.binding.expression;
+package org.springframework.webflow.execution;
 
 /**
- * An evaluator that is capable of setting a value on a target object at the path defined by this expression.
+ * Allows the client to participate in flow execution. Encapsulates behavior to send the client an appropriate response
+ * and handle the resulting event once the client responds.
  * 
  * @author Keith Donald
+ * @see ViewFactory
  */
-public interface SettableExpression extends Expression {
+public interface View {
 
 	/**
-	 * Evaluate this expression against the target object to set its value to the value provided.
-	 * @param target the target object
-	 * @param value the new value to be set
-	 * @param context the evaluation context
-	 * @throws EvaluationException an exception occured during evaluation
+	 * Render this view's content.
 	 */
-	public void evaluateToSet(Object target, Object value, EvaluationContext context) throws EvaluationException;
-}
\ No newline at end of file
+	public void render();
+
+	/**
+	 * Was a user event signaled on this view in this request?
+	 * @return true if yes, false otherwise
+	 */
+	public boolean eventSignaled();
+
+	/**
+	 * Get the user event signaled on this view in this request.
+	 * @return the user event
+	 */
+	public Event getEvent();
+
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/scope/StubObjectFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/ViewFactory.java
similarity index 54%
rename from spring-webflow/src/test/java/org/springframework/webflow/config/scope/StubObjectFactory.java
rename to spring-webflow/src/main/java/org/springframework/webflow/execution/ViewFactory.java
index a091ce0c..f536d9f8 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/scope/StubObjectFactory.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/ViewFactory.java
@@ -13,26 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.config.scope;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.ObjectFactory;
+package org.springframework.webflow.execution;
 
 /**
- * Stub implementation for testing the Spring Web Flow scopes.
+ * A factory for a view that allows the client to participate in flow execution. Encapsulates creation and restoration
+ * of the view implementation, including any application of request values to determine what user event was signaled.
  * 
- * @author Ben Hale
+ * @author Keith Donald
  */
-public class StubObjectFactory implements ObjectFactory {
+public interface ViewFactory {
 
-	private Object value = new Object();
-
-	public Object getObject() throws BeansException {
-		return value;
-	}
-
-	public Object getValue() {
-		return value;
-	}
-
-}
+	/**
+	 * Get the view to render for this request.
+	 * @param context the flow execution request context.
+	 * @return the view to render
+	 */
+	public View getView(RequestContext context);
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/ViewSelection.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/ViewSelection.java
deleted file mode 100644
index 82fd0d75..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/ViewSelection.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.execution;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-
-/**
- * Abstract base class for value objects that provide callers into a flow execution information about a logical response
- * to issue and the data necessary to issue it.
- * 
    
- * This class is a generic marker returned when a request into an executing flow has completed processing, indicating a
- * client response needs to be issued. An instance of a ViewSelection subclass represents the selection of a concrete
- * response type. It is expected that callers introspect the returned view selection instance to handle the response
- * types they support.
- * 
- * @see FlowExecution
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public abstract class ViewSelection implements Serializable {
-
-	/**
-	 * Constant for a null or empty view selection, indicating no response should be issued.
-	 */
-	public static final ViewSelection NULL_VIEW = new NullView();
-
-	/**
-	 * The definition of the 'null' view selection type, indicating that no response should be issued.
-	 */
-	private static final class NullView extends ViewSelection {
-
-		// resolve the singleton instance
-		private Object readResolve() throws ObjectStreamException {
-			return NULL_VIEW;
-		}
-
-		public String toString() {
-			return "null";
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/ConditionalFlowExecutionListenerLoader.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/ConditionalFlowExecutionListenerLoader.java
index 0a51cc74..6a2bb3a1 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/ConditionalFlowExecutionListenerLoader.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/ConditionalFlowExecutionListenerLoader.java
@@ -18,14 +18,11 @@ package org.springframework.webflow.execution.factory;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.core.style.StylerUtils;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.execution.FlowExecutionListener;
 
@@ -34,16 +31,14 @@ import org.springframework.webflow.execution.FlowExecutionListener;
  * of which listeners should apply to which flow definitions. For trivial listener loading, see
  * {@link StaticFlowExecutionListenerLoader}.
  * 
+ * @see FlowExecutionListenerCriteria
  * @see StaticFlowExecutionListenerLoader
  * 
  * @author Keith Donald
  */
 public class ConditionalFlowExecutionListenerLoader implements FlowExecutionListenerLoader {
 
-	/**
-	 * Logger, usable by subclasses.
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
+	private final Log logger = LogFactory.getLog(ConditionalFlowExecutionListenerLoader.class);
 
 	/**
 	 * The list of flow execution listeners containing {@link ConditionalFlowExecutionListenerHolder} objects. The list
@@ -51,25 +46,6 @@ public class ConditionalFlowExecutionListenerLoader implements FlowExecutionList
 	 */
 	private List listeners = new LinkedList();
 
-	/**
-	 * Add a listener that will listen to executions for all flows.
-	 * @param listener the listener to add
-	 */
-	public void addListener(FlowExecutionListener listener) {
-		addListener(listener, null);
-	}
-
-	/**
-	 * Adds a collection of listeners that share a matching criteria.
-	 * @param listeners the listeners
-	 * @param criteria the criteria where these listeners apply
-	 */
-	public void addListeners(FlowExecutionListener[] listeners, FlowExecutionListenerCriteria criteria) {
-		for (int i = 0; i < listeners.length; i++) {
-			addListener(listeners[i], criteria);
-		}
-	}
-
 	/**
 	 * Add a listener that will listen to executions to flows matching the specified criteria.
 	 * @param listener the listener
@@ -77,7 +53,7 @@ public class ConditionalFlowExecutionListenerLoader implements FlowExecutionList
 	 */
 	public void addListener(FlowExecutionListener listener, FlowExecutionListenerCriteria criteria) {
 		if (listener == null) {
-			return;
+			throw new IllegalArgumentException("The flow execution listener cannot be null");
 		}
 		if (logger.isDebugEnabled()) {
 			logger.debug("Adding flow execution listener " + listener + " with criteria " + criteria);
@@ -93,85 +69,6 @@ public class ConditionalFlowExecutionListenerLoader implements FlowExecutionList
 		conditional.add(criteria);
 	}
 
-	/**
-	 * Set the list of flow execution listeners with corresponding criteria. Allows for bean style configuration. The
-	 * given map should have {@link FlowExecutionListener} objects as keys and Strings ("*", "flowId",
-	 * "flowId1,flowId2") or {@link FlowExecutionListenerCriteria} objects as values. This will clear any listeners
-	 * registered with this object using the addListener methods.
-	 * @param listenersWithCriteria the map of listeners and their corresponding criteria
-	 */
-	public void setListeners(Map listenersWithCriteria) {
-		removeAllListeners();
-		for (Iterator it = listenersWithCriteria.entrySet().iterator(); it.hasNext();) {
-			Entry entry = (Entry) it.next();
-			Assert.isInstanceOf(FlowExecutionListener.class, entry.getKey(),
-					"The key in the listenersWithCriteria map needs to be a FlowExecutionListener object");
-			FlowExecutionListener listener = (FlowExecutionListener) entry.getKey();
-			FlowExecutionListenerCriteria criteria = null;
-			if (entry.getValue() instanceof String) {
-				criteria = getCriteria((String) entry.getValue());
-			} else if (entry.getValue() instanceof FlowExecutionListenerCriteria) {
-				criteria = (FlowExecutionListenerCriteria) entry.getValue();
-			} else if (entry.getValue() != null) {
-				throw new IllegalArgumentException("The value in the listenersWithCriteria map needs to be a "
-						+ "String or a FlowExecutionListenerCriteria object");
-			}
-			addListener(listener, criteria);
-		}
-	}
-
-	/**
-	 * Is the given listener contained by this Flow execution manager?
-	 * @param listener the listener
-	 * @return true if yes, false otherwise
-	 */
-	public boolean containsListener(FlowExecutionListener listener) {
-		Iterator it = listeners.iterator();
-		while (it.hasNext()) {
-			ConditionalFlowExecutionListenerHolder h = (ConditionalFlowExecutionListenerHolder) it.next();
-			if (h.getListener().equals(listener)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Remove the flow execution listener from the listener list.
-	 * @param listener the listener
-	 */
-	public void removeListener(FlowExecutionListener listener) {
-		Iterator it = listeners.iterator();
-		while (it.hasNext()) {
-			ConditionalFlowExecutionListenerHolder h = (ConditionalFlowExecutionListenerHolder) it.next();
-			if (h.getListener().equals(listener)) {
-				it.remove();
-			}
-		}
-	}
-
-	/**
-	 * Remove all listeners loadable by this loader.
-	 */
-	public void removeAllListeners() {
-		listeners.clear();
-	}
-
-	/**
-	 * Remove the criteria for the specified listener.
-	 * @param listener the listener
-	 * @param criteria the criteria
-	 */
-	public void removeListenerCriteria(FlowExecutionListener listener, FlowExecutionListenerCriteria criteria) {
-		if (containsListener(listener)) {
-			ConditionalFlowExecutionListenerHolder listenerHolder = getHolder(listener);
-			listenerHolder.remove(criteria);
-			if (listenerHolder.isCriteriaSetEmpty()) {
-				removeListener(listener);
-			}
-		}
-	}
-
 	/**
 	 * Returns the array of flow execution listeners for specified flow.
 	 * @param flowDefinition the flow definition associated with the execution to be listened to
@@ -211,21 +108,4 @@ public class ConditionalFlowExecutionListenerLoader implements FlowExecutionList
 		}
 		return null;
 	}
-
-	/**
-	 * Decode given string value into one of the well known criteria types.
-	 * @see FlowExecutionListenerCriteriaFactory
-	 */
-	protected FlowExecutionListenerCriteria getCriteria(String value) {
-		if ("*".equals(value)) {
-			return new FlowExecutionListenerCriteriaFactory().allFlows();
-		} else {
-			String[] flowIds = StringUtils.commaDelimitedListToStringArray(value);
-			for (int i = 0; i < flowIds.length; i++) {
-				flowIds[i] = flowIds[i].trim();
-			}
-			return new FlowExecutionListenerCriteriaFactory().flows(flowIds);
-		}
-	}
-
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteria.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteria.java
index af6cf9dd..04ecbec9 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteria.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteria.java
@@ -24,7 +24,6 @@ import org.springframework.webflow.definition.FlowDefinition;
  * This selection strategy is typically used by the {@link FlowExecutionListenerLoader} to determine which listeners
  * should apply to which flow definitions.
  * 
- * @see org.springframework.webflow.execution.FlowExecution
  * @see org.springframework.webflow.execution.FlowExecutionListener
  * @see org.springframework.webflow.execution.factory.FlowExecutionListenerLoader
  * 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteriaFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteriaFactory.java
index cb2d28df..74cf89ca 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteriaFactory.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/FlowExecutionListenerCriteriaFactory.java
@@ -18,6 +18,7 @@ package org.springframework.webflow.execution.factory;
 import org.springframework.core.style.StylerUtils;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 import org.springframework.webflow.definition.FlowDefinition;
 
 /**
@@ -30,11 +31,25 @@ import org.springframework.webflow.definition.FlowDefinition;
  */
 public class FlowExecutionListenerCriteriaFactory {
 
+	private static final WildcardFlowExecutionListenerCriteria WILDCARD_INSTANCE = new WildcardFlowExecutionListenerCriteria();
+
+	public FlowExecutionListenerCriteria getListenerCriteria(String encodedCriteria) {
+		if ("*".equals(encodedCriteria)) {
+			return allFlows();
+		} else {
+			String[] flowIds = StringUtils.commaDelimitedListToStringArray(encodedCriteria);
+			for (int i = 0; i < flowIds.length; i++) {
+				flowIds[i] = flowIds[i].trim();
+			}
+			return flows(flowIds);
+		}
+	}
+
 	/**
 	 * Returns a wild card criteria that matches all flows.
 	 */
 	public FlowExecutionListenerCriteria allFlows() {
-		return new WildcardFlowExecutionListenerCriteria();
+		return WILDCARD_INSTANCE;
 	}
 
 	/**
@@ -42,7 +57,7 @@ public class FlowExecutionListenerCriteriaFactory {
 	 * @param flowId the flow id to match
 	 */
 	public FlowExecutionListenerCriteria flow(String flowId) {
-		return new FlowIdFlowExecutionListenerCriteria(flowId);
+		return new FlowIdFlowExecutionListenerCriteria(new String[] { flowId });
 	}
 
 	/**
@@ -78,16 +93,7 @@ public class FlowExecutionListenerCriteriaFactory {
 		private String[] flowIds;
 
 		/**
-		 * Create a new flow id matching flow execution listener criteria implemenation.
-		 * @param flowId the flow id to match
-		 */
-		public FlowIdFlowExecutionListenerCriteria(String flowId) {
-			Assert.notNull(flowId, "The flow id is required");
-			this.flowIds = new String[] { flowId };
-		}
-
-		/**
-		 * Create a new flow id matching flow execution listener criteria implemenation.
+		 * Create a new flow id matching flow execution listener criteria implementation.
 		 * @param flowIds the flow ids to match
 		 */
 		public FlowIdFlowExecutionListenerCriteria(String[] flowIds) {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/StaticFlowExecutionListenerLoader.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/StaticFlowExecutionListenerLoader.java
index bd86426d..3332b81b 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/StaticFlowExecutionListenerLoader.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/factory/StaticFlowExecutionListenerLoader.java
@@ -39,13 +39,6 @@ public final class StaticFlowExecutionListenerLoader implements FlowExecutionLis
 	 */
 	private final FlowExecutionListener[] listeners;
 
-	/**
-	 * Creates a new flow execution listener loader that returns an empty listener array on each invocation.
-	 */
-	private StaticFlowExecutionListenerLoader() {
-		this(new FlowExecutionListener[0]);
-	}
-
 	/**
 	 * Creates a new flow execution listener loader that returns the provided listener on each invocation.
 	 * @param listener the listener
@@ -64,6 +57,13 @@ public final class StaticFlowExecutionListenerLoader implements FlowExecutionLis
 		this.listeners = listeners;
 	}
 
+	/**
+	 * Creates a new flow execution listener loader that returns an empty listener array on each invocation.
+	 */
+	private StaticFlowExecutionListenerLoader() {
+		this(new FlowExecutionListener[0]);
+	}
+
 	public FlowExecutionListener[] getListeners(FlowDefinition flowDefinition) {
 		return listeners;
 	}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionAccessException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionAccessException.java
index a9abda0a..ce39c8c1 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionAccessException.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionAccessException.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.webflow.execution.repository;
 
+import org.springframework.webflow.execution.FlowExecutionKey;
+
 /**
  * Base class for exceptions that indicate a flow execution could not be accessed within a repository.
  * 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRepository.java
index 0308d9aa..2e3d3dd1 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRepository.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRepository.java
@@ -16,6 +16,7 @@
 package org.springframework.webflow.execution.repository;
 
 import org.springframework.webflow.execution.FlowExecution;
+import org.springframework.webflow.execution.FlowExecutionKey;
 
 /**
  * Central subsystem interface responsible for the saving and restoring of flow executions, where each flow execution
@@ -36,33 +37,17 @@ import org.springframework.webflow.execution.FlowExecution;
 public interface FlowExecutionRepository {
 
 	/**
-	 * Generate a unique flow execution key to be used as the persistent identifier of the flow execution. This method
-	 * should be called after a new flow execution is started and remains active; thus needing to be saved. The
-	 * FlowExecutionKey is the execution's persistent identity.
-	 * @param flowExecution the flow execution
-	 * @return the flow execution key
-	 * @throws FlowExecutionRepositoryException a problem occurred generating the key
+	 * Parse the string-encoded flow execution key into its object form. Essentially, the reverse of
+	 * {@link FlowExecutionKey#toString()}.
+	 * @param encodedKey the string encoded key
+	 * @return the parsed flow execution key, the persistent identifier for exactly one flow execution
 	 */
-	public FlowExecutionKey generateKey(FlowExecution flowExecution) throws FlowExecutionRepositoryException;
+	public FlowExecutionKey parseFlowExecutionKey(String encodedKey) throws FlowExecutionRepositoryException;
 
 	/**
-	 * Obtain the "next" flow execution key to be used as the flow execution's persistent identity. This method should
-	 * be called after a existing flow execution has resumed and remains active; thus needing to be updated. This
-	 * repository may choose to return the previous key or generate a new key.
-	 * @param flowExecution the flow execution
-	 * @param previousKey the current key associated with the flow execution
-	 * @throws FlowExecutionRepositoryException a problem occurred generating the key
-	 */
-	public FlowExecutionKey getNextKey(FlowExecution flowExecution, FlowExecutionKey previousKey)
-			throws FlowExecutionRepositoryException;
-
-	/**
-	 * Return the lock for the flow execution, allowing for the lock to be acquired or released.
-	 * 
    
-	 * Caution: care should be made not to allow for a deadlock situation. If you acquire a lock make sure you release
-	 * it when you are done.
-	 * 
    
-	 * The general pattern for safely doing work against a locked conversation follows:
+	 * Return the lock for the flow execution, allowing for the lock to be acquired or released. Caution: care should be
+	 * made not to allow for a deadlock situation. If you acquire a lock make sure you release it when you are done. The
+	 * general pattern for safely doing work against a locked conversation follows:
 	 * 
 	 * 
     	 * FlowExecutionLock lock = repository.getLock(key);
@@ -84,43 +69,28 @@ public interface FlowExecutionRepository {
 	/**
 	 * Return the FlowExecution indexed by the provided key. The returned flow execution represents the
 	 * restored state of an executing flow from a point in time. This should be called to resume a persistent flow
-	 * execution.
-	 * 
    
-	 * Before calling this method, you should acquire the lock for the keyed flow execution.
+	 * execution. Before calling this method, you should acquire the lock for the keyed flow execution.
 	 * @param key the flow execution key
-	 * @return the flow execution, fully hydrated and ready to signal an event against
+	 * @return the flow execution, fully hydrated and ready to resume
 	 * @throws FlowExecutionRepositoryException if no flow execution was indexed with the key provided
 	 */
 	public FlowExecution getFlowExecution(FlowExecutionKey key) throws FlowExecutionRepositoryException;
 
 	/**
 	 * Place the FlowExecution in this repository under the provided key. This should be called to save
-	 * or update the persistent state of an active (but paused) flow execution.
-	 * 
    
-	 * Before calling this method, you should acquire the lock for the keyed flow execution.
-	 * @param key the flow execution key
+	 * or update the persistent state of an active (but paused) flow execution. Before calling this method, you should
+	 * acquire the lock for the keyed flow execution.
 	 * @param flowExecution the flow execution
 	 * @throws FlowExecutionRepositoryException the flow execution could not be stored
 	 */
-	public void putFlowExecution(FlowExecutionKey key, FlowExecution flowExecution)
-			throws FlowExecutionRepositoryException;
+	public void putFlowExecution(FlowExecution flowExecution) throws FlowExecutionRepositoryException;
 
 	/**
 	 * Remove the flow execution from the repository. This should be called when the flow execution ends (is no longer
-	 * active).
-	 * 
    
-	 * Before calling this method, you should acquire the lock for the keyed flow execution.
-	 * @param key the flow execution key
+	 * active). Before calling this method, you should acquire the lock for the keyed flow execution.
+	 * @param flowExecution the flow execution
 	 * @throws FlowExecutionRepositoryException the flow execution could not be removed.
 	 */
-	public void removeFlowExecution(FlowExecutionKey key) throws FlowExecutionRepositoryException;
-
-	/**
-	 * Parse the string-encoded flow execution key into its object form. Essentially, the reverse of
-	 * {@link FlowExecutionKey#toString()}.
-	 * @param encodedKey the string encoded key
-	 * @return the parsed flow execution key, the persistent identifier for exactly one flow execution
-	 */
-	public FlowExecutionKey parseFlowExecutionKey(String encodedKey) throws FlowExecutionRepositoryException;
+	public void removeFlowExecution(FlowExecution flowExecution) throws FlowExecutionRepositoryException;
 
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRestorationFailureException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRestorationFailureException.java
index e90f4869..1119e07c 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRestorationFailureException.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/FlowExecutionRestorationFailureException.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.webflow.execution.repository;
 
+import org.springframework.webflow.execution.FlowExecutionKey;
+
 /**
  * Thrown when the flow execution with the persistent identifier provided could not be restored.
  * 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/NoSuchFlowExecutionException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/NoSuchFlowExecutionException.java
index 05d5d441..f3ba6756 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/NoSuchFlowExecutionException.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/NoSuchFlowExecutionException.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.webflow.execution.repository;
 
+import org.springframework.webflow.execution.FlowExecutionKey;
+
 /**
  * Thrown when the flow execution with the persistent identifier provided could not be found. This could occur if the
  * execution has been removed from the repository and a client still has a handle to the key.
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/PermissionDeniedFlowExecutionAccessException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/PermissionDeniedFlowExecutionAccessException.java
index aa5c061d..fd6a8e6a 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/PermissionDeniedFlowExecutionAccessException.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/PermissionDeniedFlowExecutionAccessException.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.webflow.execution.repository;
 
+import org.springframework.webflow.execution.FlowExecutionKey;
+
 /**
  * Thrown when access to a flow execution was denied by a repository.
  * 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/AbstractFlowExecutionContinuationRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/AbstractFlowExecutionContinuationRepository.java
new file mode 100644
index 00000000..c9b1f2c4
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/AbstractFlowExecutionContinuationRepository.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.execution.repository.continuation;
+
+import org.springframework.util.Assert;
+import org.springframework.webflow.conversation.ConversationManager;
+import org.springframework.webflow.execution.FlowExecution;
+import org.springframework.webflow.execution.repository.support.AbstractFlowExecutionRepository;
+import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer;
+
+/**
+ * Base class for repositories that create flow execution snapshots called "continuations".
+ * 
+ * @author Keith Donald
+ */
+public abstract class AbstractFlowExecutionContinuationRepository extends AbstractFlowExecutionRepository {
+
+	/**
+	 * The continuation factory that will be used to create new continuations to be added to active conversations.
+	 */
+	private FlowExecutionContinuationFactory continuationFactory;
+
+	/**
+	 * Creates a new continuation repository.
+	 * @param conversationManager the conversation manager
+	 * @param executionStateRestorer the execution state restorer
+	 * @param continuationFactory the continuation factory
+	 */
+	public AbstractFlowExecutionContinuationRepository(ConversationManager conversationManager,
+			FlowExecutionStateRestorer executionStateRestorer, FlowExecutionContinuationFactory continuationFactory) {
+		super(conversationManager, executionStateRestorer);
+		Assert.notNull(continuationFactory, "The flow execution continuation factory is required");
+		this.continuationFactory = continuationFactory;
+	}
+
+	/**
+	 * Take a new continuation snapshot.
+	 * @param flowExecution the execution to snapshot
+	 * @return the continuation snapshot
+	 */
+	protected FlowExecutionContinuation snapshot(FlowExecution flowExecution) {
+		return continuationFactory.createContinuation(flowExecution);
+	}
+
+	/**
+	 * Deserialize a serialized flow execution.
+	 * @param continuationBytes the flow execution snapshot byte array
+	 * @return the deserialized flow execution
+	 */
+	protected FlowExecution deserializeExecution(byte[] continuationBytes) {
+		return continuationFactory.restoreContinuation(continuationBytes).unmarshal();
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationFactory.java
index 08c87969..033794f8 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationFactory.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationFactory.java
@@ -35,10 +35,10 @@ public interface FlowExecutionContinuationFactory {
 			throws ContinuationCreationException;
 
 	/**
-	 * Creates a new flow execution continuation from the provided byte array.
+	 * Restore a flow execution continuation object from the provided byte array.
 	 * @param bytes the flow execution byte array
 	 * @return the continuation
-	 * @throws ContinuationCreationException when the continuation cannot be created
+	 * @throws ContinuationUnmarshalException when the continuation cannot be restored
 	 */
-	public FlowExecutionContinuation createContinuation(byte[] bytes) throws ContinuationCreationException;
+	public FlowExecutionContinuation restoreContinuation(byte[] bytes) throws ContinuationUnmarshalException;
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuation.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuation.java
index 84c43074..201a2b9f 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuation.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuation.java
@@ -24,6 +24,7 @@ import java.io.ObjectInput;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
+import java.util.Arrays;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -39,7 +40,7 @@ import org.springframework.webflow.execution.FlowExecution;
  * @author Keith Donald
  * @author Erwin Vervaet
  */
-public class SerializedFlowExecutionContinuation extends FlowExecutionContinuation implements Externalizable {
+class SerializedFlowExecutionContinuation extends FlowExecutionContinuation implements Externalizable {
 
 	/**
 	 * The serialized flow execution.
@@ -120,6 +121,22 @@ public class SerializedFlowExecutionContinuation extends FlowExecutionContinuati
 		}
 	}
 
+	public boolean equals(Object o) {
+		if (!(o instanceof SerializedFlowExecutionContinuation)) {
+			return false;
+		}
+		SerializedFlowExecutionContinuation c = (SerializedFlowExecutionContinuation) o;
+		return Arrays.equals(flowExecutionData, c.flowExecutionData);
+	}
+
+	public int hashCode() {
+		int hashCode = 0;
+		for (int i = 0; i < flowExecutionData.length; i++) {
+			hashCode += flowExecutionData[i];
+		}
+		return hashCode;
+	}
+
 	// implementing Externalizable for custom serialization
 
 	public void writeExternal(ObjectOutput out) throws IOException {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactory.java
index e8f18d5d..6ddb42f6 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactory.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactory.java
@@ -24,8 +24,6 @@ import org.springframework.webflow.execution.FlowExecution;
 /**
  * A factory that creates new instances of flow execution continuations based on standard Java serialization.
  * 
- * @see SerializedFlowExecutionContinuation
- * 
  * @author Keith Donald
  * @author Erwin Vervaet
  */
@@ -55,7 +53,7 @@ public class SerializedFlowExecutionContinuationFactory implements FlowExecution
 		return new SerializedFlowExecutionContinuation(flowExecution, compress);
 	}
 
-	public FlowExecutionContinuation createContinuation(byte[] bytes) throws ContinuationUnmarshalException {
+	public FlowExecutionContinuation restoreContinuation(byte[] bytes) throws ContinuationUnmarshalException {
 		try {
 			ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bytes));
 			try {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/package.html b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/package.html
index 4e44d241..91310dd6 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/package.html
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/package.html
@@ -1,7 +1,7 @@
 
 
 
    
-Implementation of continuation-based flow execution repositories.
+Support for repositories that take flow execution continuation snapshots.
 
    
 
 
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/ClientContinuationFlowExecutionRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/ClientFlowExecutionRepository.java
similarity index 66%
rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/ClientContinuationFlowExecutionRepository.java
rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/ClientFlowExecutionRepository.java
index de952d30..68946a71 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/ClientContinuationFlowExecutionRepository.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/ClientFlowExecutionRepository.java
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.execution.repository.continuation;
+package org.springframework.webflow.execution.repository.impl;
 
 import java.io.Serializable;
 
-import org.springframework.util.Assert;
 import org.springframework.webflow.conversation.Conversation;
 import org.springframework.webflow.conversation.ConversationException;
 import org.springframework.webflow.conversation.ConversationId;
@@ -26,9 +25,12 @@ import org.springframework.webflow.conversation.ConversationParameters;
 import org.springframework.webflow.conversation.NoSuchConversationException;
 import org.springframework.webflow.core.collection.CollectionUtils;
 import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKey;
 import org.springframework.webflow.execution.repository.FlowExecutionRestorationFailureException;
-import org.springframework.webflow.execution.repository.support.AbstractConversationFlowExecutionRepository;
+import org.springframework.webflow.execution.repository.continuation.AbstractFlowExecutionContinuationRepository;
+import org.springframework.webflow.execution.repository.continuation.ContinuationUnmarshalException;
+import org.springframework.webflow.execution.repository.continuation.FlowExecutionContinuation;
+import org.springframework.webflow.execution.repository.continuation.SerializedFlowExecutionContinuationFactory;
 import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer;
 import org.springframework.webflow.util.Base64;
 
@@ -52,7 +54,7 @@ import org.springframework.webflow.util.Base64;
  * implementation does not provide a secure way of storing state on the client, so a malicious client could reverse
  * engineer a continuation and get access to possible sensitive data stored in the flow execution. If you need more
  * security and still want to store continuations on the client, subclass this class and override the methods
- * {@link #encode(FlowExecution)} and {@link #decode(String)}, implementing them with a secure encoding/decoding
+ * {@link #encode(FlowExecution)} and {@link #decode(Serializable)}, implementing them with a secure encoding/decoding
  * algorithm, e.g. based on public/private key encryption.
  * 
  * @see Base64
@@ -60,88 +62,47 @@ import org.springframework.webflow.util.Base64;
  * @author Keith Donald
  * @author Erwin Vervaet
  */
-public class ClientContinuationFlowExecutionRepository extends AbstractConversationFlowExecutionRepository {
-
-	/**
-	 * The continuation factory that will be used to create new continuations to be added to active conversations.
-	 */
-	private FlowExecutionContinuationFactory continuationFactory = new SerializedFlowExecutionContinuationFactory();
+public class ClientFlowExecutionRepository extends AbstractFlowExecutionContinuationRepository {
 
 	/**
 	 * Creates a new client continuation repository. Uses a 'no op' conversation manager by default.
 	 * @param executionStateRestorer the transient flow execution state restorer
 	 */
-	public ClientContinuationFlowExecutionRepository(FlowExecutionStateRestorer executionStateRestorer) {
-		super(executionStateRestorer, new NoOpConversationManager());
+	public ClientFlowExecutionRepository(FlowExecutionStateRestorer executionStateRestorer) {
+		this(new NoOpConversationManager(), executionStateRestorer);
 	}
 
 	/**
-	 * Creates a new client continuation repository. Use this contructor when you want to use a particular conversation
+	 * Creates a new client continuation repository. Use this constructor when you want to use a particular conversation
 	 * manager, e.g. one that does proper conversation management.
-	 * @param executionStateRestorer the transient flow execution state restorer
 	 * @param conversationManager the conversation manager for managing centralized conversational state
+	 * @param executionStateRestorer the transient flow execution state restorer
 	 */
-	public ClientContinuationFlowExecutionRepository(FlowExecutionStateRestorer executionStateRestorer,
-			ConversationManager conversationManager) {
-		super(executionStateRestorer, conversationManager);
-	}
-
-	/**
-	 * Returns the continuation factory in use by this repository.
-	 */
-	protected FlowExecutionContinuationFactory getContinuationFactory() {
-		return continuationFactory;
-	}
-
-	/**
-	 * Sets the continuation factory used by this repository.
-	 */
-	public void setContinuationFactory(FlowExecutionContinuationFactory continuationFactory) {
-		Assert.notNull(continuationFactory, "The continuation factory is required");
-		this.continuationFactory = continuationFactory;
+	public ClientFlowExecutionRepository(ConversationManager conversationManager,
+			FlowExecutionStateRestorer executionStateRestorer) {
+		super(conversationManager, executionStateRestorer, new SerializedFlowExecutionContinuationFactory());
 	}
 
 	public FlowExecution getFlowExecution(FlowExecutionKey key) {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Getting flow execution with key '" + key + "'");
 		}
-
 		// note that the call to getConversationScope() below will try to obtain
 		// the conversation identified by the key, which will fail if that conversation
 		// is no longer managed by the conversation manager (i.e. it has expired)
-
-		FlowExecutionContinuation continuation = decode((String) getContinuationId(key));
 		try {
-			FlowExecution execution = continuation.unmarshal();
-			// the flow execution was deserialized so we need to restore transient
-			// state
-			return getExecutionStateRestorer().restoreState(execution, getConversationScope(key));
+			Serializable encodedExecution = getContinuationId(key);
+			FlowExecution execution = decode(encodedExecution);
+			return restoreTransientState(execution, execution.getKey());
 		} catch (ContinuationUnmarshalException e) {
 			throw new FlowExecutionRestorationFailureException(key, e);
 		}
 	}
 
-	public void putFlowExecution(FlowExecutionKey key, FlowExecution flowExecution) {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Putting flow execution '" + flowExecution + "' into repository with key '" + key + "'");
-		}
-
-		// note that the call to putConversationScope() below will try to obtain
-		// the conversation identified by the key, which will fail if that conversation
-		// is no longer managed by the conversation manager (i.e. it has expired)
-
-		// the flow execution state is already stored in the key, so
-		// there's nothing we need to do to store it
-		putConversationScope(key, flowExecution.getConversationScope());
-	}
-
-	protected final Serializable generateContinuationId(FlowExecution flowExecution) {
-		return encode(flowExecution);
-	}
-
-	protected final Serializable parseContinuationId(String encodedId) {
-		// just return here, continuation decoding happens in getFlowExecution
-		return encodedId;
+	public void putFlowExecution(FlowExecution flowExecution) {
+		// search for key in response, replace key value with execution state value
+		// call #encode(FlowExecution) to get state value
+		putConversationScope(flowExecution);
 	}
 
 	/**
@@ -153,7 +114,7 @@ public class ClientContinuationFlowExecutionRepository extends AbstractConversat
 	 * @return the encoded representation
 	 */
 	protected Serializable encode(FlowExecution flowExecution) {
-		FlowExecutionContinuation continuation = continuationFactory.createContinuation(flowExecution);
+		FlowExecutionContinuation continuation = snapshot(flowExecution);
 		return new Base64(true).encodeToString(continuation.toByteArray());
 	}
 
@@ -162,12 +123,12 @@ public class ClientContinuationFlowExecutionRepository extends AbstractConversat
 	 * 
    
 	 * Subclasses can override this to change the decoding algorithm. This class just does a BASE64
 	 * decoding and then deserializes the flow execution.
-	 * @param encodedContinuation the encoded flow execution data
+	 * @param encodedExecution the encoded flow execution data
 	 * @return the decoded flow execution instance
 	 */
-	protected FlowExecutionContinuation decode(String encodedContinuation) {
-		byte[] bytes = new Base64(true).decodeFromString(encodedContinuation);
-		return continuationFactory.createContinuation(bytes);
+	protected FlowExecution decode(Serializable encodedExecution) {
+		byte[] continuationBytes = new Base64(true).decodeFromString((String) encodedExecution);
+		return deserializeExecution(continuationBytes);
 	}
 
 	/**
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/ContinuationFlowExecutionRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepository.java
similarity index 62%
rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/ContinuationFlowExecutionRepository.java
rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepository.java
index d04e99c3..1ef9da4b 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/ContinuationFlowExecutionRepository.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepository.java
@@ -13,20 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.execution.repository.continuation;
+package org.springframework.webflow.execution.repository.impl;
 
-import java.io.Serializable;
-
-import org.springframework.util.Assert;
 import org.springframework.webflow.conversation.Conversation;
 import org.springframework.webflow.conversation.ConversationManager;
 import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKey;
 import org.springframework.webflow.execution.repository.FlowExecutionRestorationFailureException;
-import org.springframework.webflow.execution.repository.support.AbstractConversationFlowExecutionRepository;
+import org.springframework.webflow.execution.repository.continuation.AbstractFlowExecutionContinuationRepository;
+import org.springframework.webflow.execution.repository.continuation.ContinuationNotFoundException;
+import org.springframework.webflow.execution.repository.continuation.ContinuationUnmarshalException;
+import org.springframework.webflow.execution.repository.continuation.FlowExecutionContinuation;
+import org.springframework.webflow.execution.repository.continuation.SerializedFlowExecutionContinuationFactory;
 import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer;
-import org.springframework.webflow.util.RandomGuidUidGenerator;
-import org.springframework.webflow.util.UidGenerator;
 
 /**
  * Stores one to many flow execution continuations (snapshots) per conversation, where each continuation
@@ -38,7 +37,7 @@ import org.springframework.webflow.util.UidGenerator;
  * This repository is responsible for:
  * 
      
  * 
    • Beginning a new conversation when a new flow execution is made persistent. Each conversation is assigned a
- * unique conversartion id which forms one part of the flow execution key.
+ * unique conversation id which forms one part of the flow execution key.
  * 
    • Associating a flow execution with that conversation by adding a {@link FlowExecutionContinuation} to a
  * continuation group.
      
  * When a flow execution is placed in this repository a new continuation snapshot is created, assigned an id, and added
@@ -58,23 +57,13 @@ import org.springframework.webflow.util.UidGenerator;
  * 
  * @author Keith Donald
  */
-public class ContinuationFlowExecutionRepository extends AbstractConversationFlowExecutionRepository {
+public class DefaultFlowExecutionRepository extends AbstractFlowExecutionContinuationRepository {
 
 	/**
 	 * The conversation attribute that stores the "continuation group".
 	 */
 	private static final String CONTINUATION_GROUP_ATTRIBUTE = "continuationGroup";
 
-	/**
-	 * The continuation factory that will be used to create new continuations to be added to active conversations.
-	 */
-	private FlowExecutionContinuationFactory continuationFactory = new SerializedFlowExecutionContinuationFactory();
-
-	/**
-	 * The uid generation strategy to use.
-	 */
-	private UidGenerator continuationIdGenerator = new RandomGuidUidGenerator();
-
 	/**
 	 * The maximum number of continuations that can be active per conversation. The default is 30, which is high enough
 	 * not to interfere with the user experience of normal users using the back button, but low enough to avoid
@@ -84,52 +73,12 @@ public class ContinuationFlowExecutionRepository extends AbstractConversationFlo
 
 	/**
 	 * Create a new continuation based flow execution repository using given state restorer and conversation manager.
-	 * @param executionStateRestorer the state restoration strategy to use
 	 * @param conversationManager the conversation manager to use
+	 * @param executionStateRestorer the state restoration strategy to use
 	 */
-	public ContinuationFlowExecutionRepository(FlowExecutionStateRestorer executionStateRestorer,
-			ConversationManager conversationManager) {
-		super(executionStateRestorer, conversationManager);
-	}
-
-	/**
-	 * Returns the continuation factory that encapsulates the construction of continuations stored in this repository.
-	 * Defaults to {@link SerializedFlowExecutionContinuationFactory}.
-	 */
-	public FlowExecutionContinuationFactory getContinuationFactory() {
-		return continuationFactory;
-	}
-
-	/**
-	 * Sets the continuation factory that encapsulates the construction of continuations stored in this repository.
-	 */
-	public void setContinuationFactory(FlowExecutionContinuationFactory continuationFactory) {
-		Assert.notNull(continuationFactory, "The continuation factory is required");
-		this.continuationFactory = continuationFactory;
-	}
-
-	/**
-	 * Returns the uid generation strategy used to generate continuation identifiers. Defaults to
-	 * {@link RandomGuidUidGenerator}.
-	 */
-	public UidGenerator getContinuationIdGenerator() {
-		return continuationIdGenerator;
-	}
-
-	/**
-	 * Sets the uid generation strategy used to generate unique continuation identifiers for
-	 * {@link FlowExecutionKey flow execution keys}.
-	 */
-	public void setContinuationIdGenerator(UidGenerator continuationIdGenerator) {
-		Assert.notNull(continuationIdGenerator, "The continuation id generator is required");
-		this.continuationIdGenerator = continuationIdGenerator;
-	}
-
-	/**
-	 * Returns the maximum number of continuations allowed per conversation in this repository.
-	 */
-	public int getMaxContinuations() {
-		return maxContinuations;
+	public DefaultFlowExecutionRepository(ConversationManager conversationManager,
+			FlowExecutionStateRestorer executionStateRestorer) {
+		super(conversationManager, executionStateRestorer, new SerializedFlowExecutionContinuationFactory());
 	}
 
 	/**
@@ -147,40 +96,35 @@ public class ContinuationFlowExecutionRepository extends AbstractConversationFlo
 		FlowExecutionContinuation continuation = getContinuation(key);
 		try {
 			FlowExecution execution = continuation.unmarshal();
-			// flow execution was deserialized, so restore transient state
-			return getExecutionStateRestorer().restoreState(execution, getConversationScope(key));
+			return restoreTransientState(execution, key);
 		} catch (ContinuationUnmarshalException e) {
 			throw new FlowExecutionRestorationFailureException(key, e);
 		}
 	}
 
-	public void putFlowExecution(FlowExecutionKey key, FlowExecution flowExecution) {
+	public void putFlowExecution(FlowExecution flowExecution) {
+		assertKeySet(flowExecution);
 		if (logger.isDebugEnabled()) {
-			logger.debug("Putting flow execution '" + flowExecution + "' into repository with key '" + key + "'");
+			logger.debug("Putting flow execution '" + flowExecution + "' into repository");
 		}
+		FlowExecutionKey key = flowExecution.getKey();
 		FlowExecutionContinuationGroup continuationGroup = getContinuationGroup(key);
-		FlowExecutionContinuation continuation = continuationFactory.createContinuation(flowExecution);
+		FlowExecutionContinuation continuation = snapshot(flowExecution);
 		if (logger.isDebugEnabled()) {
 			logger.debug("Adding new continuation to group with id " + getContinuationId(key));
 		}
 		continuationGroup.add(getContinuationId(key), continuation);
-		putConversationScope(key, flowExecution.getConversationScope());
+		putConversationScope(flowExecution);
 	}
 
-	protected Serializable generateContinuationId(FlowExecution flowExecution) {
-		return continuationIdGenerator.generateUid();
-	}
-
-	protected Serializable parseContinuationId(String encodedId) {
-		return continuationIdGenerator.parseUid(encodedId);
-	}
+	// internal helpers
 
 	/**
-	 * Returns the continuation group associated with the governing conversation.
+	 * Returns the continuation group associated with the governing conversation. TODO: memento persistence?
 	 * @param key the flow execution key
 	 * @return the continuation group
 	 */
-	FlowExecutionContinuationGroup getContinuationGroup(FlowExecutionKey key) {
+	private FlowExecutionContinuationGroup getContinuationGroup(FlowExecutionKey key) {
 		Conversation conversation = getConversation(key);
 		FlowExecutionContinuationGroup group = (FlowExecutionContinuationGroup) conversation
 				.getAttribute(CONTINUATION_GROUP_ATTRIBUTE);
@@ -200,7 +144,7 @@ public class ContinuationFlowExecutionRepository extends AbstractConversationFlo
 	 * @param key the flow execution key
 	 * @return the continuation.
 	 */
-	protected FlowExecutionContinuation getContinuation(FlowExecutionKey key)
+	private FlowExecutionContinuation getContinuation(FlowExecutionKey key)
 			throws FlowExecutionRestorationFailureException {
 		try {
 			return getContinuationGroup(key).get(getContinuationId(key));
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationGroup.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/FlowExecutionContinuationGroup.java
similarity index 86%
rename from spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationGroup.java
rename to spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/FlowExecutionContinuationGroup.java
index 3e2cf891..fdee8d8d 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationGroup.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/FlowExecutionContinuationGroup.java
@@ -13,13 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.execution.repository.continuation;
+package org.springframework.webflow.execution.repository.impl;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 
+import org.springframework.webflow.execution.repository.continuation.ContinuationNotFoundException;
+import org.springframework.webflow.execution.repository.continuation.FlowExecutionContinuation;
+
 /**
  * A group of flow execution continuations. Simple typed data structure backed by a map and linked list. Supports
  * expelling the oldest continuation once a maximum group size is met.
@@ -77,6 +80,9 @@ class FlowExecutionContinuationGroup implements Serializable {
 
 	/**
 	 * Add a flow execution continuation with given id to this group.
+	 * 
+	 * TODO add listener methods 1. continuationAdded(ConversationId conversationId, FlowExecutionContinuation
+	 * continuation) 2. maxContinuationsReached(ConversationId conversationId)
 	 * @param continuationId the continuation id
 	 * @param continuation the continuation
 	 */
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/package.html b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/package.html
new file mode 100644
index 00000000..c0668c23
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/impl/package.html
@@ -0,0 +1,7 @@
+
+
+
      
+Contains the concrete flow execution repository implementations provided by the framework.
+
      
+
+
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/AbstractConversationFlowExecutionRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/AbstractConversationFlowExecutionRepository.java
deleted file mode 100644
index e7c56461..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/AbstractConversationFlowExecutionRepository.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.repository.support;
-
-import java.io.Serializable;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.conversation.Conversation;
-import org.springframework.webflow.conversation.ConversationException;
-import org.springframework.webflow.conversation.ConversationId;
-import org.springframework.webflow.conversation.ConversationManager;
-import org.springframework.webflow.conversation.ConversationParameters;
-import org.springframework.webflow.conversation.NoSuchConversationException;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.BadlyFormattedFlowExecutionKeyException;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
-import org.springframework.webflow.execution.repository.FlowExecutionLock;
-import org.springframework.webflow.execution.repository.FlowExecutionRepositoryException;
-import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException;
-
-/**
- * A convenient base class for flow execution repository implementations that delegate to a conversation service for
- * managing conversations that govern the persistent state of paused flow executions.
- * 
- * @see ConversationManager
- * 
- * @author Keith Donald
- */
-public abstract class AbstractConversationFlowExecutionRepository extends AbstractFlowExecutionRepository {
-
-	/**
-	 * Logger, usable in subclasses
-	 */
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	/**
-	 * The conversation attribute holding conversation scope ("scope").
-	 */
-	private static final String SCOPE_ATTRIBUTE = "scope";
-
-	/**
-	 * The conversation service to delegate to for managing conversations initiated by this repository.
-	 */
-	private ConversationManager conversationManager;
-
-	/**
-	 * Constructor for use in subclasses.
-	 * @param executionStateRestorer the transient flow execution state restorer
-	 * @param conversationManager the conversation manager to use
-	 */
-	protected AbstractConversationFlowExecutionRepository(FlowExecutionStateRestorer executionStateRestorer,
-			ConversationManager conversationManager) {
-		super(executionStateRestorer);
-		setConversationManager(conversationManager);
-	}
-
-	/**
-	 * Returns the configured conversation manager.
-	 */
-	public ConversationManager getConversationManager() {
-		return conversationManager;
-	}
-
-	/**
-	 * Sets the conversation manager to use.
-	 * @param conversationManager the conversation service, may not be null
-	 */
-	private void setConversationManager(ConversationManager conversationManager) {
-		Assert.notNull(conversationManager, "The conversation manager is required");
-		this.conversationManager = conversationManager;
-	}
-
-	public FlowExecutionKey generateKey(FlowExecution flowExecution) {
-		// we need to generate a key for a new flow execution, so a new conversation has
-		// started
-		ConversationParameters parameters = createConversationParameters(flowExecution);
-		Conversation conversation = conversationManager.beginConversation(parameters);
-		onBegin(conversation);
-		FlowExecutionKey key = new CompositeFlowExecutionKey(conversation.getId(),
-				generateContinuationId(flowExecution));
-		if (logger.isDebugEnabled()) {
-			logger.debug("Generated new key for flow execution '" + flowExecution + "': '" + key + "'");
-		}
-		return key;
-	}
-
-	public FlowExecutionKey getNextKey(FlowExecution flowExecution, FlowExecutionKey previousKey) {
-		CompositeFlowExecutionKey key = (CompositeFlowExecutionKey) previousKey;
-		// the conversation id remains the same for the life of the flow execution
-		// but the continuation id changes
-		FlowExecutionKey nextKey = new CompositeFlowExecutionKey(key.getConversationId(),
-				generateContinuationId(flowExecution));
-		if (logger.isDebugEnabled()) {
-			logger.debug("Generated next key for flow execution '" + flowExecution + "': '" + nextKey + "'; "
-					+ "previous key was '" + key + "'");
-		}
-		return nextKey;
-	}
-
-	public FlowExecutionLock getLock(FlowExecutionKey key) throws FlowExecutionRepositoryException {
-		return new ConversationBackedFlowExecutionLock(getConversation(key));
-	}
-
-	public abstract FlowExecution getFlowExecution(FlowExecutionKey key) throws FlowExecutionRepositoryException;
-
-	public abstract void putFlowExecution(FlowExecutionKey key, FlowExecution flowExecution)
-			throws FlowExecutionRepositoryException;
-
-	public void removeFlowExecution(FlowExecutionKey key) throws FlowExecutionRepositoryException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Removing flow execution with key '" + key + "' from repository");
-		}
-
-		// end the governing conversation
-		Conversation conversation = getConversation(key);
-		conversation.end();
-		onEnd(conversation);
-	}
-
-	public FlowExecutionKey parseFlowExecutionKey(String encodedKey) throws FlowExecutionRepositoryException {
-		if (!StringUtils.hasText(encodedKey)) {
-			throw new BadlyFormattedFlowExecutionKeyException(encodedKey,
-					"The string encoded flow execution key is required");
-		}
-
-		String[] keyParts = CompositeFlowExecutionKey.keyParts(encodedKey);
-
-		// parse out the conversation id
-		ConversationId conversationId;
-		try {
-			conversationId = conversationManager.parseConversationId(keyParts[0]);
-		} catch (ConversationException e) {
-			throw new BadlyFormattedFlowExecutionKeyException(encodedKey, "The conversation id '" + keyParts[0]
-					+ "' contained in the composite flow execution key '" + encodedKey + "' is invalid", e);
-		}
-
-		// parse out the continuation id
-		Serializable continuationId;
-		try {
-			continuationId = parseContinuationId(keyParts[1]);
-		} catch (FlowExecutionRepositoryException e) {
-			throw new BadlyFormattedFlowExecutionKeyException(encodedKey, "The continuation id '" + keyParts[1]
-					+ "' contained in the composite flow execution key '" + encodedKey + "' is invalid", e);
-		}
-
-		if (logger.isDebugEnabled()) {
-			logger.debug("Parsed encoded flow execution key '" + encodedKey + "', extracted conversation id '"
-					+ conversationId + "' and continuation id '" + continuationId + "'");
-		}
-
-		return new CompositeFlowExecutionKey(conversationId, continuationId);
-	}
-
-	// overridable hooks for use in subclasses
-
-	/**
-	 * Factory method that maps a new flow execution to a descriptive
-	 * {@link ConversationParameters conversation parameters} object.
-	 * @param flowExecution the new flow execution
-	 * @return the conversation parameters object to pass to the conversation manager when the conversation is started
-	 */
-	protected ConversationParameters createConversationParameters(FlowExecution flowExecution) {
-		FlowDefinition flow = flowExecution.getDefinition();
-		return new ConversationParameters(flow.getId(), flow.getCaption(), flow.getDescription());
-	}
-
-	/**
-	 * An "on begin conversation" callback, allowing for insertion of custom logic after a new conversation has begun.
-	 * This implementation is emtpy.
-	 * @param conversation the conversation that has begun
-	 */
-	protected void onBegin(Conversation conversation) {
-	}
-
-	/**
-	 * An "on conversation end" callback, allowing for insertion of custom logic after a conversation has ended (it's
-	 * {@link Conversation#end()} method has been called). This implementation is empty.
-	 * @param conversation the conversation that has ended
-	 */
-	protected void onEnd(Conversation conversation) {
-	}
-
-	/**
-	 * Returns the conversation id part of given composite flow execution key.
-	 * @param key the composite key
-	 * @return the conversationId key part
-	 */
-	protected ConversationId getConversationId(FlowExecutionKey key) {
-		return ((CompositeFlowExecutionKey) key).getConversationId();
-	}
-
-	/**
-	 * Returns the continuation id part of given composite flow execution key.
-	 * @param key the composite key
-	 * @return the continuation id key part
-	 */
-	protected Serializable getContinuationId(FlowExecutionKey key) {
-		return ((CompositeFlowExecutionKey) key).getContinuationId();
-	}
-
-	/**
-	 * Returns the conversation governing the execution of the {@link FlowExecution} with the provided key.
-	 * @param key the flow execution key
-	 * @return the governing conversation
-	 * @throws NoSuchFlowExecutionException when the conversation for identified flow execution cannot be found
-	 */
-	protected Conversation getConversation(FlowExecutionKey key) throws NoSuchFlowExecutionException {
-		try {
-			return getConversationManager().getConversation(getConversationId(key));
-		} catch (NoSuchConversationException e) {
-			throw new NoSuchFlowExecutionException(key, e);
-		}
-	}
-
-	/**
-	 * Returns the "conversation scope" for the flow execution with the key provided. This is mainly useful for
-	 * reinitialisation of a flow execution after restoration from the repository.
-	 * @param key the flow execution key
-	 * @return the execution's conversation scope
-	 */
-	protected MutableAttributeMap getConversationScope(FlowExecutionKey key) {
-		return (MutableAttributeMap) getConversation(key).getAttribute(SCOPE_ATTRIBUTE);
-	}
-
-	/**
-	 * Sets the conversation scope attribute for the flow execution with the key provided.
-	 * @param key the flow execution key
-	 * @param scope the execution's conversation scope
-	 */
-	protected void putConversationScope(FlowExecutionKey key, MutableAttributeMap scope) {
-		Assert.notNull(scope, "The conversation scope attribute map is required");
-		getConversation(key).putAttribute(SCOPE_ATTRIBUTE, scope);
-	}
-
-	// abstract template methods
-
-	/**
-	 * Template method used to generate a new continuation id for given flow execution. Subclasses must override.
-	 * @param flowExecution the flow execution
-	 * @return the continuation id
-	 */
-	protected abstract Serializable generateContinuationId(FlowExecution flowExecution);
-
-	/**
-	 * Template method to parse the continuation id from the encoded string.
-	 * @param encodedId the string identifier
-	 * @return the parsed continuation id
-	 */
-	protected abstract Serializable parseContinuationId(String encodedId) throws FlowExecutionRepositoryException;
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/AbstractFlowExecutionRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/AbstractFlowExecutionRepository.java
index e8e7b57e..f56597e0 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/AbstractFlowExecutionRepository.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/AbstractFlowExecutionRepository.java
@@ -15,10 +15,31 @@
  */
 package org.springframework.webflow.execution.repository.support;
 
+import java.io.Serializable;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+import org.springframework.webflow.conversation.Conversation;
+import org.springframework.webflow.conversation.ConversationException;
+import org.springframework.webflow.conversation.ConversationId;
+import org.springframework.webflow.conversation.ConversationManager;
+import org.springframework.webflow.conversation.ConversationParameters;
+import org.springframework.webflow.conversation.NoSuchConversationException;
+import org.springframework.webflow.core.collection.MutableAttributeMap;
+import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.FlowExecutionFactory;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
+import org.springframework.webflow.execution.repository.BadlyFormattedFlowExecutionKeyException;
+import org.springframework.webflow.execution.repository.FlowExecutionLock;
 import org.springframework.webflow.execution.repository.FlowExecutionRepository;
+import org.springframework.webflow.execution.repository.FlowExecutionRepositoryException;
+import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException;
+import org.springframework.webflow.util.RandomGuidUidGenerator;
+import org.springframework.webflow.util.UidGenerator;
 
 /**
  * Abstract base class for flow execution repository implementations. Does not make any assumptions about the storage
@@ -30,36 +51,197 @@ import org.springframework.webflow.execution.repository.FlowExecutionRepository;
  * 
  * @author Erwin Vervaet
  */
-public abstract class AbstractFlowExecutionRepository implements FlowExecutionRepository {
+public abstract class AbstractFlowExecutionRepository implements FlowExecutionRepository, FlowExecutionKeyFactory {
 
 	/**
-	 * The strategy for restoring transient flow execution state after obtaining it from storage.
+	 * Logger, usable in subclasses
+	 */
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	/**
+	 * The conversation service to delegate to for managing conversations initiated by this repository.
+	 */
+	private ConversationManager conversationManager;
+
+	/**
+	 * The flow execution state restorer for restoring transient execution state.
 	 */
 	private FlowExecutionStateRestorer executionStateRestorer;
 
+	/**
+	 * The uid generation strategy to use.
+	 */
+	private UidGenerator continuationIdGenerator = new RandomGuidUidGenerator();
+
+	/**
+	 * Flag to indicate whether or not a new flow execution key should always be generated before each put call. Default
+	 * is true.
+	 */
+	private boolean alwaysGenerateNewNextKey = true;
+
 	/**
 	 * Constructor for use in subclasses.
-	 * @param executionStateRestorer the transient flow execution state restorer
+	 * @param conversationManager the conversation manager to use
 	 */
-	protected AbstractFlowExecutionRepository(FlowExecutionStateRestorer executionStateRestorer) {
-		setExecutionStateRestorer(executionStateRestorer);
-	}
-
-	/**
-	 * Returns the strategy for restoring transient flow execution state after obtaining it from storage.
-	 * @return the transient flow execution state restorer
-	 */
-	protected FlowExecutionStateRestorer getExecutionStateRestorer() {
-		return executionStateRestorer;
-	}
-
-	/**
-	 * Sets the strategy for restoring transient flow execution state after obtaining it from storage.
-	 * @param executionStateRestorer the transient flow execution state restorer, may not be null
-	 */
-	private void setExecutionStateRestorer(FlowExecutionStateRestorer executionStateRestorer) {
-		Assert.notNull(executionStateRestorer, "The flow execution state restorer is required");
+	protected AbstractFlowExecutionRepository(ConversationManager conversationManager,
+			FlowExecutionStateRestorer executionStateRestorer) {
+		Assert.notNull(conversationManager, "The conversation manager is required");
+		Assert.notNull(executionStateRestorer, "The execution state restorer is required");
+		this.conversationManager = conversationManager;
 		this.executionStateRestorer = executionStateRestorer;
 	}
 
-}
+	/**
+	 * Sets the uid generation strategy used to generate unique continuation identifiers for
+	 * {@link FlowExecutionKey flow execution keys}.
+	 */
+	public void setContinuationIdGenerator(UidGenerator continuationIdGenerator) {
+		Assert.notNull(continuationIdGenerator, "The continuation id generator is required");
+		this.continuationIdGenerator = continuationIdGenerator;
+	}
+
+	/**
+	 * Sets a flag indicating if a new {@link FlowExecutionKey} should always be generated before each put call. By
+	 * setting this to false a FlowExecution can remain identified by the same key throughout its life.
+	 */
+	public void setAlwaysGenerateNewNextKey(boolean alwaysGenerateNewNextKey) {
+		this.alwaysGenerateNewNextKey = alwaysGenerateNewNextKey;
+	}
+
+	public FlowExecutionKey getKey(FlowExecution execution) {
+		if (execution.getKey() == null) {
+			Conversation conversation = beginConversation(execution);
+			return new CompositeFlowExecutionKey(conversation.getId(), continuationIdGenerator.generateUid());
+		} else {
+			return getNextKey(execution);
+		}
+	}
+
+	public FlowExecutionKey parseFlowExecutionKey(String encodedKey) throws FlowExecutionRepositoryException {
+		if (!StringUtils.hasText(encodedKey)) {
+			throw new BadlyFormattedFlowExecutionKeyException(encodedKey,
+					"The string encoded flow execution key is required");
+		}
+		String[] keyParts = CompositeFlowExecutionKey.keyParts(encodedKey);
+		// parse out the conversation id
+		ConversationId conversationId;
+		try {
+			conversationId = conversationManager.parseConversationId(keyParts[0]);
+		} catch (ConversationException e) {
+			throw new BadlyFormattedFlowExecutionKeyException(encodedKey, "The conversation id '" + keyParts[0]
+					+ "' contained in the composite flow execution key '" + encodedKey + "' is invalid", e);
+		}
+		// parse out the continuation id
+		Serializable continuationId;
+		try {
+			continuationId = continuationIdGenerator.parseUid(keyParts[1]);
+		} catch (FlowExecutionRepositoryException e) {
+			throw new BadlyFormattedFlowExecutionKeyException(encodedKey, "The continuation id '" + keyParts[1]
+					+ "' contained in the composite flow execution key '" + encodedKey + "' is invalid", e);
+		}
+		return new CompositeFlowExecutionKey(conversationId, continuationId);
+	}
+
+	public FlowExecutionLock getLock(FlowExecutionKey key) throws FlowExecutionRepositoryException {
+		return new ConversationBackedFlowExecutionLock(getConversation(key));
+	}
+
+	// abstract repository methods to be overridden by subclasses
+
+	public abstract FlowExecution getFlowExecution(FlowExecutionKey key) throws FlowExecutionRepositoryException;
+
+	public abstract void putFlowExecution(FlowExecution flowExecution) throws FlowExecutionRepositoryException;
+
+	public void removeFlowExecution(FlowExecution flowExecution) throws FlowExecutionRepositoryException {
+		assertKeySet(flowExecution);
+		if (logger.isDebugEnabled()) {
+			logger.debug("Removing flow execution '" + flowExecution + "' from repository");
+		}
+		endConversation(flowExecution);
+	}
+
+	// overridable hooks for use in subclasses
+
+	/**
+	 * Factory method that maps a new flow execution to a descriptive
+	 * {@link ConversationParameters conversation parameters} object.
+	 * @param flowExecution the new flow execution
+	 * @return the conversation parameters object to pass to the conversation manager when the conversation is started
+	 */
+	protected ConversationParameters createConversationParameters(FlowExecution flowExecution) {
+		FlowDefinition flow = flowExecution.getDefinition();
+		return new ConversationParameters(flow.getId().toString(), flow.getCaption(), flow.getDescription());
+	}
+
+	/**
+	 * Gets the next key to assign to the flow execution.
+	 * @param execution
+	 * @return the next flow execution
+	 */
+	protected FlowExecutionKey getNextKey(FlowExecution execution) {
+		if (alwaysGenerateNewNextKey) {
+			CompositeFlowExecutionKey key = (CompositeFlowExecutionKey) execution.getKey();
+			return new CompositeFlowExecutionKey(key.getConversationId(), continuationIdGenerator.generateUid());
+		} else {
+			return execution.getKey();
+		}
+	}
+
+	/**
+	 * Returns the conversation governing the execution of the {@link FlowExecution} with the provided key.
+	 * @param key the flow execution key
+	 * @return the governing conversation
+	 * @throws NoSuchFlowExecutionException when the conversation for identified flow execution cannot be found
+	 */
+	protected Conversation getConversation(FlowExecutionKey key) throws NoSuchFlowExecutionException {
+		try {
+			return conversationManager.getConversation(getConversationId(key));
+		} catch (NoSuchConversationException e) {
+			throw new NoSuchFlowExecutionException(key, e);
+		}
+	}
+
+	protected ConversationId getConversationId(FlowExecutionKey key) {
+		return ((CompositeFlowExecutionKey) key).getConversationId();
+	}
+
+	protected Serializable getContinuationId(FlowExecutionKey key) {
+		return ((CompositeFlowExecutionKey) key).getContinuationId();
+	}
+
+	protected FlowExecution restoreTransientState(FlowExecution execution, FlowExecutionKey key) {
+		return executionStateRestorer.restoreState(execution, key, getConversationScope(key), this);
+	}
+
+	protected void putConversationScope(FlowExecution flowExecution) {
+		getConversation(flowExecution.getKey()).putAttribute("scope", flowExecution.getConversationScope());
+	}
+
+	protected void assertKeySet(FlowExecution execution) throws IllegalStateException {
+		if (execution.getKey() == null) {
+			throw new IllegalStateException(
+					"Key for the flow execution is null; make sure the key is assigned first.  Execution = "
+							+ execution);
+		}
+	}
+
+	// internal helpers
+
+	private Conversation beginConversation(FlowExecution execution) {
+		ConversationParameters parameters = createConversationParameters(execution);
+		Conversation conversation = conversationManager.beginConversation(parameters);
+		return conversation;
+	}
+
+	private Conversation endConversation(FlowExecution flowExecution) {
+		// end the governing conversation
+		Conversation conversation = getConversation(flowExecution.getKey());
+		conversation.end();
+		return conversation;
+	}
+
+	private MutableAttributeMap getConversationScope(FlowExecutionKey key) {
+		return (MutableAttributeMap) getConversation(key).getAttribute("scope");
+	}
+
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/CompositeFlowExecutionKey.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/CompositeFlowExecutionKey.java
index a2b4518c..3b39ca0a 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/CompositeFlowExecutionKey.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/CompositeFlowExecutionKey.java
@@ -20,8 +20,8 @@ import java.io.Serializable;
 import org.springframework.util.Assert;
 import org.springframework.webflow.conversation.ConversationId;
 import org.springframework.webflow.conversation.ConversationManager;
+import org.springframework.webflow.execution.FlowExecutionKey;
 import org.springframework.webflow.execution.repository.BadlyFormattedFlowExecutionKeyException;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
 import org.springframework.webflow.execution.repository.continuation.FlowExecutionContinuation;
 
 /**
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/FlowExecutionStateRestorer.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/FlowExecutionStateRestorer.java
index b7f70552..77beae18 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/FlowExecutionStateRestorer.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/FlowExecutionStateRestorer.java
@@ -17,10 +17,11 @@ package org.springframework.webflow.execution.repository.support;
 
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.execution.FlowExecution;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
 
 /**
- * A support strategy used by repositories that serialize flow executions to restore transient execution state after
- * deserialization.
+ * A strategy used by repositories to restore transient flow execution state during execution restoration.
  * 
  * @author Keith Donald
  */
@@ -29,10 +30,14 @@ public interface FlowExecutionStateRestorer {
 	/**
 	 * Restore the transient state of the flow execution.
 	 * @param flowExecution the (potentially deserialized) flow execution
+	 * @param key the flow execution key, typically not part of the serialized form
 	 * @param conversationScope the execution's conversation scope, which is typically not part of the serialized form
 	 * since it could be shared by multiple physical flow execution copies all sharing the same logical
 	 * conversation
+	 * @param keyFactory the flow execution key factory the flow execution will use to assign itself a new key at a
+	 * later date (typically the repository itself)
 	 * @return the restored flow execution
 	 */
-	public FlowExecution restoreState(FlowExecution flowExecution, MutableAttributeMap conversationScope);
+	public FlowExecution restoreState(FlowExecution flowExecution, FlowExecutionKey key,
+			MutableAttributeMap conversationScope, FlowExecutionKeyFactory keyFactory);
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/InvalidContinuationIdException.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/InvalidContinuationIdException.java
deleted file mode 100644
index 623afe8e..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/InvalidContinuationIdException.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.repository.support;
-
-import java.io.Serializable;
-
-import org.springframework.webflow.execution.repository.FlowExecutionRepositoryException;
-
-/**
- * Thrown when no flow execution continuation exists with the provided id. This might occur if the continuation has
- * expired or was explictly invalidated but a client's browser page cache still references it.
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class InvalidContinuationIdException extends FlowExecutionRepositoryException {
-
-	/**
-	 * The unique continuation identifier that was invalid.
-	 */
-	private Serializable continuationId;
-
-	/**
-	 * Creates an invalid continuation id exception.
-	 * @param continuationId the invalid continuation id
-	 */
-	public InvalidContinuationIdException(Serializable continuationId) {
-		super("The continuation id '" + continuationId + "' is invalid.  Access to flow execution denied.");
-		this.continuationId = continuationId;
-	}
-
-	/**
-	 * Returns the continuation id.
-	 */
-	public Serializable getContinuationId() {
-		return continuationId;
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/SimpleFlowExecutionRepository.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/SimpleFlowExecutionRepository.java
deleted file mode 100644
index bf64a329..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/repository/support/SimpleFlowExecutionRepository.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.repository.support;
-
-import java.io.Serializable;
-
-import org.springframework.util.Assert;
-import org.springframework.webflow.conversation.ConversationManager;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
-import org.springframework.webflow.execution.repository.PermissionDeniedFlowExecutionAccessException;
-import org.springframework.webflow.util.RandomGuidUidGenerator;
-import org.springframework.webflow.util.UidGenerator;
-
-/**
- * Conversation manager based flow execution repository that stores exactly one flow execution per conversation.
- * 
      
- * It is important to note that by default use of this repository does not allow for duplicate submission in
- * conjunction with browser navigational buttons (such as the back button). Specifically, if you attempt to "go back"
- * and resubmit, the continuation id stored on the page in your browser history will not match the continuation
- * id of the flow execution entry and access to the conversation will be disallowed. This is because the
- * continuationId changes on each request to consistently prevent the possibility of duplicate submission ({@link #setAlwaysGenerateNewNextKey(boolean)}).
- * 
      
- * This repository is specifically designed to be 'simple': incurring minimal resources and overhead, as only one
- * {@link FlowExecution} is stored per conversation. This repository implementation should only be used when you
- * do not have to support browser navigational button use, e.g. you lock down the browser and require that all
- * navigational events to be routed explicitly through Spring Web Flow.
- * 
- * @author Erwin Vervaet
- * @author Keith Donald
- */
-public class SimpleFlowExecutionRepository extends AbstractConversationFlowExecutionRepository {
-
-	/**
-	 * The conversation attribute holding the flow execution entry.
-	 */
-	private static final String FLOW_EXECUTION_ENTRY_ATTRIBUTE = "flowExecutionEntry";
-
-	/**
-	 * Flag to indicate whether or not a new flow execution key should always be generated before each put call. Default
-	 * is true.
-	 */
-	private boolean alwaysGenerateNewNextKey = true;
-
-	/**
-	 * The uid generation strategy to use.
-	 */
-	private UidGenerator continuationIdGenerator = new RandomGuidUidGenerator();
-
-	/**
-	 * Create a new simple repository using given state restorer and conversation manager.
-	 * @param executionStateRestorer the flow execution state restoration strategy to use
-	 * @param conversationManager the conversation manager to use
-	 */
-	public SimpleFlowExecutionRepository(FlowExecutionStateRestorer executionStateRestorer,
-			ConversationManager conversationManager) {
-		super(executionStateRestorer, conversationManager);
-	}
-
-	/**
-	 * Returns whether or not a new flow execution key should always be generated before each put call. Default is true.
-	 */
-	public boolean isAlwaysGenerateNewNextKey() {
-		return alwaysGenerateNewNextKey;
-	}
-
-	/**
-	 * Sets a flag indicating if a new {@link FlowExecutionKey} should always be generated before each put call. By
-	 * setting this to false a FlowExecution can remain identified by the same key throughout its life.
-	 */
-	public void setAlwaysGenerateNewNextKey(boolean alwaysGenerateNewNextKey) {
-		this.alwaysGenerateNewNextKey = alwaysGenerateNewNextKey;
-	}
-
-	/**
-	 * Returns the uid generation strategy used to generate continuation identifiers. Defaults to
-	 * {@link RandomGuidUidGenerator}.
-	 */
-	public UidGenerator getContinuationIdGenerator() {
-		return continuationIdGenerator;
-	}
-
-	/**
-	 * Sets the uid generation strategy used to generate unique continuation identifiers for
-	 * {@link FlowExecutionKey flow execution keys}.
-	 */
-	public void setContinuationIdGenerator(UidGenerator continuationIdGenerator) {
-		Assert.notNull(continuationIdGenerator, "The continuation id generator is required");
-		this.continuationIdGenerator = continuationIdGenerator;
-	}
-
-	public FlowExecutionKey getNextKey(FlowExecution flowExecution, FlowExecutionKey previousKey) {
-		if (isAlwaysGenerateNewNextKey()) {
-			return super.getNextKey(flowExecution, previousKey);
-		} else {
-			return previousKey;
-		}
-	}
-
-	public FlowExecution getFlowExecution(FlowExecutionKey key) {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Getting flow execution with key '" + key + "'");
-		}
-
-		try {
-			FlowExecution execution = getEntry(key).access(getContinuationId(key));
-			// it could be that the entry was serialized out and read back in, so
-			// we need to restore transient flow execution state
-			return getExecutionStateRestorer().restoreState(execution, getConversationScope(key));
-		} catch (InvalidContinuationIdException e) {
-			throw new PermissionDeniedFlowExecutionAccessException(key, e);
-		}
-	}
-
-	public void putFlowExecution(FlowExecutionKey key, FlowExecution flowExecution) {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Putting flow execution '" + flowExecution + "' into repository with key '" + key + "'");
-		}
-
-		FlowExecutionEntry entry = new FlowExecutionEntry(getContinuationId(key), flowExecution);
-		putEntry(key, entry);
-		putConversationScope(key, flowExecution.getConversationScope());
-	}
-
-	protected Serializable generateContinuationId(FlowExecution flowExecution) {
-		return continuationIdGenerator.generateUid();
-	}
-
-	protected Serializable parseContinuationId(String encodedId) {
-		return continuationIdGenerator.parseUid(encodedId);
-	}
-
-	// internal helpers
-
-	/**
-	 * Lookup the entry for keyed flow execution in the governing conversation.
-	 */
-	private FlowExecutionEntry getEntry(FlowExecutionKey key) {
-		FlowExecutionEntry entry = (FlowExecutionEntry) getConversation(key).getAttribute(
-				FLOW_EXECUTION_ENTRY_ATTRIBUTE);
-		if (entry == null) {
-			throw new IllegalStateException("No '" + FLOW_EXECUTION_ENTRY_ATTRIBUTE
-					+ "' attribute present in the governing conversation: "
-					+ "possible programmer error -- do not call get before calling put");
-		}
-		return entry;
-	}
-
-	/**
-	 * Store given flow execution entry in the governing conversation using given key.
-	 * @param key the key to use
-	 * @param entry the entry to store
-	 */
-	private void putEntry(FlowExecutionKey key, FlowExecutionEntry entry) {
-		getConversation(key).putAttribute(FLOW_EXECUTION_ENTRY_ATTRIBUTE, entry);
-	}
-
-	/**
-	 * Simple holder for a flow execution. In order to access the held flow execution you must present a valid
-	 * continuationId.
-	 * 
-	 * @author Keith Donald
-	 */
-	private static class FlowExecutionEntry implements Serializable {
-
-		/**
-		 * The id required to access the execution.
-		 */
-		private Serializable continuationId;
-
-		/**
-		 * The flow execution.
-		 */
-		private FlowExecution flowExecution;
-
-		/**
-		 * Creates a new flow execution entry.
-		 * @param continuationId the continuation id
-		 * @param flowExecution the flow execution
-		 */
-		public FlowExecutionEntry(Serializable continuationId, FlowExecution flowExecution) {
-			this.continuationId = continuationId;
-			this.flowExecution = flowExecution;
-		}
-
-		/**
-		 * Access the wrapped flow execution, using given continuation id as a password.
-		 * @param continuationId the continuation id to match
-		 * @return the flow execution
-		 * @throws InvalidContinuationIdException given continuation id does not match the continuation id stored in
-		 * this entry
-		 */
-		public FlowExecution access(Serializable continuationId) throws InvalidContinuationIdException {
-			if (!this.continuationId.equals(continuationId)) {
-				throw new InvalidContinuationIdException(continuationId);
-			}
-			return flowExecution;
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/ApplicationView.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/support/ApplicationView.java
deleted file mode 100644
index 4444c726..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/ApplicationView.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.execution.support;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.springframework.util.ObjectUtils;
-import org.springframework.webflow.execution.ViewSelection;
-
-/**
- * Concrete response type that requests the rendering of a local, internal application view resource such as a JSP,
- * Velocity, or FreeMarker template.
- * 
      
- * This is typically the most common type of view selection.
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public final class ApplicationView extends ViewSelection {
-
-	/**
-	 * The name of the view (or page or other response) to render. This name may identify a logical view
-	 * resource or may be a physical path to an internal view template.
-	 */
-	private final String viewName;
-
-	/**
-	 * A map of the application data to make available to the view for rendering.
-	 */
-	private final Map model;
-
-	/**
-	 * Creates a new application view.
-	 * @param viewName the name (or resource identifier) of the view that should be rendered
-	 * @param model the map of application model data to make available to the view during rendering; entries consist of
-	 * model names (Strings) to model objects (Objects), model entries may not be null, but the model Map may be null if
-	 * there is no model data
-	 */
-	public ApplicationView(String viewName, Map model) {
-		if (model == null) {
-			model = Collections.EMPTY_MAP;
-		}
-		this.viewName = viewName;
-		this.model = model;
-	}
-
-	/**
-	 * Returns the name of the view to render.
-	 */
-	public String getViewName() {
-		return viewName;
-	}
-
-	/**
-	 * Return the view's application model that should be made available during the rendering process. Never returns
-	 * null. The returned map is unmodifiable.
-	 */
-	public Map getModel() {
-		return Collections.unmodifiableMap(model);
-	}
-
-	public boolean equals(Object o) {
-		if (!(o instanceof ApplicationView)) {
-			return false;
-		}
-		ApplicationView other = (ApplicationView) o;
-		return ObjectUtils.nullSafeEquals(viewName, other.viewName) && model.equals(other.model);
-	}
-
-	public int hashCode() {
-		return (viewName != null ? viewName.hashCode() : 0) + model.hashCode();
-	}
-
-	public String toString() {
-		return "'" + viewName + "' [" + model.keySet() + "]";
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/ExternalRedirect.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/support/ExternalRedirect.java
deleted file mode 100644
index 97998aae..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/ExternalRedirect.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.execution.support;
-
-import org.springframework.util.Assert;
-import org.springframework.webflow.execution.ViewSelection;
-
-/**
- * Concrete response type that requests a redirect to an external URL outside of Spring Web Flow.
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public final class ExternalRedirect extends ViewSelection {
-
-	/**
-	 * The arbitrary url path to redirect to.
-	 */
-	private final String url;
-
-	/**
-	 * Creates an external redirect request.
-	 * @param url the url path to redirect to
-	 */
-	public ExternalRedirect(String url) {
-		Assert.notNull(url, "The external URL to redirect to is required");
-		this.url = url;
-	}
-
-	/**
-	 * Returns the external URL to redirect to.
-	 */
-	public String getUrl() {
-		return url;
-	}
-
-	public boolean equals(Object o) {
-		if (!(o instanceof ExternalRedirect)) {
-			return false;
-		}
-		ExternalRedirect other = (ExternalRedirect) o;
-		return url.equals(other.url);
-	}
-
-	public int hashCode() {
-		return url.hashCode();
-	}
-
-	public String toString() {
-		return "externalRedirect:'" + url + "'";
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/FlowDefinitionRedirect.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/support/FlowDefinitionRedirect.java
deleted file mode 100644
index b351297f..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/FlowDefinitionRedirect.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.execution.support;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.springframework.util.Assert;
-import org.springframework.webflow.execution.ViewSelection;
-
-/**
- * Concrete response type that requests that a new execution of a flow definition (representing the start of a
- * new conversation) be launched.
- * 
      
- * This allows "redirect to new flow" semantics; useful for restarting a flow after completion, or starting an entirely
- * new flow from within the end state of another flow definition.
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public final class FlowDefinitionRedirect extends ViewSelection {
-
-	/**
-	 * The id of the flow definition to launch.
-	 */
-	private final String flowDefinitionId;
-
-	/**
-	 * A map of input attributes to pass to the flow.
-	 */
-	private final Map executionInput;
-
-	/**
-	 * Creates a new flow definition redirect.
-	 * @param flowDefinitionId the id of the flow definition to launch
-	 * @param executionInput the input data to pass to the new flow execution on launch
-	 */
-	public FlowDefinitionRedirect(String flowDefinitionId, Map executionInput) {
-		Assert.hasText(flowDefinitionId, "The flow definition id is required");
-		this.flowDefinitionId = flowDefinitionId;
-		if (executionInput == null) {
-			executionInput = Collections.EMPTY_MAP;
-		}
-		this.executionInput = executionInput;
-	}
-
-	/**
-	 * Return the id of the flow definition to launch a new execution of.
-	 */
-	public String getFlowDefinitionId() {
-		return flowDefinitionId;
-	}
-
-	/**
-	 * Return the flow execution input map as an unmodifiable map. Never returns null.
-	 */
-	public Map getExecutionInput() {
-		return Collections.unmodifiableMap(executionInput);
-	}
-
-	public boolean equals(Object o) {
-		if (!(o instanceof FlowDefinitionRedirect)) {
-			return false;
-		}
-		FlowDefinitionRedirect other = (FlowDefinitionRedirect) o;
-		return flowDefinitionId.equals(other.flowDefinitionId) && executionInput.equals(other.executionInput);
-	}
-
-	public int hashCode() {
-		return flowDefinitionId.hashCode() + executionInput.hashCode();
-	}
-
-	public String toString() {
-		return "flowRedirect:'" + flowDefinitionId + "'";
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/FlowExecutionRedirect.java b/spring-webflow/src/main/java/org/springframework/webflow/execution/support/FlowExecutionRedirect.java
deleted file mode 100644
index 1bf1d4d6..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/FlowExecutionRedirect.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.execution.support;
-
-import java.io.ObjectStreamException;
-
-import org.springframework.webflow.engine.ViewState;
-import org.springframework.webflow.execution.ViewSelection;
-
-/**
- * Concrete response type that refreshes an application view by redirecting to an existing, active Spring Web
- * Flow execution at a unique SWF-specific flow execution URL. This enables the triggering of post-redirect-get
- * semantics from within an active flow execution.
- * 
      
- * Once the redirect response is issued a new request is initiated by the browser targeted at the flow execution URL.
- * The URL is stabally refreshable (and bookmarkable) while the conversation remains active, safely triggering a
- * {@link ViewState#refresh(org.springframework.webflow.execution.RequestContext)} on each access.
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public final class FlowExecutionRedirect extends ViewSelection {
-
-	/**
-	 * The single instance of this class.
-	 */
-	public static final FlowExecutionRedirect INSTANCE = new FlowExecutionRedirect();
-
-	/**
-	 * Avoid instantiation.
-	 */
-	private FlowExecutionRedirect() {
-	}
-
-	// resolve the singleton instance
-	private Object readResolve() throws ObjectStreamException {
-		return INSTANCE;
-	}
-
-	public String toString() {
-		return "redirect:";
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/package.html b/spring-webflow/src/main/java/org/springframework/webflow/execution/support/package.html
deleted file mode 100644
index f9cf0083..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/execution/support/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
      
-Useful generic support implementations of core flow execution types.
-
      
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutor.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutor.java
index 46d7c3f6..3774a92a 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutor.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutor.java
@@ -16,7 +16,6 @@
 package org.springframework.webflow.executor;
 
 import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.core.FlowException;
 
 /**
  * The central facade and entry-point service interface into the Spring Web Flow system for driving the executions of
@@ -31,38 +30,8 @@ import org.springframework.webflow.core.FlowException;
 public interface FlowExecutor {
 
 	/**
-	 * Launch a new execution of identified flow definition in the context of the current external client request.
-	 * @param flowDefinitionId the unique id of the flow definition to launch
-	 * @param context the external context representing the state of a request into Spring Web Flow from an external
-	 * system
-	 * @return the starting response instruction
-	 * @throws FlowException if an exception occured launching the new flow execution
+	 * Execute the flow request initiated by the provided external context.
+	 * @param context the external context, representing a client environment calling into Spring Web Flow
 	 */
-	public ResponseInstruction launch(String flowDefinitionId, ExternalContext context) throws FlowException;
-
-	/**
-	 * Resume an existing, paused flow execution by signaling an event against its current state.
-	 * @param flowExecutionKey the identifying key of a paused flow execution that is waiting to resume on the
-	 * occurrence of a user event
-	 * @param eventId the user event that occured
-	 * @param context the external context representing the state of a request into Spring Web Flow from an external
-	 * system
-	 * @return the next response instruction
-	 * @throws FlowException if an exception occured resuming the existing flow execution
-	 */
-	public ResponseInstruction resume(String flowExecutionKey, String eventId, ExternalContext context)
-			throws FlowException;
-
-	/**
-	 * Reissue the last response instruction issued by the flow execution. This is a logical refresh operation that
-	 * allows the "current response" to be re-issued. This operation is idempotent and does not affect the state of the
-	 * flow execution.
-	 * @param flowExecutionKey the identifying key of a paused flow execution that is waiting to resume on the ocurrence
-	 * of a user event
-	 * @param context the external context representing the state of a request into Spring Web Flow from an external
-	 * system
-	 * @return the current response instruction
-	 * @throws FlowException if an exception occured retrieving the current response instruction
-	 */
-	public ResponseInstruction refresh(String flowExecutionKey, ExternalContext context) throws FlowException;
+	public void execute(ExternalContext context);
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutorImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutorImpl.java
index 2e81f18c..33fb1842 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutorImpl.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/FlowExecutorImpl.java
@@ -15,30 +15,22 @@
  */
 package org.springframework.webflow.executor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.binding.mapping.AttributeMapper;
 import org.springframework.util.Assert;
 import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.context.ExternalContextHolder;
 import org.springframework.webflow.core.FlowException;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.FlowExecutionFactory;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKey;
 import org.springframework.webflow.execution.repository.FlowExecutionLock;
 import org.springframework.webflow.execution.repository.FlowExecutionRepository;
 
 /**
  * The default implementation of the central facade for driving the execution of flows within an application.
  * 
      
- * This object is responsible for creating and starting new flow executions as requested by clients, as well as
- * signaling events for processing by existing, paused executions (that are waiting to be resumed in response to a user
- * event).
+ * This object is responsible for creating and launching new flow executions as requested by clients, as well as
+ * resuming existing, paused executions (that were waiting to be resumed in response to a user event).
  * 
      
  * This object is a facade or entry point into the Spring Web Flow execution system and makes the overall system easier
  * to use. The name executor was chosen as executors drive executions.
@@ -65,21 +57,12 @@ import org.springframework.webflow.execution.repository.FlowExecutionRepository;
  * The repository responsible for managing flow execution persistence.
  * None
  * 
- * 
- * inputMapper
- * The service responsible for mapping attributes of {@link ExternalContext external contexts} that request to
- * launch new {@link FlowExecution flow executions}. After mapping, the target map is then passed to the FlowExecution,
- * exposing external context attributes as input to the flow during startup.
- * A {@link org.springframework.webflow.executor.RequestParameterInputMapper request parameter mapper}, which
- * exposes all request parameters in to the flow execution for input mapping.
- * 
  * 
  * 
      
  * 
  * @see FlowDefinitionLocator
  * @see FlowExecutionFactory
  * @see FlowExecutionRepository
- * @see AttributeMapper
  * 
  * @author Erwin Vervaet
  * @author Keith Donald
@@ -87,8 +70,6 @@ import org.springframework.webflow.execution.repository.FlowExecutionRepository;
  */
 public class FlowExecutorImpl implements FlowExecutor {
 
-	private static final Log logger = LogFactory.getLog(FlowExecutorImpl.class);
-
 	/**
 	 * A locator to access flow definitions registered in a central registry.
 	 */
@@ -104,18 +85,6 @@ public class FlowExecutorImpl implements FlowExecutor {
 	 */
 	private FlowExecutionRepository executionRepository;
 
-	/**
-	 * The service responsible for mapping attributes of an {@link ExternalContext} to a new {@link FlowExecution}
-	 * during the {@link #launch(String, ExternalContext) launch flow} operation.
-	 * 
      
-	 * This allows developers to control what attributes are made available in the inputMap to new
-	 * top-level flow executions. The starting execution may then choose to map that available input into its own local
-	 * scope.
-	 * 
      
-	 * The default implementation simply exposes all request parameters as flow execution input attributes. May be null.
-	 */
-	private AttributeMapper inputMapper = new RequestParameterInputMapper();
-
 	/**
 	 * Create a new flow executor.
 	 * @param definitionLocator the locator for accessing flow definitions to execute
@@ -132,153 +101,59 @@ public class FlowExecutorImpl implements FlowExecutor {
 		this.executionRepository = executionRepository;
 	}
 
-	/**
-	 * Exposes the configured input mapper to subclasses and privileged accessors.
-	 * @return the input mapper
-	 */
-	public AttributeMapper getInputMapper() {
-		return inputMapper;
-	}
-
-	/**
-	 * Set the service responsible for mapping attributes of an {@link ExternalContext} to a new {@link FlowExecution}
-	 * during the {@link #launch(String, ExternalContext) launch flow} operation.
-	 * 
      
-	 * The default implementation simply exposes all request parameters as flow execution input attributes. May be null.
-	 * @see RequestParameterInputMapper
-	 */
-	public void setInputMapper(AttributeMapper inputMapper) {
-		this.inputMapper = inputMapper;
-	}
-
-	/**
-	 * Exposes the configured flow definition locator to subclasses and privileged accessors.
-	 * @return the flow definition locator
-	 */
-	public FlowDefinitionLocator getDefinitionLocator() {
-		return definitionLocator;
-	}
-
-	/**
-	 * Exposes the configured execution factory to subclasses and privileged accessors.
-	 * @return the execution factory
-	 */
-	public FlowExecutionFactory getExecutionFactory() {
-		return executionFactory;
-	}
-
-	/**
-	 * Exposes the execution repository to subclasses and privileged accessors.
-	 * @return the execution repository
-	 */
-	public FlowExecutionRepository getExecutionRepository() {
-		return executionRepository;
-	}
-
-	public ResponseInstruction launch(String flowDefinitionId, ExternalContext context) throws FlowException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Launching flow execution for flow definition '" + flowDefinitionId + "'");
-		}
-		// expose external context as a thread-bound service
-		ExternalContextHolder.setExternalContext(context);
-		try {
-			FlowDefinition flowDefinition = definitionLocator.getFlowDefinition(flowDefinitionId);
-			FlowExecution flowExecution = executionFactory.createFlowExecution(flowDefinition);
-			ViewSelection selectedView = flowExecution.start(createInput(context), context);
-			if (flowExecution.isActive()) {
-				// execution still active => store it in the repository
-				FlowExecutionKey key = executionRepository.generateKey(flowExecution);
-				FlowExecutionLock lock = executionRepository.getLock(key);
-				lock.lock();
-				try {
-					executionRepository.putFlowExecution(key, flowExecution);
-				} finally {
-					lock.unlock();
-				}
-				return new ResponseInstruction(key.toString(), flowExecution, selectedView);
-			} else {
-				// execution already ended => just render the selected view
-				return new ResponseInstruction(flowExecution, selectedView);
-			}
-		} finally {
-			ExternalContextHolder.setExternalContext(null);
-		}
-	}
-
-	public ResponseInstruction resume(String flowExecutionKey, String eventId, ExternalContext context)
-			throws FlowException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Resuming flow execution with key '" + flowExecutionKey + "' on user event '" + eventId + "'");
-		}
-		// expose external context as a thread-bound service
-		ExternalContextHolder.setExternalContext(context);
-		try {
-			FlowExecutionKey key = executionRepository.parseFlowExecutionKey(flowExecutionKey);
-			FlowExecutionLock lock = executionRepository.getLock(key);
-			// make sure we're the only one manipulating the flow execution
-			lock.lock();
-			try {
-				FlowExecution flowExecution = executionRepository.getFlowExecution(key);
-				ViewSelection selectedView = flowExecution.signalEvent(eventId, context);
-				if (flowExecution.isActive()) {
-					// execution still active => store it in the repository
-					key = executionRepository.getNextKey(flowExecution, key);
-					executionRepository.putFlowExecution(key, flowExecution);
-					return new ResponseInstruction(key.toString(), flowExecution, selectedView);
-				} else {
-					// execution ended => remove it from the repository
-					executionRepository.removeFlowExecution(key);
-					return new ResponseInstruction(flowExecution, selectedView);
-				}
-			} finally {
-				lock.unlock();
-			}
-		} finally {
-			ExternalContextHolder.setExternalContext(null);
-		}
-	}
-
-	public ResponseInstruction refresh(String flowExecutionKey, ExternalContext context) throws FlowException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Refreshing flow execution with key '" + flowExecutionKey + "'");
-		}
-		// expose external context as a thread-bound service
-		ExternalContextHolder.setExternalContext(context);
-		try {
-			FlowExecutionKey key = executionRepository.parseFlowExecutionKey(flowExecutionKey);
-			FlowExecutionLock lock = executionRepository.getLock(key);
-			// make sure we're the only one manipulating the flow execution
-			lock.lock();
-			try {
-				FlowExecution flowExecution = executionRepository.getFlowExecution(key);
-				ViewSelection selectedView = flowExecution.refresh(context);
-				// don't generate a new key for a refresh, just update
-				// the flow execution with it's existing key
-				executionRepository.putFlowExecution(key, flowExecution);
-				return new ResponseInstruction(key.toString(), flowExecution, selectedView);
-			} finally {
-				lock.unlock();
-			}
-		} finally {
-			ExternalContextHolder.setExternalContext(null);
-		}
-	}
-
-	// helper methods
-
-	/**
-	 * Factory method that creates the input attribute map for a newly created {@link FlowExecution}. This
-	 * implementation uses the registered input mapper, if any.
-	 * @param context the external context
-	 * @return the input map, or null if no input
-	 */
-	protected MutableAttributeMap createInput(ExternalContext context) {
-		if (inputMapper != null) {
-			MutableAttributeMap inputMap = new LocalAttributeMap();
-			inputMapper.map(context, inputMap, null);
-			return inputMap;
+	public void execute(ExternalContext context) {
+		if (context.getFlowExecutionKey() != null) {
+			resumeExecution(context.getFlowExecutionKey(), context);
 		} else {
-			return null;
+			launchExecution(context.getFlowId(), context);
 		}
 	}
+
+	private void launchExecution(String flowId, ExternalContext context) {
+		try {
+			FlowDefinition flowDefinition = definitionLocator.getFlowDefinition(flowId);
+			FlowExecution flowExecution = executionFactory.createFlowExecution(flowDefinition);
+			flowExecution.start(context);
+			if (flowExecution.isActive()) {
+				executionRepository.putFlowExecution(flowExecution);
+				context.setPausedResult(flowExecution.getKey().toString());
+			} else {
+				context.setEndedResult(null);
+			}
+		} catch (FlowException e) {
+			if (!handleException(e, context)) {
+				context.setExceptionResult(e);
+			}
+		}
+	}
+
+	private void resumeExecution(String encodedKey, ExternalContext context) {
+		try {
+			FlowExecutionKey key = executionRepository.parseFlowExecutionKey(encodedKey);
+			FlowExecutionLock lock = executionRepository.getLock(key);
+			lock.lock();
+			try {
+				FlowExecution flowExecution = executionRepository.getFlowExecution(key);
+				flowExecution.resume(context);
+				if (flowExecution.isActive()) {
+					executionRepository.putFlowExecution(flowExecution);
+					context.setPausedResult(flowExecution.getKey().toString());
+				} else {
+					executionRepository.removeFlowExecution(flowExecution);
+					context.setEndedResult(flowExecution.getKey().toString());
+				}
+			} finally {
+				lock.unlock();
+			}
+		} catch (FlowException e) {
+			if (!handleException(e, context)) {
+				context.setExceptionResult(e);
+			}
+		}
+	}
+
+	private boolean handleException(FlowException e, ExternalContext context) {
+		// TODO
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/RequestParameterInputMapper.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/RequestParameterInputMapper.java
deleted file mode 100644
index 3b18ba99..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/RequestParameterInputMapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor;
-
-import org.springframework.binding.mapping.AttributeMapper;
-import org.springframework.binding.mapping.MappingContext;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-
-/**
- * Simple attribute mapper implementation that puts all entries in the request parameter map of a source
- * {@link ExternalContext} into the FlowExecution inputMap. This makes request parameters available to launching flows
- * for input mapping.
- * 
      
- * Used by {@link FlowExecutorImpl} as the default AttributeMapper implementation.
- * 
- * @see ExternalContext#getRequestParameterMap()
- * @see FlowExecutor#launch(String, ExternalContext)
- * 
- * @author Keith Donald
- */
-public class RequestParameterInputMapper implements AttributeMapper {
-	public void map(Object source, Object target, MappingContext context) {
-		ExternalContext externalContext = (ExternalContext) source;
-		MutableAttributeMap inputMap = (MutableAttributeMap) target;
-		inputMap.putAll(externalContext.getRequestParameterMap().asAttributeMap());
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/ResponseInstruction.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/ResponseInstruction.java
deleted file mode 100644
index 9147fac6..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/ResponseInstruction.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.executor;
-
-import java.io.Serializable;
-
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.util.Assert;
-import org.springframework.webflow.execution.FlowExecutionContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-
-/**
- * Immutable value object that provides clients with information about a response to issue.
- * 
      
- * There are five different types of response instruction:
- * 
        
- * 
      • An {@link #isApplicationView() application view}.
        • 
- * 
      • A {@link #isFlowExecutionRedirect() flow execution redirect}, showing an application view via a redirect that
- * refreshes an ongoing flow execution.
        • 
- * 
      • A {@link #isFlowDefinitionRedirect() flow definition redirect}, launching an entirely new flow execution.
        • 
- * 
      • An {@link #isExternalRedirect() external redirect}, redirecting to an external URL.
        • 
- * 
      • A {@link #isNull() null view}, not showing a response at all.
        • 
- * 
      
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class ResponseInstruction implements Serializable {
-
-	/**
-	 * The persistent identifier of the flow execution that resulted in this response instruction.
-	 */
-	private String flowExecutionKey;
-
-	/**
-	 * Basic state info on the flow execution.
-	 */
-	private transient FlowExecutionContext flowExecutionContext;
-
-	/**
-	 * The view selection that was made.
-	 */
-	private ViewSelection viewSelection;
-
-	/**
-	 * Create a new response instruction for a paused flow execution.
-	 * @param flowExecutionKey the persistent identifier of the flow execution
-	 * @param flowExecutionContext the current flow execution context
-	 * @param viewSelection the selected view
-	 */
-	public ResponseInstruction(String flowExecutionKey, FlowExecutionContext flowExecutionContext,
-			ViewSelection viewSelection) {
-		Assert.notNull(flowExecutionKey, "The flow execution key is required");
-		this.flowExecutionKey = flowExecutionKey;
-		init(flowExecutionContext, viewSelection);
-	}
-
-	/**
-	 * Create a new response instruction for an ended flow execution. No flow execution key needs to be provided since
-	 * the flow execution no longer exists and cannot be referenced any longer.
-	 * @param flowExecutionContext the current flow execution context (inactive)
-	 * @param viewSelection the selected view
-	 */
-	public ResponseInstruction(FlowExecutionContext flowExecutionContext, ViewSelection viewSelection) {
-		init(flowExecutionContext, viewSelection);
-	}
-
-	/**
-	 * Helper to initialize the flow execution context and view selection.
-	 */
-	private void init(FlowExecutionContext flowExecutionContext, ViewSelection viewSelection) {
-		Assert.notNull(flowExecutionContext, "The flow execution context is required");
-		Assert.notNull(viewSelection, "The view selection is required");
-		this.flowExecutionContext = flowExecutionContext;
-		this.viewSelection = viewSelection;
-	}
-
-	/**
-	 * Returns the persistent identifier of the flow execution.
-	 */
-	public String getFlowExecutionKey() {
-		return flowExecutionKey;
-	}
-
-	/**
-	 * Returns the flow execution context representing the current state of the execution. It could be that the returned
-	 * flow execution is {@link FlowExecutionContext#isActive() inactive}.
-	 */
-	public FlowExecutionContext getFlowExecutionContext() {
-		return flowExecutionContext;
-	}
-
-	/**
-	 * Returns the view selection selected by the flow execution.
-	 */
-	public ViewSelection getViewSelection() {
-		return viewSelection;
-	}
-
-	/**
-	 * Returns true if this is an instruction to render an application view for an "active" (in progress) flow
-	 * execution.
-	 */
-	public boolean isActiveView() {
-		return isApplicationView() && flowExecutionContext.isActive();
-	}
-
-	/**
-	 * Returns true if this is an instruction to render an application view for an "ended" (inactive) flow execution
-	 * from an end state.
-	 */
-	public boolean isEndingView() {
-		return isApplicationView() && !flowExecutionContext.isActive();
-	}
-
-	// response types
-
-	/**
-	 * Returns true if this is an "application view" (forward) response instruction.
-	 */
-	public boolean isApplicationView() {
-		return viewSelection instanceof ApplicationView;
-	}
-
-	/**
-	 * Returns true if this is an instruction to perform a redirect to the current flow execution to render an
-	 * application view.
-	 */
-	public boolean isFlowExecutionRedirect() {
-		return viewSelection instanceof FlowExecutionRedirect;
-	}
-
-	/**
-	 * Returns true if this is an instruction to launch an entirely new (independent) flow execution.
-	 */
-	public boolean isFlowDefinitionRedirect() {
-		return viewSelection instanceof FlowDefinitionRedirect;
-	}
-
-	/**
-	 * Returns true if this an instruction to perform a redirect to an external URL.
-	 */
-	public boolean isExternalRedirect() {
-		return viewSelection instanceof ExternalRedirect;
-	}
-
-	/**
-	 * Returns true if this is a "null" response instruction, e.g. no response needs to be rendered.
-	 */
-	public boolean isNull() {
-		return viewSelection == ViewSelection.NULL_VIEW;
-	}
-
-	public boolean equals(Object o) {
-		if (!(o instanceof ResponseInstruction)) {
-			return false;
-		}
-		ResponseInstruction other = (ResponseInstruction) o;
-		if (getFlowExecutionKey() != null) {
-			return getFlowExecutionKey().equals(other.getFlowExecutionKey())
-					&& viewSelection.equals(other.viewSelection);
-		} else {
-			return other.getFlowExecutionKey() == null && viewSelection.equals(other.viewSelection);
-		}
-	}
-
-	public int hashCode() {
-		int hashCode = viewSelection.hashCode();
-		if (getFlowExecutionKey() != null) {
-			hashCode += getFlowExecutionKey().hashCode();
-		}
-		return hashCode;
-	}
-
-	public String toString() {
-		return new ToStringCreator(this).append("flowExecutionKey", flowExecutionKey).append("viewSelection",
-				viewSelection).append("flowExecutionContext", flowExecutionContext).toString();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/FlowController.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/FlowController.java
deleted file mode 100644
index c63b42e4..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/FlowController.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.mvc;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.AbstractController;
-import org.springframework.web.servlet.mvc.Controller;
-import org.springframework.web.servlet.view.RedirectView;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.context.servlet.ServletExternalContext;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.executor.FlowExecutor;
-import org.springframework.webflow.executor.ResponseInstruction;
-import org.springframework.webflow.executor.support.FlowExecutorArgumentHandler;
-import org.springframework.webflow.executor.support.FlowRequestHandler;
-import org.springframework.webflow.executor.support.RequestParameterFlowExecutorArgumentHandler;
-import org.springframework.webflow.executor.support.RequestPathFlowExecutorArgumentHandler;
-import org.springframework.webflow.executor.support.ResponseInstructionHandler;
-
-/**
- * Point of integration between Spring Web MVC and Spring Web Flow: a {@link Controller} that routes incoming requests
- * to one or more managed flow executions.
- * 
      
- * Requests into the web flow system are handled by a {@link FlowExecutor}, which this class delegates to using a
- * {@link FlowRequestHandler} helper. Consult the JavaDoc of that class for more information on how requests are
- * processed.
- * 
      
- * Note: a single FlowController may execute all flows of your application.
- * 
        
- * 
      • By default, to have this controller launch a new flow execution (conversation), have the client send a
- * {@link FlowExecutorArgumentHandler#getFlowIdArgumentName()} request parameter indicating the flow definition to
- * launch.
- * 
      • To have this controller participate in an existing flow execution (conversation), have the client send a
- * {@link FlowExecutorArgumentHandler#getFlowExecutionKeyArgumentName()} request parameter identifying the conversation
- * to participate in. See the flow-launcher sample application for examples of the various strategies for
- * launching and resuming flow executions.
- * 
      
- * 
      
- * Usage example:
- * 
- * 
      - *     <!--
- *         Exposes flows for execution at a single request URL.
- *         The id of a flow to launch should be passed in by clients using
- *         the "_flowId" request parameter:
- *         e.g. /app.htm?_flowId=flow1
- *     -->
- *     <bean name="/app.htm" class="org.springframework.webflow.executor.mvc.FlowController">
- *         <property name="flowExecutor" ref="flowExecutor"/>
- *     </bean>
- * 
      
- * 
- * 
      
- * It is also possible to customize the {@link FlowExecutorArgumentHandler} strategy to allow for different types of
- * controller parameterization, for example perhaps in conjunction with a REST-style request mapper (see
- * {@link RequestPathFlowExecutorArgumentHandler}).
- * 
- * @see org.springframework.webflow.executor.FlowExecutor
- * @see org.springframework.webflow.executor.support.FlowRequestHandler
- * @see org.springframework.webflow.executor.support.FlowExecutorArgumentHandler
- * 
- * @author Erwin Vervaet
- * @author Keith Donald
- */
-public class FlowController extends AbstractController implements InitializingBean {
-
-	/**
-	 * The facade for executing flows (launching new executions, and resuming existing executions).
-	 */
-	private FlowExecutor flowExecutor;
-
-	/**
-	 * The strategy for handling flow executor parameters.
-	 */
-	private FlowExecutorArgumentHandler argumentHandler = new RequestParameterFlowExecutorArgumentHandler();
-
-	/**
-	 * Create a new flow controller. Allows bean style usage.
-	 * @see #setFlowExecutor(FlowExecutor)
-	 * @see #setArgumentHandler(FlowExecutorArgumentHandler)
-	 */
-	public FlowController() {
-		// set the cache seconds property to 0 so no pages are cached by default
-		// for flows.
-		setCacheSeconds(0);
-	}
-
-	/**
-	 * Returns the flow executor used by this controller.
-	 * @return the flow executor
-	 */
-	public FlowExecutor getFlowExecutor() {
-		return flowExecutor;
-	}
-
-	/**
-	 * Sets the flow executor to use; setting this property is required.
-	 * @param flowExecutor the fully configured flow executor to use
-	 */
-	public void setFlowExecutor(FlowExecutor flowExecutor) {
-		this.flowExecutor = flowExecutor;
-	}
-
-	/**
-	 * Returns the flow executor argument handler used by this controller. Defaults to
-	 * {@link RequestParameterFlowExecutorArgumentHandler}.
-	 * @return the argument handler
-	 */
-	public FlowExecutorArgumentHandler getArgumentHandler() {
-		return argumentHandler;
-	}
-
-	/**
-	 * Sets the flow executor argument handler to use. The default is
-	 * {@link RequestParameterFlowExecutorArgumentHandler}.
-	 * @param argumentHandler the fully configured argument handler
-	 */
-	public void setArgumentHandler(FlowExecutorArgumentHandler argumentHandler) {
-		this.argumentHandler = argumentHandler;
-	}
-
-	/**
-	 * Sets the identifier of the default flow to launch if no flowId argument can be extracted by the configured
-	 * {@link FlowExecutorArgumentHandler} during request processing.
-	 * 
      
-	 * This is a convenience method that sets the default flow id of the controller's argument handler. Don't use this
-	 * when using {@link #setArgumentHandler(FlowExecutorArgumentHandler)}.
-	 */
-	public void setDefaultFlowId(String defaultFlowId) {
-		this.argumentHandler.setDefaultFlowId(defaultFlowId);
-	}
-
-	public void afterPropertiesSet() {
-		Assert.notNull(flowExecutor, "The flow executor property is required");
-		Assert.notNull(argumentHandler, "The argument handler property is required");
-	}
-
-	protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
-		ServletExternalContext context = new ServletExternalContext(getServletContext(), request, response);
-		ResponseInstruction responseInstruction = createRequestHandler().handleFlowRequest(context);
-		return toModelAndView(responseInstruction, context);
-	}
-
-	/**
-	 * Factory method that creates a new helper for processing a request into this flow controller. The handler is a
-	 * basic template encapsulating reusable flow execution request handling workflow. This implementation just creates
-	 * a new {@link FlowRequestHandler}.
-	 * @return the controller helper
-	 */
-	protected FlowRequestHandler createRequestHandler() {
-		return new FlowRequestHandler(getFlowExecutor(), getArgumentHandler());
-	}
-
-	/**
-	 * Create a ModelAndView object based on the information in the selected response instruction. Subclasses can
-	 * override this to return a specialized ModelAndView or to do custom processing on it.
-	 * @param responseInstruction the response instruction to convert
-	 * @return a new ModelAndView object
-	 */
-	protected ModelAndView toModelAndView(final ResponseInstruction responseInstruction, final ExternalContext context) {
-		return (ModelAndView) new ResponseInstructionHandler() {
-			protected void handleApplicationView(ApplicationView view) throws Exception {
-				// forward to a view as part of an active conversation
-				Map model = new HashMap(view.getModel());
-				argumentHandler.exposeFlowExecutionContext(responseInstruction.getFlowExecutionKey(),
-						responseInstruction.getFlowExecutionContext(), model);
-				setResult(new ModelAndView(view.getViewName(), model));
-			}
-
-			protected void handleFlowDefinitionRedirect(FlowDefinitionRedirect redirect) throws Exception {
-				// restart the flow by redirecting to flow launch URL
-				String flowUrl = argumentHandler.createFlowDefinitionUrl(redirect, context);
-				setResult(new ModelAndView(new RedirectView(flowUrl)));
-			}
-
-			protected void handleFlowExecutionRedirect(FlowExecutionRedirect redirect) throws Exception {
-				// redirect to active flow execution URL
-				String flowExecutionUrl = argumentHandler.createFlowExecutionUrl(responseInstruction
-						.getFlowExecutionKey(), responseInstruction.getFlowExecutionContext(), context);
-				setResult(new ModelAndView(new RedirectView(flowExecutionUrl)));
-			}
-
-			protected void handleExternalRedirect(ExternalRedirect redirect) throws Exception {
-				// redirect to external URL
-				String externalUrl = argumentHandler.createExternalUrl(redirect, responseInstruction
-						.getFlowExecutionKey(), context);
-				setResult(new ModelAndView(new RedirectView(externalUrl)));
-			}
-
-			protected void handleNull() throws Exception {
-				// no response to issue
-				setResult(null);
-			}
-		}.handleQuietly(responseInstruction).getResult();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/PortletFlowController.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/PortletFlowController.java
deleted file mode 100644
index 969a4c0c..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/PortletFlowController.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.mvc;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.Assert;
-import org.springframework.web.portlet.ModelAndView;
-import org.springframework.web.portlet.mvc.AbstractController;
-import org.springframework.web.portlet.mvc.Controller;
-import org.springframework.webflow.context.portlet.PortletExternalContext;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.executor.FlowExecutor;
-import org.springframework.webflow.executor.ResponseInstruction;
-import org.springframework.webflow.executor.support.FlowExecutorArgumentHandler;
-import org.springframework.webflow.executor.support.RequestParameterFlowExecutorArgumentHandler;
-import org.springframework.webflow.executor.support.ResponseInstructionHandler;
-
-/**
- * Point of integration between Spring Portlet MVC and Spring Web Flow: a {@link Controller} that routes incoming
- * portlet requests to one or more managed flow executions.
- * 
      
- * Requests into the web flow system are handled by a {@link FlowExecutor}, which this class delegates to. Consult the
- * JavaDoc of that class for more information on how requests are processed.
- * 
      
- * Note: a single PortletFlowController may execute all flows within your application. See the
- * phonebook-portlet sample application for examples of the various strategies for launching and resuming
- * flow executions in a Portlet environment.
- * 
      
- * It is also possible to customize the {@link FlowExecutorArgumentHandler} strategy to allow for different types of
- * controller parameterization, for example perhaps in conjunction with a REST-style request mapper.
- * 
      
- * Integrating Spring Web Flow into a Portlet environment puts some minor contraints on your flows. These constraints
- * result from technical limitations in the Portlet API, for instance the fact that a render request cannot issue a
- * redirect. Keep the following in mind when developing Portlets using Spring Web Flow:
- * 
        
- * 
      • Using the well known POST-REDIRECT-GET idiom, for instance using alwaysRedirectOnPause or the
- * "redirect:" view prefix, does not make sense in a Portlet environment where the Portlet container handles this using
- * a seperate render phase. In other words, a {@link FlowExecutionRedirect} is not supportd.
        • 
- * 
      • This controller will launch a new flow execution every time it handles a render request without having
- * previously handled an action request (for the same session) or the render request containing a flow execution key.
- * 
        • 
- * 
      • Launching new flow executions is done in the render phase. As a result the first view selection your flow makes
- * cannot be a {@link FlowDefinitionRedirect} or an {@link ExternalRedirect}.
        • 
- * 
      
- * 
- * @see org.springframework.webflow.executor.FlowExecutor
- * @see org.springframework.webflow.executor.support.FlowExecutorArgumentHandler
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class PortletFlowController extends AbstractController implements InitializingBean {
-
-	/**
-	 * Name of the attribute under which the response instruction will be stored in the session.
-	 */
-	private static final String RESPONSE_INSTRUCTION_SESSION_ATTRIBUTE = "actionRequest.responseInstruction";
-
-	/**
-	 * Delegate for executing flow executions (launching new executions, and resuming existing executions).
-	 */
-	private FlowExecutor flowExecutor;
-
-	/**
-	 * Delegate for handling flow executor arguments.
-	 */
-	private FlowExecutorArgumentHandler argumentHandler = new RequestParameterFlowExecutorArgumentHandler();
-
-	/**
-	 * Create a new portlet flow controller. Allows for bean style usage.
-	 * @see #setFlowExecutor(FlowExecutor)
-	 * @see #setArgumentHandler(FlowExecutorArgumentHandler)
-	 */
-	public PortletFlowController() {
-		// set the cache seconds property to 0 so no pages are cached by default
-		// for flows
-		setCacheSeconds(0);
-		// this controller stores ResponseInstruction objects in the session, so
-		// we need to ensure we do this in an orderly manner
-		// see exposeToRenderPhase() and extractActionResponseInstruction()
-		setSynchronizeOnSession(true);
-	}
-
-	/**
-	 * Returns the flow executor used by this controller.
-	 * @return the flow executor
-	 */
-	public FlowExecutor getFlowExecutor() {
-		return flowExecutor;
-	}
-
-	/**
-	 * Configures the flow executor implementation to use. Required.
-	 * @param flowExecutor the fully configured flow executor
-	 */
-	public void setFlowExecutor(FlowExecutor flowExecutor) {
-		this.flowExecutor = flowExecutor;
-	}
-
-	/**
-	 * Returns the flow executor argument handler used by this controller.
-	 * @return the argument handler
-	 */
-	public FlowExecutorArgumentHandler getArgumentHandler() {
-		return argumentHandler;
-	}
-
-	/**
-	 * Sets the flow executor argument handler to use.
-	 * @param argumentHandler the fully configured argument handler
-	 */
-	public void setArgumentHandler(FlowExecutorArgumentHandler argumentHandler) {
-		this.argumentHandler = argumentHandler;
-	}
-
-	/**
-	 * Sets the identifier of the default flow to launch if no flowId argument can be extracted by the configured
-	 * {@link FlowExecutorArgumentHandler} during render request processing.
-	 * 
      
-	 * This is a convenience method that sets the default flow id of the controller's argument handler. Don't use this
-	 * when using {@link #setArgumentHandler(FlowExecutorArgumentHandler)}.
-	 */
-	public void setDefaultFlowId(String defaultFlowId) {
-		argumentHandler.setDefaultFlowId(defaultFlowId);
-	}
-
-	public void afterPropertiesSet() {
-		Assert.notNull(flowExecutor, "The flow executor property is required");
-		Assert.notNull(argumentHandler, "The argument handler property is required");
-	}
-
-	protected ModelAndView handleRenderRequestInternal(RenderRequest request, RenderResponse response) throws Exception {
-		PortletExternalContext context = new PortletExternalContext(getPortletContext(), request, response);
-
-		// look for a cached response instruction in the session put there by the action request phase
-		// the response instruction could be an "active application view" rendered
-		// from a view-state or a "confirmation view" rendered by an end-state
-		ResponseInstruction responseInstruction = extractActionResponseInstruction(request);
-		if (responseInstruction != null) {
-			// found: convert the cached response instruction to model and view for rendering
-			return toModelAndView(responseInstruction);
-		} else {
-			if (argumentHandler.isFlowExecutionKeyPresent(context)) {
-				// this is a request to render an active flow execution -- extract its key
-				String flowExecutionKey = argumentHandler.extractFlowExecutionKey(context);
-				// simply refresh the current view state of the flow execution (happens
-				// when the "refresh" browser button is clicked)
-				return toModelAndView(flowExecutor.refresh(flowExecutionKey, context));
-			} else {
-				// launch a new flow execution
-				String flowId = argumentHandler.extractFlowId(context);
-				return toModelAndView(flowExecutor.launch(flowId, context));
-			}
-		}
-	}
-
-	protected void handleActionRequestInternal(final ActionRequest request, final ActionResponse response)
-			throws Exception {
-		final PortletExternalContext context = new PortletExternalContext(getPortletContext(), request, response);
-		final String flowExecutionKey = argumentHandler.extractFlowExecutionKey(context);
-		final String eventId = argumentHandler.extractEventId(context);
-
-		// signal the event against the flow execution, returning the next response instruction
-		final ResponseInstruction responseInstruction = flowExecutor.resume(flowExecutionKey, eventId, context);
-		new ResponseInstructionHandler() {
-			protected void handleApplicationView(ApplicationView view) throws Exception {
-				// response instruction is a forward to an "application view"
-				if (responseInstruction.isActiveView()) {
-					// is an "active" forward returned by a view-state (not an end-state) --
-					// set the flow execution key render parameter to support browser refresh
-					// we need to do this because the responseInstruction stored in the session
-					// below will be removed from the session when the next render request
-					// extracts it (see extractActionResponseInstruction)
-					response.setRenderParameter(argumentHandler.getFlowExecutionKeyArgumentName(), responseInstruction
-							.getFlowExecutionKey());
-				}
-				// make response instruction available for rendering during the render phase of this portlet request
-				exposeToRenderPhase(responseInstruction, request);
-			}
-
-			protected void handleFlowDefinitionRedirect(FlowDefinitionRedirect redirect) throws Exception {
-				// set flow id render parameter to request that a new flow be launched within this portlet
-				response.setRenderParameter(argumentHandler.getFlowIdArgumentName(), redirect.getFlowDefinitionId());
-				// expose flow definition input as render parameters as well
-				Iterator it = redirect.getExecutionInput().entrySet().iterator();
-				while (it.hasNext()) {
-					Map.Entry entry = (Map.Entry) it.next();
-					response.setRenderParameter(convertToString(entry.getKey()), convertToString(entry.getValue()));
-				}
-			}
-
-			protected void handleFlowExecutionRedirect(FlowExecutionRedirect redirect) throws Exception {
-				// is a flow execution redirect: simply expose key parameter to support refresh during render phase
-				response.setRenderParameter(argumentHandler.getFlowExecutionKeyArgumentName(), responseInstruction
-						.getFlowExecutionKey());
-			}
-
-			protected void handleExternalRedirect(ExternalRedirect redirect) throws Exception {
-				// issue the redirect to the external URL
-				String url = argumentHandler.createExternalUrl(redirect, flowExecutionKey, context);
-				response.sendRedirect(url);
-			}
-
-			protected void handleNull() throws Exception {
-				if (responseInstruction.getFlowExecutionContext().isActive()) {
-					// flow execution is still active
-					// set the flow execution key render parameter to support browser refresh
-					response.setRenderParameter(argumentHandler.getFlowExecutionKeyArgumentName(), responseInstruction
-							.getFlowExecutionKey());
-				}
-				// make response instruction available for rendering during the render phase of this portlet request
-				exposeToRenderPhase(responseInstruction, request);
-			}
-		}.handle(responseInstruction);
-	}
-
-	// helpers
-
-	/**
-	 * Converts the object to a string. Simply returns {@link String#valueOf(Object)} by default.
-	 * @param object the object
-	 * @return the string-form of the object
-	 */
-	protected String convertToString(Object object) {
-		return String.valueOf(object);
-	}
-
-	/**
-	 * Expose given response instruction to the render phase by putting it in the session.
-	 */
-	private void exposeToRenderPhase(ResponseInstruction responseInstruction, ActionRequest request) {
-		// there are 2 reasons why we need to put the ResponseInstruction in the session
-		// and we can't just rely on flow execution 'refresh' during the portlet render phase:
-		// 1 - a ResponseInstruction rendered from an end-state cannot be refreshed ("confirmation view")
-		// 2 - to make the initial contents of request scope available to the view
-		PortletSession session = request.getPortletSession(false);
-		Assert.notNull(session, "A PortletSession is required");
-		session.setAttribute(RESPONSE_INSTRUCTION_SESSION_ATTRIBUTE, responseInstruction);
-	}
-
-	/**
-	 * Extract a response instruction stored in the session during the action phase by
-	 * {@link #exposeToRenderPhase(ResponseInstruction, ActionRequest)}. If a response instruction is found, it will be
-	 * removed from the session.
-	 * @param request the portlet request
-	 * @return the response instructions found in the session or null if not found
-	 */
-	private ResponseInstruction extractActionResponseInstruction(PortletRequest request) {
-		PortletSession session = request.getPortletSession(false);
-		ResponseInstruction response = null;
-		if (session != null) {
-			response = (ResponseInstruction) session.getAttribute(RESPONSE_INSTRUCTION_SESSION_ATTRIBUTE);
-			if (response != null) {
-				// remove it
-				session.removeAttribute(RESPONSE_INSTRUCTION_SESSION_ATTRIBUTE);
-			}
-		}
-		return response;
-	}
-
-	/**
-	 * Convert given response instruction into a Spring Portlet MVC model and view. Will only be called during the
-	 * render phase.
-	 */
-	protected ModelAndView toModelAndView(ResponseInstruction responseInstruction) {
-		if (responseInstruction.isApplicationView()) {
-			// forward to a view as part of an active conversation
-			ApplicationView forward = (ApplicationView) responseInstruction.getViewSelection();
-			Map model = new HashMap(forward.getModel());
-			argumentHandler.exposeFlowExecutionContext(responseInstruction.getFlowExecutionKey(), responseInstruction
-					.getFlowExecutionContext(), model);
-			return new ModelAndView(forward.getViewName(), model);
-		} else if (responseInstruction.isNull()) {
-			// no response to issue
-			return null;
-		} else {
-			// we can't render any of the redirect responses since 'sendRedirect' is only
-			// available on ActionResponse during the action phase
-			// furthermore, a FlowExecutionRedirect doesn't really makes sense since the
-			// portlet container handles refreshes with the render phase
-			throw new IllegalArgumentException("Don't know how to render response instruction " + responseInstruction);
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/package.html b/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/package.html
deleted file mode 100644
index 90ed9ca5..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/mvc/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-The integration layer between Spring Web Flow the Spring (Portlet) MVC framework.
-
-
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/FlowAction.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/FlowAction.java
deleted file mode 100644
index a5e3d13d..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/FlowAction.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.struts;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.springframework.validation.Errors;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.struts.ActionSupport;
-import org.springframework.web.struts.DelegatingActionProxy;
-import org.springframework.web.struts.SpringBindingActionForm;
-import org.springframework.web.util.WebUtils;
-import org.springframework.webflow.action.FormObjectAccessor;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.executor.FlowExecutor;
-import org.springframework.webflow.executor.ResponseInstruction;
-import org.springframework.webflow.executor.support.FlowExecutorArgumentHandler;
-import org.springframework.webflow.executor.support.FlowRequestHandler;
-import org.springframework.webflow.executor.support.RequestParameterFlowExecutorArgumentHandler;
-import org.springframework.webflow.executor.support.ResponseInstructionHandler;
-
-/**
- * Point of integration between Struts and Spring Web Flow: a Struts Action that acts a front controller entry point
- * into the web flow system. A single FlowAction may launch any new FlowExecution. In addition, a single Flow Action may
- * signal events in any existing/restored FlowExecutions.
- * 
      
- * Requests are managed by and delegated to a {@link FlowExecutor}, which this class delegates to using a
- * {@link FlowRequestHandler} (allowing reuse of common front flow controller logic in other environments). Consult the
- * JavaDoc of those classes for more information on how requests are processed.
- * 
      
- * 
    • By default, to have this controller launch a new flow execution (conversation), have the client send a
- * {@link FlowExecutorArgumentHandler#getFlowIdArgumentName()} request parameter indicating the flow definition to
- * launch.
- * 
    • To have this controller participate in an existing flow execution (conversation), have the client send a
- * {@link FlowExecutorArgumentHandler#getFlowExecutionKeyArgumentName()} request parameter identifying the conversation
- * to participate in.
- * 
      
- * On each request received by this action, a {@link StrutsExternalContext} object is created as input to the web flow
- * system. This external source event provides access to the action form, action mapping, and other Struts-specific
- * constructs.
- * 
      
- * This class also is aware of the {@link SpringBindingActionForm} adapter, which adapts Spring's data binding
- * infrastructure (based on POJO binding, a standard Errors interface, and property editor type conversion) to the
- * Struts action form model. This option gives backend web-tier developers full support for POJO-based binding with
- * minimal hassel, while still providing consistency to view developers who already have a lot of experience with Struts
- * for markup and request dispatching.
- * 
      
- * Below is an example struts-config.xml configuration for a FlowAction:
- * 
- * 
      - *     <action path="/userRegistration"
- *         type="org.springframework.webflow.executor.struts.FlowAction"
- *         name="springBindingActionForm" scope="request">
- *     </action>
- * 
      
- * 
- * This example maps the logical request URL /userRegistration.do as a Flow controller (FlowAction).
- * It is expected that flows to launch be provided in a dynamic fashion by the views (allowing this single
- * FlowAction to manage any number of flow executions). A Spring binding action form instance is set in
- * request scope, acting as an adapter enabling POJO-based binding and validation with Spring.
- * 
      
- * Other notes regarding Struts/Spring Web Flow integration:
- * 
        
- * 
      • Logical view names returned when ViewStates and EndStates are entered are mapped
- * to physical view templates using standard Struts action forwards (typically global forwards).
        • 
- * 
      • Use of the SpringBindingActionForm requires no special setup in struts-config.xml:
- * simply declare a form bean in request scope of the class
- * org.springframework.web.struts.SpringBindingActionForm and use it with your FlowAction.
        • 
- * 
      • This class depends on a {@link FlowExecutor} instance to be configured. If relying on Spring's
- * {@link DelegatingActionProxy} (which is recommended), a FlowExecutor reference can simply be injected using standard
- * Spring dependency injection techniques. If you are not using the proxy-based approach, this class will attempt a root
- * context lookup on initialization, first querying for a bean of instance {@link FlowExecutor} named
- * {@link #FLOW_EXECUTOR_BEAN_NAME}.
        • 
- * 
      • The {@link org.springframework.webflow.executor.support.FlowExecutorArgumentHandler} used by the FlowAction can
- * be configured in the root context using a bean of name {@link #FLOW_EXECUTOR_ARGUMENT_HANDLER_BEAN_NAME}. If not
- * explicitly specified it will default to a normal
- * {@link org.springframework.webflow.executor.support.RequestParameterFlowExecutorArgumentHandler} with standard
- * configuration.
        • 
- * 
      
- * 
      
- * The benefits here are considerable: developers now have a powerful web flow capability integrated with Struts, with a
- * consistent-approach to POJO-based binding and validation that addresses the proliferation of ActionForm
- * classes found in traditional Struts-based apps.
- * 
- * @see org.springframework.webflow.executor.FlowExecutor
- * @see org.springframework.webflow.executor.support.FlowRequestHandler
- * @see org.springframework.web.struts.SpringBindingActionForm
- * @see org.springframework.web.struts.DelegatingActionProxy
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class FlowAction extends ActionSupport {
-
-	/**
-	 * The flow executor will be retreived from the application context using this bean name if no executor is
-	 * explicitly set. ("flowExecutor")
-	 */
-	protected static final String FLOW_EXECUTOR_BEAN_NAME = "flowExecutor";
-
-	/**
-	 * The flow executor argument handler will be retreived from the application context using this bean name if no
-	 * argument handler is explicitly set. ("argumentHandler")
-	 */
-	protected static final String FLOW_EXECUTOR_ARGUMENT_HANDLER_BEAN_NAME = "argumentHandler";
-
-	/**
-	 * The service responsible for launching and signaling Struts-originating events in flow executions.
-	 */
-	private FlowExecutor flowExecutor;
-
-	/**
-	 * Delegate to handle flow executor arguments.
-	 */
-	private FlowExecutorArgumentHandler argumentHandler;
-
-	/**
-	 * Returns the flow executor used by this controller.
-	 * @return the flow executor
-	 */
-	public FlowExecutor getFlowExecutor() {
-		return flowExecutor;
-	}
-
-	/**
-	 * Configures the flow executor implementation to use. Required.
-	 * @param flowExecutor the fully configured flow executor
-	 */
-	public void setFlowExecutor(FlowExecutor flowExecutor) {
-		this.flowExecutor = flowExecutor;
-	}
-
-	/**
-	 * Returns the flow executor argument handler used by this controller.
-	 * @return the argument handler
-	 */
-	public FlowExecutorArgumentHandler getArgumentHandler() {
-		return argumentHandler;
-	}
-
-	/**
-	 * Sets the flow executor argument handler to use.
-	 * @param argumentHandler the fully configured argument handler
-	 */
-	public void setArgumentHandler(FlowExecutorArgumentHandler argumentHandler) {
-		this.argumentHandler = argumentHandler;
-	}
-
-	protected void onInit() {
-		WebApplicationContext context = getWebApplicationContext();
-		if (getFlowExecutor() == null) {
-			if (context.containsBean(FLOW_EXECUTOR_BEAN_NAME)) {
-				setFlowExecutor((FlowExecutor) context.getBean(FLOW_EXECUTOR_BEAN_NAME, FlowExecutor.class));
-			} else {
-				throw new IllegalStateException("No '" + FLOW_EXECUTOR_BEAN_NAME
-						+ "' bean definition could be found; to use Spring Web Flow with Struts you must "
-						+ "configure this FlowAction with a FlowExecutor");
-			}
-		}
-		if (getArgumentHandler() == null) {
-			if (context.containsBean(FLOW_EXECUTOR_ARGUMENT_HANDLER_BEAN_NAME)) {
-				setArgumentHandler((FlowExecutorArgumentHandler) context.getBean(
-						FLOW_EXECUTOR_ARGUMENT_HANDLER_BEAN_NAME, FlowExecutorArgumentHandler.class));
-			} else {
-				// default
-				argumentHandler = new RequestParameterFlowExecutorArgumentHandler();
-			}
-		}
-	}
-
-	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-		ExternalContext context = new StrutsExternalContext(mapping, form, getServletContext(), request, response);
-		ResponseInstruction responseInstruction = createRequestHandler().handleFlowRequest(context);
-		return toActionForward(responseInstruction, mapping, form, request, response, context);
-	}
-
-	/**
-	 * Factory method that creates a new helper for processing a request into this flow controller.
-	 * @return the controller helper
-	 */
-	protected FlowRequestHandler createRequestHandler() {
-		return new FlowRequestHandler(getFlowExecutor(), getArgumentHandler());
-	}
-
-	/**
-	 * Return a Struts ActionForward given a ResponseInstruction. Adds all attributes from the ResponseInstruction as
-	 * request attributes.
-	 */
-	protected ActionForward toActionForward(final ResponseInstruction responseInstruction, final ActionMapping mapping,
-			final ActionForm form, final HttpServletRequest request, final HttpServletResponse response,
-			final ExternalContext context) throws Exception {
-		return (ActionForward) new ResponseInstructionHandler() {
-			protected void handleApplicationView(ApplicationView view) throws Exception {
-				// forward to a view as part of an active conversation
-				Map model = new HashMap(view.getModel());
-				argumentHandler.exposeFlowExecutionContext(responseInstruction.getFlowExecutionKey(),
-						responseInstruction.getFlowExecutionContext(), model);
-				WebUtils.exposeRequestAttributes(request, model);
-				if (form instanceof SpringBindingActionForm) {
-					SpringBindingActionForm bindingForm = (SpringBindingActionForm) form;
-					// expose the form object and associated errors as the
-					// "current form object" in the request
-					Errors currentErrors = (Errors) model.get(FormObjectAccessor.getCurrentFormErrorsName());
-					bindingForm.expose(currentErrors, request);
-				}
-				setResult(findForward(view, mapping));
-			}
-
-			protected void handleFlowDefinitionRedirect(FlowDefinitionRedirect redirect) throws Exception {
-				// restart the flow by redirecting to flow launch URL
-				String flowUrl = argumentHandler.createFlowDefinitionUrl(redirect, context);
-				setResult(createRedirectForward(flowUrl, response));
-			}
-
-			protected void handleFlowExecutionRedirect(FlowExecutionRedirect redirect) throws Exception {
-				// redirect to active flow execution URL
-				String flowExecutionUrl = argumentHandler.createFlowExecutionUrl(responseInstruction
-						.getFlowExecutionKey(), responseInstruction.getFlowExecutionContext(), context);
-				setResult(createRedirectForward(flowExecutionUrl, response));
-			}
-
-			protected void handleExternalRedirect(ExternalRedirect redirect) throws Exception {
-				// redirect to external URL
-				String externalUrl = argumentHandler.createExternalUrl(redirect, responseInstruction
-						.getFlowExecutionKey(), context);
-				setResult(createRedirectForward(externalUrl, response));
-			}
-
-			protected void handleNull() throws Exception {
-				// no response to issue
-				setResult(null);
-			}
-		}.handle(responseInstruction).getResult();
-	}
-
-	/**
-	 * Handles a redirect. This implementation simply calls sendRedirect on the response object.
-	 * @param url the url to redirect to
-	 * @param response the http response
-	 * @return the redirect forward, this implementation returns null
-	 * @throws Exception an excpetion occured processing the redirect
-	 * @see HttpServletResponse#sendRedirect(java.lang.String)
-	 */
-	protected ActionForward createRedirectForward(String url, HttpServletResponse response) throws Exception {
-		response.sendRedirect(url);
-		return null;
-	}
-
-	/**
-	 * Find an action forward for given application view. If no suitable forward is found in the action mapping using
-	 * the view name as a key, this method will create a new action forward using the view name.
-	 * @param forward the application view to find a forward for
-	 * @param mapping the action mapping to use
-	 * @return the action forward, never null
-	 */
-	protected ActionForward findForward(ApplicationView forward, ActionMapping mapping) {
-		// note that this method is always creating a new ActionForward to make
-		// sure that the redirect flag is false -- redirect is controlled by SWF
-		// itself, not Struts
-		ActionForward actionForward = mapping.findForward(forward.getViewName());
-		if (actionForward != null) {
-			// the 1.2.1 copy constructor would ideally be better to
-			// use, but it is not Struts 1.1 compatible
-			actionForward = new ActionForward(actionForward.getName(), actionForward.getPath(), false);
-		} else {
-			actionForward = new ActionForward(forward.getViewName(), false);
-		}
-		return actionForward;
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/StrutsExternalContext.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/StrutsExternalContext.java
deleted file mode 100644
index 9db4bfa5..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/StrutsExternalContext.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.struts;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
-import org.springframework.webflow.context.servlet.ServletExternalContext;
-
-/**
- * Provides consistent access to a Struts environment from within the Spring Web Flow system. Represents the context of
- * a request into SWF from Struts.
- * 
- * @author Keith Donald
- */
-public class StrutsExternalContext extends ServletExternalContext {
-
-	/**
-	 * The Struts action mapping associated with this request.
-	 */
-	private ActionMapping actionMapping;
-
-	/**
-	 * The Struts action form associated with this request.
-	 */
-	private ActionForm actionForm;
-
-	/**
-	 * Creates a new Struts external context.
-	 * @param mapping the action mapping
-	 * @param form the action form
-	 * @param context the servlet context
-	 * @param request the request
-	 * @param response the response
-	 */
-	public StrutsExternalContext(ActionMapping mapping, ActionForm form, ServletContext context,
-			HttpServletRequest request, HttpServletResponse response) {
-		super(context, request, response);
-		this.actionMapping = mapping;
-		this.actionForm = form;
-	}
-
-	/**
-	 * Returns the action form.
-	 */
-	public ActionForm getActionForm() {
-		return actionForm;
-	}
-
-	/**
-	 * Returns the action mapping.
-	 */
-	public ActionMapping getActionMapping() {
-		return actionMapping;
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/package.html b/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/package.html
deleted file mode 100644
index 5d3b0642..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/struts/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-The integration layer between Spring Web Flow and Struts 1.x.
-
-
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExposer.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExposer.java
deleted file mode 100644
index bff8512c..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExposer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import java.util.Map;
-
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.execution.FlowExecutionContext;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.executor.FlowExecutor;
-
-/**
- * Helper strategy that can expose {@link FlowExecutor} method arguments in a response (view) so that subsequent
- * requests resulting from the response can have those arguments extracted again, typically using a
- * {@link FlowExecutorArgumentExtractor}.
- * 
      
- * Arguments can either be exposed in the model of a view that will be rendered or in a URL that will be used to trigger
- * a new request into Spring Web Flow, for instance using a redirect.
- * 
- * @author Erwin Vervaet
- */
-public interface FlowExecutorArgumentExposer {
-
-	/**
-	 * Expose the flow execution context and it's key in given model map.
-	 * @param flowExecutionKey the flow execution key (may be null if the conversation has ended)
-	 * @param context the flow execution context
-	 * @param model the model map
-	 */
-	public void exposeFlowExecutionContext(String flowExecutionKey, FlowExecutionContext context, Map model);
-
-	/**
-	 * Create a URL that when redirected to launches a entirely new execution of a flow definition (starts a new
-	 * conversation). Used to support the restart flow and redirect to flow use cases.
-	 * @param flowDefinitionRedirect the flow definition redirect view selection
-	 * @param context the external context
-	 * @return the relative flow URL path to redirect to
-	 */
-	public String createFlowDefinitionUrl(FlowDefinitionRedirect flowDefinitionRedirect, ExternalContext context);
-
-	/**
-	 * Create a URL path that when redirected to renders the current (or last) view selection made by the flow
-	 * execution identified by the flow execution key. Used to support the flow execution redirect use case.
-	 * @param flowExecutionKey the flow execution key
-	 * @param flowExecution the flow execution
-	 * @param context the external context
-	 * @return the relative conversation URL path
-	 * @see FlowExecutionRedirect
-	 */
-	public String createFlowExecutionUrl(String flowExecutionKey, FlowExecutionContext flowExecution,
-			ExternalContext context);
-
-	/**
-	 * Create a URL path that when redirected to communicates with an external system outside of Spring Web Flow.
-	 * @param redirect the external redirect request
-	 * @param flowExecutionKey the flow execution key to send through the redirect (optional)
-	 * @param context the external context
-	 * @return the external URL
-	 */
-	public String createExternalUrl(ExternalRedirect redirect, String flowExecutionKey, ExternalContext context);
-
-}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExtractionException.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExtractionException.java
deleted file mode 100644
index 68ffe0b7..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExtractionException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import org.springframework.webflow.core.FlowException;
-
-/**
- * An exception thrown by a flow executor argument extractor when an argument could not be extracted.
- * 
- * @see org.springframework.webflow.executor.support.FlowExecutorArgumentExtractor
- * 
- * @author Keith Donald
- */
-public class FlowExecutorArgumentExtractionException extends FlowException {
-
-	/**
-	 * Creates a new argument extraction exception.
-	 * @param msg a descriptive message
-	 */
-	public FlowExecutorArgumentExtractionException(String msg) {
-		super(msg);
-	}
-
-	/**
-	 * Creates a new argument extraction exception.
-	 * @param msg a descriptive message
-	 * @param cause the cause
-	 */
-	public FlowExecutorArgumentExtractionException(String msg, Throwable cause) {
-		super(msg, cause);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExtractor.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExtractor.java
deleted file mode 100644
index 5ff9b048..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentExtractor.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
-import org.springframework.webflow.executor.FlowExecutor;
-
-/**
- * A helper strategy used by the {@link FlowRequestHandler} to extract {@link FlowExecutor} method arguments from a
- * request initiated by an {@link ExternalContext}. The extracted arguments were typically exposed in the previous
- * response (the response that resulted in a new request) using a {@link FlowExecutorArgumentExposer}.
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public interface FlowExecutorArgumentExtractor {
-
-	/**
-	 * Returns true if the flow id is extractable from the context.
-	 * @param context the context in which a external user event occured
-	 * @return true if extractable, false if not
-	 */
-	public boolean isFlowIdPresent(ExternalContext context);
-
-	/**
-	 * Extracts the flow id from the external context.
-	 * @param context the context in which a external user event occured
-	 * @return the extracted flow id
-	 * @throws FlowExecutorArgumentExtractionException if the flow id could not be extracted
-	 */
-	public String extractFlowId(ExternalContext context) throws FlowExecutorArgumentExtractionException;
-
-	/**
-	 * Returns true if the flow execution key is extractable from the context.
-	 * @param context the context in which a external user event occured
-	 * @return true if extractable, false if not
-	 */
-	public boolean isFlowExecutionKeyPresent(ExternalContext context);
-
-	/**
-	 * Extract the flow execution key from the external context.
-	 * @param context the context in which the external user event occured
-	 * @return the obtained flow execution key
-	 * @throws FlowExecutorArgumentExtractionException if the flow execution key could not be extracted
-	 */
-	public String extractFlowExecutionKey(ExternalContext context) throws FlowExecutorArgumentExtractionException;
-
-	/**
-	 * Returns true if the event id is extractable from the context.
-	 * @param context the context in which a external user event occured
-	 * @return true if extractable, false if not
-	 */
-	public boolean isEventIdPresent(ExternalContext context);
-
-	/**
-	 * Extract the flow execution event id from the external context.
-	 * 
      
-	 * This method should only be called if a {@link FlowExecutionKey} was successfully extracted, indicating a request
-	 * to resume a flow execution.
-	 * @param context the context in which a external user event occured
-	 * @return the event id
-	 * @throws FlowExecutorArgumentExtractionException if the event id could not be extracted
-	 */
-	public String extractEventId(ExternalContext context) throws FlowExecutorArgumentExtractionException;
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentHandler.java
deleted file mode 100644
index a85316aa..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowExecutorArgumentHandler.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Map;
-
-import org.springframework.core.JdkVersion;
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.execution.FlowExecutionContext;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-
-/**
- * Abstract base class for objects handling {@link org.springframework.webflow.executor.FlowExecutor} arguments. This
- * class combines the two argument handling responsabilities of ({@link FlowExecutorArgumentExtractor extraction} and
- * {@link FlowExecutorArgumentExposer exposing}) and makes sure they are consistent, i.e. that exposed arguments can
- * later be extracted again.
- * 
      
- * All argument names are configurable. Common convenience functionality is also provided, e.g. a
- * {@link #applyDefaultFlowId(String) default flow id}, {@link #encodeValue(Object) URL encoding} and dealing with
- * {@link #makeRedirectUrlContextRelativeIfNecessary(String, ExternalContext) relative URLs}. Subclasses are
- * responsible for taking these settings into account when implementing actual argument extraction and exposing
- * behavior.
- * 
- * @see FlowExecutorArgumentExtractor
- * @see FlowExecutorArgumentExposer
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public abstract class FlowExecutorArgumentHandler implements FlowExecutorArgumentExtractor, FlowExecutorArgumentExposer {
-
-	// data and behavior related to argument extraction
-
-	/**
-	 * By default clients can send the id of the flow definition to be launched using an argument with this name
-	 * ("_flowId").
-	 */
-	private static final String FLOW_ID_ARGUMENT_NAME = "_flowId";
-
-	/**
-	 * By default clients can send the key of a flow execution to be resumed using an argument with this name
-	 * ("_flowExecutionKey").
-	 */
-	private static final String FLOW_EXECUTION_KEY_ARGUMENT_NAME = "_flowExecutionKey";
-
-	/**
-	 * By default clients can send the event to be signaled in an argument with this name ("_eventId").
-	 */
-	private static final String EVENT_ID_ARGUMENT_NAME = "_eventId";
-
-	/**
-	 * Identifies a flow definition to launch a new execution for, defaults to {@link #FLOW_ID_ARGUMENT_NAME}.
-	 */
-	private String flowIdArgumentName = FLOW_ID_ARGUMENT_NAME;
-
-	/**
-	 * Input argument that identifies an existing flow execution to participate in, defaults to
-	 * {@link #FLOW_EXECUTION_KEY_ARGUMENT_NAME}.
-	 */
-	private String flowExecutionKeyArgumentName = FLOW_EXECUTION_KEY_ARGUMENT_NAME;
-
-	/**
-	 * Identifies an event that occured in an existing flow execution, defaults to {@link #EVENT_ID_ARGUMENT_NAME}.
-	 */
-	private String eventIdArgumentName = EVENT_ID_ARGUMENT_NAME;
-
-	/**
-	 * The flow definition id to use if no flowId argument value can be extracted during the
-	 * {@link #extractFlowId(ExternalContext)} operation. Default value is null.
-	 */
-	private String defaultFlowId;
-
-	/**
-	 * Returns the flow id argument name, used to request a flow to launch.
-	 */
-	public String getFlowIdArgumentName() {
-		return flowIdArgumentName;
-	}
-
-	/**
-	 * Sets the flow id argument name, used to request a flow to launch.
-	 */
-	public void setFlowIdArgumentName(String flowIdArgumentName) {
-		this.flowIdArgumentName = flowIdArgumentName;
-	}
-
-	/**
-	 * Returns the flow execution key argument name, used to request that an executing conversation resumes.
-	 */
-	public String getFlowExecutionKeyArgumentName() {
-		return flowExecutionKeyArgumentName;
-	}
-
-	/**
-	 * Sets the flow execution key argument name, used to request that an executing conversation resumes.
-	 */
-	public void setFlowExecutionKeyArgumentName(String flowExecutionKeyArgumentName) {
-		this.flowExecutionKeyArgumentName = flowExecutionKeyArgumentName;
-	}
-
-	/**
-	 * Returns the event id argument name, used to signal what user action happened within a paused flow execution.
-	 */
-	public String getEventIdArgumentName() {
-		return eventIdArgumentName;
-	}
-
-	/**
-	 * Sets the event id argument name, used to signal what user action happened within a paused flow execution.
-	 */
-	public void setEventIdArgumentName(String eventIdArgumentName) {
-		this.eventIdArgumentName = eventIdArgumentName;
-	}
-
-	/**
-	 * Returns the default flowId argument value. If no flow id argument is provided, the default acts as a
-	 * fallback. Defaults to null.
-	 */
-	public String getDefaultFlowId() {
-		return defaultFlowId;
-	}
-
-	/**
-	 * Sets the default flowId argument value.
-	 * 
      
-	 * This value will be used if no flowId argument value can be extracted from the request by the
-	 * {@link #extractFlowId(ExternalContext)} operation.
-	 */
-	public void setDefaultFlowId(String defaultFlowId) {
-		this.defaultFlowId = defaultFlowId;
-	}
-
-	// data and behavior for response issuance
-
-	/**
-	 * The string-encoded id of the flow execution will be exposed to the view in a model attribute with this name
-	 * ("flowExecutionKey").
-	 */
-	private static final String FLOW_EXECUTION_KEY_ATTRIBUTE = "flowExecutionKey";
-
-	/**
-	 * The flow execution context itself will be exposed to the view in a model attribute with this name
-	 * ("flowExecutionContext").
-	 */
-	private static final String FLOW_EXECUTION_CONTEXT_ATTRIBUTE = "flowExecutionContext";
-
-	/**
-	 * The default URL encoding scheme: UTF-8.
-	 */
-	private static final String DEFAULT_URL_ENCODING_SCHEME = "UTF-8";
-
-	/**
-	 * Model attribute that identifies the flow execution participated in, defaults to
-	 * {@link #FLOW_EXECUTION_KEY_ATTRIBUTE}.
-	 */
-	private String flowExecutionKeyAttributeName = FLOW_EXECUTION_KEY_ATTRIBUTE;
-
-	/**
-	 * Model attribute that provides state about the flow execution participated in, defaults to
-	 * {@link #FLOW_EXECUTION_CONTEXT_ATTRIBUTE}.
-	 */
-	private String flowExecutionContextAttributeName = FLOW_EXECUTION_CONTEXT_ATTRIBUTE;
-
-	/**
-	 * The url encoding scheme to be used to encode URLs built by this argument handler. Defaults to
-	 * {@link #DEFAULT_URL_ENCODING_SCHEME}.
-	 */
-	private String urlEncodingScheme = DEFAULT_URL_ENCODING_SCHEME;
-
-	/**
-	 * A flag indicating whether to interpret a redirect URL that starts with a slash ("/") as relative to the current
-	 * ServletContext, i.e. as relative to the web application root, as opposed to absolute. Default is true.
-	 */
-	private boolean redirectContextRelative = true;
-
-	/**
-	 * Returns the flow execution key attribute name, used as a model attribute for identifying the executing flow being
-	 * participated in.
-	 */
-	public String getFlowExecutionKeyAttributeName() {
-		return flowExecutionKeyAttributeName;
-	}
-
-	/**
-	 * Sets the flow execution key attribute name, used as a model attribute for identifying the current state of the
-	 * executing flow being participated in (typically used by view templates during rendering).
-	 */
-	public void setFlowExecutionKeyAttributeName(String flowExecutionKeyAttributeName) {
-		this.flowExecutionKeyAttributeName = flowExecutionKeyAttributeName;
-	}
-
-	/**
-	 * Returns the flow execution context attribute name.
-	 */
-	public String getFlowExecutionContextAttributeName() {
-		return flowExecutionContextAttributeName;
-	}
-
-	/**
-	 * Sets the flow execution context attribute name.
-	 */
-	public void setFlowExecutionContextAttributeName(String flowExecutionContextAttributeName) {
-		this.flowExecutionContextAttributeName = flowExecutionContextAttributeName;
-	}
-
-	/**
-	 * Returns the url encoding scheme to be used to encode URLs built by this argument handler. Defaults to "UTF-8".
-	 */
-	public String getUrlEncodingScheme() {
-		return urlEncodingScheme;
-	}
-
-	/**
-	 * Set the url encoding scheme to be used to encode URLs built by this argument handler. Defaults to "UTF-8".
-	 */
-	public void setUrlEncodingScheme(String urlEncodingScheme) {
-		this.urlEncodingScheme = urlEncodingScheme;
-	}
-
-	/**
-	 * Set whether to interpret a given redirect URL that starts with a slash ("/") as relative to the current
-	 * ServletContext, i.e. as relative to the web application root.
-	 * 
      
-	 * Default is "true": A redirect URL that starts with a slash will be interpreted as relative to the web application
-	 * root, i.e. the context path will be prepended to the URL.
-	 */
-	public void setRedirectContextRelative(boolean redirectContextRelative) {
-		this.redirectContextRelative = redirectContextRelative;
-	}
-
-	/**
-	 * Return whether to interpret a given redirect URL that starts with a slash ("/") as relative to the current
-	 * ServletContext, i.e. as relative to the web application root.
-	 */
-	public boolean isRedirectContextRelative() {
-		return redirectContextRelative;
-	}
-
-	public abstract boolean isFlowIdPresent(ExternalContext context);
-
-	public abstract String extractFlowId(ExternalContext context) throws FlowExecutorArgumentExtractionException;
-
-	public abstract boolean isFlowExecutionKeyPresent(ExternalContext context);
-
-	public abstract String extractFlowExecutionKey(ExternalContext context)
-			throws FlowExecutorArgumentExtractionException;
-
-	public abstract boolean isEventIdPresent(ExternalContext context);
-
-	public abstract String extractEventId(ExternalContext context) throws FlowExecutorArgumentExtractionException;
-
-	public void exposeFlowExecutionContext(String flowExecutionKey, FlowExecutionContext context, Map model) {
-		if (flowExecutionKey != null) {
-			model.put(getFlowExecutionKeyAttributeName(), flowExecutionKey);
-		}
-		model.put(getFlowExecutionContextAttributeName(), context);
-	}
-
-	public abstract String createFlowDefinitionUrl(FlowDefinitionRedirect flowDefinitionRedirect,
-			ExternalContext context);
-
-	public abstract String createFlowExecutionUrl(String flowExecutionKey, FlowExecutionContext flowExecution,
-			ExternalContext context);
-
-	public abstract String createExternalUrl(ExternalRedirect redirect, String flowExecutionKey, ExternalContext context);
-
-	// helpers for use in subclasses
-
-	/**
-	 * Apply the configured default flow id to given extracted flow id.
-	 * @param extractedFlowId the extracted flow id, could be null if non was available in the external context
-	 * @return the extracted flow id if not empty, the default flow id otherwise (which could still be null if not set)
-	 * @see #getDefaultFlowId()
-	 */
-	protected String applyDefaultFlowId(String extractedFlowId) {
-		return StringUtils.hasText(extractedFlowId) ? extractedFlowId : getDefaultFlowId();
-	}
-
-	/**
-	 * URL-encode the given input object with the configured encoding scheme.
-	 * @param value the unencoded value
-	 * @return the encoded output String
-	 * @see #getUrlEncodingScheme()
-	 */
-	protected String encodeValue(Object value) {
-		return value != null ? urlEncode(value.toString()) : "";
-	}
-
-	/**
-	 * Make given redirect URL context relative if necessary. If the URL starts with a slash ("/") it will be made
-	 * relative to the current ServletContext, i.e. relative to the web application root.
-	 * @param url the original URL
-	 * @param context the external context
-	 * @return the processed URL
-	 * @see #isRedirectContextRelative()
-	 */
-	protected String makeRedirectUrlContextRelativeIfNecessary(String url, ExternalContext context) {
-		StringBuffer res = new StringBuffer();
-		if (url.startsWith("/") && isRedirectContextRelative()) {
-			res.append(context.getContextPath());
-		}
-		res.append(url);
-		return res.toString();
-	}
-
-	// internal helpers
-
-	/**
-	 * URL-encode the given input String with the configured encoding scheme.
-	 * 
      
-	 * Default implementation uses URLEncoder.encode(input, enc) on JDK 1.4+, falling back to
-	 * URLEncoder.encode(input) (which uses the platform default encoding) on JDK 1.3.
-	 * @param input the unencoded input String
-	 * @return the encoded output String
-	 */
-	private String urlEncode(String input) {
-		if (JdkVersion.getMajorJavaVersion() < JdkVersion.JAVA_14) {
-			return URLEncoder.encode(input);
-		}
-		try {
-			return URLEncoder.encode(input, getUrlEncodingScheme());
-		} catch (UnsupportedEncodingException e) {
-			throw new IllegalArgumentException("Cannot encode URL " + input);
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapper.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapper.java
deleted file mode 100644
index 4aaa0177..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapper.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import java.util.Enumeration;
-import java.util.Properties;
-
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.execution.FlowExecutionContext;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-
-/**
- * Flow executor argument handler that wraps another argument handler and applies a public to private flow id mapping.
- * This can be used to avoid literal flow ids in URLs that launch flows.
- * 
      
- * For example, when used in combination with {@link RequestPathFlowExecutorArgumentHandler} the url
- * http://localhost/springair/reservation/booking.html would launch a new execution of the
- * booking-flow flow, assuming a context path of /springair, a servlet mapping of
- * /reservation/* and a flow id mapping of booking->booking-flow (the .html suffix
- * would be removed by {@link RequestPathFlowExecutorArgumentHandler#extractFlowId(ExternalContext)}.
- * 
- * @see RequestParameterFlowExecutorArgumentHandler
- * @see RequestPathFlowExecutorArgumentHandler
- * 
- * @since 1.0.2
- * 
- * @author Andrej Zachar
- * @author Erwin Vervaet
- */
-public class FlowIdMappingArgumentHandlerWrapper extends FlowExecutorArgumentHandler {
-
-	/**
-	 * The mappings between client-submitted flow identifiers and internal flow identifiers.
-	 */
-	private Properties mappings = new Properties();
-
-	/**
-	 * The reverse: mappings between internal flow identifiers and client-submitted flow identifiers.
-	 */
-	private Properties reverseMappings = new Properties();
-
-	/**
-	 * Whether or not to fallback to the argument handler delegate if no mapping is found.
-	 */
-	private boolean fallback = true;
-
-	/**
-	 * The argument handler delegate this handler wraps.
-	 */
-	private FlowExecutorArgumentHandler argumentHandler;
-
-	/**
-	 * Default constructor for bean style usage.
-	 * @see #setArgumentHandler(FlowExecutorArgumentHandler)
-	 * @see #setMappings(Properties)
-	 * @see #setFallback(boolean)
-	 */
-	public FlowIdMappingArgumentHandlerWrapper() {
-	}
-
-	/**
-	 * Returns the wrapped argument handler.
-	 */
-	public FlowExecutorArgumentHandler getArgumentHandler() {
-		return argumentHandler;
-	}
-
-	/**
-	 * Set the wrapped argument handler.
-	 */
-	public void setArgumentHandler(FlowExecutorArgumentHandler argumentHandler) {
-		this.argumentHandler = argumentHandler;
-	}
-
-	/**
-	 * Returns the public-to-private flow id mappings in use.
-	 */
-	protected Properties getMappings() {
-		return mappings;
-	}
-
-	/**
-	 * Set the mappings between client-submitted flow identifiers and internal flow identifiers. Overwrites any previous
-	 * mappings.
-	 * @param mappings the public to private flow id mappings
-	 */
-	public void setMappings(Properties mappings) {
-		for (Enumeration publicFlowIds = mappings.propertyNames(); publicFlowIds.hasMoreElements();) {
-			String publicId = (String) publicFlowIds.nextElement();
-			String privateId = mappings.getProperty(publicId);
-			addMapping(publicId, privateId);
-		}
-	}
-
-	/**
-	 * Add a flow id mapping, overwriting any previous mapping for the same flow ids.
-	 * @param publicFlowId how the flow will be identified publically (to web clients)
-	 * @param privateFlowId how the flow is identified internally (in the flow definition registry)
-	 */
-	public void addMapping(String publicFlowId, String privateFlowId) {
-		mappings.setProperty(publicFlowId, privateFlowId);
-		reverseMappings.setProperty(privateFlowId, publicFlowId);
-	}
-
-	/**
-	 * Should we fall back to the flow id extracted by the wrapped argument handler if no mapping is defined for a flow
-	 * id? Default is true.
-	 */
-	public boolean isFallback() {
-		return fallback;
-	}
-
-	/**
-	 * Set whether or not to fall back on the flow id extracted by the wrapped argument handler if no mapping is defined
-	 * for a flow id. Default is true. When false an exception is thrown when there is a mapping failure.
-	 */
-	public void setFallback(boolean fallback) {
-		this.fallback = fallback;
-	}
-
-	public boolean isFlowIdPresent(ExternalContext context) {
-		if (argumentHandler.isFlowIdPresent(context)) {
-			return fallback || mappings.containsKey(argumentHandler.extractFlowId(context));
-		} else {
-			return false;
-		}
-	}
-
-	public String extractFlowId(ExternalContext context) throws FlowExecutorArgumentExtractionException {
-		String publicFlowId = argumentHandler.extractFlowId(context);
-		String flowId = mappings.getProperty(publicFlowId);
-		if (!StringUtils.hasText(flowId)) {
-			if (fallback) {
-				flowId = publicFlowId;
-			} else {
-				throw new FlowExecutorArgumentExtractionException("Unable to extract flow definition id: "
-						+ "no mapping was defined for '" + publicFlowId + "'");
-			}
-		}
-		return flowId;
-	}
-
-	public boolean isFlowExecutionKeyPresent(ExternalContext context) {
-		return argumentHandler.isFlowExecutionKeyPresent(context);
-	}
-
-	public String extractFlowExecutionKey(ExternalContext context) throws FlowExecutorArgumentExtractionException {
-		return argumentHandler.extractFlowExecutionKey(context);
-	}
-
-	public boolean isEventIdPresent(ExternalContext context) {
-		return argumentHandler.isEventIdPresent(context);
-	}
-
-	public String extractEventId(ExternalContext context) throws FlowExecutorArgumentExtractionException {
-		return argumentHandler.extractEventId(context);
-	}
-
-	public String createFlowDefinitionUrl(FlowDefinitionRedirect flowDefinitionRedirect, ExternalContext context) {
-		// do reverse mapping
-		String publicFlowId = reverseMappings.getProperty(flowDefinitionRedirect.getFlowDefinitionId());
-		if (!StringUtils.hasText(publicFlowId)) {
-			if (fallback) {
-				publicFlowId = flowDefinitionRedirect.getFlowDefinitionId();
-			} else {
-				// this is a mapping problem
-				throw new IllegalArgumentException("Unable to create a flow definition URL for '"
-						+ flowDefinitionRedirect + "': no reverse mapping was defined for flow id '"
-						+ flowDefinitionRedirect.getFlowDefinitionId() + "'");
-			}
-		}
-		flowDefinitionRedirect = new FlowDefinitionRedirect(publicFlowId, flowDefinitionRedirect.getExecutionInput());
-		return argumentHandler.createFlowDefinitionUrl(flowDefinitionRedirect, context);
-	}
-
-	public String createFlowExecutionUrl(String flowExecutionKey, FlowExecutionContext flowExecution,
-			ExternalContext context) {
-		return argumentHandler.createFlowExecutionUrl(flowExecutionKey, flowExecution, context);
-	}
-
-	public String createExternalUrl(ExternalRedirect redirect, String flowExecutionKey, ExternalContext context) {
-		return argumentHandler.createExternalUrl(redirect, flowExecutionKey, context);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowRequestHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowRequestHandler.java
deleted file mode 100644
index 59709987..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/FlowRequestHandler.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.util.Assert;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.core.FlowException;
-import org.springframework.webflow.executor.FlowExecutor;
-import org.springframework.webflow.executor.ResponseInstruction;
-
-/**
- * An immutable helper for flow controllers that encapsulates reusable workflow required to launch and resume flow
- * executions using a {@link FlowExecutor}.
- * 
      
- * The {@link #handleFlowRequest(ExternalContext)} method is the central helper operation and implements the following
- * algorithm:
- * 
        
- * 
      1. Extract the flow execution id by calling
- * {@link FlowExecutorArgumentExtractor#extractFlowExecutionKey(ExternalContext)}.
- * 
      2. If a valid flow execution id was extracted, signal an event in that existing execution to resume it. The event
- * to signal is determined by calling the {@link FlowExecutorArgumentExtractor#extractEventId(ExternalContext)} method.
- * If no event can be extracted, the existing execution will be refreshed.
- * 
      3. If no flow execution id was extracted, launch a new flow execution. The top-level flow definition for which an
- * execution is created is determined by extracting the flow id using the method
- * {@link FlowExecutorArgumentExtractor#extractFlowId(ExternalContext)}. If no valid flow id can be determined, an
- * exception is thrown.
- * 
      
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class FlowRequestHandler {
-
-	/**
-	 * Logger.
-	 */
-	private static final Log logger = LogFactory.getLog(FlowRequestHandler.class);
-
-	/**
-	 * The flow executor this helper will coordinate with.
-	 */
-	private FlowExecutor flowExecutor;
-
-	/**
-	 * A helper for extracting arguments of flow executor operations from the external context.
-	 */
-	private FlowExecutorArgumentExtractor argumentExtractor;
-
-	/**
-	 * Creates a new flow controller helper. Will use the default {@link RequestParameterFlowExecutorArgumentHandler}.
-	 * @param flowExecutor the flow execution manager to delegate to
-	 */
-	public FlowRequestHandler(FlowExecutor flowExecutor) {
-		this(flowExecutor, new RequestParameterFlowExecutorArgumentHandler());
-	}
-
-	/**
-	 * Creates a new flow controller helper.
-	 * @param flowExecutor the flow executor to delegate to
-	 * @param argumentExtractor the flow executor argument extractor to use
-	 */
-	public FlowRequestHandler(FlowExecutor flowExecutor, FlowExecutorArgumentExtractor argumentExtractor) {
-		Assert.notNull(flowExecutor, "The flow executor is required");
-		Assert.notNull(argumentExtractor, "The flow executor argument extractor is required");
-		this.flowExecutor = flowExecutor;
-		this.argumentExtractor = argumentExtractor;
-	}
-
-	/**
-	 * Returns the flow executor used by this helper.
-	 */
-	public FlowExecutor getFlowExecutor() {
-		return flowExecutor;
-	}
-
-	/**
-	 * Returns the flow executor argument extractor used by this helper.
-	 */
-	public FlowExecutorArgumentExtractor getArgumentExtractor() {
-		return argumentExtractor;
-	}
-
-	/**
-	 * Handle a request into the Spring Web Flow system from an external system.
-	 * @param context the external context in which the request occured
-	 * @return the selected view that should be rendered as a response
-	 */
-	public ResponseInstruction handleFlowRequest(ExternalContext context) throws FlowException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Request initiated by " + context);
-		}
-		if (argumentExtractor.isFlowExecutionKeyPresent(context)) {
-			String flowExecutionKey = argumentExtractor.extractFlowExecutionKey(context);
-			if (argumentExtractor.isEventIdPresent(context)) {
-				String eventId = argumentExtractor.extractEventId(context);
-				ResponseInstruction response = flowExecutor.resume(flowExecutionKey, eventId, context);
-				if (logger.isDebugEnabled()) {
-					logger.debug("Returning [resume] " + response);
-				}
-				return response;
-			} else {
-				ResponseInstruction response = flowExecutor.refresh(flowExecutionKey, context);
-				if (logger.isDebugEnabled()) {
-					logger.debug("Returning [refresh] " + response);
-				}
-				return response;
-			}
-		} else {
-			String flowDefinitionId = argumentExtractor.extractFlowId(context);
-			ResponseInstruction response = flowExecutor.launch(flowDefinitionId, context);
-			if (logger.isDebugEnabled()) {
-				logger.debug("Returning [launch] " + response);
-			}
-			return response;
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/RequestParameterFlowExecutorArgumentHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/RequestParameterFlowExecutorArgumentHandler.java
deleted file mode 100644
index 619f136f..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/RequestParameterFlowExecutorArgumentHandler.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.springframework.core.style.StylerUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.core.collection.ParameterMap;
-import org.springframework.webflow.execution.FlowExecutionContext;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.executor.FlowExecutor;
-
-/**
- * Default {@link FlowExecutor} argument handler that extracts flow executor method arguments from the
- * {@link ExternalContext#getRequestParameterMap()} and exposes arguments as URL encoded request parameters.
- * 
- * @author Keith Donald
- * @author Erwin Vervaet
- */
-public class RequestParameterFlowExecutorArgumentHandler extends FlowExecutorArgumentHandler {
-
-	/**
-	 * The default delimiter used when a parameter value is encoded as part of the name of a parameter, e.g.
-	 * "_eventId_submit" ("_").
-	 * 
      
-	 * This form is typically used to support multiple HTML buttons on a form without resorting to Javascript to
-	 * communicate the event that corresponds to a button.
-	 */
-	private static final String PARAMETER_VALUE_DELIMITER = "_";
-
-	/**
-	 * The embedded parameter name/value delimiter, used to parse a parameter value when a value is embedded in a
-	 * parameter name (e.g. "_eventId_submit"). Defaults to {@link #PARAMETER_VALUE_DELIMITER}.
-	 */
-	private String parameterValueDelimiter = PARAMETER_VALUE_DELIMITER;
-
-	/**
-	 * Returns the delimiter used to parse a parameter value when a value is embedded in a parameter name (e.g.
-	 * "_eventId_submit"). Defaults to "_".
-	 */
-	public String getParameterValueDelimiter() {
-		return parameterValueDelimiter;
-	}
-
-	/**
-	 * Set the delimiter used to parse a parameter value when a value is embedded in a parameter name (e.g.
-	 * "_eventId_submit").
-	 */
-	public void setParameterValueDelimiter(String parameterValueDelimiter) {
-		this.parameterValueDelimiter = parameterValueDelimiter;
-	}
-
-	public boolean isFlowIdPresent(ExternalContext context) {
-		return context.getRequestParameterMap().contains(getFlowIdArgumentName());
-	}
-
-	public String extractFlowId(ExternalContext context) throws FlowExecutorArgumentExtractionException {
-		String flowId = context.getRequestParameterMap().get(getFlowIdArgumentName());
-		flowId = applyDefaultFlowId(flowId);
-		if (!StringUtils.hasText(flowId)) {
-			throw new FlowExecutorArgumentExtractionException(
-					"Unable to extract the flow definition id parameter: make sure the client provides the '"
-							+ getFlowIdArgumentName() + "' parameter as input or set the 'defaultFlowId' property; "
-							+ "the parameters provided in this request are: "
-							+ StylerUtils.style(context.getRequestParameterMap()));
-		}
-		return flowId;
-	}
-
-	public boolean isFlowExecutionKeyPresent(ExternalContext context) {
-		return context.getRequestParameterMap().contains(getFlowExecutionKeyArgumentName());
-	}
-
-	public String extractFlowExecutionKey(ExternalContext context) throws FlowExecutorArgumentExtractionException {
-		String encodedKey = context.getRequestParameterMap().get(getFlowExecutionKeyArgumentName());
-		if (!StringUtils.hasText(encodedKey)) {
-			throw new FlowExecutorArgumentExtractionException(
-					"Unable to extract the flow execution key parameter: make sure the client provides the '"
-							+ getFlowExecutionKeyArgumentName()
-							+ "' parameter as input; the parameters provided in this request are: "
-							+ StylerUtils.style(context.getRequestParameterMap()));
-		}
-		return encodedKey;
-	}
-
-	public boolean isEventIdPresent(ExternalContext context) {
-		return StringUtils.hasText(findParameter(getEventIdArgumentName(), context.getRequestParameterMap()));
-	}
-
-	public String extractEventId(ExternalContext context) throws FlowExecutorArgumentExtractionException {
-		String eventId = findParameter(getEventIdArgumentName(), context.getRequestParameterMap());
-		if (!StringUtils.hasText(eventId)) {
-			throw new FlowExecutorArgumentExtractionException(
-					"Unable to extract the event id parameter: make sure the client provides the '"
-							+ getEventIdArgumentName() + "' parameter as input along with the '"
-							+ getFlowExecutionKeyArgumentName()
-							+ "' parameter; the parameters provided in this request are: "
-							+ StylerUtils.style(context.getRequestParameterMap()));
-		}
-		return eventId;
-	}
-
-	/**
-	 * Obtain a named parameter from the request parameters. This method will try to obtain a parameter value using the
-	 * following algorithm:
-	 * 
        
-	 * 
      1. Try to get the parameter value using just the given logical name. This handles parameters of the
-	 * form logicalName = value. For normal parameters, e.g. submitted using a hidden HTML form field, this
-	 * will return the requested value.
        2. 
-	 * 
      2. Try to obtain the parameter value from the parameter name, where the parameter name in the request is of the
-	 * form logicalName_value = xyz with "_" being the configured delimiter. This deals with parameter values
-	 * submitted using an HTML form submit button.
        3. 
-	 * 
      3. If the value obtained in the previous step has a ".x" or ".y" suffix, remove that. This handles cases where
-	 * the value was submitted using an HTML form image button. In this case the parameter in the request would actually
-	 * be of the form logicalName_value.x = 123. 
        4. 
-	 * 
      
-	 * @param logicalParameterName the logical name of the request parameter
-	 * @param parameters the available parameter map
-	 * @return the value of the parameter, or null if the parameter does not exist in given request
-	 */
-	protected String findParameter(String logicalParameterName, ParameterMap parameters) {
-		// first try to get it as a normal name=value parameter
-		String value = parameters.get(logicalParameterName);
-		if (value != null) {
-			return value;
-		}
-		// if no value yet, try to get it as a name_value=xyz parameter
-		String prefix = logicalParameterName + getParameterValueDelimiter();
-		Iterator paramNames = parameters.asMap().keySet().iterator();
-		while (paramNames.hasNext()) {
-			String paramName = (String) paramNames.next();
-			if (paramName.startsWith(prefix)) {
-				String strValue = paramName.substring(prefix.length());
-				// support images buttons, which would submit parameters as
-				// name_value.x=123
-				if (strValue.endsWith(".x") || strValue.endsWith(".y")) {
-					strValue = strValue.substring(0, strValue.length() - 2);
-				}
-				return strValue;
-			}
-		}
-		// we couldn't find the parameter value
-		return null;
-	}
-
-	public String createFlowDefinitionUrl(FlowDefinitionRedirect flowDefinitionRedirect, ExternalContext context) {
-		StringBuffer url = new StringBuffer();
-		appendFlowExecutorPath(url, context);
-		url.append('?');
-		appendQueryParameter(url, getFlowIdArgumentName(), flowDefinitionRedirect.getFlowDefinitionId());
-		if (!flowDefinitionRedirect.getExecutionInput().isEmpty()) {
-			url.append('&');
-		}
-		appendQueryParameters(url, flowDefinitionRedirect.getExecutionInput());
-		return url.toString();
-	}
-
-	public String createFlowExecutionUrl(String flowExecutionKey, FlowExecutionContext flowExecution,
-			ExternalContext context) {
-		StringBuffer url = new StringBuffer();
-		appendFlowExecutorPath(url, context);
-		url.append('?');
-		appendQueryParameter(url, getFlowExecutionKeyArgumentName(), flowExecutionKey);
-		return url.toString();
-	}
-
-	public String createExternalUrl(ExternalRedirect redirect, String flowExecutionKey, ExternalContext context) {
-		StringBuffer externalUrl = new StringBuffer();
-		externalUrl.append(makeRedirectUrlContextRelativeIfNecessary(redirect.getUrl(), context));
-		if (flowExecutionKey != null) {
-			boolean first = redirect.getUrl().indexOf('?') < 0;
-			if (first) {
-				externalUrl.append('?');
-			} else {
-				externalUrl.append('&');
-			}
-			appendQueryParameter(externalUrl, getFlowExecutionKeyArgumentName(), flowExecutionKey);
-		}
-		return externalUrl.toString();
-	}
-
-	// helpers
-
-	/**
-	 * Append the URL path to the flow executor capable of accepting new requests.
-	 * @param url the url buffer to append to
-	 * @param context the context of this request
-	 */
-	protected void appendFlowExecutorPath(StringBuffer url, ExternalContext context) {
-		url.append(context.getContextPath());
-		url.append(context.getDispatcherPath());
-		if (context.getRequestPathInfo() != null) {
-			url.append(context.getRequestPathInfo());
-		}
-	}
-
-	/**
-	 * Append query parameters to the redirect URL. Stringifies, URL-encodes and formats model attributes as query
-	 * parameters.
-	 * @param url the StringBuffer to append the parameters to
-	 * @param parameters Map that contains attributes
-	 */
-	protected void appendQueryParameters(StringBuffer url, Map parameters) {
-		Iterator entries = parameters.entrySet().iterator();
-		while (entries.hasNext()) {
-			Map.Entry entry = (Map.Entry) entries.next();
-			appendQueryParameter(url, entry.getKey(), entry.getValue());
-			if (entries.hasNext()) {
-				url.append('&');
-			}
-		}
-	}
-
-	/**
-	 * Appends a single query parameter to a URL.
-	 * @param url the target url to append to
-	 * @param key the parameter name
-	 * @param value the parameter value
-	 */
-	protected void appendQueryParameter(StringBuffer url, Object key, Object value) {
-		String encodedKey = encodeValue(key);
-		String encodedValue = encodeValue(value);
-		url.append(encodedKey).append('=').append(encodedValue);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/RequestPathFlowExecutorArgumentHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/RequestPathFlowExecutorArgumentHandler.java
deleted file mode 100644
index 7f89ea47..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/RequestPathFlowExecutorArgumentHandler.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import org.springframework.util.StringUtils;
-import org.springframework.web.util.WebUtils;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.context.servlet.ServletExternalContext;
-import org.springframework.webflow.execution.FlowExecutionContext;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-
-/**
- * Flow executor argument handler that extracts arguments from the request path and exposes them in the URL path.
- * 
      
- * This allows for REST-style URLs to launch flows in the general format:
- * http://${host}/${context path}/${dispatcher path}/${flowId}.
- * 
      
- * For example, the URL http://localhost/springair/reservation/booking would launch a new execution of
- * the booking flow, assuming a context path of /springair and a servlet mapping of
- * /reservation/*.
- * 
      
- * This also allows for URLs to resume flow executions in the format:
- * http://${host}/${context path}/${dispatcher path}/${key delimiter}/${flowExecutionKey}.
- * 
      
- * For example, the URL http://localhost/springair/reservation/k/ABC123XYZ would resume flow execution
- * "ABC123XYZ".
- * 
      
- * Note: this implementation only works with ExternalContext implementations that return valid
- * {@link ExternalContext#getRequestPathInfo()} such as the {@link ServletExternalContext}. Furthermore, it assumes
- * that the controller handling flow requests is not identified using request path information. For instance, mapping
- * the dispatcher to "*.html" in web.xml would work since in this case the flow controller will be identified as part of
- * the dispatcher name (e.g. "flows.html"). Mapping the dispatcher to "/html/*" in web.xml will not work since that
- * would require the flow controller to be identified by the extra request path information (e.g. "/html/flows").
- * 
- * @author Keith Donald
- */
-public class RequestPathFlowExecutorArgumentHandler extends RequestParameterFlowExecutorArgumentHandler {
-
-	/**
-	 * URL path separator ("/").
-	 */
-	private static final char PATH_SEPARATOR_CHARACTER = '/';
-
-	/**
-	 * Default value of the flow execution key delimiter ("k").
-	 */
-	private static final String KEY_DELIMITER = "k";
-
-	/**
-	 * The delimiter that when present in the requestPathInfo indicates the flowExecutionKey follows in the URL.
-	 * Defaults to {@link #KEY_DELIMITER}.
-	 */
-	private String keyDelimiter = KEY_DELIMITER;
-
-	/**
-	 * Returns the key delimiter. Defaults to "k".
-	 * @return the key delimiter
-	 */
-	public String getKeyDelimiter() {
-		return keyDelimiter;
-	}
-
-	/**
-	 * Sets the delimiter that when present in the requestPathInfo indicates the flowExecutionKey follows in the URL.
-	 * Defaults to "k".
-	 * @param keyDelimiter the key delimiter
-	 * @see #extractFlowExecutionKey(ExternalContext)
-	 */
-	public void setKeyDelimiter(String keyDelimiter) {
-		this.keyDelimiter = keyDelimiter;
-	}
-
-	public boolean isFlowIdPresent(ExternalContext context) {
-		String requestPathInfo = getRequestPathInfo(context);
-		boolean hasFileName = StringUtils.hasText(WebUtils.extractFilenameFromUrlPath(requestPathInfo));
-		return hasFileName || super.isFlowIdPresent(context);
-	}
-
-	public String extractFlowId(ExternalContext context) {
-		String requestPathInfo = getRequestPathInfo(context);
-		String extractedFilename = WebUtils.extractFilenameFromUrlPath(requestPathInfo);
-		return StringUtils.hasText(extractedFilename) ? extractedFilename : super.extractFlowId(context);
-	}
-
-	public boolean isFlowExecutionKeyPresent(ExternalContext context) {
-		String requestPathInfo = getRequestPathInfo(context);
-		return requestPathInfo.startsWith(keyPath()) || super.isFlowExecutionKeyPresent(context);
-	}
-
-	public String extractFlowExecutionKey(ExternalContext context) throws FlowExecutorArgumentExtractionException {
-		String requestPathInfo = getRequestPathInfo(context);
-		int index = requestPathInfo.indexOf(keyPath());
-		if (index != -1) {
-			return requestPathInfo.substring(index + keyPath().length());
-		} else {
-			return super.extractFlowExecutionKey(context);
-		}
-	}
-
-	public String createFlowDefinitionUrl(FlowDefinitionRedirect flowDefinitionRedirect, ExternalContext context) {
-		StringBuffer flowUrl = new StringBuffer();
-		appendFlowExecutorPath(flowUrl, context);
-		flowUrl.append(PATH_SEPARATOR_CHARACTER);
-		flowUrl.append(flowDefinitionRedirect.getFlowDefinitionId());
-		if (!flowDefinitionRedirect.getExecutionInput().isEmpty()) {
-			flowUrl.append('?');
-			appendQueryParameters(flowUrl, flowDefinitionRedirect.getExecutionInput());
-		}
-		return flowUrl.toString();
-	}
-
-	public String createFlowExecutionUrl(String flowExecutionKey, FlowExecutionContext flowExecution,
-			ExternalContext context) {
-		StringBuffer flowExecutionUrl = new StringBuffer();
-		appendFlowExecutorPath(flowExecutionUrl, context);
-		flowExecutionUrl.append(PATH_SEPARATOR_CHARACTER);
-		flowExecutionUrl.append(keyDelimiter);
-		flowExecutionUrl.append(PATH_SEPARATOR_CHARACTER);
-		flowExecutionUrl.append(flowExecutionKey);
-		return flowExecutionUrl.toString();
-	}
-
-	// internal helpers
-
-	protected void appendFlowExecutorPath(StringBuffer url, ExternalContext context) {
-		url.append(context.getContextPath());
-		url.append(context.getDispatcherPath());
-	}
-
-	/**
-	 * Returns the request path info for given external context. Never returns null, an empty string is returned
-	 * instead.
-	 */
-	private String getRequestPathInfo(ExternalContext context) {
-		String requestPathInfo = context.getRequestPathInfo();
-		return requestPathInfo != null ? requestPathInfo : "";
-	}
-
-	/**
-	 * Returns the flow execution key path in the request path info, e.g. "/k/".
-	 */
-	private String keyPath() {
-		return PATH_SEPARATOR_CHARACTER + keyDelimiter + PATH_SEPARATOR_CHARACTER;
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/ResponseInstructionHandler.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/ResponseInstructionHandler.java
deleted file mode 100644
index 9808cd4a..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/ResponseInstructionHandler.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- * 
- * 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.springframework.webflow.executor.support;
-
-import org.springframework.core.NestedRuntimeException;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.executor.ResponseInstruction;
-
-/**
- * Abstract helper class that allows easy handling of all known view selection types. Users need to implement each of
- * the hook methods dealing with a particular type of view selection, typically in an anonymous inner subclass of this
- * class.
- * 
- * @see ViewSelection
- * 
- * @since 1.0.2
- * 
- * @author Erwin Vervaet
- */
-public abstract class ResponseInstructionHandler {
-
-	private Object result;
-
-	/**
-	 * Set the object resulting from response handling. This is optional.
-	 * @param result the result object
-	 */
-	public void setResult(Object result) {
-		this.result = result;
-	}
-
-	/**
-	 * Returns the object resulting from response handling. This is optional and will only be set if the subclass calls
-	 * {@link #setResult(Object)} to set the result object.
-	 * @return the result object, or null if none
-	 */
-	public Object getResult() {
-		return result;
-	}
-
-	/**
-	 * Issue a response for given response instruction. Will delegate to any of the available hook methods depending on
-	 * the type of view selection contained in the response instruction.
-	 * @param responseInstruction the response instruction to issue a response for
-	 * @return this object, for call chaining
-	 * @throws Exception when an error occured
-	 */
-	public final ResponseInstructionHandler handle(ResponseInstruction responseInstruction) throws Exception {
-		if (responseInstruction.isApplicationView()) {
-			handleApplicationView((ApplicationView) responseInstruction.getViewSelection());
-		} else if (responseInstruction.isFlowDefinitionRedirect()) {
-			handleFlowDefinitionRedirect((FlowDefinitionRedirect) responseInstruction.getViewSelection());
-		} else if (responseInstruction.isFlowExecutionRedirect()) {
-			handleFlowExecutionRedirect((FlowExecutionRedirect) responseInstruction.getViewSelection());
-		} else if (responseInstruction.isExternalRedirect()) {
-			handleExternalRedirect((ExternalRedirect) responseInstruction.getViewSelection());
-		} else if (responseInstruction.isNull()) {
-			handleNull();
-		} else {
-			throw new IllegalArgumentException("Don't know how to handle response instruction " + responseInstruction);
-		}
-		return this;
-	}
-
-	/**
-	 * Quietly issue a response for given response instruction, turning any Exception raised while handling the response
-	 * instruction into a RuntimeException. Will delegate to any of the available hook methods depending on the type of
-	 * view selection contained in the response instruction.
-	 * @param responseInstruction the response instruction to issue a response for
-	 * @return this object, for call chaining
-	 */
-	public final ResponseInstructionHandler handleQuietly(ResponseInstruction responseInstruction) {
-		try {
-			return handle(responseInstruction);
-		} catch (Exception e) {
-			throw new RuntimeResponseHandlingException("Unexpected exception handling response instruction "
-					+ responseInstruction + "", e);
-		}
-	}
-
-	// template methods
-
-	/**
-	 * Issue a response for given application view.
-	 * @param view the application view to issue a response for
-	 * @throws Exception when an error occured
-	 * @see ResponseInstruction#isActiveView()
-	 * @see ApplicationView
-	 */
-	protected abstract void handleApplicationView(ApplicationView view) throws Exception;
-
-	/**
-	 * Issue a response for given flow definition redirect.
-	 * @param redirect the flow definition redirect to issue a response for
-	 * @throws Exception when an error occured
-	 * @see ResponseInstruction#isFlowDefinitionRedirect()
-	 * @see FlowDefinitionRedirect
-	 */
-	protected abstract void handleFlowDefinitionRedirect(FlowDefinitionRedirect redirect) throws Exception;
-
-	/**
-	 * Issue a response for given flow execution redirect.
-	 * @param redirect the flow execution redirect to issue a response for
-	 * @throws Exception when an error occured
-	 * @see ResponseInstruction#isFlowExecutionRedirect()
-	 * @see FlowExecutionRedirect
-	 */
-	protected abstract void handleFlowExecutionRedirect(FlowExecutionRedirect redirect) throws Exception;
-
-	/**
-	 * Issue a response for given external redirect.
-	 * @param redirect the external redirect to issue a response for
-	 * @throws Exception when an error occured
-	 * @see ResponseInstruction#isExternalRedirect()
-	 * @see ExternalRedirect
-	 */
-	protected abstract void handleExternalRedirect(ExternalRedirect redirect) throws Exception;
-
-	/**
-	 * Issue a respone for the null view selection.
-	 * @throws Exception
-	 * @see ResponseInstruction#isNull()
-	 * @see ViewSelection#NULL_VIEW
-	 */
-	protected abstract void handleNull() throws Exception;
-
-	/**
-	 * Thrown during handleQuietly.
-	 * @author Keith Donald
-	 */
-	public static class RuntimeResponseHandlingException extends NestedRuntimeException {
-		public RuntimeResponseHandlingException(String message, Throwable cause) {
-			super(message, cause);
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/package.html b/spring-webflow/src/main/java/org/springframework/webflow/executor/support/package.html
deleted file mode 100644
index e54673e3..00000000
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/support/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-Flow executor implementation support; includes helpers for driving the execution of flows.
-
-
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/persistence/HibernateFlowExecutionListener.java b/spring-webflow/src/main/java/org/springframework/webflow/persistence/HibernateFlowExecutionListener.java
index ca2f7c7e..4dc4e349 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/persistence/HibernateFlowExecutionListener.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/persistence/HibernateFlowExecutionListener.java
@@ -26,13 +26,13 @@ import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
 import org.springframework.webflow.execution.FlowSession;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A {@link FlowExecutionListener} that implements the Flow Managed Persistence Context (FMPC) pattern using the native
@@ -103,7 +103,7 @@ public class HibernateFlowExecutionListener extends FlowExecutionListenerAdapter
 		this.entityInterceptor = entityInterceptor;
 	}
 
-	public void sessionCreated(RequestContext context, FlowSession session) {
+	public void sessionStarting(RequestContext context, FlowSession session, MutableAttributeMap input) {
 		if (isPersistenceContext(session.getDefinition())) {
 			Session hibernateSession = createSession(context);
 			session.getScope().put(HIBERNATE_SESSION_ATTRIBUTE, hibernateSession);
@@ -111,15 +111,15 @@ public class HibernateFlowExecutionListener extends FlowExecutionListenerAdapter
 		}
 	}
 
-	public void resumed(RequestContext context) {
+	public void paused(RequestContext context) {
 		if (isPersistenceContext(context.getActiveFlow())) {
-			bind(getHibernateSession(context));
+			unbind(getHibernateSession(context));
 		}
 	}
 
-	public void paused(RequestContext context, ViewSelection selectedView) {
+	public void resuming(RequestContext context) {
 		if (isPersistenceContext(context.getActiveFlow())) {
-			unbind(getHibernateSession(context));
+			bind(getHibernateSession(context));
 		}
 	}
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/persistence/JpaFlowExecutionListener.java b/spring-webflow/src/main/java/org/springframework/webflow/persistence/JpaFlowExecutionListener.java
index c762e35e..d387128c 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/persistence/JpaFlowExecutionListener.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/persistence/JpaFlowExecutionListener.java
@@ -25,13 +25,13 @@ import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.transaction.support.TransactionTemplate;
 import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
 import org.springframework.webflow.execution.FlowSession;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * A {@link FlowExecutionListener} that implements the Flow Managed Persistence Context (FMPC) pattern using the
@@ -93,7 +93,7 @@ public class JpaFlowExecutionListener extends FlowExecutionListenerAdapter {
 		this.transactionTemplate = new TransactionTemplate(transactionManager);
 	}
 
-	public void sessionCreated(RequestContext context, FlowSession session) {
+	public void sessionStarting(RequestContext context, FlowSession session, MutableAttributeMap input) {
 		if (isPersistenceContext(session.getDefinition())) {
 			EntityManager em = entityManagerFactory.createEntityManager();
 			session.getScope().put(ENTITY_MANAGER_ATTRIBUTE, em);
@@ -101,15 +101,15 @@ public class JpaFlowExecutionListener extends FlowExecutionListenerAdapter {
 		}
 	}
 
-	public void resumed(RequestContext context) {
+	public void paused(RequestContext context) {
 		if (isPersistenceContext(context.getActiveFlow())) {
-			bind(getEntityManager(context));
+			unbind(getEntityManager(context));
 		}
 	}
 
-	public void paused(RequestContext context, ViewSelection selectedView) {
+	public void resuming(RequestContext context) {
 		if (isPersistenceContext(context.getActiveFlow())) {
-			unbind(getEntityManager(context));
+			bind(getEntityManager(context));
 		}
 	}
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/servlet/SpringWebServlet.java b/spring-webflow/src/main/java/org/springframework/webflow/servlet/SpringWebServlet.java
new file mode 100644
index 00000000..27702ae7
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/servlet/SpringWebServlet.java
@@ -0,0 +1,74 @@
+package org.springframework.webflow.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+import org.springframework.util.StringUtils;
+import org.springframework.web.context.ConfigurableWebApplicationContext;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.XmlWebApplicationContext;
+import org.springframework.webflow.context.servlet.ServletExternalContext;
+import org.springframework.webflow.executor.FlowExecutor;
+
+public class SpringWebServlet implements Servlet {
+
+	private ServletConfig config;
+
+	private ConfigurableWebApplicationContext container;
+
+	private FlowExecutor flowExecutor;
+
+	public void init(ServletConfig config) throws ServletException {
+		this.config = config;
+		container = new XmlWebApplicationContext();
+		container.setConfigLocations(getConfigLocations(config));
+		container.setServletConfig(config);
+		container.setServletContext(config.getServletContext());
+		container.refresh();
+		this.flowExecutor = getFlowExecutor(container);
+	}
+
+	public ServletConfig getServletConfig() {
+		return config;
+	}
+
+	public String getServletInfo() {
+		return "Spring Web Servlet";
+	}
+
+	public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
+		ServletContext servletContext = getServletConfig().getServletContext();
+		new ServletExternalContext(servletContext, request, response).executeFlowRequest(flowExecutor);
+	}
+
+	public void destroy() {
+		container.close();
+	}
+
+	private String[] getConfigLocations(ServletConfig config) {
+		String configLocations = config.getInitParameter("configLocations");
+		if (configLocations != null) {
+			return StringUtils.tokenizeToStringArray(config.getInitParameter("configLocations"),
+					ConfigurableWebApplicationContext.CONFIG_LOCATION_DELIMITERS);
+		} else {
+			return new String[] { "/WEB-INF/webapp-config.xml" };
+		}
+	}
+
+	private FlowExecutor getFlowExecutor(WebApplicationContext container) {
+		String[] beanNames = container.getBeanNamesForType(FlowExecutor.class);
+		if (beanNames.length == 0) {
+			throw new IllegalStateException("No bean of type FlowExecutor defined in context");
+		} else if (beanNames.length > 1) {
+			throw new IllegalStateException("More than one bean of type FlowExecutor defined in context.");
+		} else {
+			return (FlowExecutor) container.getBean(beanNames[0]);
+		}
+	}
+}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/FlowBuilderSystemDefaults.java b/spring-webflow/src/main/java/org/springframework/webflow/test/FlowBuilderSystemDefaults.java
new file mode 100644
index 00000000..36618d68
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/FlowBuilderSystemDefaults.java
@@ -0,0 +1,42 @@
+package org.springframework.webflow.test;
+
+import org.springframework.beans.factory.support.StaticListableBeanFactory;
+import org.springframework.binding.convert.support.DefaultConversionService;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.webflow.action.BeanInvokingActionFactory;
+import org.springframework.webflow.core.expression.DefaultExpressionParserFactory;
+import org.springframework.webflow.engine.builder.FlowArtifactFactory;
+import org.springframework.webflow.engine.builder.support.FlowBuilderServices;
+
+class FlowBuilderSystemDefaults {
+	private FlowBuilderServices defaultServices;
+
+	public FlowBuilderSystemDefaults() {
+		defaultServices = new FlowBuilderServices();
+		defaultServices.setFlowArtifactFactory(new FlowArtifactFactory());
+		defaultServices.setBeanInvokingActionFactory(new BeanInvokingActionFactory());
+		defaultServices.setConversionService(new DefaultConversionService());
+		defaultServices.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser());
+		defaultServices.setResourceLoader(new DefaultResourceLoader());
+		defaultServices.setBeanFactory(new StaticListableBeanFactory());
+	}
+
+	public FlowBuilderServices createBuilderServices() {
+		FlowBuilderServices builderServices = new FlowBuilderServices();
+		applyDefaults(builderServices);
+		return builderServices;
+	}
+
+	public void applyDefaults(FlowBuilderServices services) {
+		services.setFlowArtifactFactory(defaultServices.getFlowArtifactFactory());
+		services.setBeanInvokingActionFactory(defaultServices.getBeanInvokingActionFactory());
+		services.setConversionService(defaultServices.getConversionService());
+		services.setExpressionParser(defaultServices.getExpressionParser());
+		services.setResourceLoader(defaultServices.getResourceLoader());
+		services.setBeanFactory(defaultServices.getBeanFactory());
+	}
+
+	public static FlowBuilderServices get() {
+		return new FlowBuilderSystemDefaults().createBuilderServices();
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockExternalContext.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockExternalContext.java
index ce965778..6f13a480 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/MockExternalContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockExternalContext.java
@@ -15,10 +15,15 @@
  */
 package org.springframework.webflow.test;
 
+import java.io.PrintWriter;
 import java.util.HashMap;
 
 import org.springframework.binding.collection.SharedMapDecorator;
 import org.springframework.webflow.context.ExternalContext;
+import org.springframework.webflow.context.FlowDefinitionRequestInfo;
+import org.springframework.webflow.context.FlowExecutionRequestInfo;
+import org.springframework.webflow.context.RequestPath;
+import org.springframework.webflow.core.FlowException;
 import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.LocalSharedAttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
@@ -34,11 +39,13 @@ import org.springframework.webflow.core.collection.SharedAttributeMap;
  */
 public class MockExternalContext implements ExternalContext {
 
-	private String contextPath;
+	private String flowId;
 
-	private String dispatcherPath;
+	private String flowExecutionKey;
 
-	private String requestPathInfo;
+	private RequestPath requestPath;
+
+	private String requestMethod;
 
 	private ParameterMap requestParameterMap = new MockParameterMap();
 
@@ -50,6 +57,22 @@ public class MockExternalContext implements ExternalContext {
 
 	private SharedAttributeMap applicationMap = new LocalSharedAttributeMap(new SharedMapDecorator(new HashMap()));
 
+	private Object context;
+
+	private Object request;
+
+	private Object response;
+
+	private FlowDefinitionRequestInfo flowDefinitionRedirectResult;
+
+	private FlowExecutionRequestInfo flowExecutionRedirectResult;
+
+	private String externalRedirectResult;
+
+	private String pausedFlowExecutionKeyResult;
+
+	private FlowException exceptionResult;
+
 	/**
 	 * Creates a mock external context with an empty request parameter map. Allows for bean style usage.
 	 */
@@ -69,16 +92,20 @@ public class MockExternalContext implements ExternalContext {
 
 	// implementing external context
 
-	public String getContextPath() {
-		return contextPath;
+	public String getFlowId() {
+		return flowId;
 	}
 
-	public String getDispatcherPath() {
-		return dispatcherPath;
+	public String getFlowExecutionKey() {
+		return flowExecutionKey;
 	}
 
-	public String getRequestPathInfo() {
-		return requestPathInfo;
+	public String getRequestMethod() {
+		return requestMethod;
+	}
+
+	public RequestPath getRequestPath() {
+		return requestPath;
 	}
 
 	public ParameterMap getRequestParameterMap() {
@@ -103,28 +130,20 @@ public class MockExternalContext implements ExternalContext {
 
 	// helper setters
 
-	/**
-	 * Set the context path.
-	 * @see ExternalContext#getContextPath()
-	 */
-	public void setContextPath(String contextPath) {
-		this.contextPath = contextPath;
+	public void setFlowId(String flowId) {
+		this.flowId = flowId;
 	}
 
-	/**
-	 * Set the dispatcher path.
-	 * @see ExternalContext#getDispatcherPath()
-	 */
-	public void setDispatcherPath(String dispatcherPath) {
-		this.dispatcherPath = dispatcherPath;
+	public void setFlowExecutionKey(String flowExecutionKey) {
+		this.flowExecutionKey = flowExecutionKey;
 	}
 
-	/**
-	 * Set the request path info.
-	 * @see ExternalContext#getRequestPathInfo()
-	 */
-	public void setRequestPathInfo(String requestPathInfo) {
-		this.requestPathInfo = requestPathInfo;
+	public void setRequestMethod(String requestMethod) {
+		this.requestMethod = requestMethod;
+	}
+
+	public void setRequestPath(RequestPath requestPath) {
+		this.requestPath = requestPath;
 	}
 
 	/**
@@ -195,4 +214,86 @@ public class MockExternalContext implements ExternalContext {
 	public void putRequestParameter(String parameterName, String[] parameterValues) {
 		getMockRequestParameterMap().put(parameterName, parameterValues);
 	}
+
+	public Object getContext() {
+		return context;
+	}
+
+	public Object getRequest() {
+		return request;
+	}
+
+	public Object getResponse() {
+		return response;
+	}
+
+	public PrintWriter getResponseWriter() {
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public String encode(String string) {
+		return string;
+	}
+
+	public String buildFlowDefinitionUrl(FlowDefinitionRequestInfo requestInfo) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public String buildFlowExecutionUrl(FlowExecutionRequestInfo requestInfo, boolean contextRelative) {
+		// TODO Auto-generated method stub
+		throw new UnsupportedOperationException("Auto-generated method stub");
+	}
+
+	public void sendFlowDefinitionRedirect(FlowDefinitionRequestInfo requestInfo) {
+		this.flowDefinitionRedirectResult = requestInfo;
+	}
+
+	public void sendFlowExecutionRedirect(FlowExecutionRequestInfo requestInfo) {
+		this.flowExecutionRedirectResult = requestInfo;
+	}
+
+	public void sendExternalRedirect(String resourceUri) {
+		externalRedirectResult = resourceUri;
+	}
+
+	public void setPausedResult(String flowExecutionKey) {
+		this.pausedFlowExecutionKeyResult = flowExecutionKey;
+	}
+
+	public void setEndedResult(String flowExecutionKey) {
+
+	}
+
+	public void setExceptionResult(FlowException e) {
+		exceptionResult = e;
+	}
+
+	public FlowDefinitionRequestInfo getFlowDefinitionRedirectResult() {
+		return flowDefinitionRedirectResult;
+	}
+
+	public FlowExecutionRequestInfo getFlowExecutionRedirectResult() {
+		return flowExecutionRedirectResult;
+	}
+
+	public String getExternalRedirectResult() {
+		return externalRedirectResult;
+	}
+
+	public String getPausedFlowExecutionKeyResult() {
+		return pausedFlowExecutionKeyResult;
+	}
+
+	public FlowException getExceptionResult() {
+		return exceptionResult;
+	}
+
+	public boolean isResponseCommitted() {
+		return false;
+		/*
+		 * return flowExecutionRedirectResult == true || flowDefinitionRedirectResult != null || externalRedirectResult !=
+		 * null;
+		 */
+	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowServiceLocator.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowBuilderContext.java
similarity index 77%
rename from spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowServiceLocator.java
rename to spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowBuilderContext.java
index 3515846f..a3f1f514 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowServiceLocator.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowBuilderContext.java
@@ -17,10 +17,11 @@ package org.springframework.webflow.test;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.support.StaticListableBeanFactory;
+import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.core.collection.CollectionUtils;
 import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
 import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.builder.DefaultFlowServiceLocator;
+import org.springframework.webflow.engine.builder.support.FlowBuilderContextImpl;
 
 /**
  * A stub flow service locator implementation suitable for a test environment.
@@ -35,13 +36,20 @@ import org.springframework.webflow.engine.builder.DefaultFlowServiceLocator;
  * 
  * @author Keith Donald
  */
-public class MockFlowServiceLocator extends DefaultFlowServiceLocator {
+public class MockFlowBuilderContext extends FlowBuilderContextImpl {
 
 	/**
 	 * Creates a new mock flow service locator.
 	 */
-	public MockFlowServiceLocator() {
-		super(new FlowDefinitionRegistryImpl(), new StaticListableBeanFactory());
+	public MockFlowBuilderContext(String flowId) {
+		this(flowId, CollectionUtils.EMPTY_ATTRIBUTE_MAP);
+	}
+
+	/**
+	 * Creates a new mock flow service locator.
+	 */
+	public MockFlowBuilderContext(String flowId, AttributeMap attributes) {
+		super(flowId, attributes, new FlowDefinitionRegistryImpl(), FlowBuilderSystemDefaults.get());
 	}
 
 	/**
@@ -50,7 +58,7 @@ public class MockFlowServiceLocator extends DefaultFlowServiceLocator {
 	 * @param subflow the subflow
 	 */
 	public void registerSubflow(Flow subflow) {
-		getSubflowRegistry().registerFlowDefinition(new StaticFlowDefinitionHolder(subflow));
+		((FlowDefinitionRegistryImpl) getFlowDefinitionLocator()).registerFlowDefinition(subflow);
 	}
 
 	/**
@@ -63,4 +71,5 @@ public class MockFlowServiceLocator extends DefaultFlowServiceLocator {
 	public void registerBean(String beanName, Object bean) {
 		((StaticListableBeanFactory) getBeanFactory()).addBean(beanName, bean);
 	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionContext.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionContext.java
index b5076783..efb529eb 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionContext.java
@@ -21,6 +21,7 @@ import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.execution.FlowExecutionContext;
+import org.springframework.webflow.execution.FlowExecutionKey;
 import org.springframework.webflow.execution.FlowSession;
 
 /**
@@ -32,6 +33,8 @@ import org.springframework.webflow.execution.FlowSession;
  */
 public class MockFlowExecutionContext implements FlowExecutionContext {
 
+	private FlowExecutionKey key;
+
 	private FlowDefinition flow;
 
 	private FlowSession activeSession;
@@ -54,13 +57,24 @@ public class MockFlowExecutionContext implements FlowExecutionContext {
 	/**
 	 * Creates a new mock flow execution context for the specified root flow definition.
 	 */
-	public MockFlowExecutionContext(Flow rootFlow) {
-		this.flow = rootFlow;
-		activeSession = new MockFlowSession(rootFlow);
+	public MockFlowExecutionContext(Flow flow) {
+		this(new MockFlowSession(flow));
+	}
+
+	/**
+	 * Creates a new mock flow execution context for the specified active flow session.
+	 */
+	public MockFlowExecutionContext(FlowSession flowSession) {
+		this.flow = flowSession.getDefinition();
+		this.activeSession = flowSession;
+	}
+
+	public FlowExecutionKey getKey() {
+		return key;
 	}
 
 	public String getCaption() {
-		return "Mock flow execution context";
+		return flow.getCaption();
 	}
 
 	// implementing flow execution context
@@ -69,6 +83,10 @@ public class MockFlowExecutionContext implements FlowExecutionContext {
 		return flow;
 	}
 
+	public boolean hasStarted() {
+		return isActive();
+	}
+
 	public boolean isActive() {
 		return activeSession != null;
 	}
@@ -101,6 +119,13 @@ public class MockFlowExecutionContext implements FlowExecutionContext {
 		this.flow = rootFlow;
 	}
 
+	/**
+	 * Sets the flow execution key
+	 */
+	public void setKey(FlowExecutionKey key) {
+		this.key = key;
+	}
+
 	/**
 	 * Sets the mock session to be the active session.
 	 */
@@ -147,4 +172,5 @@ public class MockFlowExecutionContext implements FlowExecutionContext {
 	public void putAttribute(String attributeName, Object attributeValue) {
 		attributes.put(attributeName, attributeValue);
 	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionKey.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionKey.java
new file mode 100644
index 00000000..11e0ecd8
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionKey.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.test;
+
+import org.springframework.webflow.execution.FlowExecutionKey;
+
+/**
+ * A simple flow execution key implementation. New instances of this class get their values from a sequence encapsulated
+ * as a stativ private variable of this class.
+ * 
+ * @author Keith Donald
+ */
+public class MockFlowExecutionKey extends FlowExecutionKey {
+
+	private static int nextKey = 1;
+
+	private int value;
+
+	/**
+	 * Creates a new mock flow execution key.
+	 */
+	public MockFlowExecutionKey() {
+		this.value = nextKey();
+	}
+
+	public boolean equals(Object o) {
+		if (!(o instanceof MockFlowExecutionKey)) {
+			return false;
+		}
+		MockFlowExecutionKey key = (MockFlowExecutionKey) o;
+		return value == key.value;
+	}
+
+	public int hashCode() {
+		return value * 29;
+	}
+
+	public String toString() {
+		return String.valueOf(value);
+	}
+
+	private static int nextKey() {
+		int key = nextKey;
+		nextKey++;
+		return key;
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionKeyFactory.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionKeyFactory.java
new file mode 100644
index 00000000..4b94e3a9
--- /dev/null
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowExecutionKeyFactory.java
@@ -0,0 +1,17 @@
+package org.springframework.webflow.test;
+
+import org.springframework.webflow.execution.FlowExecution;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
+
+/**
+ * Trivial flow execution key factory implementation that returns a mock flow execution key each time. The mock key
+ * returned is unique: its value is the result of incrementing a sequence managed in static memory.
+ * 
+ * @author Keith Donald
+ */
+public class MockFlowExecutionKeyFactory implements FlowExecutionKeyFactory {
+	public FlowExecutionKey getKey(FlowExecution execution) {
+		return new MockFlowExecutionKey();
+	}
+}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowSession.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowSession.java
index 09df213f..eefc3eef 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowSession.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockFlowSession.java
@@ -21,10 +21,10 @@ import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.definition.StateDefinition;
 import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.engine.RequestControlContext;
 import org.springframework.webflow.engine.State;
-import org.springframework.webflow.engine.ViewState;
+import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.FlowSession;
-import org.springframework.webflow.execution.FlowSessionStatus;
 
 /**
  * Mock implementation of the {@link FlowSession} interface.
@@ -39,8 +39,6 @@ public class MockFlowSession implements FlowSession {
 
 	private State state;
 
-	private FlowSessionStatus status = FlowSessionStatus.CREATED;
-
 	private MutableAttributeMap scope = new LocalAttributeMap();
 
 	private MutableAttributeMap flashMap = new LocalAttributeMap();
@@ -49,12 +47,14 @@ public class MockFlowSession implements FlowSession {
 
 	/**
 	 * Creates a new mock flow session that sets a flow with id "mockFlow" as the 'active flow' in state "mockState".
-	 * This session marks itself active.
 	 */
 	public MockFlowSession() {
 		setDefinition(new Flow("mockFlow"));
-		State state = new ViewState(definition, "mockState");
-		setStatus(FlowSessionStatus.ACTIVE);
+		State state = new State(definition, "mockState") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+				// nothing to do
+			}
+		};
 		setState(state);
 	}
 
@@ -66,7 +66,7 @@ public class MockFlowSession implements FlowSession {
 	}
 
 	/**
-	 * Creates a new mock session in {@link FlowSessionStatus#CREATED} state for the specified flow definition.
+	 * Creates a new mock session for the specified flow definition.
 	 * @param flow the flow definition for the session
 	 * @param input initial contents of 'flow scope'
 	 */
@@ -85,10 +85,6 @@ public class MockFlowSession implements FlowSession {
 		return state;
 	}
 
-	public FlowSessionStatus getStatus() {
-		return status;
-	}
-
 	public MutableAttributeMap getScope() {
 		return scope;
 	}
@@ -121,13 +117,6 @@ public class MockFlowSession implements FlowSession {
 		this.state = state;
 	}
 
-	/**
-	 * Set the status of this flow session.
-	 */
-	public void setStatus(FlowSessionStatus status) {
-		this.status = status;
-	}
-
 	/**
 	 * Set the scope data maintained by this flow session. This will be the flow scope data of the ongoing flow
 	 * execution.
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestContext.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestContext.java
index ac2b13f2..1d595675 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestContext.java
@@ -15,7 +15,11 @@
  */
 package org.springframework.webflow.test;
 
+import org.springframework.binding.message.DefaultMessageContextFactory;
+import org.springframework.binding.message.MessageContext;
+import org.springframework.context.support.StaticMessageSource;
 import org.springframework.webflow.context.ExternalContext;
+import org.springframework.webflow.context.FlowExecutionRequestInfo;
 import org.springframework.webflow.core.collection.AttributeMap;
 import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
@@ -42,9 +46,11 @@ import org.springframework.webflow.execution.RequestContext;
  */
 public class MockRequestContext implements RequestContext {
 
-	private FlowExecutionContext flowExecutionContext = new MockFlowExecutionContext();
+	private FlowExecutionContext flowExecutionContext;
 
-	private ExternalContext externalContext = new MockExternalContext();
+	private ExternalContext externalContext;
+
+	private MessageContext messageContext;
 
 	private MutableAttributeMap requestScope = new LocalAttributeMap();
 
@@ -55,37 +61,52 @@ public class MockRequestContext implements RequestContext {
 	private Transition lastTransition;
 
 	/**
-	 * Creates a new mock request context with the following defaults:
+	 * Convenience constructor that creates a new mock request context with the following defaults:
 	 * 
        
-	 * 
      • A flow execution context with a active session of flow "mockFlow" in state "mockState".
+	 * 
      • A mock flow execution context with a active session of flow "mockFlow" in state "mockState".
 	 * 
      • A mock external context with no request parameters set.
 	 * 
      
 	 * To add request parameters to this request, use the {@link #putRequestParameter(String, String)} method.
 	 */
 	public MockRequestContext() {
+		this(new MockFlowExecutionContext());
 	}
 
 	/**
-	 * Creates a new mock request context with the following defaults:
+	 * Convenience constructor that creates a new mock request context with the following defaults:
 	 * 
        
-	 * 
      • A flow execution context with an active session for the specified flow.
+	 * 
      • A mock flow execution context with an active session for the specified flow.
 	 * 
      • A mock external context with no request parameters set.
 	 * 
      
 	 * To add request parameters to this request, use the {@link #putRequestParameter(String, String)} method.
+	 * @param flow the flow definition
 	 */
 	public MockRequestContext(Flow flow) {
-		flowExecutionContext = new MockFlowExecutionContext(flow);
+		this(new MockFlowExecutionContext(flow));
 	}
 
 	/**
-	 * Creates a new mock request context with the following defaults:
+	 * Convenience constructor that creates a new mock request context with the following defaults:
 	 * 
        
-	 * 
      • A flow execution context with a active session of flow "mockFlow" in state "mockState".
+	 * 
      • A mock flow execution context with a active session of flow "mockFlow" in state "mockState".
 	 * 
      • A mock external context with the provided parameters set.
 	 * 
      
 	 */
 	public MockRequestContext(ParameterMap requestParameterMap) {
-		externalContext = new MockExternalContext(requestParameterMap);
+		this.flowExecutionContext = new MockFlowExecutionContext();
+		this.externalContext = new MockExternalContext(requestParameterMap);
+		this.messageContext = new DefaultMessageContextFactory(new StaticMessageSource()).createMessageContext();
+	}
+
+	/**
+	 * Creates a new mock request context with the provided flow execution context. To add request parameters to this
+	 * request, use the {@link #putRequestParameter(String, String)} method.
+	 * @param flowExecutionContext the flow execution context
+	 */
+	public MockRequestContext(FlowExecutionContext flowExecutionContext) {
+		this.flowExecutionContext = flowExecutionContext;
+		this.externalContext = new MockExternalContext();
+		this.messageContext = new DefaultMessageContextFactory(new StaticMessageSource()).createMessageContext();
 	}
 
 	// implementing RequestContext
@@ -118,6 +139,10 @@ public class MockRequestContext implements RequestContext {
 		return externalContext.getRequestParameterMap();
 	}
 
+	public MessageContext getMessageContext() {
+		return messageContext;
+	}
+
 	public ExternalContext getExternalContext() {
 		return externalContext;
 	}
@@ -142,8 +167,28 @@ public class MockRequestContext implements RequestContext {
 		this.attributes.replaceWith(attributes);
 	}
 
-	public AttributeMap getModel() {
-		return getConversationScope().union(getFlowScope()).union(getFlashScope()).union(getRequestScope());
+	public String getFlowExecutionUrl() {
+		if (flowExecutionContext.getKey() == null) {
+			throw new IllegalStateException(
+					"Flow execution key not yet assigned; unable to build the flow execution url");
+		} else {
+			String flowDefinitionId = flowExecutionContext.getDefinition().getId();
+			FlowExecutionRequestInfo requestInfo = new FlowExecutionRequestInfo(flowDefinitionId, flowExecutionContext
+					.getKey().toString());
+			return externalContext.buildFlowExecutionUrl(requestInfo, true);
+		}
+	}
+
+	public void sendFlowExecutionRedirect() {
+		if (flowExecutionContext.getKey() == null) {
+			throw new IllegalStateException(
+					"Flow execution key not yet assigned; unable to send a flow execution redirect request");
+		} else {
+			String flowDefinitionId = flowExecutionContext.getDefinition().getId();
+			FlowExecutionRequestInfo requestInfo = new FlowExecutionRequestInfo(flowDefinitionId, flowExecutionContext
+					.getKey().toString());
+			externalContext.sendFlowExecutionRedirect(requestInfo);
+		}
 	}
 
 	// mutators
@@ -246,4 +291,5 @@ public class MockRequestContext implements RequestContext {
 	public void putRequestParameter(String parameterName, String[] parameterValues) {
 		getMockExternalContext().putRequestParameter(parameterName, parameterValues);
 	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestControlContext.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestControlContext.java
index 9a1e0fc7..77905bc4 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestControlContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestControlContext.java
@@ -22,9 +22,9 @@ import org.springframework.webflow.engine.State;
 import org.springframework.webflow.engine.Transition;
 import org.springframework.webflow.engine.TransitionableState;
 import org.springframework.webflow.execution.Event;
+import org.springframework.webflow.execution.FlowExecutionContext;
+import org.springframework.webflow.execution.FlowExecutionKey;
 import org.springframework.webflow.execution.FlowSession;
-import org.springframework.webflow.execution.FlowSessionStatus;
-import org.springframework.webflow.execution.ViewSelection;
 
 /**
  * Mock implementation of the {@link RequestControlContext} interface to facilitate standalone Flow and State unit
@@ -38,45 +38,73 @@ import org.springframework.webflow.execution.ViewSelection;
  */
 public class MockRequestControlContext extends MockRequestContext implements RequestControlContext {
 
+	private boolean flowExecutionRedirectSent;
+
+	private boolean alwaysRedirectOnPause;
+
 	/**
 	 * Creates a new mock request control context for controlling a mock execution of the provided flow definition.
+	 * @param flow the flow definition
 	 */
-	public MockRequestControlContext(Flow rootFlow) {
-		super(rootFlow);
+	public MockRequestControlContext(Flow flow) {
+		super(flow);
+	}
+
+	/**
+	 * Creates a new mock request control context for controlling a flow execution.
+	 * @param flowExecutionContext the flow execution context
+	 */
+	public MockRequestControlContext(FlowExecutionContext flowExecutionContext) {
+		super(flowExecutionContext);
 	}
 
 	// implementing RequestControlContext
 
 	public void setCurrentState(State state) {
-		State previousState = (State) getCurrentState();
 		getMockFlowExecutionContext().getMockActiveSession().setState(state);
-		if (previousState == null) {
-			getMockFlowExecutionContext().getMockActiveSession().setStatus(FlowSessionStatus.ACTIVE);
+	}
+
+	public void start(Flow flow, MutableAttributeMap input) throws IllegalStateException {
+		MockFlowSession session = new MockFlowSession(flow, input);
+		if (getFlowExecutionContext().isActive()) {
+			session.setParent(getFlowExecutionContext().getActiveSession());
 		}
+		getMockFlowExecutionContext().setActiveSession(session);
+		flow.start(this, input);
 	}
 
-	public ViewSelection start(Flow flow, MutableAttributeMap input) throws IllegalStateException {
-		getMockFlowExecutionContext().setActiveSession(new MockFlowSession(flow, input));
-		getMockFlowExecutionContext().getMockActiveSession().setStatus(FlowSessionStatus.STARTING);
-		ViewSelection selectedView = flow.start(this, input);
-		return selectedView;
-	}
-
-	public ViewSelection signalEvent(Event event) {
+	public void handleEvent(Event event) {
 		setLastEvent(event);
-		ViewSelection selectedView = ((Flow) getActiveFlow()).onEvent(this);
-		return selectedView;
+		((Flow) getActiveFlow()).handleEvent(this);
 	}
 
 	public FlowSession endActiveFlowSession(MutableAttributeMap output) throws IllegalStateException {
 		MockFlowSession endingSession = getMockFlowExecutionContext().getMockActiveSession();
 		endingSession.getDefinitionInternal().end(this, output);
-		endingSession.setStatus(FlowSessionStatus.ENDED);
-		getMockFlowExecutionContext().setActiveSession(null);
+		getMockFlowExecutionContext().setActiveSession(endingSession.getParent());
 		return endingSession;
 	}
 
-	public ViewSelection execute(Transition transition) {
-		return transition.execute((TransitionableState) getCurrentState(), this);
+	public void execute(Transition transition) {
+		transition.execute((TransitionableState) getCurrentState(), this);
 	}
+
+	public FlowExecutionKey assignFlowExecutionKey() {
+		MockFlowExecutionKey key = new MockFlowExecutionKey();
+		getMockFlowExecutionContext().setKey(key);
+		return key;
+	}
+
+	public boolean getAlwaysRedirectOnPause() {
+		return alwaysRedirectOnPause;
+	}
+
+	public boolean getFlowExecutionRedirectSent() {
+		return this.flowExecutionRedirectSent;
+	}
+
+	public void setAlwaysRedirectOnPause(boolean alwaysRedirectOnPause) {
+		this.alwaysRedirectOnPause = alwaysRedirectOnPause;
+	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java
index 27965caa..2dbcef39 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractExternalizedFlowExecutionTests.java
@@ -15,21 +15,18 @@
  */
 package org.springframework.webflow.test.execution;
 
-import java.io.File;
-
-import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
+import org.springframework.webflow.config.FlowDefinitionResource;
 import org.springframework.webflow.core.collection.AttributeMap;
 import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.definition.registry.FlowDefinitionResource;
 import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.engine.builder.FlowAssembler;
 import org.springframework.webflow.engine.builder.FlowBuilder;
-import org.springframework.webflow.engine.builder.FlowServiceLocator;
+import org.springframework.webflow.engine.builder.FlowBuilderContext;
 import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
 import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
-import org.springframework.webflow.test.MockFlowServiceLocator;
+import org.springframework.webflow.test.MockFlowBuilderContext;
 
 /**
  * Base class for flow integration tests that verify an externalized flow definition executes as expected. Supports
@@ -91,8 +88,8 @@ public abstract class AbstractExternalizedFlowExecutionTests extends AbstractFlo
 	}
 
 	/**
-	 * Sets system attributes to be associated with the flow execution the next time one is {@link #startFlow() started}
-	 * by this test. Useful for assigning attributes that influence flow execution behavior.
+	 * Sets system attributes to be associated with the flow execution the next time one is started. by this test.
+	 * Useful for assigning attributes that influence flow execution behavior.
 	 * @param executionAttributes the system attributes to assign
 	 */
 	protected void setFlowExecutionAttributes(AttributeMap executionAttributes) {
@@ -100,8 +97,8 @@ public abstract class AbstractExternalizedFlowExecutionTests extends AbstractFlo
 	}
 
 	/**
-	 * Set a single listener to be attached to the flow execution the next time one is {@link #startFlow() started} by
-	 * this test. Useful for attaching a listener that does test assertions during the execution of the flow.
+	 * Set a single listener to be attached to the flow execution the next time one is started by this test. Useful for
+	 * attaching a listener that does test assertions during the execution of the flow.
 	 * @param executionListener the listener to attach
 	 */
 	protected void setFlowExecutionListener(FlowExecutionListener executionListener) {
@@ -110,10 +107,9 @@ public abstract class AbstractExternalizedFlowExecutionTests extends AbstractFlo
 	}
 
 	/**
-	 * Set the listeners to be attached to the flow execution the next time one is {@link #startFlow() started} by this
-	 * test. Useful for attaching listeners that do test assertions during the execution of the flow.
+	 * Set the listeners to be attached to the flow execution the next time one is started. by this test. Useful for
+	 * attaching listeners that do test assertions during the execution of the flow.
 	 * @param executionListeners the listeners to attach
-	 * @since 1.0.4
 	 */
 	protected void setFlowExecutionListeners(FlowExecutionListener[] executionListeners) {
 		getFlowExecutionImplFactory().setExecutionListenerLoader(
@@ -127,107 +123,58 @@ public abstract class AbstractExternalizedFlowExecutionTests extends AbstractFlo
 		if (isCacheFlowDefinition() && cachedFlowDefinition != null) {
 			return cachedFlowDefinition;
 		}
-		FlowServiceLocator flowServiceLocator = createFlowServiceLocator();
-		Flow flow = createFlow(getFlowDefinitionResource(), flowServiceLocator);
+		Flow flow = buildFlow();
 		if (isCacheFlowDefinition()) {
 			cachedFlowDefinition = flow;
 		}
 		return flow;
 	}
 
-	/**
-	 * Returns the flow service locator to use during flow definition construction time for accessing externally managed
-	 * flow artifacts such as actions and flows to be used as subflows.
-	 * 
      
-	 * This implementation just creates a {@link MockFlowServiceLocator} and populates it with services by calling
-	 * {@link #registerMockServices(MockFlowServiceLocator)}.
-	 * @return the flow artifact factory
-	 */
-	protected FlowServiceLocator createFlowServiceLocator() {
-		MockFlowServiceLocator serviceLocator = new MockFlowServiceLocator();
-		registerMockServices(serviceLocator);
-		return serviceLocator;
-	}
-
-	/**
-	 * Template method called by {@link #createFlowServiceLocator()} to allow registration of mock implementations of
-	 * services needed to test the flow execution. Useful when testing flow definitions in execution in isolation from
-	 * flows and middle-tier services. Subclasses may override.
-	 * @param serviceRegistry the mock service registry (and locator)
-	 */
-	protected void registerMockServices(MockFlowServiceLocator serviceRegistry) {
-	}
-
 	/**
 	 * Factory method to assemble a flow definition from a resource. Called by {@link #getFlowDefinition()} to create
 	 * the "main" flow to test. May also be called by subclasses to create subflow definitions whose executions should
 	 * also be exercised by this test.
-	 * @param resource the flow definition resource
 	 * @return the built flow definition, ready for execution
-	 * @see #createFlowBuilder(Resource, FlowServiceLocator)
 	 */
-	protected final Flow createFlow(FlowDefinitionResource resource, FlowServiceLocator serviceLocator) {
-		FlowBuilder builder = createFlowBuilder(resource.getLocation(), serviceLocator);
-		FlowAssembler assembler = new FlowAssembler(resource.getId(), resource.getAttributes(), builder);
+	protected final Flow buildFlow() {
+		FlowDefinitionResource resource = getFlowDefinitionResource();
+		FlowBuilderContext builderContext = createFlowBuilderContext(resource);
+		FlowBuilder builder = createFlowBuilder(resource.getPath());
+		FlowAssembler assembler = new FlowAssembler(builder, builderContext);
 		return assembler.assembleFlow();
 	}
 
 	/**
-	 * Returns the pointer to the resource that houses the definition of the flow to be tested. Subclasses must
-	 * implement.
-	 * 
      
-	 * Example usage:
-	 * 
-	 * 
      -	 * protected FlowDefinitionResource getFlowDefinitionResource() {
-	 * 	return createFlowDefinitionResource("/WEB-INF/flows/order-flow.xml");
-	 * }
-	 * 
      
-	 * 
+	 * Create the flow builder context to build the flow definition at the resource location provided.
+	 * @param resource the flow definition resource
+	 * @return the flow builder context
+	 */
+	protected FlowBuilderContext createFlowBuilderContext(FlowDefinitionResource resource) {
+		MockFlowBuilderContext builderContext = new MockFlowBuilderContext(resource.getId(), resource.getAttributes());
+		configure(builderContext);
+		return builderContext;
+	}
+
+	/**
+	 * Subclasses may override this hook to customize the builder context for the flow being tested. Useful for
+	 * registering mock subflows or other builder services.
+	 * @param builderContext the mock flow builder context.
+	 */
+	protected void configure(MockFlowBuilderContext builderContext) {
+
+	}
+
+	/**
+	 * Get the flow definition to be tested.
 	 * @return the flow definition resource
 	 */
 	protected abstract FlowDefinitionResource getFlowDefinitionResource();
 
 	/**
-	 * Factory method to create the builder that will build the flow definition whose execution will be tested.
-	 * Subclasses must implement.
-	 * 
      
-	 * A subclass may return a builder that sets up mock implementations of services needed locally by the flow
-	 * definition at runtime.
-	 * @param resource the externalized flow definition resource location
-	 * @param serviceLocator the flow service locator
-	 * @return the flow builder that will build the flow to be tested
+	 * Create the flow builder to build the flow at the specified resource location.
+	 * @param path the location of the flow definition
+	 * @return the flow builder that can build the flow definition
 	 */
-	protected abstract FlowBuilder createFlowBuilder(Resource resource, FlowServiceLocator serviceLocator);
+	protected abstract FlowBuilder createFlowBuilder(Resource path);
 
-	/**
-	 * Convenient factory method that creates a {@link FlowDefinitionResource} from a file path. Typically called by
-	 * subclasses overriding {@link #getFlowDefinitionResource()}.
-	 * @param filePath the full path to the externalized flow definition file
-	 * @return the flow definition resource
-	 */
-	protected final FlowDefinitionResource createFlowDefinitionResource(String filePath) {
-		return createFlowDefinitionResource(new File(filePath));
-	}
-
-	/**
-	 * Convenient factory method that creates a {@link FlowDefinitionResource} from a file in a directory. Typically
-	 * called by subclasses overriding {@link #getFlowDefinitionResource()}.
-	 * @param fileDirectory the directory containing the file
-	 * @param fileName the short file name
-	 * @return the flow definition resource pointing to the file
-	 */
-	protected final FlowDefinitionResource createFlowDefinitionResource(String fileDirectory, String fileName) {
-		return createFlowDefinitionResource(new File(fileDirectory, fileName));
-	}
-
-	/**
-	 * Convenient factory method that creates a {@link FlowDefinitionResource} from a file. Typically called by
-	 * subclasses overriding {@link #getFlowDefinitionResource()}.
-	 * @param file the file
-	 * @return the flow definition resource
-	 */
-	protected FlowDefinitionResource createFlowDefinitionResource(File file) {
-		return new FlowDefinitionResource(new FileSystemResource(file));
-	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java
index 28fe38a6..802a2fe9 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractFlowExecutionTests.java
@@ -15,44 +15,30 @@
  */
 package org.springframework.webflow.test.execution;
 
-import java.util.Collection;
-import java.util.Map;
-
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.core.style.StylerUtils;
 import org.springframework.util.Assert;
 import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.core.collection.ParameterMap;
 import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.FlowExecutionFactory;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.test.MockExternalContext;
 
 /**
  * Base class for integration tests that verify a flow executes as expected. Flow execution tests captured by subclasses
  * should test that a flow responds to all supported transition criteria correctly, transitioning to the correct states
- * and producing the expected results on the occurence of possible external (user) events.
+ * and producing the expected results on the occurrence of possible external (user) events.
  * 
      
  * More specifically, a typical flow execution test case will test:
  * 
        
  * 
      • That the flow execution starts as expected given a request from an external context containing potential input
- * attributes (see the {@link #startFlow(MutableAttributeMap, ExternalContext)} variants).
+ * attributes (see the {@link #startFlow(ExternalContext)} variants).
  * 
      • That given the set of supported state transition criteria a state executes the appropriate transition when a
- * matching event is signaled (with potential input request parameters, see the
- * {@link #signalEvent(String, ExternalContext)} variants). A test case should be coded for each logical event that can
- * occur, where an event drives a possible path through the flow. The goal should be to exercise all possible paths of
- * the flow. Use a test coverage tool like Clover or Emma to assist with measuring your test's effectiveness.
+ * matching event is signaled (with potential input request parameters, see the {@link #resumeFlow(ExternalContext)}
+ * variants). A test case should be coded for each logical event that can occur, where an event drives a possible path
+ * through the flow. The goal should be to exercise all possible paths of the flow. Use a test coverage tool like Clover
+ * or Emma to assist with measuring your test's effectiveness.
  * 
      • That given a transition that leads to an interactive state type (a view state or an end state) that the view
  * selection returned to the client matches what was expected and the current state of the flow matches what is
  * expected.
@@ -73,11 +59,6 @@ public abstract class AbstractFlowExecutionTests extends TestCase {
 	 */
 	private FlowExecutionFactory flowExecutionFactory;
 
-	/**
-	 * The expression parser for parsing evaluatable model attribute expressions.
-	 */
-	private ExpressionParser expressionParser = DefaultExpressionParserFactory.getExpressionParser();
-
 	/**
 	 * The flow execution running the flow when the test is active (runtime object).
 	 */
@@ -100,14 +81,6 @@ public abstract class AbstractFlowExecutionTests extends TestCase {
 		super(name);
 	}
 
-	/**
-	 * Set the expression parser responsible for parsing expression strings into evaluatable expression objects.
-	 */
-	public void setExpressionParser(ExpressionParser expressionParser) {
-		Assert.notNull(expressionParser, "The expression parser is required");
-		this.expressionParser = expressionParser;
-	}
-
 	/**
 	 * Gets the factory that will create the flow execution to test. This method will create the factory if it is not
 	 * already set.
@@ -121,152 +94,27 @@ public abstract class AbstractFlowExecutionTests extends TestCase {
 		return flowExecutionFactory;
 	}
 
-	/**
-	 * Creates an ExternalContext instance. Defaults to using {@link MockExternalContext}. Subclasses can override if
-	 * they which to use another external context implementation.
-	 * @param requestParameters request parameters to put into the external context (optional)
-	 * @return a new ExternalContext instance
-	 */
-	protected ExternalContext createExternalContext(ParameterMap requestParameters) {
-		return new MockExternalContext(requestParameters);
-	}
-
 	/**
 	 * Start the flow execution to be tested.
-	 * 
        
-	 * Convenience operation that starts the execution with:
-	 * 
          
-	 * 
        • no input attributes
-	 * 
        • an empty {@link ExternalContext} with no environmental request parameters set
-	 * 
        
-	 * @return the view selection made as a result of starting the flow (returned when the first interactive state (a
-	 * view state or end state) is entered)
-	 * @throws FlowExecutionException if an exception was thrown while starting the flow execution
-	 */
-	protected ViewSelection startFlow() throws FlowExecutionException {
-		return startFlow(null, createExternalContext(null));
-	}
-
-	/**
-	 * Start the flow execution to be tested.
-	 * 
        
-	 * Convenience operation that starts the execution with:
-	 * 
          
-	 * 
        • the specified input attributes, eligible for mapping by the root flow
-	 * 
        • an empty {@link ExternalContext} with no environmental request parameters set
-	 * 
        
-	 * @param input the flow execution input attributes eligible for mapping by the root flow
-	 * @return the view selection made as a result of starting the flow (returned when the first interactive state (a
-	 * view state or end state) is entered)
-	 * @throws FlowExecutionException if an exception was thrown while starting the flow execution
-	 */
-	protected ViewSelection startFlow(MutableAttributeMap input) throws FlowExecutionException {
-		return startFlow(input, createExternalContext(null));
-	}
-
-	/**
-	 * Start the flow execution to be tested.
-	 * 
        
-	 * This is the most flexible of the start methods. It allows you to specify:
-	 * 
          
-	 * 
        1. a map of input attributes to pass to the flow execution, eligible for mapping by the root flow definition
-	 * 
        2. an external context that provides the flow execution being tested access to the calling environment for this
-	 * request
-	 * 
        
-	 * @param input the flow execution input attributes eligible for mapping by the root flow
 	 * @param context the external context providing information about the caller's environment, used by the flow
 	 * execution during the start operation
-	 * @return the view selection made as a result of starting the flow (returned when the first interactive state (a
-	 * view state or end state) is entered)
 	 * @throws FlowExecutionException if an exception was thrown while starting the flow execution
 	 */
-	protected ViewSelection startFlow(MutableAttributeMap input, ExternalContext context) throws FlowExecutionException {
+	protected void startFlow(ExternalContext context) throws FlowExecutionException {
 		flowExecution = getFlowExecutionFactory().createFlowExecution(getFlowDefinition());
-		return flowExecution.start(input, context);
+		flowExecution.start(context);
 	}
 
 	/**
-	 * Signal an occurence of an event in the current state of the flow execution being tested.
-	 * @param eventId the event that occured
-	 * @throws FlowExecutionException if an exception was thrown within a state of the resumed flow execution during
-	 * event processing
-	 */
-	protected ViewSelection signalEvent(String eventId) throws FlowExecutionException {
-		return signalEvent(eventId, createExternalContext(null));
-	}
-
-	/**
-	 * Signal an occurence of an event in the current state of the flow execution being tested.
-	 * @param eventId the event that occured
-	 * @param requestParameters request parameters needed by the flow execution to complete event processing
-	 * @throws FlowExecutionException if an exception was thrown within a state of the resumed flow execution during
-	 * event processing
-	 */
-	protected ViewSelection signalEvent(String eventId, ParameterMap requestParameters) throws FlowExecutionException {
-		return signalEvent(eventId, createExternalContext(requestParameters));
-	}
-
-	/**
-	 * Signal an occurence of an event in the current state of the flow execution being tested.
-	 * 
        
-	 * Note: signaling an event will cause state transitions to occur in a chain until control is returned to the
-	 * caller. Control is returned once an "interactive" state type is entered: either a view state when the flow is
-	 * paused or an end state when the flow terminates. Action states are executed without returning control, as their
-	 * result always triggers another state transition, executed internally. Action states can also be executed in a
-	 * chain like fashion (e.g. action state 1 (result), action state 2 (result), action state 3 (result), view state
-	 * ).
-	 * 
        
-	 * If you wish to verify expected behavior on each state transition (and not just when the view state triggers
-	 * return of control back to the client), you have a few options:
-	 * 
        
-	 * First, you may implement standalone unit tests for your {@link org.springframework.webflow.execution.Action}
-	 * implementations. There you can verify that an Action executes its logic properly in isolation. When you do this,
-	 * you may mock or stub out services the Action implementation needs that are expensive to initialize. You can also
-	 * verify there that the action puts everything in the flow or request scope it was expected to (to meet its
-	 * contract with the view it is prepping for display, for example).
-	 * 
        
-	 * Second, you can attach one or more FlowExecutionListeners to the flow execution at start time within your test
-	 * code, which will allow you to receive a callback on each state transition (among other points). It is recommended
-	 * you extend {@link org.springframework.webflow.execution.FlowExecutionListenerAdapter} and only override the
-	 * callback methods you are interested in.
-	 * @param eventId the event that occured
+	 * Resume the flow execution to be tested.
 	 * @param context the external context providing information about the caller's environment, used by the flow
-	 * execution during the signal event operation
-	 * @return the view selection that was made, returned once control is returned to the client (occurs when the flow
-	 * enters a view state, or an end state)
-	 * @throws FlowExecutionException if an exception was thrown within a state of the resumed flow execution during
-	 * event processing
+	 * execution during the start operation
+	 * @throws FlowExecutionException if an exception was thrown while starting the flow execution
 	 */
-	protected ViewSelection signalEvent(String eventId, ExternalContext context) throws FlowExecutionException {
+	protected void resumeFlow(ExternalContext context) throws FlowExecutionException {
 		Assert.state(flowExecution != null, "The flow execution to test is [null]; "
 				+ "you must start the flow execution before you can signal an event against it!");
-		return flowExecution.signalEvent(eventId, context);
-	}
-
-	/**
-	 * Refresh the flow execution being tested, asking the current view state to make a "refresh" view selection. This
-	 * is idempotent operation that may be safely called on an active but currently paused execution. Used to simulate a
-	 * browser flow execution redirect.
-	 * @return the current view selection for this flow execution
-	 * @throws FlowExecutionException if an exception was thrown during refresh
-	 */
-	protected ViewSelection refresh() throws FlowExecutionException {
-		return refresh(createExternalContext(null));
-	}
-
-	/**
-	 * Refresh the flow execution being tested, asking the current view state state to make a "refresh" view selection.
-	 * This is idempotent operation that may be safely called on an active but currently paused execution. Used to
-	 * simulate a browser flow execution redirect.
-	 * @param context the external context providing information about the caller's environment, used by the flow
-	 * execution during the refresh operation
-	 * @return the current view selection for this flow execution
-	 * @throws FlowExecutionException if an exception was thrown during refresh
-	 */
-	protected ViewSelection refresh(ExternalContext context) throws FlowExecutionException {
-		Assert.state(flowExecution != null,
-				"The flow execution to test is [null]; you must start the flow execution before you can refresh it!");
-		return flowExecution.refresh(context);
+		flowExecution.resume(context);
 	}
 
 	// convenience accessors
@@ -400,7 +248,8 @@ public abstract class AbstractFlowExecutionTests extends TestCase {
 	 * Assert that the entire flow execution has ended; that is, it is no longer active.
 	 */
 	protected void assertFlowExecutionEnded() {
-		assertTrue("The flow execution is still active but it should have ended", !getFlowExecution().isActive());
+		assertTrue("The flow execution is still active but it should have ended", getFlowExecution().hasStarted()
+				&& !getFlowExecution().isActive());
 	}
 
 	/**
@@ -413,117 +262,6 @@ public abstract class AbstractFlowExecutionTests extends TestCase {
 				getFlowExecution().getActiveSession().getState().getId());
 	}
 
-	/**
-	 * Assert that the view name equals the provided value.
-	 * @param expectedViewName the expected name
-	 * @param viewSelection the selected view
-	 */
-	protected void assertViewNameEquals(String expectedViewName, ApplicationView viewSelection) {
-		assertEquals("The view name is wrong:", expectedViewName, viewSelection.getViewName());
-	}
-
-	/**
-	 * Assert that the selected view contains the specified model attribute with the provided expected value.
-	 * @param expectedValue the expected value
-	 * @param attributeName the attribute name (can be an expression)
-	 * @param viewSelection the selected view with a model attribute map to assert against
-	 */
-	protected void assertModelAttributeEquals(Object expectedValue, String attributeName, ApplicationView viewSelection) {
-		assertEquals("The model attribute '" + attributeName + "' value is wrong:", expectedValue,
-				evaluateModelAttributeExpression(attributeName, viewSelection.getModel()));
-	}
-
-	/**
-	 * Assert that the selected view contains the specified collection model attribute with the provided expected size.
-	 * @param expectedSize the expected size
-	 * @param attributeName the collection attribute name (can be an expression
-	 * @param viewSelection the selected view with a model attribute map to assert against
-	 */
-	protected void assertModelAttributeCollectionSize(int expectedSize, String attributeName,
-			ApplicationView viewSelection) {
-		assertModelAttributeNotNull(attributeName, viewSelection);
-		Collection c = (Collection) evaluateModelAttributeExpression(attributeName, viewSelection.getModel());
-		assertEquals("The model attribute '" + attributeName + "' collection size is wrong:", expectedSize, c.size());
-	}
-
-	/**
-	 * Assert that the selected view contains the specified model attribute.
-	 * @param attributeName the attribute name (can be an expression)
-	 * @param viewSelection the selected view with a model attribute map to assert against
-	 */
-	protected void assertModelAttributeNotNull(String attributeName, ApplicationView viewSelection) {
-		assertNotNull("The model attribute '" + attributeName + "' is null but should not be; model contents are "
-				+ StylerUtils.style(viewSelection.getModel()), evaluateModelAttributeExpression(attributeName,
-				viewSelection.getModel()));
-	}
-
-	/**
-	 * Assert that the selected view does not contain the specified model attribute.
-	 * @param attributeName the attribute name (can be an expression)
-	 * @param viewSelection the selected view with a model attribute map to assert against
-	 */
-	protected void assertModelAttributeNull(String attributeName, ApplicationView viewSelection) {
-		assertNull("The model attribute '" + attributeName + "' is not null but should be; model contents are "
-				+ StylerUtils.style(viewSelection.getModel()), evaluateModelAttributeExpression(attributeName,
-				viewSelection.getModel()));
-	}
-
-	// other helpers
-
-	/**
-	 * Assert that the returned view selection is an instance of {@link ApplicationView}.
-	 * @param viewSelection the view selection
-	 */
-	protected ApplicationView applicationView(ViewSelection viewSelection) {
-		Assert.isInstanceOf(ApplicationView.class, viewSelection, "Unexpected class of view selection: ");
-		return (ApplicationView) viewSelection;
-	}
-
-	/**
-	 * Assert that the returned view selection is an instance of {@link FlowExecutionRedirect}.
-	 * @param viewSelection the view selection
-	 */
-	protected FlowExecutionRedirect flowExecutionRedirect(ViewSelection viewSelection) {
-		Assert.isInstanceOf(FlowExecutionRedirect.class, viewSelection, "Unexpected class of view selection: ");
-		return (FlowExecutionRedirect) viewSelection;
-	}
-
-	/**
-	 * Assert that the returned view selection is an instance of {@link FlowDefinitionRedirect}.
-	 * @param viewSelection the view selection
-	 */
-	protected FlowDefinitionRedirect flowDefinitionRedirect(ViewSelection viewSelection) {
-		Assert.isInstanceOf(FlowDefinitionRedirect.class, viewSelection, "Unexpected class of view selection: ");
-		return (FlowDefinitionRedirect) viewSelection;
-	}
-
-	/**
-	 * Assert that the returned view selection is an instance of {@link ExternalRedirect}.
-	 * @param viewSelection the view selection
-	 */
-	protected ExternalRedirect externalRedirect(ViewSelection viewSelection) {
-		Assert.isInstanceOf(ExternalRedirect.class, viewSelection, "Unexpected class of view selection: ");
-		return (ExternalRedirect) viewSelection;
-	}
-
-	/**
-	 * Assert that the returned view selection is the {@link ViewSelection#NULL_VIEW}.
-	 * @param viewSelection the view selection
-	 */
-	protected void nullView(ViewSelection viewSelection) {
-		assertEquals("Not the null view selection:", viewSelection, ViewSelection.NULL_VIEW);
-	}
-
-	/**
-	 * Evaluates a model attribute expression.
-	 * @param attributeName the attribute expression
-	 * @param model the model map
-	 * @return the attribute expression value
-	 */
-	protected Object evaluateModelAttributeExpression(String attributeName, Map model) {
-		return expressionParser.parseExpression(attributeName).evaluate(model, null);
-	}
-
 	/**
 	 * Factory method to create the flow execution factory. Subclasses could override this if they want to use a custom
 	 * flow execution factory or custom configuration of the flow execution factory, registering flow execution
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java
index 755eedde..2c55af19 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/execution/AbstractXmlFlowExecutionTests.java
@@ -17,9 +17,7 @@ package org.springframework.webflow.test.execution;
 
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.io.Resource;
-import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.engine.builder.FlowBuilder;
-import org.springframework.webflow.engine.builder.FlowServiceLocator;
 import org.springframework.webflow.engine.builder.xml.XmlFlowBuilder;
 
 /**
@@ -67,16 +65,15 @@ public abstract class AbstractXmlFlowExecutionTests extends AbstractExternalized
 	/**
 	 * Constructs an XML flow execution test with given name.
 	 * @param name the name of the test
-	 * @since 1.0.2
 	 */
 	public AbstractXmlFlowExecutionTests(String name) {
 		super(name);
 	}
 
-	protected FlowBuilder createFlowBuilder(Resource resource, FlowServiceLocator flowServiceLocator) {
-		return new XmlFlowBuilder(resource, flowServiceLocator) {
-			protected void registerLocalBeans(Flow flow, ConfigurableBeanFactory beanFactory) {
-				registerLocalMockServices(flow, beanFactory);
+	protected FlowBuilder createFlowBuilder(Resource resource) {
+		return new XmlFlowBuilder(resource) {
+			protected void registerFlowBeans(ConfigurableBeanFactory flowBeanFactory) {
+				registerMockFlowBeans(flowBeanFactory);
 			}
 		};
 	}
@@ -84,10 +81,9 @@ public abstract class AbstractXmlFlowExecutionTests extends AbstractExternalized
 	/**
 	 * Template method subclasses may override to register mock implementations of services used locally by the flow
 	 * being tested.
-	 * @param flow the flow to register the services for
-	 * @param beanFactory the local flow service registry; register mock services with it using
+	 * @param flowBeanFactory the local flow service registry; register mock services with it using
 	 * {@link ConfigurableBeanFactory#registerSingleton(String, Object)}
 	 */
-	protected void registerLocalMockServices(Flow flow, ConfigurableBeanFactory beanFactory) {
+	protected void registerMockFlowBeans(ConfigurableBeanFactory flowBeanFactory) {
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/AttributeMapperActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/AttributeMapperActionTests.java
index 87eb6b6e..bb3f78fb 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/action/AttributeMapperActionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/AttributeMapperActionTests.java
@@ -19,7 +19,7 @@ import junit.framework.TestCase;
 
 import org.springframework.binding.mapping.DefaultAttributeMapper;
 import org.springframework.binding.mapping.MappingBuilder;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
+import org.springframework.webflow.core.expression.DefaultExpressionParserFactory;
 import org.springframework.webflow.test.MockRequestContext;
 
 /**
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/EvaluateActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/EvaluateActionTests.java
index 04033755..6ba8ff26 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/action/EvaluateActionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/EvaluateActionTests.java
@@ -17,9 +17,8 @@ package org.springframework.webflow.action;
 
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.binding.expression.support.StaticExpression;
 import org.springframework.webflow.TestBean;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.ScopeType;
 import org.springframework.webflow.test.MockRequestContext;
@@ -29,8 +28,6 @@ import org.springframework.webflow.test.MockRequestContext;
  */
 public class EvaluateActionTests extends TestCase {
 
-	private ExpressionParser parser = DefaultExpressionParserFactory.getExpressionParser();
-
 	private MockRequestContext context = new MockRequestContext();
 
 	protected void setUp() throws Exception {
@@ -39,23 +36,23 @@ public class EvaluateActionTests extends TestCase {
 	}
 
 	public void testEvaluateExpressionNoResult() throws Exception {
-		EvaluateAction action = new EvaluateAction(parser.parseExpression("flowScope.foo"));
+		EvaluateAction action = new EvaluateAction(new StaticExpression("bar"));
 		Event result = action.execute(context);
 		assertEquals("bar", result.getId());
 		assertNull(context.getFlowScope().get("baz"));
 	}
 
 	public void testEvaluateExpressionResult() throws Exception {
-		EvaluateAction action = new EvaluateAction(parser.parseExpression("flowScope.foo"), new ActionResultExposer(
-				"baz", ScopeType.FLOW));
+		EvaluateAction action = new EvaluateAction(new StaticExpression("bar"), new ActionResultExposer("baz",
+				ScopeType.FLOW));
 		Event result = action.execute(context);
 		assertEquals("bar", result.getId());
 		assertEquals("bar", context.getFlowScope().get("baz"));
 	}
 
 	public void testBeanResult() throws Exception {
-		EvaluateAction action = new EvaluateAction(parser.parseExpression("flowScope.bean"), new ActionResultExposer(
-				"baz", ScopeType.FLOW));
+		EvaluateAction action = new EvaluateAction(new StaticExpression(new TestBean()), new ActionResultExposer("baz",
+				ScopeType.FLOW));
 		Event result = action.execute(context);
 		assertEquals("success", result.getId());
 		assertEquals(new TestBean(), context.getFlowScope().get("baz"));
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/support/EventFactorySupportTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/EventFactorySupportTests.java
similarity index 92%
rename from spring-webflow/src/test/java/org/springframework/webflow/execution/support/EventFactorySupportTests.java
rename to spring-webflow/src/test/java/org/springframework/webflow/action/EventFactorySupportTests.java
index b52031ae..681dcc48 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/support/EventFactorySupportTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/EventFactorySupportTests.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.execution.support;
+package org.springframework.webflow.action;
 
 import junit.framework.TestCase;
 
+import org.springframework.webflow.action.EventFactorySupport;
 import org.springframework.webflow.execution.Event;
 
 /**
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/ExternalRedirectActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/ExternalRedirectActionTests.java
new file mode 100644
index 00000000..935022ff
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/ExternalRedirectActionTests.java
@@ -0,0 +1,26 @@
+package org.springframework.webflow.action;
+
+import org.springframework.binding.expression.support.StaticExpression;
+import org.springframework.webflow.test.MockRequestContext;
+
+import junit.framework.TestCase;
+
+public class ExternalRedirectActionTests extends TestCase {
+	private ExternalRedirectAction action;
+
+	public void testExecute() throws Exception {
+		action = new ExternalRedirectAction(new StaticExpression("/wherever"));
+		MockRequestContext context = new MockRequestContext();
+		action.execute(context);
+		assertEquals("/wherever", context.getMockExternalContext().getExternalRedirectResult());
+	}
+
+	public void testExecuteWithNullResourceUri() throws Exception {
+		try {
+			action = new ExternalRedirectAction(null);
+			fail("Should have failed");
+		} catch (IllegalArgumentException e) {
+
+		}
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/FlowDefinitionRedirectActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/FlowDefinitionRedirectActionTests.java
new file mode 100644
index 00000000..ed402c8f
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/FlowDefinitionRedirectActionTests.java
@@ -0,0 +1,49 @@
+package org.springframework.webflow.action;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.springframework.binding.expression.Expression;
+import org.springframework.binding.expression.support.StaticExpression;
+import org.springframework.webflow.context.FlowDefinitionRequestInfo;
+import org.springframework.webflow.test.MockRequestContext;
+
+public class FlowDefinitionRedirectActionTests extends TestCase {
+	private FlowDefinitionRedirectAction action;
+
+	public void testExecute() throws Exception {
+		Expression flowId = new StaticExpression("user");
+		Expression[] requestElements = new Expression[] { new StaticExpression("1") };
+		Map requestParameters = new HashMap();
+		requestParameters.put(new StaticExpression("foo"), new StaticExpression("bar"));
+		action = new FlowDefinitionRedirectAction(flowId, requestElements, requestParameters);
+		MockRequestContext context = new MockRequestContext();
+		action.execute(context);
+		FlowDefinitionRequestInfo result = context.getMockExternalContext().getFlowDefinitionRedirectResult();
+		assertEquals("user", result.getFlowDefinitionId());
+		assertEquals("1", result.getRequestPath().getElement(0));
+		assertEquals("bar", result.getRequestParameters().get("foo"));
+	}
+
+	public void testExecuteWithNullRequestFields() throws Exception {
+		Expression flowId = new StaticExpression("user");
+		action = new FlowDefinitionRedirectAction(flowId, null, null);
+		MockRequestContext context = new MockRequestContext();
+		action.execute(context);
+		FlowDefinitionRequestInfo result = context.getMockExternalContext().getFlowDefinitionRedirectResult();
+		assertEquals("user", result.getFlowDefinitionId());
+		assertEquals(null, result.getRequestPath());
+		assertEquals(null, result.getRequestParameters());
+	}
+
+	public void testExecuteWithNullFlowId() throws Exception {
+		try {
+			action = new FlowDefinitionRedirectAction(null, null, null);
+			fail("Should have failed");
+		} catch (IllegalArgumentException e) {
+
+		}
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/FormActionBindingTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/FormActionBindingTests.java
index df2c3842..4121a49b 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/action/FormActionBindingTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/FormActionBindingTests.java
@@ -19,6 +19,7 @@ import junit.framework.TestCase;
 
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.mock.web.MockServletContext;
 import org.springframework.validation.DataBinder;
 import org.springframework.validation.Errors;
 import org.springframework.webflow.context.servlet.ServletExternalContext;
@@ -49,11 +50,12 @@ public class FormActionBindingTests extends TestCase {
 
 	public void testMessageCodesOnBindFailure() throws Exception {
 		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.setPathInfo("/fooFlow");
 		request.setMethod("POST");
 		request.addParameter("prop", "A");
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		MockRequestContext context = new MockRequestContext();
-		context.setExternalContext(new ServletExternalContext(null, request, response));
+		context.setExternalContext(new ServletExternalContext(new MockServletContext(), request, response));
 		context.setAttribute("method", "bindAndValidate");
 
 		// use a FormAction to do the binding
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/FormActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/FormActionTests.java
index 570aa82b..00edc7b4 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/action/FormActionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/FormActionTests.java
@@ -18,6 +18,7 @@ package org.springframework.webflow.action;
 import junit.framework.TestCase;
 
 import org.springframework.validation.BindException;
+import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
 import org.springframework.validation.Validator;
@@ -334,7 +335,7 @@ public class FormActionTests extends TestCase {
 		assertEquals(action.getEventFactorySupport().getSuccessEventId(), action.setupForm(context).getId());
 
 		Object formObject = getFormObject(context);
-		BindException errors = (BindException) getErrors(context);
+		BindingResult errors = (BindingResult) getErrors(context);
 
 		assertTrue(formObject instanceof TestBean);
 		assertTrue(errors.getTarget() instanceof TestBean);
@@ -345,7 +346,7 @@ public class FormActionTests extends TestCase {
 
 		OtherTestBean freshBean = new OtherTestBean();
 		context.getFlowScope().put("test", freshBean);
-		context.getRequestScope().put(BindException.ERROR_KEY_PREFIX + "test", errors);
+		context.getRequestScope().put(BindingResult.MODEL_KEY_PREFIX + "test", errors);
 
 		FormAction otherAction = createFormAction("test");
 		otherAction.setFormObjectClass(OtherTestBean.class);
@@ -353,7 +354,7 @@ public class FormActionTests extends TestCase {
 		assertEquals(action.getEventFactorySupport().getSuccessEventId(), otherAction.setupForm(context).getId());
 
 		formObject = context.getFlowScope().get("test");
-		errors = (BindException) getErrors(context);
+		errors = (BindingResult) getErrors(context);
 
 		assertTrue(formObject instanceof OtherTestBean);
 		assertSame(freshBean, formObject);
@@ -413,7 +414,7 @@ public class FormActionTests extends TestCase {
 		assertSame(testBean, getFormObject(context));
 		assertEquals("bla", getFormObject(context).getProp());
 		assertNotNull(getErrors(context));
-		assertSame(testBean, ((BindException) getErrors(context)).getTarget());
+		assertSame(testBean, ((BindingResult) getErrors(context)).getTarget());
 		assertFalse(getErrors(context).hasErrors());
 	}
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/LocalBeanInvokingActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/LocalBeanInvokingActionTests.java
deleted file mode 100644
index 9f099a7e..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/action/LocalBeanInvokingActionTests.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.action;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.method.MethodSignature;
-import org.springframework.binding.method.Parameter;
-import org.springframework.binding.method.Parameters;
-import org.springframework.webflow.TestBean;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.ScopeType;
-import org.springframework.webflow.test.MockRequestContext;
-
-/**
- * Unit test for the {@link LocalBeanInvokingAction}.
- * 
- * @author Keith Donald
- */
-public class LocalBeanInvokingActionTests extends TestCase {
-
-	private TestBean bean = new TestBean();
-
-	private LocalBeanInvokingAction action;
-
-	private MockRequestContext context = new MockRequestContext();
-
-	public void setUp() {
-		action = new LocalBeanInvokingAction(new MethodSignature("execute"), bean);
-	}
-
-	public void testInvokeBean() throws Exception {
-		action.execute(context);
-		assertTrue(bean.executed);
-	}
-
-	public void testNullTargetBean() throws Exception {
-		try {
-			action = new LocalBeanInvokingAction(new MethodSignature("execute"), null);
-			fail("Should've failed with iae");
-		} catch (IllegalArgumentException e) {
-
-		}
-	}
-
-	public void testExposeResultInScopes() throws Exception {
-		LocalAttributeMap attributes = new LocalAttributeMap();
-		attributes.put("foo", "a string value");
-		attributes.put("bar", "12345");
-		context.setLastEvent(new Event(this, "submit", attributes));
-		MethodSignature method = new MethodSignature("execute", new Parameters(new Parameter[] {
-				new Parameter(String.class, expression("lastEvent.attributes.foo")),
-				new Parameter(Integer.class, expression("lastEvent.attributes.bar")) }));
-		action = new LocalBeanInvokingAction(method, bean);
-		action.setMethodResultExposer(new ActionResultExposer("foo", ScopeType.REQUEST));
-		testInvokeBean();
-		assertEquals(new Integer(12345), context.getRequestScope().get("foo"));
-
-		context.getRequestScope().clear();
-
-		action.setMethodResultExposer(new ActionResultExposer("foo", ScopeType.FLOW));
-		testInvokeBean();
-		assertEquals(new Integer(12345), context.getFlowScope().get("foo"));
-		assertNull(context.getRequestScope().get("foo"));
-	}
-
-	private Expression expression(String string) {
-		return DefaultExpressionParserFactory.getExpressionParser().parseExpression(string);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/MultiActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/MultiActionTests.java
index e7dfb917..98c8e5fe 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/action/MultiActionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/MultiActionTests.java
@@ -19,6 +19,7 @@ import junit.framework.TestCase;
 
 import org.springframework.webflow.action.MultiAction.MethodResolver;
 import org.springframework.webflow.engine.AnnotatedAction;
+import org.springframework.webflow.engine.StubViewFactory;
 import org.springframework.webflow.engine.ViewState;
 import org.springframework.webflow.execution.RequestContext;
 import org.springframework.webflow.test.MockFlowSession;
@@ -52,7 +53,7 @@ public class MultiActionTests extends TestCase {
 
 	public void testDispatchWithCurrentStateId() throws Exception {
 		MockFlowSession session = context.getMockFlowExecutionContext().getMockActiveSession();
-		session.setState(new ViewState(session.getDefinitionInternal(), "increment"));
+		session.setState(new ViewState(session.getDefinitionInternal(), "increment", new StubViewFactory()));
 		action.execute(context);
 		assertEquals(1, action.counter);
 	}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/ResultObjectEventFactoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/ResultObjectEventFactoryTests.java
index f0810a4d..493ae705 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/action/ResultObjectEventFactoryTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/action/ResultObjectEventFactoryTests.java
@@ -17,8 +17,8 @@ package org.springframework.webflow.action;
 
 import junit.framework.TestCase;
 
+import org.springframework.core.enums.StaticLabeledEnum;
 import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.FlowSessionStatus;
 import org.springframework.webflow.test.MockRequestContext;
 
 /**
@@ -37,7 +37,7 @@ public class ResultObjectEventFactoryTests extends TestCase {
 	}
 
 	public void testMappedTypes() {
-		assertTrue(factory.isMappedValueType(FlowSessionStatus.class));
+		assertTrue(factory.isMappedValueType(MyEnum.class));
 		assertTrue(factory.isMappedValueType(boolean.class));
 		assertTrue(factory.isMappedValueType(Boolean.class));
 		assertTrue(factory.isMappedValueType(String.class));
@@ -57,12 +57,20 @@ public class ResultObjectEventFactoryTests extends TestCase {
 	}
 
 	public void testLabeledEnumResult() {
-		Event result = factory.createResultEvent(this, FlowSessionStatus.ACTIVE, context);
-		assertEquals("Active", result.getId());
+		Event result = factory.createResultEvent(this, MyEnum.FOO, context);
+		assertEquals("foo", result.getId());
 	}
 
 	public void testOtherResult() {
 		Event result = factory.createResultEvent(this, "hello", context);
 		assertEquals("hello", result.getId());
 	}
+
+	private static class MyEnum extends StaticLabeledEnum {
+		public static final MyEnum FOO = new MyEnum();
+
+		private MyEnum() {
+			super(1, "foo");
+		}
+	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/SetActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/SetActionTests.java
deleted file mode 100644
index a0a6168d..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/action/SetActionTests.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.action;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.binding.expression.SettableExpression;
-import org.springframework.webflow.TestBean;
-import org.springframework.webflow.TestBeanWithMap;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.ScopeType;
-import org.springframework.webflow.test.MockRequestContext;
-
-/**
- * Unit tests for {@link SetAction}.
- */
-public class SetActionTests extends TestCase {
-
-	private ExpressionParser parser = DefaultExpressionParserFactory.getExpressionParser();
-
-	private MockRequestContext context = new MockRequestContext();
-
-	public void testSetActionWithBooleanValue() throws Exception {
-		context.getFlowScope().put("bean", new TestBean());
-
-		SettableExpression attr = parser.parseSettableExpression("bean.executed");
-		Expression value = parser.parseExpression("true");
-		SetAction action = new SetAction(attr, ScopeType.FLOW, value);
-		Event outcome = action.execute(context);
-		assertEquals("success", outcome.getId());
-		assertEquals(true, ((TestBean) context.getFlowScope().get("bean")).executed);
-	}
-
-	public void testSetActionWithStringValue() throws Exception {
-		SettableExpression attr = parser.parseSettableExpression("backState");
-		Expression value = parser.parseExpression("'otherState'"); // ${'otherState'} also works
-		SetAction action = new SetAction(attr, ScopeType.FLOW, value);
-		assertEquals("success", action.execute(context).getId());
-		assertEquals("otherState", context.getFlowScope().get("backState"));
-	}
-
-	public void testSetActionWithValueFromMap() throws Exception {
-		TestBeanWithMap beanWithMap = new TestBeanWithMap();
-		beanWithMap.getMap().put("key1", "value1");
-		beanWithMap.getMap().put("key2", "value2");
-		context.getFlowScope().put("beanWithMap", beanWithMap);
-
-		SettableExpression attr = parser.parseSettableExpression("key");
-		Expression value = parser.parseExpression("${flowScope.beanWithMap.map['key1']}");
-		SetAction action = new SetAction(attr, ScopeType.FLASH, value);
-		assertEquals("success", action.execute(context).getId());
-		assertEquals("value1", context.getFlashScope().get("key"));
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/BeanConfigTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/BeanConfigTests.java
deleted file mode 100644
index f98d3fbf..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/BeanConfigTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.config;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.webflow.executor.mvc.FlowController;
-
-/**
- * Test case that illustrates configuration of a FlowController and its associated artifacts using classic spring bean
- * configuration information. This test case does not really test much but serves more as an example.
- * 
- * @author Erwin Vervaet
- */
-public class BeanConfigTests extends TestCase {
-
-	private BeanFactory beanFactory;
-
-	protected void setUp() throws Exception {
-		beanFactory = new ClassPathXmlApplicationContext("webflow-config-classic.xml", BeanConfigTests.class);
-	}
-
-	public void testFlowControllerConfig() {
-		FlowController flowController = (FlowController) beanFactory.getBean("flowController");
-		assertEquals("test-flow", flowController.getArgumentHandler().getDefaultFlowId());
-	}
-
-	public void testFlowControllerBeanConfig() {
-		FlowController flowController = (FlowController) beanFactory.getBean("flowController-bean");
-		assertEquals("test-flow", flowController.getArgumentHandler().getDefaultFlowId());
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorBeanDefinitionParserTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorBeanDefinitionParserTests.java
new file mode 100644
index 00000000..235096fc
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorBeanDefinitionParserTests.java
@@ -0,0 +1,39 @@
+package org.springframework.webflow.config;
+
+import junit.framework.TestCase;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+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;
+	private FlowExecutor executor;
+
+	public void setUp() {
+		context = new ClassPathXmlApplicationContext("org/springframework/webflow/config/flow-executor.xml");
+		executor = (FlowExecutor) context.getBean("flowExecutor");
+	}
+
+	public void testExecute() {
+		MockExternalContext context = new MockExternalContext();
+		context.setFlowId("flow");
+		executor.execute(context);
+	}
+
+	public static class ConfigurationListener extends FlowExecutionListenerAdapter {
+		public void sessionCreating(RequestContext context, FlowDefinition definition) {
+			if (!context.getFlowExecutionContext().isActive()) {
+				assertEquals(3, context.getFlowExecutionContext().getAttributes().size());
+				assertEquals(Boolean.FALSE, context.getFlowExecutionContext().getAttributes().getBoolean(
+						"alwaysRedirectOnPause"));
+				assertEquals("bar", context.getFlowExecutionContext().getAttributes().get("foo"));
+				assertEquals(new Integer(2), context.getFlowExecutionContext().getAttributes().get("bar"));
+			}
+		}
+	}
+
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorFactoryBeanTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorFactoryBeanTests.java
index 86b40cf4..da75667b 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorFactoryBeanTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorFactoryBeanTests.java
@@ -1,113 +1,88 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.config;
-
-import junit.framework.TestCase;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.webflow.conversation.ConversationManager;
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
-import org.springframework.webflow.execution.repository.FlowExecutionRepository;
-import org.springframework.webflow.execution.repository.continuation.ClientContinuationFlowExecutionRepository;
-import org.springframework.webflow.execution.repository.continuation.ContinuationFlowExecutionRepository;
-import org.springframework.webflow.execution.repository.support.SimpleFlowExecutionRepository;
-import org.springframework.webflow.executor.FlowExecutorImpl;
-
-/**
- * Test case for {@link FlowExecutorFactoryBean}.
- * 
- * @author Erwin Vervaet
- */
-public class FlowExecutorFactoryBeanTests extends TestCase {
-
-	private ApplicationContext applicationContext;
-
-	protected void setUp() throws Exception {
-		this.applicationContext = new ClassPathXmlApplicationContext("flow-executor-factory-bean.xml",
-				BeanConfigTests.class);
-	}
-
-	public void testSetMaxConversationsAndMaxContinuations() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) applicationContext.getBean("flowExecutor0");
-		assertTrue(flowExecutor.getExecutionRepository() instanceof ContinuationFlowExecutionRepository);
-		ContinuationFlowExecutionRepository repo = (ContinuationFlowExecutionRepository) flowExecutor
-				.getExecutionRepository();
-		SessionBindingConversationManager conversationManager = (SessionBindingConversationManager) repo
-				.getConversationManager();
-		assertEquals(1, conversationManager.getMaxConversations());
-		assertEquals(10, repo.getMaxContinuations());
-	}
-
-	public void testRepoConfigurationWithDefaultConversationManager() throws Exception {
-		SimpleFlowExecutionRepository simple = (SimpleFlowExecutionRepository) setupRepo(RepositoryType.SIMPLE, null);
-		assertTrue(simple.getConversationManager() instanceof SessionBindingConversationManager);
-		assertTrue(simple.isAlwaysGenerateNewNextKey());
-
-		SimpleFlowExecutionRepository singleKey = (SimpleFlowExecutionRepository) setupRepo(RepositoryType.SINGLEKEY,
-				null);
-		assertTrue(singleKey.getConversationManager() instanceof SessionBindingConversationManager);
-		assertFalse(singleKey.isAlwaysGenerateNewNextKey());
-
-		ContinuationFlowExecutionRepository continuation = (ContinuationFlowExecutionRepository) setupRepo(
-				RepositoryType.CONTINUATION, null);
-		assertTrue(continuation.getConversationManager() instanceof SessionBindingConversationManager);
-
-		ClientContinuationFlowExecutionRepository client = (ClientContinuationFlowExecutionRepository) setupRepo(
-				RepositoryType.CLIENT, null);
-		assertFalse("Client repo does not use SessionBindingConversationManager by default", client
-				.getConversationManager() instanceof SessionBindingConversationManager);
-	}
-
-	public void testRepoConfiguration() throws Exception {
-		ConversationManager cm = new CustomConversationManager();
-
-		SimpleFlowExecutionRepository simple = (SimpleFlowExecutionRepository) setupRepo(RepositoryType.SIMPLE, cm);
-		assertTrue(simple.getConversationManager() instanceof CustomConversationManager);
-		assertTrue(simple.isAlwaysGenerateNewNextKey());
-
-		SimpleFlowExecutionRepository singleKey = (SimpleFlowExecutionRepository) setupRepo(RepositoryType.SINGLEKEY,
-				cm);
-		assertTrue(singleKey.getConversationManager() instanceof CustomConversationManager);
-		assertFalse(singleKey.isAlwaysGenerateNewNextKey());
-
-		ContinuationFlowExecutionRepository continuation = (ContinuationFlowExecutionRepository) setupRepo(
-				RepositoryType.CONTINUATION, cm);
-		assertTrue(continuation.getConversationManager() instanceof CustomConversationManager);
-
-		ClientContinuationFlowExecutionRepository client = (ClientContinuationFlowExecutionRepository) setupRepo(
-				RepositoryType.CLIENT, cm);
-		assertTrue(client.getConversationManager() instanceof CustomConversationManager);
-	}
-
-	private FlowExecutionRepository setupRepo(RepositoryType repoType, ConversationManager conversationManager)
-			throws Exception {
-		FlowExecutorFactoryBean flowExecutorFactoryBean = new FlowExecutorFactoryBean();
-		flowExecutorFactoryBean
-				.setDefinitionLocator((FlowDefinitionLocator) applicationContext.getBean("flowRegistry"));
-		flowExecutorFactoryBean.setRepositoryType(repoType);
-		if (conversationManager != null) {
-			flowExecutorFactoryBean.setConversationManager(conversationManager);
-		}
-		flowExecutorFactoryBean.afterPropertiesSet();
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) flowExecutorFactoryBean.getObject();
-		return flowExecutor.getExecutionRepository();
-	}
-
-	private static class CustomConversationManager extends SessionBindingConversationManager {
-	}
-}
+package org.springframework.webflow.config;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.definition.registry.FlowDefinitionConstructionException;
+import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
+import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
+import org.springframework.webflow.engine.EndState;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.engine.StubViewFactory;
+import org.springframework.webflow.engine.Transition;
+import org.springframework.webflow.engine.ViewState;
+import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
+import org.springframework.webflow.execution.FlowExecutionListener;
+import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
+import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
+import org.springframework.webflow.executor.FlowExecutor;
+import org.springframework.webflow.test.MockExternalContext;
+
+public class FlowExecutorFactoryBeanTests extends TestCase {
+	private FlowExecutorFactoryBean factoryBean;
+
+	public void setUp() {
+		factoryBean = new FlowExecutorFactoryBean();
+	}
+
+	public void testGetFlowExecutorNoPropertiesSet() throws Exception {
+		try {
+			factoryBean.afterPropertiesSet();
+		} catch (IllegalArgumentException e) {
+
+		}
+	}
+
+	public void testGetFlowExecutorBasicConfig() throws Exception {
+		factoryBean.setFlowDefinitionLocator(new FlowDefinitionLocator() {
+			public FlowDefinition getFlowDefinition(String id) throws NoSuchFlowDefinitionException,
+					FlowDefinitionConstructionException {
+				Flow flow = new Flow(id);
+				ViewState view = new ViewState(flow, "view", new StubViewFactory());
+				view.getTransitionSet().add(new Transition(new DefaultTargetStateResolver("end")));
+				new EndState(flow, "end");
+				return flow;
+			}
+		});
+		factoryBean.afterPropertiesSet();
+		FlowExecutor executor = (FlowExecutor) factoryBean.getObject();
+		MockExternalContext context = new MockExternalContext();
+		context.setFlowId("flow");
+		executor.execute(context);
+	}
+
+	public void testGetFlowExecutorOptionsSpecified() throws Exception {
+		factoryBean.setFlowDefinitionLocator(new FlowDefinitionLocator() {
+			public FlowDefinition getFlowDefinition(String id) throws NoSuchFlowDefinitionException,
+					FlowDefinitionConstructionException {
+				Flow flow = new Flow(id);
+				ViewState view = new ViewState(flow, "view", new StubViewFactory());
+				view.getTransitionSet().add(new Transition(new DefaultTargetStateResolver("end")));
+				new EndState(flow, "end");
+				return flow;
+			}
+		});
+		Set attributes = new HashSet();
+		attributes.add(new FlowElementAttribute("foo", "bar", null));
+		factoryBean.setFlowExecutionAttributes(attributes);
+		factoryBean.setFlowExecutionRepositoryType(FlowExecutionRepositoryType.CONTINUATION);
+		FlowExecutionListener listener = new FlowExecutionListenerAdapter() {
+
+		};
+		factoryBean.setFlowExecutionListenerLoader(new StaticFlowExecutionListenerLoader(listener));
+		factoryBean.setMaxContinuations(2);
+		factoryBean.setMaxConversations(1);
+		factoryBean.afterPropertiesSet();
+		FlowExecutor executor = (FlowExecutor) factoryBean.getObject();
+		MockExternalContext context = new MockExternalContext();
+		context.setFlowId("flow");
+		executor.execute(context);
+
+		MockExternalContext context2 = new MockExternalContext();
+		context2.setFlowExecutionKey(context.getFlowExecutionKey());
+		executor.execute(context);
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowRegistryBeanDefinitionParserTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowRegistryBeanDefinitionParserTests.java
new file mode 100644
index 00000000..1df2a041
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowRegistryBeanDefinitionParserTests.java
@@ -0,0 +1,59 @@
+package org.springframework.webflow.config;
+
+import junit.framework.TestCase;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.definition.registry.FlowDefinitionConstructionException;
+import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
+import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
+
+public class FlowRegistryBeanDefinitionParserTests extends TestCase {
+	private ClassPathXmlApplicationContext context;
+	private FlowDefinitionRegistry registry;
+
+	public void setUp() {
+		context = new ClassPathXmlApplicationContext("org/springframework/webflow/config/flow-registry.xml");
+		registry = (FlowDefinitionRegistry) context.getBean("flowRegistry");
+	}
+
+	public void testRegistryFlowLocationsPopulated() {
+		FlowDefinition flow = registry.getFlowDefinition("flow");
+		assertEquals("flow", flow.getId());
+		assertEquals("bar", flow.getAttributes().get("foo"));
+		assertEquals(new Integer(2), flow.getAttributes().get("bar"));
+	}
+
+	public void testRegistryFlowBuildersPopulated() {
+		FlowDefinition foo = registry.getFlowDefinition("foo");
+		assertEquals("foo", foo.getId());
+	}
+
+	public void testRegistryFlowBuildersPopulatedWithId() {
+		FlowDefinition foo = registry.getFlowDefinition("foo2");
+		assertEquals("foo2", foo.getId());
+	}
+
+	public void testRegistryFlowBuildersPopulatedWithAttributes() {
+		FlowDefinition foo3 = registry.getFlowDefinition("foo3");
+		assertEquals("foo3", foo3.getId());
+		assertEquals("bar", foo3.getAttributes().get("foo"));
+		assertEquals(new Integer(2), foo3.getAttributes().get("bar"));
+	}
+
+	public void testNoSuchFlow() {
+		try {
+			registry.getFlowDefinition("not there");
+		} catch (NoSuchFlowDefinitionException e) {
+
+		}
+	}
+
+	public void testBogusPath() {
+		try {
+			registry.getFlowDefinition("bogus");
+		} catch (FlowDefinitionConstructionException e) {
+
+		}
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowRegistryFactoryBeanTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowRegistryFactoryBeanTests.java
new file mode 100644
index 00000000..5699a367
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowRegistryFactoryBeanTests.java
@@ -0,0 +1,71 @@
+package org.springframework.webflow.config;
+
+import java.util.HashSet;
+
+import junit.framework.TestCase;
+
+import org.springframework.beans.factory.support.StaticListableBeanFactory;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
+import org.springframework.webflow.engine.builder.support.FlowBuilderServices;
+
+public class FlowRegistryFactoryBeanTests extends TestCase {
+	private FlowRegistryFactoryBean factoryBean;
+
+	public void setUp() {
+		factoryBean = new FlowRegistryFactoryBean();
+	}
+
+	public void testGetFlowRegistry() throws Exception {
+		HashSet attributes = new HashSet();
+		attributes.add(new FlowElementAttribute("foo", "bar", null));
+		attributes.add(new FlowElementAttribute("bar", "2", "integer"));
+		FlowLocation location1 = new FlowLocation("flow1", "org/springframework/webflow/config/flow.xml", attributes);
+		FlowLocation location2 = new FlowLocation("flow2", "org/springframework/webflow/config/flow.xml", attributes);
+		FlowLocation[] flowLocations = new FlowLocation[] { location1, location2 };
+		factoryBean.setFlowLocations(flowLocations);
+		factoryBean.setResourceLoader(new DefaultResourceLoader());
+		factoryBean.setBeanFactory(new StaticListableBeanFactory());
+		factoryBean.afterPropertiesSet();
+		FlowDefinitionRegistry registry = (FlowDefinitionRegistry) factoryBean.getObject();
+		FlowDefinition def = registry.getFlowDefinition("flow1");
+		assertNotNull(def);
+		assertEquals("flow1", def.getId());
+		assertEquals("bar", def.getAttributes().get("foo"));
+		assertEquals(new Integer(2), def.getAttributes().getInteger("bar"));
+		def = registry.getFlowDefinition("flow2");
+		assertNotNull(def);
+		assertEquals("flow2", def.getId());
+	}
+
+	public void testGetFlowRegistryGeneratedFlowId() throws Exception {
+		FlowLocation location1 = new FlowLocation(null, "org/springframework/webflow/config/flow.xml", null);
+		FlowLocation[] flowLocations = new FlowLocation[] { location1 };
+		factoryBean.setFlowLocations(flowLocations);
+		factoryBean.setResourceLoader(new DefaultResourceLoader());
+		factoryBean.setBeanFactory(new StaticListableBeanFactory());
+		factoryBean.afterPropertiesSet();
+		FlowDefinitionRegistry registry = (FlowDefinitionRegistry) factoryBean.getObject();
+		FlowDefinition def = registry.getFlowDefinition("flow");
+		assertNotNull(def);
+		assertEquals("flow", def.getId());
+		assertTrue(def.getAttributes().isEmpty());
+	}
+
+	public void testGetFlowRegistryCustomFlowServices() throws Exception {
+		FlowLocation location1 = new FlowLocation(null, "org/springframework/webflow/config/flow.xml", null);
+		FlowLocation[] flowLocations = new FlowLocation[] { location1 };
+		factoryBean.setFlowLocations(flowLocations);
+		FlowBuilderServices builderServices = new FlowBuilderServices();
+		factoryBean.setFlowBuilderServices(builderServices);
+		factoryBean.setResourceLoader(new DefaultResourceLoader());
+		factoryBean.setBeanFactory(new StaticListableBeanFactory());
+		factoryBean.afterPropertiesSet();
+		FlowDefinitionRegistry registry = (FlowDefinitionRegistry) factoryBean.getObject();
+		FlowDefinition def = registry.getFlowDefinition("flow");
+		assertNotNull(def);
+		assertEquals("flow", def.getId());
+		assertTrue(def.getAttributes().isEmpty());
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/FooFlowBuilder.java b/spring-webflow/src/test/java/org/springframework/webflow/config/FooFlowBuilder.java
new file mode 100644
index 00000000..36b2d70a
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/FooFlowBuilder.java
@@ -0,0 +1,13 @@
+package org.springframework.webflow.config;
+
+import org.springframework.webflow.engine.EndState;
+import org.springframework.webflow.engine.builder.FlowBuilderException;
+import org.springframework.webflow.engine.builder.support.AbstractFlowBuilder;
+
+public class FooFlowBuilder extends AbstractFlowBuilder {
+
+	public void buildStates() throws FlowBuilderException {
+		new EndState(getFlow(), "finish");
+	}
+
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/TestFlowExecutionListenerCriteria.java b/spring-webflow/src/test/java/org/springframework/webflow/config/TestFlowExecutionListenerCriteria.java
deleted file mode 100644
index 64459d94..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/TestFlowExecutionListenerCriteria.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.config;
-
-import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.execution.factory.FlowExecutionListenerCriteria;
-
-/**
- * Dummy test implementation of a FlowExecutionListenerCriteria. Not intended for actual use.
- * 
- * @author Erwin Vervaet
- */
-public class TestFlowExecutionListenerCriteria implements FlowExecutionListenerCriteria {
-
-	public boolean appliesTo(FlowDefinition definition) {
-		return definition.getAttributes().contains("dummy");
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/WebFlowConfigNamespaceHandlerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/WebFlowConfigNamespaceHandlerTests.java
deleted file mode 100644
index 0bc2c99e..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/WebFlowConfigNamespaceHandlerTests.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.config;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.beans.factory.parsing.Problem;
-import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.conversation.ConversationManager;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
-import org.springframework.webflow.execution.factory.ConditionalFlowExecutionListenerLoader;
-import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
-import org.springframework.webflow.execution.repository.continuation.ClientContinuationFlowExecutionRepository;
-import org.springframework.webflow.execution.repository.continuation.ContinuationFlowExecutionRepository;
-import org.springframework.webflow.execution.repository.support.AbstractConversationFlowExecutionRepository;
-import org.springframework.webflow.execution.repository.support.SimpleFlowExecutionRepository;
-import org.springframework.webflow.executor.FlowExecutorImpl;
-
-/**
- * Unit tests for the WebFlowConfigNamespaceHandler and its BeanDefinitionParsers.
- */
-public class WebFlowConfigNamespaceHandlerTests extends TestCase {
-
-	private DefaultListableBeanFactory beanFactory;
-
-	protected void setUp() throws Exception {
-		this.beanFactory = new DefaultListableBeanFactory();
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory);
-		reader.loadBeanDefinitions(new ClassPathResource(
-				"org/springframework/webflow/config/webflow-config-namespace.xml"));
-	}
-
-	public void testRegistryWithPath() {
-		FlowDefinitionRegistry registry = (FlowDefinitionRegistry) this.beanFactory.getBean("withPath");
-		assertEquals("Incorrect number of flows loaded", 1, registry.getFlowDefinitionCount());
-		assertTrue("Incorrect flow name", registry.containsFlowDefinition("/flow1"));
-	}
-
-	public void testRegistryWithPathWithWildcards() {
-		FlowDefinitionRegistry registry = (FlowDefinitionRegistry) this.beanFactory.getBean("withPathWithWildcards");
-		assertEquals("Incorrect number of flows loaded", 3, registry.getFlowDefinitionCount());
-		assertTrue("Incorrect flow name", registry.containsFlowDefinition("/flow1"));
-		assertTrue("Incorrect flow name", registry.containsFlowDefinition("/flow2"));
-	}
-
-	public void testRegistryWithId() {
-		FlowDefinitionRegistry registry = (FlowDefinitionRegistry) this.beanFactory.getBean("withId");
-		assertEquals("Incorrect number of flows loaded", 1, registry.getFlowDefinitionCount());
-		assertTrue("Incorrect flow name", registry.containsFlowDefinition("/foo"));
-	}
-
-	public void testWithIdWithWildCards() {
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory);
-		try {
-			reader.loadBeanDefinitions(new ClassPathResource(
-					"org/springframework/webflow/config/webflow-config-namespace-bad.xml"));
-			fail("Should not have allowed id with wildcards");
-		} catch (BeanDefinitionParsingException e) {
-		}
-	}
-
-	public void testRegistryWithNamespace() {
-		FlowDefinitionRegistry registry = (FlowDefinitionRegistry) this.beanFactory.getBean("withNamespace");
-		assertEquals("Incorrect number of flows loaded", 1, registry.getFlowDefinitionCount());
-		assertTrue("Incorrect flow name", registry.containsFlowDefinition("namespace/flow1"));
-	}
-
-	public void testDefaultExecutor() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("defaultExecutor");
-		assertTrue(flowExecutor.getExecutionRepository() instanceof ContinuationFlowExecutionRepository);
-		assertSame(this.beanFactory.getBean("withPathWithWildcards"), flowExecutor.getDefinitionLocator());
-		AttributeMap attribs = ((FlowExecutionImplFactory) flowExecutor.getExecutionFactory()).getExecutionAttributes();
-		assertEquals(1, attribs.size()); // defaults have been applied
-		assertEquals(new Boolean(true), attribs.get(ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE));
-	}
-
-	public void testSimpleExecutor() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("simpleExecutor");
-		assertSame(this.beanFactory.getBean("withPathWithWildcards"), flowExecutor.getDefinitionLocator());
-		assertTrue(flowExecutor.getExecutionRepository() instanceof SimpleFlowExecutionRepository);
-		assertTrue(((SimpleFlowExecutionRepository) flowExecutor.getExecutionRepository()).isAlwaysGenerateNewNextKey());
-		AttributeMap attribs = ((FlowExecutionImplFactory) flowExecutor.getExecutionFactory()).getExecutionAttributes();
-		assertEquals(3, attribs.size());
-		assertEquals(new Boolean(true), attribs.get(ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE));
-		assertEquals("test", attribs.get("test"));
-		assertEquals(new Integer(1), attribs.get("test1"));
-		assertSame(StaticFlowExecutionListenerLoader.EMPTY_INSTANCE, ((FlowExecutionImplFactory) flowExecutor
-				.getExecutionFactory()).getExecutionListenerLoader());
-	}
-
-	public void testContinuationExecutor() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("continuationExecutor");
-		assertSame(this.beanFactory.getBean("withPathWithWildcards"), flowExecutor.getDefinitionLocator());
-		assertTrue(flowExecutor.getExecutionRepository() instanceof ContinuationFlowExecutionRepository);
-		AttributeMap attribs = ((FlowExecutionImplFactory) flowExecutor.getExecutionFactory()).getExecutionAttributes();
-		assertEquals(1, attribs.size());
-		assertEquals(new Boolean(false), attribs.get(ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE));
-		ConditionalFlowExecutionListenerLoader ll = (ConditionalFlowExecutionListenerLoader) ((FlowExecutionImplFactory) flowExecutor
-				.getExecutionFactory()).getExecutionListenerLoader();
-		assertEquals(1, ll.getListeners(new Flow("test")).length);
-		assertSame(this.beanFactory.getBean("listener1"), ll.getListeners(new Flow("test"))[0]);
-	}
-
-	public void testClientExecutor() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("clientExecutor");
-		assertSame(this.beanFactory.getBean("withPathWithWildcards"), flowExecutor.getDefinitionLocator());
-		assertTrue(flowExecutor.getExecutionRepository() instanceof ClientContinuationFlowExecutionRepository);
-		AttributeMap attribs = ((FlowExecutionImplFactory) flowExecutor.getExecutionFactory()).getExecutionAttributes();
-		assertEquals(1, attribs.size());
-		assertEquals(new Boolean(true), attribs.get(ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE));
-		ConditionalFlowExecutionListenerLoader ll = (ConditionalFlowExecutionListenerLoader) ((FlowExecutionImplFactory) flowExecutor
-				.getExecutionFactory()).getExecutionListenerLoader();
-		assertEquals(2, ll.getListeners(new Flow("flow1")).length);
-		assertSame(this.beanFactory.getBean("listener1"), ll.getListeners(new Flow("flow1"))[0]);
-		assertSame(this.beanFactory.getBean("listener2"), ll.getListeners(new Flow("flow1"))[1]);
-		assertEquals(1, ll.getListeners(new Flow("flow2")).length);
-		assertSame(this.beanFactory.getBean("listener2"), ll.getListeners(new Flow("flow2"))[0]);
-		assertEquals(1, ll.getListeners(new Flow("flow3")).length);
-		assertSame(this.beanFactory.getBean("listener2"), ll.getListeners(new Flow("flow3"))[0]);
-	}
-
-	public void testSingleKeyExecutor() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("singleKeyExecutor");
-		assertSame(this.beanFactory.getBean("withPathWithWildcards"), flowExecutor.getDefinitionLocator());
-		assertTrue(flowExecutor.getExecutionRepository() instanceof SimpleFlowExecutionRepository);
-		assertFalse(((SimpleFlowExecutionRepository) flowExecutor.getExecutionRepository())
-				.isAlwaysGenerateNewNextKey());
-		AttributeMap attribs = ((FlowExecutionImplFactory) flowExecutor.getExecutionFactory()).getExecutionAttributes();
-		assertEquals(1, attribs.size());
-		assertEquals(new Boolean(true), attribs.get(ApplicationViewSelector.ALWAYS_REDIRECT_ON_PAUSE_ATTRIBUTE));
-		assertSame(StaticFlowExecutionListenerLoader.EMPTY_INSTANCE, ((FlowExecutionImplFactory) flowExecutor
-				.getExecutionFactory()).getExecutionListenerLoader());
-	}
-
-	public void testDuplicateRepositoryType() {
-		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory);
-		DefaultProblemReporter problemReporter = new DefaultProblemReporter();
-		reader.setProblemReporter(problemReporter);
-		reader.loadBeanDefinitions(new ClassPathResource("org/springframework/webflow/config/namespace-error-1.xml"));
-		assertNotNull("Should have created an error", problemReporter.getLastProblem());
-		assertTrue(problemReporter.getLastProblem().getMessage().contains("repositoryType"));
-	}
-
-	public void testConversationManagerRef() {
-		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory);
-		DefaultProblemReporter problemReporter = new DefaultProblemReporter();
-		reader.setProblemReporter(problemReporter);
-		reader.loadBeanDefinitions(new ClassPathResource("org/springframework/webflow/config/namespace-error-2.xml"));
-		assertNotNull("Should have created an error", problemReporter.getLastProblem());
-		assertTrue(problemReporter.getLastProblem().getMessage().contains("conversation"));
-	}
-
-	public void testMaxContinuation() {
-		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
-		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory);
-		DefaultProblemReporter problemReporter = new DefaultProblemReporter();
-		reader.setProblemReporter(problemReporter);
-		reader.loadBeanDefinitions(new ClassPathResource("org/springframework/webflow/config/namespace-error-3.xml"));
-		assertNotNull("Should have created an error", problemReporter.getLastProblem());
-		assertTrue(problemReporter.getLastProblem().getMessage().contains("continuation"));
-	}
-
-	public void testContinuationExtended() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("continuationExtended");
-		assertTrue("Repository type should be ContinuationFlowExecutionRepository", flowExecutor
-				.getExecutionRepository() instanceof ContinuationFlowExecutionRepository);
-	}
-
-	public void testClientExtended() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("clientExtended");
-		assertTrue("Repository type should be ClientContinuationFlowExecutionRepository", flowExecutor
-				.getExecutionRepository() instanceof ClientContinuationFlowExecutionRepository);
-	}
-
-	public void testSimpleExtended() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("simpleExtended");
-		assertTrue("Repository type should be SimpleFlowExecutionRepository",
-				flowExecutor.getExecutionRepository() instanceof SimpleFlowExecutionRepository);
-	}
-
-	public void testSinglekeyExtended() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("singlekeyExtended");
-		assertTrue("Repository type should be SimpleFlowExecutionRepository",
-				flowExecutor.getExecutionRepository() instanceof SimpleFlowExecutionRepository);
-	}
-
-	public void testConversationManagerExtended() {
-		FlowExecutorImpl flowExecutor = (FlowExecutorImpl) this.beanFactory.getBean("conversationManagerExtended");
-		assertTrue("Repository type should be SimpleFlowExecutionRepository",
-				flowExecutor.getExecutionRepository() instanceof SimpleFlowExecutionRepository);
-		AbstractConversationFlowExecutionRepository repository = (AbstractConversationFlowExecutionRepository) flowExecutor
-				.getExecutionRepository();
-		ConversationManager conversationManager = (ConversationManager) this.beanFactory.getBean("conversationManager");
-		assertSame("The conversation manager in the repository should be the one explicitly wired",
-				conversationManager, repository.getConversationManager());
-	}
-
-	/**
-	 * {@link ProblemReporter} implementation that simply stores the last reported error
-	 */
-	static class DefaultProblemReporter implements ProblemReporter {
-
-		private Problem problem;
-
-		public Problem getLastProblem() {
-			return this.problem;
-		}
-
-		public void error(Problem problem) {
-			this.problem = problem;
-		}
-
-		public void fatal(Problem problem) {
-			this.problem = problem;
-
-		}
-
-		public void warning(Problem problem) {
-			this.problem = problem;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor-factory-bean.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor-factory-bean.xml
deleted file mode 100644
index 0dbf25d1..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor-factory-bean.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-           
-	
-	
-	
-		
-			
-				
-					
-						
-							
-						
-					
-				
-			
-		
-	
-	
-	
-		
-		
-		
-		
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml
new file mode 100644
index 00000000..384ddbdd
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-executor.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+		
+		
+			
+					
+					
+		
+		
+			
+		
+	
+	
+	
+	
+	
+		
+	
+
+	
+	
+
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml
new file mode 100644
index 00000000..11a0cbac
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml
@@ -0,0 +1,31 @@
+
+
+
+	
+		
+			
+				
+				
+			
+		
+		
+		
+		
+		
+			
+				
+				
+			
+		
+	
+	
+	
+	
+
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml
new file mode 100644
index 00000000..9bdfa89c
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow.xml
@@ -0,0 +1,10 @@
+
+
+	
+		
+	
+
+
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow1.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow1.xml
deleted file mode 100644
index 4e3e7b7e..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow2.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow2.xml
deleted file mode 100644
index 4e3e7b7e..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-	
-	
-	
-
-
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-1.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-1.xml
deleted file mode 100644
index 13756d36..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-1.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-		
-	
-
-	
-		
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-2.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-2.xml
deleted file mode 100644
index 2c822bb2..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-	
-		
-	
-
-	
-		
-	
-	
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-3.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-3.xml
deleted file mode 100644
index 4c00de3f..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/namespace-error-3.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-	
-		
-	
-
-	
-		
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/scope/ConversationScopeTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/scope/ConversationScopeTests.java
deleted file mode 100644
index d78cf1dd..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/scope/ConversationScopeTests.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.config.scope;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.execution.FlowExecutionContextHolder;
-import org.springframework.webflow.test.MockFlowExecutionContext;
-
-/**
- * Test cases for the
- * @{link ConversationScope} class.
- * 
- * @author Ben Hale
- */
-public class ConversationScopeTests extends TestCase {
-
-	private MockFlowExecutionContext context;
-
-	private ConversationScope scope;
-
-	protected void setUp() {
-		context = new MockFlowExecutionContext();
-		FlowExecutionContextHolder.setFlowExecutionContext(context);
-		scope = new ConversationScope();
-	}
-
-	protected void tearDown() {
-		scope = null;
-		context = null;
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-	}
-
-	public void testGetVarMissing() {
-		StubObjectFactory factory = new StubObjectFactory();
-		Object gotten = scope.get("name", factory);
-		assertNotNull("Should be real object", gotten);
-		assertTrue("Should have added object to the map", context.getConversationScope().contains("name"));
-		assertSame("Created object should have been returned", factory.getValue(), gotten);
-		assertSame("Created object should have been persisted", factory.getValue(), context.getConversationScope().get(
-				"name"));
-	}
-
-	public void testGetVarExist() {
-		StubObjectFactory factory = new StubObjectFactory();
-		Object value = new Object();
-		context.getConversationScope().put("name", value);
-		Object gotten = scope.get("name", factory);
-		assertNotNull("Should be real object", gotten);
-		assertTrue("Should still be in map", context.getConversationScope().contains("name"));
-		assertSame("Persisted object should have been returned", value, gotten);
-		assertNotSame("Created object should not have been returned", factory.getValue(), gotten);
-	}
-
-	public void testGetRequestContextMissing() {
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-		StubObjectFactory factory = new StubObjectFactory();
-		try {
-			scope.get("name", factory);
-			fail("Should have thrown a IllegalStateException without a request context");
-		} catch (IllegalStateException e) {
-		}
-	}
-
-	public void testGetConversationId() {
-		String conversationId = scope.getConversationId();
-		assertNull("Method not implemented yet, should return null", conversationId);
-	}
-
-	public void testRemoveVarMissing() {
-		Object removed = scope.remove("name");
-		assertFalse("Should have removed from object from map", context.getConversationScope().contains("name"));
-		assertNull("Should have returned a null object", removed);
-	}
-
-	public void testRemoveVarExist() {
-		Object value = new Object();
-		context.getConversationScope().put("name", value);
-		Object removed = scope.remove("name");
-		assertFalse("Should have removed from object from map", context.getConversationScope().contains("name"));
-		assertSame("Should have returned the previous object", removed, value);
-	}
-
-	public void testRemoveRequestContextMissing() {
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-		try {
-			scope.remove("name");
-			fail("Should have thrown a IllegalStateException without a request context");
-		} catch (IllegalStateException e) {
-		}
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/scope/FlashScopeTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/scope/FlashScopeTests.java
deleted file mode 100644
index 2ebfdab7..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/scope/FlashScopeTests.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.config.scope;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.execution.FlowExecutionContextHolder;
-import org.springframework.webflow.test.MockFlowExecutionContext;
-
-/**
- * Test cases for the
- * @{link FlashScope} class.
- * 
- * @author Ben Hale
- */
-public class FlashScopeTests extends TestCase {
-
-	private MockFlowExecutionContext context;
-
-	private FlashScope scope;
-
-	protected void setUp() {
-		context = new MockFlowExecutionContext();
-		FlowExecutionContextHolder.setFlowExecutionContext(context);
-		scope = new FlashScope();
-	}
-
-	protected void tearDown() {
-		scope = null;
-		context = null;
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-	}
-
-	public void testGetVarMissing() {
-		StubObjectFactory factory = new StubObjectFactory();
-		Object gotten = scope.get("name", factory);
-		assertNotNull("Should be real object", gotten);
-		assertTrue("Should have added object to the map", context.getFlashScope().contains("name"));
-		assertSame("Created object should have been returned", factory.getValue(), gotten);
-		assertSame("Created object should have been persisted", factory.getValue(), context.getFlashScope().get("name"));
-	}
-
-	public void testGetVarExist() {
-		StubObjectFactory factory = new StubObjectFactory();
-		Object value = new Object();
-		context.getFlashScope().put("name", value);
-		Object gotten = scope.get("name", factory);
-		assertNotNull("Should be real object", gotten);
-		assertTrue("Should still be in map", context.getFlashScope().contains("name"));
-		assertSame("Persisted object should have been returned", value, gotten);
-		assertNotSame("Created object should not have been returned", factory.getValue(), gotten);
-	}
-
-	public void testGetRequestContextMissing() {
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-		StubObjectFactory factory = new StubObjectFactory();
-		try {
-			scope.get("name", factory);
-			fail("Should have thrown a IllegalStateException without a request context");
-		} catch (IllegalStateException e) {
-		}
-	}
-
-	public void testGetConversationId() {
-		String flashId = scope.getConversationId();
-		assertNull("Method not implemented yet, should return null", flashId);
-	}
-
-	public void testRemoveVarMissing() {
-		Object removed = scope.remove("name");
-		assertFalse("Should have removed from object from map", context.getFlashScope().contains("name"));
-		assertNull("Should have returned a null object", removed);
-	}
-
-	public void testRemoveVarExist() {
-		Object value = new Object();
-		context.getFlashScope().put("name", value);
-		Object removed = scope.remove("name");
-		assertFalse("Should have removed from object from map", context.getFlashScope().contains("name"));
-		assertSame("Should have returned the previous object", removed, value);
-	}
-
-	public void testRemoveRequestContextMissing() {
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-		try {
-			scope.remove("name");
-			fail("Should have thrown a IllegalStateException without a request context");
-		} catch (IllegalStateException e) {
-		}
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/scope/FlowScopeTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/scope/FlowScopeTests.java
deleted file mode 100644
index baa76465..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/scope/FlowScopeTests.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.config.scope;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.execution.FlowExecutionContextHolder;
-import org.springframework.webflow.test.MockFlowExecutionContext;
-
-/**
- * Test cases for the
- * @{link FlowScope} class.
- * 
- * @author Ben Hale
- */
-public class FlowScopeTests extends TestCase {
-
-	private MockFlowExecutionContext context;
-
-	private FlowScope scope;
-
-	protected void setUp() {
-		context = new MockFlowExecutionContext();
-		FlowExecutionContextHolder.setFlowExecutionContext(context);
-		scope = new FlowScope();
-	}
-
-	protected void tearDown() {
-		scope = null;
-		context = null;
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-	}
-
-	public void testGetVarMissing() {
-		StubObjectFactory factory = new StubObjectFactory();
-		Object gotten = scope.get("name", factory);
-		assertNotNull("Should be real object", gotten);
-		assertTrue("Should have added object to the map", context.getActiveSession().getScope().contains("name"));
-		assertSame("Created object should have been returned", factory.getValue(), gotten);
-		assertSame("Created object should have been persisted", factory.getValue(), context.getActiveSession()
-				.getScope().get("name"));
-	}
-
-	public void testGetVarExist() {
-		StubObjectFactory factory = new StubObjectFactory();
-		Object value = new Object();
-		context.getActiveSession().getScope().put("name", value);
-		Object gotten = scope.get("name", factory);
-		assertNotNull("Should be real object", gotten);
-		assertTrue("Should still be in map", context.getActiveSession().getScope().contains("name"));
-		assertSame("Persisted object should have been returned", value, gotten);
-		assertNotSame("Created object should not have been returned", factory.getValue(), gotten);
-	}
-
-	public void testGetRequestContextMissing() {
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-		StubObjectFactory factory = new StubObjectFactory();
-		try {
-			scope.get("name", factory);
-		} catch (IllegalStateException e) {
-		}
-	}
-
-	public void testGetConversationId() {
-		String flowId = scope.getConversationId();
-		assertNull("Method not implemented yet, should return null", flowId);
-	}
-
-	public void testRemoveVarMissing() {
-		Object removed = scope.remove("name");
-		assertFalse("Should have removed from object from map", context.getActiveSession().getScope().contains("name"));
-		assertNull("Should have returned a null object", removed);
-	}
-
-	public void testRemoveVarExist() {
-		Object value = new Object();
-		context.getActiveSession().getScope().put("name", value);
-		Object removed = scope.remove("name");
-		assertFalse("Should have removed from object from map", context.getActiveSession().getScope().contains("name"));
-		assertSame("Should have returned the previous object", removed, value);
-	}
-
-	public void testRemoveRequestContextMissing() {
-		FlowExecutionContextHolder.setFlowExecutionContext(null);
-		try {
-			scope.remove("name");
-			fail("Should have thrown a IllegalStateException without a request context");
-		} catch (IllegalStateException e) {
-		}
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-classic.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-classic.xml
deleted file mode 100644
index 99060fe0..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-classic.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-	
-
-	
-		
-			
-				
-					
-						
-							
-						
-					
-				
-			
-		
-	
-
-	
-
-	
-
-	
-		
-			
-				
-				
-				
-					
-				
-			
-		
-	
-
-	
-
-	
-		
-	
-
-	
-
-	
-		
-		
-	
-
-	
-		
-		
-			
-				
-			
-		
-		
-		
-		
-		
-			
-				
-			
-		
-	
-
-	
-
-	
-		
-		
-	
-
-	
-		
-		
-			
-				
-					
-						
-						
-							true
-						
-					
-				
-				
-			
-		
-		
-	
-
-	
-		
-			
-				
-				
-					
-						
-						
-							true
-						
-					
-				
-				
-			
-		
-		
-		
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-namespace-bad.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-namespace-bad.xml
deleted file mode 100644
index c0d84029..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-namespace-bad.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-		
-	
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-namespace.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-namespace.xml
deleted file mode 100644
index afe08f0b..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/webflow-config-namespace.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-	
-		
-	
-
-	
-		
-	
-	
-	
-		
-	
-
-	
-		
-			
-		
-	
-
-	
-	
-	
-		
-			
-			
-		
-	
-
-	
-		
-			
-		
-		
-			
-		
-	
-
-	
-		
-			
-			
-		
-	
-	
-	
-	
-		
-        
-		
-           	
-        
-	
-	
-	
-		
-	
-	
-	
-		
-	
-	
-	
-		
-	
-	
-	
-		
-	
-	
-	
-
-	
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/context/RequestPathTests.java b/spring-webflow/src/test/java/org/springframework/webflow/context/RequestPathTests.java
new file mode 100644
index 00000000..07fdf65d
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/context/RequestPathTests.java
@@ -0,0 +1,83 @@
+package org.springframework.webflow.context;
+
+import junit.framework.TestCase;
+
+import org.springframework.webflow.context.RequestPath;
+
+public class RequestPathTests extends TestCase {
+	public void testNewPathParse() {
+		RequestPath path = new RequestPath("/users/1");
+		assertEquals(2, path.getElementCount());
+		assertEquals("users", path.getElement(0));
+		assertEquals("1", path.getElement(1));
+	}
+
+	public void testNewPathParseTrailingSlash() {
+		RequestPath path = new RequestPath("/users/1/");
+		assertEquals(2, path.getElementCount());
+		assertEquals("users", path.getElement(0));
+		assertEquals("1", path.getElement(1));
+	}
+
+	public void testNewPathParseNoLeadingSlash() {
+		try {
+			RequestPath path = new RequestPath("users/1/");
+			fail("should have failed");
+		} catch (IllegalArgumentException e) {
+
+		}
+	}
+
+	public void testOutOfBounds() {
+		RequestPath path = new RequestPath("/users/1/");
+		assertEquals(2, path.getElementCount());
+		assertEquals("users", path.getElement(0));
+		try {
+			assertEquals("1", path.getElement(2));
+			fail("should have failed");
+		} catch (ArrayIndexOutOfBoundsException e) {
+
+		}
+	}
+
+	public void testEmptyPath() {
+		RequestPath path = new RequestPath("/");
+		assertEquals(1, path.getElementCount());
+		assertEquals("", path.getElement(0));
+	}
+
+	public void testSinglePathElement() {
+		RequestPath path = new RequestPath("/users");
+		assertEquals(1, path.getElementCount());
+		assertEquals("users", path.getElement(0));
+	}
+
+	public void testToString() {
+		RequestPath path2 = new RequestPath("/users");
+		RequestPath path3 = new RequestPath("/users/1/foo/bar");
+		assertEquals("/users", path2.toString());
+		assertEquals("/users/1/foo/bar", path3.toString());
+	}
+
+	public void testPopElement() {
+		RequestPath path = new RequestPath("/users/1");
+		assertEquals(2, path.getElementCount());
+		path = path.pop(1);
+		assertEquals(1, path.getElementCount());
+		assertEquals("/1", path.toString());
+	}
+
+	public void testPopAllElements() {
+		RequestPath path = new RequestPath("/users/1");
+		assertEquals(2, path.getElementCount());
+		path = path.pop(2);
+		assertNull(path);
+	}
+
+	public void testPopEmptyPath() {
+		RequestPath path = new RequestPath("/");
+		assertEquals(1, path.getElementCount());
+		path = path.pop();
+		assertNull(path);
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/context/portlet/PortletExternalContextTests.java b/spring-webflow/src/test/java/org/springframework/webflow/context/portlet/PortletExternalContextTests.java
deleted file mode 100644
index eda1a959..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/context/portlet/PortletExternalContextTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.context.portlet;
-
-import junit.framework.TestCase;
-
-import org.springframework.mock.web.portlet.MockPortletContext;
-import org.springframework.mock.web.portlet.MockPortletRequest;
-import org.springframework.mock.web.portlet.MockPortletResponse;
-
-/**
- * Unit tests for {@link PortletExternalContext}.
- */
-public class PortletExternalContextTests extends TestCase {
-
-	private PortletExternalContext context = new PortletExternalContext(new MockPortletContext(),
-			new MockPortletRequest(), new MockPortletResponse());
-
-	public void testApplicationMap() {
-		assertEquals(1, context.getApplicationMap().size());
-		context.getApplicationMap().put("foo", "bar");
-		assertEquals("bar", context.getApplicationMap().get("foo"));
-		assertEquals("bar", context.getContext().getAttribute("foo"));
-	}
-
-	public void testSessionMap() {
-		assertEquals(0, context.getSessionMap().size());
-		context.getSessionMap().put("foo", "bar");
-		assertEquals("bar", context.getSessionMap().get("foo"));
-		assertEquals("bar", context.getRequest().getPortletSession().getAttribute("foo"));
-	}
-
-	public void testRequestMap() {
-		assertEquals(0, context.getRequestMap().size());
-		context.getRequestMap().put("foo", "bar");
-		assertEquals("bar", context.getRequestMap().get("foo"));
-		assertEquals("bar", context.getRequest().getAttribute("foo"));
-	}
-
-	public void testOther() {
-		assertNull(context.getRequestPathInfo());
-		assertNull(context.getDispatcherPath());
-		assertNotNull(context.getResponse());
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/context/servlet/ServletExternalContextTests.java b/spring-webflow/src/test/java/org/springframework/webflow/context/servlet/ServletExternalContextTests.java
index bd8b5e4e..14e1244d 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/context/servlet/ServletExternalContextTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/context/servlet/ServletExternalContextTests.java
@@ -20,39 +20,162 @@ import junit.framework.TestCase;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
+import org.springframework.webflow.context.ExternalContext;
+import org.springframework.webflow.context.ExternalContextHolder;
+import org.springframework.webflow.context.FlowDefinitionRequestInfo;
+import org.springframework.webflow.context.FlowExecutionRequestInfo;
+import org.springframework.webflow.context.RequestPath;
+import org.springframework.webflow.executor.FlowExecutor;
+import org.springframework.webflow.test.MockParameterMap;
 
 /**
  * Unit tests for {@link ServletExternalContext}.
  */
 public class ServletExternalContextTests extends TestCase {
 
-	private ServletExternalContext context = new ServletExternalContext(new MockServletContext(),
-			new MockHttpServletRequest(), new MockHttpServletResponse());
+	private MockHttpServletRequest request;
 
-	public void testApplicationMap() {
-		assertEquals(1, context.getApplicationMap().size());
-		context.getApplicationMap().put("foo", "bar");
-		assertEquals("bar", context.getApplicationMap().get("foo"));
-		assertEquals("bar", context.getContext().getAttribute("foo"));
+	private MockHttpServletResponse response;
+
+	private FlowExecutor flowExecutor;
+
+	private ServletExternalContext context;
+
+	protected void setUp() {
+		request = new MockHttpServletRequest();
+		response = new MockHttpServletResponse();
+		flowExecutor = new StubFlowExecutor();
 	}
 
-	public void testSessionMap() {
-		assertEquals(0, context.getSessionMap().size());
-		context.getSessionMap().put("foo", "bar");
-		assertEquals("bar", context.getSessionMap().get("foo"));
-		assertEquals("bar", context.getRequest().getSession().getAttribute("foo"));
+	public void testProcessLaunchFlowRequest() throws Exception {
+		request.setPathInfo("/booking");
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		assertEquals("booking", context.getFlowId());
 	}
 
-	public void testRequestMap() {
-		assertEquals(0, context.getRequestMap().size());
-		context.getRequestMap().put("foo", "bar");
-		assertEquals("bar", context.getRequestMap().get("foo"));
-		assertEquals("bar", context.getRequest().getAttribute("foo"));
+	public void testProcessLaunchFlowRequestTrailingSlash() throws Exception {
+		request.setPathInfo("/booking/");
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		assertEquals("booking", context.getFlowId());
 	}
 
-	public void testOther() {
-		assertEquals(null, context.getRequestPathInfo());
-		assertEquals("", context.getDispatcherPath());
-		assertNotNull(context.getResponse());
+	public void testProcessLaunchFlowRequestElements() throws Exception {
+		request.setPathInfo("/users/1");
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		assertEquals("users", context.getFlowId());
+		assertEquals(context.getRequestPath().getElement(0), "1");
 	}
+
+	public void testProcessLaunchFlowMultipleRequestElements() throws Exception {
+		request.setPathInfo("/users/1/foo/bar//baz/");
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		assertEquals("users", context.getFlowId());
+		assertEquals("1", context.getRequestPath().getElement(0));
+		assertEquals("foo", context.getRequestPath().getElement(1));
+		assertEquals("bar", context.getRequestPath().getElement(2));
+		assertEquals("", context.getRequestPath().getElement(3));
+		assertEquals("baz", context.getRequestPath().getElement(4));
+	}
+
+	public void testProcessResumeFlowExecution() throws Exception {
+		request.setPathInfo("/executions/booking/_c12345_k12345");
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		assertEquals("booking", context.getFlowId());
+		assertEquals("_c12345_k12345", context.getFlowExecutionKey());
+	}
+
+	public void testExternalContextUnbound() throws Exception {
+		request.setPathInfo("/executions/booking/_c12345_k12345");
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		try {
+			ExternalContextHolder.getExternalContext();
+			fail("Should have failed");
+		} catch (IllegalStateException e) {
+
+		}
+	}
+
+	public void testNoRequestPathInfo() {
+		request.setPathInfo(null);
+		try {
+			context = new ServletExternalContext(new MockServletContext(), request, response);
+			fail("Should have failed");
+		} catch (IllegalArgumentException e) {
+
+		}
+	}
+
+	public void testSendFlowExecutionRedirect() throws Exception {
+		request.setPathInfo("/users/1");
+		flowExecutor = new FlowExecutor() {
+			public void execute(ExternalContext context) {
+				context.sendFlowExecutionRedirect(new FlowExecutionRequestInfo("users", "_c12345_k12345"));
+			}
+		};
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		assertEquals("/executions/users/_c12345_k12345", response.getRedirectedUrl());
+	}
+
+	public void testFlowExecutionRedirectAttemptOnEnd() throws Exception {
+		request.setPathInfo("/users/1");
+		flowExecutor = new FlowExecutor() {
+			public void execute(ExternalContext context) {
+				context.sendFlowExecutionRedirect(new FlowExecutionRequestInfo("users", "_c12345_k12345"));
+				context.setEndedResult("_c12345_k12345");
+			}
+		};
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		try {
+			context.executeFlowRequest(flowExecutor);
+			fail("Should have failed");
+		} catch (IllegalStateException e) {
+
+		}
+	}
+
+	public void testSendFlowDefinitionRedirect() throws Exception {
+		request.setPathInfo("/users/1");
+		flowExecutor = new FlowExecutor() {
+			public void execute(ExternalContext context) {
+				MockParameterMap parameters = new MockParameterMap();
+				parameters.put("foo", "bar");
+				parameters.put("bar", "baz");
+				RequestPath requestPath = new RequestPath("/1/you&me");
+				FlowDefinitionRequestInfo requestInfo = new FlowDefinitionRequestInfo("customers", requestPath,
+						parameters, "frag");
+				context.sendFlowDefinitionRedirect(requestInfo);
+				context.setEndedResult(null);
+			}
+		};
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		assertEquals("/customers/1/you%26me?foo=bar&bar=baz#frag", response.getRedirectedUrl());
+	}
+
+	public void testSendExternalRedirect() throws Exception {
+		request.setPathInfo("/users/1");
+		flowExecutor = new FlowExecutor() {
+			public void execute(ExternalContext context) {
+				context.sendExternalRedirect("/foo/bar/baz");
+				context.setEndedResult(null);
+			}
+		};
+		context = new ServletExternalContext(new MockServletContext(), request, response);
+		context.executeFlowRequest(flowExecutor);
+		assertEquals("/foo/bar/baz", response.getRedirectedUrl());
+	}
+
+	public class StubFlowExecutor implements FlowExecutor {
+		public void execute(ExternalContext context) {
+			assertNotNull(ExternalContextHolder.getExternalContext());
+		}
+	}
+
 }
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/conversation/impl/ConversationSizeTests.java b/spring-webflow/src/test/java/org/springframework/webflow/conversation/impl/ConversationSizeTests.java
deleted file mode 100644
index 0e104c38..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/conversation/impl/ConversationSizeTests.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.conversation.impl;
-
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.config.FlowExecutorFactoryBean;
-import org.springframework.webflow.config.RepositoryType;
-import org.springframework.webflow.core.collection.SharedAttributeMap;
-import org.springframework.webflow.definition.registry.FlowDefinitionHolder;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistrar;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.builder.AbstractFlowBuilder;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.builder.FlowBuilderException;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.executor.FlowExecutor;
-import org.springframework.webflow.executor.ResponseInstruction;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Test case that looks for the miminum conversation size.
- */
-public class ConversationSizeTests extends TestCase {
-
-	private SessionBindingConversationManager conversationManager;
-
-	private FlowExecutor flowExecutor;
-
-	protected void setUp() throws Exception {
-		FlowDefinitionRegistry flowRegistry = new FlowDefinitionRegistryImpl();
-		new SizeTestFlowRegistrar().registerFlowDefinitions(flowRegistry);
-
-		conversationManager = new SessionBindingConversationManager();
-
-		FlowExecutorFactoryBean flowExecutorFactory = new FlowExecutorFactoryBean();
-		flowExecutorFactory.setDefinitionLocator(flowRegistry);
-		flowExecutorFactory.setConversationManager(conversationManager);
-		flowExecutorFactory.setRepositoryType(RepositoryType.CONTINUATION);
-		flowExecutorFactory.afterPropertiesSet();
-		flowExecutor = flowExecutorFactory.getFlowExecutor();
-	}
-
-	public void testConversationSize() throws Exception {
-		MockExternalContext context = new MockExternalContext();
-		SharedAttributeMap session = context.getSessionMap();
-
-		// initially the session is empty
-		assertTrue(session.isEmpty());
-
-		ResponseInstruction ri = flowExecutor.launch("size-test-flow", context);
-		assertTrue(ri.getFlowExecutionContext().isActive());
-		assertTrue(ri.getViewSelection() instanceof FlowExecutionRedirect); // alwaysRedirectOnPause
-
-		// the launch has stored a ConversationContainer in the session since we're using
-		// SessionBindingConversationManager
-		assertEquals(1, session.size());
-		ConversationContainer conversationContainer = (ConversationContainer) session.get(conversationManager
-				.getSessionKey());
-		assertNotNull(conversationContainer);
-		assertEquals(1, conversationContainer.size());
-		int initialSize = getSerializedSize(conversationContainer);
-
-		ri = flowExecutor.refresh(ri.getFlowExecutionKey(), context);
-		assertTrue(ri.getFlowExecutionContext().isActive());
-		assertEquals("view", ((ApplicationView) ri.getViewSelection()).getViewName());
-
-		// the refresh did not impact the size of the session
-		assertEquals(1, session.size());
-		assertSame(conversationContainer, session.get(conversationManager.getSessionKey()));
-		assertEquals(1, conversationContainer.size());
-
-		ri = flowExecutor.resume(ri.getFlowExecutionKey(), "end", context);
-		assertFalse(ri.getFlowExecutionContext().isActive());
-		assertTrue(ri.isNull());
-
-		// the conversation ended but the ConversationContainer is still in the session
-		assertEquals(1, session.size());
-		assertSame(conversationContainer, session.get(conversationManager.getSessionKey()));
-		assertEquals(0, conversationContainer.size());
-		int inactiveSize = getSerializedSize(conversationContainer);
-
-		assertTrue(inactiveSize < initialSize);
-	}
-
-	// helpers
-
-	private int getSerializedSize(Object obj) throws Exception {
-		ByteArrayOutputStream bout = new ByteArrayOutputStream();
-		ObjectOutputStream oout = new ObjectOutputStream(bout);
-		oout.writeObject(obj);
-		oout.flush();
-		int objSize = bout.toByteArray().length;
-		return objSize;
-	}
-
-	private static class SizeTestFlowBuilder extends AbstractFlowBuilder {
-		public void buildStates() throws FlowBuilderException {
-			addViewState("view", "view", transition(on("end"), to("end")));
-			addEndState("end");
-		}
-	}
-
-	private static class SizeTestFlowRegistrar implements FlowDefinitionRegistrar {
-
-		public void registerFlowDefinitions(FlowDefinitionRegistry registry) {
-			Flow flow = new FlowAssembler("size-test-flow", null, new SizeTestFlowBuilder()).assembleFlow();
-			FlowDefinitionHolder flowHolder = new StaticFlowDefinitionHolder(flow);
-			registry.registerFlowDefinition(flowHolder);
-		}
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/core/WebFlowOgnlExpressionParserTests.java b/spring-webflow/src/test/java/org/springframework/webflow/core/WebFlowOgnlExpressionParserTests.java
deleted file mode 100644
index f91739a9..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/core/WebFlowOgnlExpressionParserTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.collection.MapAdaptable;
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.SettableExpression;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-
-/**
- * Unit tests for {@link WebFlowOgnlExpressionParser}.
- */
-public class WebFlowOgnlExpressionParserTests extends TestCase {
-
-	WebFlowOgnlExpressionParser parser = new WebFlowOgnlExpressionParser();
-
-	public void testEvalSimpleExpression() {
-		ArrayList list = new ArrayList();
-		Expression exp = parser.parseExpression("size()");
-		Integer size = (Integer) exp.evaluate(list, null);
-		assertEquals(0, size.intValue());
-	}
-
-	public void testEvalMapAdaptable() {
-		MapAdaptable adaptable = new MapAdaptable() {
-			public Map asMap() {
-				HashMap map = new HashMap();
-				map.put("size", new Integer(0));
-				return map;
-			}
-		};
-		Expression exp = parser.parseExpression("size");
-		Integer size = (Integer) exp.evaluate(adaptable, null);
-		assertEquals(0, size.intValue());
-	}
-
-	public void testEvalAndSetMutableMap() {
-		LocalAttributeMap map = new LocalAttributeMap();
-		map.put("size", new Integer(0));
-		Expression exp = parser.parseExpression("size");
-		Integer size = (Integer) exp.evaluate(map, null);
-		assertEquals(0, size.intValue());
-		assertTrue(exp instanceof SettableExpression);
-		SettableExpression sexp = (SettableExpression) exp;
-		sexp.evaluateToSet(map, new Integer(1), null);
-		size = (Integer) exp.evaluate(map, null);
-		assertEquals(1, size.intValue());
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/core/DefaultExpressionParserFactoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/core/expression/DefaultExpressionParserFactoryTests.java
similarity index 88%
rename from spring-webflow/src/test/java/org/springframework/webflow/core/DefaultExpressionParserFactoryTests.java
rename to spring-webflow/src/test/java/org/springframework/webflow/core/expression/DefaultExpressionParserFactoryTests.java
index 3041abc6..d656ab16 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/core/DefaultExpressionParserFactoryTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/core/expression/DefaultExpressionParserFactoryTests.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.core;
+package org.springframework.webflow.core.expression;
 
 import junit.framework.TestCase;
 
 import org.springframework.binding.expression.ExpressionParser;
+import org.springframework.webflow.core.expression.DefaultExpressionParserFactory;
 
 /**
  * Unit tests for {@link DefaultExpressionParserFactory}.
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImplTests.java b/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImplTests.java
index 20662b87..33166ddf 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImplTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImplTests.java
@@ -37,124 +37,32 @@ public class FlowDefinitionRegistryImplTests extends TestCase {
 		barFlow = new BarFlow();
 	}
 
-	public void testEmptyRegistryAsserts() {
-		assertEquals(0, registry.getFlowDefinitionCount());
-		assertEquals(0, registry.getFlowDefinitionPaths().length);
-	}
-
 	public void testNoSuchFlowDefinition() {
 		try {
 			registry.getFlowDefinition("bogus");
 			fail("Should've bombed with NoSuchFlow");
 		} catch (NoSuchFlowDefinitionException e) {
-		}
-	}
-
-	public void testNoSuchFlowDefinitionWithNamespace() {
-		try {
-			registry.getFlowDefinition("/namespace/bogus");
-			fail("Should've bombed with NoSuchFlow");
-		} catch (NoSuchFlowDefinitionException e) {
 
 		}
 	}
 
 	public void testRegisterFlow() {
 		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(fooFlow));
-		assertEquals(1, registry.getFlowDefinitionCount());
-		assertEquals("/foo", registry.getFlowDefinitionPaths()[0]);
-		assertEquals("foo", registry.getFlowDefinition("foo").getId());
-	}
-
-	public void testRegisterFlowWithNamespace() {
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(barFlow), "/namespace");
-		assertEquals(1, registry.getFlowDefinitionCount());
-		assertEquals("/namespace/bar", registry.getFlowDefinitionPaths()[0]);
-		assertEquals("bar", registry.getFlowDefinition("/namespace/bar").getId());
+		assertEquals(fooFlow, registry.getFlowDefinition("foo"));
 	}
 
 	public void testRegisterFlowSameIds() {
 		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(fooFlow));
 		FooFlow newFlow = new FooFlow();
 		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(newFlow));
-		assertEquals(1, registry.getFlowDefinitionCount());
 		assertSame(newFlow, registry.getFlowDefinition("foo"));
 	}
 
-	public void testRegisterFlowSameIdsWithNamespace() {
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(barFlow), "/namespace");
-		BarFlow newFlow = new BarFlow();
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(newFlow), "/namespace");
-		assertEquals(1, registry.getFlowDefinitionCount());
-		assertSame(newFlow, registry.getFlowDefinition("/namespace/bar"));
-	}
-
 	public void testRegisterMultipleFlows() {
 		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(fooFlow));
-		FooFlow newFlow = new FooFlow();
-		newFlow.id = "bar";
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(newFlow));
-		assertEquals(2, registry.getFlowDefinitionCount());
-		assertSame(fooFlow, registry.getFlowDefinition("foo"));
-		assertSame(newFlow, registry.getFlowDefinition("bar"));
-	}
-
-	public void testRegisterMultipleFlowsWithNamespace() {
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(barFlow), "/namespace");
-		BarFlow newFlow = new BarFlow();
-		newFlow.id = "foo";
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(newFlow), "/namespace");
-		assertEquals(2, registry.getFlowDefinitionCount());
-		assertSame(barFlow, registry.getFlowDefinition("/namespace/bar"));
-		assertSame(newFlow, registry.getFlowDefinition("/namespace/foo"));
-	}
-
-	public void testRefresh() {
-		testRegisterMultipleFlows();
-		registry.refresh();
-		assertEquals(2, registry.getFlowDefinitionCount());
-		assertSame(fooFlow, registry.getFlowDefinition("foo"));
-	}
-
-	public void testRefreshWithNamespace() {
-		testRegisterMultipleFlowsWithNamespace();
-		registry.refresh();
-		assertEquals(2, registry.getFlowDefinitionCount());
-		assertSame(barFlow, registry.getFlowDefinition("/namespace/bar"));
-	}
-
-	public void testRefreshValidFlow() {
-		testRegisterMultipleFlows();
-		registry.refresh("foo");
-		assertEquals(2, registry.getFlowDefinitionCount());
-		assertSame(fooFlow, registry.getFlowDefinition("foo"));
-	}
-
-	public void testRefreshValidFlowWithNamespace() {
-		testRegisterMultipleFlowsWithNamespace();
-		registry.refresh("/namespace/bar");
-		assertEquals(2, registry.getFlowDefinitionCount());
-		assertSame(barFlow, registry.getFlowDefinition("/namespace/bar"));
-	}
-
-	public void testRefreshNoSuchFlow() {
-		testRegisterMultipleFlows();
-		try {
-			registry.refresh("bogus");
-			fail("Should've bombed with NoSuchFlow");
-		} catch (NoSuchFlowDefinitionException e) {
-
-		}
-	}
-
-	public void testRefreshNoSuchFlowWithNamespace() {
-		testRegisterMultipleFlowsWithNamespace();
-		try {
-			registry.refresh("/namespace/bogus");
-			fail("Should've bombed with NoSuchFlow");
-		} catch (NoSuchFlowDefinitionException e) {
-
-		}
+		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(barFlow));
+		assertEquals(fooFlow, registry.getFlowDefinition("foo"));
+		assertEquals(barFlow, registry.getFlowDefinition("bar"));
 	}
 
 	public void testParentHierarchy() {
@@ -164,17 +72,7 @@ public class FlowDefinitionRegistryImplTests extends TestCase {
 		FooFlow fooFlow = new FooFlow();
 		child.registerFlowDefinition(new StaticFlowDefinitionHolder(fooFlow));
 		assertSame(fooFlow, child.getFlowDefinition("foo"));
-		assertEquals("bar", child.getFlowDefinition("bar").getId());
-	}
-
-	public void testParentHierarchyWithNamespace() {
-		testRegisterMultipleFlowsWithNamespace();
-		FlowDefinitionRegistryImpl child = new FlowDefinitionRegistryImpl();
-		child.setParent(registry);
-		BarFlow barFlow = new BarFlow();
-		child.registerFlowDefinition(new StaticFlowDefinitionHolder(barFlow), "/namespace");
-		assertSame(barFlow, child.getFlowDefinition("/namespace/bar"));
-		assertEquals("bar", child.getFlowDefinition("/namespace/bar").getId());
+		assertEquals(barFlow, child.getFlowDefinition("bar"));
 	}
 
 	private static class FooFlow implements FlowDefinition {
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowPathUtilsTests.java b/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowPathUtilsTests.java
deleted file mode 100644
index 48cf37c5..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowPathUtilsTests.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.springframework.webflow.definition.registry;
-
-import junit.framework.TestCase;
-
-public class FlowPathUtilsTests extends TestCase {
-
-	public void testNamespaceWithNoSlash() {
-		assertEquals("Incorrect namespace", "", FlowPathUtils.extractFlowNamespace("flow"));
-	}
-
-	public void testNamespaceWithSlash() {
-		assertEquals("Incorrect namespace", "", FlowPathUtils.extractFlowNamespace("/flow"));
-	}
-
-	public void testNamespaceWithNamespace() {
-		assertEquals("Incorrect namespace", "/namespace", FlowPathUtils.extractFlowNamespace("/namespace/flow"));
-	}
-
-	public void teswtNamespaceWithComplexNamespace() {
-		assertEquals("Incorrect namespace", "/complex/namespace", FlowPathUtils
-				.extractFlowNamespace("/complex/namespace/flow"));
-	}
-
-	public void testNamespaceEmpty() {
-		try {
-			FlowPathUtils.extractFlowNamespace("");
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testNamespaceWhitespace() {
-		try {
-			FlowPathUtils.extractFlowNamespace(" ");
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testNamespaceNull() {
-		try {
-			FlowPathUtils.extractFlowNamespace(null);
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testIdWithNoSlash() {
-		assertEquals("Incorrect id", "flow", FlowPathUtils.extractFlowId("flow"));
-	}
-
-	public void testIdWithSlash() {
-		assertEquals("Incorrect id", "flow", FlowPathUtils.extractFlowId("/flow"));
-	}
-
-	public void testIdWithNamespace() {
-		assertEquals("Incorrect id", "flow", FlowPathUtils.extractFlowId("/namespace/flow"));
-	}
-
-	public void testIdWithComplexNamespace() {
-		assertEquals("Incorrect id", "flow", FlowPathUtils.extractFlowId("/complex/namespace/flow"));
-	}
-
-	public void testIdEmpty() {
-		try {
-			FlowPathUtils.extractFlowId("");
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testIdWhitespace() {
-		try {
-			FlowPathUtils.extractFlowId(" ");
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testIdNull() {
-		try {
-			FlowPathUtils.extractFlowId(null);
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testPathWithEmptyNamespace() {
-		assertEquals("Incorrect path", "/flow", FlowPathUtils.buildFlowPath("", "flow"));
-	}
-
-	public void testPathWithNamespace() {
-		assertEquals("Incorrect path", "/namespace/flow", FlowPathUtils.buildFlowPath("/namespace", "flow"));
-	}
-
-	public void testPathWithComplexNamespace() {
-		assertEquals("Incorrect path", "/complex/namespace/flow", FlowPathUtils.buildFlowPath("/complex/namespace",
-				"flow"));
-	}
-
-	public void testPathWithNullNamespace() {
-		try {
-			FlowPathUtils.buildFlowPath(null, "flow");
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testPathWithEmptyId() {
-		try {
-			FlowPathUtils.buildFlowPath("", "");
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testPathWithWhitespaceId() {
-		try {
-			FlowPathUtils.buildFlowPath("", " ");
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testPathWithNullId() {
-		try {
-			FlowPathUtils.buildFlowPath("", null);
-			fail("Should have detected empty input");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionExecutorTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionExecutorTests.java
index 9944f5a6..dd7d8ebc 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionExecutorTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionExecutorTests.java
@@ -18,49 +18,69 @@ package org.springframework.webflow.engine;
 import junit.framework.TestCase;
 
 import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.FlowSessionStatus;
 import org.springframework.webflow.execution.RequestContext;
 import org.springframework.webflow.execution.TestAction;
-import org.springframework.webflow.test.MockFlowSession;
 import org.springframework.webflow.test.MockRequestContext;
 
 public class ActionExecutorTests extends TestCase {
 
-	public void testBasicExecute() {
+	private MockRequestContext context;
+	private State state;
+	private Flow flow;
+
+	protected void setUp() throws Exception {
+		flow = new Flow("myFlow");
+		state = new EndState(flow, "end");
+		context = new MockRequestContext(flow);
+	}
+
+	public void testExecuteAction() {
 		TestAction action = new TestAction();
-		Event result = ActionExecutor.execute(action, new MockRequestContext());
+		Event result = ActionExecutor.execute(action, context);
+		assertNull(context.getCurrentState());
 		assertEquals("success", result.getId());
 	}
 
-	public void testExceptionWhileStarted() {
-		TestAction action = new TestAction() {
-			protected Event doExecute(RequestContext context) throws Exception {
-				throw new IllegalStateException("Oops");
-			}
-		};
-		try {
-			ActionExecutor.execute(action, new MockRequestContext());
-			fail("Should've failed");
-		} catch (ActionExecutionException e) {
-			assertTrue(e.getCause() instanceof IllegalStateException);
-		}
+	public void testExecuteActionInState() {
+		context.getMockFlowExecutionContext().getMockActiveSession().setState(state);
+		TestAction action = new TestAction();
+		Event result = ActionExecutor.execute(action, context);
+		assertSame(state, context.getCurrentState());
+		assertEquals("success", result.getId());
 	}
 
-	public void testExceptionWhileStarting() {
+	public void testExecuteActionWithException() {
 		TestAction action = new TestAction() {
 			protected Event doExecute(RequestContext context) throws Exception {
 				throw new IllegalStateException("Oops");
 			}
 		};
-		MockRequestContext context = new MockRequestContext();
-		MockFlowSession starting = new MockFlowSession(new Flow("flow"));
-		starting.setStatus(FlowSessionStatus.STARTING);
-		context.getMockFlowExecutionContext().setActiveSession(starting);
 		try {
 			ActionExecutor.execute(action, context);
 			fail("Should've failed");
 		} catch (ActionExecutionException e) {
+			assertNull(context.getCurrentState());
 			assertTrue(e.getCause() instanceof IllegalStateException);
+			assertEquals(flow.getId(), e.getFlowId());
+			assertNull(e.getStateId());
+		}
+	}
+
+	public void testExecuteActionInStateWithException() {
+		context.getMockFlowExecutionContext().getMockActiveSession().setState(state);
+		TestAction action = new TestAction() {
+			protected Event doExecute(RequestContext context) throws Exception {
+				throw new IllegalStateException("Oops");
+			}
+		};
+		try {
+			ActionExecutor.execute(action, context);
+			fail("Should've failed");
+		} catch (ActionExecutionException e) {
+			assertSame(state, context.getCurrentState());
+			assertTrue(e.getCause() instanceof IllegalStateException);
+			assertEquals(flow.getId(), e.getFlowId());
+			assertEquals(state.getId(), e.getStateId());
 		}
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionStateTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionStateTests.java
index 1a961002..b2b0ad02 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionStateTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/ActionStateTests.java
@@ -17,43 +17,62 @@ package org.springframework.webflow.engine;
 
 import junit.framework.TestCase;
 
-import org.springframework.webflow.engine.impl.FlowExecutionImpl;
 import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
 import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
 import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.TestAction;
-import org.springframework.webflow.test.MockExternalContext;
+import org.springframework.webflow.test.MockRequestControlContext;
 
 /**
- * Tests that each of the Flow state types execute as expected when entered.
- * 
+ * Tests ActionState behavior
  * @author Keith Donald
  */
 public class ActionStateTests extends TestCase {
 
-	public void testActionStateSingleAction() {
-		Flow flow = new Flow("myFlow");
-		ActionState state = new ActionState(flow, "actionState");
+	private Flow flow;
+	private ActionState state;
+	private MockRequestControlContext context;
+
+	public void setUp() {
+		flow = new Flow("myFlow");
+		state = new ActionState(flow, "actionState");
+		new EndState(flow, "finish");
+		context = new MockRequestControlContext(flow);
+	}
+
+	public void testExecuteSingleAction() {
 		state.getActionList().add(new TestAction());
 		state.getTransitionSet().add(new Transition(on("success"), to("finish")));
-		new EndState(flow, "finish");
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		flowExecution.start(null, new MockExternalContext());
+		state.enter(context);
 		assertEquals(1, ((TestAction) state.getActionList().get(0)).getExecutionCount());
 	}
 
-	public void testActionAttributesChain() {
-		Flow flow = new Flow("myFlow");
-		ActionState state = new ActionState(flow, "actionState");
+	public void testExecuteNothing() {
+		try {
+			state.enter(context);
+			fail("Should've failed");
+		} catch (IllegalStateException e) {
+			// expected
+		}
+	}
+
+	public void testExecuteActionCannotHandleResultEvent() {
+		state.getActionList().add(new TestAction());
+		try {
+			state.enter(context);
+			fail("Should've failed");
+		} catch (NoMatchingTransitionException e) {
+			assertEquals(1, ((TestAction) state.getActionList().get(0)).getExecutionCount());
+		}
+	}
+
+	public void testExecuteActionChain() {
 		state.getActionList().add(new TestAction("not mapped result"));
 		state.getActionList().add(new TestAction(null));
 		state.getActionList().add(new TestAction(""));
 		state.getActionList().add(new TestAction("success"));
 		state.getTransitionSet().add(new Transition(on("success"), to("finish")));
-		new EndState(flow, "finish");
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		flowExecution.start(null, new MockExternalContext());
+		state.enter(context);
 		Action[] actions = state.getActionList().toArray();
 		for (int i = 0; i < actions.length; i++) {
 			TestAction action = (TestAction) actions[i];
@@ -61,47 +80,6 @@ public class ActionStateTests extends TestCase {
 		}
 	}
 
-	public void testActionAttributesChainNoMatchingTransition() {
-		Flow flow = new Flow("myFlow");
-		ActionState state = new ActionState(flow, "actionState");
-		state.getActionList().add(new TestAction("not mapped result"));
-		state.getActionList().add(new TestAction(null));
-		state.getActionList().add(new TestAction(""));
-		state.getActionList().add(new TestAction("yet another not mapped result"));
-		state.getTransitionSet().add(new Transition(on("success"), to("finish")));
-		new EndState(flow, "finish");
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		try {
-			flowExecution.start(null, new MockExternalContext());
-			fail("Should not have matched to another state transition");
-		} catch (NoMatchingTransitionException e) {
-			// expected
-		}
-	}
-
-	public void testActionAttributesChainNamedActions() {
-		Flow flow = new Flow("myFlow");
-		ActionState state = new ActionState(flow, "actionState");
-		state.getActionList().add(new AnnotatedAction(new TestAction("not mapped result")));
-		state.getActionList().add(new AnnotatedAction(new TestAction(null)));
-		AnnotatedAction action3 = new AnnotatedAction(new TestAction(""));
-		action3.setName("action3");
-		state.getActionList().add(action3);
-		AnnotatedAction action4 = new AnnotatedAction(new TestAction("success"));
-		action4.setName("action4");
-		state.getActionList().add(action4);
-		state.getTransitionSet().add(new Transition(on("action4.success"), to("finish")));
-		new EndState(flow, "finish");
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		flowExecution.start(null, new MockExternalContext());
-		assertTrue(!flowExecution.isActive());
-		Action[] actions = state.getActionList().toArray();
-		for (int i = 0; i < actions.length; i++) {
-			AnnotatedAction action = (AnnotatedAction) actions[i];
-			assertEquals(1, ((TestAction) (action.getTargetAction())).getExecutionCount());
-		}
-	}
-
 	protected TransitionCriteria on(String event) {
 		return new EventIdTransitionCriteria(event);
 	}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotedActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotedActionTests.java
index 2cdd08bd..a50b814c 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotedActionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/AnnotedActionTests.java
@@ -27,9 +27,11 @@ public class AnnotedActionTests extends TestCase {
 
 	private AnnotatedAction action = new AnnotatedAction(new TestAction());
 
-	private MockRequestContext context = new MockRequestContext();
+	private MockRequestContext context;
 
 	protected void setUp() throws Exception {
+		Flow flow = new Flow("myFlow");
+		context = new MockRequestContext(flow);
 	}
 
 	public void testBasicExecute() throws Exception {
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/DecisionStateTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/DecisionStateTests.java
index 9ca73fac..d00f87f6 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/DecisionStateTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/DecisionStateTests.java
@@ -52,7 +52,7 @@ public class DecisionStateTests extends TestCase {
 		assertFalse(context.getFlowExecutionContext().isActive());
 	}
 
-	public void testNoMatching() {
+	public void testCannotDecide() {
 		Flow flow = new Flow("flow");
 		DecisionState state = new DecisionState(flow, "decisionState");
 		state.getTransitionSet().add(new Transition(new EventIdTransitionCriteria("foo"), to("invalid")));
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/EndStateTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/EndStateTests.java
index 7c6dc709..8330a9e3 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/EndStateTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/EndStateTests.java
@@ -17,77 +17,96 @@ package org.springframework.webflow.engine;
 
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.support.StaticExpression;
 import org.springframework.binding.mapping.DefaultAttributeMapper;
+import org.springframework.binding.mapping.Mapping;
 import org.springframework.binding.mapping.MappingBuilder;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.engine.impl.FlowExecutionImpl;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
+import org.springframework.webflow.core.collection.MutableAttributeMap;
+import org.springframework.webflow.core.expression.DefaultExpressionParserFactory;
+import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
 import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.FlowExecutionListener;
-import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
-import org.springframework.webflow.execution.FlowSession;
+import org.springframework.webflow.execution.Action;
+import org.springframework.webflow.execution.Event;
+import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockExternalContext;
+import org.springframework.webflow.test.MockFlowExecutionContext;
+import org.springframework.webflow.test.MockFlowSession;
+import org.springframework.webflow.test.MockRequestControlContext;
 
 /**
- * Tests that each of the Flow state types execute as expected when entered.
- * 
+ * Tests EndState behavior.
  * @author Keith Donald
  */
 public class EndStateTests extends TestCase {
 
-	public void testEndStateTerminateFlow() {
+	public void testEnterEndStateTerminateFlowExecution() {
 		Flow flow = new Flow("myFlow");
-		EndState state = new EndState(flow, "finish");
-		state.setViewSelector(view("myViewName"));
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		ApplicationView view = (ApplicationView) flowExecution.start(null, new MockExternalContext());
-		assertFalse(flowExecution.isActive());
-		assertEquals("myViewName", view.getViewName());
+		EndState state = new EndState(flow, "end");
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		state.enter(context);
+		assertFalse("Active", context.getFlowExecutionContext().isActive());
 	}
 
-	public void testEndStateTerminateFlowWithOutput() {
+	public void testEnterEndStateWithFinalResponseRenderer() {
 		Flow flow = new Flow("myFlow");
-		DefaultAttributeMapper inputMapper = new DefaultAttributeMapper();
-		MappingBuilder mapping = new MappingBuilder(DefaultExpressionParserFactory.getExpressionParser());
-		inputMapper.addMapping(mapping.source("attr1").target("flowScope.attr1").value());
-		flow.setInputMapper(inputMapper);
+		EndState state = new EndState(flow, "end");
+		StubFinalResponseAction action = new StubFinalResponseAction();
+		state.setFinalResponseAction(action);
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		state.enter(context);
+		assertTrue(action.executeCalled);
+	}
 
-		EndState state = new EndState(flow, "finish");
-		DefaultAttributeMapper outputMapper = new DefaultAttributeMapper();
-		outputMapper.addMapping(mapping.source("flowScope.attr1").target("attr1").value());
-		outputMapper.addMapping(mapping.source("flowScope.attr2").target("attr2").value());
-		state.setOutputMapper(outputMapper);
-
-		FlowExecutionListener outputVerifier = new FlowExecutionListenerAdapter() {
-			public void sessionEnded(RequestContext context, FlowSession session, AttributeMap output) {
-				assertEquals("value1", output.get("attr1"));
-				assertNull(output.get("attr2"));
+	public void testEnterEndStateWithOutputMapper() {
+		Flow flow = new Flow("myFlow") {
+			public void end(RequestControlContext context, MutableAttributeMap output) throws FlowExecutionException {
+				assertEquals("foo", output.get("y"));
 			}
 		};
-		FlowExecution flowExecution = new FlowExecutionImpl(flow, new FlowExecutionListener[] { outputVerifier }, null);
-		LocalAttributeMap input = new LocalAttributeMap();
-		input.put("attr1", "value1");
-		ViewSelection view = flowExecution.start(input, new MockExternalContext());
-		assertFalse(flowExecution.isActive());
-		assertEquals(ViewSelection.NULL_VIEW, view);
+		EndState state = new EndState(flow, "end");
+		DefaultAttributeMapper mapper = new DefaultAttributeMapper();
+		MappingBuilder builder = new MappingBuilder(DefaultExpressionParserFactory.getExpressionParser());
+		Mapping mapping = builder.source("flowScope.x").target("y").value();
+		mapper.addMapping(mapping);
+		state.setOutputMapper(mapper);
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		context.getFlowScope().put("x", "foo");
+		state.enter(context);
+	}
+
+	public void testEnterEndStateTerminateFlowSession() {
+		Flow subflow = new Flow("mySubflow");
+		EndState state = new EndState(subflow, "end");
+		MockFlowSession session = new MockFlowSession(subflow);
+
+		Flow parent = new Flow("parent");
+		SubflowState subflowState = new SubflowState(parent, "subflow", subflow);
+		subflowState.getTransitionSet().add(new Transition(on("end"), to("end")));
+		new EndState(parent, "end");
+
+		MockFlowSession parentSession = new MockFlowSession(parent);
+		parentSession.setState(subflowState);
+
+		session.setParent(parentSession);
+		MockRequestControlContext context = new MockRequestControlContext(new MockFlowExecutionContext(session));
+		state.enter(context);
+
+		assertFalse("Active", context.getFlowExecutionContext().isActive());
 	}
 
 	protected static TransitionCriteria on(String event) {
 		return new EventIdTransitionCriteria(event);
 	}
 
-	protected static String to(String stateId) {
-		return stateId;
+	protected static TargetStateResolver to(String stateId) {
+		return new DefaultTargetStateResolver(stateId);
 	}
 
-	public static ViewSelector view(String viewName) {
-		return new ApplicationViewSelector(new StaticExpression(viewName));
+	private class StubFinalResponseAction implements Action {
+		private boolean executeCalled;
+
+		public Event execute(RequestContext context) {
+			executeCalled = true;
+			return new Event(this, "success");
+		}
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/FlowExecutionHandlerSetTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/FlowExecutionHandlerSetTests.java
new file mode 100644
index 00000000..6a35f2c0
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/FlowExecutionHandlerSetTests.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.engine;
+
+import junit.framework.TestCase;
+
+import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.test.MockRequestControlContext;
+
+/**
+ * Unit tests for {@link org.springframework.webflow.engine.FlowExecutionExceptionHandler} related code.
+ * 
+ * @author Erwin Vervaet
+ */
+public class FlowExecutionHandlerSetTests extends TestCase {
+
+	Flow flow = new Flow("myFlow");
+	MockRequestControlContext context = new MockRequestControlContext(flow);
+	boolean handled;
+
+	public void testHandleException() {
+		FlowExecutionExceptionHandlerSet handlerSet = new FlowExecutionExceptionHandlerSet();
+		handlerSet.add(new TestStateExceptionHandler(NullPointerException.class, "null"));
+		handlerSet.add(new TestStateExceptionHandler(FlowExecutionException.class, "execution 1"));
+		handlerSet.add(new TestStateExceptionHandler(FlowExecutionException.class, "execution 2"));
+		assertEquals(3, handlerSet.size());
+		FlowExecutionException e = new FlowExecutionException("flowId", "stateId", "Test");
+		assertTrue(handlerSet.handleException(e, context));
+		assertFalse(context.getFlowScope().contains("null"));
+		assertTrue(context.getFlowScope().contains("execution 1"));
+		assertFalse(context.getFlowScope().contains("execution 2"));
+	}
+
+	/**
+	 * State exception handler used in tests.
+	 */
+	public static class TestStateExceptionHandler implements FlowExecutionExceptionHandler {
+
+		private Class typeToHandle;
+		private String resultName;
+
+		public TestStateExceptionHandler(Class typeToHandle, String resultName) {
+			this.typeToHandle = typeToHandle;
+			this.resultName = resultName;
+		}
+
+		public boolean canHandle(FlowExecutionException exception) {
+			return typeToHandle.isInstance(exception);
+		}
+
+		public void handle(FlowExecutionException exception, RequestControlContext context) {
+			context.getFlowScope().put(resultName, Boolean.TRUE);
+		}
+	}
+
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/FlowTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/FlowTests.java
index 1bd25b0b..352fa60f 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/FlowTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/FlowTests.java
@@ -19,15 +19,13 @@ import java.util.ArrayList;
 
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.support.StaticExpression;
 import org.springframework.binding.mapping.DefaultAttributeMapper;
 import org.springframework.binding.mapping.MappingBuilder;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.webflow.TestException;
 import org.springframework.webflow.action.TestMultiAction;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
 import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
+import org.springframework.webflow.core.expression.DefaultExpressionParserFactory;
 import org.springframework.webflow.engine.support.BeanFactoryFlowVariable;
 import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
 import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
@@ -37,7 +35,6 @@ import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.ScopeType;
 import org.springframework.webflow.execution.TestAction;
-import org.springframework.webflow.execution.support.ApplicationView;
 import org.springframework.webflow.test.MockRequestControlContext;
 
 /**
@@ -51,11 +48,9 @@ public class FlowTests extends TestCase {
 
 	private Flow createSimpleFlow() {
 		flow = new Flow("myFlow");
-		ViewState state1 = new ViewState(flow, "myState1");
-		state1.setViewSelector(new ApplicationViewSelector(new StaticExpression("myView")));
+		ViewState state1 = new ViewState(flow, "myState1", new StubViewFactory());
 		state1.getTransitionSet().add(new Transition(on("submit"), to("myState2")));
-		EndState state2 = new EndState(flow, "myState2");
-		state2.setViewSelector(new ApplicationViewSelector(new StaticExpression("myView2")));
+		new EndState(flow, "myState2");
 		flow.getGlobalTransitionSet().add(new Transition(on("globalEvent"), to("myState2")));
 		return flow;
 	}
@@ -69,7 +64,7 @@ public class FlowTests extends TestCase {
 		assertTrue(flow.containsState("myState1"));
 		assertTrue(flow.containsState("myState2"));
 		State state = flow.getStateInstance("myState1");
-		assertEquals("Wrong flow:", "myFlow", state.getFlow().getId());
+		assertEquals("Wrong flow:", flow.getId(), state.getFlow().getId());
 		assertEquals("Wrong state:", "myState1", flow.getState("myState1").getId());
 		assertEquals("Wrong state:", "myState2", flow.getState("myState2").getId());
 	}
@@ -155,16 +150,6 @@ public class FlowTests extends TestCase {
 		assertEquals(1, flow.getEndActionList().size());
 	}
 
-	public void testAddInlineFlow() {
-		Flow inline = new Flow("inline");
-		flow.addInlineFlow(inline);
-		assertSame(inline, flow.getInlineFlow("inline"));
-		assertEquals(1, flow.getInlineFlowCount());
-		String[] inlined = flow.getInlineFlowIds();
-		assertEquals(1, inlined.length);
-		assertSame(flow.getInlineFlows()[0], inline);
-	}
-
 	public void testAddGlobalTransition() {
 		Transition t = new Transition(to("myState2"));
 		flow.getGlobalTransitionSet().add(t);
@@ -177,6 +162,17 @@ public class FlowTests extends TestCase {
 		assertEquals("Wrong start state", "myState1", context.getCurrentState().getId());
 	}
 
+	public void testStartWithoutStartState() {
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		try {
+			Flow empty = new Flow("empty");
+			empty.start(context, null);
+			fail("should have failed");
+		} catch (IllegalStateException e) {
+
+		}
+	}
+
 	public void testStartWithAction() {
 		MockRequestControlContext context = new MockRequestControlContext(flow);
 		TestAction action = new TestAction();
@@ -193,7 +189,6 @@ public class FlowTests extends TestCase {
 		beanFactory.registerPrototype("bean", ArrayList.class);
 		flow.addVariable(new BeanFactoryFlowVariable("var2", "bean", beanFactory, ScopeType.FLOW));
 		flow.start(context, new LocalAttributeMap());
-		assertEquals(2, context.getFlowScope().size());
 		context.getFlowScope().getRequired("var1", ArrayList.class);
 		context.getFlowScope().getRequired("var2", ArrayList.class);
 	}
@@ -226,7 +221,7 @@ public class FlowTests extends TestCase {
 		Event event = new Event(this, "foo");
 		try {
 			context.setLastEvent(event);
-			flow.onEvent(context);
+			flow.handleEvent(context);
 		} catch (IllegalStateException e) {
 
 		}
@@ -239,7 +234,7 @@ public class FlowTests extends TestCase {
 		context.setLastEvent(event);
 		try {
 			context.setLastEvent(event);
-			flow.onEvent(context);
+			flow.handleEvent(context);
 		} catch (IllegalStateException e) {
 
 		}
@@ -252,7 +247,7 @@ public class FlowTests extends TestCase {
 		context.setLastEvent(event);
 		assertTrue(context.getFlowExecutionContext().isActive());
 		context.setLastEvent(event);
-		flow.onEvent(context);
+		flow.handleEvent(context);
 		assertTrue(!context.getFlowExecutionContext().isActive());
 	}
 
@@ -263,7 +258,7 @@ public class FlowTests extends TestCase {
 		context.setLastEvent(event);
 		assertTrue(context.getFlowExecutionContext().isActive());
 		context.setLastEvent(event);
-		flow.onEvent(context);
+		flow.handleEvent(context);
 		assertTrue(!context.getFlowExecutionContext().isActive());
 	}
 
@@ -274,12 +269,19 @@ public class FlowTests extends TestCase {
 		context.setLastEvent(event);
 		try {
 			context.setLastEvent(event);
-			flow.onEvent(context);
+			flow.handleEvent(context);
 		} catch (NoMatchingTransitionException e) {
 
 		}
 	}
 
+	public void testResume() {
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		context.setCurrentState(flow.getStateInstance("myState1"));
+		flow.resume(context);
+		assertTrue(context.getFlowScope().getBoolean("renderCalled").booleanValue());
+	}
+
 	public void testEnd() {
 		TestAction action = new TestAction();
 		flow.getEndActionList().add(action);
@@ -301,20 +303,18 @@ public class FlowTests extends TestCase {
 		assertEquals("foo", sessionOutput.get("attr"));
 	}
 
-	public void testHandleStateException() {
+	public void testHandleException() {
 		flow.getExceptionHandlerSet().add(
 				new TransitionExecutingFlowExecutionExceptionHandler().add(TestException.class, "myState2"));
 		MockRequestControlContext context = new MockRequestControlContext(flow);
 		context.setCurrentState(flow.getStateInstance("myState1"));
 		FlowExecutionException e = new FlowExecutionException(flow.getId(), flow.getStartState().getId(), "Oops!",
 				new TestException());
-		ApplicationView selectedView = (ApplicationView) flow.handleException(e, context);
+		flow.handleException(e, context);
 		assertFalse(context.getFlowExecutionContext().isActive());
-		assertNotNull("Should not have been null", selectedView);
-		assertEquals("Wrong selected view", "myView2", selectedView.getViewName());
 	}
 
-	public void testHandleStateExceptionNoMatch() {
+	public void testHandleExceptionNoMatch() {
 		MockRequestControlContext context = new MockRequestControlContext(flow);
 		FlowExecutionException e = new FlowExecutionException(flow.getId(), flow.getStartState().getId(), "Oops!",
 				new TestException());
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/SimpleFlow.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/SimpleFlow.java
deleted file mode 100644
index 35c260d1..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/SimpleFlow.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine;
-
-import org.springframework.binding.expression.support.StaticExpression;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
-import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
-import org.springframework.webflow.engine.support.ExternalRedirectSelector;
-
-public class SimpleFlow extends Flow {
-	public SimpleFlow() {
-		super("simpleFlow");
-
-		ViewState state1 = new ViewState(this, "view");
-		state1.setViewSelector(new ApplicationViewSelector(new StaticExpression("view")));
-		state1.getTransitionSet().add(new Transition(to("end")));
-
-		EndState state2 = new EndState(this, "end");
-		state2.setViewSelector(new ExternalRedirectSelector(new StaticExpression("confirm")));
-	}
-
-	protected TargetStateResolver to(String stateId) {
-		return new DefaultTargetStateResolver(stateId);
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/StateExceptionHandlerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/StateExceptionHandlerTests.java
deleted file mode 100644
index 652b19dc..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/StateExceptionHandlerTests.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-
-/**
- * Unit tests for {@link org.springframework.webflow.engine.FlowExecutionExceptionHandler} related code.
- * 
- * @author Erwin Vervaet
- */
-public class StateExceptionHandlerTests extends TestCase {
-
-	public void testHandleException() {
-		FlowExecutionExceptionHandlerSet handlerSet = new FlowExecutionExceptionHandlerSet();
-
-		handlerSet.add(new TestStateExceptionHandler(NullPointerException.class, new ApplicationView("NOK", null)));
-		handlerSet.add(new TestStateExceptionHandler(FlowExecutionException.class, new ApplicationView("OK", null)));
-		handlerSet.add(new TestStateExceptionHandler(FlowExecutionException.class, new ApplicationView("NOK", null)));
-
-		FlowExecutionException testException = new FlowExecutionException("flowId", "stateId", "Test");
-		assertNotNull("First handler should have been ignored since it does not handle StateException", handlerSet
-				.handleException(testException, null));
-		assertEquals(
-				"Third handler should not have been reached since second handler handles excpetion and returns not-null",
-				"OK", ((ApplicationView) handlerSet.handleException(testException, null)).getViewName());
-	}
-
-	public void testHandleExceptionWithNulls() {
-		FlowExecutionExceptionHandlerSet handlerSet = new FlowExecutionExceptionHandlerSet();
-
-		handlerSet.add(new TestStateExceptionHandler(FlowExecutionException.class, null));
-		handlerSet.add(new TestStateExceptionHandler(FlowExecutionException.class, new ApplicationView("OK", null)));
-		handlerSet.add(new TestStateExceptionHandler(FlowExecutionException.class, new ApplicationView("NOK", null)));
-
-		FlowExecutionException testException = new FlowExecutionException("flowId", "stateId", "Test");
-		assertNotNull("First handler should have been ignored since it return null", handlerSet.handleException(
-				testException, null));
-		assertEquals(
-				"Third handler should not have been reached since second handler handles excpetion and returns not-null",
-				"OK", ((ApplicationView) handlerSet.handleException(testException, null)).getViewName());
-	}
-
-	public void testHandleExceptionNoMatch() {
-		FlowExecutionExceptionHandlerSet handlerSet = new FlowExecutionExceptionHandlerSet();
-
-		handlerSet.add(new TestStateExceptionHandler(FlowExecutionException.class, null));
-		handlerSet.add(new TestStateExceptionHandler(NullPointerException.class, new ApplicationView("NOK", null)));
-
-		FlowExecutionException testException = new FlowExecutionException("flowId", "stateId", "Test");
-		assertNull("First handler should have been ignored since it return null, "
-				+ "second handler should have been ignored since it does not handle the exception", handlerSet
-				.handleException(testException, null));
-	}
-
-	/**
-	 * State exception handler used in tests.
-	 */
-	public static class TestStateExceptionHandler implements FlowExecutionExceptionHandler {
-
-		private Class typeToHandle;
-		private ViewSelection handleResult;
-
-		public TestStateExceptionHandler(Class typeToHandle, ViewSelection handleResult) {
-			this.typeToHandle = typeToHandle;
-			this.handleResult = handleResult;
-		}
-
-		public boolean handles(FlowExecutionException exception) {
-			return typeToHandle.isInstance(exception);
-		}
-
-		public ViewSelection handle(FlowExecutionException exception, RequestControlContext context) {
-			return handleResult;
-		}
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/StateTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/StateTests.java
index 29a56c31..a90d80a8 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/StateTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/StateTests.java
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 
 import org.springframework.webflow.execution.FlowExecutionException;
 import org.springframework.webflow.execution.TestAction;
-import org.springframework.webflow.execution.ViewSelection;
 import org.springframework.webflow.test.MockRequestControlContext;
 
 /**
@@ -35,12 +34,13 @@ public class StateTests extends TestCase {
 
 	private boolean entered;
 
+	private boolean handled;
+
 	public void setUp() {
 		flow = new Flow("flow");
 		state = new State(flow, "myState") {
-			protected ViewSelection doEnter(RequestControlContext context) throws FlowExecutionException {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
 				entered = true;
-				return ViewSelection.NULL_VIEW;
 			}
 		};
 	}
@@ -63,4 +63,28 @@ public class StateTests extends TestCase {
 		assertTrue(entered);
 		assertEquals(1, action.getExecutionCount());
 	}
+
+	public void testHandledException() {
+		state.getExceptionHandlerSet().add(new FlowExecutionExceptionHandler() {
+			public boolean canHandle(FlowExecutionException exception) {
+				return true;
+			}
+
+			public void handle(FlowExecutionException exception, RequestControlContext context) {
+				handled = true;
+			}
+
+		});
+		FlowExecutionException e = new FlowExecutionException(flow.getId(), state.getId(), "Whatev");
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		assertTrue(state.handleException(e, context));
+		assertTrue(handled);
+	}
+
+	public void testCouldNotHandleException() {
+		FlowExecutionException e = new FlowExecutionException(flow.getId(), state.getId(), "Whatev");
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		assertFalse(state.handleException(e, context));
+	}
+
 }
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/StubViewFactory.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/StubViewFactory.java
new file mode 100644
index 00000000..d22962d1
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/StubViewFactory.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2004-2007 the original author or authors.
+ *
+ * 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.springframework.webflow.engine;
+
+import org.springframework.webflow.execution.Event;
+import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.execution.View;
+import org.springframework.webflow.execution.ViewFactory;
+
+public class StubViewFactory implements ViewFactory {
+
+	public View getView(RequestContext context) {
+		return new NullView(context);
+	}
+
+	private static class NullView implements View {
+		private RequestContext context;
+
+		public NullView(RequestContext context) {
+			this.context = context;
+		}
+
+		public void render() {
+			context.getFlowScope().put("renderCalled", Boolean.TRUE);
+		}
+
+		public boolean eventSignaled() {
+			return context.getExternalContext().getRequestParameterMap().contains("_eventId");
+		}
+
+		public Event getEvent() {
+			return new Event(this, context.getExternalContext().getRequestParameterMap().get("_eventId"));
+		}
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/SubflowStateTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/SubflowStateTests.java
index 5ce63db6..2dde7187 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/SubflowStateTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/SubflowStateTests.java
@@ -17,20 +17,16 @@ package org.springframework.webflow.engine;
 
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.support.StaticExpression;
-import org.springframework.binding.mapping.DefaultAttributeMapper;
-import org.springframework.binding.mapping.MappingBuilder;
-import org.springframework.webflow.action.AttributeMapperAction;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.engine.impl.FlowExecutionImpl;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
+import org.springframework.binding.mapping.AttributeMapper;
+import org.springframework.binding.mapping.MappingContext;
+import org.springframework.webflow.core.collection.AttributeMap;
+import org.springframework.webflow.core.collection.LocalAttributeMap;
+import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
 import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockExternalContext;
-import org.springframework.webflow.test.MockParameterMap;
+import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.RequestContext;
+import org.springframework.webflow.test.MockRequestControlContext;
 
 /**
  * Tests that each of the Flow state types execute as expected when entered.
@@ -39,72 +35,77 @@ import org.springframework.webflow.test.MockParameterMap;
  */
 public class SubflowStateTests extends TestCase {
 
-	public void testSubFlowState() {
-		Flow subFlow = new Flow("mySubFlow");
-		ViewState state1 = new ViewState(subFlow, "subFlowViewState");
-		state1.setViewSelector(view("mySubFlowViewName"));
-		state1.getTransitionSet().add(new Transition(on("submit"), to("finish")));
-		new EndState(subFlow, "finish");
+	private Flow parentFlow;
+	private SubflowState subflowState;
+	private Flow subflow;
+	private MockRequestControlContext context;
 
-		Flow flow = new Flow("myFlow");
-		SubflowState state2 = new SubflowState(flow, "subFlowState", subFlow);
-		state2.getTransitionSet().add(new Transition(on("finish"), to("finish")));
-
-		EndState state3 = new EndState(flow, "finish");
-		state3.setViewSelector(view("myParentFlowEndingViewName"));
-
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		ApplicationView view = (ApplicationView) flowExecution.start(null, new MockExternalContext());
-		assertEquals("mySubFlow", flowExecution.getActiveSession().getDefinition().getId());
-		assertEquals("subFlowViewState", flowExecution.getActiveSession().getState().getId());
-		assertEquals("mySubFlowViewName", view.getViewName());
-		view = (ApplicationView) flowExecution.signalEvent("submit", new MockExternalContext());
-		assertEquals("myParentFlowEndingViewName", view.getViewName());
-		assertTrue(!flowExecution.isActive());
+	public void setUp() {
+		parentFlow = new Flow("parent");
+		subflow = new Flow("child");
+		subflowState = new SubflowState(parentFlow, "subflow", subflow);
+		context = new MockRequestControlContext(parentFlow);
+		context.setCurrentState(subflowState);
 	}
 
-	public void testSubFlowStateModelMapping() {
-		Flow subFlow = new Flow("mySubFlow");
-		MappingBuilder mapping = new MappingBuilder(DefaultExpressionParserFactory.getExpressionParser());
-		DefaultAttributeMapper inputMapper = new DefaultAttributeMapper();
-		inputMapper.addMapping(mapping.source("childInputAttribute").target("flowScope.childInputAttribute").value());
-		subFlow.setInputMapper(inputMapper);
-		ViewState state1 = new ViewState(subFlow, "subFlowViewState");
-		state1.setViewSelector(view("mySubFlowViewName"));
-		state1.getTransitionSet().add(new Transition(on("submit"), to("finish")));
-		EndState state2 = new EndState(subFlow, "finish");
-		DefaultAttributeMapper outputMapper = new DefaultAttributeMapper();
-		outputMapper.addMapping(mapping.source("flowScope.childInputAttribute").target("childInputAttribute").value());
-		state2.setOutputMapper(outputMapper);
+	public void testEnter() {
+		new State(subflow, "whatev") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+		subflowState.enter(context);
+		assertEquals("child", context.getActiveFlow().getId());
+	}
 
-		Flow flow = new Flow("myFlow");
-		ActionState mapperState = new ActionState(flow, "mapperState");
-		DefaultAttributeMapper mapper = new DefaultAttributeMapper();
-		mapper.addMapping(mapping.source("externalContext.requestParameterMap.parentInputAttribute").target(
-				"flowScope.parentInputAttribute").value());
-		Action mapperAction = new AttributeMapperAction(mapper);
-		mapperState.getActionList().add(mapperAction);
-		mapperState.getTransitionSet().add(new Transition(on("success"), to("subFlowState")));
+	public void testEnterWithInput() {
+		subflowState.setAttributeMapper(new FlowAttributeMapper() {
+			public MutableAttributeMap createFlowInput(RequestContext context) {
+				return new LocalAttributeMap("foo", "bar");
+			}
 
-		SubflowState subflowState = new SubflowState(flow, "subFlowState", subFlow);
-		subflowState.setAttributeMapper(new TestAttributeMapper());
-		subflowState.getTransitionSet().add(new Transition(on("finish"), to("finish")));
+			public void mapFlowOutput(AttributeMap flowOutput, RequestContext context) {
+			}
+		});
+		subflow.setInputMapper(new AttributeMapper() {
+			public void map(Object source, Object target, MappingContext context) {
+				MutableAttributeMap map = (MutableAttributeMap) source;
+				assertEquals("bar", map.get("foo"));
+			}
+		});
+		new State(subflow, "whatev") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+		subflowState.enter(context);
+		assertEquals("child", context.getActiveFlow().getId());
+	}
 
-		EndState endState = new EndState(flow, "finish");
-		endState.setViewSelector(view("myParentFlowEndingViewName"));
+	public void testReturnWithOutput() {
+		subflowState.setAttributeMapper(new FlowAttributeMapper() {
+			public MutableAttributeMap createFlowInput(RequestContext context) {
+				return new LocalAttributeMap();
+			}
 
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		MockParameterMap input = new MockParameterMap();
-		input.put("parentInputAttribute", "attributeValue");
-		ApplicationView view = (ApplicationView) flowExecution.start(null, new MockExternalContext(input));
-		assertEquals("mySubFlow", flowExecution.getActiveSession().getDefinition().getId());
-		assertEquals("subFlowViewState", flowExecution.getActiveSession().getState().getId());
-		assertEquals("mySubFlowViewName", view.getViewName());
-		assertEquals("attributeValue", flowExecution.getActiveSession().getScope().get("childInputAttribute"));
-		view = (ApplicationView) flowExecution.signalEvent("submit", new MockExternalContext());
-		assertEquals("myParentFlowEndingViewName", view.getViewName());
-		assertTrue(!flowExecution.isActive());
-		assertEquals("attributeValue", view.getModel().get("parentOutputAttribute"));
+			public void mapFlowOutput(AttributeMap flowOutput, RequestContext context) {
+				assertEquals("bar", flowOutput.get("foo"));
+			}
+		});
+		subflowState.getTransitionSet().add(new Transition(on("end"), to("whatev")));
+		new State(parentFlow, "whatev") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+
+		new EndState(subflow, "end");
+		subflow.setOutputMapper(new AttributeMapper() {
+			public void map(Object source, Object target, MappingContext context) {
+				MutableAttributeMap map = (MutableAttributeMap) target;
+				map.put("foo", "bar");
+			}
+
+		});
+		subflowState.enter(context);
+		assertEquals("parent", context.getActiveFlow().getId());
 	}
 
 	protected TransitionCriteria on(String event) {
@@ -115,7 +116,4 @@ public class SubflowStateTests extends TestCase {
 		return new DefaultTargetStateResolver(stateId);
 	}
 
-	protected ViewSelector view(String viewName) {
-		return new ApplicationViewSelector(new StaticExpression(viewName));
-	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/TransitionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/TransitionTests.java
index 8eb8bdc6..eba48bb0 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/TransitionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/TransitionTests.java
@@ -18,49 +18,99 @@ package org.springframework.webflow.engine;
 import junit.framework.TestCase;
 
 import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
-import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
-import org.springframework.webflow.execution.TestAction;
+import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.RequestContext;
 import org.springframework.webflow.test.MockRequestControlContext;
 
 public class TransitionTests extends TestCase {
 
-	public void testSimpleTransition() {
-		Transition t = new Transition(to("target"));
+	private boolean reenterCalled;
+	private boolean exitCalled;
+
+	public void testExecuteTransitionFromState() {
 		Flow flow = new Flow("flow");
-		ViewState source = new ViewState(flow, "source");
-		TestAction action = new TestAction();
-		source.getExitActionList().add(action);
-		ViewState target = new ViewState(flow, "target");
+		final TransitionableState source = new TransitionableState(flow, "state 1") {
+			public void exit(RequestControlContext context) {
+				exitCalled = true;
+			}
+
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+		final TransitionableState target = new TransitionableState(flow, "state 2") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+		TargetStateResolver targetResolver = new TargetStateResolver() {
+			public State resolveTargetState(Transition transition, State sourceState, RequestContext context) {
+				assertSame(source, sourceState);
+				return target;
+			}
+		};
 		MockRequestControlContext context = new MockRequestControlContext(flow);
 		context.setCurrentState(source);
+		Transition t = new Transition(targetResolver);
 		t.execute(source, context);
-		assertTrue(t.matches(context));
-		assertEquals(t, context.getLastTransition());
-		assertEquals(context.getCurrentState(), target);
-		assertEquals(1, action.getExecutionCount());
+		assertTrue(exitCalled);
+		assertSame(target, context.getCurrentState());
 	}
 
-	public void testTransitionCriteriaDoesNotMatch() {
-		Transition t = new Transition(new EventIdTransitionCriteria("bogus"), to("target"));
-		MockRequestControlContext context = new MockRequestControlContext(new Flow("flow"));
-		assertFalse(t.matches(context));
-	}
-
-	public void testTransitionCannotExecute() {
-		Transition t = new Transition(to("target"));
-		t.setExecutionCriteria(new EventIdTransitionCriteria("bogus"));
+	public void testExecuteTransitionWithNullSourceState() {
 		Flow flow = new Flow("flow");
-		ViewState source = new ViewState(flow, "source");
-		TestAction action = new TestAction();
-		source.getExitActionList().add(action);
-		new ViewState(flow, "target");
+		final TransitionableState target = new TransitionableState(flow, "state 2") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+		TargetStateResolver targetResolver = new TargetStateResolver() {
+			public State resolveTargetState(Transition transition, State sourceState, RequestContext context) {
+				assertNull(sourceState);
+				return target;
+			}
+		};
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		Transition t = new Transition(targetResolver);
+		t.execute(null, context);
+		assertSame(target, context.getCurrentState());
+	}
+
+	public void testTransitionExecutionRefused() {
+		Flow flow = new Flow("flow");
+		final TransitionableState source = new TransitionableState(flow, "state 1") {
+
+			public void reenter(RequestControlContext context) {
+				reenterCalled = true;
+				super.reenter(context);
+			}
+
+			public void exit(RequestControlContext context) {
+				exitCalled = true;
+			}
+
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+		final TransitionableState target = new TransitionableState(flow, "state 2") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+		TargetStateResolver targetResolver = new TargetStateResolver() {
+			public State resolveTargetState(Transition transition, State sourceState, RequestContext context) {
+				assertSame(source, sourceState);
+				return target;
+			}
+		};
 		MockRequestControlContext context = new MockRequestControlContext(flow);
 		context.setCurrentState(source);
+		Transition t = new Transition(targetResolver);
+		t.setExecutionCriteria(new TransitionCriteria() {
+			public boolean test(RequestContext context) {
+				return false;
+			}
+		});
 		t.execute(source, context);
-		assertTrue(t.matches(context));
-		assertEquals(null, context.getLastTransition());
-		assertEquals(context.getCurrentState(), source);
-		assertEquals(0, action.getExecutionCount());
+		assertFalse(exitCalled);
+		assertTrue(reenterCalled);
+		assertSame(source, context.getCurrentState());
 	}
 
 	protected TargetStateResolver to(String stateId) {
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/ViewStateTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/ViewStateTests.java
index 2802cbcc..ab8f0d87 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/ViewStateTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/ViewStateTests.java
@@ -17,87 +17,80 @@ package org.springframework.webflow.engine;
 
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.support.StaticExpression;
-import org.springframework.webflow.engine.impl.FlowExecutionImpl;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
 import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
 import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.TestAction;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockExternalContext;
+import org.springframework.webflow.test.MockRequestControlContext;
 
 /**
- * Tests that each of the Flow state types execute as expected when entered.
- * 
+ * Tests that ViewState logic is correct.
  * @author Keith Donald
  */
 public class ViewStateTests extends TestCase {
 
-	public void testViewState() {
+	public void testEnterViewState() {
 		Flow flow = new Flow("myFlow");
-		ViewState state = new ViewState(flow, "viewState");
-		state.setViewSelector(view("myViewName"));
+		StubViewFactory viewFactory = new StubViewFactory();
+		ViewState state = new ViewState(flow, "viewState", viewFactory);
 		state.getTransitionSet().add(new Transition(on("submit"), to("finish")));
 		new EndState(flow, "finish");
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		ApplicationView view = (ApplicationView) flowExecution.start(null, new MockExternalContext());
-		assertEquals("viewState", flowExecution.getActiveSession().getState().getId());
-		assertNotNull(view);
-		assertEquals("myViewName", view.getViewName());
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		state.enter(context);
+		assertTrue("Render not called", context.getFlowScope().contains("renderCalled"));
+		assertFalse(context.getFlowExecutionRedirectSent());
 	}
 
-	public void testViewStateMarker() {
+	public void testEnterViewStateWithLocalRedirect() {
 		Flow flow = new Flow("myFlow");
-		ViewState state = new ViewState(flow, "viewState");
+		StubViewFactory viewFactory = new StubViewFactory();
+		ViewState state = new ViewState(flow, "viewState", viewFactory);
+		state.setRedirect(true);
 		state.getTransitionSet().add(new Transition(on("submit"), to("finish")));
 		new EndState(flow, "finish");
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		ViewSelection view = flowExecution.start(null, new MockExternalContext());
-		assertEquals("viewState", flowExecution.getActiveSession().getState().getId());
-		assertEquals(ViewSelection.NULL_VIEW, view);
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		state.enter(context);
+		assertFalse("Render called", context.getFlowScope().contains("renderCalled"));
+		assertNotNull(context.getMockExternalContext().getFlowExecutionRedirectResult());
 	}
 
-	public void testViewStateNotRenderableSelection() {
+	public void testEnterViewStateWithAlwaysRedirectOnPause() {
 		Flow flow = new Flow("myFlow");
-		ViewState state = new ViewState(flow, "viewState");
-		state.setViewSelector(new ApplicationViewSelector(new StaticExpression("myView"), true));
-		TestAction action = new TestAction();
-		state.getRenderActionList().add(action);
+		StubViewFactory viewFactory = new StubViewFactory();
+		ViewState state = new ViewState(flow, "viewState", viewFactory);
 		state.getTransitionSet().add(new Transition(on("submit"), to("finish")));
 		new EndState(flow, "finish");
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		assertFalse(action.isExecuted());
-
-		flowExecution.start(null, new MockExternalContext());
-		assertEquals("viewState", flowExecution.getActiveSession().getState().getId());
-		assertFalse(action.isExecuted());
-		assertEquals(action.getExecutionCount(), 0);
-
-		flowExecution.refresh(new MockExternalContext());
-		assertEquals(action.getExecutionCount(), 1);
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		context.setAlwaysRedirectOnPause(true);
+		state.enter(context);
+		assertFalse("Render called", context.getFlowScope().contains("renderCalled"));
+		assertNotNull(context.getMockExternalContext().getFlowExecutionRedirectResult());
 	}
 
-	public void testViewStateRenderableSelection() {
+	public void testResumeViewStateForRefresh() {
 		Flow flow = new Flow("myFlow");
-		ViewState state = new ViewState(flow, "viewState");
-		state.setViewSelector(new ApplicationViewSelector(new StaticExpression("test")));
-		TestAction action = new TestAction();
-		state.getRenderActionList().add(action);
+		StubViewFactory viewFactory = new StubViewFactory();
+		ViewState state = new ViewState(flow, "viewState", viewFactory);
 		state.getTransitionSet().add(new Transition(on("submit"), to("finish")));
 		new EndState(flow, "finish");
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		assertFalse(action.isExecuted());
-
-		flowExecution.start(null, new MockExternalContext());
-		assertEquals("viewState", flowExecution.getActiveSession().getState().getId());
-		assertTrue(action.isExecuted());
-		assertEquals(action.getExecutionCount(), 1);
-
-		flowExecution.refresh(new MockExternalContext());
-		assertEquals(action.getExecutionCount(), 2);
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		state.enter(context);
+		context = new MockRequestControlContext(context.getFlowExecutionContext());
+		state.resume(context);
+		assertTrue("Render not called", context.getFlowScope().contains("renderCalled"));
+		assertFalse(context.getFlowExecutionRedirectSent());
+	}
 
+	public void testResumeViewStateForEvent() {
+		Flow flow = new Flow("myFlow");
+		StubViewFactory viewFactory = new StubViewFactory();
+		ViewState state = new ViewState(flow, "viewState", viewFactory);
+		state.getTransitionSet().add(new Transition(on("submit"), to("finish")));
+		new EndState(flow, "finish");
+		MockRequestControlContext context = new MockRequestControlContext(flow);
+		state.enter(context);
+		context = new MockRequestControlContext(context.getFlowExecutionContext());
+		context.putRequestParameter("_eventId", "submit");
+		state.resume(context);
+		assertFalse(context.getFlowExecutionContext().isActive());
 	}
 
 	protected TransitionCriteria on(String event) {
@@ -108,7 +101,4 @@ public class ViewStateTests extends TestCase {
 		return new DefaultTargetStateResolver(stateId);
 	}
 
-	public static ViewSelector view(String viewName) {
-		return new ApplicationViewSelector(new StaticExpression(viewName));
-	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderParameterizationTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderParameterizationTests.java
deleted file mode 100644
index 7a3df47b..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderParameterizationTests.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.definition.registry.FlowDefinitionHolder;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistrar;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockFlowServiceLocator;
-import org.springframework.webflow.test.MockRequestControlContext;
-
-/**
- * Test parameterization of flow built using an AbstractFlowBuilder when registering the flows with a
- * FlowDefinitionRegistry.
- */
-public class AbstractFlowBuilderParameterizationTests extends TestCase {
-
-	private FlowDefinitionRegistry registry;
-
-	protected void setUp() throws Exception {
-		registry = new FlowDefinitionRegistryImpl();
-		MockFlowServiceLocator flowServiceLocator = new MockFlowServiceLocator();
-		flowServiceLocator.registerBean("testAction", new ParameterizationTestAction());
-		new TestFlowRegistrar(flowServiceLocator).registerFlowDefinitions(registry);
-	}
-
-	public void testFlowParameterization() {
-		assertEquals(2, registry.getFlowDefinitionCount());
-		assertTrue(registry.containsFlowDefinition("flowA"));
-		Flow flowA = (Flow) registry.getFlowDefinition("flowA");
-		assertEquals(2, flowA.getAttributes().size());
-		assertEquals("A", flowA.getAttributes().get("name"));
-		assertEquals("someValue", flowA.getAttributes().get("someKey"));
-		assertNull(flowA.getAttributes().get("someOtherKey"));
-
-		assertTrue(registry.containsFlowDefinition("flowB"));
-		Flow flowB = (Flow) registry.getFlowDefinition("flowB");
-		assertEquals(2, flowB.getAttributes().size());
-		assertEquals("B", flowB.getAttributes().get("name"));
-		assertEquals("someOtherValue", flowB.getAttributes().get("someOtherKey"));
-		assertNull(flowB.getAttributes().get("someKey"));
-	}
-
-	public void testFlowParameterizationAtRuntime() {
-		Flow flowA = (Flow) registry.getFlowDefinition("flowA");
-		ViewSelection viewSelection = flowA.start(new MockRequestControlContext(flowA), null);
-		assertEquals("A", ((ApplicationView) viewSelection).getViewName());
-
-		Flow flowB = (Flow) registry.getFlowDefinition("flowB");
-		viewSelection = flowB.start(new MockRequestControlContext(flowB), null);
-		assertEquals("B", ((ApplicationView) viewSelection).getViewName());
-	}
-
-	public class TestFlowBuilder extends AbstractFlowBuilder {
-
-		public TestFlowBuilder(FlowServiceLocator flowServiceLocator) {
-			setFlowServiceLocator(flowServiceLocator);
-		}
-
-		public void buildStates() throws FlowBuilderException {
-			addActionState("test", action("testAction"), transition(on(success()), to("finish")));
-			addEndState("finish", "${activeFlow.attributes['name']}");
-		}
-	}
-
-	private class TestFlowRegistrar implements FlowDefinitionRegistrar {
-
-		private FlowServiceLocator flowServiceLocator;
-
-		public TestFlowRegistrar(FlowServiceLocator flowServiceLocator) {
-			this.flowServiceLocator = flowServiceLocator;
-		}
-
-		public void registerFlowDefinitions(FlowDefinitionRegistry registry) {
-			MutableAttributeMap attributesA = new LocalAttributeMap();
-			attributesA.put("name", "A");
-			attributesA.put("someKey", "someValue");
-			Flow flowA = new FlowAssembler("flowA", attributesA, new TestFlowBuilder(flowServiceLocator))
-					.assembleFlow();
-			FlowDefinitionHolder flowHolderA = new StaticFlowDefinitionHolder(flowA);
-			registry.registerFlowDefinition(flowHolderA);
-
-			MutableAttributeMap attributesB = new LocalAttributeMap();
-			attributesB.put("name", "B");
-			attributesB.put("someOtherKey", "someOtherValue");
-			Flow flowB = new FlowAssembler("flowB", attributesB, new TestFlowBuilder(flowServiceLocator))
-					.assembleFlow();
-			FlowDefinitionHolder flowHolderB = new StaticFlowDefinitionHolder(flowB);
-			registry.registerFlowDefinition(flowHolderB);
-		}
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderTests.java
deleted file mode 100644
index c8426fc5..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/AbstractFlowBuilderTests.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.action.MultiAction;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.engine.ActionState;
-import org.springframework.webflow.engine.AnnotatedAction;
-import org.springframework.webflow.engine.EndState;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.FlowAttributeMapper;
-import org.springframework.webflow.engine.SubflowState;
-import org.springframework.webflow.engine.Transition;
-import org.springframework.webflow.engine.ViewState;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockExternalContext;
-import org.springframework.webflow.test.MockRequestContext;
-
-/**
- * Test Java based flow builder logic (subclasses of AbstractFlowBuilder).
- * 
- * @see org.springframework.webflow.engine.builder.AbstractFlowBuilder
- * 
- * @author Keith Donald
- * @author Rod Johnson
- * @author Colin Sampaleanu
- */
-public class AbstractFlowBuilderTests extends TestCase {
-
-	private String PERSONS_LIST = "person.List";
-
-	private static String PERSON_DETAILS = "person.Detail";
-
-	private AbstractFlowBuilder builder = createBuilder();
-
-	protected AbstractFlowBuilder createBuilder() {
-		return new AbstractFlowBuilder() {
-			public void buildStates() {
-				addEndState("finish");
-			}
-		};
-	}
-
-	public void testDependencyLookup() {
-		TestMasterFlowBuilderLookupById master = new TestMasterFlowBuilderLookupById();
-		master.setFlowServiceLocator(new BaseFlowServiceLocator() {
-			public Flow getSubflow(String id) throws FlowArtifactLookupException {
-				if (id.equals(PERSON_DETAILS)) {
-					BaseFlowBuilder builder = new TestDetailFlowBuilderLookupById();
-					builder.setFlowServiceLocator(this);
-					FlowAssembler assembler = new FlowAssembler(PERSON_DETAILS, builder);
-					return assembler.assembleFlow();
-				} else {
-					throw new FlowArtifactLookupException(id, Flow.class);
-				}
-			}
-
-			public Action getAction(String id) throws FlowArtifactLookupException {
-				return new NoOpAction();
-			}
-
-			public FlowAttributeMapper getAttributeMapper(String id) throws FlowArtifactLookupException {
-				if (id.equals("id.attributeMapper")) {
-					return new PersonIdMapper();
-				} else {
-					throw new FlowArtifactLookupException(id, FlowAttributeMapper.class);
-				}
-			}
-		});
-
-		FlowAssembler assembler = new FlowAssembler(PERSONS_LIST, master);
-		Flow flow = assembler.assembleFlow();
-
-		assertEquals("person.List", flow.getId());
-		assertTrue(flow.getStateCount() == 4);
-		assertTrue(flow.containsState("getPersonList"));
-		assertTrue(flow.getState("getPersonList") instanceof ActionState);
-		assertTrue(flow.containsState("viewPersonList"));
-		assertTrue(flow.getState("viewPersonList") instanceof ViewState);
-		assertTrue(flow.containsState("person.Detail"));
-		assertTrue(flow.getState("person.Detail") instanceof SubflowState);
-		assertTrue(flow.containsState("finish"));
-		assertTrue(flow.getState("finish") instanceof EndState);
-	}
-
-	public void testNoArtifactFactorySet() {
-		TestMasterFlowBuilderLookupById master = new TestMasterFlowBuilderLookupById();
-		try {
-			FlowAssembler assembler = new FlowAssembler(PERSONS_LIST, master);
-			assembler.assembleFlow();
-			fail("Should have failed, artifact lookup not supported");
-		} catch (UnsupportedOperationException e) {
-			// expected
-		}
-	}
-
-	public class TestMasterFlowBuilderLookupById extends AbstractFlowBuilder {
-		public void buildStates() {
-			addActionState("getPersonList", action("noOpAction"), transition(on(success()), to("viewPersonList")));
-			addViewState("viewPersonList", "person.list.view", transition(on(submit()), to("person.Detail")));
-			addSubflowState(PERSON_DETAILS, flow("person.Detail"), attributeMapper("id.attributeMapper"), transition(
-					on("*"), to("getPersonList")));
-			addEndState("finish");
-		}
-	}
-
-	public class TestMasterFlowBuilderDependencyInjection extends AbstractFlowBuilder {
-		private NoOpAction noOpAction;
-
-		private Flow subFlow;
-
-		private PersonIdMapper personIdMapper;
-
-		public void setNoOpAction(NoOpAction noOpAction) {
-			this.noOpAction = noOpAction;
-		}
-
-		public void setPersonIdMapper(PersonIdMapper personIdMapper) {
-			this.personIdMapper = personIdMapper;
-		}
-
-		public void setSubFlow(Flow subFlow) {
-			this.subFlow = subFlow;
-		}
-
-		public void buildStates() {
-			addActionState("getPersonList", noOpAction, transition(on(success()), to("viewPersonList")));
-			addViewState("viewPersonList", "person.list.view", transition(on(submit()), to("person.Detail")));
-			addSubflowState(PERSON_DETAILS, subFlow, personIdMapper, transition(on("*"), to("getPersonList")));
-			addEndState("finish");
-		}
-	}
-
-	public static class PersonIdMapper implements FlowAttributeMapper {
-		public MutableAttributeMap createFlowInput(RequestContext context) {
-			LocalAttributeMap inputMap = new LocalAttributeMap();
-			inputMap.put("personId", context.getFlowScope().get("personId"));
-			return inputMap;
-		}
-
-		public void mapFlowOutput(AttributeMap subflowOutput, RequestContext context) {
-		}
-	}
-
-	public static class TestDetailFlowBuilderLookupById extends AbstractFlowBuilder {
-		public void buildStates() {
-			addActionState("getDetails", action("noOpAction"), transition(on(success()), to("viewDetails")));
-			addViewState("viewDetails", "person.Detail.view", transition(on(submit()), to("bindAndValidateDetails")));
-			addActionState("bindAndValidateDetails", action("noOpAction"), new Transition[] {
-					transition(on(error()), to("viewDetails")), transition(on(success()), to("finish")) });
-			addEndState("finish");
-		}
-	}
-
-	public static class TestDetailFlowBuilderDependencyInjection extends AbstractFlowBuilder {
-
-		private NoOpAction noOpAction;
-
-		public void setNoOpAction(NoOpAction noOpAction) {
-			this.noOpAction = noOpAction;
-		}
-
-		public void buildStates() {
-			addActionState("getDetails", noOpAction, transition(on(success()), to("viewDetails")));
-			addViewState("viewDetails", "person.Detail.view", transition(on(submit()), to("bindAndValidateDetails")));
-			addActionState("bindAndValidateDetails", noOpAction, new Transition[] {
-					transition(on(error()), to("viewDetails")), transition(on(success()), to("finish")) });
-			addEndState("finish");
-		}
-	};
-
-	/**
-	 * Action bean stub that does nothing, just returns a "success" result.
-	 */
-	public static final class NoOpAction implements Action {
-		public Event execute(RequestContext context) throws Exception {
-			return new Event(this, "success");
-		}
-	}
-
-	public void testConfigureMultiAction() throws Exception {
-		MultiAction multiAction = new MultiAction(new MultiActionTarget());
-		AnnotatedAction action = builder.invoke("foo", multiAction);
-		assertEquals("foo", action.getAttributeMap().get(AnnotatedAction.METHOD_ATTRIBUTE));
-		assertEquals("success", action.execute(new MockRequestContext()).getId());
-	}
-
-	public static class MultiActionTarget {
-		public Event foo(RequestContext context) {
-			return new Event(this, "success");
-		}
-	}
-
-	public void testEndStateRefresh() {
-		FlowBuilder builder = new AbstractFlowBuilder() {
-			public void buildStates() throws FlowBuilderException {
-				addEndState("theEnd", "redirect:endView");
-			}
-		};
-		Flow testFlow = new FlowAssembler("testFlow", builder).assembleFlow();
-		assertTrue(testFlow.getStartState() instanceof EndState);
-		assertTrue(((EndState) testFlow.getStartState()).getViewSelector() instanceof ApplicationViewSelector);
-		assertTrue(((ApplicationViewSelector) ((EndState) testFlow.getStartState()).getViewSelector()).isRedirect());
-
-		FlowExecution execution = new FlowExecutionImplFactory().createFlowExecution(testFlow);
-		ViewSelection viewSelection = execution.start(null, new MockExternalContext());
-		assertTrue("redirect: should be ignored for end states", viewSelection instanceof ApplicationView);
-		assertEquals("endView", ((ApplicationView) viewSelection).getViewName());
-		assertFalse(execution.isActive());
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/BaseFlowServiceLocatorTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/BaseFlowServiceLocatorTests.java
deleted file mode 100644
index 06978c91..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/BaseFlowServiceLocatorTests.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.binding.convert.support.GenericConversionService;
-import org.springframework.binding.convert.support.TextToBoolean;
-import org.springframework.webflow.engine.NullViewSelector;
-import org.springframework.webflow.engine.ViewSelector;
-
-import junit.framework.TestCase;
-
-/**
- * Test case for the {@link BaseFlowServiceLocator}.
- * 
- * @author Erwin Vervaet
- */
-public class BaseFlowServiceLocatorTests extends TestCase {
-
-	public void testWithCustomConversionService() {
-		BaseFlowServiceLocator serviceLocator = new BaseFlowServiceLocator();
-
-		GenericConversionService conversionService = new GenericConversionService();
-		conversionService.addConverter(new TextToBoolean("ja", "nee"));
-		conversionService.addConverter(new CustomTextToViewSelector(serviceLocator));
-
-		serviceLocator.setConversionService(conversionService);
-
-		assertEquals(Boolean.TRUE, serviceLocator.getConversionService().getConversionExecutor(String.class,
-				Boolean.class).execute("ja"));
-		assertSame(NullViewSelector.INSTANCE, serviceLocator.getConversionService().getConversionExecutor(String.class,
-				ViewSelector.class).execute("custom:"));
-	}
-
-	public static class CustomTextToViewSelector extends TextToViewSelector {
-
-		public CustomTextToViewSelector(FlowServiceLocator flowServiceLocator) {
-			super(flowServiceLocator);
-		}
-
-		protected ViewSelector convertEncodedViewSelector(String encodedView) {
-			return NullViewSelector.INSTANCE;
-		}
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/FlowAssemblerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/FlowAssemblerTests.java
new file mode 100644
index 00000000..95c629c0
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/FlowAssemblerTests.java
@@ -0,0 +1,50 @@
+package org.springframework.webflow.engine.builder;
+
+import junit.framework.TestCase;
+
+import org.easymock.EasyMock;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.test.MockFlowBuilderContext;
+
+public class FlowAssemblerTests extends TestCase {
+	private FlowBuilder builder;
+	private FlowAssembler assembler;
+	private FlowBuilderContext builderContext;
+
+	protected void setUp() {
+		builder = (FlowBuilder) EasyMock.createMock(FlowBuilder.class);
+		builderContext = new MockFlowBuilderContext("search");
+		assembler = new FlowAssembler(builder, builderContext);
+	}
+
+	public void testAssembleFlow() {
+		builder.init(builderContext);
+		builder.dispose();
+		builder.buildVariables();
+		builder.buildInputMapper();
+		builder.buildStartActions();
+		builder.buildStates();
+		builder.buildGlobalTransitions();
+		builder.buildEndActions();
+		builder.buildOutputMapper();
+		builder.buildExceptionHandlers();
+		EasyMock.expect(builder.getFlow()).andReturn(new Flow("search"));
+		EasyMock.replay(new Object[] { builder });
+		Flow flow = assembler.assembleFlow();
+		assertEquals("search", flow.getId());
+		EasyMock.verify(new Object[] { builder });
+	}
+
+	public void testDisposeCalledOnException() {
+		builder.init(builderContext);
+		EasyMock.expectLastCall().andThrow(new IllegalArgumentException());
+		builder.dispose();
+		EasyMock.replay(new Object[] { builder });
+		try {
+			assembler.assembleFlow();
+			fail("Should have failed");
+		} catch (IllegalArgumentException e) {
+			EasyMock.verify(new Object[] { builder });
+		}
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/MyCustomStateExceptionHandler.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/MyCustomStateExceptionHandler.java
deleted file mode 100644
index d06d0b21..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/MyCustomStateExceptionHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
-import org.springframework.webflow.engine.RequestControlContext;
-import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.ViewSelection;
-
-public class MyCustomStateExceptionHandler implements FlowExecutionExceptionHandler {
-
-	public boolean handles(FlowExecutionException e) {
-		return false;
-	}
-
-	public ViewSelection handle(FlowExecutionException e, RequestControlContext context) {
-		return null;
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/ParameterizationTestAction.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/ParameterizationTestAction.java
deleted file mode 100644
index 2e36aef3..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/ParameterizationTestAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import junit.framework.Assert;
-
-import org.springframework.webflow.action.AbstractAction;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-
-/**
- * Test action used by some unit tests.
- * 
- * @author Erwin Vervaet
- */
-public class ParameterizationTestAction extends AbstractAction {
-
-	protected Event doExecute(RequestContext context) throws Exception {
-		if ("flowA".equals(context.getActiveFlow().getId())) {
-			Flow flowA = (Flow) context.getActiveFlow();
-			Assert.assertEquals(2, flowA.getAttributes().size());
-			Assert.assertEquals("A", flowA.getAttributes().get("name"));
-			Assert.assertEquals("someValue", flowA.getAttributes().get("someKey"));
-			Assert.assertNull(flowA.getAttributes().get("someOtherKey"));
-		} else if ("flowB".equals(context.getActiveFlow().getId())) {
-			Flow flowB = (Flow) context.getActiveFlow();
-			Assert.assertEquals(2, flowB.getAttributes().size());
-			Assert.assertEquals("B", flowB.getAttributes().get("name"));
-			Assert.assertEquals("someOtherValue", flowB.getAttributes().get("someOtherKey"));
-			Assert.assertNull(flowB.getAttributes().get("someKey"));
-		} else {
-			throw new IllegalStateException();
-		}
-		return success();
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/RefreshableFlowDefinitionHolderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/RefreshableFlowDefinitionHolderTests.java
index 57a6a89b..f521e0f8 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/RefreshableFlowDefinitionHolderTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/RefreshableFlowDefinitionHolderTests.java
@@ -1,113 +1,58 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.springframework.core.io.AbstractResource;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.engine.builder.xml.XmlFlowBuilder;
-import org.springframework.webflow.util.ResourceHolder;
-
-/**
- * Unit tests for {@link RefreshableFlowDefinitionHolder}.
- */
-public class RefreshableFlowDefinitionHolderTests extends TestCase {
-
-	public void testNoRefreshOnNoChange() {
-		File parent = new File("src/test/java/org/springframework/webflow/engine/builder/xml");
-		Resource location = new FileSystemResource(new File(parent, "flow.xml"));
-		XmlFlowBuilder flowBuilder = new XmlFlowBuilder(location);
-		FlowAssembler assembler = new FlowAssembler("flow", flowBuilder);
-		RefreshableFlowDefinitionHolder holder = new RefreshableFlowDefinitionHolder(assembler);
-		assertEquals("flow", holder.getFlowDefinitionId());
-		assertSame(flowBuilder, holder.getFlowBuilder());
-		assertEquals(0, holder.getLastModified());
-		assertTrue(!holder.isAssembled());
-		FlowDefinition flow1 = holder.getFlowDefinition();
-		assertTrue(holder.isAssembled());
-		long lastModified = holder.getLastModified();
-		assertTrue(lastModified != -1);
-		assertTrue(lastModified > 0);
-		FlowDefinition flow2 = holder.getFlowDefinition();
-		assertEquals("flow", flow2.getId());
-		assertEquals(lastModified, holder.getLastModified());
-		assertSame(flow1, flow2);
-	}
-
-	public void testReloadOnChange() throws Exception {
-		MockFlowBuilder mockFlowBuilder = new MockFlowBuilder();
-		FlowAssembler assembler = new FlowAssembler("mockFlow", mockFlowBuilder);
-		RefreshableFlowDefinitionHolder holder = new RefreshableFlowDefinitionHolder(assembler);
-
-		mockFlowBuilder.lastModified = 0L;
-		assertEquals(0, mockFlowBuilder.buildCallCount);
-		holder.getFlowDefinition();
-		assertEquals(1, mockFlowBuilder.buildCallCount);
-		holder.getFlowDefinition();
-		assertEquals(1, mockFlowBuilder.buildCallCount);
-		holder.getFlowDefinition();
-		assertEquals(1, mockFlowBuilder.buildCallCount);
-		mockFlowBuilder.lastModified = 10L;
-		holder.getFlowDefinition();
-		assertEquals(2, mockFlowBuilder.buildCallCount);
-		holder.getFlowDefinition();
-		assertEquals(2, mockFlowBuilder.buildCallCount);
-		holder.refresh();
-		assertEquals(3, mockFlowBuilder.buildCallCount);
-		holder.refresh();
-		assertEquals(4, mockFlowBuilder.buildCallCount);
-	}
-
-	private class MockFlowBuilder extends AbstractFlowBuilder implements ResourceHolder {
-
-		public int buildCallCount = 0;
-		public long lastModified = 0L;
-
-		public void buildStates() throws FlowBuilderException {
-			addEndState("end");
-			buildCallCount++;
-		}
-
-		public Resource getResource() {
-			return new AbstractResource() {
-
-				public File getFile() throws IOException {
-					return new File("mock") {
-						public long lastModified() {
-							return lastModified;
-						}
-					};
-				}
-
-				public String getDescription() {
-					return null;
-				}
-
-				public InputStream getInputStream() throws IOException {
-					return null;
-				}
-			};
-		}
-	}
-
-}
\ No newline at end of file
+package org.springframework.webflow.engine.builder;
+
+import junit.framework.TestCase;
+
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.io.Resource;
+import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.engine.EndState;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.engine.builder.support.AbstractFlowBuilder;
+import org.springframework.webflow.test.MockFlowBuilderContext;
+import org.springframework.webflow.util.ResourceHolder;
+
+public class RefreshableFlowDefinitionHolderTests extends TestCase {
+	private RefreshableFlowDefinitionHolder holder;
+	private FlowAssembler assembler;
+
+	protected void setUp() {
+		FlowAssembler assembler = new FlowAssembler(new SimpleFlowBuilder(), new MockFlowBuilderContext("flowId"));
+		holder = new RefreshableFlowDefinitionHolder(assembler);
+	}
+
+	public void testGetFlowDefinition() {
+		FlowDefinition flow = holder.getFlowDefinition();
+		assertEquals("flowId", flow.getId());
+		assertEquals("end", flow.getStartState().getId());
+	}
+
+	public void testGetFlowDefinitionWithChangesRefreshed() {
+		assembler = new FlowAssembler(new ChangeDetectableFlowBuilder(), new MockFlowBuilderContext("flowId"));
+		holder = new RefreshableFlowDefinitionHolder(assembler);
+		FlowDefinition flow = holder.getFlowDefinition();
+		flow = holder.getFlowDefinition();
+		assertEquals("flowId", flow.getId());
+		assertEquals("end", flow.getStartState().getId());
+	}
+
+	public class SimpleFlowBuilder extends AbstractFlowBuilder implements FlowBuilder {
+
+		public void buildStates() throws FlowBuilderException {
+			new EndState(getFlow(), "end");
+		}
+
+		protected Flow createFlow() {
+			return Flow.create(getContext().getFlowId(), getContext().getFlowAttributes());
+		}
+
+	}
+
+	public class ChangeDetectableFlowBuilder extends SimpleFlowBuilder implements ResourceHolder {
+		private FileSystemResource resource = new FileSystemResource("file.txt");
+
+		public Resource getResource() {
+			return resource;
+		}
+	}
+
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/SimpleFlowBuilder.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/SimpleFlowBuilder.java
deleted file mode 100644
index 27fec334..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/SimpleFlowBuilder.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-public class SimpleFlowBuilder extends AbstractFlowBuilder {
-	public void buildStates() {
-		addEndState("end");
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/TextToViewSelectorTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/TextToViewSelectorTests.java
deleted file mode 100644
index 1eb8d581..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/TextToViewSelectorTests.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.engine.NullViewSelector;
-import org.springframework.webflow.engine.ViewSelector;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.test.MockFlowServiceLocator;
-import org.springframework.webflow.test.MockRequestContext;
-
-/**
- * Test case for ${link TextToViewSelector}.
- * 
- * @author Erwin Vervaet
- */
-public class TextToViewSelectorTests extends TestCase {
-
-	private MockFlowServiceLocator serviceLocator;
-	private TextToViewSelector converter;
-
-	public void setUp() {
-		serviceLocator = new MockFlowServiceLocator();
-		converter = new TextToViewSelector(serviceLocator);
-	}
-
-	public void testNullView() {
-		assertSame(NullViewSelector.INSTANCE, viewSelector(null));
-		assertSame(NullViewSelector.INSTANCE, viewSelector(""));
-	}
-
-	public void testApplicationView() {
-		ViewSelector selector = viewSelector("myView");
-		RequestContext context = getRequestContext();
-		ApplicationView view = (ApplicationView) selector.makeEntrySelection(context);
-		assertEquals("myView", view.getViewName());
-		assertEquals(5, view.getModel().size());
-	}
-
-	public void testFlowExecutionRedirect() {
-		ViewSelector selector = viewSelector("redirect:myView");
-		RequestContext context = getRequestContext();
-		FlowExecutionRedirect redirect = (FlowExecutionRedirect) selector.makeEntrySelection(context);
-		assertSame(redirect, FlowExecutionRedirect.INSTANCE);
-		context.getRequestScope().clear();
-		ApplicationView view = (ApplicationView) selector.makeRefreshSelection(context);
-		assertEquals("myView", view.getViewName());
-		assertEquals(3, view.getModel().size());
-	}
-
-	public void testFlowRedirect() {
-		ViewSelector selector = viewSelector("flowRedirect:myFlow");
-		RequestContext context = getRequestContext();
-		FlowDefinitionRedirect redirect = (FlowDefinitionRedirect) selector.makeEntrySelection(context);
-		assertEquals("myFlow", redirect.getFlowDefinitionId());
-		assertEquals(0, redirect.getExecutionInput().size());
-	}
-
-	public void testFlowRedirectWithModel() {
-		ViewSelector selector = viewSelector("flowRedirect:myFlow?foo=${flowScope.foo}&bar=${requestScope.oven}");
-		RequestContext context = getRequestContext();
-		FlowDefinitionRedirect redirect = (FlowDefinitionRedirect) selector.makeEntrySelection(context);
-		assertEquals("myFlow", redirect.getFlowDefinitionId());
-		assertEquals(2, redirect.getExecutionInput().size());
-		assertEquals("bar", redirect.getExecutionInput().get("foo"));
-		assertEquals("mit", redirect.getExecutionInput().get("bar"));
-	}
-
-	public void testExternalRedirect() {
-		ViewSelector selector = viewSelector("externalRedirect:myUrl.htm?foo=${flowScope.foo}&bar=${requestScope.oven}");
-		RequestContext context = getRequestContext();
-		ExternalRedirect view = (ExternalRedirect) selector.makeEntrySelection(context);
-		assertEquals("myUrl.htm?foo=bar&bar=mit", view.getUrl());
-	}
-
-	public void testBean() {
-		ViewSelector myViewSelector = new ViewSelector() {
-			public boolean isEntrySelectionRenderable(RequestContext context) {
-				return true;
-			}
-
-			public ViewSelection makeEntrySelection(RequestContext context) {
-				return null;
-			}
-
-			public ViewSelection makeRefreshSelection(RequestContext context) {
-				return null;
-			}
-		};
-		serviceLocator.registerBean("myViewSelector", myViewSelector);
-		assertSame(myViewSelector, viewSelector("bean:myViewSelector"));
-	}
-
-	private RequestContext getRequestContext() {
-		MockRequestContext ctx = new MockRequestContext();
-		ctx.getFlowScope().put("foo", "bar");
-		ctx.getFlowScope().put("bar", "car");
-		ctx.getRequestScope().put("oven", "mit");
-		ctx.getRequestScope().put("cat", "woman");
-		ctx.getFlowScope().put("boo", new Integer(3));
-		ctx.setLastEvent(new Event(this, "sample"));
-		return ctx;
-	}
-
-	/**
-	 * Turn given view name into a corresponding view selector.
-	 * @param viewName the view name (might be encoded)
-	 * @return the corresponding view selector
-	 */
-	protected ViewSelector viewSelector(String viewName) {
-		return (ViewSelector) converter.convert(viewName);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/file.txt b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/file.txt
new file mode 100644
index 00000000..47df90da
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/file.txt
@@ -0,0 +1 @@
+a changeable file
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/TextToTransitionCriteriaTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/support/TextToTransitionCriteriaTests.java
similarity index 90%
rename from spring-webflow/src/test/java/org/springframework/webflow/engine/builder/TextToTransitionCriteriaTests.java
rename to spring-webflow/src/test/java/org/springframework/webflow/engine/builder/support/TextToTransitionCriteriaTests.java
index 0701ec55..75892a5d 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/TextToTransitionCriteriaTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/support/TextToTransitionCriteriaTests.java
@@ -13,32 +13,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.webflow.engine.builder;
+package org.springframework.webflow.engine.builder.support;
 
 import junit.framework.TestCase;
 
 import org.springframework.binding.convert.ConversionException;
+import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.engine.TransitionCriteria;
 import org.springframework.webflow.engine.WildcardTransitionCriteria;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.test.MockFlowServiceLocator;
+import org.springframework.webflow.test.MockFlowBuilderContext;
 import org.springframework.webflow.test.MockRequestContext;
 
-/**
- * Test case for {@link TextToTransitionCriteria}.
- */
+// TODO - 2 expected failures do to limitations in OgnlExpressionParser
 public class TextToTransitionCriteriaTests extends TestCase {
 
-	private MockFlowServiceLocator serviceLocator = new MockFlowServiceLocator();
+	private MockFlowBuilderContext serviceLocator = new MockFlowBuilderContext("flowId");
 	private TextToTransitionCriteria converter = new TextToTransitionCriteria(serviceLocator);
 
+	public void setUp() {
+	}
+
 	public void testAny() {
 		String expression = "*";
 		TransitionCriteria criterion = (TransitionCriteria) converter.convert(expression);
 		RequestContext ctx = getRequestContext();
 		assertTrue("Criterion should evaluate to true", criterion.test(ctx));
-
 		assertSame(WildcardTransitionCriteria.INSTANCE, converter.convert("*"));
 		assertSame(WildcardTransitionCriteria.INSTANCE, converter.convert(""));
 	}
@@ -64,6 +65,7 @@ public class TextToTransitionCriteriaTests extends TestCase {
 		assertFalse("Criterion should evaluate to false", criterion.test(ctx));
 	}
 
+	/*
 	public void testNonBooleanEvaluation() throws Exception {
 		String expression = "${flowScope.foo}";
 		TransitionCriteria criterion = (TransitionCriteria) converter.convert(expression);
@@ -75,6 +77,7 @@ public class TextToTransitionCriteriaTests extends TestCase {
 			// success
 		}
 	}
+	*/
 
 	public void testInvalidSyntax() throws Exception {
 		try {
@@ -86,6 +89,7 @@ public class TextToTransitionCriteriaTests extends TestCase {
 		}
 	}
 
+	/*
 	public void testEventId() throws Exception {
 		String expression = "${lastEvent.id == 'sample'}";
 		TransitionCriteria criterion = (TransitionCriteria) converter.convert(expression);
@@ -95,6 +99,7 @@ public class TextToTransitionCriteriaTests extends TestCase {
 		criterion = (TransitionCriteria) converter.convert(expression);
 		assertTrue("Criterion should evaluate to true", criterion.test(ctx));
 	}
+	*/
 
 	public void testBean() {
 		TransitionCriteria myTransitionCriteria = new TransitionCriteria() {
@@ -108,7 +113,8 @@ public class TextToTransitionCriteriaTests extends TestCase {
 	}
 
 	private RequestContext getRequestContext() {
-		MockRequestContext ctx = new MockRequestContext();
+		Flow flow = new Flow("id");
+		MockRequestContext ctx = new MockRequestContext(flow);
 		ctx.getFlowScope().put("foo", "bar");
 		ctx.setLastEvent(new Event(this, "sample"));
 		return ctx;
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/DefaultDocumentLoaderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/DefaultDocumentLoaderTests.java
deleted file mode 100644
index 702c5485..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/DefaultDocumentLoaderTests.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import junit.framework.TestCase;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.w3c.dom.Document;
-
-public class DefaultDocumentLoaderTests extends TestCase {
-	private DefaultDocumentLoader loader = new DefaultDocumentLoader();
-
-	public void testLoad() throws Exception {
-		Resource resource = new ClassPathResource("testFlow1.xml", getClass());
-		Document document = loader.loadDocument(resource);
-		assertNotNull(document);
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/EvaluateActionXmlFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/EvaluateActionXmlFlowBuilderTests.java
deleted file mode 100644
index ba47e425..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/EvaluateActionXmlFlowBuilderTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import junit.framework.TestCase;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.engine.ActionState;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.FlowSessionStatus;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockExternalContext;
-
-public class EvaluateActionXmlFlowBuilderTests extends TestCase {
-	private Flow flow;
-
-	protected void setUp() throws Exception {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("evaluateActionFlow.xml",
-				XmlFlowBuilderTests.class), new TestFlowServiceLocator());
-		flow = new FlowAssembler("evaluateActionFlow", builder).assembleFlow();
-	}
-
-	public void testActionStateConfiguration() {
-		assertTrue(flow.getState("actionState1") instanceof ActionState);
-	}
-
-	public void testFlowExecution() {
-		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
-		FlowExecution execution = factory.createFlowExecution(flow);
-		ApplicationView selection = (ApplicationView) execution.start(null, new MockExternalContext());
-		assertEquals(FlowSessionStatus.CREATED, execution.getActiveSession().getScope().get("sessionStatus"));
-		assertNotNull(selection.getModel().get("hashCode"));
-		assertEquals(new Integer(FlowSessionStatus.CREATED.hashCode()), selection.getModel().get("hashCode"));
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/MessageSourceAwareAction.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/MessageSourceAwareAction.java
deleted file mode 100644
index 6b2b3f68..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/MessageSourceAwareAction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import org.springframework.context.MessageSource;
-import org.springframework.context.MessageSourceAware;
-import org.springframework.context.NoSuchMessageException;
-import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.util.Assert;
-import org.springframework.webflow.action.AbstractAction;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-
-public class MessageSourceAwareAction extends AbstractAction implements MessageSourceAware {
-
-	private MessageSourceAccessor messageSource;
-
-	public void setMessageSource(MessageSource messageSource) {
-		this.messageSource = new MessageSourceAccessor(messageSource);
-	}
-
-	protected Event doExecute(RequestContext context) throws Exception {
-		Assert.notNull(messageSource.getMessage("foo"));
-		Assert.isTrue(messageSource.getMessage("foo").equals("bar"));
-		try {
-			messageSource.getMessage("bar");
-			throw new IllegalStateException();
-		} catch (NoSuchMessageException e) {
-			// expected
-		}
-		return success();
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/MessageSourceAwareTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/MessageSourceAwareTests.java
deleted file mode 100644
index 8276c0cf..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/MessageSourceAwareTests.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import java.util.Locale;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.context.support.StaticMessageSource;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.builder.DefaultFlowServiceLocator;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.test.MockExternalContext;
-
-public class MessageSourceAwareTests extends TestCase {
-
-	private Flow flow;
-
-	protected void setUp() throws Exception {
-		GenericApplicationContext context = new GenericApplicationContext();
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(FooMessageSource.class);
-		context.registerBeanDefinition("messageSource", builder.getBeanDefinition());
-		context.refresh();
-		DefaultFlowServiceLocator locator = new DefaultFlowServiceLocator(new FlowDefinitionRegistryImpl(), context);
-		XmlFlowBuilder flowBuilder = new XmlFlowBuilder(
-				new ClassPathResource("messageSourceAwareFlow.xml", getClass()), locator);
-		flow = new FlowAssembler("flow", flowBuilder).assembleFlow();
-	}
-
-	private static class FooMessageSource extends StaticMessageSource {
-		public FooMessageSource() {
-			addMessage("foo", Locale.getDefault(), "bar");
-		}
-	}
-
-	public void testAwareAction() {
-		FlowExecution execution = new FlowExecutionImplFactory().createFlowExecution(flow);
-		execution.start(null, new MockExternalContext());
-		assertFalse(execution.isActive());
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/NamedActionXmlFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/NamedActionXmlFlowBuilderTests.java
deleted file mode 100644
index b62fc68c..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/NamedActionXmlFlowBuilderTests.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.action.AbstractAction;
-import org.springframework.webflow.definition.registry.FlowDefinitionResource;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests;
-
-/**
- * Named action tests.
- * 
- * @author Erwin Vervaet
- */
-public class NamedActionXmlFlowBuilderTests extends AbstractXmlFlowExecutionTests {
-
-	private int executionOrderCounter = 0;
-	private Action aAction;
-	private int aActionExecutionCount = 0;
-	private int aActionExecutionOrder;
-	private Object bBean;
-	private int bBeanExecutionCount = 0;
-	private int bBeanExecutionOrder;
-	private Action cAction;
-	private int cActionExecutionCount = 0;
-	private int cActionExecutionOrder;
-
-	protected void setUp() throws Exception {
-		aAction = new AbstractAction() {
-			protected Event doExecute(RequestContext context) throws Exception {
-				aActionExecutionCount++;
-				aActionExecutionOrder = executionOrderCounter++;
-				return success();
-			}
-		};
-		bBean = new TestBean(this);
-		cAction = new AbstractAction() {
-			protected Event doExecute(RequestContext context) throws Exception {
-				cActionExecutionCount++;
-				cActionExecutionOrder = executionOrderCounter++;
-				return success();
-			}
-		};
-	}
-
-	protected FlowDefinitionResource getFlowDefinitionResource() {
-		return new FlowDefinitionResource(new ClassPathResource("namedActionFlow.xml",
-				NamedActionXmlFlowBuilderTests.class));
-	}
-
-	protected void registerLocalMockServices(Flow flow, ConfigurableBeanFactory beanFactory) {
-		beanFactory.registerSingleton("aAction", aAction);
-		beanFactory.registerSingleton("cAction", cAction);
-		beanFactory.registerSingleton("bBean", bBean);
-	}
-
-	public void testActionExecutionOrder() {
-		startFlow();
-		assertFlowExecutionEnded();
-		assertEquals(1, aActionExecutionCount);
-		assertEquals(0, aActionExecutionOrder);
-		assertEquals(1, bBeanExecutionCount);
-		assertEquals(1, bBeanExecutionOrder);
-		assertEquals(1, cActionExecutionCount);
-		assertEquals(2, cActionExecutionOrder);
-	}
-
-	public static class TestBean {
-		private NamedActionXmlFlowBuilderTests testCase;
-
-		public TestBean(NamedActionXmlFlowBuilderTests testCase) {
-			this.testCase = testCase;
-		}
-
-		public void b() {
-			testCase.bBeanExecutionCount++;
-			testCase.bBeanExecutionOrder = testCase.executionOrderCounter++;
-		}
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/NamespaceXmlFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/NamespaceXmlFlowBuilderTests.java
deleted file mode 100644
index 31703044..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/NamespaceXmlFlowBuilderTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import junit.framework.TestCase;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-
-/**
- * Test case for XML flow builder using namespaces.
- * 
- * @see org.springframework.webflow.engine.builder.xml.XmlFlowBuilder
- * 
- * @author Erwin Vervaet
- */
-public class NamespaceXmlFlowBuilderTests extends TestCase {
-
-	public void testBuildFlow() {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("nsFlow.xml",
-				NamespaceXmlFlowBuilderTests.class), new TestFlowServiceLocator());
-		new FlowAssembler("nsFlow", builder).assembleFlow();
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/PojoActionXmlFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/PojoActionXmlFlowBuilderTests.java
deleted file mode 100644
index a847e25d..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/PojoActionXmlFlowBuilderTests.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import junit.framework.TestCase;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.action.AbstractBeanInvokingAction;
-import org.springframework.webflow.engine.ActionState;
-import org.springframework.webflow.engine.AnnotatedAction;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.ScopeType;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Unit tests for {@link XmlFlowBuilder} dealing with POJO actions.
- */
-public class PojoActionXmlFlowBuilderTests extends TestCase {
-
-	private Flow flow;
-
-	protected void setUp() throws Exception {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("pojoActionFlow.xml",
-				XmlFlowBuilderTests.class), new TestFlowServiceLocator());
-		flow = new FlowAssembler("pojoActionFlow", builder).assembleFlow();
-	}
-
-	public void testActionStateConfiguration() {
-		ActionState as1 = (ActionState) flow.getState("actionState1");
-		AbstractBeanInvokingAction targetAction = (AbstractBeanInvokingAction) as1.getActionList().getAnnotated(0)
-				.getTargetAction();
-		assertEquals(ScopeType.REQUEST, targetAction.getMethodResultExposer().getResultScope());
-		assertEquals(1, as1.getTransitionSet().size());
-
-		ActionState as2 = (ActionState) flow.getState("actionState2");
-		targetAction = (AbstractBeanInvokingAction) as2.getActionList().getAnnotated(0).getTargetAction();
-		assertEquals(ScopeType.FLOW, targetAction.getMethodResultExposer().getResultScope());
-
-		ActionState as3 = (ActionState) flow.getState("actionState3");
-		targetAction = (AbstractBeanInvokingAction) as3.getActionList().getAnnotated(0).getTargetAction();
-		assertEquals(ScopeType.CONVERSATION, targetAction.getMethodResultExposer().getResultScope());
-
-		ActionState as4 = (ActionState) flow.getState("actionState4");
-		targetAction = (AbstractBeanInvokingAction) as4.getActionList().getAnnotated(0).getTargetAction();
-		assertEquals("methodWithVariableArgument", targetAction.getMethodSignature().getMethodName());
-		assertEquals(1, targetAction.getMethodSignature().getParameters().size());
-		// assertEquals("flowScope.result2",
-		// targetAction.getMethodSignature().getParameters().getParameter(0).getName());
-		assertEquals(null, targetAction.getMethodResultExposer());
-
-		ActionState as5 = (ActionState) flow.getState("actionState5");
-		targetAction = (AbstractBeanInvokingAction) as5.getActionList().getAnnotated(0).getTargetAction();
-		assertEquals("methodWithConstantArgument", targetAction.getMethodSignature().getMethodName());
-		assertEquals(1, targetAction.getMethodSignature().getParameters().size());
-		assertEquals(null, targetAction.getMethodResultExposer());
-
-		ActionState as6 = (ActionState) flow.getState("actionState6");
-		targetAction = (AbstractBeanInvokingAction) as6.getActionList().getAnnotated(0).getTargetAction();
-		assertEquals("methodWithArgumentTypeConversion", targetAction.getMethodSignature().getMethodName());
-		assertEquals(1, targetAction.getMethodSignature().getParameters().size());
-		assertEquals(null, targetAction.getMethodResultExposer());
-
-		ActionState as7 = (ActionState) flow.getState("actionState7");
-		AnnotatedAction aa = as7.getActionList().getAnnotated(0);
-		assertEquals("evaluator", aa.getName());
-
-		ActionState as8 = (ActionState) flow.getState("actionState8");
-		aa = as8.getActionList().getAnnotated(0);
-		assertEquals("setter", aa.getName());
-	}
-
-	public void testFlowExecution() {
-		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
-		FlowExecution execution = factory.createFlowExecution(flow);
-		execution.start(null, new MockExternalContext());
-		assertTrue(execution.isActive());
-		assertEquals("pause", execution.getActiveSession().getState().getId());
-		execution.signalEvent("resume", new MockExternalContext());
-		assertFalse(execution.isActive());
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/TestFlowServiceLocator.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/TestFlowServiceLocator.java
deleted file mode 100644
index e8cd1bf1..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/TestFlowServiceLocator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.support.StaticListableBeanFactory;
-import org.springframework.webflow.TestException;
-import org.springframework.webflow.action.MultiAction;
-import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
-import org.springframework.webflow.engine.EndState;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.FlowAttributeMapper;
-import org.springframework.webflow.engine.builder.BaseFlowServiceLocator;
-import org.springframework.webflow.engine.builder.FlowArtifactLookupException;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-
-/**
- * Flow service locator for the services needed by the testFlow (defined in testFlow.xml)
- * 
- * @author Erwin Vervaet
- */
-public class TestFlowServiceLocator extends BaseFlowServiceLocator {
-
-	public StaticListableBeanFactory registry = new StaticListableBeanFactory();
-
-	public TestFlowServiceLocator() {
-		init();
-	}
-
-	public void init() {
-		registry.addBean("action1", new TestAction());
-		registry.addBean("action2", new TestAction());
-		registry.addBean("multiAction", new TestMultiAction());
-		registry.addBean("pojoAction", new TestPojo());
-		registry.addBean("attributeMapper1", new TestAttributeMapper());
-	}
-
-	public Flow getSubflow(String id) throws FlowArtifactLookupException {
-		if ("subFlow1".equals(id) || "subFlow2".equals(id)) {
-			Flow flow = new Flow(id);
-			new EndState(flow, "finish");
-			return flow;
-		}
-		throw new NoSuchFlowDefinitionException(id, new String[] { "subFlow1", "subFlow2" });
-	}
-
-	public class TestAction implements Action {
-		public Event execute(RequestContext context) throws Exception {
-			if (context.getFlowExecutionContext().getDefinition().getAttributes().contains("scenario2")) {
-				return new Event(this, "event2");
-			}
-			return new Event(this, "event1");
-		}
-	}
-
-	public class TestMultiAction extends MultiAction {
-		public Event actionMethod(RequestContext context) throws Exception {
-			throw new TestException("Oops!");
-		}
-	}
-
-	public class TestAttributeMapper implements FlowAttributeMapper {
-		public MutableAttributeMap createFlowInput(RequestContext context) {
-			return new LocalAttributeMap();
-		}
-
-		public void mapFlowOutput(AttributeMap subflowOutput, RequestContext context) {
-		}
-	}
-
-	public BeanFactory getBeanFactory() throws UnsupportedOperationException {
-		return registry;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/TestPojo.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/TestPojo.java
deleted file mode 100644
index 0d1f1049..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/TestPojo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import org.springframework.util.Assert;
-import org.springframework.webflow.execution.FlowSessionStatus;
-
-public class TestPojo {
-	private boolean flag;
-
-	public boolean booleanMethod() {
-		return true;
-	}
-
-	public FlowSessionStatus enumMethod() {
-		return FlowSessionStatus.CREATED;
-	}
-
-	public void methodWithVariableArgument(FlowSessionStatus status) {
-		Assert.isTrue(status == FlowSessionStatus.CREATED);
-	}
-
-	public void methodWithConstantArgument(String constant) {
-		Assert.isTrue(constant.equals("A constant"));
-	}
-
-	public void methodWithArgumentTypeConversion(FlowSessionStatus status) {
-		Assert.isTrue(status == FlowSessionStatus.CREATED);
-	}
-
-	public boolean isFlag() {
-		return flag;
-	}
-
-	public void setFlag(boolean flag) {
-		this.flag = flag;
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderCustomTypeTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderCustomTypeTests.java
deleted file mode 100644
index c7207ee3..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderCustomTypeTests.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.mapping.AttributeMapper;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.action.AbstractAction;
-import org.springframework.webflow.engine.ActionState;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.FlowAttributeMapper;
-import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
-import org.springframework.webflow.engine.RequestControlContext;
-import org.springframework.webflow.engine.SubflowState;
-import org.springframework.webflow.engine.builder.BaseFlowServiceLocator;
-import org.springframework.webflow.engine.builder.FlowArtifactLookupException;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.support.AbstractFlowAttributeMapper;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-
-/**
- * Test case for XML flow builder, testing pluggability of custom types.
- * 
- * @see org.springframework.webflow.engine.builder.xml.XmlFlowBuilder
- * 
- * @author Erwin Vervaet
- */
-public class XmlFlowBuilderCustomTypeTests extends TestCase {
-
-	private Flow flow;
-
-	protected void setUp() throws Exception {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("testFlow3.xml",
-				XmlFlowBuilderCustomTypeTests.class), new CustomFlowArtifactFactory());
-		FlowAssembler assembler = new FlowAssembler("testFlow3", builder);
-		flow = assembler.assembleFlow();
-	}
-
-	public void testBuildResult() {
-		assertEquals("testFlow3", flow.getId());
-		assertEquals(5, flow.getStateCount());
-		assertEquals(1, flow.getExceptionHandlerSet().size());
-		assertSame(((ActionState) flow.getState("actionState1")).getActionList().getAnnotated(0).getTargetAction()
-				.getClass(), CustomAction.class);
-		assertSame(((SubflowState) flow.getState("subFlowState1")).getAttributeMapper().getClass(),
-				CustomAttributeMapper.class);
-		assertSame(flow.getExceptionHandlerSet().toArray()[0].getClass(), CustomExceptionHandler.class);
-	}
-
-	public static class CustomAction extends AbstractAction {
-		protected Event doExecute(RequestContext context) throws Exception {
-			return success();
-		}
-	}
-
-	public static class CustomAttributeMapper extends AbstractFlowAttributeMapper {
-		protected AttributeMapper getInputMapper() {
-			return null;
-		}
-
-		protected AttributeMapper getOutputMapper() {
-			return null;
-		}
-	}
-
-	public static class CustomExceptionHandler implements FlowExecutionExceptionHandler {
-		public boolean handles(FlowExecutionException exception) {
-			return false;
-		}
-
-		public ViewSelection handle(FlowExecutionException exception, RequestControlContext context) {
-			return null;
-		}
-	}
-
-	public static class CustomFlowArtifactFactory extends BaseFlowServiceLocator {
-
-		public Action getAction(String id) throws FlowArtifactLookupException {
-			return new CustomAction();
-		}
-
-		public FlowAttributeMapper getAttributeMapper(String id) throws FlowArtifactLookupException {
-			return new CustomAttributeMapper();
-		}
-
-		public FlowExecutionExceptionHandler getExceptionHandler(String id) throws FlowArtifactLookupException {
-			return new CustomExceptionHandler();
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java
deleted file mode 100644
index 6e79f2b8..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.beans.factory.HierarchicalBeanFactory;
-import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.action.AbstractAction;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.engine.ActionState;
-import org.springframework.webflow.engine.AnnotatedAction;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.SubflowState;
-import org.springframework.webflow.engine.builder.DefaultFlowServiceLocator;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-
-/**
- * Test case for XML flow builder, testing flow nesting.
- * 
- * @see org.springframework.webflow.engine.builder.xml.XmlFlowBuilder
- * 
- * @author Erwin Vervaet
- */
-public class XmlFlowBuilderNestingTests extends TestCase {
-
-	private BeanFactory parentBeanFactory;
-
-	private Flow flow;
-
-	private TestService testService;
-
-	protected void setUp() throws Exception {
-		ClassPathXmlApplicationContext parentContext = new ClassPathXmlApplicationContext(
-				"/org/springframework/webflow/engine/builder/xml/testFlow2ParentContext.xml");
-		this.parentBeanFactory = parentContext.getBeanFactory();
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("testFlow2.xml", getClass()));
-		builder
-				.setFlowServiceLocator(new DefaultFlowServiceLocator(new FlowDefinitionRegistryImpl(),
-						parentBeanFactory));
-		this.flow = new FlowAssembler("testFlow2", builder).assembleFlow();
-		this.testService = (TestService) parentContext.getBean("testService");
-	}
-
-	public void testBuildResult() {
-		assertEquals("testFlow2", flow.getId());
-		assertEquals(3, flow.getStateCount());
-		assertEquals("actionState1", flow.getStartState().getId());
-
-		TestAction action1 = (TestAction) ((ActionState) flow.getState("actionState1")).getActionList().getAnnotated(0)
-				.getTargetAction();
-		BeanFactory testFlow2BeanFactory = action1.getBeanFactory();
-		assertNotNull(testFlow2BeanFactory);
-		assertSame(testService, action1.getTestService());
-		assertSame(action1, testFlow2BeanFactory.getBean("action1"));
-		assertSame(parentBeanFactory, ((HierarchicalBeanFactory) testFlow2BeanFactory).getParentBeanFactory());
-		assertEquals(4, BeanFactoryUtils.countBeansIncludingAncestors((ListableBeanFactory) testFlow2BeanFactory));
-
-		Flow subFlow1 = ((SubflowState) flow.getState("subFlowState1")).getSubflow();
-		assertNotSame(flow, subFlow1);
-		assertEquals("subFlow1", subFlow1.getId());
-		assertEquals(2, subFlow1.getStateCount());
-		assertEquals("subActionState1", subFlow1.getStartState().getId());
-
-		AnnotatedAction[] actions = ((ActionState) subFlow1.getState("subActionState1")).getActionList()
-				.toAnnotatedArray();
-		assertEquals(2, actions.length);
-		SubTestAction subAction1 = null;
-		if (action1 == actions[0].getTargetAction()) {
-			subAction1 = (SubTestAction) actions[1].getTargetAction();
-		} else {
-			subAction1 = (SubTestAction) actions[0].getTargetAction();
-			assertSame(action1, actions[1].getTargetAction());
-		}
-		BeanFactory testFlow2SubFlow1BeanFactory = subAction1.getBeanFactory();
-		assertNotNull(testFlow2SubFlow1BeanFactory);
-		assertSame(testService, subAction1.getTestService());
-		assertNull(subAction1.getTestAction()); // autowire by name should have
-		// failed
-		assertSame(action1, subAction1.getAction1());
-		assertSame(subAction1, testFlow2SubFlow1BeanFactory.getBean("subAction1"));
-		assertSame(testFlow2BeanFactory, ((HierarchicalBeanFactory) testFlow2SubFlow1BeanFactory)
-				.getParentBeanFactory());
-		assertEquals(1, ((ListableBeanFactory) testFlow2SubFlow1BeanFactory).getBeanDefinitionCount()); // only
-		// subAction1
-	}
-
-	public static class TestService {
-		public void doIt() {
-		}
-	}
-
-	public static class TestAction extends AbstractAction implements BeanFactoryAware {
-		private TestService testService;
-
-		private BeanFactory beanFactory;
-
-		public TestService getTestService() {
-			return testService;
-		}
-
-		public void setTestService(TestService testService) {
-			this.testService = testService;
-		}
-
-		public BeanFactory getBeanFactory() {
-			return beanFactory;
-		}
-
-		public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-			this.beanFactory = beanFactory;
-		}
-
-		protected Event doExecute(RequestContext context) throws Exception {
-			testService.doIt();
-			return success();
-		}
-	}
-
-	public static class SubTestAction extends AbstractAction implements BeanFactoryAware {
-		private TestService testService;
-
-		private TestAction testAction;
-
-		private TestAction action1;
-
-		private BeanFactory beanFactory;
-
-		public TestService getTestService() {
-			return testService;
-		}
-
-		public void setTestService(TestService testService) {
-			this.testService = testService;
-		}
-
-		public TestAction getTestAction() {
-			return testAction;
-		}
-
-		public void setTestAction(TestAction testAction) {
-			this.testAction = testAction;
-		}
-
-		public TestAction getAction1() {
-			return action1;
-		}
-
-		public void setAction1(TestAction action1) {
-			this.action1 = action1;
-		}
-
-		public BeanFactory getBeanFactory() {
-			return beanFactory;
-		}
-
-		public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-			this.beanFactory = beanFactory;
-		}
-
-		protected Event doExecute(RequestContext context) throws Exception {
-			testService.doIt();
-			return testAction.execute(context);
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderTests.java
index 3eed129d..5097d050 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderTests.java
@@ -1,204 +1,40 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
 
-import java.io.IOException;
-import java.math.BigDecimal;
-
 import junit.framework.TestCase;
 
-import org.springframework.binding.mapping.DefaultAttributeMapper;
-import org.springframework.binding.mapping.RequiredMapping;
+import org.springframework.beans.factory.support.StaticListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.action.AbstractBeanInvokingAction;
-import org.springframework.webflow.engine.ActionState;
-import org.springframework.webflow.engine.DecisionState;
-import org.springframework.webflow.engine.EndState;
 import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.SubflowState;
-import org.springframework.webflow.engine.Transition;
-import org.springframework.webflow.engine.ViewState;
 import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
-import org.springframework.webflow.engine.support.TransitionExecutingFlowExecutionExceptionHandler;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockRequestControlContext;
+import org.springframework.webflow.engine.builder.FlowBuilderException;
+import org.springframework.webflow.test.MockFlowBuilderContext;
 
-/**
- * Test case for XML flow builder.
- * 
- * @see org.springframework.webflow.engine.builder.xml.XmlFlowBuilder
- * 
- * @author Erwin Vervaet
- */
 public class XmlFlowBuilderTests extends TestCase {
+	private XmlFlowBuilder builder;
 
-	private Flow flow;
-
-	private MockRequestControlContext context;
-
-	protected void setUp() throws Exception {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("testFlow1.xml", XmlFlowBuilderTests.class),
-				new TestFlowServiceLocator());
-		flow = new FlowAssembler("testFlow1", builder).assembleFlow();
-		context = new MockRequestControlContext(flow);
+	protected void setUp() {
+		StaticListableBeanFactory beanFactory = new StaticListableBeanFactory();
+		beanFactory.addBean("bean", new Object());
 	}
 
-	private Event createEvent(String id) {
-		return new Event(this, id);
+	public void testBuildIncompleteFlow() {
+		ClassPathResource resource = new ClassPathResource("flow-incomplete.xml", getClass());
+		builder = new XmlFlowBuilder(resource);
+		FlowAssembler assembler = new FlowAssembler(builder, new MockFlowBuilderContext("flow"));
+		try {
+			assembler.assembleFlow();
+			fail("Should have failed");
+		} catch (FlowBuilderException e) {
+
+		}
 	}
 
-	public void testBuildResult() {
-		assertNotNull(flow);
-		assertEquals("testFlow1", flow.getId());
-		assertEquals("actionState1", flow.getStartState().getId());
-		assertEquals(14, flow.getStateIds().length);
-
-		assertEquals(5, flow.getVariables().length);
-		assertEquals(1, flow.getStartActionList().size());
-		assertEquals(1, flow.getEndActionList().size());
-		assertEquals(2, flow.getExceptionHandlerSet().size());
-		assertTrue(flow.getExceptionHandlerSet().toArray()[0] instanceof TransitionExecutingFlowExecutionExceptionHandler);
-		assertTrue(flow.getExceptionHandlerSet().toArray()[1] instanceof TransitionExecutingFlowExecutionExceptionHandler);
-		TransitionExecutingFlowExecutionExceptionHandler handler = (TransitionExecutingFlowExecutionExceptionHandler) flow
-				.getExceptionHandlerSet().toArray()[1];
-		FlowExecutionException exception = new FlowExecutionException("testFlow1", "actionState1", "test",
-				new IOException());
-		assertTrue(handler.handles(exception));
-		context.getFlowScope().put("testTargetState", "endState1");
-		ViewSelection view = handler.handle(exception, context);
-		assertTrue(view instanceof ApplicationView);
-		assertEquals("endView1", ((ApplicationView) view).getViewName());
-
-		ActionState actionState1 = (ActionState) flow.getState("actionState1");
-		assertNotNull(actionState1);
-		assertEquals(2, actionState1.getActionList().size());
-		assertEquals(null, actionState1.getActionList().getAnnotated(0).getCaption());
-		assertEquals(Boolean.TRUE, actionState1.getAttributeMap().getBoolean("propBoolean"));
-		assertEquals("aString", actionState1.getAttributeMap().getString("propString"));
-		assertEquals("action2Name", actionState1.getActionList().getAnnotated(1).getName());
-		assertEquals(3, actionState1.getTransitionSet().size());
-		context.setLastEvent(createEvent("event1"));
-		assertTrue(actionState1.getTransitionSet().hasMatchingTransition(context));
-		Transition transition = actionState1.getRequiredTransition(context);
-		assertEquals("viewState1", getTargetStateId(transition));
-		assertEquals(new BigDecimal("12345"), transition.getAttributeMap().get("propBigDecimal"));
-		context.setLastEvent(createEvent("action2Name.event2"));
-		assertTrue(actionState1.getTransitionSet().hasMatchingTransition(context));
-		transition = actionState1.getRequiredTransition(context);
-		assertEquals("viewState2", getTargetStateId(transition));
-		assertEquals("prop1Value", actionState1.getActionList().getAnnotated(0).getAttributeMap().get("prop1"));
-		assertEquals("prop2Value", actionState1.getActionList().getAnnotated(0).getAttributeMap().get("prop2"));
-
-		ActionState actionState2 = (ActionState) flow.getState("actionState2");
-		assertEquals(1, actionState2.getExceptionHandlerSet().size());
-
-		ViewState viewState1 = (ViewState) flow.getState("viewState1");
-		assertNotNull(viewState1);
-		assertEquals("view1", (String) ((ApplicationViewSelector) viewState1.getViewSelector()).getViewName().evaluate(
-				null, null));
-		assertEquals(1, viewState1.getTransitionSet().size());
-		assertEquals(1, viewState1.getRenderActionList().size());
-		context.setLastEvent(createEvent("event1"));
-		assertTrue(viewState1.getTransitionSet().hasMatchingTransition(context));
-		transition = viewState1.getRequiredTransition(context);
-		assertEquals("subFlowState1", getTargetStateId(transition));
-
-		ViewState viewState2 = (ViewState) flow.getState("viewState2");
-		assertNotNull(viewState2);
-		assertEquals(1, viewState2.getTransitionSet().size());
-		context.setLastEvent(createEvent("event2"));
-		assertTrue(viewState2.getTransitionSet().hasMatchingTransition(context));
-		transition = viewState2.getRequiredTransition(context);
-		assertEquals("subFlowState2", getTargetStateId(transition));
-
-		SubflowState subFlowState1 = (SubflowState) flow.getState("subFlowState1");
-		assertNotNull(subFlowState1);
-		assertNotNull(subFlowState1.getSubflow());
-		assertEquals("subFlow1", subFlowState1.getSubflow().getId());
-		assertNotNull(subFlowState1.getAttributeMapper());
-		assertEquals(1, subFlowState1.getTransitionSet().size());
-		context.setLastEvent(createEvent("finish"));
-		assertTrue(subFlowState1.getTransitionSet().hasMatchingTransition(context));
-		transition = subFlowState1.getRequiredTransition(context);
-		assertEquals("spawnInlineFlow", getTargetStateId(transition));
-
-		SubflowState subFlowState2 = (SubflowState) flow.getState("subFlowState2");
-		assertNotNull(subFlowState2);
-		assertNotNull(subFlowState2.getSubflow());
-		assertEquals("subFlow2", subFlowState2.getSubflow().getId());
-		assertNotNull(subFlowState2.getAttributeMapper());
-		ImmutableFlowAttributeMapper mapper = (ImmutableFlowAttributeMapper) subFlowState2.getAttributeMapper();
-		assertEquals(3, ((DefaultAttributeMapper) mapper.getInputMapper()).getMappings().length);
-		assertEquals(4, ((DefaultAttributeMapper) mapper.getOutputMapper()).getMappings().length);
-		assertTrue(((DefaultAttributeMapper) mapper.getInputMapper()).getMappings()[0] instanceof RequiredMapping);
-
-		assertEquals(1, subFlowState2.getTransitionSet().size());
-		context.setLastEvent(createEvent("finish"));
-		assertTrue(subFlowState2.getTransitionSet().hasMatchingTransition(context));
-		transition = subFlowState2.getRequiredTransition(context);
-		assertEquals("decisionState1", getTargetStateId(transition));
-
-		DecisionState decisionState1 = (DecisionState) flow.getState("decisionState1");
-		assertTrue(decisionState1.getTransitionSet().size() == 2);
-		assertNotNull(decisionState1);
-
-		DecisionState decisionState2 = (DecisionState) flow.getState("decisionState2");
-		assertTrue(decisionState2.getTransitionSet().size() == 2);
-		assertNotNull(decisionState2);
-
-		ActionState actionState4 = (ActionState) flow.getState("actionState4");
-		assertTrue(actionState4.getTransitionSet().size() == 2);
-		assertNotNull(actionState4);
-		assertNotNull(actionState4.getActionList().get(0));
-		assertNull(actionState4.getActionList().getAnnotated(0).getAttributeMap().get("method"));
-		assertTrue(actionState4.getActionList().getAnnotated(0).getTargetAction() instanceof AbstractBeanInvokingAction);
-
-		ActionState actionState5 = (ActionState) flow.getState("actionState5");
-		assertTrue(actionState5.getTransitionSet().size() == 2);
-		assertNotNull(actionState5);
-		assertNotNull(actionState5.getActionList().get(0));
-		assertNull(actionState5.getActionList().getAnnotated(0).getAttributeMap().get("method"));
-		assertTrue(actionState5.getActionList().getAnnotated(0).getTargetAction() instanceof AbstractBeanInvokingAction);
-
-		EndState endState1 = (EndState) flow.getState("endState1");
-		assertNotNull(endState1);
-		assertEquals("endView1", (String) ((ApplicationViewSelector) endState1.getViewSelector()).getViewName()
-				.evaluate(null, null));
-
-		EndState endState2 = (EndState) flow.getState("endState2");
-		assertNotNull(endState2);
-
-		Flow inlineFlow = flow.getInlineFlow("inline-flow");
-		assertNotNull(inlineFlow);
-		assertNotNull(inlineFlow.getInputMapper());
-		assertNotNull(inlineFlow.getOutputMapper());
-		assertEquals(1, inlineFlow.getVariables().length);
-		assertEquals(1, inlineFlow.getStartActionList().size());
-		assertEquals(1, inlineFlow.getEndActionList().size());
-		EndState endState3 = (EndState) inlineFlow.getState("end");
-		assertNotNull(endState3);
-		assertNotNull(endState3.getOutputMapper());
+	public void testBuildFlowWithEndState() {
+		ClassPathResource resource = new ClassPathResource("flow-endstate.xml", getClass());
+		builder = new XmlFlowBuilder(resource);
+		FlowAssembler assembler = new FlowAssembler(builder, new MockFlowBuilderContext("flow"));
+		Flow flow = assembler.assembleFlow();
+		assertEquals("flow", flow.getId());
+		assertEquals("end", flow.getStartState().getId());
 	}
-
-	protected String getTargetStateId(Transition transition) {
-		return transition.getTargetStateId();
-	}
-
-}
\ No newline at end of file
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistrarTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistrarTests.java
deleted file mode 100644
index 873020ab..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowRegistrarTests.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.builder.xml;
-
-import junit.framework.TestCase;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.FlowDefinitionResource;
-import org.springframework.webflow.engine.builder.BaseFlowServiceLocator;
-
-public class XmlFlowRegistrarTests extends TestCase {
-
-	private XmlFlowRegistrar registrar;
-
-	private FlowDefinitionRegistry registry = new FlowDefinitionRegistryImpl();
-
-	protected void setUp() {
-		BaseFlowServiceLocator locator = new BaseFlowServiceLocator();
-		registrar = new XmlFlowRegistrar(locator);
-	}
-
-	public void testAddResource() {
-		assertEquals(0, registry.getFlowDefinitionCount());
-		registrar.addResource(new FlowDefinitionResource("foo", fromClassPath("flow.xml")), "namespace");
-		registrar.registerFlowDefinitions(registry);
-		assertEquals(1, registry.getFlowDefinitionCount());
-		assertEquals("foo", registry.getFlowDefinition("namespace/foo").getId());
-	}
-
-	public void testAddResourceDefaultNamespace() {
-		assertEquals(0, registry.getFlowDefinitionCount());
-		registrar.setDefaultNamespace("default");
-		registrar.addResource(new FlowDefinitionResource("foo", fromClassPath("flow.xml")));
-		registrar.registerFlowDefinitions(registry);
-		assertEquals(1, registry.getFlowDefinitionCount());
-		assertEquals("foo", registry.getFlowDefinition("default/foo").getId());
-	}
-
-	public void testAddLocation() {
-		assertEquals(0, registry.getFlowDefinitionCount());
-		registrar.addLocation(fromClassPath("flow.xml"), "namespace");
-		registrar.registerFlowDefinitions(registry);
-		assertEquals(1, registry.getFlowDefinitionCount());
-		assertEquals("flow", registry.getFlowDefinition("namespace/flow").getId());
-	}
-
-	public void testAddLocationDefaultNamespace() {
-		assertEquals(0, registry.getFlowDefinitionCount());
-		registrar.setDefaultNamespace("default");
-		registrar.addLocation(fromClassPath("flow.xml"));
-		registrar.registerFlowDefinitions(registry);
-		assertEquals(1, registry.getFlowDefinitionCount());
-		assertEquals("flow", registry.getFlowDefinition("default/flow").getId());
-	}
-
-	private Resource fromClassPath(String resourceName) {
-		return new ClassPathResource(resourceName, getClass());
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/evaluateActionFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/evaluateActionFlow.xml
deleted file mode 100644
index 7cfc2b4d..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/evaluateActionFlow.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-		
-			
-		
-		
-	
-
-	
-		
-			
-		
-		
-	
-	
-	
-		
-	
-
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-endstate.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-endstate.xml
new file mode 100644
index 00000000..9bdfa89c
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-endstate.xml
@@ -0,0 +1,10 @@
+
+
+	
+		
+	
+
+
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-incomplete.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-incomplete.xml
new file mode 100644
index 00000000..8e3ed2f4
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow-incomplete.xml
@@ -0,0 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow.xml
deleted file mode 100644
index 9eeae8ce..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/flow.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-	
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/messageSourceAwareContext.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/messageSourceAwareContext.xml
deleted file mode 100644
index 6539d2ed..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/messageSourceAwareContext.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-		
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/messageSourceAwareFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/messageSourceAwareFlow.xml
deleted file mode 100644
index 2e6364b7..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/messageSourceAwareFlow.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-		
-		
-	
-	
-	
-	
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/namedActionFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/namedActionFlow.xml
deleted file mode 100644
index 31a5d6ea..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/namedActionFlow.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-	
-	
-	
-	
-		
-		
-		
-		
-	
-	
-	
-	
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/namedActionFlowContext.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/namedActionFlowContext.xml
deleted file mode 100644
index d60baaa5..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/namedActionFlowContext.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-	
-	
-	
-	
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/nsFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/nsFlow.xml
deleted file mode 100644
index 007120f5..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/nsFlow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-	
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/parameterizedFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/parameterizedFlow.xml
deleted file mode 100644
index ae8367a6..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/parameterizedFlow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-	
-	
-		
-		
-	
-	
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/pojoActionFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/pojoActionFlow.xml
deleted file mode 100644
index 4604889f..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/pojoActionFlow.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-	
-	
-	
-
-	
-		
-			
-		
-		
-	
-
-	
-		
-			
-		
-		
-	
-
-	
-		
-			
-		
-		
-	
-
-	
-		
-			
-				
-			
-		
-		
-	
-
-	
-		
-			
-				
-			
-		
-		
-	
-
-	
-		
-			
-				
-			
-		
-		
-	
-
-	
-		
-			
-		
-		
-		
-	
-	
-	
-		
-	
-	
-	
-		
-		
-	
-	
-	
-		
-	
-
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow1.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow1.xml
deleted file mode 100644
index 14e4955a..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow1.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-	
-
-	
-	
-	
-	
-	
-
-	
-		
-	
-
-	
-
-	
-		
-		
-		
-			
-				prop1Value
-			
-			
-		
-		
-		
-			
-		
-		
-		
-	
-
-	
-		
-		
-		
-	
-
-	
-		
-			
-		
-		
-	
-
-	
-		
-			
-		
-		
-	
-
-	
-		
-			
-		
-		
-	
-
-	
-		
-		
-		
-			
-		
-	
-
-	
-		
-			
-				
-				
-				
-			
-			
-				
-				
-				
-				
-			
-		
-		
-	
-
-	
-		
-	
-
-	
-		
-	
-
-	
-		
-		
-	
-
-	
-		
-		
-		
-	
-
-	
-		
-		
-		
-	
-
-	
-
-	
-
-	
-		
-		
-	
-
-	
-		
-	
-
-	
-
-	
-		
-			
-			
-				
-			
-			
-				
-			
-			
-			
-				
-					
-				
-			
-			
-				
-			
-			
-				
-			
-		
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow1Context.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow1Context.xml
deleted file mode 100644
index be189be3..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow1Context.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2.xml
deleted file mode 100644
index 68ca643b..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-	
-
-	
-		
-		
-		
-	
-
-	
-		
-	
-
-	
-
-	
-
-	
-		
-
-			
-
-			
-				
-				
-				
-				
-				
-			
-
-			
-
-			
-		
-	
-
-
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2Context.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2Context.xml
deleted file mode 100644
index fc1c6e22..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2Context.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-	
-		 
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2ParentContext.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2ParentContext.xml
deleted file mode 100644
index 4977be35..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2ParentContext.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-		
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2SubFlow1Context.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2SubFlow1Context.xml
deleted file mode 100644
index 9194444e..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow2SubFlow1Context.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow3.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow3.xml
deleted file mode 100644
index 56b40bdc..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow3.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-	
-
-	
-		
-		
-	
-
-	
-		
-		
-	
-
-	
-		
-	
-
-	
-		
-	
-
-	
-
-	
-
-	
-
-	
-		
-			
-			
-		
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow3Context.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow3Context.xml
deleted file mode 100644
index fbe0cc6e..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/testFlow3Context.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-	
-	
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/ExceptionThrowingAction.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/ExceptionThrowingAction.java
deleted file mode 100644
index 7765838f..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/ExceptionThrowingAction.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.impl;
-
-import org.springframework.webflow.action.AbstractAction;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-
-/**
- * Test action that throws an exception.
- * 
- * @author Erwin Vervaet
- */
-public class ExceptionThrowingAction extends AbstractAction {
-
-	protected Event doExecute(RequestContext context) throws Exception {
-		Class exceptionType = Class.forName(context.getAttributes().getString("exceptionType"));
-		throw (Exception) exceptionType.newInstance();
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactoryTests.java
index cb515304..e59cfe13 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactoryTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplFactoryTests.java
@@ -19,12 +19,17 @@ import junit.framework.TestCase;
 
 import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.engine.EndState;
 import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.SimpleFlow;
+import org.springframework.webflow.engine.RequestControlContext;
+import org.springframework.webflow.engine.State;
 import org.springframework.webflow.execution.FlowExecution;
+import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
 import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
+import org.springframework.webflow.execution.FlowSession;
 import org.springframework.webflow.execution.RequestContext;
 import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
 import org.springframework.webflow.test.MockExternalContext;
@@ -36,34 +41,70 @@ public class FlowExecutionImplFactoryTests extends TestCase {
 
 	private FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
 
-	private Flow flowDefinition = new SimpleFlow();
+	private Flow flowDefinition;
 
 	private boolean starting;
 
-	public void testDefaultFactory() {
+	private boolean getKeyCalled;
+
+	public void setUp() {
+		flowDefinition = new Flow("flow");
+		new EndState(flowDefinition, "end");
+	}
+
+	public void testCreate() {
 		FlowExecution execution = factory.createFlowExecution(flowDefinition);
+		assertSame(flowDefinition, execution.getDefinition());
+		assertFalse(execution.hasStarted());
 		assertFalse(execution.isActive());
 	}
 
-	public void testFactoryWithExecutionAttributes() {
+	public void testCreateNullArgument() {
+		try {
+			factory.createFlowExecution(null);
+			fail("Should've failed");
+		} catch (IllegalArgumentException e) {
+
+		}
+	}
+
+	public void testCreateWithExecutionAttributes() {
 		MutableAttributeMap attributes = new LocalAttributeMap();
 		attributes.put("foo", "bar");
 		factory.setExecutionAttributes(attributes);
 		FlowExecution execution = factory.createFlowExecution(flowDefinition);
-		assertFalse(execution.isActive());
 		assertEquals(attributes, execution.getAttributes());
 	}
 
-	public void testFactoryWithListener() {
+	public void testCreateWithExecutionListener() {
 		FlowExecutionListener listener1 = new FlowExecutionListenerAdapter() {
-			public void sessionStarting(RequestContext context, FlowDefinition definition, MutableAttributeMap input) {
+			public void sessionStarting(RequestContext context, FlowSession session, MutableAttributeMap input) {
 				starting = true;
 			}
 		};
 		factory.setExecutionListenerLoader(new StaticFlowExecutionListenerLoader(listener1));
 		FlowExecution execution = factory.createFlowExecution(flowDefinition);
 		assertFalse(execution.isActive());
-		execution.start(null, new MockExternalContext());
+		execution.start(new MockExternalContext());
 		assertTrue(starting);
 	}
+
+	public void testCreateWithExecutionKeyFactory() {
+		State state = new State(flowDefinition, "state") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+				context.assignFlowExecutionKey();
+			}
+		};
+		flowDefinition.setStartState(state);
+		factory.setExecutionKeyFactory(new FlowExecutionKeyFactory() {
+			public FlowExecutionKey getKey(FlowExecution execution) {
+				getKeyCalled = true;
+				return null;
+			}
+		});
+		FlowExecution execution = factory.createFlowExecution(flowDefinition);
+		execution.start(new MockExternalContext());
+		assertTrue(getKeyCalled);
+		assertNull(execution.getKey());
+	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorerTests.java
deleted file mode 100644
index 22af7a8b..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplStateRestorerTests.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.factory.support.StaticListableBeanFactory;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.builder.DefaultFlowServiceLocator;
-import org.springframework.webflow.engine.builder.xml.XmlFlowRegistrar;
-import org.springframework.webflow.execution.FlowExecutionListener;
-import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
-import org.springframework.webflow.execution.factory.FlowExecutionListenerLoader;
-import org.springframework.webflow.test.MockExternalContext;
-import org.springframework.webflow.test.MockParameterMap;
-
-/**
- * Test case for {@link FlowExecutionImplStateRestorer}.
- * 
- * @author Erwin Vervaet
- */
-public class FlowExecutionImplStateRestorerTests extends TestCase {
-
-	private FlowExecutionImpl flowExecution;
-
-	private FlowDefinitionLocator flowLocator;
-
-	private FlowExecutionImplStateRestorer stateRestorer;
-
-	protected void setUp() throws Exception {
-		FlowDefinitionRegistry registry = new FlowDefinitionRegistryImpl();
-		XmlFlowRegistrar registrar = new XmlFlowRegistrar(new DefaultFlowServiceLocator(registry,
-				new StaticListableBeanFactory()));
-		registrar.addLocation(new ClassPathResource("testFlow.xml", getClass()));
-		registrar.addLocation(new ClassPathResource("external-subflow.xml", getClass()));
-		registrar.registerFlowDefinitions(registry);
-		final Flow flow = (Flow) registry.getFlowDefinition("testFlow");
-		flowLocator = registry;
-
-		FlowExecutionListener listener1 = new FlowExecutionListenerAdapter() {
-		};
-		final FlowExecutionListener[] listeners = new FlowExecutionListener[] { listener1 };
-
-		MutableAttributeMap attributes = new LocalAttributeMap();
-		attributes.put("foo", "bar");
-		flowExecution = new FlowExecutionImpl(flow, listeners, attributes);
-
-		MutableAttributeMap conversationScope = new LocalAttributeMap();
-		conversationScope.put("baz", "bear");
-		flowExecution.setConversationScope(conversationScope);
-
-		FlowExecutionListenerLoader listenerLoader = new FlowExecutionListenerLoader() {
-			public FlowExecutionListener[] getListeners(FlowDefinition flow) {
-				return listeners;
-			}
-		};
-		stateRestorer = new FlowExecutionImplStateRestorer(flowLocator);
-		stateRestorer.setExecutionListenerLoader(listenerLoader);
-		stateRestorer.setExecutionAttributes(attributes);
-	}
-
-	public void testRehydrate() throws Exception {
-		// setup some input data
-		MockParameterMap input = new MockParameterMap();
-		input.put("name", "value");
-		// start the flow execution
-		flowExecution.start(null, new MockExternalContext(input));
-		runFlowExecutionRestoreTest();
-	}
-
-	public void testRehydrateNotStarted() throws Exception {
-		// don't start the flow execution
-		runFlowExecutionRestoreTest();
-	}
-
-	protected void runFlowExecutionRestoreTest() throws Exception {
-		// serialize the flowExecution
-		ByteArrayOutputStream bout = new ByteArrayOutputStream();
-		ObjectOutputStream oout = new ObjectOutputStream(bout);
-		oout.writeObject(flowExecution);
-		oout.flush();
-
-		// deserialize the flowExecution
-		ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-		ObjectInputStream oin = new ObjectInputStream(bin);
-		FlowExecutionImpl restoredFlowExecution = (FlowExecutionImpl) oin.readObject();
-		assertNotNull(restoredFlowExecution);
-		assertNull(restoredFlowExecution.getDefinition());
-
-		stateRestorer.restoreState(restoredFlowExecution, flowExecution.getConversationScope());
-		assertNotNull(restoredFlowExecution.getDefinition());
-		assertEquals(flowExecution.isActive(), restoredFlowExecution.isActive());
-		if (flowExecution.isActive()) {
-			assertEquals(flowExecution.getActiveSession().getScope().asMap(), restoredFlowExecution.getActiveSession()
-					.getScope().asMap());
-			assertEquals(flowExecution.getActiveSession().getState().getId(), restoredFlowExecution.getActiveSession()
-					.getState().getId());
-			assertEquals(flowExecution.getActiveSession().getDefinition().getId(), restoredFlowExecution
-					.getActiveSession().getDefinition().getId());
-			assertSame(flowExecution.getDefinition(), restoredFlowExecution.getDefinition());
-		}
-		assertEquals(flowExecution.getListeners().size(), restoredFlowExecution.getListeners().size());
-		assertEquals(flowExecution.getConversationScope(), restoredFlowExecution.getConversationScope());
-		assertEquals(flowExecution.getAttributes(), flowExecution.getAttributes());
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplTests.java
index 05169bf5..f62e1431 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionImplTests.java
@@ -17,48 +17,27 @@ package org.springframework.webflow.engine.impl;
 
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.support.StaticExpression;
-import org.springframework.binding.mapping.DefaultAttributeMapper;
-import org.springframework.binding.mapping.MappingBuilder;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.action.AbstractAction;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.engine.ActionState;
+import org.springframework.binding.message.DefaultMessageContextFactory;
+import org.springframework.context.support.StaticMessageSource;
+import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.engine.EndState;
 import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.FlowExecutionExceptionHandler;
 import org.springframework.webflow.engine.RequestControlContext;
-import org.springframework.webflow.engine.SubflowState;
-import org.springframework.webflow.engine.TargetStateResolver;
-import org.springframework.webflow.engine.Transition;
-import org.springframework.webflow.engine.TransitionCriteria;
-import org.springframework.webflow.engine.ViewSelector;
+import org.springframework.webflow.engine.State;
+import org.springframework.webflow.engine.StubViewFactory;
 import org.springframework.webflow.engine.ViewState;
-import org.springframework.webflow.engine.builder.AbstractFlowBuilder;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.builder.FlowBuilder;
-import org.springframework.webflow.engine.builder.FlowBuilderException;
-import org.springframework.webflow.engine.builder.xml.TestFlowServiceLocator;
-import org.springframework.webflow.engine.builder.xml.XmlFlowBuilder;
-import org.springframework.webflow.engine.builder.xml.XmlFlowBuilderTests;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
-import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
-import org.springframework.webflow.engine.support.EventIdTransitionCriteria;
-import org.springframework.webflow.engine.support.TransitionExecutingFlowExecutionExceptionHandler;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
 import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
+import org.springframework.webflow.execution.FlowSession;
 import org.springframework.webflow.execution.MockFlowExecutionListener;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.TestAction;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
+import org.springframework.webflow.execution.RequestContextHolder;
 import org.springframework.webflow.test.MockExternalContext;
-import org.springframework.webflow.test.MockFlowServiceLocator;
+import org.springframework.webflow.test.MockFlowExecutionKey;
 
 /**
  * General flow execution tests.
@@ -66,317 +45,268 @@ import org.springframework.webflow.test.MockFlowServiceLocator;
  * @author Keith Donald
  * @author Erwin Vervaet
  * @author Ben Hale
+ * @author Jeremy Grelle
  */
 public class FlowExecutionImplTests extends TestCase {
 
-	public void testExceptionHandlingWithGlobalTransitionExceptionHandler() {
-		FlowBuilder flowBuilder = new XmlFlowBuilder(new ClassPathResource("globalTransitionExceptionHandler-flow.xml",
-				getClass()));
-		Flow flow = new FlowAssembler("test", flowBuilder).assembleFlow();
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		ViewSelection view = flowExecution.start(null, new MockExternalContext());
-		assertEquals("showFooException", ((ApplicationView) view).getViewName());
-		assertFalse(flowExecution.isActive());
+	public void testStartAndEnd() {
+		Flow flow = new Flow("flow");
+		new EndState(flow, "end");
+		MockFlowExecutionListener mockListener = new MockFlowExecutionListener();
+		FlowExecutionListener[] listeners = new FlowExecutionListener[] { mockListener };
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setListeners(listeners);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		MockExternalContext context = new MockExternalContext();
+		assertFalse(execution.hasStarted());
+		execution.start(context);
+		assertTrue(execution.hasStarted());
+		assertFalse(execution.isActive());
+		assertEquals(1, mockListener.getRequestsSubmittedCount());
+		assertEquals(1, mockListener.getRequestsProcessedCount());
+		assertEquals(1, mockListener.getSessionCreatingCount());
+		assertEquals(1, mockListener.getSessionStartingCount());
+		assertEquals(1, mockListener.getSessionStartedCount());
+		assertEquals(1, mockListener.getStateEnteringCount());
+		assertEquals(1, mockListener.getStateEnteredCount());
+		assertEquals(1, mockListener.getSessionEndingCount());
+		assertEquals(1, mockListener.getSessionEndedCount());
+		assertEquals(0, mockListener.getEventSignaledCount());
+		assertEquals(0, mockListener.getPausedCount());
+		assertEquals(0, mockListener.getResumingCount());
+		assertEquals(0, mockListener.getExceptionThrownCount());
+		assertEquals(0, mockListener.getFlowNestingLevel());
 	}
 
-	public void testExceptionHandlingWithEvaluateAction() {
-		FlowBuilder flowBuilder = new XmlFlowBuilder(new ClassPathResource("fooFlow.xml", getClass()));
-		Flow flow = new FlowAssembler("fooFlow", flowBuilder).assembleFlow();
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		ViewSelection view = flowExecution.start(null, new MockExternalContext());
-		assertEquals("showFooException", ((ApplicationView) view).getViewName());
-		assertFalse(flowExecution.isActive());
-	}
-
-	public void testExceptionWhileHandlingException() {
-		MockFlowServiceLocator serviceLocator = new MockFlowServiceLocator();
-		serviceLocator.registerBean("testAction", new ExceptionThrowingAction());
-		XmlFlowBuilder flowBuilder = new XmlFlowBuilder(new ClassPathResource("exceptionHandlingFlow.xml", this
-				.getClass()));
-		flowBuilder.setFlowServiceLocator(serviceLocator);
-		Flow flow = new FlowAssembler("flow", flowBuilder).assembleFlow();
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		ViewSelection view = flowExecution.start(null, new MockExternalContext());
-		assertEquals("failed", ((ApplicationView) view).getViewName());
-		assertFalse(flowExecution.isActive());
-	}
-
-	public void testFlowExecutionListener() {
-		Flow flow = new Flow("myFlow");
-		DefaultAttributeMapper inputMapper = new DefaultAttributeMapper();
-		MappingBuilder mapping = new MappingBuilder(DefaultExpressionParserFactory.getExpressionParser());
-		inputMapper.addMapping(mapping.source("name").target("flowScope.name").value());
-		flow.setInputMapper(inputMapper);
-		ActionState actionState = new ActionState(flow, "actionState");
-		actionState.getActionList().add(new TestAction());
-		actionState.getTransitionSet().add(new Transition(onEvent("success"), toState("viewState")));
-
-		ViewState viewState = new ViewState(flow, "viewState");
-		viewState.setViewSelector(selectView("myView"));
-		viewState.getTransitionSet().add(new Transition(onEvent("submit"), toState("subFlowState")));
-
-		Flow subFlow = new Flow("mySubFlow");
-		ViewState state1 = new ViewState(subFlow, "subFlowViewState");
-		state1.setViewSelector(selectView("mySubFlowViewName"));
-		state1.getTransitionSet().add(new Transition(onEvent("submit"), toState("finish")));
-		new EndState(subFlow, "finish");
-
-		SubflowState subflowState = new SubflowState(flow, "subFlowState", subFlow);
-		subflowState.getTransitionSet().add(new Transition(onEvent("finish"), toState("finish")));
-
-		EndState endState = new EndState(flow, "finish");
-		endState.getEntryActionList().add(new AbstractAction() {
-			protected Event doExecute(RequestContext context) throws Exception {
-				throw new IllegalStateException("Whoops!");
-			}
-		});
-		TransitionExecutingFlowExecutionExceptionHandler handler = new TransitionExecutingFlowExecutionExceptionHandler();
-		handler.add(Exception.class, "error");
-		endState.getExceptionHandlerSet().add(handler);
-
-		new EndState(flow, "error");
-
-		MockFlowExecutionListener flowExecutionListener = new MockFlowExecutionListener();
-		FlowExecutionImpl flowExecution = new FlowExecutionImpl(flow,
-				new FlowExecutionListener[] { flowExecutionListener }, null);
-		LocalAttributeMap input = new LocalAttributeMap();
-		input.put("name", "value");
-		assertTrue(!flowExecutionListener.isStarted());
-		flowExecution.start(input, new MockExternalContext());
-		assertTrue(flowExecutionListener.isStarted());
-		assertTrue(flowExecutionListener.isPaused());
-		assertTrue(!flowExecutionListener.isExecuting());
-		assertEquals(1, flowExecutionListener.getEventsSignaledCount());
-		assertEquals(0, flowExecutionListener.getFlowNestingLevel());
-		assertEquals(2, flowExecutionListener.getTransitionCount());
-		assertEquals("value", flowExecution.getActiveSession().getScope().getString("name"));
-		flowExecution.signalEvent("submit", new MockExternalContext());
-		assertTrue(!flowExecutionListener.isExecuting());
-		assertEquals(2, flowExecutionListener.getEventsSignaledCount());
-		assertEquals(1, flowExecutionListener.getFlowNestingLevel());
-		assertEquals(4, flowExecutionListener.getTransitionCount());
-		flowExecution.signalEvent("submit", new MockExternalContext());
-		assertTrue(!flowExecutionListener.isExecuting());
-		assertEquals(0, flowExecutionListener.getFlowNestingLevel());
-		assertEquals(4, flowExecutionListener.getEventsSignaledCount());
-		assertEquals(7, flowExecutionListener.getTransitionCount());
-		assertEquals(1, flowExecutionListener.getExceptionsThrown());
-		assertTrue(!flowExecution.isActive());
-	}
-
-	public void testLoopInFlow() throws Exception {
-		AbstractFlowBuilder builder = new AbstractFlowBuilder() {
-			public void buildStates() throws FlowBuilderException {
-				addViewState("viewState", "viewName", new Transition[] { transition(on(submit()), to("viewState")),
-						transition(on(finish()), to("endState")) });
-				addEndState("endState");
+	public void testStartAndPause() {
+		Flow flow = new Flow("flow");
+		new State(flow, "state") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+				// no op
 			}
 		};
-		Flow flow = new FlowAssembler("flow", builder).assembleFlow();
-		FlowExecution flowExecution = new FlowExecutionImpl(flow);
-		ApplicationView view = (ApplicationView) flowExecution.start(null, new MockExternalContext());
-		assertNotNull(view);
-		assertEquals("viewName", view.getViewName());
-		for (int i = 0; i < 10; i++) {
-			view = (ApplicationView) flowExecution.signalEvent("submit", new MockExternalContext());
-			assertEquals("viewName", view.getViewName());
-		}
-		assertTrue(flowExecution.isActive());
-		flowExecution.signalEvent("finish", new MockExternalContext());
-		assertFalse(flowExecution.isActive());
+		MockFlowExecutionListener mockListener = new MockFlowExecutionListener();
+		FlowExecutionListener[] listeners = new FlowExecutionListener[] { mockListener };
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setListeners(listeners);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		MockExternalContext context = new MockExternalContext();
+		execution.start(context);
+		assertTrue(execution.isActive());
+		assertEquals(1, mockListener.getPausedCount());
 	}
 
-	public void testLoopInFlowWithSubFlow() throws Exception {
-		AbstractFlowBuilder childBuilder = new AbstractFlowBuilder() {
-			public void buildStates() throws FlowBuilderException {
-				addActionState("doOtherStuff", new AbstractAction() {
-					private int executionCount = 0;
-
-					protected Event doExecute(RequestContext context) throws Exception {
-						executionCount++;
-						if (executionCount < 2) {
-							return success();
-						}
-						return error();
-					}
-				},
-						new Transition[] { transition(on(success()), to(finish())),
-								transition(on(error()), to("stopTest")) });
-				addEndState(finish());
-				addEndState("stopTest");
+	public void testStartExceptionThrownBeforeFirstSessionCreated() {
+		Flow flow = new Flow("flow");
+		new EndState(flow, "end");
+		FlowExecutionListener mockListener = new FlowExecutionListenerAdapter() {
+			public void sessionStarting(RequestContext context, FlowSession session, MutableAttributeMap input) {
+				throw new IllegalStateException("Oops");
 			}
 		};
-		final Flow childFlow = new FlowAssembler("flow", childBuilder).assembleFlow();
-		AbstractFlowBuilder parentBuilder = new AbstractFlowBuilder() {
-			public void buildStates() throws FlowBuilderException {
-				addActionState("doStuff", new AbstractAction() {
-					protected Event doExecute(RequestContext context) throws Exception {
-						return success();
-					}
-				}, transition(on(success()), to("startSubFlow")));
-				addSubflowState("startSubFlow", childFlow, null, new Transition[] {
-						transition(on(finish()), to("startSubFlow")), transition(on("stopTest"), to("stopTest")) });
-				addEndState("stopTest");
-			}
-		};
-		Flow parentFlow = new FlowAssembler("parentFlow", parentBuilder).assembleFlow();
-
-		FlowExecution flowExecution = new FlowExecutionImpl(parentFlow);
-		flowExecution.start(null, new MockExternalContext());
-		assertFalse(flowExecution.isActive());
-	}
-
-	public void testExtensiveFlowNavigationScenario1() {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("testFlow1.xml", XmlFlowBuilderTests.class),
-				new TestFlowServiceLocator());
-		FlowAssembler assembler = new FlowAssembler("testFlow1", builder);
-		FlowExecution execution = new FlowExecutionImpl(assembler.assembleFlow());
+		FlowExecutionListener[] listeners = new FlowExecutionListener[] { mockListener };
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setListeners(listeners);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
 		MockExternalContext context = new MockExternalContext();
-		execution.start(null, context);
-		assertEquals("viewState1", execution.getActiveSession().getState().getId());
-		assertNotNull(execution.getActiveSession().getScope().get("items"));
-		execution.signalEvent("event1", context);
-		assertTrue(!execution.isActive());
-	}
-
-	public void testExtensiveFlowNavigationScenario2() {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("testFlow1.xml", XmlFlowBuilderTests.class),
-				new TestFlowServiceLocator());
-		LocalAttributeMap attributes = new LocalAttributeMap();
-		attributes.put("scenario2", Boolean.TRUE);
-		FlowAssembler assembler = new FlowAssembler("testFlow1", attributes, builder);
-		FlowExecution execution = new FlowExecutionImpl(assembler.assembleFlow());
-		MockExternalContext context = new MockExternalContext();
-		execution.start(null, context);
-		assertEquals("viewState2", execution.getActiveSession().getState().getId());
-		assertNotNull(execution.getActiveSession().getScope().get("items"));
-		execution.signalEvent("event2", context);
-		assertTrue(!execution.isActive());
-	}
-
-	public void testFlashScope() {
-		FlowExecution execution = new FlowExecutionImpl(new FlashScopeFlow());
-		MockExternalContext context = new MockExternalContext();
-		execution.start(null, context);
-		assertTrue(execution.getFlashScope().contains("flashScopedValue"));
-		execution.refresh(context);
-		assertTrue(execution.getFlashScope().contains("flashScopedValue"));
-		execution.refresh(context);
-		assertTrue(execution.getFlashScope().contains("flashScopedValue"));
-		execution.signalEvent("submit", context);
-		assertFalse(execution.getFlashScope().contains("flashScopedValue"));
-	}
-
-	public void testExceptionFromInputMapper() {
-		FlowBuilder flowBuilder = new XmlFlowBuilder(new ClassPathResource("runtime-exception.xml", getClass()));
-		Flow flow = new FlowAssembler("runtime-exception", flowBuilder).assembleFlow();
-		FlowExecutionImpl flowExecution = new FlowExecutionImpl(flow);
+		assertFalse(execution.hasStarted());
 		try {
-			flowExecution.start(new LocalAttributeMap(), new MockExternalContext());
-			fail("Should have thrown a FlowExecutionException, not any other type");
+			execution.start(context);
+			fail("Should have failed");
 		} catch (FlowExecutionException e) {
+			assertEquals(flow.getId(), e.getFlowId());
+			assertNull(e.getStateId());
 		}
 	}
 
-	public void testExceptionWithListener() {
-		FlowBuilder flowBuilder = new XmlFlowBuilder(new ClassPathResource("runtime-exception.xml", getClass()));
-		Flow flow = new FlowAssembler("runtime-exception", flowBuilder).assembleFlow();
-		FlowExceptionListener listener = new FlowExceptionListener();
-		FlowExecutionImpl flowExecution = new FlowExecutionImpl(flow);
-		flowExecution.setListeners(new FlowExecutionListeners(new FlowExecutionListener[] { listener }));
+	public void testStartExceptionThrownByState() {
+		Flow flow = new Flow("flow");
+		State state = new State(flow, "state") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+				throw new IllegalStateException("Oops");
+			}
+		};
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		MockExternalContext context = new MockExternalContext();
+		assertFalse(execution.hasStarted());
 		try {
-			flowExecution.start(new LocalAttributeMap(), new MockExternalContext());
-			fail("Should have thrown a FlowExecutionException, not any other type");
+			execution.start(context);
+			fail("Should have failed");
 		} catch (FlowExecutionException e) {
-		}
-
-		assertTrue("Listener should have been called on exception", listener.getExceptionFired());
-	}
-
-	public void testExceptionWithHandler() {
-		FlowBuilder flowBuilder = new XmlFlowBuilder(new ClassPathResource("runtime-exception.xml", getClass()));
-		Flow flow = new FlowAssembler("runtime-exception", flowBuilder).assembleFlow();
-		FlowExceptionHandler handler = new FlowExceptionHandler();
-		flow.getExceptionHandlerSet().add(handler);
-		FlowExecutionImpl flowExecution = new FlowExecutionImpl(flow);
-		flowExecution.start(new LocalAttributeMap(), new MockExternalContext());
-		assertTrue("Handler should have been called on exception", handler.getExceptionHandled());
-	}
-
-	public static TransitionCriteria onEvent(String event) {
-		return new EventIdTransitionCriteria(event);
-	}
-
-	protected TargetStateResolver toState(String stateId) {
-		return new DefaultTargetStateResolver(stateId);
-	}
-
-	public static ViewSelector selectView(String viewName) {
-		return new ApplicationViewSelector(new StaticExpression(viewName));
-	}
-
-	private class FlashScopeFlow extends Flow {
-
-		public FlashScopeFlow() {
-			super("flashScopeFlow");
-
-			ActionState state1 = new ActionState(this, "action");
-			state1.getActionList().add(new Action() {
-				public Event execute(RequestContext context) throws Exception {
-					context.getFlashScope().put("flashScopedValue", "flashScopedValue");
-					return new Event(this, "success");
-				}
-			});
-			state1.getTransitionSet().add(new Transition(toState("view")));
-
-			ViewState state2 = new ViewState(this, "view");
-			state2.getEntryActionList().add(new Action() {
-				public Event execute(RequestContext context) throws Exception {
-					assertTrue(context.getFlashScope().contains("flashScopedValue"));
-					return new Event(this, "success");
-				}
-			});
-			state2.getTransitionSet().add(new Transition(toState("end")));
-
-			EndState state3 = new EndState(this, "end");
-			state3.getEntryActionList().add(new Action() {
-				public Event execute(RequestContext context) throws Exception {
-					assertFalse(context.getFlashScope().contains("flashScopedValue"));
-					return new Event(this, "success");
-				}
-			});
+			assertEquals(flow.getId(), e.getFlowId());
+			assertEquals(state.getId(), e.getStateId());
 		}
 	}
 
-	private class FlowExceptionListener extends FlowExecutionListenerAdapter {
-
-		private boolean exceptionFired = false;
-
-		public boolean getExceptionFired() {
-			return exceptionFired;
-		}
-
-		public void exceptionThrown(RequestContext context, FlowExecutionException exception) {
-			exceptionFired = true;
+	public void testStartFlowExecutionExceptionThrown() {
+		Flow flow = new Flow("flow");
+		final FlowExecutionException e = new FlowExecutionException("flow", "state", "Oops");
+		new State(flow, "state") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+				throw e;
+			}
+		};
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		MockExternalContext context = new MockExternalContext();
+		assertFalse(execution.hasStarted());
+		try {
+			execution.start(context);
+			fail("Should have failed");
+		} catch (FlowExecutionException ex) {
+			assertSame(e, ex);
 		}
 	}
 
-	private class FlowExceptionHandler implements FlowExecutionExceptionHandler {
+	public void testStartCannotCallTwice() {
+		Flow flow = new Flow("flow");
+		new EndState(flow, "end");
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		MockExternalContext context = new MockExternalContext();
+		execution.start(context);
+		try {
+			execution.start(context);
+			fail("Should've failed");
+		} catch (IllegalStateException e) {
 
-		private boolean exceptionHandled = false;
-
-		public boolean getExceptionHandled() {
-			return exceptionHandled;
 		}
+	}
 
-		public ViewSelection handle(FlowExecutionException exception, RequestControlContext context) {
-			exceptionHandled = true;
-			return ViewSelection.NULL_VIEW;
-		}
+	public void testResume() {
+		Flow flow = new Flow("flow");
+		new ViewState(flow, "view", new StubViewFactory());
+		MockFlowExecutionListener mockListener = new MockFlowExecutionListener();
+		FlowExecutionListener[] listeners = new FlowExecutionListener[] { mockListener };
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		execution.setListeners(listeners);
+		execution.setKeyFactory(new MockFlowExecutionKeyFactory());
+		MockExternalContext context = new MockExternalContext();
+		execution.start(context);
+		context = new MockExternalContext();
+		execution.resume(context);
+		assertEquals(1, mockListener.getResumingCount());
+		assertEquals(2, mockListener.getPausedCount());
+	}
+
+	public void testResumeNotAViewState() {
+		Flow flow = new Flow("flow");
+		new State(flow, "state") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+				// no-op
+			}
+		};
+		MockFlowExecutionListener mockListener = new MockFlowExecutionListener();
+		FlowExecutionListener[] listeners = new FlowExecutionListener[] { mockListener };
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		execution.setListeners(listeners);
+		MockExternalContext context = new MockExternalContext();
+		execution.start(context);
+		context = new MockExternalContext();
+		try {
+			execution.resume(context);
+			assertEquals(1, mockListener.getResumingCount());
+			fail("Should have failed");
+		} catch (FlowExecutionException e) {
 
-		public boolean handles(FlowExecutionException exception) {
-			return true;
 		}
+	}
+
+	public void testResumeAfterEnding() {
+		Flow flow = new Flow("flow");
+		new EndState(flow, "end");
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		MockExternalContext context = new MockExternalContext();
+		execution.start(context);
+		try {
+			execution.resume(context);
+			fail("Should've failed");
+		} catch (IllegalStateException e) {
+
+		}
+	}
+
+	public void testResumeException() {
+		Flow flow = new Flow("flow");
+		ViewState state = new ViewState(flow, "view", new StubViewFactory()) {
+			public void resume(RequestControlContext context) {
+				throw new IllegalStateException("Oops");
+			}
+		};
+		MockFlowExecutionListener mockListener = new MockFlowExecutionListener();
+		FlowExecutionListener[] listeners = new FlowExecutionListener[] { mockListener };
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		execution.setListeners(listeners);
+		execution.setKeyFactory(new MockFlowExecutionKeyFactory());
+		MockExternalContext context = new MockExternalContext();
+		execution.start(context);
+		context = new MockExternalContext();
+		try {
+			execution.resume(context);
+		} catch (FlowExecutionException e) {
+			assertEquals(flow.getId(), e.getFlowId());
+			assertEquals(state.getId(), e.getStateId());
+			assertEquals(1, mockListener.getResumingCount());
+			assertEquals(2, mockListener.getPausedCount());
+		}
+	}
+
+	public void testResumeFlowExecutionException() {
+		Flow flow = new Flow("flow");
+		ViewState state = new ViewState(flow, "view", new StubViewFactory()) {
+			public void resume(RequestControlContext context) {
+				throw new FlowExecutionException("flow", "view", "oops");
+			}
+		};
+		MockFlowExecutionListener mockListener = new MockFlowExecutionListener();
+		FlowExecutionListener[] listeners = new FlowExecutionListener[] { mockListener };
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		execution.setListeners(listeners);
+		execution.setKeyFactory(new MockFlowExecutionKeyFactory());
+		MockExternalContext context = new MockExternalContext();
+		execution.start(context);
+		context = new MockExternalContext();
+		try {
+			execution.resume(context);
+		} catch (FlowExecutionException e) {
+			assertEquals(flow.getId(), e.getFlowId());
+			assertEquals(state.getId(), e.getStateId());
+			assertEquals(1, mockListener.getResumingCount());
+			assertEquals(2, mockListener.getPausedCount());
+		}
+	}
+
+	public void testRequestContextManagedOnStartAndResume() {
+		Flow flow = new Flow("flow");
+		new ViewState(flow, "view", new StubViewFactory()) {
+			public void resume(RequestControlContext context) {
+				assertSame(context, RequestContextHolder.getRequestContext());
+			}
+		};
+		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		execution.setMessageContextFactory(new DefaultMessageContextFactory(new StaticMessageSource()));
+		execution.setKeyFactory(new MockFlowExecutionKeyFactory());
+
+		MockExternalContext context = new MockExternalContext();
+		execution.start(context);
+		assertNull("RequestContext was not released", RequestContextHolder.getRequestContext());
+
+		context = new MockExternalContext();
+		execution.resume(context);
+		assertNull("RequestContext was not released", RequestContextHolder.getRequestContext());
 
 	}
+
+	private static class MockFlowExecutionKeyFactory implements FlowExecutionKeyFactory {
+		public FlowExecutionKey getKey(FlowExecution execution) {
+			return new MockFlowExecutionKey();
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionStateRestorerImplTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionStateRestorerImplTests.java
new file mode 100644
index 00000000..5ae60709
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FlowExecutionStateRestorerImplTests.java
@@ -0,0 +1,96 @@
+package org.springframework.webflow.engine.impl;
+
+import java.util.LinkedList;
+
+import junit.framework.TestCase;
+
+import org.springframework.webflow.core.collection.LocalAttributeMap;
+import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.definition.registry.FlowDefinitionConstructionException;
+import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
+import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.execution.FlowExecution;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
+import org.springframework.webflow.execution.FlowExecutionListener;
+import org.springframework.webflow.execution.MockFlowExecutionListener;
+import org.springframework.webflow.execution.factory.FlowExecutionListenerLoader;
+import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
+import org.springframework.webflow.test.MockFlowExecutionKey;
+
+public class FlowExecutionStateRestorerImplTests extends TestCase {
+	private SimpleFlowDefinitionLocator definitionLocator;
+	private FlowExecutionImplStateRestorer stateRestorer;
+	private LocalAttributeMap executionAttributes = new LocalAttributeMap();
+	private FlowExecutionListener listener = new MockFlowExecutionListener();
+	private FlowExecutionListenerLoader executionListenerLoader = new StaticFlowExecutionListenerLoader(listener);
+	MockFlowExecutionKey newKey = new MockFlowExecutionKey();
+	private FlowExecutionKeyFactory executionKeyFactory = new FlowExecutionKeyFactory() {
+		public FlowExecutionKey getKey(FlowExecution execution) {
+			return newKey;
+		}
+	};
+
+	protected void setUp() {
+		definitionLocator = new SimpleFlowDefinitionLocator();
+		stateRestorer = new FlowExecutionImplStateRestorer(definitionLocator);
+		stateRestorer.setExecutionAttributes(executionAttributes);
+		stateRestorer.setExecutionListenerLoader(executionListenerLoader);
+	}
+
+	public void testRestoreStateNoSessions() {
+		FlowExecutionKey key = new MockFlowExecutionKey();
+		LocalAttributeMap conversationScope = new LocalAttributeMap();
+		FlowExecutionImpl execution = new FlowExecutionImpl("parent", new LinkedList());
+		stateRestorer.restoreState(execution, key, conversationScope, executionKeyFactory);
+		assertSame(definitionLocator.parent, execution.getDefinition());
+		assertTrue(execution.getFlowSessions().isEmpty());
+		assertSame(conversationScope, execution.getConversationScope());
+		assertSame(key, execution.getKey());
+		assertSame(executionAttributes, execution.getAttributes());
+		assertEquals(1, execution.getListeners().length);
+		execution.assignKey();
+		assertEquals(newKey, execution.getKey());
+	}
+
+	public void testRestoreStateFlowDefinitionIdNotSet() {
+		FlowExecutionKey key = new MockFlowExecutionKey();
+		LocalAttributeMap conversationScope = new LocalAttributeMap();
+		FlowExecutionImpl execution = new FlowExecutionImpl();
+		try {
+			stateRestorer.restoreState(execution, key, conversationScope, executionKeyFactory);
+			fail("Should've failed");
+		} catch (IllegalStateException e) {
+
+		}
+	}
+
+	public void testRestoreStateFlowSessionsNotSet() {
+		FlowExecutionKey key = new MockFlowExecutionKey();
+		LocalAttributeMap conversationScope = new LocalAttributeMap();
+		FlowExecutionImpl execution = new FlowExecutionImpl("parent", null);
+		try {
+			stateRestorer.restoreState(execution, key, conversationScope, executionKeyFactory);
+			fail("Should've failed");
+		} catch (IllegalStateException e) {
+
+		}
+	}
+
+	private class SimpleFlowDefinitionLocator implements FlowDefinitionLocator {
+		Flow parent = new Flow("parent");
+		Flow child = new Flow("child");
+
+		public FlowDefinition getFlowDefinition(String flowId) throws NoSuchFlowDefinitionException,
+				FlowDefinitionConstructionException {
+			if (flowId.equals(parent.getId())) {
+				return parent;
+			} else if (flowId.equals(child.getId())) {
+				return child;
+			} else {
+				throw new IllegalArgumentException(flowId.toString());
+			}
+		}
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FooException.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FooException.java
deleted file mode 100644
index 0dc98ad2..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FooException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.impl;
-
-public class FooException extends RuntimeException {
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FooFlowAction.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FooFlowAction.java
deleted file mode 100644
index 173fa774..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/FooFlowAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.impl;
-
-public class FooFlowAction {
-
-	public String action1() {
-		throw new FooException();
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/InfiniteLoopTestAction.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/InfiniteLoopTestAction.java
deleted file mode 100644
index b15b4192..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/InfiniteLoopTestAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.impl;
-
-import org.springframework.webflow.action.MultiAction;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-
-public class InfiniteLoopTestAction extends MultiAction {
-
-	public Event method(RequestContext context) {
-		return success();
-	}
-
-	public Event errorMethod(RequestContext context) {
-		return error();
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/MiscFlowExecutionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/MiscFlowExecutionTests.java
deleted file mode 100644
index 39104350..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/MiscFlowExecutionTests.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.impl;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.expression.support.StaticExpression;
-import org.springframework.binding.mapping.RequiredMappingException;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.action.AbstractAction;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.SubflowState;
-import org.springframework.webflow.engine.ViewState;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.builder.xml.XmlFlowBuilder;
-import org.springframework.webflow.engine.support.ApplicationViewSelector;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Miscellaneous flow execution tests.
- */
-public class MiscFlowExecutionTests extends TestCase {
-
-	public void testRequestScopePutInEntryAction() {
-		Flow parentFlow = new Flow("parent");
-		Flow flow = new Flow("test");
-		new SubflowState(parentFlow, "parentState", flow);
-
-		ViewState state = new ViewState(flow, "view");
-		state.setViewSelector(new ApplicationViewSelector(new StaticExpression("myView")));
-		final Object order = new Object();
-		state.getEntryActionList().add(new AbstractAction() {
-			protected Event doExecute(RequestContext context) {
-				context.getRequestScope().put("order", order);
-				return success();
-			}
-		});
-		FlowExecution execution = new FlowExecutionImpl(parentFlow);
-		ApplicationView response = (ApplicationView) execution.start(null, new MockExternalContext());
-		assertNotNull(response.getModel().get("order"));
-		assertEquals(order, response.getModel().get("order"));
-	}
-
-	public void testRequiredMapping() {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("required-mapping.xml", getClass()));
-		Flow flow = new FlowAssembler("myFlow", builder).assembleFlow();
-		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
-		LocalAttributeMap input = new LocalAttributeMap();
-		input.put("id", "23");
-		ApplicationView view = (ApplicationView) execution.start(input, new MockExternalContext());
-		assertEquals(new Long(23), view.getModel().get("id"));
-	}
-
-	public void testRequiredMappingException() {
-		XmlFlowBuilder builder = new XmlFlowBuilder(new ClassPathResource("required-mapping.xml", getClass()));
-		Flow flow = new FlowAssembler("myFlow", builder).assembleFlow();
-		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
-		try {
-			execution.start(null, new MockExternalContext());
-			fail("Should have thrown a FlowExecutionException");
-		} catch (FlowExecutionException e) {
-			assertTrue("Root cause should have been a RequiredMappingException",
-					e.getRootCause() instanceof RequiredMappingException);
-		}
-	}
-
-	/*
-	 * public void testInfiniteLoop() { MockFlowServiceLocator serviceLocator = new MockFlowServiceLocator();
-	 * serviceLocator.registerBean("action", new InfiniteLoopTestAction()); XmlFlowBuilder builder = new
-	 * XmlFlowBuilder(new ClassPathResource("infinite-loop.xml", getClass()));
-	 * builder.setFlowServiceLocator(serviceLocator); Flow flow = new FlowAssembler("myFlow", builder).assembleFlow();
-	 * FlowExecutionImpl execution = new FlowExecutionImpl(flow); try { execution.start(null, new
-	 * MockExternalContext()); } catch (StackOverflowError e) { // expected } }
-	 */
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/NestedSubflowRestorationTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/NestedSubflowRestorationTests.java
deleted file mode 100644
index d8878245..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/NestedSubflowRestorationTests.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.impl;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.definition.registry.FlowDefinitionConstructionException;
-import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
-import org.springframework.webflow.definition.registry.FlowDefinitionResource;
-import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.continuation.SerializedFlowExecutionContinuation;
-import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests;
-
-/**
- * Tests dealing with restoration of nested subflows.
- * 
- * @author Erwin Vervaet
- */
-public class NestedSubflowRestorationTests extends AbstractXmlFlowExecutionTests implements FlowDefinitionLocator {
-
-	protected FlowDefinitionResource getFlowDefinitionResource() {
-		return new FlowDefinitionResource(new ClassPathResource("nestedSubflow.xml",
-				NestedSubflowRestorationTests.class));
-	}
-
-	public FlowDefinition getFlowDefinition(String id) throws NoSuchFlowDefinitionException,
-			FlowDefinitionConstructionException {
-		return getFlowDefinition();
-	}
-
-	public void testNestedFlows() {
-		startFlow();
-		assertFlowExecutionActive();
-		assertActiveFlowEquals("nestedSubflow");
-		assertCurrentStateEquals("view1");
-		signalEvent("start");
-		assertFlowExecutionActive();
-		assertActiveFlowEquals("subflowDef3");
-		assertCurrentStateEquals("view4");
-
-		FlowExecution flowExecution = getFlowExecution();
-		flowExecution = new SerializedFlowExecutionContinuation(flowExecution, false).unmarshal();
-		flowExecution = new FlowExecutionImplStateRestorer(this).restoreState(flowExecution, null);
-		updateFlowExecution(flowExecution);
-
-		signalEvent("continue");
-		assertFlowExecutionEnded();
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/exceptionHandlingFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/exceptionHandlingFlow.xml
deleted file mode 100644
index 19aa440a..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/exceptionHandlingFlow.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-	
-	
-	
-		
-			
-		
-		
-	
-	
-	
-		
-			
-		
-		
-	
-	
-	
-	
-  
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/external-subflow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/external-subflow.xml
deleted file mode 100644
index a6e2c431..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/external-subflow.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-
-	
-		
-	
-	
-	
-	
-  
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/fooFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/fooFlow.xml
deleted file mode 100644
index 5e8e8c4a..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/fooFlow.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-  
-
-  
-
-  
-    
-    
-    
-  
-
-  
-
-  
- 
-
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/globalTransitionExceptionHandler-flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/globalTransitionExceptionHandler-flow.xml
deleted file mode 100644
index d187a345..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/globalTransitionExceptionHandler-flow.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-  
-
-  
-
-  
-    
-  
-
-  
-
-  
-
-  
-      
-   
-  
-
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop.xml
deleted file mode 100644
index 091fd9fe..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/infinite-loop.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-		
-	
-
-	
-		
-		
-			
-			
-			
-		
-	
-		
-	
-  
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/nestedSubflow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/nestedSubflow.xml
deleted file mode 100644
index e99d5a04..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/nestedSubflow.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-	
-	
-	
-		
-	
-
-	
-		
-	
-	
-	
-	
-	
-	
-		
-			
-			
-			
-				
-			
-			
-			
-			
-			
-			
-				
-					
-					
-					
-						
-					
-					
-					
-					
-					
-						
-							
-							
-							
-								
-							
-							
-							
-						
-					
-				
-			
-		
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/required-mapping.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/required-mapping.xml
deleted file mode 100644
index 8c2eb4e6..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/required-mapping.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-		
-	
-
-	
-
-	
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/runtime-exception.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/runtime-exception.xml
deleted file mode 100644
index e736bc28..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/runtime-exception.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-	
-		
-	
-
-	
-
-	
-
-
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/testFlow.xml b/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/testFlow.xml
deleted file mode 100644
index 591f0347..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/impl/testFlow.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-	
-
-	
-			
-	
-	
-	
-	
-	
-		
-			
-			
-			
-				
-			
-			
-			
-			
-	
-	
-  
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/ApplicationViewSelectorTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/ApplicationViewSelectorTests.java
deleted file mode 100644
index 6ff5bbd2..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/ApplicationViewSelectorTests.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.binding.expression.support.StaticExpression;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockFlowExecutionContext;
-import org.springframework.webflow.test.MockRequestContext;
-
-public class ApplicationViewSelectorTests extends TestCase {
-	ExpressionParser parser = DefaultExpressionParserFactory.getExpressionParser();
-
-	public void testMakeSelection() {
-		Expression exp = parser.parseExpression("${requestScope.viewVar}");
-		ApplicationViewSelector selector = new ApplicationViewSelector(exp);
-		MockRequestContext context = new MockRequestContext();
-		context.getRequestScope().put("viewVar", "view");
-		context.getRequestScope().put("foo", "bar");
-		context.getFlowScope().put("foo", "bar2");
-		context.getFlowScope().put("foo2", "bar");
-		context.getConversationScope().put("foo", "bar3");
-		context.getConversationScope().put("foo3", "bar");
-		ViewSelection selection = selector.makeEntrySelection(context);
-		assertTrue(selection instanceof ApplicationView);
-		ApplicationView view = (ApplicationView) selection;
-		assertEquals("view", view.getViewName());
-		assertEquals("bar", view.getModel().get("foo"));
-		assertEquals("bar", view.getModel().get("foo2"));
-		assertEquals("bar", view.getModel().get("foo3"));
-	}
-
-	public void testMakeNullSelection() {
-		ApplicationViewSelector selector = new ApplicationViewSelector(new StaticExpression(null));
-		MockRequestContext context = new MockRequestContext();
-		try {
-			selector.makeEntrySelection(context);
-			fail();
-		} catch (IllegalStateException e) {
-			// expected
-		}
-	}
-
-	public void testMakeNullSelectionEmptyString() {
-		ApplicationViewSelector selector = new ApplicationViewSelector(new StaticExpression(""));
-		MockRequestContext context = new MockRequestContext();
-		try {
-			selector.makeEntrySelection(context);
-			fail();
-		} catch (IllegalStateException e) {
-			// expected
-		}
-	}
-
-	public void testIsEntrySelectionRenderable() {
-		ApplicationViewSelector selector = new ApplicationViewSelector(new StaticExpression(null));
-		MockRequestContext context = new MockRequestContext();
-		assertTrue(selector.isEntrySelectionRenderable(context));
-	}
-
-	public void testIsEntrySelectionRenderableRedirect() {
-		ApplicationViewSelector selector = new ApplicationViewSelector(new StaticExpression(null), true);
-		MockRequestContext context = new MockRequestContext();
-		assertFalse(selector.isEntrySelectionRenderable(context));
-	}
-
-	public void testIsEntrySelectionRenderableAlwaysRedirectOnPause() {
-		ApplicationViewSelector selector = new ApplicationViewSelector(new StaticExpression(null));
-		MockRequestContext requestContext = new MockRequestContext();
-		MockFlowExecutionContext flowExecutionContext = new MockFlowExecutionContext();
-		flowExecutionContext.putAttribute("alwaysRedirectOnPause", Boolean.TRUE);
-		requestContext.setFlowExecutionContext(flowExecutionContext);
-		assertFalse(selector.isEntrySelectionRenderable(requestContext));
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/AttributeExpressionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/AttributeExpressionTests.java
deleted file mode 100644
index 30a48f35..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/AttributeExpressionTests.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.support.StaticExpression;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.execution.ScopeType;
-import org.springframework.webflow.test.MockRequestContext;
-
-/**
- * Unit tests for {@link AttributeExpression}.
- */
-public class AttributeExpressionTests extends TestCase {
-
-	public void testFlowScopeExpression() {
-		Expression exp = DefaultExpressionParserFactory.getExpressionParser().parseExpression("foo");
-		AttributeExpression flowExp = new AttributeExpression(exp, ScopeType.FLOW);
-		MockRequestContext context = new MockRequestContext();
-		context.getFlowScope().put("foo", "bar");
-		assertEquals("bar", flowExp.evaluate(context, null));
-	}
-
-	public void testFlowScopeSettableExpression() {
-		Expression exp = DefaultExpressionParserFactory.getExpressionParser().parseSettableExpression("foo");
-		AttributeExpression flowExp = new AttributeExpression(exp, ScopeType.FLOW);
-		MockRequestContext context = new MockRequestContext();
-		context.getFlowScope().put("foo", "bar");
-		flowExp.evaluateToSet(context, "newValue", null);
-		assertEquals("newValue", context.getFlowScope().get("foo"));
-	}
-
-	public void testAttributeMapExpression() {
-		Expression exp = DefaultExpressionParserFactory.getExpressionParser().parseExpression("foo");
-		AttributeExpression attrExp = new AttributeExpression(exp);
-		MutableAttributeMap attributeMap = new LocalAttributeMap();
-		attributeMap.put("foo", "bar");
-		assertEquals("bar", attrExp.evaluate(attributeMap, null));
-	}
-
-	public void testAttributeMapSettableExpression() {
-		Expression exp = DefaultExpressionParserFactory.getExpressionParser().parseSettableExpression("foo");
-		AttributeExpression attrExp = new AttributeExpression(exp);
-		MutableAttributeMap attributeMap = new LocalAttributeMap();
-		attributeMap.put("foo", "bar");
-		attrExp.evaluateToSet(attributeMap, "newValue", null);
-		assertEquals("newValue", attributeMap.get("foo"));
-	}
-
-	public void testInvalidExpressionType() {
-		Expression exp = new StaticExpression("value");
-		AttributeExpression attrExp = new AttributeExpression(exp);
-		try {
-			attrExp.evaluateToSet(new LocalAttributeMap(), "newValue", null);
-			fail("we need a SettableExpression");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testUnsupportedTarget() {
-		try {
-			new AttributeExpression(new StaticExpression("value")).evaluate(new HashMap(), null);
-			fail("a Map is not supported");
-		} catch (IllegalArgumentException e) {
-		}
-		try {
-			Expression exp = DefaultExpressionParserFactory.getExpressionParser().parseSettableExpression("foo");
-			new AttributeExpression(exp).evaluate(new HashMap(), null);
-			fail("a Map is not supported");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/BooleanExpressionTransitionCriteriaTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/BooleanExpressionTransitionCriteriaTests.java
deleted file mode 100644
index 2b372ca6..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/BooleanExpressionTransitionCriteriaTests.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.test.MockRequestContext;
-
-/**
- * Unit tests for {@link org.springframework.webflow.engine.support.BooleanExpressionTransitionCriteria}.
- */
-public class BooleanExpressionTransitionCriteriaTests extends TestCase {
-
-	private ExpressionParser parser = DefaultExpressionParserFactory.getExpressionParser();
-
-	public void testMatchCriteria() {
-		Expression exp = parser.parseExpression("${requestScope.flag}");
-		BooleanExpressionTransitionCriteria c = new BooleanExpressionTransitionCriteria(exp);
-		MockRequestContext context = new MockRequestContext();
-		context.getRequestScope().put("flag", Boolean.TRUE);
-		assertEquals(true, c.test(context));
-	}
-
-	public void testNotABoolean() {
-		Expression exp = parser.parseExpression("${requestScope.flag}");
-		BooleanExpressionTransitionCriteria c = new BooleanExpressionTransitionCriteria(exp);
-		MockRequestContext context = new MockRequestContext();
-		context.getRequestScope().put("flag", "foo");
-		try {
-			c.test(context);
-			fail("not a boolean");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public void testResult() {
-		Expression exp = parser.parseExpression("${#result == 'foo'}");
-		BooleanExpressionTransitionCriteria c = new BooleanExpressionTransitionCriteria(exp);
-		MockRequestContext context = new MockRequestContext();
-		context.setLastEvent(new Event(this, "foo"));
-		assertEquals(true, c.test(context));
-	}
-
-	public void testFunctionInvocation() {
-		Expression exp = parser.parseExpression("${#result.endsWith('error')}");
-		BooleanExpressionTransitionCriteria c = new BooleanExpressionTransitionCriteria(exp);
-		MockRequestContext context = new MockRequestContext();
-		context.setLastEvent(new Event(this, "error"));
-		assertTrue(c.test(context));
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/ConfigurableFlowAttributeMapperTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/ConfigurableFlowAttributeMapperTests.java
deleted file mode 100644
index f86624ec..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/ConfigurableFlowAttributeMapperTests.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.mapping.Mapping;
-import org.springframework.binding.mapping.MappingBuilder;
-import org.springframework.webflow.action.FormAction;
-import org.springframework.webflow.core.collection.CollectionUtils;
-import org.springframework.webflow.core.collection.LocalAttributeMap;
-import org.springframework.webflow.core.collection.MutableAttributeMap;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.ScopeType;
-import org.springframework.webflow.test.MockFlowSession;
-import org.springframework.webflow.test.MockRequestContext;
-
-/**
- * Test case for {@link ConfigurableFlowAttributeMapper}.
- * 
- * @author Erwin Vervaet
- */
-public class ConfigurableFlowAttributeMapperTests extends TestCase {
-
-	private ConfigurableFlowAttributeMapper mapper;
-
-	private MockRequestContext context;
-
-	private MockFlowSession parentSession;
-
-	private MockFlowSession subflowSession;
-
-	private MappingBuilder mapping;
-
-	protected void setUp() throws Exception {
-		mapper = new ConfigurableFlowAttributeMapper();
-		mapping = new MappingBuilder(mapper.getExpressionParser());
-		context = new MockRequestContext();
-		parentSession = new MockFlowSession();
-		subflowSession = new MockFlowSession();
-		subflowSession.setParent(parentSession);
-	}
-
-	public void testAttributeMapping() {
-		mapper.addInputAttribute("x");
-		mapper.addOutputAttribute("y");
-
-		context.setActiveSession(parentSession);
-		context.getFlowScope().put("x", "xValue");
-		MutableAttributeMap input = mapper.createFlowInput(context);
-		assertEquals(1, input.size());
-		assertEquals("xValue", input.get("x"));
-
-		parentSession.getScope().clear();
-
-		MutableAttributeMap subflowOutput = new LocalAttributeMap();
-		subflowOutput.put("y", "yValue");
-		mapper.mapFlowOutput(subflowOutput, context);
-		assertEquals(1, parentSession.getScope().size());
-		assertEquals("yValue", parentSession.getScope().get("y"));
-	}
-
-	public void testDirectMapping() {
-		mapper.addInputMapping(mapping.source("${flowScope.x}").target("${y}").value());
-		mapper.addOutputMapping(mapping.source("y").target("flowScope.y").value());
-
-		context.setActiveSession(parentSession);
-		context.getFlowScope().put("x", "xValue");
-		MutableAttributeMap input = mapper.createFlowInput(context);
-		assertEquals(1, input.size());
-		assertEquals("xValue", input.get("y"));
-
-		parentSession.getScope().clear();
-
-		MutableAttributeMap subflowOutput = new LocalAttributeMap();
-		subflowOutput.put("y", "xValue");
-		mapper.mapFlowOutput(subflowOutput, context);
-		assertEquals(1, parentSession.getScope().size());
-		assertEquals("xValue", parentSession.getScope().get("y"));
-	}
-
-	public void testBeanPropertyMapping() {
-		mapper.addInputMappings(new Mapping[] { mapping.source("flowScope.bean.prop").target("attr").value(),
-				mapping.source("flowScope.bean").target("otherBean").value(),
-				mapping.source("flowScope.otherAttr").target("otherBean.prop ").value() });
-		mapper.addOutputMappings(new Mapping[] { mapping.source("bean.prop").target("flowScope.attr").value(),
-				mapping.source("bean").target("flowScope.otherBean").value(),
-				mapping.source("otherAttr").target("flowScope.otherBean.prop").value() });
-
-		TestBean bean = new TestBean();
-		bean.setProp("value");
-
-		context.setActiveSession(parentSession);
-		context.getFlowScope().put("bean", bean);
-		context.getFlowScope().put("otherAttr", "otherValue");
-		MutableAttributeMap input = mapper.createFlowInput(context);
-		assertEquals(2, input.size());
-		assertEquals("value", input.get("attr"));
-		assertEquals("otherValue", ((TestBean) input.get("otherBean")).getProp());
-
-		parentSession.getScope().clear();
-		bean.setProp("value");
-
-		MutableAttributeMap subflowOutput = new LocalAttributeMap();
-		subflowOutput.put("bean", bean);
-		subflowOutput.put("otherAttr", "otherValue");
-		mapper.mapFlowOutput(subflowOutput, context);
-		assertEquals(2, parentSession.getScope().size());
-		assertEquals("value", parentSession.getScope().get("attr"));
-		assertEquals("otherValue", ((TestBean) parentSession.getScope().get("otherBean")).getProp());
-	}
-
-	public void testExpressionMapping() {
-		mapper.addInputMappings(new Mapping[] { mapping.source("${requestScope.a}").target("b").value(),
-				mapping.source("${flowScope.x}").target("y").value() });
-		mapper.addOutputMappings(new Mapping[] { mapping.source("b").target("flowScope.c").value(),
-				mapping.source("y").target("flowScope.z").value() });
-
-		context.setActiveSession(parentSession);
-		context.getRequestScope().put("a", "aValue");
-		context.getFlowScope().put("x", "xValue");
-		MutableAttributeMap input = mapper.createFlowInput(context);
-		assertEquals(2, input.size());
-		assertEquals("aValue", input.get("b"));
-		assertEquals("xValue", input.get("y"));
-
-		parentSession.getScope().clear();
-
-		MutableAttributeMap subflowOutput = new LocalAttributeMap();
-		subflowOutput.put("b", "aValue");
-		subflowOutput.put("y", "xValue");
-		mapper.mapFlowOutput(subflowOutput, context);
-		assertEquals(2, parentSession.getScope().size());
-		assertEquals("aValue", parentSession.getScope().get("c"));
-		assertEquals("xValue", parentSession.getScope().get("z"));
-	}
-
-	public void testNullMapping() {
-		mapper.addInputMappings(new Mapping[] { mapping.source("${flowScope.x}").target("y").value(),
-				mapping.source("${flowScope.a}").target("b").value() });
-		mapper.addOutputMappings(new Mapping[] { mapping.source("y").target("flowScope.c").value(),
-				mapping.source("b").target("flowScope.z").value() });
-
-		parentSession.getScope().put("x", null);
-
-		context.setActiveSession(parentSession);
-		MutableAttributeMap input = mapper.createFlowInput(context);
-		assertEquals(0, input.size());
-		assertFalse(input.contains("y"));
-		assertFalse(input.contains("b"));
-
-		parentSession.getScope().clear();
-
-		mapper.mapFlowOutput(CollectionUtils.EMPTY_ATTRIBUTE_MAP, context);
-		assertEquals(0, parentSession.getScope().size());
-		assertFalse(parentSession.getScope().contains("c"));
-		assertFalse(parentSession.getScope().contains("z"));
-	}
-
-	public void testFormActionInCombinationWithMapping() throws Exception {
-		context.setLastEvent(new Event(this, "start"));
-
-		context.setActiveSession(parentSession);
-		assertTrue(context.getFlowScope().size() == 0);
-
-		FormAction action = new FormAction();
-		action.setFormObjectName("command");
-		action.setFormObjectClass(TestBean.class);
-		action.setFormObjectScope(ScopeType.FLOW);
-		action.setFormErrorsScope(ScopeType.FLOW);
-		context.setAttribute("method", "setupForm");
-
-		action.execute(context);
-
-		assertEquals(4, context.getFlowScope().size());
-		assertNotNull(context.getFlowScope().get("command"));
-
-		mapper.addInputMapping(mapping.source("${flowScope.command}").target("command").value());
-		MutableAttributeMap input = mapper.createFlowInput(context);
-
-		assertEquals(1, input.size());
-		assertSame(parentSession.getScope().get("command"), input.get("command"));
-		assertTrue(subflowSession.getScope().size() == 0);
-		subflowSession.getScope().replaceWith(input);
-
-		context.setActiveSession(subflowSession);
-		assertEquals(1, context.getFlowScope().size());
-
-		action.execute(context);
-
-		assertEquals(4, context.getFlowScope().size());
-		assertSame(parentSession.getScope().get("command"), context.getFlowScope().get("command"));
-	}
-
-	public static class TestBean {
-		private String prop;
-
-		public String getProp() {
-			return prop;
-		}
-
-		public void setProp(String prop) {
-			this.prop = prop;
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/DefaultTargetStateResolverTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/DefaultTargetStateResolverTests.java
deleted file mode 100644
index dcfa2eba..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/DefaultTargetStateResolverTests.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.engine.builder.AbstractFlowBuilder;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.builder.FlowBuilderException;
-import org.springframework.webflow.execution.Action;
-import org.springframework.webflow.execution.Event;
-import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.execution.AbstractFlowExecutionTests;
-
-/**
- * Unit tests for {@link DefaultTargetStateResolver}.
- * 
- * @author Erwin Vervaet
- */
-public class DefaultTargetStateResolverTests extends AbstractFlowExecutionTests {
-
-	private boolean fail = false;
-
-	protected FlowDefinition getFlowDefinition() {
-		return new FlowAssembler("testFlow", new TestFlowBuilder()).assembleFlow();
-	}
-
-	public void testNonNullSourceState() {
-		fail = false;
-		ViewSelection viewSelection = startFlow();
-		assertFlowExecutionActive();
-		assertCurrentStateEquals("stateA");
-		assertEquals("stateAView", ((ApplicationView) viewSelection).getViewName());
-		viewSelection = signalEvent("aEvent");
-		assertFlowExecutionActive();
-		assertCurrentStateEquals("stateB");
-		assertEquals("stateBView", ((ApplicationView) viewSelection).getViewName());
-		viewSelection = signalEvent("bEvent");
-		assertFlowExecutionEnded();
-		assertTrue(viewSelection == ViewSelection.NULL_VIEW);
-	}
-
-	public void testNullSourceState() {
-		fail = true;
-		ViewSelection viewSelection = startFlow();
-		assertFlowExecutionEnded();
-		assertTrue(viewSelection == ViewSelection.NULL_VIEW);
-	}
-
-	private class TestFlowBuilder extends AbstractFlowBuilder {
-
-		public void buildStartActions() throws FlowBuilderException {
-			getFlow().getStartActionList().add(new Action() {
-				public Event execute(RequestContext context) throws Exception {
-					if (fail) {
-						throw new UnsupportedOperationException();
-					}
-					return new Event(this, "success");
-				}
-			});
-		}
-
-		public void buildExceptionHandlers() throws FlowBuilderException {
-			TransitionExecutingFlowExecutionExceptionHandler handler = new TransitionExecutingFlowExecutionExceptionHandler();
-			handler.add(UnsupportedOperationException.class, "stateC");
-			getFlow().getExceptionHandlerSet().add(handler);
-		}
-
-		public void buildStates() throws FlowBuilderException {
-			addViewState("stateA", "stateAView", transition(on("aEvent"), to("stateB")));
-			addViewState("stateB", "stateBView", transition(on("bEvent"), to("stateC")));
-			addEndState("stateC");
-		}
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/FlowDefinitionRedirectSelectorTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/FlowDefinitionRedirectSelectorTests.java
deleted file mode 100644
index 850d378a..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/FlowDefinitionRedirectSelectorTests.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import junit.framework.TestCase;
-
-import org.springframework.binding.expression.Expression;
-import org.springframework.binding.expression.ExpressionParser;
-import org.springframework.webflow.core.DefaultExpressionParserFactory;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.test.MockRequestContext;
-
-public class FlowDefinitionRedirectSelectorTests extends TestCase {
-	ExpressionParser parser = DefaultExpressionParserFactory.getExpressionParser();
-
-	public void testMakeSelection() {
-		Expression exp = parser.parseExpression("${requestScope.flowIdVar}?a=b&c=${requestScope.bar}");
-		FlowDefinitionRedirectSelector selector = new FlowDefinitionRedirectSelector(exp);
-		MockRequestContext context = new MockRequestContext();
-		context.getRequestScope().put("flowIdVar", "foo");
-		context.getRequestScope().put("bar", "baz");
-		ViewSelection selection = selector.makeEntrySelection(context);
-		assertTrue(selection instanceof FlowDefinitionRedirect);
-		FlowDefinitionRedirect redirect = (FlowDefinitionRedirect) selection;
-		assertEquals("foo", redirect.getFlowDefinitionId());
-		assertEquals("b", redirect.getExecutionInput().get("a"));
-		assertEquals("baz", redirect.getExecutionInput().get("c"));
-	}
-
-	public void testMakeSelectionInvalidVariable() {
-		Expression exp = parser.parseExpression("${flowScope.flowId}");
-		FlowDefinitionRedirectSelector selector = new FlowDefinitionRedirectSelector(exp);
-		MockRequestContext context = new MockRequestContext();
-		try {
-			ViewSelection selection = selector.makeEntrySelection(context);
-			assertTrue(selection instanceof FlowDefinitionRedirect);
-		} catch (IllegalStateException e) {
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/NullViewSelectionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/NullViewSelectionTests.java
deleted file mode 100644
index b50f4d06..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/NullViewSelectionTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.engine.support;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.engine.NullViewSelector;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.test.MockRequestContext;
-
-public class NullViewSelectionTests extends TestCase {
-
-	private MockRequestContext context = new MockRequestContext();
-
-	public void testMakeSelection() {
-		assertEquals(ViewSelection.NULL_VIEW, NullViewSelector.INSTANCE.makeEntrySelection(context));
-	}
-
-	public void testMakeRefreshSelection() {
-		assertEquals(ViewSelection.NULL_VIEW, NullViewSelector.INSTANCE.makeRefreshSelection(context));
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionCriteriaChainTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionCriteriaChainTests.java
index fa80970a..993b2421 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionCriteriaChainTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionCriteriaChainTests.java
@@ -15,12 +15,12 @@
  */
 package org.springframework.webflow.engine.support;
 
+import org.springframework.webflow.action.EventFactorySupport;
 import org.springframework.webflow.engine.AnnotatedAction;
 import org.springframework.webflow.engine.TransitionCriteria;
 import org.springframework.webflow.execution.Action;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.support.EventFactorySupport;
 import org.springframework.webflow.test.MockRequestContext;
 
 import junit.framework.TestCase;
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandlerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandlerTests.java
index 590ecdfb..4f41b86e 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandlerTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/support/TransitionExecutingFlowExecutionExceptionHandlerTests.java
@@ -17,7 +17,6 @@ package org.springframework.webflow.engine.support;
 
 import junit.framework.TestCase;
 
-import org.springframework.binding.expression.support.StaticExpression;
 import org.springframework.webflow.TestException;
 import org.springframework.webflow.action.AbstractAction;
 import org.springframework.webflow.core.collection.MutableAttributeMap;
@@ -28,11 +27,11 @@ import org.springframework.webflow.engine.State;
 import org.springframework.webflow.engine.TargetStateResolver;
 import org.springframework.webflow.engine.Transition;
 import org.springframework.webflow.engine.TransitionableState;
-import org.springframework.webflow.engine.builder.AbstractFlowBuilder;
 import org.springframework.webflow.engine.builder.FlowAssembler;
 import org.springframework.webflow.engine.builder.FlowBuilder;
 import org.springframework.webflow.engine.builder.FlowBuilderException;
-import org.springframework.webflow.engine.impl.FlowExecutionImpl;
+import org.springframework.webflow.engine.builder.support.AbstractFlowBuilder;
+import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
 import org.springframework.webflow.execution.Event;
 import org.springframework.webflow.execution.FlowExecution;
 import org.springframework.webflow.execution.FlowExecutionException;
@@ -40,9 +39,9 @@ import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
 import org.springframework.webflow.execution.FlowSession;
 import org.springframework.webflow.execution.RequestContext;
-import org.springframework.webflow.execution.ViewSelection;
-import org.springframework.webflow.execution.support.ApplicationView;
+import org.springframework.webflow.execution.factory.StaticFlowExecutionListenerLoader;
 import org.springframework.webflow.test.MockExternalContext;
+import org.springframework.webflow.test.MockFlowBuilderContext;
 
 public class TransitionExecutingFlowExecutionExceptionHandlerTests extends TestCase {
 
@@ -53,7 +52,7 @@ public class TransitionExecutingFlowExecutionExceptionHandlerTests extends TestC
 	protected void setUp() {
 		flow = new Flow("myFlow");
 		state = new TransitionableState(flow, "state1") {
-			protected ViewSelection doEnter(RequestControlContext context) {
+			protected void doEnter(RequestControlContext context) {
 				throw new FlowExecutionException(getFlow().getId(), getId(), "Oops!", new TestException());
 			}
 		};
@@ -65,10 +64,10 @@ public class TransitionExecutingFlowExecutionExceptionHandlerTests extends TestC
 		handler.add(TestException.class, "state");
 		FlowExecutionException e = new FlowExecutionException(state.getOwner().getId(), state.getId(), "Oops",
 				new TestException());
-		assertTrue("Doesn't handle state exception", handler.handles(e));
+		assertTrue("Doesn't handle state exception", handler.canHandle(e));
 
 		e = new FlowExecutionException(state.getOwner().getId(), state.getId(), "Oops", new Exception());
-		assertFalse("Shouldn't handle exception", handler.handles(e));
+		assertFalse("Shouldn't handle exception", handler.canHandle(e));
 	}
 
 	public void testTransitionExecutorHandlesExceptionSuperclassMatch() {
@@ -76,14 +75,13 @@ public class TransitionExecutingFlowExecutionExceptionHandlerTests extends TestC
 		handler.add(Exception.class, "state");
 		FlowExecutionException e = new FlowExecutionException(state.getOwner().getId(), state.getId(), "Oops",
 				new TestException());
-		assertTrue("Doesn't handle state exception", handler.handles(e));
+		assertTrue("Doesn't handle state exception", handler.canHandle(e));
 		e = new FlowExecutionException(state.getOwner().getId(), state.getId(), "Oops", new RuntimeException());
-		assertTrue("Doesn't handle state exception", handler.handles(e));
+		assertTrue("Doesn't handle state exception", handler.canHandle(e));
 	}
 
 	public void testFlowStateExceptionHandlingTransition() {
-		EndState state2 = new EndState(flow, "end");
-		state2.setViewSelector(new ApplicationViewSelector(new StaticExpression("view")));
+		new EndState(flow, "end");
 		TransitionExecutingFlowExecutionExceptionHandler handler = new TransitionExecutingFlowExecutionExceptionHandler();
 		handler.add(TestException.class, "end");
 		flow.getExceptionHandlerSet().add(handler);
@@ -94,8 +92,10 @@ public class TransitionExecutingFlowExecutionExceptionHandlerTests extends TestC
 				assertTrue(context.getFlashScope().get("rootCauseException") instanceof TestException);
 			}
 		};
-		FlowExecutionImpl execution = new FlowExecutionImpl(flow, new FlowExecutionListener[] { listener }, null);
-		execution.start(null, new MockExternalContext());
+		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
+		factory.setExecutionListenerLoader(new StaticFlowExecutionListenerLoader(listener));
+		FlowExecution execution = factory.createFlowExecution(flow);
+		execution.start(new MockExternalContext());
 		assertTrue("Should have ended", !execution.isActive());
 	}
 
@@ -103,18 +103,18 @@ public class TransitionExecutingFlowExecutionExceptionHandlerTests extends TestC
 		TransitionExecutingFlowExecutionExceptionHandler handler = new TransitionExecutingFlowExecutionExceptionHandler();
 		handler.add(TestException.class, "end");
 		flow.getExceptionHandlerSet().add(handler);
-		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		FlowExecution execution = new FlowExecutionImplFactory().createFlowExecution(flow);
 		try {
-			execution.start(null, new MockExternalContext());
+			execution.start(new MockExternalContext());
 			fail("Should have failed no such state");
 		} catch (IllegalArgumentException e) {
 		}
 	}
 
 	public void testStateExceptionHandlingRethrow() {
-		FlowExecutionImpl execution = new FlowExecutionImpl(flow);
+		FlowExecution execution = new FlowExecutionImplFactory().createFlowExecution(flow);
 		try {
-			execution.start(null, new MockExternalContext());
+			execution.start(new MockExternalContext());
 			fail("Should have rethrown");
 		} catch (FlowExecutionException e) {
 			// expected
@@ -124,29 +124,31 @@ public class TransitionExecutingFlowExecutionExceptionHandlerTests extends TestC
 	public void testStateExceptionHandlingExceptionInEndState() {
 		FlowBuilder builder = new AbstractFlowBuilder() {
 			public void buildStates() throws FlowBuilderException {
-				State state = addEndState("end");
+				State state = new EndState(getFlow(), "end");
 				state.getEntryActionList().add(new AbstractAction() {
 					protected Event doExecute(RequestContext context) throws Exception {
 						throw new NullPointerException("failing");
 					}
 				});
-				addViewState("showError", "error", transition(on("end"), to("end")));
+				new TransitionableState(getFlow(), "showError") {
+					protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+					}
+				};
 			}
 
 			public void buildExceptionHandlers() throws FlowBuilderException {
 				getFlow().getExceptionHandlerSet().add(
 						new TransitionExecutingFlowExecutionExceptionHandler().add(Exception.class, "showError"));
 			}
+
+			public Flow createFlow() throws FlowBuilderException {
+				return Flow.create(getContext().getFlowId(), getContext().getFlowAttributes());
+			}
 		};
-		Flow flow = new FlowAssembler("flow", builder).assembleFlow();
-		FlowExecution execution = new FlowExecutionImpl(flow);
-		ViewSelection view = execution.start(null, new MockExternalContext());
+		Flow flow = new FlowAssembler(builder, new MockFlowBuilderContext("flow")).assembleFlow();
+		FlowExecution execution = new FlowExecutionImplFactory().createFlowExecution(flow);
+		execution.start(new MockExternalContext());
 		assertTrue(execution.isActive());
-		assertEquals("error", ((ApplicationView) view).getViewName());
-		assertTrue(((ApplicationView) view).getModel().containsKey(
-				TransitionExecutingFlowExecutionExceptionHandler.ROOT_CAUSE_EXCEPTION_ATTRIBUTE));
-		assertTrue(((ApplicationView) view).getModel().containsKey(
-				TransitionExecutingFlowExecutionExceptionHandler.FLOW_EXECUTION_EXCEPTION_ATTRIBUTE));
 	}
 
 	protected TargetStateResolver toState(String stateId) {
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/MockFlowExecutionListener.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/MockFlowExecutionListener.java
index c00d25d0..5ddcd2f7 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/MockFlowExecutionListener.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/execution/MockFlowExecutionListener.java
@@ -31,29 +31,45 @@ public class MockFlowExecutionListener extends FlowExecutionListenerAdapter {
 
 	private boolean sessionStarting;
 
+	private int sessionCreatingCount;
+
+	private int sessionStartingCount;
+
+	private int sessionStartedCount;
+
 	private boolean started;
 
 	private boolean executing;
 
+	private int stateEnteringCount;
+
+	private int stateEnteredCount;
+
+	private int resumingCount;
+
 	private boolean paused;
 
+	private int pausedCount;
+
 	private int flowNestingLevel;
 
 	private boolean requestInProcess;
 
-	private int requestsSubmitted;
+	private int requestsSubmittedCount;
 
-	private int requestsProcessed;
+	private int requestsProcessedCount;
 
-	private int eventsSignaled;
+	private int eventSignaledCount;
 
 	private boolean stateEntering;
 
-	private int stateTransitions;
-
 	private boolean sessionEnding;
 
-	private int exceptionsThrown;
+	private int sessionEndingCount;
+
+	private int sessionEndedCount;
+
+	private int exceptionThrownCount;
 
 	/**
 	 * Is the flow execution running: it has started but not yet ended.
@@ -96,125 +112,174 @@ public class MockFlowExecutionListener extends FlowExecutionListenerAdapter {
 	 * Returns the number of requests submitted so far.
 	 */
 	public int getRequestsSubmittedCount() {
-		return requestsSubmitted;
+		return requestsSubmittedCount;
 	}
 
 	/**
 	 * Returns the number of requests processed so far.
 	 */
 	public int getRequestsProcessedCount() {
-		return requestsProcessed;
+		return requestsProcessedCount;
+	}
+
+	/**
+	 * Returns the number of sessions that have attempted to be created so far.
+	 */
+	public int getSessionCreatingCount() {
+		return sessionCreatingCount;
+	}
+
+	/**
+	 * Returns the number of sessions that have attempted to start so far.
+	 */
+	public int getSessionStartingCount() {
+		return sessionStartingCount;
+	}
+
+	/**
+	 * Returns the number of sessions that started so far.
+	 */
+	public int getSessionStartedCount() {
+		return sessionStartedCount;
+	}
+
+	/**
+	 * Returns the number of state entries attempted so far.
+	 */
+	public int getStateEnteringCount() {
+		return stateEnteringCount;
+	}
+
+	/**
+	 * Returns the number of states entered so far.
+	 */
+	public int getStateEnteredCount() {
+		return stateEnteredCount;
 	}
 
 	/**
 	 * Returns the number of events signaled so far.
 	 */
-	public int getEventsSignaledCount() {
-		return eventsSignaled;
+	public int getEventSignaledCount() {
+		return eventSignaledCount;
 	}
 
 	/**
-	 * Returns the number of state transitions executed so far.
+	 * Returns the number of times the flow execution has paused.
 	 */
-	public int getTransitionCount() {
-		return stateTransitions;
+	public int getPausedCount() {
+		return pausedCount;
+	}
+
+	/**
+	 * Returns the number of times the flow execution has resumed.
+	 */
+	public int getResumingCount() {
+		return resumingCount;
+	}
+
+	/**
+	 * Returns the number of sessions that have attempted to end so far.
+	 */
+	public int getSessionEndingCount() {
+		return sessionEndingCount;
+	}
+
+	/**
+	 * Returns the number of sessions that end so far.
+	 */
+	public int getSessionEndedCount() {
+		return sessionEndedCount;
 	}
 
 	/**
 	 * Returns the number of exceptions thrown.
 	 */
-	public int getExceptionsThrown() {
-		return exceptionsThrown;
+	public int getExceptionThrownCount() {
+		return exceptionThrownCount;
 	}
 
 	public void requestSubmitted(RequestContext context) {
 		Assert.state(!requestInProcess, "There is already a request being processed");
-		requestsSubmitted++;
+		requestsSubmittedCount++;
 		requestInProcess = true;
 	}
 
-	public void sessionStarting(RequestContext context, FlowDefinition definition, MutableAttributeMap input) {
+	public void sessionCreating(RequestContext context, FlowDefinition definition) {
 		if (!context.getFlowExecutionContext().isActive()) {
 			Assert.state(!started, "The flow execution was already started");
-			flowNestingLevel = 0;
-			eventsSignaled = 0;
-			stateTransitions = 0;
+			started = true;
 		}
-		sessionStarting = true;
+		sessionCreatingCount++;
 	}
 
-	public void sessionCreated(RequestContext context, FlowSession session) {
-		Assert.state(sessionStarting, "The session should've been starting...");
-		if (session.isRoot()) {
-			Assert.state(!started, "The flow execution was already started");
-			executing = true;
-		} else {
-			assertStarted();
-			flowNestingLevel++;
-		}
+	public void sessionStarting(RequestContext context, FlowSession session, MutableAttributeMap input) {
+		sessionStartingCount++;
+		sessionStarting = true;
+		flowNestingLevel++;
 	}
 
 	public void sessionStarted(RequestContext context, FlowSession session) {
 		Assert.state(sessionStarting, "The session should've been starting...");
 		sessionStarting = false;
-		if (session.isRoot()) {
-			Assert.state(!started, "The flow execution was already started");
-			started = true;
-		} else {
-			assertStarted();
-		}
+		sessionStartedCount++;
 	}
 
 	public void requestProcessed(RequestContext context) {
 		Assert.state(requestInProcess, "There is no request being processed");
-		requestsProcessed++;
+		requestsProcessedCount++;
 		requestInProcess = false;
 	}
 
 	public void eventSignaled(RequestContext context, Event event) {
-		eventsSignaled++;
+		eventSignaledCount++;
 	}
 
 	public void stateEntering(RequestContext context, StateDefinition state) throws EnterStateVetoException {
 		stateEntering = true;
+		stateEnteringCount++;
 	}
 
 	public void stateEntered(RequestContext context, StateDefinition newState, StateDefinition previousState) {
 		Assert.state(stateEntering, "State should've entering...");
 		stateEntering = false;
-		stateTransitions++;
+		stateEnteredCount++;
 	}
 
-	public void paused(RequestContext context, ViewSelection selectedView) {
+	public void paused(RequestContext context) {
 		executing = false;
 		paused = true;
+		pausedCount++;
 	}
 
-	public void resumed(RequestContext context) {
+	public void resuming(RequestContext context) {
 		executing = true;
 		paused = false;
+		resumingCount++;
 	}
 
 	public void sessionEnding(RequestContext context, FlowSession session, MutableAttributeMap output) {
 		sessionEnding = true;
+		sessionEndingCount++;
+		flowNestingLevel--;
 	}
 
 	public void sessionEnded(RequestContext context, FlowSession session, AttributeMap output) {
 		assertStarted();
 		Assert.state(sessionEnding, "Should have been ending");
 		sessionEnding = false;
+		sessionEndedCount++;
 		if (session.isRoot()) {
 			Assert.state(flowNestingLevel == 0, "The flow execution should have ended");
 			started = false;
 			executing = false;
 		} else {
-			flowNestingLevel--;
 			Assert.state(started, "The flow execution prematurely ended");
 		}
 	}
 
 	public void exceptionThrown(RequestContext context, FlowExecutionException exception) {
-		exceptionsThrown++;
+		exceptionThrownCount++;
 	}
 
 	/**
@@ -230,8 +295,19 @@ public class MockFlowExecutionListener extends FlowExecutionListenerAdapter {
 	public void reset() {
 		started = false;
 		executing = false;
-		requestsSubmitted = 0;
-		requestsProcessed = 0;
-		exceptionsThrown = 0;
+		requestsSubmittedCount = 0;
+		requestsProcessedCount = 0;
+		sessionCreatingCount = 0;
+		sessionStartingCount = 0;
+		sessionStartedCount = 0;
+		stateEnteringCount = 0;
+		stateEnteredCount = 0;
+		eventSignaledCount = 0;
+		pausedCount = 0;
+		resumingCount = 0;
+		sessionEndingCount = 0;
+		sessionEndedCount = 0;
+		exceptionThrownCount = 0;
+		flowNestingLevel = 0;
 	}
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/factory/ConditionalFlowExecutionListenerLoaderTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/factory/ConditionalFlowExecutionListenerLoaderTests.java
index 1f3a605f..8643d5b8 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/factory/ConditionalFlowExecutionListenerLoaderTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/execution/factory/ConditionalFlowExecutionListenerLoaderTests.java
@@ -17,7 +17,6 @@ package org.springframework.webflow.execution.factory;
 
 import junit.framework.TestCase;
 
-import org.springframework.webflow.definition.FlowDefinition;
 import org.springframework.webflow.engine.Flow;
 import org.springframework.webflow.execution.FlowExecutionListener;
 import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
@@ -27,77 +26,44 @@ import org.springframework.webflow.execution.FlowExecutionListenerAdapter;
  */
 public class ConditionalFlowExecutionListenerLoaderTests extends TestCase {
 
-	private ConditionalFlowExecutionListenerLoader loader = new ConditionalFlowExecutionListenerLoader();
+	private FlowExecutionListenerCriteriaFactory criteriaFactory;
+	private ConditionalFlowExecutionListenerLoader loader;
 
-	public void testAddListener() {
-		FlowExecutionListener l1 = new FlowExecutionListenerAdapter() {
-		};
-		FlowExecutionListener l2 = new FlowExecutionListenerAdapter() {
-		};
-		loader.addListener(l1);
-		assertTrue(loader.containsListener(l1));
-		loader.addListener(l2);
-		assertTrue(loader.containsListener(l2));
-		FlowExecutionListener[] listeners = loader.getListeners(new Flow("foo"));
-		assertEquals(2, listeners.length);
-		assertSame(l1, listeners[0]);
-		assertSame(l2, listeners[1]);
-		loader.removeListener(l1);
-		assertFalse(loader.containsListener(l1));
-		loader.removeListener(l2);
-		assertEquals(0, loader.getListeners(new Flow("flow")).length);
+	protected void setUp() {
+		loader = new ConditionalFlowExecutionListenerLoader();
+		criteriaFactory = new FlowExecutionListenerCriteriaFactory();
 	}
 
-	public void testAddListenerWithCriteria() {
-		FlowExecutionListener l1 = new FlowExecutionListenerAdapter() {
+	public void testAddConditionalListener() {
+		FlowExecutionListenerAdapter listener = new FlowExecutionListenerAdapter() {
 		};
-		FlowExecutionListener l2 = new FlowExecutionListenerAdapter() {
-		};
-		loader.addListener(l1);
-		assertTrue(loader.containsListener(l1));
-		assertFalse(loader.containsListener(l2));
-		final Flow theFlow = new Flow("foo");
-		loader.addListener(l2, new FlowExecutionListenerCriteria() {
-			public boolean appliesTo(FlowDefinition flow) {
-				assertSame(theFlow, flow);
-				return false;
-			}
-		});
-		FlowExecutionListener[] listeners = loader.getListeners(theFlow);
+		loader.addListener(listener, criteriaFactory.allFlows());
+		Flow flow = new Flow("foo");
+		FlowExecutionListener[] listeners = loader.getListeners(flow);
 		assertEquals(1, listeners.length);
-		assertSame(l1, listeners[0]);
+		assertSame(listener, listeners[0]);
 	}
 
-	public void testAddListenerGroup() {
-		FlowExecutionListener l1 = new FlowExecutionListenerAdapter() {
+	public void testAddMultipleListeners() {
+		FlowExecutionListenerAdapter listener = new FlowExecutionListenerAdapter() {
 		};
-		FlowExecutionListener l2 = new FlowExecutionListenerAdapter() {
+		FlowExecutionListenerAdapter listener2 = new FlowExecutionListenerAdapter() {
 		};
-		FlowExecutionListener l3 = new FlowExecutionListenerAdapter() {
-		};
-		FlowExecutionListener l4 = new FlowExecutionListenerAdapter() {
-		};
-		loader.addListener(l1);
-		loader.addListener(l2);
-		loader.addListeners(new FlowExecutionListener[] { l3, l4 }, new FlowExecutionListenerCriteriaFactory()
-				.flow("bogus"));
-		assertTrue(loader.containsListener(l1));
-		assertTrue(loader.containsListener(l2));
-		assertTrue(loader.containsListener(l3));
-		assertTrue(loader.containsListener(l4));
-		FlowExecutionListener[] listeners = loader.getListeners(new Flow("foo"));
+		loader.addListener(listener, criteriaFactory.allFlows());
+		loader.addListener(listener2, criteriaFactory.allFlows());
+		Flow flow = new Flow("foo");
+		FlowExecutionListener[] listeners = loader.getListeners(flow);
 		assertEquals(2, listeners.length);
-		assertSame(l1, listeners[0]);
-		assertSame(l2, listeners[1]);
+		assertSame(listener, listeners[0]);
+		assertSame(listener2, listeners[1]);
 	}
 
-	public void testNullFlowDefinition() {
-		try {
-			loader.getListeners(null);
-			fail("Should have failed");
-		} catch (IllegalArgumentException e) {
-
-		}
-
+	public void testAddListenerButNoMatch() {
+		FlowExecutionListenerAdapter listener = new FlowExecutionListenerAdapter() {
+		};
+		loader.addListener(listener, criteriaFactory.flow("bar"));
+		Flow flow = new Flow("foo");
+		FlowExecutionListener[] listeners = loader.getListeners(flow);
+		assertEquals(0, listeners.length);
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/ClientContinuationFlowExecutionRepositoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/ClientContinuationFlowExecutionRepositoryTests.java
deleted file mode 100644
index 8b3485e2..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/ClientContinuationFlowExecutionRepositoryTests.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.repository.continuation;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.context.ExternalContextHolder;
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.SimpleFlow;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
-import org.springframework.webflow.execution.repository.FlowExecutionLock;
-import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException;
-import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Unit tests for {@link ClientContinuationFlowExecutionRepository}.
- */
-public class ClientContinuationFlowExecutionRepositoryTests extends TestCase {
-
-	private ClientContinuationFlowExecutionRepository repository;
-
-	private FlowExecution execution;
-
-	private FlowExecutionKey key;
-
-	private FlowExecutionLock lock;
-
-	protected void setUp() throws Exception {
-		FlowDefinitionRegistry registry = new FlowDefinitionRegistryImpl();
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(new SimpleFlow()));
-		execution = new FlowExecutionImplFactory().createFlowExecution(registry.getFlowDefinition("simpleFlow"));
-		FlowExecutionStateRestorer stateRestorer = new FlowExecutionImplStateRestorer(registry);
-		repository = new ClientContinuationFlowExecutionRepository(stateRestorer,
-				new SessionBindingConversationManager());
-		ExternalContextHolder.setExternalContext(new MockExternalContext());
-	}
-
-	public void testPutExecution() {
-		key = repository.generateKey(execution);
-		assertNotNull(key);
-		lock = repository.getLock(key);
-		lock.lock();
-		repository.putFlowExecution(key, execution);
-		FlowExecution persisted = repository.getFlowExecution(key);
-		assertNotNull(persisted);
-		lock.unlock();
-	}
-
-	public void testGetNextKey() {
-		key = repository.generateKey(execution);
-		assertNotNull(key);
-		lock = repository.getLock(key);
-		lock.lock();
-		repository.putFlowExecution(key, execution);
-		FlowExecutionKey nextKey = repository.getNextKey(execution, key);
-		repository.putFlowExecution(nextKey, execution);
-		FlowExecution persisted = repository.getFlowExecution(nextKey);
-		assertNotNull(persisted);
-		lock.unlock();
-	}
-
-	public void testGetNextKeyVerifyKeyChanged() {
-		key = repository.generateKey(execution);
-		assertNotNull(key);
-		lock = repository.getLock(key);
-		lock.lock();
-		repository.putFlowExecution(key, execution);
-		FlowExecutionKey nextKey = repository.getNextKey(execution, key);
-		repository.putFlowExecution(nextKey, execution);
-		repository.getFlowExecution(key);
-		repository.getFlowExecution(nextKey);
-		lock.unlock();
-	}
-
-	public void testRemove() {
-		testPutExecution();
-		lock.lock();
-		repository.removeFlowExecution(key);
-		try {
-			repository.getFlowExecution(key);
-			fail("should've throw nsfee");
-		} catch (NoSuchFlowExecutionException e) {
-		}
-		lock.unlock();
-	}
-
-	public void testLock() {
-		testPutExecution();
-		FlowExecutionLock lock = repository.getLock(key);
-		lock.lock();
-		repository.getFlowExecution(key);
-		lock.unlock();
-	}
-
-	public void testLockLock() {
-		testPutExecution();
-		FlowExecutionLock lock = repository.getLock(key);
-		lock.lock();
-		lock.lock();
-		repository.getFlowExecution(key);
-		lock.unlock();
-		lock.unlock();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/ContinuationFlowExecutionRepositoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/ContinuationFlowExecutionRepositoryTests.java
deleted file mode 100644
index ae3ea127..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/ContinuationFlowExecutionRepositoryTests.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.repository.continuation;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.context.ExternalContextHolder;
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.SimpleFlow;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
-import org.springframework.webflow.execution.repository.FlowExecutionLock;
-import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException;
-import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Unit tests for {@link ContinuationFlowExecutionRepository}.
- */
-public class ContinuationFlowExecutionRepositoryTests extends TestCase {
-
-	private ContinuationFlowExecutionRepository repository;
-
-	private FlowExecution execution;
-
-	private FlowExecutionKey key;
-
-	private FlowExecutionLock lock;
-
-	protected void setUp() throws Exception {
-		FlowDefinitionRegistry registry = new FlowDefinitionRegistryImpl();
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(new SimpleFlow()));
-		execution = new FlowExecutionImplFactory().createFlowExecution(registry.getFlowDefinition("simpleFlow"));
-		FlowExecutionStateRestorer stateRestorer = new FlowExecutionImplStateRestorer(registry);
-		repository = new ContinuationFlowExecutionRepository(stateRestorer, new SessionBindingConversationManager());
-		ExternalContextHolder.setExternalContext(new MockExternalContext());
-	}
-
-	public void testPutExecution() {
-		key = repository.generateKey(execution);
-		lock = repository.getLock(key);
-		lock.lock();
-		assertNotNull(key);
-		repository.putFlowExecution(key, execution);
-		FlowExecution persisted = repository.getFlowExecution(key);
-		assertNotNull(persisted);
-		lock.unlock();
-	}
-
-	public void testGetNextKey() {
-		key = repository.generateKey(execution);
-		lock = repository.getLock(key);
-		lock.lock();
-		assertNotNull(key);
-		repository.putFlowExecution(key, execution);
-		FlowExecutionKey nextKey = repository.getNextKey(execution, key);
-		repository.putFlowExecution(nextKey, execution);
-		FlowExecution persisted = repository.getFlowExecution(nextKey);
-		assertNotNull(persisted);
-		lock.unlock();
-	}
-
-	public void testGetNextKeyVerifyKeyChanged() {
-		key = repository.generateKey(execution);
-		lock = repository.getLock(key);
-		lock.lock();
-		assertNotNull(key);
-		repository.putFlowExecution(key, execution);
-		FlowExecutionKey nextKey = repository.getNextKey(execution, key);
-		repository.putFlowExecution(nextKey, execution);
-		repository.getFlowExecution(key);
-		repository.getFlowExecution(nextKey);
-		lock.unlock();
-	}
-
-	public void testRemove() {
-		testPutExecution();
-		lock.lock();
-		repository.removeFlowExecution(key);
-		try {
-			repository.getFlowExecution(key);
-			fail("should've throw nsfee");
-		} catch (NoSuchFlowExecutionException e) {
-		}
-		lock.unlock();
-	}
-
-	public void testLock() {
-		testPutExecution();
-		FlowExecutionLock lock = repository.getLock(key);
-		lock.lock();
-		repository.getFlowExecution(key);
-		lock.unlock();
-	}
-
-	public void testLockLock() {
-		testPutExecution();
-		FlowExecutionLock lock = repository.getLock(key);
-		lock.lock();
-		lock.lock();
-		repository.getFlowExecution(key);
-		lock.unlock();
-		lock.unlock();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationGroupTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationGroupTests.java
deleted file mode 100644
index 4951ee58..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/FlowExecutionContinuationGroupTests.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.repository.continuation;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.config.FlowExecutorFactoryBean;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.context.ExternalContextHolder;
-import org.springframework.webflow.conversation.ConversationManager;
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.builder.AbstractFlowBuilder;
-import org.springframework.webflow.engine.builder.FlowAssembler;
-import org.springframework.webflow.engine.builder.FlowBuilderException;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
-import org.springframework.webflow.execution.repository.FlowExecutionLock;
-import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.execution.support.FlowExecutionRedirect;
-import org.springframework.webflow.executor.FlowExecutor;
-import org.springframework.webflow.executor.ResponseInstruction;
-import org.springframework.webflow.executor.support.RequestParameterFlowExecutorArgumentHandler;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Unit tests for {@link FlowExecutionContinuationGroup}.
- * 
- * @author Erwin Vervaet
- */
-public class FlowExecutionContinuationGroupTests extends TestCase {
-
-	public void testUpdateFlowExecution() {
-		FlowExecutionContinuationGroup group = new FlowExecutionContinuationGroup(-1);
-		assertEquals(0, group.getContinuationCount());
-		FlowExecutionContinuation continuation1 = new TestFlowExecutionContinuation();
-		group.add("1", continuation1);
-		assertEquals(1, group.getContinuationCount());
-		assertSame(continuation1, group.get("1"));
-		FlowExecutionContinuation continuation2 = new TestFlowExecutionContinuation();
-		group.add("2", continuation2);
-		assertEquals(2, group.getContinuationCount());
-		assertSame(continuation1, group.get("1"));
-		assertSame(continuation2, group.get("2"));
-		FlowExecutionContinuation updatedContinuation2 = new TestFlowExecutionContinuation();
-		group.add("2", updatedContinuation2);
-		assertEquals(2, group.getContinuationCount());
-		assertSame(continuation1, group.get("1"));
-		assertSame(updatedContinuation2, group.get("2"));
-	}
-
-	public void testUpdateFlowExecutionWithMaxContinuations() {
-		FlowExecutionContinuationGroup group = new FlowExecutionContinuationGroup(2);
-		FlowExecutionContinuation continuation1 = new TestFlowExecutionContinuation();
-		group.add("1", continuation1);
-		FlowExecutionContinuation continuation2 = new TestFlowExecutionContinuation();
-		group.add("2", continuation2);
-		assertEquals(2, group.getContinuationCount());
-		assertSame(continuation1, group.get("1"));
-		assertSame(continuation2, group.get("2"));
-		FlowExecutionContinuation updatedContinuation2 = new TestFlowExecutionContinuation();
-		group.add("2", updatedContinuation2);
-		assertEquals(2, group.getContinuationCount());
-		assertSame(continuation1, group.get("1"));
-		assertSame(updatedContinuation2, group.get("2"));
-		FlowExecutionContinuation continuation3 = new TestFlowExecutionContinuation();
-		group.add("3", continuation3);
-		assertEquals(2, group.getContinuationCount());
-		try {
-			group.get("1");
-			fail();
-		} catch (ContinuationNotFoundException e) {
-			// expected
-		}
-		assertSame(updatedContinuation2, group.get("2"));
-		assertSame(continuation3, group.get("3"));
-		updatedContinuation2 = new TestFlowExecutionContinuation();
-		group.add("2", updatedContinuation2);
-		FlowExecutionContinuation continuation4 = new TestFlowExecutionContinuation();
-		group.add("4", continuation4);
-		assertEquals(2, group.getContinuationCount());
-		try {
-			group.get("3");
-			fail();
-		} catch (ContinuationNotFoundException e) {
-			// expected
-		}
-		assertSame(updatedContinuation2, group.get("2"));
-		assertSame(continuation4, group.get("4"));
-	}
-
-	public void testViaFlowExecutor() throws Exception {
-		FlowDefinitionRegistry registry = new FlowDefinitionRegistryImpl();
-		FlowDefinition testFlow = new FlowAssembler("testFlow", new TestFlowBuilder()).assembleFlow();
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(testFlow));
-
-		ConversationManager conversationManager = new SessionBindingConversationManager();
-
-		FlowExecutorFactoryBean flowExecutorFactory = new FlowExecutorFactoryBean();
-		flowExecutorFactory.setDefinitionLocator(registry);
-		flowExecutorFactory.setConversationManager(conversationManager);
-		flowExecutorFactory.afterPropertiesSet();
-		FlowExecutor flowExecutor = (FlowExecutor) flowExecutorFactory.getObject();
-
-		MockExternalContext externalContext = new MockExternalContext();
-
-		GroupGetter groupGetter = new GroupGetter(registry, conversationManager);
-
-		// obtain continuation group
-		ResponseInstruction response = flowExecutor.launch("testFlow", externalContext);
-		externalContext.putRequestParameter("_flowExecutionKey", response.getFlowExecutionKey());
-		FlowExecutionContinuationGroup group = groupGetter.getContinuationGroup(externalContext);
-		assertNotNull(group);
-
-		assertTrue(response.getViewSelection() instanceof FlowExecutionRedirect);
-		assertEquals(1, group.getContinuationCount());
-		externalContext.putRequestParameter("_flowExecutionKey", response.getFlowExecutionKey());
-		response = flowExecutor.refresh(response.getFlowExecutionKey(), externalContext);
-		assertEquals("viewName", ((ApplicationView) response.getViewSelection()).getViewName());
-		assertEquals(1, group.getContinuationCount());
-
-		externalContext.putRequestParameter("_flowExecutionKey", response.getFlowExecutionKey());
-		response = flowExecutor.resume(response.getFlowExecutionKey(), "next", externalContext);
-		assertTrue(response.getViewSelection() instanceof FlowExecutionRedirect);
-		assertEquals(2, group.getContinuationCount());
-		externalContext.putRequestParameter("_flowExecutionKey", response.getFlowExecutionKey());
-		response = flowExecutor.refresh(response.getFlowExecutionKey(), externalContext);
-		assertEquals("nextViewName", ((ApplicationView) response.getViewSelection()).getViewName());
-		assertEquals(2, group.getContinuationCount());
-
-		externalContext.putRequestParameter("_flowExecutionKey", response.getFlowExecutionKey());
-		response = flowExecutor.refresh(response.getFlowExecutionKey(), externalContext);
-		assertEquals("nextViewName", ((ApplicationView) response.getViewSelection()).getViewName());
-		assertEquals(2, group.getContinuationCount());
-
-		externalContext.putRequestParameter("_flowExecutionKey", response.getFlowExecutionKey());
-		response = flowExecutor.resume(response.getFlowExecutionKey(), "end", externalContext);
-
-		try {
-			groupGetter.getContinuationGroup(externalContext);
-			fail();
-		} catch (NoSuchFlowExecutionException e) {
-			// expected
-		}
-	}
-
-	private static class TestFlowExecutionContinuation extends FlowExecutionContinuation {
-
-		public FlowExecution unmarshal() throws ContinuationUnmarshalException {
-			return null;
-		}
-
-		public byte[] toByteArray() {
-			return new byte[0];
-		}
-	}
-
-	private static class TestFlowBuilder extends AbstractFlowBuilder {
-		public void buildStates() throws FlowBuilderException {
-			addViewState("viewState", "viewName", transition(on("next"), to("nextViewState")));
-			addViewState("nextViewState", "nextViewName", transition(on("end"), to("endState")));
-			addEndState("endState");
-		}
-	}
-
-	private static class GroupGetter extends ContinuationFlowExecutionRepository {
-
-		public GroupGetter(FlowDefinitionLocator definitionLocator, ConversationManager conversationManager) {
-			super(new FlowExecutionImplStateRestorer(definitionLocator), conversationManager);
-		}
-
-		public FlowExecutionContinuationGroup getContinuationGroup(ExternalContext externalContext) {
-			ExternalContextHolder.setExternalContext(externalContext);
-			try {
-				FlowExecutionKey key = parseFlowExecutionKey(new RequestParameterFlowExecutorArgumentHandler()
-						.extractFlowExecutionKey(externalContext));
-				FlowExecutionLock lock = getLock(key);
-				lock.lock();
-				try {
-					return getContinuationGroup(key);
-				} finally {
-					lock.unlock();
-				}
-			} finally {
-				ExternalContextHolder.setExternalContext(null);
-			}
-		}
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactoryTests.java
new file mode 100644
index 00000000..f034030b
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationFactoryTests.java
@@ -0,0 +1,76 @@
+package org.springframework.webflow.execution.repository.continuation;
+
+import junit.framework.TestCase;
+
+import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.definition.registry.FlowDefinitionConstructionException;
+import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
+import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.engine.RequestControlContext;
+import org.springframework.webflow.engine.State;
+import org.springframework.webflow.engine.impl.FlowExecutionImpl;
+import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
+import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
+import org.springframework.webflow.execution.FlowExecution;
+import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.FlowExecutionKeyFactory;
+import org.springframework.webflow.execution.repository.support.FlowExecutionStateRestorer;
+import org.springframework.webflow.test.MockExternalContext;
+import org.springframework.webflow.test.MockFlowExecutionKeyFactory;
+
+public class SerializedFlowExecutionContinuationFactoryTests extends TestCase {
+	private Flow flow;
+	private SerializedFlowExecutionContinuationFactory factory;
+	private FlowExecutionStateRestorer stateRestorer;
+	private FlowExecutionKeyFactory executionKeyFactory;
+
+	public void setUp() {
+		flow = new Flow("myFlow");
+		new State(flow, "state") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+			}
+		};
+		factory = new SerializedFlowExecutionContinuationFactory();
+		stateRestorer = new FlowExecutionImplStateRestorer(new FlowDefinitionLocator() {
+			public FlowDefinition getFlowDefinition(String flowId) throws NoSuchFlowDefinitionException,
+					FlowDefinitionConstructionException {
+				return flow;
+			}
+		});
+		executionKeyFactory = new MockFlowExecutionKeyFactory();
+	}
+
+	public void testCreateContinuation() {
+		FlowExecution flowExecution = new FlowExecutionImplFactory().createFlowExecution(flow);
+		flowExecution.start(new MockExternalContext());
+		flowExecution.getActiveSession().getScope().put("foo", "bar");
+		FlowExecutionContinuation continuation = factory.createContinuation(flowExecution);
+		FlowExecutionImpl flowExecution2 = (FlowExecutionImpl) continuation.unmarshal();
+		assertNotSame(flowExecution, flowExecution2);
+		stateRestorer.restoreState(flowExecution2, null, flowExecution.getConversationScope(), executionKeyFactory);
+		assertEquals(flowExecution.getDefinition().getId(), flowExecution2.getDefinition().getId());
+		assertEquals(flowExecution.getActiveSession().getScope().get("foo"), flowExecution2.getActiveSession()
+				.getScope().get("foo"));
+		assertEquals(flowExecution.getActiveSession().getState().getId(), flowExecution2.getActiveSession().getState()
+				.getId());
+	}
+
+	public void testRestoreContinuation() {
+		FlowExecution flowExecution = new FlowExecutionImplFactory().createFlowExecution(flow);
+		flowExecution.start(new MockExternalContext());
+		flowExecution.getActiveSession().getScope().put("foo", "bar");
+		FlowExecutionContinuation continuation = factory.createContinuation(flowExecution);
+		byte[] bytes = continuation.toByteArray();
+		FlowExecutionContinuation continuation2 = factory.restoreContinuation(bytes);
+		assertEquals(continuation, continuation2);
+		FlowExecutionImpl flowExecution2 = (FlowExecutionImpl) continuation2.unmarshal();
+		assertNotSame(flowExecution, flowExecution2);
+		stateRestorer.restoreState(flowExecution2, null, flowExecution.getConversationScope(), executionKeyFactory);
+		assertEquals(flowExecution.getDefinition().getId(), flowExecution2.getDefinition().getId());
+		assertEquals(flowExecution.getActiveSession().getScope().get("foo"), flowExecution2.getActiveSession()
+				.getScope().get("foo"));
+		assertEquals(flowExecution.getActiveSession().getState().getId(), flowExecution2.getActiveSession().getState()
+				.getId());
+	}
+}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationTests.java
deleted file mode 100644
index 9c103d9b..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/continuation/SerializedFlowExecutionContinuationTests.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.repository.continuation;
-
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputStream;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.definition.FlowDefinition;
-import org.springframework.webflow.engine.SimpleFlow;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Unit tests for {@link SerializedFlowExecutionContinuation}.
- * 
- * @author Keith Donald
- */
-public class SerializedFlowExecutionContinuationTests extends TestCase {
-
-	public void testCreate() throws Exception {
-		FlowDefinition flow = new SimpleFlow();
-		FlowExecution execution = new FlowExecutionImplFactory().createFlowExecution(flow);
-		execution.start(null, new MockExternalContext());
-		SerializedFlowExecutionContinuation c = new SerializedFlowExecutionContinuation(execution, true);
-		assertTrue(c.isCompressed());
-		byte[] array = c.toByteArray();
-		execution = c.unmarshal();
-
-		ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(array));
-		try {
-			c = (SerializedFlowExecutionContinuation) ois.readObject();
-			assertTrue(c.isCompressed());
-			execution = c.unmarshal();
-		} finally {
-			ois.close();
-		}
-	}
-
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/impl/ClientFlowExecutionRepositoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/impl/ClientFlowExecutionRepositoryTests.java
new file mode 100644
index 00000000..2f1d65df
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/impl/ClientFlowExecutionRepositoryTests.java
@@ -0,0 +1,14 @@
+package org.springframework.webflow.execution.repository.impl;
+
+import junit.framework.TestCase;
+
+public class ClientFlowExecutionRepositoryTests extends TestCase {
+
+	protected void setUp() {
+
+	}
+
+	public void testMe() {
+
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepositoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepositoryTests.java
new file mode 100644
index 00000000..f9c8901a
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/impl/DefaultFlowExecutionRepositoryTests.java
@@ -0,0 +1,224 @@
+package org.springframework.webflow.execution.repository.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.springframework.webflow.conversation.Conversation;
+import org.springframework.webflow.conversation.ConversationException;
+import org.springframework.webflow.conversation.ConversationId;
+import org.springframework.webflow.conversation.ConversationManager;
+import org.springframework.webflow.conversation.ConversationParameters;
+import org.springframework.webflow.conversation.NoSuchConversationException;
+import org.springframework.webflow.conversation.impl.SimpleConversationId;
+import org.springframework.webflow.definition.FlowDefinition;
+import org.springframework.webflow.definition.registry.FlowDefinitionConstructionException;
+import org.springframework.webflow.definition.registry.FlowDefinitionLocator;
+import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.engine.RequestControlContext;
+import org.springframework.webflow.engine.State;
+import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
+import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
+import org.springframework.webflow.execution.FlowExecution;
+import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.FlowExecutionKey;
+import org.springframework.webflow.execution.repository.BadlyFormattedFlowExecutionKeyException;
+import org.springframework.webflow.execution.repository.FlowExecutionLock;
+import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException;
+import org.springframework.webflow.test.MockExternalContext;
+
+public class DefaultFlowExecutionRepositoryTests extends TestCase {
+	private Flow flow;
+	private ConversationManager conversationManager;
+	private FlowExecutionImplStateRestorer stateRestorer;
+	private DefaultFlowExecutionRepository repository;
+
+	protected void setUp() throws Exception {
+		flow = new Flow("myFlow");
+		new State(flow, "state") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+				context.assignFlowExecutionKey();
+			}
+		};
+		conversationManager = new StubConversationManager();
+		stateRestorer = new FlowExecutionImplStateRestorer(new FlowDefinitionLocator() {
+			public FlowDefinition getFlowDefinition(String flowId) throws NoSuchFlowDefinitionException,
+					FlowDefinitionConstructionException {
+				return flow;
+			}
+		});
+		repository = new DefaultFlowExecutionRepository(conversationManager, stateRestorer);
+	}
+
+	public void testParseFlowExecutionKey() {
+		String key = "_c12345_k54321";
+		FlowExecutionKey k = repository.parseFlowExecutionKey(key);
+		assertEquals(key, k.toString());
+	}
+
+	public void testParseBadlyFormattedFlowExecutionKey() {
+		String key = "_c12345";
+		try {
+			repository.parseFlowExecutionKey(key);
+			fail("Should have failed");
+		} catch (BadlyFormattedFlowExecutionKeyException e) {
+			assertEquals("_c12345", e.getInvalidKey());
+			assertNotNull(e.getFormat());
+		}
+	}
+
+	public void testGetLock() {
+		FlowExecutionKey key = repository.parseFlowExecutionKey("_c12345_k54321");
+		FlowExecutionLock lock = repository.getLock(key);
+		assertNotNull(lock);
+		lock.unlock();
+	}
+
+	public void testGetLockNoSuchFlowExecution() {
+		FlowExecutionKey key = repository.parseFlowExecutionKey("_cbogus_k54321");
+		try {
+			repository.getLock(key);
+			fail("should have failed");
+		} catch (NoSuchFlowExecutionException e) {
+
+		}
+	}
+
+	public void testPutFlowExecution() {
+		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
+		factory.setExecutionKeyFactory(repository);
+		FlowExecution execution = factory.createFlowExecution(flow);
+		execution.start(new MockExternalContext());
+		assertNotNull(execution.getKey());
+		repository.putFlowExecution(execution);
+		FlowExecution execution2 = repository.getFlowExecution(execution.getKey());
+		assertSame(execution.getDefinition(), execution2.getDefinition());
+		assertEquals(execution.getActiveSession().getState().getId(), execution2.getActiveSession().getState().getId());
+	}
+
+	public void testPutFlowExecutionNoKeyAssigned() {
+		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
+		FlowExecution execution = factory.createFlowExecution(flow);
+		try {
+			repository.putFlowExecution(execution);
+			fail("Should have failed");
+		} catch (IllegalStateException e) {
+
+		}
+	}
+
+	public void testRemoveFlowExecution() {
+		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
+		factory.setExecutionKeyFactory(repository);
+		FlowExecution execution = factory.createFlowExecution(flow);
+		execution.start(new MockExternalContext());
+		assertNotNull(execution.getKey());
+		repository.putFlowExecution(execution);
+		repository.removeFlowExecution(execution);
+		try {
+			repository.getFlowExecution(execution.getKey());
+			fail("Should have failed");
+		} catch (NoSuchFlowExecutionException e) {
+
+		}
+	}
+
+	public void testRemoveKeyNotSet() {
+		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
+		FlowExecution execution = factory.createFlowExecution(flow);
+		try {
+			repository.removeFlowExecution(execution);
+			fail("Should have failed");
+		} catch (IllegalStateException e) {
+
+		}
+	}
+
+	public void testRemoveNoSuchFlowExecution() {
+		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
+		factory.setExecutionKeyFactory(repository);
+		FlowExecution execution = factory.createFlowExecution(flow);
+		execution.start(new MockExternalContext());
+		try {
+			repository.removeFlowExecution(execution);
+			repository.removeFlowExecution(execution);
+			fail("Should have failed");
+		} catch (NoSuchFlowExecutionException e) {
+
+		}
+	}
+
+	public static class StubConversationManager implements ConversationManager {
+
+		/**
+		 * The single conversation managed by the manager.
+		 */
+		private final StubConversation INSTANCE = new StubConversation();
+
+		public Conversation beginConversation(ConversationParameters conversationParameters)
+				throws ConversationException {
+			return INSTANCE;
+		}
+
+		public Conversation getConversation(ConversationId id) throws ConversationException {
+			if (id.equals(INSTANCE.getId()) && !INSTANCE.hasEnded()) {
+				return INSTANCE;
+			} else {
+				throw new NoSuchConversationException(id);
+			}
+		}
+
+		public ConversationId parseConversationId(String encodedId) throws ConversationException {
+			return new SimpleConversationId(encodedId);
+		}
+
+		private static class StubConversation implements Conversation {
+
+			private final ConversationId ID = new SimpleConversationId("12345");
+
+			private boolean locked;
+
+			private boolean ended;
+
+			private Map attributes = new HashMap();
+
+			public boolean hasEnded() {
+				return ended;
+			}
+
+			public boolean isLocked() {
+				return locked;
+			}
+
+			public ConversationId getId() {
+				return ID;
+			}
+
+			public void lock() {
+				locked = true;
+			}
+
+			public Object getAttribute(Object name) {
+				return attributes.get(name);
+			}
+
+			public void putAttribute(Object name, Object value) {
+				attributes.put(name, value);
+			}
+
+			public void removeAttribute(Object name) {
+				attributes.remove(name);
+			}
+
+			public void end() {
+				ended = true;
+			}
+
+			public void unlock() {
+				locked = false;
+			}
+		}
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/support/CompositeFlowExecutionKeyTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/support/CompositeFlowExecutionKeyTests.java
index 3a63ee16..07ab3aad 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/support/CompositeFlowExecutionKeyTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/support/CompositeFlowExecutionKeyTests.java
@@ -19,17 +19,14 @@ import junit.framework.TestCase;
 
 import org.springframework.webflow.conversation.impl.SimpleConversationId;
 
-/**
- * Unit tests for {@link CompositeFlowExecutionKey}.
- */
 public class CompositeFlowExecutionKeyTests extends TestCase {
 
-	public void testValidKey() {
+	public void testToString() {
 		CompositeFlowExecutionKey key = new CompositeFlowExecutionKey(new SimpleConversationId("foo"), "bar");
 		assertEquals("_cfoo_kbar", key.toString());
 	}
 
-	public void testKeyEquals() {
+	public void testEquals() {
 		CompositeFlowExecutionKey key = new CompositeFlowExecutionKey(new SimpleConversationId("foo"), "bar");
 		CompositeFlowExecutionKey key2 = new CompositeFlowExecutionKey(new SimpleConversationId("foo"), "bar");
 		assertEquals(key, key2);
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/support/SimpleFlowExecutionRepositoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/support/SimpleFlowExecutionRepositoryTests.java
deleted file mode 100644
index 120465b8..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/repository/support/SimpleFlowExecutionRepositoryTests.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.repository.support;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.context.ExternalContextHolder;
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.SimpleFlow;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.execution.FlowExecution;
-import org.springframework.webflow.execution.repository.FlowExecutionKey;
-import org.springframework.webflow.execution.repository.FlowExecutionLock;
-import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException;
-import org.springframework.webflow.execution.repository.PermissionDeniedFlowExecutionAccessException;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Unit tests for {@link SimpleFlowExecutionRepository}.
- */
-public class SimpleFlowExecutionRepositoryTests extends TestCase {
-
-	private SimpleFlowExecutionRepository repository;
-
-	private FlowExecution execution;
-
-	private FlowExecutionKey key;
-
-	private FlowExecutionLock lock;
-
-	protected void setUp() throws Exception {
-		FlowDefinitionRegistry registry = new FlowDefinitionRegistryImpl();
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(new SimpleFlow()));
-		execution = new FlowExecutionImplFactory().createFlowExecution(registry.getFlowDefinition("simpleFlow"));
-		FlowExecutionStateRestorer stateRestorer = new FlowExecutionImplStateRestorer(registry);
-		repository = new SimpleFlowExecutionRepository(stateRestorer, new SessionBindingConversationManager());
-		ExternalContextHolder.setExternalContext(new MockExternalContext());
-	}
-
-	public void testPutExecution() {
-		key = repository.generateKey(execution);
-		assertNotNull(key);
-		lock = repository.getLock(key);
-		lock.lock();
-		repository.putFlowExecution(key, execution);
-		FlowExecution persisted = repository.getFlowExecution(key);
-		assertNotNull(persisted);
-		assertSame(execution, persisted);
-		lock.unlock();
-	}
-
-	public void testGetNextKey() {
-		key = repository.generateKey(execution);
-		assertNotNull(key);
-		lock = repository.getLock(key);
-		lock.lock();
-		repository.putFlowExecution(key, execution);
-		FlowExecutionKey nextKey = repository.getNextKey(execution, key);
-		repository.putFlowExecution(nextKey, execution);
-		FlowExecution persisted = repository.getFlowExecution(nextKey);
-		assertNotNull(persisted);
-		assertSame(execution, persisted);
-		lock.unlock();
-	}
-
-	public void testGetNextKeyVerifyKeyChanged() {
-		key = repository.generateKey(execution);
-		assertNotNull(key);
-		lock = repository.getLock(key);
-		lock.lock();
-		repository.putFlowExecution(key, execution);
-		FlowExecutionKey nextKey = repository.getNextKey(execution, key);
-		repository.putFlowExecution(nextKey, execution);
-		try {
-			repository.getFlowExecution(key);
-			fail("Should've failed");
-		} catch (PermissionDeniedFlowExecutionAccessException e) {
-		}
-		lock.unlock();
-	}
-
-	public void testGetNextKeyVerifyKeyStaysSame() {
-		repository.setAlwaysGenerateNewNextKey(false);
-		key = repository.generateKey(execution);
-		FlowExecutionKey nextKey = repository.getNextKey(execution, key);
-		assertSame(key, nextKey);
-	}
-
-	public void testRemove() {
-		testPutExecution();
-		lock.lock();
-		repository.removeFlowExecution(key);
-		try {
-			repository.getFlowExecution(key);
-			fail("should've throw nsfee");
-		} catch (NoSuchFlowExecutionException e) {
-		}
-		lock.unlock();
-	}
-
-	public void testLock() {
-		testPutExecution();
-		FlowExecutionLock lock = repository.getLock(key);
-		lock.lock();
-		repository.getFlowExecution(key);
-		lock.unlock();
-	}
-
-	public void testLockLock() {
-		testPutExecution();
-		FlowExecutionLock lock = repository.getLock(key);
-		lock.lock();
-		lock.lock();
-		repository.getFlowExecution(key);
-		lock.unlock();
-		lock.unlock();
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/support/ApplicationViewTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/support/ApplicationViewTests.java
deleted file mode 100644
index dd5d83cb..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/support/ApplicationViewTests.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.support;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-/**
- * Unit tests for {@link ApplicationView}.
- */
-public class ApplicationViewTests extends TestCase {
-
-	public void testConstructAndAccess() {
-		Map model = new HashMap();
-		model.put("name", "value");
-		ApplicationView view = new ApplicationView("view", model);
-		assertEquals("view", view.getViewName());
-		assertEquals(1, view.getModel().size());
-		assertEquals("value", model.get("name"));
-		try {
-			view.getModel().put("foo", "bar");
-		} catch (UnsupportedOperationException e) {
-
-		}
-	}
-
-	public void testNullParams() {
-		ApplicationView view = new ApplicationView(null, null);
-		assertEquals(0, view.getModel().size());
-		assertEquals(null, view.getViewName());
-		ApplicationView view2 = new ApplicationView(null, null);
-		assertEquals(view, view2);
-	}
-
-	public void testMapLookup() {
-		ApplicationView view = new ApplicationView("view", null);
-		Map map = new HashMap();
-		map.put("view", view);
-		assertSame(view, map.get("view"));
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/support/ExternalRedirectTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/support/ExternalRedirectTests.java
deleted file mode 100644
index 76732867..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/support/ExternalRedirectTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.support;
-
-import junit.framework.TestCase;
-
-/**
- * Unit tests for {@link ExternalRedirect}.
- */
-public class ExternalRedirectTests extends TestCase {
-
-	private ExternalRedirect redirect;
-
-	protected void setUp() throws Exception {
-	}
-
-	public void testStaticExpression() {
-		redirect = new ExternalRedirect("my/url");
-		assertEquals("my/url", redirect.getUrl());
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/execution/support/FlowDefinitionRedirectTests.java b/spring-webflow/src/test/java/org/springframework/webflow/execution/support/FlowDefinitionRedirectTests.java
deleted file mode 100644
index 91f592fe..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/execution/support/FlowDefinitionRedirectTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.execution.support;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-/**
- * Unit tests for {@link FlowDefinitionRedirect}.
- */
-public class FlowDefinitionRedirectTests extends TestCase {
-
-	public void testConstructAndAccess() {
-		Map input = new HashMap();
-		input.put("name", "value");
-		FlowDefinitionRedirect redirect = new FlowDefinitionRedirect("foo", input);
-		assertEquals("foo", redirect.getFlowDefinitionId());
-		assertEquals(1, redirect.getExecutionInput().size());
-		assertEquals("value", redirect.getExecutionInput().get("name"));
-		try {
-			redirect.getExecutionInput().put("foo", "bar");
-		} catch (UnsupportedOperationException e) {
-
-		}
-	}
-
-	public void testNullParams() {
-		try {
-			new FlowDefinitionRedirect(null, null);
-			fail("was null");
-		} catch (IllegalArgumentException e) {
-
-		}
-
-	}
-
-	public void testMapLookup() {
-		FlowDefinitionRedirect redirect = new FlowDefinitionRedirect("foo", null);
-		Map map = new HashMap();
-		map.put("redirect", redirect);
-		assertSame(redirect, map.get("redirect"));
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/ClientContinuationFlowExecutorIntegrationTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/ClientContinuationFlowExecutorIntegrationTests.java
deleted file mode 100644
index 0d613950..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/ClientContinuationFlowExecutorIntegrationTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor;
-
-public class ClientContinuationFlowExecutorIntegrationTests extends FlowExecutorIntegrationTests {
-	protected String[] getConfigLocations() {
-		return new String[] { "org/springframework/webflow/executor/context.xml",
-				"org/springframework/webflow/executor/repository-client.xml" };
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/ContinuationFlowExecutorIntegrationTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/ContinuationFlowExecutorIntegrationTests.java
deleted file mode 100644
index 334678a7..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/ContinuationFlowExecutorIntegrationTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor;
-
-public class ContinuationFlowExecutorIntegrationTests extends FlowExecutorIntegrationTests {
-	protected String[] getConfigLocations() {
-		return new String[] { "org/springframework/webflow/executor/context.xml",
-				"org/springframework/webflow/executor/repository-continuation.xml" };
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/FlowExecutorImplTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/FlowExecutorImplTests.java
new file mode 100644
index 00000000..274c5b99
--- /dev/null
+++ b/spring-webflow/src/test/java/org/springframework/webflow/executor/FlowExecutorImplTests.java
@@ -0,0 +1,97 @@
+package org.springframework.webflow.executor;
+
+import junit.framework.TestCase;
+
+import org.springframework.webflow.context.ExternalContextHolder;
+import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
+import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
+import org.springframework.webflow.engine.EndState;
+import org.springframework.webflow.engine.Flow;
+import org.springframework.webflow.engine.RequestControlContext;
+import org.springframework.webflow.engine.State;
+import org.springframework.webflow.engine.StubViewFactory;
+import org.springframework.webflow.engine.ViewState;
+import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
+import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
+import org.springframework.webflow.execution.FlowExecutionException;
+import org.springframework.webflow.execution.repository.impl.DefaultFlowExecutionRepository;
+import org.springframework.webflow.test.MockExternalContext;
+
+public class FlowExecutorImplTests extends TestCase {
+	private FlowDefinitionRegistryImpl definitionLocator;
+	private FlowExecutionImplFactory executionFactory;
+	private DefaultFlowExecutionRepository executionRepository;
+	private FlowExecutorImpl executor;
+
+	protected void setUp() {
+		definitionLocator = new FlowDefinitionRegistryImpl();
+		executionFactory = new FlowExecutionImplFactory();
+		executionRepository = new DefaultFlowExecutionRepository(new SessionBindingConversationManager(),
+				new FlowExecutionImplStateRestorer(definitionLocator));
+		executionFactory.setExecutionKeyFactory(executionRepository);
+		executor = new FlowExecutorImpl(definitionLocator, executionFactory, executionRepository);
+	}
+
+	public void testLaunchAndEnd() {
+		Flow flow = new Flow("flow");
+		new EndState(flow, "end");
+		definitionLocator.registerFlowDefinition(flow);
+		MockExternalContext context = new MockExternalContext();
+		context.setFlowId("flow");
+
+		ExternalContextHolder.setExternalContext(context);
+		executor.execute(context);
+		ExternalContextHolder.setExternalContext(null);
+
+		assertNull(context.getFlowExecutionRedirectResult());
+		assertNull(context.getPausedFlowExecutionKeyResult());
+		assertNull(context.getExceptionResult());
+	}
+
+	public void testLaunchAndResume() {
+		Flow flow = new Flow("flow");
+		new ViewState(flow, "pause", new StubViewFactory());
+		definitionLocator.registerFlowDefinition(flow);
+		MockExternalContext context = new MockExternalContext();
+		context.setFlowId("flow");
+
+		ExternalContextHolder.setExternalContext(context);
+		executor.execute(context);
+		ExternalContextHolder.setExternalContext(null);
+
+		assertNotNull(context.getPausedFlowExecutionKeyResult());
+		assertNull(context.getExceptionResult());
+		assertNull(context.getFlowExecutionRedirectResult());
+
+		MockExternalContext context2 = new MockExternalContext();
+		context2.setSessionMap(context.getSessionMap());
+		context2.setFlowId("flow");
+		context2.setFlowExecutionKey(context.getPausedFlowExecutionKeyResult());
+
+		ExternalContextHolder.setExternalContext(context);
+		executor.execute(context2);
+		ExternalContextHolder.setExternalContext(null);
+	}
+
+	public void testLaunchAndException() {
+		Flow flow = new Flow("flow");
+		final UnsupportedOperationException e = new UnsupportedOperationException();
+		new State(flow, "exception") {
+			protected void doEnter(RequestControlContext context) throws FlowExecutionException {
+				throw e;
+			}
+		};
+		definitionLocator.registerFlowDefinition(flow);
+		MockExternalContext context = new MockExternalContext();
+		context.setFlowId("flow");
+
+		ExternalContextHolder.setExternalContext(context);
+		executor.execute(context);
+		ExternalContextHolder.setExternalContext(null);
+
+		assertNull(context.getFlowExecutionRedirectResult());
+		assertNull(context.getPausedFlowExecutionKeyResult());
+		assertNotNull(context.getExceptionResult());
+		assertSame(e, context.getExceptionResult().getCause());
+	}
+}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/FlowExecutorIntegrationTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/FlowExecutorIntegrationTests.java
deleted file mode 100644
index f9bfb7b6..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/FlowExecutorIntegrationTests.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.mock.web.MockServletContext;
-import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
-import org.springframework.webflow.context.ExternalContext;
-import org.springframework.webflow.context.servlet.ServletExternalContext;
-import org.springframework.webflow.definition.registry.NoSuchFlowDefinitionException;
-import org.springframework.webflow.engine.NoMatchingTransitionException;
-import org.springframework.webflow.execution.repository.NoSuchFlowExecutionException;
-import org.springframework.webflow.execution.support.ApplicationView;
-import org.springframework.webflow.test.MockExternalContext;
-
-public class FlowExecutorIntegrationTests extends AbstractDependencyInjectionSpringContextTests {
-
-	private FlowExecutor flowExecutor;
-
-	public void setFlowExecutor(FlowExecutor flowExecutor) {
-		this.flowExecutor = flowExecutor;
-	}
-
-	protected String[] getConfigLocations() {
-		return new String[] { "org/springframework/webflow/executor/context.xml",
-				"org/springframework/webflow/executor/repository-simple.xml" };
-	}
-
-	public void testConfigurationOk() {
-		assertNotNull(flowExecutor);
-	}
-
-	public void testLaunchFlow() {
-		ExternalContext context = new ServletExternalContext(new MockServletContext(), new MockHttpServletRequest(),
-				new MockHttpServletResponse());
-		ResponseInstruction response = flowExecutor.launch("flow", context);
-		assertTrue(response.getFlowExecutionContext().isActive());
-		assertEquals("viewState1", response.getFlowExecutionContext().getActiveSession().getState().getId());
-		assertTrue(response.isApplicationView());
-		ApplicationView view = (ApplicationView) response.getViewSelection();
-		assertEquals("view1", view.getViewName());
-		assertEquals(0, view.getModel().size());
-	}
-
-	public void testLaunchNoSuchFlow() {
-		try {
-			ExternalContext context = new ServletExternalContext(new MockServletContext(),
-					new MockHttpServletRequest(), new MockHttpServletResponse());
-			flowExecutor.launch("bogus", context);
-			fail("no such flow expected");
-		} catch (NoSuchFlowDefinitionException e) {
-			assertEquals("bogus", e.getFlowId());
-		}
-	}
-
-	public void testLaunchAndSignalEvent() {
-		ExternalContext context = new ServletExternalContext(new MockServletContext(), new MockHttpServletRequest(),
-				new MockHttpServletResponse());
-		ResponseInstruction response = flowExecutor.launch("flow", context);
-		String key = response.getFlowExecutionKey();
-		assertEquals("viewState1", response.getFlowExecutionContext().getActiveSession().getState().getId());
-		response = flowExecutor.resume(key, "event1", context);
-		assertTrue(response.getFlowExecutionContext().isActive());
-		assertEquals("viewState2", response.getFlowExecutionContext().getActiveSession().getState().getId());
-		assertTrue(response.isApplicationView());
-		assertNotNull(response.getFlowExecutionKey());
-		ApplicationView view = (ApplicationView) response.getViewSelection();
-		assertEquals("view2", view.getViewName());
-		assertEquals(0, view.getModel().size());
-		response = flowExecutor.resume(response.getFlowExecutionKey(), "event1", context);
-		view = (ApplicationView) response.getViewSelection();
-		assertFalse(response.getFlowExecutionContext().isActive());
-		assertTrue(response.isApplicationView());
-		assertNull(response.getFlowExecutionKey());
-		assertEquals("endView1", view.getViewName());
-		assertEquals(0, view.getModel().size());
-		try {
-			flowExecutor.resume(key, "event1", context);
-			fail("Should've been removed");
-		} catch (NoSuchFlowExecutionException e) {
-
-		}
-	}
-
-	public void testRefresh() {
-		ExternalContext context = new ServletExternalContext(new MockServletContext(), new MockHttpServletRequest(),
-				new MockHttpServletResponse());
-		ResponseInstruction response = flowExecutor.launch("flow", context);
-		ResponseInstruction response2 = flowExecutor.refresh(response.getFlowExecutionKey(), context);
-		assertEquals(response, response2);
-	}
-
-	public void testNoSuchFlowExecution() {
-		try {
-			flowExecutor.resume("_cbogus_kbogus", "bogus", new MockExternalContext());
-			fail("Should've failed");
-		} catch (NoSuchFlowExecutionException e) {
-			assertEquals("_cbogus_kbogus", e.getFlowExecutionKey().toString());
-		}
-	}
-
-	public void testSignalEventNoMatchingTransition() {
-		ExternalContext context = new ServletExternalContext(new MockServletContext(), new MockHttpServletRequest(),
-				new MockHttpServletResponse());
-		ResponseInstruction response = flowExecutor.launch("flow", context);
-		String key = response.getFlowExecutionKey();
-		try {
-			flowExecutor.resume(key, "bogus", context);
-			fail("Should've been removed");
-		} catch (NoMatchingTransitionException e) {
-			assertEquals("flow", e.getFlowId());
-			assertEquals("viewState1", e.getStateId());
-			assertEquals("bogus", e.getEvent().getId());
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/context.xml b/spring-webflow/src/test/java/org/springframework/webflow/executor/context.xml
deleted file mode 100644
index efa3d7e0..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/context.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-	
-		
-		
-		
-	
-
-	
-
-	
-		
-			
-		
-	
-
-	
-		
-	
-
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/executor/flow.xml
deleted file mode 100644
index e2a95d00..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/flow.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-	
-	
-	
-		
-	
-	
-	
-		
-	
-	
-		
-  
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/mvc/FlowControllerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/mvc/FlowControllerTests.java
deleted file mode 100644
index bf476ec1..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/mvc/FlowControllerTests.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.mvc;
-
-import junit.framework.TestCase;
-
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.mock.web.MockServletContext;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.view.RedirectView;
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.SimpleFlow;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.execution.repository.FlowExecutionRepository;
-import org.springframework.webflow.execution.repository.support.SimpleFlowExecutionRepository;
-import org.springframework.webflow.executor.FlowExecutorImpl;
-
-/**
- * Unit tests for {@link FlowController}.
- */
-public class FlowControllerTests extends TestCase {
-
-	private FlowController controller = new FlowController();
-
-	public void setUp() {
-		controller.setServletContext(new MockServletContext());
-
-		FlowDefinitionRegistryImpl registry = new FlowDefinitionRegistryImpl();
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(new SimpleFlow()));
-		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
-		FlowExecutionRepository repository = new SimpleFlowExecutionRepository(new FlowExecutionImplStateRestorer(
-				registry), new SessionBindingConversationManager());
-		controller.setFlowExecutor(new FlowExecutorImpl(registry, factory, repository));
-	}
-
-	public void testLaunch() throws Exception {
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		MockHttpServletResponse response = new MockHttpServletResponse();
-		request.addParameter("_flowId", "simpleFlow");
-		ModelAndView mv = controller.handleRequestInternal(request, response);
-		assertEquals("view", mv.getViewName());
-	}
-
-	public void testResume() throws Exception {
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		request.setMethod("POST");
-		request.setContextPath("/app");
-		MockHttpServletResponse response = new MockHttpServletResponse();
-		request.addParameter("_flowId", "simpleFlow");
-		ModelAndView mv = controller.handleRequestInternal(request, response);
-		request.addParameter("_flowExecutionKey", (String) mv.getModel().get("flowExecutionKey"));
-		request.addParameter("_eventId", "submit");
-		mv = controller.handleRequest(request, response);
-		assertNull(mv.getViewName());
-		assertTrue(mv.getView() instanceof RedirectView);
-		RedirectView rv = (RedirectView) mv.getView();
-		assertEquals("confirm", rv.getUrl());
-		assertNull(mv.getModel().get("flowExecutionKey"));
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/mvc/PortletFlowControllerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/mvc/PortletFlowControllerTests.java
deleted file mode 100644
index 040a987d..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/mvc/PortletFlowControllerTests.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.mvc;
-
-import junit.framework.TestCase;
-
-import org.springframework.mock.web.portlet.MockActionRequest;
-import org.springframework.mock.web.portlet.MockActionResponse;
-import org.springframework.mock.web.portlet.MockPortletContext;
-import org.springframework.mock.web.portlet.MockRenderRequest;
-import org.springframework.mock.web.portlet.MockRenderResponse;
-import org.springframework.web.portlet.ModelAndView;
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.SimpleFlow;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.execution.repository.FlowExecutionRepository;
-import org.springframework.webflow.execution.repository.support.SimpleFlowExecutionRepository;
-import org.springframework.webflow.executor.FlowExecutorImpl;
-
-/**
- * Unit tests for {@link PortletFlowController}.
- */
-public class PortletFlowControllerTests extends TestCase {
-
-	private PortletFlowController controller = new PortletFlowController();
-
-	public void setUp() {
-		controller.setPortletContext(new MockPortletContext());
-
-		FlowDefinitionRegistryImpl registry = new FlowDefinitionRegistryImpl();
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(new SimpleFlow()));
-		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
-		FlowExecutionRepository repository = new SimpleFlowExecutionRepository(new FlowExecutionImplStateRestorer(
-				registry), new SessionBindingConversationManager());
-		controller.setFlowExecutor(new FlowExecutorImpl(registry, factory, repository));
-	}
-
-	public void testLaunch() throws Exception {
-		MockRenderRequest request = new MockRenderRequest();
-		MockRenderResponse response = new MockRenderResponse();
-		request.addParameter("_flowId", "simpleFlow");
-		ModelAndView mv = controller.handleRenderRequest(request, response);
-		assertEquals("view", mv.getViewName());
-	}
-
-	public void testResume() throws Exception {
-		MockRenderRequest renderRequest = new MockRenderRequest();
-		MockRenderResponse renderResponse = new MockRenderResponse();
-		renderRequest.addParameter("_flowId", "simpleFlow");
-		ModelAndView mv = controller.handleRenderRequest(renderRequest, renderResponse);
-		assertEquals("view", mv.getViewName());
-		assertNotNull(mv.getModel().get("flowExecutionKey"));
-
-		MockActionRequest actionRequest = new MockActionRequest();
-		actionRequest.setSession(renderRequest.getPortletSession());
-		actionRequest.setContextPath("/app");
-		MockActionResponse actionResponse = new MockActionResponse();
-		actionRequest.addParameter("_flowExecutionKey", (String) mv.getModel().get("flowExecutionKey"));
-		actionRequest.addParameter("_eventId", "submit");
-		try {
-			controller.handleActionRequest(actionRequest, actionResponse);
-		} catch (IllegalArgumentException e) {
-
-		}
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-client.xml b/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-client.xml
deleted file mode 100644
index 4b0301ae..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-client.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-		
-		
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-continuation.xml b/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-continuation.xml
deleted file mode 100644
index ce0784bf..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-continuation.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-	
-		
-		
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-simple.xml b/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-simple.xml
deleted file mode 100644
index 03682ecc..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/repository-simple.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-	
-		
-		
-	
-
-
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/struts/FlowActionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/struts/FlowActionTests.java
deleted file mode 100644
index 585bbdb3..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/struts/FlowActionTests.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.struts;
-
-import junit.framework.TestCase;
-
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionServlet;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.mock.web.MockServletContext;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.web.struts.SpringBindingActionForm;
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.SimpleFlow;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.execution.repository.FlowExecutionRepository;
-import org.springframework.webflow.execution.repository.support.SimpleFlowExecutionRepository;
-import org.springframework.webflow.executor.FlowExecutorImpl;
-
-/**
- * Unit tests for {@link FlowAction}.
- */
-public class FlowActionTests extends TestCase {
-
-	private FlowAction action;
-
-	public void setUp() {
-		action = new FlowAction() {
-			protected WebApplicationContext initWebApplicationContext(ActionServlet actionServlet)
-					throws IllegalStateException {
-				StaticWebApplicationContext context = new StaticWebApplicationContext();
-				context.setServletContext(new MockServletContext());
-				return context;
-			}
-		};
-
-		FlowDefinitionRegistryImpl registry = new FlowDefinitionRegistryImpl();
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(new SimpleFlow()));
-		FlowExecutionImplFactory factory = new FlowExecutionImplFactory();
-		FlowExecutionRepository repository = new SimpleFlowExecutionRepository(new FlowExecutionImplStateRestorer(
-				registry), new SessionBindingConversationManager());
-		action.setFlowExecutor(new FlowExecutorImpl(registry, factory, repository));
-
-		action.setServlet(new ActionServlet());
-	}
-
-	public void testLaunch() throws Exception {
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		MockHttpServletResponse response = new MockHttpServletResponse();
-		request.addParameter("_flowId", "simpleFlow");
-		ActionMapping mapping = new ActionMapping();
-		mapping.addForwardConfig(new ActionForward("view", "/view.jsp", false));
-		ActionForm form = new SpringBindingActionForm();
-		ActionForward forward = action.execute(mapping, form, request, response);
-		assertEquals("view", forward.getName());
-	}
-
-	public void testResume() throws Exception {
-		MockHttpServletRequest request = new MockHttpServletRequest();
-		request.setMethod("POST");
-		request.setContextPath("/app");
-		new MockHttpServletResponse();
-		request.addParameter("_flowId", "simpleFlow");
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapperTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapperTests.java
deleted file mode 100644
index 9f3ecbce..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/support/FlowIdMappingArgumentHandlerWrapperTests.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import java.util.Collections;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import org.springframework.util.StringUtils;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Test case for {@link FlowIdMappingArgumentHandlerWrapper}.
- * 
- * @author Erwin Vervaet
- */
-public class FlowIdMappingArgumentHandlerWrapperTests extends TestCase {
-
-	private FlowIdMappingArgumentHandlerWrapper argumentHandler;
-
-	protected void setUp() throws Exception {
-		this.argumentHandler = new FlowIdMappingArgumentHandlerWrapper();
-		this.argumentHandler.setArgumentHandler(new RequestPathFlowExecutorArgumentHandler());
-		Properties mappings = new Properties();
-		mappings.setProperty("A", "X");
-		mappings.setProperty("B", "Y");
-		argumentHandler.setMappings(mappings);
-		argumentHandler.addMapping("C", "X");
-	}
-
-	public void testMappingNoFallback() {
-		argumentHandler.setFallback(false);
-
-		assertTrue(argumentHandler.isFlowIdPresent(context("A")));
-		assertEquals("X", argumentHandler.extractFlowId(context("A")));
-		assertTrue(argumentHandler.isFlowIdPresent(context("B")));
-		assertEquals("Y", argumentHandler.extractFlowId(context("B")));
-		assertTrue(argumentHandler.isFlowIdPresent(context("C")));
-		assertEquals("X", argumentHandler.extractFlowId(context("C")));
-		assertFalse(argumentHandler.isFlowIdPresent(context("X")));
-		assertFalse(argumentHandler.isFlowIdPresent(context("Y")));
-		try {
-			argumentHandler.extractFlowId(context("X"));
-			fail();
-		} catch (FlowExecutorArgumentExtractionException e) {
-			// expected
-		}
-		try {
-			argumentHandler.extractFlowId(context(""));
-			fail();
-		} catch (FlowExecutorArgumentExtractionException e) {
-			// expected
-		}
-	}
-
-	public void testMappingFallback() {
-		argumentHandler.setFallback(true);
-
-		assertTrue(argumentHandler.isFlowIdPresent(context("A")));
-		assertEquals("X", argumentHandler.extractFlowId(context("A")));
-		assertTrue(argumentHandler.isFlowIdPresent(context("B")));
-		assertEquals("Y", argumentHandler.extractFlowId(context("B")));
-		assertTrue(argumentHandler.isFlowIdPresent(context("C")));
-		assertEquals("X", argumentHandler.extractFlowId(context("C")));
-		assertTrue(argumentHandler.isFlowIdPresent(context("X")));
-		assertEquals("X", argumentHandler.extractFlowId(context("X")));
-		assertTrue(argumentHandler.isFlowIdPresent(context("Y")));
-		assertEquals("Y", argumentHandler.extractFlowId(context("Y")));
-		try {
-			argumentHandler.extractFlowId(context(""));
-			fail();
-		} catch (FlowExecutorArgumentExtractionException e) {
-			// expected
-		}
-	}
-
-	public void testReverseMappingNoFallBack() {
-		argumentHandler.setFallback(false);
-
-		assertEquals("/app/flows/C", argumentHandler.createFlowDefinitionUrl(redirect("X"), context()));
-		assertEquals("/app/flows/B", argumentHandler.createFlowDefinitionUrl(redirect("Y"), context()));
-
-		try {
-			argumentHandler.createFlowDefinitionUrl(redirect("Z"), context());
-			fail();
-		} catch (IllegalArgumentException e) {
-			// expected
-		}
-	}
-
-	public void testReverseMappingFallback() {
-		argumentHandler.setFallback(true);
-
-		assertEquals("/app/flows/C", argumentHandler.createFlowDefinitionUrl(redirect("X"), context()));
-		assertEquals("/app/flows/B", argumentHandler.createFlowDefinitionUrl(redirect("Y"), context()));
-		assertEquals("/app/flows/Z", argumentHandler.createFlowDefinitionUrl(redirect("Z"), context()));
-	}
-
-	public void testWithRequestParameters() {
-		argumentHandler.setArgumentHandler(new RequestParameterFlowExecutorArgumentHandler());
-
-		// mapping
-		assertTrue(argumentHandler.isFlowIdPresent(contextWithParam("A")));
-		assertEquals("X", argumentHandler.extractFlowId(contextWithParam("A")));
-
-		// reverse mapping
-		assertEquals("/app/flows?_flowId=C", argumentHandler.createFlowDefinitionUrl(redirect("X"), context()));
-	}
-
-	// internal helpers
-
-	private MockExternalContext context() {
-		return context("");
-	}
-
-	private MockExternalContext context(String flowId) {
-		MockExternalContext context = new MockExternalContext();
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows");
-		if (StringUtils.hasText(flowId)) {
-			context.setRequestPathInfo("/" + flowId);
-		}
-		return context;
-	}
-
-	private MockExternalContext contextWithParam(String flowId) {
-		MockExternalContext context = context();
-		context.putRequestParameter("_flowId", flowId);
-		return context;
-	}
-
-	private FlowDefinitionRedirect redirect(String flowId) {
-		return new FlowDefinitionRedirect(flowId, Collections.EMPTY_MAP);
-	}
-}
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/support/FlowRequestHandlerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/support/FlowRequestHandlerTests.java
deleted file mode 100644
index bdbf075d..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/support/FlowRequestHandlerTests.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.conversation.impl.SessionBindingConversationManager;
-import org.springframework.webflow.definition.registry.FlowDefinitionRegistryImpl;
-import org.springframework.webflow.definition.registry.StaticFlowDefinitionHolder;
-import org.springframework.webflow.engine.EndState;
-import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.engine.TargetStateResolver;
-import org.springframework.webflow.engine.Transition;
-import org.springframework.webflow.engine.ViewState;
-import org.springframework.webflow.engine.impl.FlowExecutionImplFactory;
-import org.springframework.webflow.engine.impl.FlowExecutionImplStateRestorer;
-import org.springframework.webflow.engine.support.DefaultTargetStateResolver;
-import org.springframework.webflow.execution.repository.support.SimpleFlowExecutionRepository;
-import org.springframework.webflow.executor.FlowExecutorImpl;
-import org.springframework.webflow.executor.ResponseInstruction;
-import org.springframework.webflow.test.MockExternalContext;
-
-/**
- * Unit tests for {@link FlowRequestHandler}.
- */
-public class FlowRequestHandlerTests extends TestCase {
-
-	private FlowRequestHandler handler;
-
-	private MockExternalContext context = new MockExternalContext();
-
-	protected void setUp() throws Exception {
-		FlowDefinitionRegistryImpl registry = new FlowDefinitionRegistryImpl();
-		Flow flow = new Flow("flow");
-		ViewState view = new ViewState(flow, "view");
-		view.getTransitionSet().add(new Transition(to("end")));
-		new EndState(flow, "end");
-		registry.registerFlowDefinition(new StaticFlowDefinitionHolder(flow));
-		FlowExecutorImpl executor = new FlowExecutorImpl(registry, new FlowExecutionImplFactory(),
-				new SimpleFlowExecutionRepository(new FlowExecutionImplStateRestorer(registry),
-						new SessionBindingConversationManager()));
-		handler = new FlowRequestHandler(executor);
-	}
-
-	public void testLaunch() {
-		context.putRequestParameter("_flowId", "flow");
-		ResponseInstruction response = handler.handleFlowRequest(context);
-		assertTrue(response.isNull());
-		assertTrue(response.getFlowExecutionContext().isActive());
-		assertEquals("flow", response.getFlowExecutionContext().getDefinition().getId());
-		assertEquals("view", response.getFlowExecutionContext().getActiveSession().getState().getId());
-	}
-
-	public void testResumeOnEvent() {
-		context.putRequestParameter("_flowId", "flow");
-		ResponseInstruction response = handler.handleFlowRequest(context);
-
-		String flowExecutionKey = response.getFlowExecutionKey();
-		context.putRequestParameter("_flowExecutionKey", flowExecutionKey);
-		context.putRequestParameter("_eventId", "submit");
-		response = handler.handleFlowRequest(context);
-
-		assertTrue(response.isNull());
-		assertTrue(!response.getFlowExecutionContext().isActive());
-		assertEquals("flow", response.getFlowExecutionContext().getDefinition().getId());
-
-	}
-
-	public void testRefreshFlowExecution() {
-		context.putRequestParameter("_flowId", "flow");
-		ResponseInstruction response = handler.handleFlowRequest(context);
-
-		String flowExecutionKey = response.getFlowExecutionKey();
-		context.putRequestParameter("_flowExecutionKey", flowExecutionKey);
-		response = handler.handleFlowRequest(context);
-
-		assertTrue(response.isNull());
-		assertTrue(response.getFlowExecutionContext().isActive());
-		assertEquals("flow", response.getFlowExecutionContext().getDefinition().getId());
-		assertEquals("view", response.getFlowExecutionContext().getActiveSession().getState().getId());
-	}
-
-	protected TargetStateResolver to(String stateId) {
-		return new DefaultTargetStateResolver(stateId);
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/support/RequestParameterFlowExecutorArgumentHandlerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/support/RequestParameterFlowExecutorArgumentHandlerTests.java
deleted file mode 100644
index 80a07234..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/support/RequestParameterFlowExecutorArgumentHandlerTests.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.execution.FlowExecutionContext;
-import org.springframework.webflow.execution.support.ExternalRedirect;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.test.MockExternalContext;
-import org.springframework.webflow.test.MockFlowExecutionContext;
-
-/**
- * Unit tests for {@link RequestParameterFlowExecutorArgumentHandler}.
- */
-public class RequestParameterFlowExecutorArgumentHandlerTests extends TestCase {
-
-	private MockExternalContext context;
-
-	private FlowExecutorArgumentHandler argumentHandler;
-
-	private String flowExecutionKey;
-
-	public void setUp() {
-		context = new MockExternalContext();
-		argumentHandler = new RequestParameterFlowExecutorArgumentHandler();
-		flowExecutionKey = "_c12345_k12345";
-	}
-
-	public void testExtractFlowId() {
-		context.putRequestParameter("_flowId", "flow");
-		assertEquals("flow", argumentHandler.extractFlowId(context));
-	}
-
-	public void testExtractFlowIdDefault() {
-		argumentHandler.setDefaultFlowId("flow");
-		assertEquals("flow", argumentHandler.extractFlowId(new MockExternalContext()));
-	}
-
-	public void testExtractFlowIdNoIdProvided() {
-		try {
-			argumentHandler.extractFlowId(context);
-			fail("no flow id provided");
-		} catch (FlowExecutorArgumentExtractionException e) {
-
-		}
-	}
-
-	public void testExtractFlowExecutionKey() {
-		context.putRequestParameter("_flowExecutionKey", "_c12345_k12345");
-		assertEquals(flowExecutionKey, argumentHandler.extractFlowExecutionKey(context));
-	}
-
-	public void testExtractFlowExecutionNoKeyProvided() {
-		try {
-			argumentHandler.extractFlowExecutionKey(context);
-			fail("no flow execution key provided");
-		} catch (FlowExecutorArgumentExtractionException e) {
-
-		}
-	}
-
-	public void testExtractEventId() {
-		context.putRequestParameter("_eventId", "submit");
-		assertEquals("submit", argumentHandler.extractEventId(context));
-	}
-
-	public void testExtractEventIdButtonNameFormat() {
-		context.putRequestParameter("_eventId_submit", "not important");
-		context.putRequestParameter("_somethingElse", "not important");
-		assertEquals("submit", argumentHandler.extractEventId(context));
-	}
-
-	public void testExtractEventIdNoIdProvided() {
-		try {
-			argumentHandler.extractEventId(context);
-			fail("no event id provided");
-		} catch (FlowExecutorArgumentExtractionException e) {
-
-		}
-	}
-
-	public void testCreateFlowUrl() {
-		/*
-		 * Scenario: Context root: /app Dispatcher mapping in web.xml: *.htm Controller mapping: /flows.htm So full
-		 * request URI will be /app/flows.htm
-		 */
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows.htm");
-		FlowDefinitionRedirect redirect = new FlowDefinitionRedirect("flow", null);
-		String url = argumentHandler.createFlowDefinitionUrl(redirect, context);
-		assertEquals("/app/flows.htm?_flowId=flow", url);
-	}
-
-	public void testCreateFlowUrlRequestPath() {
-		/*
-		 * Scenario: Context root: /app Dispatcher mapping in web.xml: /system/* Controller mapping: /flows.htm So full
-		 * request URI will be /app/system/flows.htm
-		 */
-		context.setContextPath("/app");
-		context.setDispatcherPath("/system");
-		context.setRequestPathInfo("/flows.htm");
-		FlowDefinitionRedirect redirect = new FlowDefinitionRedirect("flow", null);
-		String url = argumentHandler.createFlowDefinitionUrl(redirect, context);
-		assertEquals("/app/system/flows.htm?_flowId=flow", url);
-	}
-
-	public void testCreateFlowUrlWithInput() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows.htm");
-		Map input = new HashMap();
-		input.put("foo", "bar");
-		input.put("baz", new Integer(3));
-		FlowDefinitionRedirect redirect = new FlowDefinitionRedirect("flow", input);
-		String url = argumentHandler.createFlowDefinitionUrl(redirect, context);
-		assertTrue("/app/flows.htm?_flowId=flow&foo=bar&baz=3".equals(url)
-				|| "/app/flows.htm?_flowId=flow&baz=3&foo=bar".equals(url));
-	}
-
-	public void testCreateFlowExecutionUrl() {
-		/*
-		 * Scenario: Context root: /app Dispatcher mapping in web.xml: *.htm Controller mapping: /flows.htm So full
-		 * request URI will be /app/flows.htm
-		 */
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows.htm");
-		FlowExecutionContext flowExecution = new MockFlowExecutionContext();
-		String url = argumentHandler.createFlowExecutionUrl(flowExecutionKey, flowExecution, context);
-		assertEquals("/app/flows.htm?_flowExecutionKey=_c12345_k12345", url);
-	}
-
-	public void testCreateFlowExecutionUrlRequestPath() {
-		/*
-		 * Scenario: Context root: /app Dispatcher mapping in web.xml: /system/* Controller mapping: /flows.htm So full
-		 * request URI will be /app/system/flows.htm
-		 */
-		context.setContextPath("/app");
-		context.setDispatcherPath("/system");
-		context.setRequestPathInfo("/flows.htm");
-		FlowExecutionContext flowExecution = new MockFlowExecutionContext();
-		String url = argumentHandler.createFlowExecutionUrl(flowExecutionKey, flowExecution, context);
-		assertEquals("/app/system/flows.htm?_flowExecutionKey=_c12345_k12345", url);
-	}
-
-	public void testCreateExternalUrlAbsolute() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows.htm");
-		ExternalRedirect redirect = new ExternalRedirect("/a/url");
-		argumentHandler.setRedirectContextRelative(false);
-		String url = argumentHandler.createExternalUrl(redirect, flowExecutionKey, context);
-		assertEquals("/a/url?_flowExecutionKey=_c12345_k12345", url);
-	}
-
-	public void testCreateExternalUrlContextRelative() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows.htm");
-		ExternalRedirect redirect = new ExternalRedirect("/a/url");
-		String url = argumentHandler.createExternalUrl(redirect, flowExecutionKey, context);
-		assertEquals("/app/a/url?_flowExecutionKey=_c12345_k12345", url);
-	}
-
-	public void testCreateExternalUrlNoKey() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows");
-		ExternalRedirect redirect = new ExternalRedirect("/a/url");
-		String url = argumentHandler.createExternalUrl(redirect, null, context);
-		assertEquals("/app/a/url", url);
-	}
-
-	public void testCreateExternalUrlNoKeyRelativeUrl() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows");
-		ExternalRedirect redirect = new ExternalRedirect("a/url");
-		String url = argumentHandler.createExternalUrl(redirect, null, context);
-		assertEquals("a/url", url);
-	}
-
-	public void testAccidentalParameterArraySubmit() {
-		context.putRequestParameter("_flowExecutionKey", new String[] { "_c12345_k12345", "_c12345_k12345" });
-		assertEquals(flowExecutionKey, argumentHandler.extractFlowExecutionKey(context));
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/executor/support/RequestPathFlowExecutorArgumentHandlerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/executor/support/RequestPathFlowExecutorArgumentHandlerTests.java
deleted file mode 100644
index 6a7f8edb..00000000
--- a/spring-webflow/src/test/java/org/springframework/webflow/executor/support/RequestPathFlowExecutorArgumentHandlerTests.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2004-2007 the original author or authors.
- *
- * 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.springframework.webflow.executor.support;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.springframework.webflow.execution.FlowExecutionContext;
-import org.springframework.webflow.execution.support.FlowDefinitionRedirect;
-import org.springframework.webflow.test.MockExternalContext;
-import org.springframework.webflow.test.MockFlowExecutionContext;
-
-/**
- * Unit tests for {@link RequestPathFlowExecutorArgumentHandler}.
- */
-public class RequestPathFlowExecutorArgumentHandlerTests extends TestCase {
-
-	private MockExternalContext context = new MockExternalContext();
-
-	private RequestPathFlowExecutorArgumentHandler argumentHandler;
-
-	private String flowExecutionKey;
-
-	public void setUp() {
-		argumentHandler = new RequestPathFlowExecutorArgumentHandler();
-		flowExecutionKey = "_c12345_k12345";
-	}
-
-	public void testExtractFlowId() {
-		MockExternalContext context = new MockExternalContext();
-		context.setRequestPathInfo("flow");
-		assertEquals("flow", argumentHandler.extractFlowId(context));
-	}
-
-	public void testExtractFlowIdDefault() {
-		argumentHandler.setDefaultFlowId("flow");
-		assertEquals("flow", argumentHandler.extractFlowId(new MockExternalContext()));
-	}
-
-	public void testExtractFlowIdNoRequestPath() {
-		try {
-			argumentHandler.extractFlowId(new MockExternalContext());
-			fail("should've failed");
-		} catch (FlowExecutorArgumentExtractionException e) {
-		}
-	}
-
-	public void testCreateFlowUrl() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows");
-		FlowDefinitionRedirect redirect = new FlowDefinitionRedirect("flow", null);
-		String url = argumentHandler.createFlowDefinitionUrl(redirect, context);
-		assertEquals("/app/flows/flow", url);
-	}
-
-	public void testCreateFlowUrlInput() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows");
-		Map input = new HashMap();
-		input.put("foo", "bar");
-		input.put("baz", new Integer(3));
-		FlowDefinitionRedirect redirect = new FlowDefinitionRedirect("flow", input);
-		String url = argumentHandler.createFlowDefinitionUrl(redirect, context);
-		assertTrue("/app/flows/flow?foo=bar&baz=3".equals(url) || "/app/flows/flow?baz=3&foo=bar".equals(url));
-	}
-
-	public void testCreateFlowExecutionUrl() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows");
-		FlowExecutionContext flowExecution = new MockFlowExecutionContext();
-		String url = argumentHandler.createFlowExecutionUrl(flowExecutionKey, flowExecution, context);
-		assertEquals("/app/flows/k/_c12345_k12345", url);
-	}
-
-	public void testIsFlowExecutionKeyPresent() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows");
-		context.setRequestPathInfo("/k/_c12345_k12345");
-		assertTrue(argumentHandler.isFlowExecutionKeyPresent(context));
-		context.setRequestPathInfo("/sellitem");
-		assertFalse(argumentHandler.isFlowExecutionKeyPresent(context));
-	}
-
-	public void testExtractFlowExecutionKey() {
-		context.setContextPath("/app");
-		context.setDispatcherPath("/flows");
-		context.setRequestPathInfo("/k/_c12345_k12345");
-		assertEquals("_c12345_k12345", argumentHandler.extractFlowExecutionKey(context));
-	}
-}
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/HibernateFlowExecutionListenerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/persistence/HibernateFlowExecutionListenerTests.java
index 14262ae4..d1a992d5 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/HibernateFlowExecutionListenerTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/HibernateFlowExecutionListenerTests.java
@@ -37,7 +37,6 @@ import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.webflow.engine.EndState;
 import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.ViewSelection;
 import org.springframework.webflow.test.MockFlowSession;
 import org.springframework.webflow.test.MockRequestContext;
 
@@ -71,18 +70,18 @@ public class HibernateFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		hibernateListener.sessionCreated(context, flowSession);
+		hibernateListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
 		// Session created and bound to conversation
 		final Session hibSession = (Session) flowSession.getScope().get("session");
 		assertNotNull("Should have been populated", hibSession);
-		hibernateListener.paused(context, ViewSelection.NULL_VIEW);
+		hibernateListener.paused(context);
 		assertSessionNotBound();
 
 		// Session bound to thread local variable
-		hibernateListener.resumed(context);
+		hibernateListener.resuming(context);
 		assertSessionBound();
 
 		hibernateTemplate.execute(new HibernateCallback() {
@@ -91,14 +90,14 @@ public class HibernateFlowExecutionListenerTests extends TestCase {
 				return null;
 			}
 		}, true);
-		hibernateListener.paused(context, ViewSelection.NULL_VIEW);
+		hibernateListener.paused(context);
 		assertSessionNotBound();
 	}
 
 	public void testFlowNotAPersistenceContext() {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
-		hibernateListener.sessionCreated(context, flowSession);
+		hibernateListener.sessionStarting(context, flowSession, null);
 		assertSessionNotBound();
 	}
 
@@ -107,7 +106,7 @@ public class HibernateFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		hibernateListener.sessionCreated(context, flowSession);
+		hibernateListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
@@ -130,17 +129,17 @@ public class HibernateFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		hibernateListener.sessionCreated(context, flowSession);
+		hibernateListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
 		TestBean bean1 = new TestBean("Keith Donald");
 		hibernateTemplate.save(bean1);
 		assertEquals("Table should still only have one row", 1, jdbcTemplate.queryForInt("select count(*) from T_BEAN"));
-		hibernateListener.paused(context, ViewSelection.NULL_VIEW);
+		hibernateListener.paused(context);
 		assertSessionNotBound();
 
-		hibernateListener.resumed(context);
+		hibernateListener.resuming(context);
 		TestBean bean2 = new TestBean("Keith Donald");
 		hibernateTemplate.save(bean2);
 		assertEquals("Table should still only have one row", 1, jdbcTemplate.queryForInt("select count(*) from T_BEAN"));
@@ -164,7 +163,7 @@ public class HibernateFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		hibernateListener.sessionCreated(context, flowSession);
+		hibernateListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
@@ -186,7 +185,7 @@ public class HibernateFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		hibernateListener.sessionCreated(context, flowSession);
+		hibernateListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
@@ -206,7 +205,7 @@ public class HibernateFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		hibernateListener.sessionCreated(context, flowSession);
+		hibernateListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
@@ -233,13 +232,13 @@ public class HibernateFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		hibernateListener.sessionCreated(context, flowSession);
+		hibernateListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
 		TestBean bean = (TestBean) hibernateTemplate.get(TestBean.class, Long.valueOf(0));
 		assertFalse("addresses should not be initialized", Hibernate.isInitialized(bean.getAddresses()));
-		hibernateListener.paused(context, ViewSelection.NULL_VIEW);
+		hibernateListener.paused(context);
 		assertFalse("addresses should not be initialized", Hibernate.isInitialized(bean.getAddresses()));
 		Hibernate.initialize(bean.getAddresses());
 		assertTrue("addresses should be initialized", Hibernate.isInitialized(bean.getAddresses()));
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/persistence/JpaFlowExecutionListenerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/persistence/JpaFlowExecutionListenerTests.java
index d926ebb4..63e0b12d 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/persistence/JpaFlowExecutionListenerTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/persistence/JpaFlowExecutionListenerTests.java
@@ -18,7 +18,6 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.webflow.engine.EndState;
 import org.springframework.webflow.execution.FlowExecutionException;
-import org.springframework.webflow.execution.ViewSelection;
 import org.springframework.webflow.test.MockFlowSession;
 import org.springframework.webflow.test.MockRequestContext;
 
@@ -49,7 +48,7 @@ public class JpaFlowExecutionListenerTests extends TestCase {
 	public void testFlowNotAPersistenceContext() {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
-		jpaListener.sessionCreated(context, flowSession);
+		jpaListener.sessionStarting(context, flowSession, null);
 		assertSessionNotBound();
 	}
 
@@ -58,7 +57,7 @@ public class JpaFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		jpaListener.sessionCreated(context, flowSession);
+		jpaListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
@@ -81,17 +80,17 @@ public class JpaFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		jpaListener.sessionCreated(context, flowSession);
+		jpaListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
 		TestBean bean1 = new TestBean(1, "Keith Donald");
 		jpaTemplate.persist(bean1);
 		assertEquals("Table should still only have one row", 1, jdbcTemplate.queryForInt("select count(*) from T_BEAN"));
-		jpaListener.paused(context, ViewSelection.NULL_VIEW);
+		jpaListener.paused(context);
 		assertSessionNotBound();
 
-		jpaListener.resumed(context);
+		jpaListener.resuming(context);
 		TestBean bean2 = new TestBean(2, "Keith Donald");
 		jpaTemplate.persist(bean2);
 		assertEquals("Table should still only have one row", 1, jdbcTemplate.queryForInt("select count(*) from T_BEAN"));
@@ -114,7 +113,7 @@ public class JpaFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		jpaListener.sessionCreated(context, flowSession);
+		jpaListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
@@ -136,7 +135,7 @@ public class JpaFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		jpaListener.sessionCreated(context, flowSession);
+		jpaListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
@@ -156,7 +155,7 @@ public class JpaFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		jpaListener.sessionCreated(context, flowSession);
+		jpaListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
@@ -183,13 +182,13 @@ public class JpaFlowExecutionListenerTests extends TestCase {
 		MockRequestContext context = new MockRequestContext();
 		MockFlowSession flowSession = new MockFlowSession();
 		flowSession.getDefinitionInternal().getAttributeMap().put("persistenceContext", "true");
-		jpaListener.sessionCreated(context, flowSession);
+		jpaListener.sessionStarting(context, flowSession, null);
 		context.setActiveSession(flowSession);
 		assertSessionBound();
 
 		TestBean bean = (TestBean) jpaTemplate.getReference(TestBean.class, Long.valueOf(0));
 		assertFalse("addresses should not be initialized", Hibernate.isInitialized(bean.getAddresses()));
-		jpaListener.paused(context, ViewSelection.NULL_VIEW);
+		jpaListener.paused(context);
 		assertFalse("addresses should not be initialized", Hibernate.isInitialized(bean.getAddresses()));
 		Hibernate.initialize(bean.getAddresses());
 		assertTrue("addresses should be initialized", Hibernate.isInitialized(bean.getAddresses()));
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
index 4aa9283f..766b61d6 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
@@ -20,12 +20,11 @@ import java.util.List;
 
 import org.springframework.binding.mapping.AttributeMapper;
 import org.springframework.binding.mapping.MappingContext;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.webflow.config.FlowDefinitionResource;
+import org.springframework.webflow.config.FlowDefinitionResourceFactory;
 import org.springframework.webflow.core.collection.AttributeMap;
-import org.springframework.webflow.definition.registry.FlowDefinitionResource;
 import org.springframework.webflow.engine.EndState;
 import org.springframework.webflow.engine.Flow;
-import org.springframework.webflow.execution.support.ApplicationView;
 import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests;
 
 /**
@@ -33,47 +32,24 @@ import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests;
  */
 public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 
+	protected FlowDefinitionResource getFlowDefinitionResource() {
+		return new FlowDefinitionResourceFactory().createClassPathResource("search-flow.xml", getClass());
+	}
+
 	public void testStartFlow() {
-		ApplicationView view = applicationView(startFlow());
-		assertCurrentStateEquals("enterCriteria");
-		assertViewNameEquals("searchCriteria", view);
-		assertModelAttributeNotNull("searchCriteria", view);
+		// startFlow(new MockExternalContext());
 	}
 
 	public void testCriteriaSubmitSuccess() {
-		startFlow();
-		MockParameterMap parameters = new MockParameterMap();
-		parameters.put("firstName", "Keith");
-		parameters.put("lastName", "Donald");
-		ApplicationView view = applicationView(signalEvent("search", parameters));
-		assertCurrentStateEquals("displayResults");
-		assertViewNameEquals("searchResults", view);
-		assertModelAttributeCollectionSize(1, "results", view);
 	}
 
 	public void testNewSearch() {
-		testCriteriaSubmitSuccess();
-		ApplicationView view = applicationView(signalEvent("newSearch"));
-		assertCurrentStateEquals("enterCriteria");
-		assertViewNameEquals("searchCriteria", view);
 	}
 
 	public void testSelectValidResult() {
-		testCriteriaSubmitSuccess();
-		MockParameterMap parameters = new MockParameterMap();
-		parameters.put("id", "1");
-		ApplicationView view = applicationView(signalEvent("select", parameters));
-		assertCurrentStateEquals("displayResults");
-		assertViewNameEquals("searchResults", view);
-		assertModelAttributeCollectionSize(1, "results", view);
 	}
 
-	protected FlowDefinitionResource getFlowDefinitionResource() {
-		return new FlowDefinitionResource("search-flow", new ClassPathResource("search-flow.xml",
-				SearchFlowExecutionTests.class));
-	}
-
-	protected void registerMockServices(MockFlowServiceLocator serviceRegistry) {
+	protected void configure(MockFlowBuilderContext builderContext) {
 		Flow mockDetailFlow = new Flow("detail-flow");
 		mockDetailFlow.setInputMapper(new AttributeMapper() {
 			public void map(Object source, Object target, MappingContext context) {
@@ -83,13 +59,11 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 		});
 		// test responding to finish result
 		new EndState(mockDetailFlow, "finish");
-
-		serviceRegistry.registerSubflow(mockDetailFlow);
-		serviceRegistry.registerBean("phonebook", new TestPhoneBook());
+		builderContext.registerSubflow(mockDetailFlow);
+		builderContext.registerBean("phonebook", new TestPhoneBook());
 	}
 
-	public static class TestPhoneBook {
-
+	static class TestPhoneBook {
 		public List search(Object criteria) {
 			ArrayList res = new ArrayList();
 			res.add(new Object());
@@ -103,7 +77,5 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 		public Object getPerson(String userId) {
 			return new Object();
 		}
-
 	}
-
 }
\ No newline at end of file
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml b/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml
index 9a7559a2..7cc96480 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/test/search-flow.xml
@@ -36,7 +36,7 @@
 		
 		
 	
-
+
 	
 	
 
\ No newline at end of file