pom.xml: update Spring Security to 4.0.1.RELEASE.

@see http://spring.io/blog/2014/05/05/spring-security-4-0-0-m1-released
@see http://spring.io/blog/2014/08/18/spring-security-4-0-0-m2-released
@see http://spring.io/blog/2014/12/11/spring-security-4-0-0-rc1-released
@see http://spring.io/blog/2015/02/26/spring-security-4-0-0-rc2-released
@see http://spring.io/blog/2015/03/26/spring-security-4-0-0-released
@see http://spring.io/blog/2015/04/23/spring-security-4-0-1-released

Thymeleaf integration were updated accordingly
(thymeleaf-extras-springsecurity3 -> thymeleaf-extras-springsecurity4).

NOTE: After updating to Spring Security we don't have ability to obtain login
from last failed authentication attempt, because BadCredentialsException
doesn't have property with extra information anymore.

@see http://docs.spring.io/spring-security/site/migrate/current/3-to-4/html5/migrate-3-to-4-jc.html#m3to4-deprecations-core-ae
@see http://stackoverflow.com/q/30359933/spring-security-4-x-how-to-obtain-login-that-has-been-used-during-failed-authen

Author: php-coder

pom.xml

@@ -19,7 +19,7 @@
 		<slf4j.version>1.7.9</slf4j.version>
 		<spring.version>4.1.6.RELEASE</spring.version>
 		<spring.data.version>1.6.4.RELEASE</spring.data.version>
-		<spring.security.version>3.2.7.RELEASE</spring.security.version>
+		<spring.security.version>4.0.1.RELEASE</spring.security.version>
 		<h2.version>1.4.184</h2.version>
 		<javax.validation.version>1.1.0.Final</javax.validation.version>
 		<javax.inject.version>1</javax.inject.version>
@@ -32,7 +32,7 @@
 		<commons.collections.version>3.2.1</commons.collections.version>
 		<commons.dbcp.version>1.4</commons.dbcp.version>
 		<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
-		<thymeleaf.security.version>2.1.1.RELEASE</thymeleaf.security.version>
+		<thymeleaf.security.version>2.1.2.RELEASE</thymeleaf.security.version>
 		<thymeleaf.togglz.version>1.0.1.RELEASE</thymeleaf.togglz.version>
 		<liquibase.version>3.3.2</liquibase.version>
 		<liquibase.slf4j.version>1.2.1</liquibase.slf4j.version>
@@ -232,7 +232,7 @@
 
 		<dependency>
 			<groupId>org.thymeleaf.extras</groupId>
-			<artifactId>thymeleaf-extras-springsecurity3</artifactId>
+			<artifactId>thymeleaf-extras-springsecurity4</artifactId>
 			<version>${thymeleaf.security.version}</version>
 		</dependency>
 

src/main/java/ru/mystamps/web/config/MvcConfig.java

@@ -43,7 +43,7 @@
 import org.springframework.web.servlet.ViewResolver;
 
 import com.github.heneke.thymeleaf.togglz.TogglzDialect;
-import org.thymeleaf.extras.springsecurity3.dialect.SpringSecurityDialect;
+import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
 import org.thymeleaf.spring4.SpringTemplateEngine;
 import org.thymeleaf.spring4.view.ThymeleafView;
 import org.thymeleaf.spring4.view.ThymeleafViewResolver;

src/main/webapp/WEB-INF/views/account/auth.html

@@ -79,7 +79,7 @@ <h3 th:text="#{t_authentication_on_site}">
 					</div>
 					/*/-->
 
-					<div class="row-fluid" th:with="lastLogin=${exceptionOccurred ? session.SPRING_SECURITY_LAST_EXCEPTION.authentication.principal : ''}">
+					<div class="row-fluid">
 						<div class="span6 offset3">
 							<form id="authAccountForm" action="../site/index.html" th:action="@{${LOGIN_PAGE}}" method="post" class="form-horizontal">
 
@@ -89,7 +89,7 @@ <h3 th:text="#{t_authentication_on_site}">
 										<span id="login.required" class="required_field">*</span>
 									</label>
 									<div class="controls">
-										<input type="text" id="login" name="login" required="required" value="" th:value="${lastLogin}" />
+										<input type="text" id="login" name="login" required="required" value="" />
 									</div>
 								</div>
 

src/test/java/ru/mystamps/web/tests/page/AuthAccountPage.java

@@ -46,7 +46,8 @@ public AuthAccountPage(WebDriver driver) {
 				required(inputField("login"))
 					.withLabel(tr("t_login"))
 					.and()
-					.invalidValue("x"),
+					.invalidValue("x")
+					.preserveInvalidValue(false),
 
 				required(passwordField("password"))
 					.withLabel(tr("t_password"))

src/test/java/ru/mystamps/web/tests/page/element/Form.java

@@ -210,8 +210,9 @@ public Field invalidValue(String invalidValue) {
 			return this;
 		}
 
-		protected void preserveInvalidValue(boolean preserveInvalidValue) {
+		public Field preserveInvalidValue(boolean preserveInvalidValue) {
 			this.preserveInvalidValue = preserveInvalidValue;
+			return this;
 		}
 
 		public boolean shouldPreserveInvalidValue() {