Upgrade to Spring Security 4 via SWF 2.4.2 snapshots

primefaces-showcase/pom.xml

@@ -10,8 +10,8 @@
 
 	<properties>
 		<java-version>1.6</java-version>
-		<springwebflow-version>2.4.0.RELEASE</springwebflow-version>
-		<springsecurity-version>3.2.4.RELEASE</springsecurity-version>
+		<springwebflow-version>2.4.2.BUILD-SNAPSHOT</springwebflow-version>
+		<springsecurity-version>4.0.1.RELEASE</springsecurity-version>
 		<primefaces-version>4.0</primefaces-version>
 		<org.slf4j-version>1.7.5</org.slf4j-version>
 	</properties>
@@ -21,7 +21,7 @@
 			<dependency>
 				<groupId>org.springframework</groupId>
 				<artifactId>spring-framework-bom</artifactId>
-				<version>4.0.5.RELEASE</version>
+				<version>4.1.6.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -220,6 +220,16 @@
 					<target>${java-version}</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.tomcat.maven</groupId>
+				<artifactId>tomcat7-maven-plugin</artifactId>
+				<version>2.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>9.0.0.v20130308</version>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>

primefaces-showcase/src/main/resources/log4j.xml

@@ -2,7 +2,6 @@
 <!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
 
-	<!-- Appenders -->
 	<appender name="console" class="org.apache.log4j.ConsoleAppender">
 		<param name="Target" value="System.out" />
 		<layout class="org.apache.log4j.PatternLayout">
@@ -10,30 +9,12 @@
 		</layout>
 	</appender>
 	
-	<!-- Application Loggers -->
 	<logger name="org.springframework.samples.webflow">
 		<level value="debug" />
 	</logger>
 	
-	<!-- 3rdparty Loggers -->
-	<logger name="org.springframework.core">
-		<level value="info" />
-	</logger>	
-	
-	<logger name="org.springframework.beans">
-		<level value="info" />
-	</logger>
-	
-	<logger name="org.springframework.context">
-		<level value="info" />
-	</logger>
-
-	<logger name="org.springframework.http">
-		<level value="info" />
-	</logger>
-
 	<logger name="org.springframework.web">
-		<level value="debug" />
+		<level value="info" />
 	</logger>
 
 	<logger name="org.springframework.binding">
@@ -44,11 +25,14 @@
 		<level value="debug" />
 	</logger>
 
+	<logger name="org.springframework.security">
+		<level value="debug" />
+	</logger>
+
 	<logger name="org.primefaces">
 		<level value="debug" />
 	</logger>
 
-	<!-- Root Logger -->
 	<root>
 		<priority value="info" />
 		<appender-ref ref="console" />

primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
 	<!-- 
 		URL mappings for views without controller logic.

primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml

@@ -4,10 +4,10 @@
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:faces="http://www.springframework.org/schema/faces"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
-		http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.4.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
 	<!--
 		DispatcherServlet Context: defines this servlet's request-processing infrastructure

primefaces-showcase/src/main/webapp/WEB-INF/spring/appServlet/webflow.xml

@@ -3,9 +3,9 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:faces="http://www.springframework.org/schema/faces"
-	xsi:schemaLocation="http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
-		http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces-2.4.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/faces http://www.springframework.org/schema/faces/spring-faces.xsd">
 
 	<!-- Executes flows: the central entry point into the Spring Web Flow system -->
 	<flow-executor id="flowExecutor">

primefaces-showcase/src/main/webapp/WEB-INF/spring/root-context.xml

@@ -1,7 +1,7 @@
 <?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.2.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 	
 	<!-- Root Context: defines shared resources visible to all other web components -->
 	<import resource="security-config.xml"/>

primefaces-showcase/src/main/webapp/WEB-INF/spring/security-config.xml

@@ -4,19 +4,20 @@
        xmlns:security="http://www.springframework.org/schema/security"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+           http://www.springframework.org/schema/beans/spring-beans.xsd
            http://www.springframework.org/schema/security
-           http://www.springframework.org/schema/security/spring-security-3.2.xsd">
+           http://www.springframework.org/schema/security/spring-security.xsd">
 
 	<!-- 
 		Configure Spring Security 
 	-->
 	<security:http auto-config="true" use-expressions="true">
-		<security:form-login login-page="/app/login" login-processing-url="/app/j_spring_security_check" 
+		<security:form-login login-page="/app/login" login-processing-url="/app/loginProcess"
 			default-target-url="/app/home" authentication-failure-url="/app/login?login_error=1" />
 		<security:logout logout-url="/app/logout" logout-success-url="/app/home" />
 		<security:intercept-url pattern="/secured/appleUser" method="POST" access="hasRole('ROLE_APPLE_USER')" />
 		<security:intercept-url pattern="/secured/androidUser" method="POST" access="hasRole('ROLE_ANDROID_USER')" />
+		<security:csrf disabled="true" />
 	</security:http>
 
 	<!--

primefaces-showcase/src/main/webapp/WEB-INF/views/login.xhtml

@@ -22,23 +22,19 @@
 	<c:if test="${not empty param.login_error}">
 		<div class="error">
 			Your login attempt was not successful, try again.<br />
-			Reason: #{sessionScope.SPRING_SECURITY_LAST_EXCEPTION.message}
 		</div>
 	</c:if>
 	<p:panel header="Login Information">
-		<form name="f" action="${request.contextPath}/app/j_spring_security_check" method="post">
+		<form name="f" action="${request.contextPath}/app/loginProcess" method="post">
 			<p>
 				User:
 				<br />
-				<c:if test="${not empty param.login_error}">
-					<c:set var="username" value="${sessionScope.SPRING_SECURITY_LAST_USERNAME}"/>
-				</c:if>
-				<input type="text" name="j_username" value="#{username}"/>
+				<input type="text" name="username" />
 			</p>
 			<p>
 				Password:
 				<br />
-				<input type="password" name="j_password" />				
+				<input type="password" name="password" />
 			</p>
 			<p>
 				<input type="checkbox" name="_spring_security_remember_me"/>