[jugevents.version3] push by enricogi...@gmail.com - fixing recovery password functionality and opendId issue on 2013-05-20 02:11 GMT

[juge...@googlecode.com]

Revision: 30e62a21cc25
Branch: default
Author: enricogiurin
Date: Sun May 19 19:10:41 2013
Log: fixing recovery password functionality and opendId issue
http://code.google.com/p/jugevents/source/detail?r=30e62a21cc25&repo=version3

Modified:
/jugevents/jugevents-web/pom.xml

/jugevents/jugevents-web/src/main/java/it/jugpadova/controllers/PasswordRecoveryController.java
/jugevents/jugevents-web/src/main/webapp/WEB-INF/tiles/defs/default.xml

=======================================
--- /jugevents/jugevents-web/pom.xml Sun May 19 11:54:40 2013
+++ /jugevents/jugevents-web/pom.xml Sun May 19 19:10:41 2013
@@ -286,6 +286,17 @@
<dependency>
<groupId>com.octo.captcha</groupId>
<artifactId>jcaptcha-all</artifactId>
+ <!-- to fix xerces issue with openId -->
+ <exclusions>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
=======================================
---
/jugevents/jugevents-web/src/main/java/it/jugpadova/controllers/PasswordRecoveryController.java
Tue Apr 16 18:38:46 2013
+++
/jugevents/jugevents-web/src/main/java/it/jugpadova/controllers/PasswordRecoveryController.java
Sun May 19 19:10:41 2013
@@ -54,6 +54,7 @@
private static final Logger logger =
LoggerFactory.getLogger(PasswordRecoveryController.class);
public static final String FORM_VIEW = "pwdrecovery/passwordRecovery";
+
public static final String PASSWORD_RECOVERY_ATTRIBUTE
= "passwordRecovery";
@Resource
private JuggerBo juggerBo;
@@ -86,10 +87,11 @@

@ModelAttribute(PASSWORD_RECOVERY_ATTRIBUTE)
@RequestMapping(method = RequestMethod.GET)
- protected String form(Model model) throws
+ protected ModelAndView form(Model model) throws
Exception {
- model.addAttribute(PASSWORD_RECOVERY_ATTRIBUTE, new
PasswordRecovery());
- return FORM_VIEW;
+ ModelAndView mv = new ModelAndView(FORM_VIEW);
+ mv.addObject(PASSWORD_RECOVERY_ATTRIBUTE, new PasswordRecovery());
+ return mv;
}
}

=======================================
--- /jugevents/jugevents-web/src/main/webapp/WEB-INF/tiles/defs/default.xml
Sun Feb 24 15:16:13 2013
+++ /jugevents/jugevents-web/src/main/webapp/WEB-INF/tiles/defs/default.xml
Sun May 19 19:10:41 2013
@@ -111,6 +111,10 @@
<definition name="jugger/registration/setpwd"
extends="template.central">
<put-attribute name="main"
value="/WEB-INF/jsp/jugger/registration/setpwd.jsp"/>
</definition>
+
+ <definition name="pwdrecovery/passwordRecovery"
extends="template.central">
+ <put-attribute name="main"
value="/WEB-INF/jsp/pwdrecovery/passwordRecovery.jsp"/>
+ </definition>

<definition name="admin/conf" extends="template.central">
<put-attribute name="main" value="/WEB-INF/jsp/admin/conf.jsp"/>
@@ -164,9 +168,7 @@
<put-attribute name="main" value="/WEB-INF/jsp/500.jsp"/>
</definition>

- <definition name="pwdrecovery/passwordRecovery"
extends="template.central">
- <put-attribute name="main"
value="/WEB-INF/jsp/pwdrecovery/passwordRecovery.jsp"/>
- </definition>
+

<definition name="pwdrecovery/setpwd" extends="template.central">
<put-attribute name="main"
value="/WEB-INF/jsp/pwdrecovery/setpwd.jsp"/>