From 3aac995f210e8566f76c10bd8e61f13d10797128 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Mon, 31 Mar 2014 21:19:29 -0400
Subject: [PATCH] Update Spring Faces chapter with Java config

---
 src/reference/spring-faces.xml | 39 ++++++++++++++++++++++++++++++++--
 src/reference/system-setup.xml |  1 +
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/reference/spring-faces.xml b/src/reference/spring-faces.xml
index 4b5877f7..e1aa71bc 100644
--- a/src/reference/spring-faces.xml
+++ b/src/reference/spring-faces.xml
@@ -196,8 +196,9 @@ xsi:schemaLocation="
 	<sect1 xml:id="spring-faces-webflow-config">
 		<title>Configuring Web Flow for use with JSF</title>
 
-		<para>This section explains how to configure Web Flow with JSF.    The
-		following is sample configuration for Web Flow and JSF:</para>
+		<para>This section explains how to configure Web Flow with JSF.
+		Both Java and XML style configuration are supported.
+		The following is sample configuration for Web Flow and JSF in XML:</para>
 
 		<programlisting language="xml">
 &lt;?xml version="1.0" encoding="UTF-8"?&gt;
@@ -235,6 +236,34 @@ xsi:schemaLocation="
 &lt;/beans&gt;
 		</programlisting>
 
+		<para>
+			The following is an example of the same in Java configuration:
+		</para>
+
+		<programlisting language="java"><![CDATA[
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.faces.config.*;
+
+@Configuration
+public class WebFlowConfig extends AbstractFacesFlowConfiguration {
+
+    @Bean
+    public FlowExecutor flowExecutor() {
+        return getFlowExecutorBuilder(flowRegistry())
+                .addFlowExecutionListener(new FlowFacesContextLifecycleListener())
+                .build();
+    }
+
+    @Bean
+    public FlowDefinitionRegistry flowRegistry() {
+        return getFlowDefinitionRegistryBuilder()
+                .setBasePath("/WEB-INF")
+                .addFlowLocationPattern("**/*-flow.xml").build();
+
+}]]>
+		</programlisting>
+
 		<para>The main points are the installation of a
 		<code>FlowFacesContextLifecycleListener</code> that manages a single
 		FacesContext for the duration of Web Flow request and the use of the
@@ -270,6 +299,12 @@ xsi:schemaLocation="
 		<code>FlowHandlerAdapter</code> normally used with Web Flow. This adapter
 		initializes itself with a <code>JsfAjaxHandler</code> instead of the
 		<code>SpringJavaSciprtAjaxHandler</code>.</para>
+
+		<para>When using Java config, the <classname>AbstractFacesFlowConfiguration</classname>
+		base class automatically registers <classname>JsfResourceRequestHandler</classname>
+		so there is nothing further to do.
+		</para>
+
 	</sect1>
 
 	<sect1 xml:id="spring-faces-managed-beans">
diff --git a/src/reference/system-setup.xml b/src/reference/system-setup.xml
index 6f6d0410..90ccac11 100644
--- a/src/reference/system-setup.xml
+++ b/src/reference/system-setup.xml
@@ -44,6 +44,7 @@
 		</para>
 		<programlisting language="java"><![CDATA[
 import org.springframework.context.annotation.Configuration;
+import org.springframework.webflow.config.AbstractFlowConfiguration;
 
 @Configuration
 public class WebFlowConfig extends AbstractFlowConfiguration {