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

r113 - trunk
by tchemit＠users.chorem.org Oct. 3, 2010

Oct. 3, 2010

Author: tchemit Date: 2010-10-03 17:57:31 +0200 (Sun, 03 Oct 2010) New Revision: 113 Url: http://chorem.org/repositories/revision/bow/113 Log: Update mavenpom4redmine to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:12:22 UTC (rev 112) +++ trunk/pom.xml 2010-10-03 15:57:31 UTC (rev 113) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r112 - trunk
by tchemit＠users.chorem.org Sept. 29, 2010

Sept. 29, 2010

Author: tchemit Date: 2010-09-29 10:12:22 +0200 (Wed, 29 Sep 2010) New Revision: 112 Url: http://chorem.org/repositories/revision/bow/112 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:34:04 UTC (rev 111) +++ trunk/pom.xml 2010-09-29 08:12:22 UTC (rev 112) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <groupId>org.chorem</groupId>

1 0

r111 - trunk
by tchemit＠users.chorem.org Sept. 9, 2010

Sept. 9, 2010

Author: tchemit Date: 2010-09-09 11:34:04 +0200 (Thu, 09 Sep 2010) New Revision: 111 Url: http://chorem.org/repositories/revision/bow/111 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:22:33 UTC (rev 110) +++ trunk/pom.xml 2010-09-09 09:34:04 UTC (rev 111) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <groupId>org.chorem</groupId>

1 0

r110 - trunk
by tchemit＠users.chorem.org Aug. 29, 2010

Aug. 29, 2010

Author: tchemit Date: 2010-08-29 16:22:33 +0200 (Sun, 29 Aug 2010) New Revision: 110 Url: http://chorem.org/repositories/revision/bow/110 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-25 15:49:53 UTC (rev 109) +++ trunk/pom.xml 2010-08-29 14:22:33 UTC (rev 110) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r109 - in trunk/src/site: . rst rst/developper rst/user
by bbrossaud＠users.chorem.org Aug. 25, 2010

Aug. 25, 2010

Author: bbrossaud Date: 2010-08-25 17:49:53 +0200 (Wed, 25 Aug 2010) New Revision: 109 Url: http://chorem.org/repositories/revision/bow/109 Log: addition bow doc Added: trunk/src/site/rst/developper/ trunk/src/site/rst/developper/installation.rst trunk/src/site/rst/developper/presentation.rst trunk/src/site/rst/index.rst trunk/src/site/rst/resources/ trunk/src/site/rst/user/ trunk/src/site/rst/user/alias.rst trunk/src/site/rst/user/importExport.rst trunk/src/site/rst/user/openSearch.rst trunk/src/site/rst/user/search.rst trunk/src/site/rst/user/token.rst Modified: trunk/src/site/site.xml Added: trunk/src/site/rst/developper/installation.rst =================================================================== --- trunk/src/site/rst/developper/installation.rst (rev 0) +++ trunk/src/site/rst/developper/installation.rst 2010-08-25 15:49:53 UTC (rev 109) @@ -0,0 +1,10 @@ +============ +Installation +============ + +Si vous souhaitez installer bow il vous suffit : + +- de télécharger le war à cette adresse : http://maven.chorem.org/release/org/chorem/bow +- de mettre le war dans le dossier webapps de tomcat + +Le dépot des sources est à cette adresse : http://svn.chorem.org/svn/bow/ \ No newline at end of file Added: trunk/src/site/rst/developper/presentation.rst =================================================================== --- trunk/src/site/rst/developper/presentation.rst (rev 0) +++ trunk/src/site/rst/developper/presentation.rst 2010-08-25 15:49:53 UTC (rev 109) @@ -0,0 +1,8 @@ +============ +Presentation +============ + +Bow est une application J2EE. Le modèle de bow utilise wikitty. Wikitty est un +projet CodeLutin qui est un système de stockage et de recherche de type clé/valeur. + +Vous trouverez de plus amples informations à cette adresse : http://maven-site.nuiton.org/wikitty . \ No newline at end of file Added: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst (rev 0) +++ trunk/src/site/rst/index.rst 2010-08-25 15:49:53 UTC (rev 109) @@ -0,0 +1,14 @@ +Bow +=== + +Bow (Bookmark On the Web) est une application web permettant la gestion de ses +marque-pages (bookmarks). + +Cette application vous permettra de consulter vos marque-pages où que vous soyez +et de n'importe quel ordinateur pourvu d'une connexion internet, mais aussi de +pouvoir en ajouter de nouveaux, les modifier ou les supprimer. + +Ce site vous donne accès à la documentation : + +- utilisateur: qui vous décrira chaque caratéristique du programme. +- développeur: qui s'adresse aux personnes désireuses de modifier des fonctionnalités ou d'en ajouter de nouvelles. \ No newline at end of file Added: trunk/src/site/rst/user/alias.rst =================================================================== --- trunk/src/site/rst/user/alias.rst (rev 0) +++ trunk/src/site/rst/user/alias.rst 2010-08-25 15:49:53 UTC (rev 109) @@ -0,0 +1,19 @@ +===================== +Utilisation des alias +===================== + +Il est possible d'associer un alias à un marque-page et d'utiliser l'adresse +de l'alias plutôt que celle d'origine. L'adresses de l'alias est de cette forme: + +nomDuServeur/**alias**/nomAlias + +Cela peut-être utile si vous avez une adresse très longue, l'alias permettra +d'avoir un lien plus court et donc plus lisible. + +- Exemple: + +Nom du serveur: http://demo.chorem.org/bow/ + +Alias: monAlias + +Resultat: http://demo.chorem.org/bow/alias/monAlias \ No newline at end of file Added: trunk/src/site/rst/user/importExport.rst =================================================================== --- trunk/src/site/rst/user/importExport.rst (rev 0) +++ trunk/src/site/rst/user/importExport.rst 2010-08-25 15:49:53 UTC (rev 109) @@ -0,0 +1,19 @@ +===================== +Importion/Exportation +===================== + +Importation +=========== + +Cette fonctionnalité vous permet d'importer des marque-pages depuis votre ordinateur. +Les marque-pages importés auront comme tags les noms des dossiers auquels ils appartenaient. +Le fichier à importer doit-être au format **HTML**. + +Pour importer un fichier il vous suffit de selectionner un fichier contenant vos informations +en cliquant sur "parcourir" puis de cliquer sur "import". + +Exportation +=========== + +Pour exporter vos marque-pages, cliquez sur "Export bookmarks", votre fichier d'exportation +sera au format HTML. Added: trunk/src/site/rst/user/openSearch.rst =================================================================== --- trunk/src/site/rst/user/openSearch.rst (rev 0) +++ trunk/src/site/rst/user/openSearch.rst 2010-08-25 15:49:53 UTC (rev 109) @@ -0,0 +1,13 @@ +========== +OpenSearch +========== + +Il est possible d'utiliser le moteur de recherche de bow dans la barre de recherche +rapide du navigateur. Pour pouvoir l'ajouter il faut se connecter, puis choisir soit +le moteur de recherche permanent ou temporaire. Le temporaire ne dure que le temps +d'expiration de la session. Une fois ajouté vous pouvez l'utiliser à n'importe quel +moment. + +Vous pouvez aussi effectuer une recherche mais cette fois ne pas utiliser le moteur de +recherche de bow mais celui que vous avez défini au préalable. Pour cela préfixé +votre recherche de **":s"**. \ No newline at end of file Added: trunk/src/site/rst/user/search.rst =================================================================== --- trunk/src/site/rst/user/search.rst (rev 0) +++ trunk/src/site/rst/user/search.rst 2010-08-25 15:49:53 UTC (rev 109) @@ -0,0 +1,18 @@ +========= +Recherche +========= + +Il est possible de rechercher des marque-pages de deux façons différentes +comme expliquées ci-dessous. + +- Recherche par tags: + La recherche par tag va rechercher les marque-pages en fonction des tags qu'ils + possèdent. Il est possible de les taper manuellement ou de cliquer sur les tags + du nuage de tags et ainsi d'effectuer une recherche en entonoire. + +- Recherche intégrale: + La recherche intégrale va retourner tous les marque-pages qui possèdent un des + mots clés tapés dans la barre de recherche. + +Ces deux types de recherche retournent, si la recherche est vide, les marque-pages +qui ne possèdent aucun tag. \ No newline at end of file Added: trunk/src/site/rst/user/token.rst =================================================================== --- trunk/src/site/rst/user/token.rst (rev 0) +++ trunk/src/site/rst/user/token.rst 2010-08-25 15:49:53 UTC (rev 109) @@ -0,0 +1,16 @@ +===================== +Ajout de marque-pages +===================== + +Il est possible d'ajouter des marque-pages de deux façons par l'intermédiaire: + +- Du formulaire d'ajout/modification. + +- Des liens d'ajout de marque-pages (session et permanent) : + Ces liens permettent l'ajout de nouveaux marque-pages sans avoir + à se connecter au site. Il suffit d'ajouter ces liens à vos favoris + puis cliquez dessus lorsque vous souhaitez enregistrer une page. Une + fenêtre apparait, complétée là et le tour est joué! + +Il existe deux types de lien, un qui n'est valable que le temps d'expiration de la session +(pratique si vous utilisez temporairement un ordinateur) et l'autre de manière permanente. \ No newline at end of file Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-08-24 08:46:04 UTC (rev 108) +++ trunk/src/site/site.xml 2010-08-25 15:49:53 UTC (rev 109) @@ -5,15 +5,27 @@ <bannerLeft> <name>${project.name}</name> - <href>index.html</href> </bannerLeft> <body> - <menu name="Overview"> - <item name="Accueil" href="index.html"/> - <item name="todo" href="todo.html"/> + + <menu name="Utilisateur" inherit="top"> + <item name="Utilisation de bow"> + <item name="Importation/Exportation" href="user/importExport.html" /> + <item name="Recherche de marque-pages" href="user/search.html" /> + <item name="Ajout de marque-pages" href="user/token.html" /> + <item name="Utilisation des alias" href="user/alias.html" /> + <item name="OpenSearch" href="user/openSearch.html" /> + </item> </menu> + <menu> + <item name="Développeur"> + <item name="Presentation" href="developper/presentation.html" /> + <item name="Installation" href="developper/installation.html" /> + </item> + </menu> + <menu ref="reports"/> </body>

1 0

r108 - in trunk/src/main: java/org/chorem/bow xmi
by bbrossaud＠users.chorem.org Aug. 24, 2010

Aug. 24, 2010

Author: bbrossaud Date: 2010-08-24 10:46:04 +0200 (Tue, 24 Aug 2010) New Revision: 108 Url: http://chorem.org/repositories/revision/bow/108 Log: addition import extension to bookmark and set the import date when an import is done Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/xmi/bow.zargo Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-08-11 14:49:54 UTC (rev 107) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-08-24 08:46:04 UTC (rev 108) @@ -31,6 +31,7 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Properties; import javax.mail.Message; @@ -254,6 +255,12 @@ } this.actionChangePreferences(request, session, user); request.getRequestDispatcher("preferences.jsp").forward(request, response); + } else if (action.equals("deleteImport") && user != null) { + if (log.isDebugEnabled()) { + log.debug("Going to actionDeleteImport"); + } + this.actionDeleteImport(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"); @@ -277,7 +284,12 @@ } - /* @param request servlet request + protected void actionDeleteImport(HttpServletRequest request, + HttpSession session, User user) { + ; + } + + /* @param request servlet request * @param response servlet response * @param user the user * @param token the permanent or temporary token @@ -896,6 +908,23 @@ } } + protected void createImportExtension(List<Bookmark> bookmarks) { + if (bookmarks != null && !bookmarks.isEmpty()) { + WikittyProxy proxy = BowProxy.getInstance(); + List<String> ids = new ArrayList<String>(); + for (Bookmark bookmark : bookmarks) { + String id = bookmark.getWikittyId(); + ids.add(id); + } + Date date = new Date(); + List<Import> imports = proxy.restore(Import.class, ids); + for (Import imp : imports) { + imp.setDate(date); + } + proxy.store(imports); + } + } + /* @param request servlet request * @param response servlet response * @param user User user @@ -923,7 +952,8 @@ NodeList list = parser.parse(null); List<Bookmark> bookmarks = new ArrayList<Bookmark>(); parseHtmlToBookmarks(list, user, bookmarks, new ArrayList<String>()); - proxy.store(bookmarks); + bookmarks = proxy.store(bookmarks); + createImportExtension(bookmarks); } } } Modified: trunk/src/main/xmi/bow.zargo =================================================================== (Binary files differ)

1 0

r107 - trunk
by tchemit＠users.chorem.org Aug. 11, 2010

Aug. 11, 2010

Author: tchemit Date: 2010-08-11 16:49:54 +0200 (Wed, 11 Aug 2010) New Revision: 107 Url: http://chorem.org/repositories/revision/bow/107 Log: Utilisation de mavenpom4redmine 2.2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-28 16:27:02 UTC (rev 106) +++ trunk/pom.xml 2010-08-11 14:49:54 UTC (rev 107) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2.1</version> + <version>2.2.3</version> </parent> <groupId>org.chorem</groupId> @@ -232,5 +232,3 @@ </build> </project> - -

1 0

r106 - trunk/src/main/java/org/chorem/bow
by bbrossaud＠users.chorem.org July 28, 2010

July 28, 2010

Author: bbrossaud Date: 2010-07-28 18:27:02 +0200 (Wed, 28 Jul 2010) New Revision: 106 Url: http://chorem.org/repositories/revision/bow/106 Log: remove bug fulltext Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-28 13:52:36 UTC (rev 105) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-28 16:27:02 UTC (rev 106) @@ -552,10 +552,12 @@ WikittyProxy proxy = BowProxy.getInstance(); Bookmark bookmark = proxy.restore(Bookmark.class, id); if (bookmark != null) { - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); - if (proxy.findByCriteria(Bookmark.class, criteria) != null) { - alias = bookmark.getAlias(); - } + 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.getAlias(); + } + } BookmarkActions.updateBookmark(bookmark, name, link, tags, alias); proxy.store(bookmark); } @@ -660,20 +662,28 @@ protected void actionSearch(HttpServletRequest request, User user) throws IOException, ServletException { String searchLine = request.getParameter("searchLine"); - String tag = request.getParameter("addTag"); - if (tag != null && !tag.isEmpty()) { - if (searchLine == null || searchLine.isEmpty()) { - searchLine = tag; - } else { - searchLine += " " + tag; - } + if (searchLine == null) { + searchLine = ""; } - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); - criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user - BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine); - request.setAttribute("bookmarkActions", bookmarkActions); + String fulltext = request.getParameter("fullTextLine"); + if (fulltext != null && !fulltext.isEmpty() && searchLine.isEmpty()) { + actionFullText(request, user); + } else { + String tag = request.getParameter("addTag"); + if (tag != null && !tag.isEmpty()) { + if (searchLine == null || searchLine.isEmpty()) { + searchLine = tag; + } else { + searchLine += " " + tag; + } + } + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = getBookmarkListCriteriaByUser(user, searchLine); + criteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); + PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); // select all bookmarks by user + BookmarkActions bookmarkActions = createBookmarkActions(request, result, searchLine); + request.setAttribute("bookmarkActions", bookmarkActions); + } } /* @param request servlet request @@ -1012,21 +1022,25 @@ * @throws ServletException if a servlet error occurs * @description retrieve bookmark for the full text research */ - protected void actionFullText(HttpServletRequest request, User user) { + protected void actionFullText(HttpServletRequest request, User user) throws IOException, ServletException { String fullText = request.getParameter("fullTextLine"); - WikittyProxy proxy = BowProxy.getInstance(); - 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); - + if (fullText == null || fullText.isEmpty()) { + actionSearch(request, user); } else { - criteria = getBookmarkListCriteriaByUser(user, null); + WikittyProxy proxy = BowProxy.getInstance(); + 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<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); + BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); + request.setAttribute("bookmarkActions", bookmarkActions); } - PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, criteria); - BookmarkActions bookmarkActions = createBookmarkActions(request, result, null); - request.setAttribute("bookmarkActions", bookmarkActions); } /* @param request servlet request

1 0

r105 - in trunk/src/main: java/org/chorem/bow webapp
by bbrossaud＠users.chorem.org July 28, 2010

July 28, 2010

Author: bbrossaud Date: 2010-07-28 15:52:36 +0200 (Wed, 28 Jul 2010) New Revision: 105 Url: http://chorem.org/repositories/revision/bow/105 Log: addition permanent token to the bow link and bowLink works in preferences and admin Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/webapp/admin.jsp 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-28 09:23:31 UTC (rev 104) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-28 13:52:36 UTC (rev 105) @@ -138,12 +138,11 @@ log.debug("Going to actionLogout"); } this.actionLogout(request, response, session); - } else if (action.equals("home") && user != null) { + } else if (action.equals("home")) { if (log.isDebugEnabled()) { log.debug("Going to actionHome.jsp"); } - this.actionHome(request, user); - request.getRequestDispatcher("main.jsp").forward(request, response); + this.actionHome(request, response, session); } else if (action.equals("addUrl") && user != null) { if (log.isDebugEnabled()) { log.debug("Going to actionAddUrl"); @@ -455,7 +454,7 @@ } String searchLine = request.getParameter("searchLine"); if (searchLine == null) { - actionHome(request, user); + initHomePage(request, user); } else { actionSearch(request, user); } @@ -727,12 +726,8 @@ if (login == null) { request.getRequestDispatcher("error.jsp").forward(request, response); } else { - session.setAttribute("user", login); - Preference preference = proxy.restore(Preference.class, login.getWikittyId()); - session.setAttribute("preference", preference); - initializeToken(session, login); - actionHome(request, login); - checkAdmin(email, session); + initSession(session, login); + initHomePage(request, login); sendMail(email, password); request.getRequestDispatcher("main.jsp").forward(request, response); } @@ -752,13 +747,8 @@ password = StringUtil.encodeMD5(password); User login = this.checkLogin(email, password); // check if the user exists if (login != null) { - WikittyProxy proxy = BowProxy.getInstance(); - session.setAttribute("user", login); - Preference preference = proxy.restore(Preference.class, login.getWikittyId()); - session.setAttribute("preference", preference); - initializeToken(session, login); - checkAdmin(email, session); - actionHome(request, login); + initSession(session, login); + initHomePage(request, login); request.getRequestDispatcher("main.jsp").forward(request, response); } else { @@ -843,13 +833,9 @@ return true; } - /* @param request servlet request - * @param user User user - * @description initialize all for the home page - */ - protected void actionHome(HttpServletRequest request, User user) { - WikittyProxy proxy = BowProxy.getInstance(); - Criteria criteria = getBookmarkListCriteriaByUser(user, null); + protected void initHomePage(HttpServletRequest request, User user) { + WikittyProxy proxy = BowProxy.getInstance(); + Criteria criteria = getBookmarkListCriteriaByUser(user, null); if (criteria != null) { Criteria sortCriteria = criteria.addSortDescending(Bookmark.FQ_FIELD_CLICK); PagedResult<Bookmark> result = proxy.findAllByCriteria(Bookmark.class, sortCriteria); // select all bookmarks by user @@ -868,6 +854,37 @@ request.setAttribute("bookmarkActions", bookmarkActions); } } + + protected void initSession(HttpSession session, User user) throws NoSuchAlgorithmException { + WikittyProxy proxy = BowProxy.getInstance(); + session.setAttribute("user", user); + Preference preference = proxy.restore(Preference.class, user.getWikittyId()); + session.setAttribute("preference", preference); + initializeToken(session, user); + checkAdmin(user.getEmail(), session); + } + + /* @param request servlet request + * @param user User user + * @description initialize all for the home page + */ + protected void actionHome(HttpServletRequest request, HttpServletResponse response, HttpSession session) + throws ServletException, IOException, NoSuchAlgorithmException { + User user = (User) session.getAttribute("user"); + if (user == null) { + String token = request.getParameter("token"); + user = checkPermanentToken(token); + if (user != null) { + initSession(session, user); + } + } + if (user != null) { + initHomePage(request, user); + request.getRequestDispatcher("main.jsp").forward(request, response); + } else { + request.getRequestDispatcher("login.jsp").forward(request, response); + } + } /* @param request servlet request * @param response servlet response Modified: trunk/src/main/webapp/admin.jsp =================================================================== --- trunk/src/main/webapp/admin.jsp 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/webapp/admin.jsp 2010-07-28 13:52:36 UTC (rev 105) @@ -2,13 +2,16 @@ <%@page import="org.chorem.bow.Preference" %> <%@page import="org.chorem.bow.User" %> +<%@page import="org.chorem.bow.TokenActions" %> <% User user = (User) session.getAttribute("user"); Preference preference = (Preference) session.getAttribute("preference"); - if (user != null && preference != null) { + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + if (user != null && preference != null && tokenActions != null) { String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); + String permanentToken = tokenActions.getPermanentToken(); String check = preference.getColors(); if (check == null) { preference.setColors(""); @@ -35,7 +38,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="bow">bow</a> + <a class="logo" href="<%=url%>?action=home&token=<%=permanentToken%>">bow</a> </div> </div> </div> Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-07-28 13:52:36 UTC (rev 105) @@ -60,7 +60,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) + <a class="logo" href="<%=url%>?action=home&token=<%=permanentToken%>">bow</a>(Bookmarks On the Web) </div> <div id="headright"> <form method="POST" action="bow?action=logout"> Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-28 13:52:36 UTC (rev 105) @@ -60,7 +60,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) + <a class="logo" href="<%=url%>?action=home&token=<%=permanentToken%>">bow</a>(Bookmarks On the Web) </div> <div id="headright"> <form method="POST" action="bow?action=logout"> Modified: trunk/src/main/webapp/preferences.jsp =================================================================== --- trunk/src/main/webapp/preferences.jsp 2010-07-28 09:23:31 UTC (rev 104) +++ trunk/src/main/webapp/preferences.jsp 2010-07-28 13:52:36 UTC (rev 105) @@ -2,13 +2,16 @@ <%@page import="org.chorem.bow.Preference" %> <%@page import="org.chorem.bow.User" %> +<%@page import="org.chorem.bow.TokenActions" %> <% User user = (User) session.getAttribute("user"); Preference preference = (Preference) session.getAttribute("preference"); - if (user != null && preference != null) { + TokenActions tokenActions = (TokenActions) session.getAttribute("tokenActions"); + if (user != null && preference != null && tokenActions != null) { String url = (String) request.getAttribute("bowUrl"); String version = (String) request.getAttribute("version"); + String permanentToken = tokenActions.getPermanentToken(); String check = preference.getColors(); if (check == null) { preference.setColors(""); @@ -35,7 +38,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="bow">bow</a> + <a class="logo" href="<%=url%>?action=home&token=<%=permanentToken%>">bow</a> </div> </div> </div>

1 0

r104 - in trunk/src/main: java/org/chorem/bow resources
by bpoussin＠users.chorem.org July 28, 2010

July 28, 2010

Author: bpoussin Date: 2010-07-28 11:23:31 +0200 (Wed, 28 Jul 2010) New Revision: 104 Url: http://chorem.org/repositories/revision/bow/104 Log: add support for search in search engine (default seeks.fr) if we start with ':' in OpenSearch request Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java trunk/src/main/java/org/chorem/bow/ControllerServlet.java trunk/src/main/resources/bow.properties Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-27 16:14:23 UTC (rev 103) +++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-28 09:23:31 UTC (rev 104) @@ -152,6 +152,15 @@ } /** + * Get default search engine + * + * @return search engine url + */ + public String getSearchEngine() { + return getOption(Option.SEARCH_ENGINE.key); + } + + /** * Get bow address from as string. * * @return addressFrom @@ -199,6 +208,8 @@ null, String.class, false, false), SERVLET_ALIAS("servlet.alias", _("bow.config.servlet.bow.description"), null, String.class, false, false), + SEARCH_ENGINE("search.engine", _("bow.config.search.engine.description"), + 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"), Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-27 16:14:23 UTC (rev 103) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-28 09:23:31 UTC (rev 104) @@ -285,11 +285,27 @@ * @throws ServletException if a servlet error occurs * @description set the openSearch result */ - protected void actionOpenSearchResult(HttpServletRequest request, HttpServletResponse response, HttpSession session, User user, String token) + protected void actionOpenSearchResult(HttpServletRequest request, + HttpServletResponse response, HttpSession session, User user, String token) throws IOException, ServletException, NoSuchAlgorithmException { String searchLine = request.getParameter("searchLine"); - if (searchLine != null && searchLine.matches("^http://[^ ]*") && !searchLine.contains(" ")) { + if (searchLine != null && searchLine.matches("^http://[^ ]*")) { response.sendRedirect(searchLine); + } else if (searchLine != null && searchLine.startsWith(":")) { + searchLine = searchLine.substring(1); // suppress first ":" + + WikittyProxy proxy = BowProxy.getInstance(); + Preference pref = proxy.restore(Preference.class, user.getWikittyId()); + + String searchEngineURL = pref.getSearchEngineUrlResults(); + if (searchEngineURL == null || "".equals(searchEngineURL)) { + BowConfig config = BowConfig.getInstance(); + searchEngineURL = config.getSearchEngine(); + } + searchEngineURL = searchEngineURL.replace("{searchTerms}", searchLine); + searchEngineURL = response.encodeRedirectURL(searchEngineURL); + + response.sendRedirect(searchEngineURL); } else { session.setAttribute("user", user); initializeToken(session, user); Modified: trunk/src/main/resources/bow.properties =================================================================== --- trunk/src/main/resources/bow.properties 2010-07-27 16:14:23 UTC (rev 103) +++ trunk/src/main/resources/bow.properties 2010-07-28 09:23:31 UTC (rev 104) @@ -6,3 +6,4 @@ bow.smtpServer=smtp bow.addressFrom=bow(a)chorem.org bow.admins=brossa_b(a)epitech.net +search.engine=http://seeks.fr/search?expansion=1&action=expand&q={searchTerms}

1 0