Skip to content

Commit 5154c5b

Browse files
committed
cleanup and upgrade
1 parent 959eb43 commit 5154c5b

File tree

18 files changed

+193
-106
lines changed

18 files changed

+193
-106
lines changed

handling-spring-static-resources/.classpath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2020
</attributes>
2121
</classpathentry>
22-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
22+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
2323
<attributes>
24-
<attribute name="owner.project.facets" value="java"/>
24+
<attribute name="maven.pomderived" value="true"/>
2525
</attributes>
2626
</classpathentry>
2727
<classpathentry kind="output" path="target/classes"/>

handling-spring-static-resources/pom.xml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,33 +171,29 @@
171171
</build>
172172

173173
<properties>
174-
<java-version>1.7</java-version>
174+
<java-version>1.8</java-version>
175175
<!-- Spring -->
176-
<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
177-
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
176+
<org.springframework.version>4.2.4.RELEASE</org.springframework.version>
177+
<org.springframework.security.version>4.0.3.RELEASE</org.springframework.security.version>
178178

179179
<org.aspectj-version>1.8.1</org.aspectj-version>
180180
<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
181181

182-
<!-- Spring -->
183-
<org.springframework.version>4.1.5.RELEASE</org.springframework.version>
184-
<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
185-
186182
<!-- persistence -->
187-
<hibernate.version>4.3.10.Final</hibernate.version>
188-
<mysql-connector-java.version>5.1.35</mysql-connector-java.version>
189-
<spring-data-jpa.version>1.7.2.RELEASE</spring-data-jpa.version>
183+
<hibernate.version>4.3.11.Final</hibernate.version>
184+
<mysql-connector-java.version>5.1.37</mysql-connector-java.version>
185+
<spring-data-jpa.version>1.9.2.RELEASE</spring-data-jpa.version>
190186

191187
<!-- marshalling -->
192188

193-
<jackson.version>2.5.5</jackson.version>
189+
<jackson.version>2.6.4</jackson.version>
194190

195191
<!-- logging -->
196192
<org.slf4j.version>1.7.13</org.slf4j.version>
197193
<logback.version>1.1.3</logback.version>
198194

199195
<!-- various -->
200-
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
196+
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
201197

202198
<!-- util -->
203199
<guava.version>19.0</guava.version>

handling-spring-static-resources/src/main/resources/webSecurityConfig.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
33
xmlns:mvc="http://www.springframework.org/schema/mvc"
44
xsi:schemaLocation="
5-
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
6-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
5+
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.0.xsd
6+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
77
http://www.springframework.org/schema/mvc
8-
http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"
8+
http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd"
99
>
1010
<http use-expressions="true">
1111
<intercept-url pattern="/login*" access="permitAll"/>
@@ -21,7 +21,7 @@
2121
<form-login login-page='/login.html' authentication-failure-url="/login.html?error=true" authentication-success-handler-ref="myAuthenticationSuccessHandler"
2222
default-target-url="home.html"/>
2323
<session-management invalid-session-url="/invalidSession.html" session-fixation-protection="none"/>
24-
<logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true" logout-url="/j_spring_security_logout" delete-cookies="JSESSIONID"/>
24+
<logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true" delete-cookies="JSESSIONID"/>
2525

2626
</http>
2727

handling-spring-static-resources/src/main/webapp/WEB-INF/view/login.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
<body>
4242
<h1><spring:message code="label.form.loginTitle"></spring:message></h1>
4343

44-
<form name='f' action="j_spring_security_check" method='POST' onsubmit="return validate();">
44+
<form name='f' action="login" method='POST' onsubmit="return validate();">
4545
<table>
4646
<tr>
4747
<td><label><spring:message code="label.form.loginEmail"></spring:message></label></td>
48-
<td><input type='text' name='j_username' value=''></td>
48+
<td><input type='text' name='username' value=''></td>
4949
</tr>
5050
<tr>
5151
<td><label><spring:message code="label.form.loginPass"></spring:message></label></td>
52-
<td><input type='password' name='j_password' /></td>
52+
<td><input type='password' name='password' /></td>
5353
</tr>
5454
<tr>
5555
<td><input name="submit" type="submit" value=<spring:message code="label.form.submit"></spring:message> /></td>

spring-security-login-and-registration/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
2424
</attributes>
2525
</classpathentry>
26-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
26+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
2727
<attributes>
2828
<attribute name="maven.pomderived" value="true"/>
2929
</attributes>

0 commit comments

Comments
 (0)