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

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

15 Jul '10

Author: bbrossaud Date: 2010-07-15 17:58:03 +0200 (Thu, 15 Jul 2010) New Revision: 86 Url: http://chorem.org/repositories/revision/bow/86 Log: addition header for the java class Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java trunk/src/main/java/org/chorem/bow/BookmarkActions.java trunk/src/main/java/org/chorem/bow/BowConfig.java trunk/src/main/java/org/chorem/bow/BowProxy.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/java/org/chorem/bow/OpenSearchActions.java trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java trunk/src/main/java/org/chorem/bow/TokenActions.java trunk/src/main/java/org/chorem/bow/UserMigration.java Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bow; Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bow; Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,8 +1,14 @@ -/* *##% - * Copyright (c) 2010 poussin. All rights reserved. +/* + * #%L + * bow * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * @@ -11,9 +17,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - *##%*/ + * #L% + */ package org.chorem.bow; import static org.nuiton.i18n.I18n._; Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,8 +1,14 @@ -/* *##% - * Copyright (c) 2010 poussin. All rights reserved. +/* + * #%L + * bow * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * @@ -11,9 +17,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - *##%*/ + * #L% + */ package org.chorem.bow; import java.util.Arrays; Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bow; Modified: trunk/src/main/java/org/chorem/bow/OpenSearchActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/OpenSearchActions.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bow; Modified: trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java =================================================================== --- trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bow; Modified: trunk/src/main/java/org/chorem/bow/TokenActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/TokenActions.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/TokenActions.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,6 +1,25 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% */ package org.chorem.bow; Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java =================================================================== --- trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-07-15 15:36:42 UTC (rev 85) +++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-07-15 15:58:03 UTC (rev 86) @@ -1,3 +1,26 @@ +/* + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.bow; import java.security.NoSuchAlgorithmException;

1 0

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

15 Jul '10

Author: bbrossaud Date: 2010-07-15 17:36:42 +0200 (Thu, 15 Jul 2010) New Revision: 85 Url: http://chorem.org/repositories/revision/bow/85 Log: addition admin page and fullText use wikitty engine Added: trunk/src/main/webapp/admin.jsp Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java trunk/src/main/java/org/chorem/bow/BowProxy.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/java/org/chorem/bow/UserMigration.java trunk/src/main/resources/bow.properties trunk/src/main/webapp/bookmarkHome.jsp trunk/src/main/webapp/bookmarkSearch.jsp Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-15 09:14:24 UTC (rev 84) +++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-15 15:36:42 UTC (rev 85) @@ -19,10 +19,13 @@ import static org.nuiton.i18n.I18n._; import java.io.File; +import java.util.ArrayList; +import java.util.List; import org.apache.commons.lang.UnhandledException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.StringUtil; /** * @@ -104,6 +107,11 @@ return getOption(Option.BOW_ADDRESSFROM.key); } + public String[] getAdmins() { + String str = getOption(Option.BOW_ADMINS.key); + return StringUtil.split(str, ","); + } + /** * Set {@code solr} and {@code jms} system configuration. * @@ -136,6 +144,8 @@ null, String.class, false, false), BOW_ADDRESSFROM("bow.addressFrom", _("bow.config.bow.addressFrom.description"), null, String.class, false, false), + BOW_ADMINS("bow.admins", _("bow.config.bow.admins.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); public final String key; Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-07-15 09:14:24 UTC (rev 84) +++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2010-07-15 15:36:42 UTC (rev 85) @@ -25,7 +25,6 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceCached; -import org.nuiton.wikitty.WikittyServiceNotifier; import org.nuiton.wikitty.jdbc.WikittyServiceJDBC; /** @@ -47,6 +46,9 @@ if (instance == null) { BowConfig config = BowConfig.getInstance(); instance = new BowProxy(config); + /* + * Fixe me when wikitty will integrate this function + */ WikittyExtensionMigration.migrationRegistry.put(User.EXT_USER, new UserMigration()); } return instance; Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-15 09:14:24 UTC (rev 84) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-15 15:36:42 UTC (rev 85) @@ -227,12 +227,23 @@ log.debug("Going to actionPreferences"); } request.getRequestDispatcher("preferences.jsp").forward(request, response); + } else if (action.equals("admin") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionAdmin"); + } + request.getRequestDispatcher("admin.jsp").forward(request, response); } else if (action.equals("changePreferences") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionChangePreferences"); } this.actionChangePreferences(request, session, user); request.getRequestDispatcher("preferences.jsp").forward(request, response); + } else if (action.equals("reIndexation") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionReIndexation"); + } + this.actionReIndexation(request, session, user); + request.getRequestDispatcher("admin.jsp").forward(request, response); } else { if (user != null) { request.getRequestDispatcher("error.jsp").forward(request, response); @@ -643,9 +654,7 @@ if (bookList != null) { bookmarkActions.setBookmarks(bookList); } - if (fullText != null && !fullText.isEmpty()) { - bookmarkActions.fullText(fullText); - } else { + if (fullText == null || fullText.isEmpty()) { if (searchLine != null && searchLine.isEmpty()) { bookmarkActions.emptySearchline(); } else { @@ -686,6 +695,7 @@ session.setAttribute("preference", preference); initializeToken(session, login); actionHome(request, login); + checkAdmin(email, session); sendMail(email, password); request.getRequestDispatcher("main.jsp").forward(request, response); } @@ -710,6 +720,7 @@ Preference preference = proxy.restore(Preference.class, login.getWikittyId()); session.setAttribute("preference", preference); initializeToken(session, login); + checkAdmin(email, session); actionHome(request, login); request.getRequestDispatcher("main.jsp").forward(request, response); @@ -720,6 +731,19 @@ } } + protected void checkAdmin(String login, HttpSession session) { + String[] admins = BowConfig.getInstance().getAdmins(); + if (admins != null) { + for (int count = 0; count < admins.length; ++count) { + if (login.equals(admins[count])) { + session.setAttribute("admin", true); + return; + } + } + } + session.setAttribute("admin", false); + } + /* @param session HttpSession session * @throws ServletException if a servlet error occurs * @description retrieve tokens or create there if the user are just @@ -936,8 +960,17 @@ * @description retrieve bookmark for the full text research */ protected void actionFullText(HttpServletRequest request, User user) { + String fullText = request.getParameter("fullTextLine"); WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = getBookmarkListCriteriaByUser(user, null); + Criteria criteria = null; + if (fullText != null && !fullText.isEmpty()) { + criteria = Search.query().keyword(fullText). + eq(Bookmark.FQ_FIELD_EMAIL, user.getEmail()).criteria(). + addFacetField(Bookmark.FQ_FIELD_TAGS); + + } else { + criteria = getBookmarkListCriteriaByUser(user, null); + } PagedResult result = proxy.findAllByCriteria(Bookmark.class, criteria); BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); request.setAttribute("bookmarkActions", bookmarkActions); @@ -1102,4 +1135,9 @@ request.getRequestDispatcher("forgotPassword.jsp").forward(request, response); } } + + private void actionReIndexation(HttpServletRequest request, HttpSession session, User user) { + WikittyProxy proxy = BowProxy.getInstance(); + proxy.getWikittyService().syncEngin(proxy.getSecurityToken()); + } } Modified: trunk/src/main/java/org/chorem/bow/UserMigration.java =================================================================== --- trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-07-15 09:14:24 UTC (rev 84) +++ trunk/src/main/java/org/chorem/bow/UserMigration.java 2010-07-15 15:36:42 UTC (rev 85) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.chorem.bow; import java.security.NoSuchAlgorithmException; Modified: trunk/src/main/resources/bow.properties =================================================================== --- trunk/src/main/resources/bow.properties 2010-07-15 09:14:24 UTC (rev 84) +++ trunk/src/main/resources/bow.properties 2010-07-15 15:36:42 UTC (rev 85) @@ -2,3 +2,4 @@ bow.url=http://localhost:8080/bow/ bow.smtpServer=smtp bow.addressFrom=bow(a)chorem.org +bow.admins=brossa_b(a)epitech.net Added: trunk/src/main/webapp/admin.jsp =================================================================== --- trunk/src/main/webapp/admin.jsp (rev 0) +++ trunk/src/main/webapp/admin.jsp 2010-07-15 15:36:42 UTC (rev 85) @@ -0,0 +1,61 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> + +<%@page import="org.chorem.bow.Preference" %> +<%@page import="org.chorem.bow.User" %> + +<% + User user = (User) session.getAttribute("user"); + Preference preference = (Preference) session.getAttribute("preference"); + if (user != null && preference != null) { + String url = (String) request.getAttribute("bowUrl"); + String version = (String) request.getAttribute("version"); + String check = preference.getColors(); + if (check == null) { + preference.setColors(""); + } + check = preference.getSearchEngineUrlResults(); + if (check == null) { + preference.setSearchEngineUrlResults(""); + } + check = preference.getSearchEngineUrlSuggestions(); + if (check == null) { + preference.setSearchEngineUrlSuggestions(""); + } +%> + +<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"> + <br /><br /> + <a href="bow?action=reIndexation">All data re-indexation</a> + <br /><br /> + <a href="bow?action=home">Return to the home page</a> + <br /><br /> + </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> +<%}%> Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-07-15 09:14:24 UTC (rev 84) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-07-15 15:36:42 UTC (rev 85) @@ -14,6 +14,10 @@ <% TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); + Boolean admin = (Boolean) session.getAttribute("admin"); + if (admin == null) { + admin = false; + } if (tokenActions != null && bookmarkActions != null) { String temporaryToken = tokenActions.getTemporaryToken(); String permanentToken = tokenActions.getPermanentToken(); @@ -126,9 +130,12 @@ </div> <div id="colonneD"> <ul class="droite"> + <%if (admin == true) {%> + <li><a href="bow?action=admin">Admin</a></li> + <%}%> <li><a href="bow?action=preferences">Preferences</a></li> - <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Temporary token</a></li> - <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Current permanent token</a></li> + <li><a title="Add this link to your favourites to bookmark others in the future. This link is just available while you are connected on the site!" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Temporary bookmark addition link</a></li> + <li><a title="Add this link to your favourites to bookmark others in the future. This link is always available!" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Permanent bookmark addition link</a></li> </ul> <div id="nuage"> <jsp:include page="tagsCloud.jsp" flush="true" /> Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-15 09:14:24 UTC (rev 84) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-15 15:36:42 UTC (rev 85) @@ -14,6 +14,10 @@ <% TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); + Boolean admin = (Boolean) session.getAttribute("admin"); + if (admin == null) { + admin = false; + } if (tokenActions != null && bookmarkActions != null) { String temporaryToken = tokenActions.getTemporaryToken(); String permanentToken = tokenActions.getPermanentToken(); @@ -108,9 +112,12 @@ <div id="colonneD"> <ul class="droite"> + <%if (admin == true) {%> + <li><a href="bow?action=admin">Admin</a></li> + <%}%> <li><a href="bow?action=preferences">Preferences</a></li> - <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> - <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> + <li><a title="Add this link to your favourites to bookmark others in the future. This link is just available while you are connected on the site!" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary bookmark addition link</a></li> + <li><a title="Add this link to your favourites to bookmark others in the future. This link is always available!" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Permanent bookmark addition link</a></li> </ul> <div id="nuage"> <jsp:include page="tagsCloud.jsp" flush="true">

1 0

r84 - 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 11:14:24 +0200 (Thu, 15 Jul 2010) New Revision: 84 Url: http://chorem.org/repositories/revision/bow/84 Log: moved regenerate token in preferences page Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/bookmarkHome.jsp trunk/src/main/webapp/bookmarkSearch.jsp 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-07-15 08:43:11 UTC (rev 83) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-15 09:14:24 UTC (rev 84) @@ -163,6 +163,7 @@ log.debug("Going to actionGenerateToken"); } this.actionGenerateToken(request, response, user, session); + request.getRequestDispatcher("preferences.jsp").forward(request, response); } else if (action.equals("deleteTag") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionDeleteTag"); @@ -492,7 +493,6 @@ tokenActions.setPermanentToken(""); } } - redirectToTheGoodPage(request, response); } protected void actionModifyBookmark(HttpServletRequest request, HttpServletResponse response, User user) @@ -1025,11 +1025,11 @@ } } } - proxy.store(newUser); + newUser = proxy.store(newUser); + session.setAttribute("user", newUser); - session.setAttribute("user", newUser); preference = proxy.restore(Preference.class, newUser.getWikittyId()); - request.setAttribute("preference", preference); + session.setAttribute("preference", preference); } protected void sendMail(String email, String password) Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-07-15 08:43:11 UTC (rev 83) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-07-15 09:14:24 UTC (rev 84) @@ -129,7 +129,6 @@ <li><a href="bow?action=preferences">Preferences</a></li> <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Temporary token</a></li> <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);">Current permanent token</a></li> - <li><a href="bow?action=generateToken">Regenerate permanent token</a></li> </ul> <div id="nuage"> <jsp:include page="tagsCloud.jsp" flush="true" /> Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-15 08:43:11 UTC (rev 83) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-15 09:14:24 UTC (rev 84) @@ -111,7 +111,6 @@ <li><a href="bow?action=preferences">Preferences</a></li> <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=temporaryToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Temporary token</a></li> <li><a href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');var%20link='<%=url%>bow?action=addUrl&token=<%=permanentToken%>&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);void(0);">Current permanent token</a></li> - <li><a href="bow?action=generateToken&searchLine=<%=searchLine%>&fullTextLine=<%=fullText%>">Regenerate permanent token</a></li> </ul> <div id="nuage"> <jsp:include page="tagsCloud.jsp" flush="true"> Modified: trunk/src/main/webapp/preferences.jsp =================================================================== --- trunk/src/main/webapp/preferences.jsp 2010-07-15 08:43:11 UTC (rev 83) +++ trunk/src/main/webapp/preferences.jsp 2010-07-15 09:14:24 UTC (rev 84) @@ -55,8 +55,11 @@ <input type=password name="newPassword"/> <p>Confirm new password</p> <input type=password name="confirmNewPassword"/> - <br/> + <br/> <br /> + <a href="bow?action=generateToken">Regenerate permanent token</a> + <br /> <br /> + <h1>Site look</h1> <p>Site color</p> <input type="text" name="colors" value="<%=preference.getColors()%>"/>

1 0

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