- Bow-commits - mailman.cloud.codelutin.com

r83 - in trunk/src/main: java/org/chorem/bow webapp
by bbrossaud＠users.chorem.org 15 Jul '10

15 Jul '10

Author: bbrossaud Date: 2010-07-15 10:43:11 +0200 (Thu, 15 Jul 2010) New Revision: 83 Url: http://chorem.org/repositories/revision/bow/83 Log: resolved problem with alias Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/webapp/bookmark.jsp Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-15 08:03:27 UTC (rev 82) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-15 08:43:11 UTC (rev 83) @@ -152,10 +152,12 @@ public static void addUrlToBookmark(String url, Bookmark bookmark) { if (url != null && !url.isEmpty()) { String link = url.trim(); - if (!link.contains("://")) { + if (!link.contains("http://")) { link = "http://" + link; } bookmark.setLink(link); + } else { + bookmark.setLink(""); } } @@ -192,21 +194,13 @@ } else { bookmark.setDescription(""); } - if (tags != null && !tags.isEmpty()) { - tags = tags.trim(); - String[] tagsTab = tags.split("\\s+"); // put the tags in an array - for (int i = 0; i < tagsTab.length; ++i) { - if (!tagsTab[i].isEmpty()) { - bookmark.addTags(tagsTab[i]); - } - } - } - if (url != null) { - bookmark.setLink(url); - } else { - bookmark.setLink(""); - } + + addTagsToBookmark(tags, bookmark); + + addUrlToBookmark(url, bookmark); + bookmark.setClick(0); + bookmark.setEmail(user.getEmail()); // set the email (user name) if (date == null) { date = new Date(); @@ -228,27 +222,14 @@ } } - public static void updateBookmark(Bookmark bookmark, String name, String link, String str, String alias) { + public static void updateBookmark(Bookmark bookmark, String name, String link, String tags, String alias) { if (name != null) { name = name.trim(); bookmark.setDescription(name); } - if (link != null) { - link = link.trim(); - bookmark.setLink(link); - } - if (str != null) { - bookmark.clearTags(); - if (!str.isEmpty()) { - str = str.trim(); - String[] tags = str.split("\\s+"); - for (int i = 0; i < tags.length; i++) { - if (bookmark.getTags() == null || !bookmark.getTags().contains(tags[i])) { - bookmark.addTags(tags[i]); - } - } - } - } + addUrlToBookmark(link, bookmark); + bookmark.clearTags(); + addTagsToBookmark(tags, bookmark); if (alias != null) { alias = alias.trim(); bookmark.setAlias(alias); Modified: trunk/src/main/webapp/bookmark.jsp =================================================================== --- trunk/src/main/webapp/bookmark.jsp 2010-07-15 08:03:27 UTC (rev 82) +++ trunk/src/main/webapp/bookmark.jsp 2010-07-15 08:43:11 UTC (rev 83) @@ -26,7 +26,7 @@ <div class="bookmark"> <div class="bookmarkhead clearfix"> - <a class="alias" href="<%=url + bookmark.getAlias()%>" title="<%=url + bookmark.getAlias()%>" target="_blank"> + <a class="alias" href="<%=url + "alias/" + bookmark.getAlias()%>" title="<%=bookmark.getLink()%>" target="_blank"> <%=bookmark.getAlias()%> </a> <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p>

1 0

r82 - in trunk: . src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org 15 Jul '10

15 Jul '10

Author: bbrossaud Date: 2010-07-15 10:03:27 +0200 (Thu, 15 Jul 2010) New Revision: 82 Url: http://chorem.org/repositories/revision/bow/82 Log: the empty alias addition in the bookmark form works Modified: trunk/pom.xml trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-14 13:25:12 UTC (rev 81) +++ trunk/pom.xml 2010-07-15 08:03:27 UTC (rev 82) @@ -219,8 +219,18 @@ </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> </plugins> </build> </project> + Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-14 13:25:12 UTC (rev 81) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-15 08:03:27 UTC (rev 82) @@ -535,9 +535,11 @@ Bookmark bookmark = null; if (name != null) { String tags = request.getParameter("tags"); // tags - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); - if (proxy.findByCriteria(Bookmark.class, criteria) != null) { - alias = ""; + if (alias != null && !alias.isEmpty()) { + Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); + if (proxy.findByCriteria(Bookmark.class, criteria) != null) { + alias = ""; + } } bookmark = BookmarkActions.createBookmark(link, name, tags, user, alias, null); } else { // this part is for the bookmark addition by script

1 0

r81 - trunk/src/main/webapp/css
by bpoussin＠users.chorem.org 14 Jul '10

14 Jul '10

Author: bpoussin Date: 2010-07-14 15:25:12 +0200 (Wed, 14 Jul 2010) New Revision: 81 Url: http://chorem.org/repositories/revision/bow/81 Log: input field must take 100% Modified: trunk/src/main/webapp/css/bookmark.css Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2010-07-14 13:19:28 UTC (rev 80) +++ trunk/src/main/webapp/css/bookmark.css 2010-07-14 13:25:12 UTC (rev 81) @@ -190,7 +190,7 @@ #colonneD form input{ height:22px; - width:146px; + width:100%; } #colonneD #add form label{

1 0

r80 - trunk/src/main/webapp/css
by bpoussin＠users.chorem.org 14 Jul '10

14 Jul '10

Author: bpoussin Date: 2010-07-14 15:19:28 +0200 (Wed, 14 Jul 2010) New Revision: 80 Url: http://chorem.org/repositories/revision/bow/80 Log: use min-height to permit cloud extension if necessary Modified: trunk/src/main/webapp/css/bookmark.css Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2010-07-09 08:42:08 UTC (rev 79) +++ trunk/src/main/webapp/css/bookmark.css 2010-07-14 13:19:28 UTC (rev 80) @@ -208,7 +208,7 @@ } #colonneD #nuage{ - height:100px; + min-height:100px; } #colonneD #add{

1 0

r79 - trunk
by bbrossaud＠users.chorem.org 09 Jul '10

09 Jul '10

Author: bbrossaud Date: 2010-07-09 10:42:08 +0200 (Fri, 09 Jul 2010) New Revision: 79 Url: http://chorem.org/repositories/revision/bow/79 Log: compile with wikitty 2.0-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-25 15:58:46 UTC (rev 78) +++ trunk/pom.xml 2010-07-09 08:42:08 UTC (rev 79) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.3</version> + <version>2.1.4</version> </parent> <groupId>org.chorem</groupId> @@ -122,6 +122,7 @@    + <platform>chorem.org</platform> <projectId>bow</projectId> <wikitty.version>2.0-SNAPSHOT</wikitty.version>  @@ -161,7 +162,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>1.0.0</version> + <version>2.1</version> <executions> <execution> <id>api generator</id> @@ -185,14 +186,14 @@ <includes>**/*.objectmodel</includes> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - <defaultPackage>com.jurismarches.vradi</defaultPackage> +  + <inputs>zargo</inputs> + <fullPackagePath>org.chorem.bow</fullPackagePath> <extractedPackages>org.chorem.bow</extractedPackages> <generatedPackages>org.chorem.bow</generatedPackages> </configuration> <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> + <goal>smart-generate</goal> </goals> </execution> </executions> @@ -204,7 +205,7 @@ <version>${wikitty.version}</version> </dependency>  - <dependency> + </dependencies> </plugin> @@ -222,3 +223,4 @@ </build> </project> +

1 0

r78 - in trunk/src/main: java/org/chorem/bow webapp
by bbrossaud＠users.chorem.org 25 Jun '10

25 Jun '10

Author: bbrossaud Date: 2010-06-25 17:58:46 +0200 (Fri, 25 Jun 2010) New Revision: 78 Url: http://chorem.org/repositories/revision/bow/78 Log: to change the current password we have to fill the current and confirm the new Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/preferences.jsp Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-22 17:58:20 UTC (rev 77) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-25 15:58:46 UTC (rev 78) @@ -982,32 +982,49 @@ private void actionChangePreferences(HttpServletRequest request, HttpSession session, User user) throws NoSuchAlgorithmException, AddressException, MessagingException { + WikittyProxy proxy = BowProxy.getInstance(); - String email = request.getParameter("email"); - String password = request.getParameter("password"); + Preference preference = (Preference) session.getAttribute("preference"); + // Retrieve Preference fields String colors = request.getParameter("colors"); + String tags = request.getParameter("tags"); + String bookmarks = request.getParameter("bookmarks"); + String searchEngineSuggestions = request.getParameter("searchEngineUrlSuggestions"); + String searchEngineResults = request.getParameter("searchEngineUrlResults"); + preference.setColors(colors); - String tags = request.getParameter("tags"); preference.setTags(Integer.valueOf(tags)); - String bookmarks = request.getParameter("bookmarks"); preference.setBookmarks(Integer.valueOf(bookmarks)); - String searchEngineSuggestions = request.getParameter("searchEngineUrlSuggestions"); preference.setSearchEngineUrlSuggestions(searchEngineSuggestions); - String searchEngineResults = request.getParameter("searchEngineUrlResults"); preference.setSearchEngineUrlResults(searchEngineResults); proxy.store(preference); + User newUser = proxy.restore(User.class, user.getWikittyId()); + // Retrieve User fields + String email = request.getParameter("email"); + String newPassword = request.getParameter("newPassword"); + String currentPassword = request.getParameter("currentPassword"); + String confirmNewPassword = request.getParameter("confirmNewPassword"); + if (email != null && !email.isEmpty()) { newUser.setEmail(email); } - if (password != null && !password.isEmpty()) { - String md5 = StringUtil.encodeMD5(password); - newUser.setPassword(md5); - sendMail(newUser.getEmail(), password); + if (newPassword != null && confirmNewPassword != null && currentPassword != null) { + if (!newPassword.isEmpty() && !confirmNewPassword.isEmpty() && !currentPassword.isEmpty()) { + if (newPassword.equals(confirmNewPassword)) { + currentPassword = StringUtil.encodeMD5(currentPassword); + if (currentPassword.equals(newUser.getPassword())) { + String md5 = StringUtil.encodeMD5(newPassword); + newUser.setPassword(md5); + sendMail(newUser.getEmail(), newPassword); + } + } + } } proxy.store(newUser); + session.setAttribute("user", newUser); preference = proxy.restore(Preference.class, newUser.getWikittyId()); request.setAttribute("preference", preference); Modified: trunk/src/main/webapp/preferences.jsp =================================================================== --- trunk/src/main/webapp/preferences.jsp 2010-06-22 17:58:20 UTC (rev 77) +++ trunk/src/main/webapp/preferences.jsp 2010-06-25 15:58:46 UTC (rev 78) @@ -49,9 +49,12 @@ <h1>User Informations</h1> <p>Email :</p> <input type="text" name="email" value="<%=user.getEmail()%>"/> - <p>Password :</p> - <input type=password name="password"/> - + <p>Current password :</p> + <input type=password name="currentPassword"/> + <p>New password :</p> + <input type=password name="newPassword"/> + <p>Confirm new password</p> + <input type=password name="confirmNewPassword"/> <br/> <h1>Site look</h1>

1 0

r77 - trunk/src/main/webapp/WEB-INF
by fdesbois＠users.chorem.org 22 Jun '10

22 Jun '10

Author: fdesbois Date: 2010-06-22 19:58:20 +0200 (Tue, 22 Jun 2010) New Revision: 77 Url: http://chorem.org/repositories/revision/bow/77 Log: Test JAK for KML files Modified: trunk/src/main/webapp/WEB-INF/web.xml Modified: trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/src/main/webapp/WEB-INF/web.xml 2010-06-22 09:10:23 UTC (rev 76) +++ trunk/src/main/webapp/WEB-INF/web.xml 2010-06-22 17:58:20 UTC (rev 77) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http:/java.sun.com/dtd/web-app_2_3.dtd"> +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http:/java.sun.com/dtd/web-app_2_3.dtd">  @@ -13,9 +15,9 @@ <servlet-name>Alias</servlet-name> </servlet> - <welcome-file-list> + <welcome-file-list> <welcome-file>bow</welcome-file> - </welcome-file-list> + </welcome-file-list> <listener> <listener-class>org.chorem.bow.ControllerServlet</listener-class>

1 0

r76 - in trunk/src/main: java/org/chorem/bow webapp webapp/css
by bbrossaud＠users.chorem.org 22 Jun '10

22 Jun '10

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>

1 0

r75 - in trunk/src/main: java/org/chorem/bow xmi
by bbrossaud＠users.chorem.org 21 Jun '10

21 Jun '10

Author: bbrossaud Date: 2010-06-21 18:22:07 +0200 (Mon, 21 Jun 2010) New Revision: 75 Url: http://chorem.org/repositories/revision/bow/75 Log: addition user migration and removed bug, mail is send after registeration and when the user informations are changed Added: trunk/src/main/java/org/chorem/bow/UserMigration.java Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/xmi/bow.zargo Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-21 13:48:25 UTC (rev 74) +++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-06-21 16:22:07 UTC (rev 75) @@ -14,12 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ - package org.chorem.bow; - +import java.util.Arrays; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyExtensionMigration; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceCached; @@ -39,20 +41,27 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(BowProxy.class); - static protected BowProxy instance; synchronized static public BowProxy getInstance() { if (instance == null) { BowConfig config = BowConfig.getInstance(); instance = new BowProxy(config); + WikittyExtensionMigration.migrationRegistry.put(User.EXT_USER, new UserMigration()); } return instance; } protected BowProxy(BowConfig config) { + List<WikittyExtension> extensions = Arrays.asList( + UserImpl.extensionUser, + PreferenceImpl.extensionPreference, + BookmarkImpl.extensionBookmark, + TokenImpl.extensionToken); WikittyService ws = new WikittyServiceJDBC(config.getFlatOptions()); ws = new WikittyServiceCached(ws); + String token = super.getSecurityToken(); + ws.storeExtension(token, extensions); setWikittyService(ws); } } Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-21 13:48:25 UTC (rev 74) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-21 16:22:07 UTC (rev 75) @@ -136,8 +136,7 @@ if (log.isDebugEnabled()) { log.debug("Going to actionSendPassword"); } - this.actionSendPassword(request); - request.getRequestDispatcher("login.jsp").forward(request, response); + this.actionSendPassword(request, response); } else if (action.equals("modifyBookmark") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionModif"); @@ -663,18 +662,18 @@ * @description check if the registration is correct or not */ protected void actionRegister(HttpServletRequest request, HttpServletResponse response, HttpSession session) - throws IOException, ServletException, NoSuchAlgorithmException { + throws IOException, ServletException, NoSuchAlgorithmException, AddressException, MessagingException { String email = request.getParameter("email"); String password = request.getParameter("password"); - password = StringUtil.encodeMD5(password); - if (this.checkRegister(email, password)) { // check if all is well + String md5 = StringUtil.encodeMD5(password); + if (this.checkRegister(email, md5)) { // check if all is well String error = "Email and password must be correctly filled"; request.setAttribute("msgError", error); request.getRequestDispatcher("register.jsp").forward(request, response); } else { WikittyProxy proxy = BowProxy.getInstance(); UserImpl newUser = new UserImpl(); - newUser.setPassword(password); + newUser.setPassword(md5); newUser.setEmail(email); User login = proxy.store((User) newUser); // store the new user if (login == null) { @@ -685,6 +684,7 @@ session.setAttribute("preference", preference); initializeToken(session, login); actionHome(request, login); + sendMail(email, password); request.getRequestDispatcher("main.jsp").forward(request, response); } } @@ -981,18 +981,10 @@ } private void actionChangePreferences(HttpServletRequest request, HttpSession session, User user) - throws NoSuchAlgorithmException { + throws NoSuchAlgorithmException, AddressException, MessagingException { + WikittyProxy proxy = BowProxy.getInstance(); String email = request.getParameter("email"); String password = request.getParameter("password"); - if (email != null && !email.isEmpty()) { - user.setEmail(email); - } - if (password != null && !password.isEmpty()) { - password = StringUtil.encodeMD5(password); - user.setPassword(password); - } - - WikittyProxy proxy = BowProxy.getInstance(); Preference preference = (Preference) session.getAttribute("preference"); String colors = request.getParameter("colors"); preference.setColors(colors); @@ -1006,6 +998,18 @@ preference.setSearchEngineUrlResults(searchEngineResults); proxy.store(preference); + User newUser = proxy.restore(User.class, user.getWikittyId()); + if (email != null && !email.isEmpty()) { + newUser.setEmail(email); + } + if (password != null && !password.isEmpty()) { + String md5 = StringUtil.encodeMD5(password); + newUser.setPassword(md5); + sendMail(newUser.getEmail(), password); + } + proxy.store(newUser); + session.setAttribute("user", newUser); + preference = proxy.restore(Preference.class, newUser.getWikittyId()); request.setAttribute("preference", preference); } @@ -1033,7 +1037,8 @@ msg.setSubject(messageSubject); String messageBody = "Hi,\n\n"; - messageBody += "Here is your new password: " + password + "\n"; + messageBody += "Your new password: " + password + "\n"; + messageBody += "Your email: " + email + "\n\n"; msg.setContent(messageBody, "text/plain"); Transport.send(msg); @@ -1049,8 +1054,8 @@ return false; } - protected void actionSendPassword(HttpServletRequest request) - throws NoSuchAlgorithmException, AddressException, MessagingException { + protected void actionSendPassword(HttpServletRequest request, HttpServletResponse response) + throws NoSuchAlgorithmException, AddressException, MessagingException, ServletException, IOException { String email = request.getParameter("email"); if (email != null) { WikittyProxy proxy = BowProxy.getInstance(); @@ -1068,6 +1073,10 @@ sendMail(email, password); user.setPassword(md5); proxy.store(user); + request.getRequestDispatcher("login.jsp").forward(request, response); + } else { + request.setAttribute("error", "This email doesn't exist..."); + request.getRequestDispatcher("forgotPassword.jsp").forward(request, response); } } } Added: trunk/src/main/java/org/chorem/bow/UserMigration.java =================================================================== --- trunk/src/main/java/org/chorem/bow/UserMigration.java (rev 0) +++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-06-21 16:22:07 UTC (rev 75) @@ -0,0 +1,45 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.chorem.bow; + +import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; +import java.util.Collection; +import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyExtensionMigration; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyTransaction; + +/** + * + * @author sherkhan + */ +public class UserMigration implements WikittyExtensionMigration { + + @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(); + 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.setField(extensionName, "password", password); + return newWikitty; + } +} Modified: trunk/src/main/xmi/bow.zargo =================================================================== (Binary files differ)

1 0

r74 - in trunk: . src/main/java/org/chorem/bow src/main/resources src/main/webapp src/main/webapp/css src/main/xmi
by bbrossaud＠users.chorem.org 21 Jun '10

21 Jun '10

Author: bbrossaud Date: 2010-06-21 15:48:25 +0200 (Mon, 21 Jun 2010) New Revision: 74 Url: http://chorem.org/repositories/revision/bow/74 Log: addition the new design part (date) and send new password by mail Added: trunk/src/main/webapp/forgotPassword.jsp Modified: trunk/pom.xml trunk/src/main/java/org/chorem/bow/BowConfig.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/resources/bow.properties trunk/src/main/webapp/bookmark.jsp trunk/src/main/webapp/css/bookmark.css trunk/src/main/webapp/css/connexion.css trunk/src/main/webapp/login.jsp trunk/src/main/webapp/register.jsp trunk/src/main/xmi/bow.zargo Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/pom.xml 2010-06-21 13:48:25 UTC (rev 74) @@ -20,6 +20,12 @@ <dependencies> <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.3</version> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-06-21 13:48:25 UTC (rev 74) @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ - package org.chorem.bow; import static org.nuiton.i18n.I18n._; @@ -37,7 +36,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(BowConfig.class); - /** Singleton instance. */ protected static BowConfig instance = null; @@ -89,6 +87,24 @@ } /** + * Get bow smtp server as string. + * + * @return smtpServer + */ + public String getSmtpServer() { + return getOption(Option.BOW_SMTPSERVER.key); + } + + /** + * Get bow address from as string. + * + * @return addressFrom + */ + public String getAddressFrom() { + return getOption(Option.BOW_ADDRESSFROM.key); + } + + /** * Set {@code solr} and {@code jms} system configuration. * * This is the "only" way to configure embedded solr. @@ -111,14 +127,17 @@ public static enum Option { CONFIG_FILE(CONFIG_FILE_NAME, _("bow.config.configFileName.description"), - "bow.properties", String.class, false, false), + "bow.properties", String.class, false, false), APPLICATION_VERSION("application.version", _("bow.config.application.version.description"), - null, String.class, true, true), + null, String.class, true, true), BOW_URL("bow.url", _("bow.config.bow.url.description"), - null, String.class, false, false), + null, String.class, false, false), + BOW_SMTPSERVER("bow.smtpServer", _("bow.config.bow.smtpServer.description"), + null, String.class, false, false), + BOW_ADDRESSFROM("bow.addressFrom", _("bow.config.bow.addressFrom.description"), + null, String.class, false, false), DATA_DIR("solr.data.dir", _("bow.config.data.dir.description"), - System.getProperty("user.home") + "/.bow/solr", String.class, false, false); - + System.getProperty("user.home") + "/.bow/solr", String.class, false, false); public final String key; public final String description; public final String defaultValue; @@ -136,5 +155,4 @@ this.isTransient = isTransient; } } - } Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-06-21 13:48:25 UTC (rev 74) @@ -14,6 +14,14 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; +import java.util.Properties; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; @@ -24,6 +32,7 @@ import org.apache.commons.fileupload.FileUploadException; import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.htmlparser.Node; @@ -97,6 +106,11 @@ log.debug("Going to Register"); } request.getRequestDispatcher("register.jsp").forward(request, response); + } else if (action.equals("forgotPassword")) { + if (log.isDebugEnabled()) { + log.debug("Going to forgotPassword"); + } + request.getRequestDispatcher("forgotPassword.jsp").forward(request, response); } else if (action.equals("login")) { if (log.isDebugEnabled()) { log.debug("Going to actionLogin"); @@ -118,6 +132,12 @@ log.debug("Going to actionAddUrl"); } this.actionAddUrl(request, response, user); + } else if (action.equals("sendPassword")) { + if (log.isDebugEnabled()) { + log.debug("Going to actionSendPassword"); + } + this.actionSendPassword(request); + request.getRequestDispatcher("login.jsp").forward(request, response); } else if (action.equals("modifyBookmark") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionModif"); @@ -988,4 +1008,67 @@ proxy.store(preference); request.setAttribute("preference", preference); } + + protected void sendMail(String email, String password) + throws AddressException, MessagingException { + + BowConfig config = BowConfig.getInstance(); + String smtpServer = config.getSmtpServer(); + Properties properties = new Properties(); + properties.put("mail.smtp.host", smtpServer); + + Session session = Session.getDefaultInstance(properties, null); + session.setDebug(true); + + Message msg = new MimeMessage(session); + + InternetAddress toAddress = new InternetAddress(email); + msg.addRecipient(Message.RecipientType.TO, toAddress); + + String addressFrom = config.getAddressFrom(); + InternetAddress fromAddress = new InternetAddress(addressFrom); + msg.setFrom(fromAddress); + + String messageSubject = "[Bow] New Password"; + msg.setSubject(messageSubject); + + String messageBody = "Hi,\n\n"; + messageBody += "Here is your new password: " + password + "\n"; + msg.setContent(messageBody, "text/plain"); + + Transport.send(msg); + } + + protected boolean passwordExists(String password) { + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = Search.query().eq(User.FQ_FIELD_PASSWORD, password).criteria(); + List<User> users = proxy.findAllByCriteria(User.class, criteria).getAll(); + if (users != null && users.size() > 0) { + return true; + } + return false; + } + + protected void actionSendPassword(HttpServletRequest request) + throws NoSuchAlgorithmException, AddressException, MessagingException { + String email = request.getParameter("email"); + if (email != null) { + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = Search.query().eq(User.FQ_FIELD_EMAIL, email).criteria(); + User user = proxy.findByCriteria(User.class, criteria); + if (user != null) { + boolean bool = true; + String password = ""; + String md5 = ""; + while (bool) { + password = RandomStringUtils.randomAlphanumeric(20); + md5 = StringUtil.encodeMD5(password); + bool = passwordExists(md5); + } + sendMail(email, password); + user.setPassword(md5); + proxy.store(user); + } + } + } } Modified: trunk/src/main/resources/bow.properties =================================================================== --- trunk/src/main/resources/bow.properties 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/src/main/resources/bow.properties 2010-06-21 13:48:25 UTC (rev 74) @@ -1,2 +1,4 @@ application.version=${project.version} bow.url=http://localhost:8080/bow/ +bow.smtpServer=smtp +bow.addressFrom=bow(a)chorem.org Modified: trunk/src/main/webapp/bookmark.jsp =================================================================== --- trunk/src/main/webapp/bookmark.jsp 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/src/main/webapp/bookmark.jsp 2010-06-21 13:48:25 UTC (rev 74) @@ -26,11 +26,10 @@ <div class="bookmark"> <div class="bookmarkhead clearfix"> - <img src="./img/ptit-livre.jpg" alt="web site logo" /> - <a href="<%=url + bookmark.getAlias()%>" title="<%=url + bookmark.getAlias()%>" target="_blank"> + <a class="alias" href="<%=url + bookmark.getAlias()%>" title="<%=url + bookmark.getAlias()%>" target="_blank"> <%=bookmark.getAlias()%> </a> - <span> (<%=sdf.format(bookmark.getDate())%>)</span> + <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p> <a class="edit" href="bow?action=editBookmark&bookmarkId=<%=bookmark.getWikittyId()%><%=search%>" onclick="return modify('<%=bookmark.getDescription()%>', '<%=bookmark.getAlias()%>', '<%=BookmarkActions.getBookmarkTagsString(bookmark)%>', '<%=link%>', 'bow?action=modifyBookmark&bookmarkId=<%=bookmark.getWikittyId()%><%=search%>', '<%=bookmark.getWikittyId()%>');"></a> <a class="supprim" href="bow?action=removeBookmark&bookmarkId=<%=bookmark.getWikittyId()%><%=search%>"></a> </div> Modified: trunk/src/main/webapp/css/bookmark.css =================================================================== --- trunk/src/main/webapp/css/bookmark.css 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/src/main/webapp/css/bookmark.css 2010-06-21 13:48:25 UTC (rev 74) @@ -217,7 +217,7 @@ #colonneD .colonnebas{ background:url(/bow/img/piedmenu.jpg) no-repeat; - height:817px; + height:82px; } .bookmark{ @@ -231,12 +231,21 @@ background-color:#bf8a9c; padding:0 20px; position:relative; + clear:both; } +.bookmark .bookmarkhead .date{ + color:#fff; + font-size:10px; + float:left; + margin-top:10px; +} + .bookmark .bookmarkhead a.edit{ background:url(/bow/img/edit.jpg) no-repeat; height:32px; position:absolute; + float: right; top:0; right:32px; border:none; @@ -247,6 +256,7 @@ background:url(/bow/img/croix.jpg) no-repeat; height:32px; position:absolute; + float: right; top:0; right:0; border:none; @@ -263,6 +273,13 @@ text-decoration:none; } +.bookmark .bookmarkhead .alias { + float:left; + margin-right:15px; + display:block; + background:url(/bow/img/ptit-livre.jpg) no-repeat; +} + .bookmark .bookmarkcontenu{ position:relative; } Modified: trunk/src/main/webapp/css/connexion.css =================================================================== --- trunk/src/main/webapp/css/connexion.css 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/src/main/webapp/css/connexion.css 2010-06-21 13:48:25 UTC (rev 74) @@ -1,125 +1,135 @@ @charset "utf-8"; /* CSS Document */ *{ -padding:0; -margin:0; + padding:0; + margin:0; } .clearfix {height:1%} .clearfix:after { - content:"."; + content:"."; - height:0; + height:0; - line-height:0; + line-height:0; - display:block; + display:block; - visibility:hidden; + visibility:hidden; - clear:both; + clear:both; } body{ -font-size:10px; -font-family:Verdana, Arial, Helvetica, sans-serif; + font-size:10px; + font-family:Verdana, Arial, Helvetica, sans-serif; } #headback{ -background:#FFFFFF url(/bow/img/fondhead.jpg) repeat-x; -width:auto; -height:100px; + background:#FFFFFF url(/bow/img/fondhead.jpg) repeat-x; + width:auto; + height:100px; } #head{ -clear:both; -width:1004px; -height:100px; -margin:0 auto; -position:relative; + clear:both; + width:1004px; + height:100px; + margin:0 auto; + position:relative; } #headleft{ -width:740px; -float:left; -height:100px; + width:740px; + float:left; + height:100px; } #headleft a.logo{ -background:url(/bow/img/logobow.jpg); -width:290px; -height:100px; -text-indent:-99999px; -display:block; + background:url(/bow/img/logobow.jpg); + width:290px; + height:100px; + text-indent:-99999px; + display:block; } #mainbodyback{ -background-color:#9edcf8; -min-height:100px; + background-color:#9edcf8; + min-height:100px; } #mainbody{ -width:1004px; -margin:0 auto; -position:relative; -clear:both; + width:1004px; + margin:0 auto; + position:relative; + clear:both; } #content{ -width:1004px; -position:relative; -margin:0 auto; -padding-top:20px; + width:1004px; + position:relative; + margin:0 auto; + padding-top:20px; } #contenu{ -width:225px; -height:315px; -background:url(/bow/img/fondconnexion.jpg) no-repeat; -position:relative; -margin:100px auto; -padding:10px 70px; + width:225px; + height:315px; + background:url(/bow/img/fondconnexion.jpg) no-repeat; + position:relative; + margin:100px auto; + padding:10px 70px; } #contenu h1{ -color:#804561; -width:60px; -position:relative; -margin:20px auto; + color:#804561; + width:225px; + position:relative; + margin:20px auto; } #contenu form p{ -color:#804561; -font-size:16px; -font-weight:bold; -padding:15px 0; + color:#804561; + font-size:16px; + font-weight:bold; + padding:15px 0; } #contenu form input{ -width:225px; + width:225px; } -#contenu form button{ -float:right; -margin-top:20px; -background:url(/bow/img/fdboutonV.jpg) repeat-x; -height:31px; -line-height:31px; -width:60px; -color:#FFFFFF; -font-weight:bold; -border:none; +#contenu form button { + float:right; + margin-top:20px; + background:url(/bow/img/fdboutonV.jpg) repeat-x; + height:31px; + line-height:31px; + color:#FFFFFF; + font-weight:bold; + border:none; } -#contenu a{ -color:#804561; -position:absolute; -bottom:50px; -left:70px; -font-size:14px; -font-weight:bold; + +#contenu .register{ + color:#804561; + position:absolute; + bottom:50px; + left:75px; + font-size:14px; + font-weight:bold; } + +#contenu .forgot{ + color:#804561; + position:absolute; + bottom:100px; + left:75px; + font-size:9px; + font-weight:bold; +} + #footer{ -background-color:#804561; -height:50px; -width:auto; + background-color:#804561; + height:50px; + width:auto; } #footer p{ -color:#bf8a9c; -font-size:14px; -text-align:center; -line-height:50px; + color:#bf8a9c; + font-size:14px; + text-align:center; + line-height:50px; } \ No newline at end of file Added: trunk/src/main/webapp/forgotPassword.jsp =================================================================== --- trunk/src/main/webapp/forgotPassword.jsp (rev 0) +++ trunk/src/main/webapp/forgotPassword.jsp 2010-06-21 13:48:25 UTC (rev 74) @@ -0,0 +1,50 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<% + String error = (String) request.getAttribute("msgError"); + String url = (String) request.getAttribute("bowUrl"); + String version = (String) request.getAttribute("version"); +%> + +<html> + <head> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="Bookmark On the Web" /> + <title>Bow</title> + <link rel="stylesheet" type="text/css" href="./css/connexion.css" /> + </head> + <body> + <div id="headback"> + <div id="head"> + <div id="headleft"> + <a class="logo" href="bow">bow</a> + </div> + </div> + </div> + <div id="mainbodyback"> + <div id="mainbody"> + + <div id="content"> + + <div id="contenu"> + <h1>Forgot Your Password?</h1> + <form method="POST" action="bow?action=sendPassword"> + <p>Email :</p> + <input type="text" name="email" /> + <button>Submit</button> + </form> + <a href="bow" class="register">Login page</a> + </div> + <br /> + <%if (error != null) {%> + <font color="red"><%=error%></font> + <%}%> + </div> + + </div> + <jsp:include page="footer.jsp" flush="true" > + <jsp:param name="bowUrl" value="<%=url%>" /> + <jsp:param name="version" value="<%=version%>" /> + </jsp:include> + </div> + </body> +</html> \ No newline at end of file Modified: trunk/src/main/webapp/login.jsp =================================================================== --- trunk/src/main/webapp/login.jsp 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/src/main/webapp/login.jsp 2010-06-21 13:48:25 UTC (rev 74) @@ -34,7 +34,8 @@ <input type=password name="password" /> <button type="submit">Login</button> </form> - <a href="bow?action=registration">Register</a> + <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) {%> Modified: trunk/src/main/webapp/register.jsp =================================================================== --- trunk/src/main/webapp/register.jsp 2010-06-14 14:15:40 UTC (rev 73) +++ trunk/src/main/webapp/register.jsp 2010-06-21 13:48:25 UTC (rev 74) @@ -34,7 +34,7 @@ <input type=password name="password" /> <button>Register</button> </form> - <a href="bow">Return to the login page</a> + <a href="bow" class="register">Login page</a> </div> <br /> <%if (error != null) {%> Modified: trunk/src/main/xmi/bow.zargo =================================================================== (Binary files differ)

1 0