Merge pull request eugenp#171 from Doha2012/master

fix user/registration path
rohitghatol · Mar 24, 2015 · b6f5e73 · b6f5e73
2 parents 6260f49 + 05e5c2b
commit b6f5e73
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/...-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java
@@ -49,7 +49,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .antMatchers("/j_spring_security_check*","/login*", "/logout*", "/signin/**", "/signup/**",
                         "/user/registration*", "/regitrationConfirm*", "/expiredAccount*", "/registration*", 
                         "/badUser*", "/user/resendRegistrationToken*" ,"/forgetPassword*", "/user/resetPassword*", 
-                        "/user/changePassword*", "/emailError*", "/resources/**").permitAll()
+                        "/user/changePassword*", "/emailError*", "/resources/**","/old/user/registration*").permitAll()
                 .antMatchers("/invalidSession*").anonymous()
                 .anyRequest().authenticated()
                 .and()

diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp
@@ -17,7 +17,7 @@ code="label.badUser.title"></spring:message></title>
 				 ${param.message}
 </h1>
 <br>
-<a href="<c:url value="/user/registration" />"><spring:message
+<a href="<c:url value="/old/user/registration" />"><spring:message
 code="label.form.loginSignUp"></spring:message></a>
 
 <c:if test="${param.expired}">

diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp
@@ -16,7 +16,7 @@
   <spring:message code="auth.message.expired"></spring:message> 
 </h1>
 <br>
-<a href="<c:url value="/user/registration" />"><spring:message
+<a href="<c:url value="/old/user/registration" />"><spring:message
 code="label.form.loginSignUp"></spring:message></a>
 
 </body>

diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp
@@ -32,7 +32,7 @@
 </div>
 
 <br> 
-<a href="<c:url value="/user/registration" />"><spring:message code="label.form.loginSignUp"></spring:message></a>
+<a href="<c:url value="/old/user/registration" />"><spring:message code="label.form.loginSignUp"></spring:message></a>
 <br>
 <a href="<c:url value="login.html" />"><spring:message code="label.form.loginLink"></spring:message></a>
 

diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/login.jsp
@@ -97,7 +97,7 @@ ${param.message}
 
 			</form>
 			<br> Current Locale : ${pageContext.response.locale} <br> <a
-				href="<c:url value="/user/registration" />"><spring:message
+				href="<c:url value="/old/user/registration" />"><spring:message
 					code="label.form.loginSignUp"></spring:message></a>
 			<br><br><br>
             <a href="<c:url value="/forgetPassword.html" />"><spring:message