cleanup and upgrade

CrystalSNS · Jan 6, 2016 · 671bfc1 · 671bfc1
1 parent 868c754
commit 671bfc1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml
@@ -82,14 +82,14 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>${javax.servlet.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>1.2</version>
+            <version>${jstl.version}</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>14.0.1</version>
+            <version>${guava.version}</version>
         </dependency>
 
         <!-- logging -->
@@ -238,7 +238,9 @@
 
         <!-- various -->
         <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 -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.4</commons-lang3.version>

diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml
@@ -87,14 +87,14 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>${javax.servlet.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>1.2</version>
+            <version>${jstl.version}</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -243,7 +243,9 @@
 
         <!-- various -->
         <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 -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.4</commons-lang3.version>

diff --git a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml
@@ -12,6 +12,8 @@
         <intercept-url pattern="/login*" access="permitAll"/>
         <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"/>
 
         <logout delete-cookies="JSESSIONID"/>

diff --git a/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/console.jsp b/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/console.jsp
@@ -16,7 +16,7 @@
 		<br/>
 	</security:authorize>
 
-	<a href="<c:url value="/j_spring_security_logout" />">Logout</a>
+	<a href="<c:url value="/logout" />">Logout</a>
 
 </body>
 </html>
diff --git a/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/homepage.jsp
@@ -16,7 +16,7 @@
 		<br />
 	</security:authorize>
 
-	<a href="<c:url value="/j_spring_security_logout" />">Logout</a>
+	<a href="<c:url value="/logout" />">Logout</a>
 
 </body>
 </html>
diff --git a/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-mvc-custom/src/main/webapp/WEB-INF/view/login.jsp
@@ -4,20 +4,20 @@
 <body>
 	<h1>Login</h1>
 
-	<form name='f' action="j_spring_security_check" method='POST'>
+	<form name='f' action="login" method='POST'>
 
 		<table>
 			<tr>
 				<td>User:</td>
-				<td><input type='text' name='j_username' value=''></td>
+				<td><input type='text' name='username' value=''></td>
 			</tr>
 			<tr>
 				<td>Password:</td>
-				<td><input type='password' name='j_password' /></td>
+				<td><input type='password' name='password' /></td>
 			</tr>
 			<tr>
 				<td>Remember Me:</td>
-				<td><input type="checkbox" name="_spring_security_remember_me" /></td>
+				<td><input type="checkbox" name="remember_me" /></td>
 			</tr>
 			<tr>
 				<td><input name="submit" type="submit" value="submit" /></td>

diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml
@@ -82,14 +82,14 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>${javax.servlet.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>1.2</version>
+            <version>${jstl.version}</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -238,7 +238,9 @@
 
         <!-- various -->
         <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 -->
         <guava.version>19.0</guava.version>
         <commons-lang3.version>3.4</commons-lang3.version>