cleanup and upgrade

This commit is contained in:
DOHA 2016-01-06 13:26:07 +02:00
parent 868c754e30
commit 671bfc1635
7 changed files with 24 additions and 16 deletions

View File

@ -82,14 +82,14 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>${javax.servlet.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>1.2</version> <version>${jstl.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@ -98,7 +98,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>14.0.1</version> <version>${guava.version}</version>
</dependency> </dependency>
<!-- logging --> <!-- logging -->
@ -238,7 +238,9 @@
<!-- various --> <!-- various -->
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version> <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
<jstl.version>1.2</jstl.version>
<javax.servlet.version>3.0.1</javax.servlet.version>
<!-- util --> <!-- util -->
<guava.version>19.0</guava.version> <guava.version>19.0</guava.version>
<commons-lang3.version>3.4</commons-lang3.version> <commons-lang3.version>3.4</commons-lang3.version>

View File

@ -87,14 +87,14 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>${javax.servlet.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>1.2</version> <version>${jstl.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@ -243,7 +243,9 @@
<!-- various --> <!-- various -->
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version> <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
<javax.servlet.version>3.0.1</javax.servlet.version>
<jstl.version>1.2</jstl.version>
<!-- util --> <!-- util -->
<guava.version>19.0</guava.version> <guava.version>19.0</guava.version>
<commons-lang3.version>3.4</commons-lang3.version> <commons-lang3.version>3.4</commons-lang3.version>

View File

@ -12,6 +12,8 @@
<intercept-url pattern="/login*" access="permitAll"/> <intercept-url pattern="/login*" access="permitAll"/>
<intercept-url pattern="/**" access="isAuthenticated()"/> <intercept-url pattern="/**" access="isAuthenticated()"/>
<csrf disabled="true"/>
<form-login login-page='/login.html' authentication-success-handler-ref="myAuthenticationSuccessHandler" authentication-failure-url="/login.html?error=true"/> <form-login login-page='/login.html' authentication-success-handler-ref="myAuthenticationSuccessHandler" authentication-failure-url="/login.html?error=true"/>
<logout delete-cookies="JSESSIONID"/> <logout delete-cookies="JSESSIONID"/>

View File

@ -16,7 +16,7 @@
<br/> <br/>
</security:authorize> </security:authorize>
<a href="<c:url value="/j_spring_security_logout" />">Logout</a> <a href="<c:url value="/logout" />">Logout</a>
</body> </body>
</html> </html>

View File

@ -16,7 +16,7 @@
<br /> <br />
</security:authorize> </security:authorize>
<a href="<c:url value="/j_spring_security_logout" />">Logout</a> <a href="<c:url value="/logout" />">Logout</a>
</body> </body>
</html> </html>

View File

@ -4,20 +4,20 @@
<body> <body>
<h1>Login</h1> <h1>Login</h1>
<form name='f' action="j_spring_security_check" method='POST'> <form name='f' action="login" method='POST'>
<table> <table>
<tr> <tr>
<td>User:</td> <td>User:</td>
<td><input type='text' name='j_username' value=''></td> <td><input type='text' name='username' value=''></td>
</tr> </tr>
<tr> <tr>
<td>Password:</td> <td>Password:</td>
<td><input type='password' name='j_password' /></td> <td><input type='password' name='password' /></td>
</tr> </tr>
<tr> <tr>
<td>Remember Me:</td> <td>Remember Me:</td>
<td><input type="checkbox" name="_spring_security_remember_me" /></td> <td><input type="checkbox" name="remember_me" /></td>
</tr> </tr>
<tr> <tr>
<td><input name="submit" type="submit" value="submit" /></td> <td><input name="submit" type="submit" value="submit" /></td>

View File

@ -82,14 +82,14 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version> <version>${javax.servlet.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>1.2</version> <version>${jstl.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@ -238,7 +238,9 @@
<!-- various --> <!-- various -->
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version> <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
<jstl.version>1.2</jstl.version>
<javax.servlet.version>3.0.1</javax.servlet.version>
<!-- util --> <!-- util -->
<guava.version>19.0</guava.version> <guava.version>19.0</guava.version>
<commons-lang3.version>3.4</commons-lang3.version> <commons-lang3.version>3.4</commons-lang3.version>