diff --git a/SWF-1468/pom.xml b/SWF-1468/pom.xml
new file mode 100644
index 0000000..ffc1707
--- /dev/null
+++ b/SWF-1468/pom.xml
@@ -0,0 +1,218 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.webflow.issues</groupId>
+	<artifactId>SWF-1468</artifactId>
+	<version>1.0-SNAPSHOT</version>
+	<name>Spring Web Flow and JSF Issue Reproduction Project</name>
+	<packaging>war</packaging>
+
+	<properties>
+		<java-version>1.6</java-version>
+		<org.springwebflow-version>2.3.1.BUILD-SNAPSHOT</org.springwebflow-version>
+		<org.springframework-version>3.1.1.RELEASE</org.springframework-version>
+		<org.springsecurity-version>3.0.7.RELEASE</org.springsecurity-version>
+		<jsf-version>2.1.7</jsf-version>
+		<org.slf4j-version>1.6.1</org.slf4j-version>
+	</properties>
+
+	<dependencies>
+		<!-- Spring Framework -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${org.springframework-version}</version>
+			<exclusions>
+				<!-- Exclude Commons Logging in favor of SLF4j -->
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>
+
+		<!-- Spring Web Flow -->
+		<dependency>
+			<groupId>org.springframework.webflow</groupId>
+			<artifactId>spring-faces</artifactId>
+			<version>${org.springwebflow-version}</version>
+		</dependency>
+
+		<!-- JSF -->
+		<dependency>
+			<groupId>com.sun.faces</groupId>
+			<artifactId>jsf-api</artifactId>
+			<version>${jsf-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.faces</groupId>
+			<artifactId>jsf-impl</artifactId>
+			<version>${jsf-version}</version>
+		</dependency>
+
+		<!-- Spring Security
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+			<version>${org.springsecurity-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				 </exclusion>
+			</exclusions>						
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-taglibs</artifactId>
+			<version>${org.springsecurity-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+			<version>${org.springsecurity-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				 </exclusion>
+			</exclusions>						
+				</dependency>	
+				-->
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${org.slf4j-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${org.slf4j-version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>${org.slf4j-version}</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.16</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<!-- Servlet API, JSP API, JSTL -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet.jsp</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.1</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- Bean Validation with the Hibernate Validator implementation -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.0.0.GA</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.1.0.Final</version>
+		</dependency>
+
+		<!-- JAXB for Hibernate Validator when running on Java 5
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.1</version>
+		</dependency>
+		-->
+
+		<!-- JUnit -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<repositories>
+
+		<repository>
+			<id>spring-related-snapshot-releases</id>
+			<name>Latest Spring Snapshot Repository</name>
+			<url>http://maven.springframework.org/snapshot</url>
+			<releases><enabled>false</enabled></releases>
+			<snapshots><enabled>true</enabled></snapshots>
+		</repository>
+
+	</repositories>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>${java-version}</source>
+					<target>${java-version}</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>install</id>
+						<phase>install</phase>
+						<goals>
+							<goal>sources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<includes>
+						<include>**/*Tests.java</include>
+					</includes>
+					<excludes>
+						<exclude>**/*Abstract*.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<version>2.8</version>
+				<configuration>
+					<downloadSources>true</downloadSources>
+					<downloadJavadocs>false</downloadJavadocs>
+					<wtpversion>2.0</wtpversion>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+</project>
+
diff --git a/SWF-1468/src/main/resources/log4j.properties b/SWF-1468/src/main/resources/log4j.properties
new file mode 100644
index 0000000..c3e60f2
--- /dev/null
+++ b/SWF-1468/src/main/resources/log4j.properties
@@ -0,0 +1,10 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.category.org.springframework.binding=DEBUG
+log4j.category.org.springframework.web=DEBUG
+log4j.category.org.springframework.webflow=DEBUG
+log4j.category.org.springframework.js=DEBUG
\ No newline at end of file
diff --git a/SWF-1468/src/main/webapp/WEB-INF/faces-config.xml b/SWF-1468/src/main/webapp/WEB-INF/faces-config.xml
new file mode 100644
index 0000000..d143ffb
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/faces-config.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+        version="2.0">
+
+</faces-config>
diff --git a/SWF-1468/src/main/webapp/WEB-INF/layouts/standard.xhtml b/SWF-1468/src/main/webapp/WEB-INF/layouts/standard.xhtml
new file mode 100644
index 0000000..7cd3c96
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/layouts/standard.xhtml
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:f="http://java.sun.com/jsf/core"
+  xmlns:h="http://java.sun.com/jsf/html"
+  xmlns:ui="http://java.sun.com/jsf/facelets">
+<f:view contentType="text/html">
+  <h:head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Spring Web Flow and JSF Issue Project</title>
+  </h:head>
+  <body>
+    <ui:insert name="content" />
+  </body>
+</f:view>
+</html>
diff --git a/SWF-1468/src/main/webapp/WEB-INF/myflow/myflow.xml b/SWF-1468/src/main/webapp/WEB-INF/myflow/myflow.xml
new file mode 100644
index 0000000..22a41fc
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/myflow/myflow.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-2.0.xsd">
+		
+	<view-state id="view">
+		<transition on="continue" to="done" />
+	</view-state>
+
+	<end-state id="done" view="externalRedirect:contextRelative:/" />
+
+</flow>
\ No newline at end of file
diff --git a/SWF-1468/src/main/webapp/WEB-INF/myflow/view.xhtml b/SWF-1468/src/main/webapp/WEB-INF/myflow/view.xhtml
new file mode 100755
index 0000000..0e6850f
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/myflow/view.xhtml
@@ -0,0 +1,20 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:h="http://java.sun.com/jsf/html" 
+  xmlns:f="http://java.sun.com/jsf/core"
+  xmlns:on="http://java.sun.com/jsf/composite/onzin"
+  template="/WEB-INF/layouts/standard.xhtml">
+  <ui:define name="content">
+    <div>
+      <h1>My Page</h1>
+      <h:form>
+        <p>Line before onzintag</p>
+        <p><on:onzintag/></p> 
+        <p>Line after onzintag</p>
+        <h:commandButton id="continue" value="End Flow" action="continue" />
+      </h:form>
+    </div>
+  </ui:define>
+</ui:composition>
\ No newline at end of file
diff --git a/SWF-1468/src/main/webapp/WEB-INF/spring/root-context.xml b/SWF-1468/src/main/webapp/WEB-INF/spring/root-context.xml
new file mode 100644
index 0000000..faac234
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	
+	<!-- Root Context: defines shared resources visible to all other web components -->
+
+</beans>
diff --git a/SWF-1468/src/main/webapp/WEB-INF/spring/servlet-context.xml b/SWF-1468/src/main/webapp/WEB-INF/spring/servlet-context.xml
new file mode 100644
index 0000000..9f90b12
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/spring/servlet-context.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:faces="http://www.springframework.org/schema/faces"
+		xsi:schemaLocation="
+           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+           http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.2.xsd">
+
+	<context:component-scan base-package="org.springframework.webflow.issues" />
+
+	<faces:resources />
+	
+	<bean class="org.springframework.web.servlet.mvc.HttpRequestHandlerAdapter"/>
+
+	<!-- Maps request paths to flows in the flowRegistry -->
+	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
+		<property name="order" value="1" />
+		<property name="flowRegistry" ref="flowRegistry" />
+		<property name="defaultHandler">
+			<!-- If no flow match, map path to a view to render; e.g. the 
+				 "/intro" path would map to the view named "intro" 
+				 -->
+			<bean class="org.springframework.web.servlet.mvc.UrlFilenameViewController" />
+		</property>
+	</bean>
+	
+	<!-- Maps logical view names to Facelet templates in /WEB-INF (e.g. 'search' 
+					to '/WEB-INF/search.xhtml' -->
+	<bean id="faceletsViewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
+		<property name="viewClass" value="org.springframework.faces.mvc.JsfView" />
+		<property name="prefix" value="/WEB-INF/views/" />
+		<property name="suffix" value=".xhtml" />
+	</bean>
+	
+	<!-- Dispatches requests mapped to flows to FlowHandler implementations -->
+	<bean class="org.springframework.faces.webflow.JsfFlowHandlerAdapter">
+		<property name="flowExecutor" ref="flowExecutor" />
+	</bean>
+	
+	<!-- Dispatches requests mapped to org.springframework.web.servlet.mvc.Controller 
+					implementations -->
+	<bean class="org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter" />
+	
+	<!-- Import Spring Web Flow specific configuration -->
+	<import resource="webflow.xml" />
+
+</beans>
diff --git a/SWF-1468/src/main/webapp/WEB-INF/spring/webflow.xml b/SWF-1468/src/main/webapp/WEB-INF/spring/webflow.xml
new file mode 100644
index 0000000..57f1195
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/spring/webflow.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:webflow="http://www.springframework.org/schema/webflow-config"
+       xmlns:faces="http://www.springframework.org/schema/faces"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+           http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.3.xsd
+           http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.2.xsd">
+
+	<!-- The central entry point into the Spring Web Flow system -->
+	<webflow:flow-executor id="flowExecutor">
+		<webflow:flow-execution-listeners>
+			<webflow:listener ref="facesContextListener"/>
+		</webflow:flow-execution-listeners>
+	</webflow:flow-executor>
+	
+	<!-- The registry with flow definitions -->
+	<webflow:flow-registry id="flowRegistry" flow-builder-services="facesFlowBuilderServices" base-path="/WEB-INF">
+		<webflow:flow-location-pattern value="/**/*flow.xml" />
+	</webflow:flow-registry>
+	
+	<!-- Enable the Spring Web Flow JSF integration -->
+	<faces:flow-builder-services id="facesFlowBuilderServices" development="true" />
+
+	<!-- Install a listener that creates and releases the FacesContext for each request. -->
+	<bean id="facesContextListener" class="org.springframework.faces.webflow.FlowFacesContextLifecycleListener"/>
+	
+	<!-- 
+		Uncomment to install a listener to apply Spring Security authorities.
+		Also remember to add register it in <webflow:flow-executor> element above. 
+	<bean id="securityFlowExecutionListener" class="org.springframework.webflow.security.SecurityFlowExecutionListener" />
+	-->
+
+</beans>
\ No newline at end of file
diff --git a/SWF-1468/src/main/webapp/WEB-INF/views/index.xhtml b/SWF-1468/src/main/webapp/WEB-INF/views/index.xhtml
new file mode 100755
index 0000000..2987862
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/views/index.xhtml
@@ -0,0 +1,15 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:ui="http://java.sun.com/jsf/facelets"
+  xmlns:f="http://java.sun.com/jsf/core"
+  template="/WEB-INF/layouts/standard.xhtml">
+  <ui:define name="content">
+    <div>
+      <h1>Home</h1>
+      <p><strong>See server log for debug information</strong></p>  
+      <hr />
+      <a href="main/myflow">Start Flow</a>
+    </div>
+  </ui:define>
+</ui:composition>
\ No newline at end of file
diff --git a/SWF-1468/src/main/webapp/WEB-INF/web.xml b/SWF-1468/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..bace44b
--- /dev/null
+++ b/SWF-1468/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/spring/root-context.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	
+	<!-- Use JSF view templates saved as *.xhtml, for use with Facelets -->
+	<context-param>
+		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+		<param-value>.xhtml</param-value>
+	</context-param>
+	
+	<!-- Enables special Facelets debug output during development -->
+  	<context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+   		<param-value>Development</param-value>
+  	</context-param>
+  	
+  	<!-- Causes Facelets to refresh templates during development -->
+  	<context-param>
+  		<param-name>javax.faces.FACELETS_REFRESH_PERIOD</param-name>
+  		<param-value>1</param-value>
+  	</context-param>
+  	
+	<!-- Uncomment for Spring Security
+	<filter>
+        <filter-name>springSecurityFilterChain</filter-name>
+        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+    </filter>
+
+    <filter-mapping>
+      <filter-name>springSecurityFilterChain</filter-name>
+      <servlet-name>appServlet</servlet-name>
+    </filter-mapping>
+    -->
+
+  	<!-- Uncomment to declare Spring Security Facelets tag library
+  	<context-param>
+  		<param-name>javax.faces.FACELETS_LIBRARIES</param-name>
+  		<param-value>/WEB-INF/springsecurity.taglib.xml</param-value>
+  	</context-param>
+	-->
+	  	    
+	<servlet>
+		<servlet-name>appServlet</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextConfigLocation</param-name>
+			<param-value>/WEB-INF/spring/servlet-context.xml</param-value>
+		</init-param>
+		<load-on-startup>2</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>appServlet</servlet-name>
+		<url-pattern>/main/*</url-pattern>
+	</servlet-mapping>
+
+	<!-- Just here so the JSF implementation can initialize, *not* used at runtime -->
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	
+	<welcome-file-list>
+		<welcome-file>main/index.html</welcome-file>
+	</welcome-file-list>
+
+</web-app>
diff --git a/SWF-1468/src/main/webapp/resources/onzin/onzintag.xhtml b/SWF-1468/src/main/webapp/resources/onzin/onzintag.xhtml
new file mode 100644
index 0000000..ed25898
--- /dev/null
+++ b/SWF-1468/src/main/webapp/resources/onzin/onzintag.xhtml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:cc="http://java.sun.com/jsf/composite">
+    <cc:interface>
+    </cc:interface>
+    <cc:implementation>
+        ONZIN
+    </cc:implementation>
+</html>
+
diff --git a/SWF-1468/src/test/java/org/springframework/webflow/issues/MyFlowExecutionTests.java b/SWF-1468/src/test/java/org/springframework/webflow/issues/MyFlowExecutionTests.java
new file mode 100644
index 0000000..035aa3c
--- /dev/null
+++ b/SWF-1468/src/test/java/org/springframework/webflow/issues/MyFlowExecutionTests.java
@@ -0,0 +1,47 @@
+package org.springframework.webflow.issues;
+
+import org.springframework.webflow.config.FlowDefinitionResource;
+import org.springframework.webflow.config.FlowDefinitionResourceFactory;
+import org.springframework.webflow.core.collection.LocalAttributeMap;
+import org.springframework.webflow.core.collection.MutableAttributeMap;
+import org.springframework.webflow.test.MockExternalContext;
+import org.springframework.webflow.test.MockFlowBuilderContext;
+import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests;
+
+public class MyFlowExecutionTests extends AbstractXmlFlowExecutionTests {
+
+	@Override
+	protected FlowDefinitionResource getResource(FlowDefinitionResourceFactory resourceFactory) {
+		return resourceFactory.createFileResource("src/main/webapp/WEB-INF/myflow/myflow.xml");
+	}
+
+	@Override
+	protected void configureFlowBuilderContext(MockFlowBuilderContext builderContext) {
+		// Register beans here..
+		// MyService myService = ... ;
+		// builderContext.registerBean("myService", myService);
+	}
+
+	public void testStartFlow() {
+
+		MutableAttributeMap input = new LocalAttributeMap();
+		MockExternalContext context = new MockExternalContext();
+
+		startFlow(input, context);
+
+		assertCurrentStateEquals("view");
+		assertResponseWrittenEquals("view", context);
+	}
+
+	public void testEndFlow() {
+		setCurrentState("view");
+
+		MockExternalContext context = new MockExternalContext();
+		context.setEventId("continue");
+		resumeFlow(context);
+
+		assertFlowExecutionEnded();
+		assertFlowExecutionOutcomeEquals("done");
+	}
+
+}
diff --git a/SWF-1468/src/test/resources/log4j.properties b/SWF-1468/src/test/resources/log4j.properties
new file mode 100644
index 0000000..eff60e8
--- /dev/null
+++ b/SWF-1468/src/test/resources/log4j.properties
@@ -0,0 +1,10 @@
+log4j.rootCategory=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
+
+log4j.category.org.springframework.binding=DEBUG
+log4j.category.org.springframework.web=DEBUG
+log4j.category.org.springframework.webflow=DEBUG
+log4j.category.org.springframework.js=DEBUG