Author: bbrossaud Date: 2010-06-22 11:10:23 +0200 (Tue, 22 Jun 2010) New Revision: 76 Url: http://chorem.org/repositories/revision/bow/76 Log: user migration works and addition error msg Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/java/org/chorem/bow/UserMigration.java trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/forgotPassword.jsp trunk/src/main/webapp/login.jsp trunk/src/main/webapp/register.jsp Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-21 16:22:07 UTC (rev 75) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-22 09:10:23 UTC (rev 76) @@ -1057,7 +1057,7 @@ protected void actionSendPassword(HttpServletRequest request, HttpServletResponse response) throws NoSuchAlgorithmException, AddressException, MessagingException, ServletException, IOException { String email = request.getParameter("email"); - if (email != null) { + if (email != null && !email.isEmpty()) { WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); User user = proxy.findByCriteria(User.class, criteria); @@ -1075,9 +1075,12 @@ proxy.store(user); request.getRequestDispatcher("login.jsp").forward(request, response); } else { - request.setAttribute("error", "This email doesn't exist..."); + request.setAttribute("msgError", "This email doesn't exist..."); request.getRequestDispatcher("forgotPassword.jsp").forward(request, response); } + } else { + request.setAttribute("msgError", "Please enter an email"); + request.getRequestDispatcher("forgotPassword.jsp").forward(request, response); } } } Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java =================================================================== --- trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-06-21 16:22:07 UTC (rev 75) +++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-06-22 09:10:23 UTC (rev 76) @@ -6,7 +6,8 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; -import java.util.Collection; +import java.util.List; +import java.util.Set; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; @@ -24,22 +25,33 @@ @Override public Wikitty migrate(WikittyService service, WikittyTransaction transaction, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { - Wikitty newWikitty = new Wikitty(wikitty.getId()); - newWikitty.setVersion(wikitty.getVersion()); - String extensionName = newExt.getName(); - Collection<WikittyExtension> extensions = wikitty.getExtensions(); + String id = wikitty.getId(); + String version = wikitty.getVersion(); + Wikitty newWikitty = new Wikitty(id); + newWikitty.setVersion(version); + + List<WikittyExtension> extensions = new ArrayList<WikittyExtension>(wikitty.getExtensions()); if (extensions.contains(oldExt)) { extensions.remove(oldExt); extensions.add(newExt); } - newWikitty.addExtension(new ArrayList<WikittyExtension>(extensions)); - String password = newWikitty.getFieldAsString(extensionName, "password"); - try { - password = StringUtil.encodeMD5(password); - } catch (NoSuchAlgorithmException ex) { - throw new WikittyException(ex); + newWikitty.addExtension(extensions); + + Set<String> fieldNames = wikitty.fieldNames(); + for (String fieldName : fieldNames) { + Object obj = wikitty.getFqField(fieldName); + if (fieldName.equals("User.password")) { + String password = (String) obj; + try { + password = StringUtil.encodeMD5(password); + } catch (NoSuchAlgorithmException ex) { + throw new WikittyException(ex); + } + obj = password; + } + newWikitty.setFqField(fieldName, obj); } - newWikitty.setField(extensionName, "password", password); + return newWikitty; } } Modified: trunk/src/main/webapp/css/connexion.css =================================================================== --- trunk/src/main/webapp/css/connexion.css 2010-06-21 16:22:07 UTC (rev 75) +++ trunk/src/main/webapp/css/connexion.css 2010-06-22 09:10:23 UTC (rev 76) @@ -122,6 +122,13 @@ font-weight:bold; } +#contenu .error { + color: red; + position:absolute; + bottom: 10px; + font-size: 12px; +} + #footer{ background-color:#804561; height:50px; Modified: trunk/src/main/webapp/forgotPassword.jsp =================================================================== --- trunk/src/main/webapp/forgotPassword.jsp 2010-06-21 16:22:07 UTC (rev 75) +++ trunk/src/main/webapp/forgotPassword.jsp 2010-06-22 09:10:23 UTC (rev 76) @@ -6,7 +6,7 @@ %> <html> - <head> + <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmark On the Web" /> <title>Bow</title> @@ -32,12 +32,11 @@ <input type="text" name="email" /> <button>Submit</button> </form> + <%if (error != null) {%> + <p class="error"><%=error%></p> + <%}%> <a href="bow" class="register">Login page</a> </div> - <br /> - <%if (error != null) {%> - <font color="red"><%=error%></font> - <%}%> </div> </div> Modified: trunk/src/main/webapp/login.jsp =================================================================== --- trunk/src/main/webapp/login.jsp 2010-06-21 16:22:07 UTC (rev 75) +++ trunk/src/main/webapp/login.jsp 2010-06-22 09:10:23 UTC (rev 76) @@ -34,13 +34,12 @@ <input type=password name="password" /> <button type="submit">Login</button> </form> + <%if (error != null) {%> + <p class="error"><%=error%></p> + <%}%> <a href="bow?action=registration" class="register">Register</a> <a href="bow?action=forgotPassword" class="forgot">Forgot Your Password?</a> </div> - <br /> - <%if (error != null) {%> - <font color="red"><%=error%></font> - <%}%> </div> </div> Modified: trunk/src/main/webapp/register.jsp =================================================================== --- trunk/src/main/webapp/register.jsp 2010-06-21 16:22:07 UTC (rev 75) +++ trunk/src/main/webapp/register.jsp 2010-06-22 09:10:23 UTC (rev 76) @@ -6,7 +6,7 @@ %> <html> - <head> + <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmark On the Web" /> <title>Bow</title> @@ -34,12 +34,11 @@ <input type=password name="password" /> <button>Register</button> </form> + <%if (error != null) {%> + <p class="error"><%=error%></p> + <%}%> <a href="bow" class="register">Login page</a> </div> - <br /> - <%if (error != null) {%> - <font color="red"><%=error%></font> - <%}%> </div> </div>