From 63843c6774bf91fc559e18f49fd1d3e52c727019 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Sat, 12 Apr 2008 10:15:20 +0000
Subject: [PATCH] improved org of config files

---
 ...org.springframework.ide.eclipse.core.prefs |   9 +-
 .../booking-faces/.springBeans                |  20 ++-
 .../WEB-INF/config/data-access-config.xml     |  35 +++++
 .../webapp/WEB-INF/config/security-config.xml |  42 ++++++
 .../WEB-INF/config/web-application-config.xml |  23 +++
 .../webapp/WEB-INF/config/webflow-config.xml  |  40 ++++++
 .../webapp/WEB-INF/config/webmvc-config.xml   |  34 +++++
 .../webapp/WEB-INF/web-application-config.xml | 136 ------------------
 .../src/main/webapp/WEB-INF/web.xml           |   4 +-
 9 files changed, 202 insertions(+), 141 deletions(-)
 create mode 100644 spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/data-access-config.xml
 create mode 100644 spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
 create mode 100644 spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/web-application-config.xml
 create mode 100644 spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml
 create mode 100644 spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
 delete mode 100755 spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml

diff --git a/spring-webflow-samples/booking-faces/.settings/org.springframework.ide.eclipse.core.prefs b/spring-webflow-samples/booking-faces/.settings/org.springframework.ide.eclipse.core.prefs
index f55808e4..7ebddb67 100755
--- a/spring-webflow-samples/booking-faces/.settings/org.springframework.ide.eclipse.core.prefs
+++ b/spring-webflow-samples/booking-faces/.settings/org.springframework.ide.eclipse.core.prefs
@@ -1,4 +1,4 @@
-#Wed Feb 27 11:35:00 EST 2008
+#Sat Apr 12 06:11:28 EDT 2008
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
 org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true
@@ -8,6 +8,13 @@ org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.bestp
 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true
 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=true
 org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.AvoidDriverManagerDataSource-com.springsource.sts.bestpractices.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ImportElementsAtTopRulee-com.springsource.sts.bestpractices.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ParentBeanSpecifiesAbstractClassRule-com.springsource.sts.bestpractices.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.RefElementRule-com.springsource.sts.bestpractices.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.TooManyBeansInFileRule-com.springsource.sts.bestpractices.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UnnecessaryValueElementRule-com.springsource.sts.bestpractices.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UseBeanInheritance-com.springsource.sts.bestpractices.beansvalidator=true
 org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.legacyxmlusage.jndiobjectfactory-com.springsource.sts.bestpractices.beansvalidator=true
 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true
 org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true
diff --git a/spring-webflow-samples/booking-faces/.springBeans b/spring-webflow-samples/booking-faces/.springBeans
index 5d292705..a1c6dc1e 100755
--- a/spring-webflow-samples/booking-faces/.springBeans
+++ b/spring-webflow-samples/booking-faces/.springBeans
@@ -1,14 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.4.v200802202100]]></pluginVersion>
+	<pluginVersion><![CDATA[2.0.5.v200803132004]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
-		<config>src/main/webapp/WEB-INF/web-application-config.xml</config>
+		<config>src/main/webapp/WEB-INF/config/web-application-config.xml</config>
+		<config>src/main/webapp/WEB-INF/config/data-access-config.xml</config>
+		<config>src/main/webapp/WEB-INF/config/security-config.xml</config>
+		<config>src/main/webapp/WEB-INF/config/webflow-config.xml</config>
+		<config>src/main/webapp/WEB-INF/config/webmvc-config.xml</config>
 	</configs>
 	<configSets>
+		<configSet>
+			<name><![CDATA[webapp]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/webapp/WEB-INF/config/data-access-config.xml</config>
+				<config>src/main/webapp/WEB-INF/config/security-config.xml</config>
+				<config>src/main/webapp/WEB-INF/config/web-application-config.xml</config>
+				<config>src/main/webapp/WEB-INF/config/webflow-config.xml</config>
+				<config>src/main/webapp/WEB-INF/config/webmvc-config.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/data-access-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/data-access-config.xml
new file mode 100644
index 00000000..00b187c7
--- /dev/null
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/data-access-config.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:tx="http://www.springframework.org/schema/tx"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/tx
+           http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+
+	<!-- Instructs Spring to perfrom declarative transaction managemenet on annotated classes -->
+	<tx:annotation-driven />
+
+	<!-- Drives transactions using local JPA APIs -->
+	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>
+		
+	<!-- Creates a EntityManagerFactory for use with the Hibernate JPA provider and a simple in-memory data source populated with test data -->
+	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+		<property name="jpaVendorAdapter">
+			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+		</property>
+	</bean>
+
+	<!-- Deploys a in-memory "booking" datasource populated -->
+	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+		<property name="url" value="jdbc:hsqldb:mem:booking" />
+		<property name="username" value="sa" />
+		<property name="password" value="" />
+	</bean>
+	
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
new file mode 100644
index 00000000..dd26fbeb
--- /dev/null
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/security-config.xml
@@ -0,0 +1,42 @@
+<?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:security="http://www.springframework.org/schema/security"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/security
+           http://www.springframework.org/schema/security/spring-security-2.0.xsd">
+
+	<!-- Configure Spring Security -->
+	<security:http auto-config="true">
+		<!-- Restrict URLs based on role -->
+		<security:intercept-url pattern="/spring/login*" access="ROLE_ANONYMOUS" />
+		<security:intercept-url pattern="/spring/logout-success*" access="ROLE_ANONYMOUS" />
+		<security:intercept-url pattern="/spring/logout*" access="ROLE_USER" />
+		
+		<!-- Override default login and logout pages -->
+		<security:form-login login-page="/spring/login" login-url="/spring/login-process" default-target-url="/spring/flows/main" authentication-failure-url="/spring/login?login_error=1" />
+		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logout-success" />
+	</security:http>
+	
+	<!--
+		Define local authentication provider, a real app would use an external provider (JDBC, LDAP, CAS, etc)
+		
+		usernames/passwords are:
+			keith/melbourne
+			erwin/leuven
+			jeremy/atlanta
+			scott/rochester
+	-->
+	<security:authentication-provider>
+		<security:password-encoder hash="md5" />
+		<security:user-service>
+			<security:user name="keith" password="417c7382b16c395bc25b5da1398cf076" authorities="ROLE_USER, ROLE_SUPERVISOR" />
+			<security:user name="erwin" password="12430911a8af075c6f41c6976af22b09" authorities="ROLE_USER, ROLE_SUPERVISOR" />
+			<security:user name="jeremy" password="57c6cbff0d421449be820763f03139eb" authorities="ROLE_USER" />
+			<security:user name="scott" password="942f2339bf50796de535a384f0d1af3e" authorities="ROLE_USER" />
+		</security:user-service>
+	</security:authentication-provider>
+	
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/web-application-config.xml
new file mode 100644
index 00000000..4c5b1b15
--- /dev/null
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/web-application-config.xml
@@ -0,0 +1,23 @@
+<?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"
+       xsi:schemaLocation="
+           http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+	<!-- Activates annotation-based bean configuration -->
+	<context:annotation-config />
+	
+	<!-- Scans for application @Components to deploy -->
+	<context:component-scan base-package="org.springframework.webflow.samples.booking" />
+
+	<!-- Imports the configurations of the different infrastructure systems of the application -->
+	<import resource="webmvc-config.xml" />
+	<import resource="webflow-config.xml" />
+	<import resource="data-access-config.xml" />
+	<import resource="security-config.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml
new file mode 100644
index 00000000..855fdbd9
--- /dev/null
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml
@@ -0,0 +1,40 @@
+<?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-2.5.xsd
+           http://www.springframework.org/schema/webflow-config
+           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd
+           http://www.springframework.org/schema/faces
+           http://www.springframework.org/schema/faces/spring-faces-2.0.xsd">
+
+	<!-- Executes flows: the central entry point into the Spring Web Flow system -->
+	<webflow:flow-executor id="flowExecutor">
+		<webflow:flow-execution-listeners>
+			<webflow:listener ref="jpaFlowExecutionListener" />
+			<webflow:listener ref="securityFlowExecutionListener" />
+		</webflow:flow-execution-listeners>
+	</webflow:flow-executor>
+	
+	<!-- The registry of executable flow definitions -->
+	<webflow:flow-registry id="flowRegistry" flow-builder-services="facesFlowBuilderServices">
+		<webflow:flow-location path="/WEB-INF/flows/main/main.xml" />
+		<webflow:flow-location path="/WEB-INF/flows/booking/booking.xml" />
+	</webflow:flow-registry>
+	
+	<!-- Configures the Spring Web Flow JSF integration -->
+	<faces:flow-builder-services id="facesFlowBuilderServices" />
+
+	<!-- Installs a listener that manages JPA persistence contexts for flows that require them -->
+	<bean id="jpaFlowExecutionListener" class="org.springframework.webflow.persistence.JpaFlowExecutionListener">
+		<constructor-arg ref="entityManagerFactory" />
+		<constructor-arg ref="transactionManager" />
+	</bean>
+	
+	<!-- Installs a listener to apply Spring Security authorities -->
+	<bean id="securityFlowExecutionListener" class="org.springframework.webflow.security.SecurityFlowExecutionListener" />
+
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
new file mode 100644
index 00000000..288e9475
--- /dev/null
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -0,0 +1,34 @@
+<?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-2.5.xsd">
+
+	<!-- Maps request URIs to controllers -->			
+	<bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
+		<property name="mappings">
+			<value>
+				/main=flowController
+				/booking=flowController
+			</value>
+		</property>
+		<property name="defaultHandler">
+			<!-- Selects view names to render based on the request URI: e.g. /main selects "main" -->	
+			<bean class="org.springframework.web.servlet.mvc.UrlFilenameViewController" />
+		</property>
+	</bean>
+
+	<!-- Handles requests mapped to the Spring Web Flow system -->
+	<bean id="flowController" class="org.springframework.webflow.mvc.servlet.FlowController">
+		<constructor-arg ref="flowExecutor" />
+	</bean>
+
+	<!-- Maps logical view names to Facelet templates (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/" />
+		<property name="suffix" value=".xhtml" />
+	</bean>
+		
+</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml
deleted file mode 100755
index 567fb040..00000000
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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:tx="http://www.springframework.org/schema/tx"
-       xmlns:webflow="http://www.springframework.org/schema/webflow-config"
-       xmlns:faces="http://www.springframework.org/schema/faces"
-       xmlns:security="http://www.springframework.org/schema/security"
-       xsi:schemaLocation="
-           http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-           http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-2.5.xsd
-           http://www.springframework.org/schema/tx
-           http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-           http://www.springframework.org/schema/webflow-config
-           http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd
-           http://www.springframework.org/schema/faces
-           http://www.springframework.org/schema/faces/spring-faces-2.0.xsd
-           http://www.springframework.org/schema/security
-           http://www.springframework.org/schema/security/spring-security-2.0.xsd">
-
-	<!-- Activates annotation-based bean configuration -->
-	<context:annotation-config />
-	
-	<!-- Scans for application @Components to deploy -->
-	<context:component-scan base-package="org.springframework.webflow.samples.booking" />
-
-	<!-- Maps request URIs to controllers -->			
-	<bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
-		<property name="mappings">
-			<value>
-				/main=flowController
-				/booking=flowController
-			</value>
-		</property>
-		<property name="defaultHandler">
-			<!-- Handles requests mapped directly to facelet .xhtml view templates -->	
-			<bean class="org.springframework.web.servlet.mvc.UrlFilenameViewController" />
-		</property>
-	</bean>
-
-	<!-- Handles requests mapped to the Spring Web Flow system -->
-	<bean id="flowController" class="org.springframework.webflow.mvc.servlet.FlowController">
-		<constructor-arg ref="flowExecutor" />
-	</bean>
-
-	<!-- Maps logical view names to Facelet templates (e.g. 'search' to '/WEB-INF/search.xhtml' -->
-	<bean id="jsfViewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-		<property name="viewClass" value="org.springframework.faces.mvc.JsfView"/>
-		<property name="prefix" value="/WEB-INF/" />
-		<property name="suffix" value=".xhtml" />
-	</bean>
-	
-	<!-- Executes flows: the central entry point into the Spring Web Flow system -->
-	<webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry">
-		<webflow:flow-execution-listeners>
-			<webflow:listener ref="jpaFlowExecutionListener" />
-			<webflow:listener ref="securityFlowExecutionListener" />
-		</webflow:flow-execution-listeners>
-	</webflow:flow-executor>
-	
-	<!-- The registry of executable flow definitions -->
-	<webflow:flow-registry id="flowRegistry" flow-builder-services="facesFlowBuilderServices">
-		<webflow:flow-location path="/WEB-INF/flows/main/main.xml" />
-		<webflow:flow-location path="/WEB-INF/flows/booking/booking.xml" />
-	</webflow:flow-registry>
-	
-	<!-- Configures the Spring Web Flow JSF integration -->
-	<faces:flow-builder-services id="facesFlowBuilderServices" />
-
-	<!-- Installs a listener that manages JPA persistence contexts for flows that require them -->
-	<bean id="jpaFlowExecutionListener" class="org.springframework.webflow.persistence.JpaFlowExecutionListener">
-		<constructor-arg ref="entityManagerFactory" />
-		<constructor-arg ref="transactionManager" />
-	</bean>
-	
-	<!-- Installs a listener to apply Spring Security authorities -->
-	<bean id="securityFlowExecutionListener" class="org.springframework.webflow.security.SecurityFlowExecutionListener" />
-
-	<!-- Instructs Spring to perfrom declarative transaction managemenet on annotated classes -->
-	<tx:annotation-driven />
-
-	<!-- Drives transactions using local JPA APIs -->
-	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-		<property name="entityManagerFactory" ref="entityManagerFactory" />
-	</bean>
-		
-	<!-- Creates a EntityManagerFactory for use with the Hibernate JPA provider and a simple in-memory data source populated with test data -->
-	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-		<property name="dataSource" ref="dataSource" />
-		<property name="jpaVendorAdapter">
-			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
-		</property>
-	</bean>
-
-	<!-- Deploys a in-memory "booking" datasource populated -->
-	<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="url" value="jdbc:hsqldb:mem:booking" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-	</bean>
-	
-	<!-- Configure Spring Security -->
-	<security:http auto-config="true">
-		<!-- restrict URLs based on role -->
-		<security:intercept-url pattern="/spring/login*" access="ROLE_ANONYMOUS" />
-		<security:intercept-url pattern="/spring/logout-success*" access="ROLE_ANONYMOUS" />
-		<security:intercept-url pattern="/spring/logout*" access="ROLE_USER" />
-		
-		<!-- override default login and logout pages -->
-		<security:form-login login-page="/spring/login" login-url="/spring/login-process" default-target-url="/spring/flows/main" authentication-failure-url="/spring/login?login_error=1" />
-		<security:logout logout-url="/spring/logout" logout-success-url="/spring/logout-success" />
-	</security:http>
-	
-	<!--
-		Define local authentication provider, a real app would use an external provider (JDBC, LDAP, CAS, etc)
-		
-		usernames/passwords are:
-			keith/melbourne
-			erwin/leuven
-			jeremy/atlanta
-			scott/rochester
-	-->
-	<security:authentication-provider>
-		<security:password-encoder hash="md5" />
-		<security:user-service>
-			<security:user name="keith" password="417c7382b16c395bc25b5da1398cf076" authorities="ROLE_USER, ROLE_SUPERVISOR" />
-			<security:user name="erwin" password="12430911a8af075c6f41c6976af22b09" authorities="ROLE_USER, ROLE_SUPERVISOR" />
-			<security:user name="jeremy" password="57c6cbff0d421449be820763f03139eb" authorities="ROLE_USER" />
-			<security:user name="scott" password="942f2339bf50796de535a384f0d1af3e" authorities="ROLE_USER" />
-		</security:user-service>
-	</security:authentication-provider>
-	
-</beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml
index 57e6b276..e8501c26 100755
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>
-			/WEB-INF/web-application-config.xml
+			/WEB-INF/config/web-application-config.xml
 		</param-value>
 	</context-param>
 	
@@ -62,7 +62,7 @@
 		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/web-application-config.xml</param-value>
+			<param-value>/WEB-INF/config/web-application-config.xml</param-value>
 		</init-param>
 		<load-on-startup>2</load-on-startup>
 	</servlet>