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

r93 - trunk
by bpoussin＠users.chorem.org 21 Jul '10

21 Jul '10

Author: bpoussin Date: 2010-07-21 11:23:43 +0200 (Wed, 21 Jul 2010) New Revision: 93 Url: http://chorem.org/repositories/revision/bow/93 Log: change version to 0.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-21 09:15:40 UTC (rev 92) +++ trunk/pom.xml 2010-07-21 09:23:43 UTC (rev 93) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.3-SNAPSHOT</version> <dependencies>

1 0

r92 - trunk/src/main/java/org/chorem/bow
by bpoussin＠users.chorem.org 21 Jul '10

21 Jul '10

Author: bpoussin Date: 2010-07-21 11:15:40 +0200 (Wed, 21 Jul 2010) New Revision: 92 Url: http://chorem.org/repositories/revision/bow/92 Log: fix #222 "http rajout?\195?\169 ?\195?\160 l'import" Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-21 09:08:07 UTC (rev 91) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-21 09:15:40 UTC (rev 92) @@ -172,7 +172,7 @@ if (url != null && !url.isEmpty()) { String link = url.trim(); // FIXME poussin 20100717 how can add ftp:// in bookmarks ? - if (!link.startsWith("http://") || !link.startsWith("https://")) { + if (! (link.startsWith("http://") || link.startsWith("https://"))) { link = "http://" + link; } bookmark.setLink(link);

1 0

r91 - in trunk: . src/main/webapp
by echatellier＠users.chorem.org 21 Jul '10

21 Jul '10

Author: echatellier Date: 2010-07-21 11:08:07 +0200 (Wed, 21 Jul 2010) New Revision: 91 Url: http://chorem.org/repositories/revision/bow/91 Log: Fix research > search Modified: trunk/ trunk/src/main/webapp/bookmarkHome.jsp trunk/src/main/webapp/bookmarkSearch.jsp Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target solr transaction.log PutObjectStoreDirHere + target solr transaction.log PutObjectStoreDirHere .settings .classpath .project Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-07-21 08:58:23 UTC (rev 90) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-07-21 09:08:07 UTC (rev 91) @@ -141,7 +141,7 @@ <jsp:include page="tagsCloud.jsp" flush="true" /> </div> <div id="recherche"> - <h2>Research</h2> + <h2>Search</h2> <form method="POST" action="bow?action=search"> <div class="input"> <input type="text" name="searchLine"/> @@ -150,7 +150,7 @@ </form> </div> <div id="recherche"> - <h2>Full text research</h2> + <h2>Full text search</h2> <form method="POST" action="bow?action=fullText"> <div class="input"> <input type="text" name="fullTextLine" value="<%=bookmarkActions.getFullTextLine()%>" /> @@ -186,4 +186,4 @@ </div> </body> -<%}%> \ No newline at end of file +<%}%> Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-21 08:58:23 UTC (rev 90) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-21 09:08:07 UTC (rev 91) @@ -125,7 +125,7 @@ </jsp:include> </div> <div id="recherche"> - <h2>Research</h2> + <h2>Search</h2> <form method="POST" action="bow?action=search"> <div class="input"> <input type="text" name="searchLine" value="<%=searchLine%>" /> @@ -134,7 +134,7 @@ </form> </div> <div id="recherche"> - <h2>Full text research</h2> + <h2>Full text search</h2> <form method="POST" action="bow?action=fullText"> <div class="input"> <input type="text" name="fullTextLine" value="<%=bookmarkActions.getFullTextLine()%>" /> @@ -170,4 +170,4 @@ </div> </body> -<%}%> \ No newline at end of file +<%}%>

1 0

r90 - trunk/src/main/webapp
by bpoussin＠users.chorem.org 21 Jul '10

21 Jul '10

Author: bpoussin Date: 2010-07-21 10:58:23 +0200 (Wed, 21 Jul 2010) New Revision: 90 Url: http://chorem.org/repositories/revision/bow/90 Log: modification des intitules de 'add link' pour qu'il soit consistant avec la page home Modified: trunk/src/main/webapp/bookmarkSearch.jsp Modified: trunk/src/main/webapp/bookmarkSearch.jsp =================================================================== --- trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-17 12:55:53 UTC (rev 89) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-21 08:58:23 UTC (rev 90) @@ -116,8 +116,8 @@ <li><a href="bow?action=admin">Admin</a></li> <%}%> <li><a href="bow?action=preferences">Preferences</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> + <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);">Bookmark add link (session)</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);">Bookmark add link (permanent)</a></li> </ul> <div id="nuage"> <jsp:include page="tagsCloud.jsp" flush="true">

1 0

r89 - in trunk/src/main: java/org/chorem/bow resources webapp
by bpoussin＠users.chorem.org 17 Jul '10

17 Jul '10

Author: bpoussin Date: 2010-07-17 14:55:53 +0200 (Sat, 17 Jul 2010) New Revision: 89 Url: http://chorem.org/repositories/revision/bow/89 Log: add url/servlet path configuration, this permit apache url modification 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/ControllerServlet.java trunk/src/main/resources/bow.properties trunk/src/main/webapp/bookmark.jsp trunk/src/main/webapp/bookmarkHome.jsp trunk/src/main/webapp/bookmarkSearch.jsp trunk/src/main/webapp/header.jsp Modified: trunk/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-16 07:59:52 UTC (rev 88) +++ trunk/src/main/java/org/chorem/bow/AliasServlet.java 2010-07-17 12:55:53 UTC (rev 89) @@ -39,11 +39,11 @@ */ public class AliasServlet extends HttpServlet { - protected String bowUrl = ""; + protected String bowServletUrl = ""; public AliasServlet() throws ArgumentsParserException { BowConfig config = BowConfig.getInstance(); - bowUrl = config.getBowUrl(); + bowServletUrl = config.getBowUrl() + config.getServletBow() ; } @Override @@ -60,11 +60,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { try { - String url = request.getRequestURL().toString(); - int index = url.indexOf("alias"); - index += 5; - String alias = url.substring(index); + String alias = request.getPathInfo(); if (alias != null && !alias.isEmpty()) { + // remove first '/' alias = alias.substring(1); WikittyProxy proxy = BowProxy.getInstance(); Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); @@ -73,10 +71,10 @@ String redirect = bookmark.getLink(); response.sendRedirect(redirect); } else { - response.sendRedirect(bowUrl); + response.sendRedirect(bowServletUrl); } } else { - response.sendRedirect(bowUrl); + response.sendRedirect(bowServletUrl); } } catch (Exception eee) { request.getRequestDispatcher("error.jsp").forward(request, response); Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-16 07:59:52 UTC (rev 88) +++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2010-07-17 12:55:53 UTC (rev 89) @@ -171,7 +171,8 @@ public static void addUrlToBookmark(String url, Bookmark bookmark) { if (url != null && !url.isEmpty()) { String link = url.trim(); - if (!link.contains("http://")) { + // FIXME poussin 20100717 how can add ftp:// in bookmarks ? + if (!link.startsWith("http://") || !link.startsWith("https://")) { link = "http://" + link; } bookmark.setLink(link); Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-16 07:59:52 UTC (rev 88) +++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2010-07-17 12:55:53 UTC (rev 89) @@ -88,9 +88,57 @@ * @return url */ public String getBowUrl() { - return getOption(Option.BOW_URL.key); + String result = getOption(Option.BOW_URL.key); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; + } + return result; } + /** + * Get alias url as string. + * + * @return url + */ + public String getAliasUrl() { + String result = getOption(Option.ALIAS_URL.key); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; + } + return result; + } + + /** + * Get bow servlet as string. + * + * @return servlet name + */ + public String getServletBow() { + return getOption(Option.SERVLET_BOW.key); + } + + /** + * Get alias servlet as string. + * + * @return servlet name + */ + public String getServletAlias() { + return getOption(Option.SERVLET_ALIAS.key); + } + + /** + * Get alias servlet url as string. + * + * @return servlet name + */ + public String getServletAliasUrl() { + String result = getAliasUrl() + getServletAlias(); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; + } + return result; + } + public File getDataDirAsFile() { File option = getOptionAsFile(Option.DATA_DIR.key); return option; @@ -147,6 +195,12 @@ null, String.class, true, true), BOW_URL("bow.url", _("bow.config.bow.url.description"), null, String.class, false, false), + ALIAS_URL("alias.url", _("bow.config.alias.url.description"), + null, String.class, false, false), + SERVLET_BOW("servlet.bow", _("bow.config.servlet.bow.description"), + null, String.class, false, false), + SERVLET_ALIAS("servlet.alias", _("bow.config.servlet.bow.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-16 07:59:52 UTC (rev 88) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-17 12:55:53 UTC (rev 89) @@ -75,18 +75,16 @@ private static final Log log = LogFactory.getLog(ControllerServlet.class); protected String version = ""; - protected String url = ""; + protected String bowServletUrl = ""; public ControllerServlet() throws ArgumentsParserException, Exception { BowConfig config = BowConfig.getInstance(); version = config.getVersion(); - url = config.getBowUrl(); - if (url == null) { + bowServletUrl = config.getBowUrl(); + if (bowServletUrl == null) { throw new Exception("No bow.url=\"SERVER URL\" in bow.properties"); } - if (url.charAt(url.length() - 1) != '/') { - url += '/'; - } + bowServletUrl += config.getServletBow(); } @Override @@ -104,7 +102,7 @@ throws IOException, ServletException { try { request.setAttribute("version", version); - request.setAttribute("bowUrl", url); + request.setAttribute("bowUrl", bowServletUrl); HttpSession session = request.getSession(true); User user = (User) session.getAttribute("user"); @@ -360,7 +358,7 @@ /* @param request servlet request * @param response servlet response * @throws ServletException if a servlet error occurs - * @description when the user click on the bookmark url, we + * @description when the user click on the bookmark bowServletUrl, we * increment the number of click */ protected void actionAddClick(HttpServletRequest request, HttpServletResponse response) @@ -527,7 +525,7 @@ protected void actionModifyBookmark(HttpServletRequest request, HttpServletResponse response, User user) throws IOException { - String link = request.getParameter("url"); // url of the website + String link = request.getParameter("url"); // bowServletUrl of the website String name = request.getParameter("name"); // website name String alias = request.getParameter("alias"); String tags = request.getParameter("tags"); @@ -558,7 +556,7 @@ } protected void addUrl(HttpServletRequest request, User user) { - String link = request.getParameter("url"); // url of the website + String link = request.getParameter("url"); // bowServletUrl of the website String name = request.getParameter("name"); // website name String alias = request.getParameter("alias"); WikittyProxy proxy = BowProxy.getInstance(); Modified: trunk/src/main/resources/bow.properties =================================================================== --- trunk/src/main/resources/bow.properties 2010-07-16 07:59:52 UTC (rev 88) +++ trunk/src/main/resources/bow.properties 2010-07-17 12:55:53 UTC (rev 89) @@ -1,5 +1,8 @@ application.version=${project.version} bow.url=http://localhost:8080/bow/ +alias.url=http://localhost:8080/bow/ +servlet.bow=bow +servlet.alias=alias bow.smtpServer=smtp bow.addressFrom=bow(a)chorem.org bow.admins=brossa_b(a)epitech.net Modified: trunk/src/main/webapp/bookmark.jsp =================================================================== --- trunk/src/main/webapp/bookmark.jsp 2010-07-16 07:59:52 UTC (rev 88) +++ trunk/src/main/webapp/bookmark.jsp 2010-07-17 12:55:53 UTC (rev 89) @@ -1,3 +1,4 @@ +<%@page import="org.chorem.bow.BowConfig" %> <%@page import="org.chorem.bow.Bookmark" %> <%@page import="java.text.SimpleDateFormat" %> <%@page import="org.chorem.bow.BookmarkActions" %> @@ -8,6 +9,7 @@ BookmarkActions bookmarkActions = (BookmarkActions) request.getAttribute("bookmarkActions"); SimpleDateFormat sdf = (SimpleDateFormat) request.getAttribute("sdf"); String url = (String) request.getAttribute("bowUrl"); + String aliasUrl = BowConfig.getInstance().getServletAliasUrl(); String search = ""; String searchLine = request.getParameter("searchLine"); if (searchLine != null) { @@ -26,7 +28,7 @@ <div class="bookmark"> <div class="bookmarkhead clearfix"> - <a class="alias" href="<%=url + "alias/" + bookmark.getAlias()%>" title="<%=bookmark.getLink()%>" target="_blank"> + <a class="alias" href="<%=aliasUrl + bookmark.getAlias()%>" title="<%=bookmark.getLink()%>" target="_blank"> <%=bookmark.getAlias()%> </a> <p class="date"> (<%=sdf.format(bookmark.getDate())%>)</p> Modified: trunk/src/main/webapp/bookmarkHome.jsp =================================================================== --- trunk/src/main/webapp/bookmarkHome.jsp 2010-07-16 07:59:52 UTC (rev 88) +++ trunk/src/main/webapp/bookmarkHome.jsp 2010-07-17 12:55:53 UTC (rev 89) @@ -60,7 +60,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="<%=url%>bow?action=home">bow</a>(Bookmarks On the Web) + <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) </div> <div id="headright"> <form action="bow?action=logout"> @@ -134,8 +134,8 @@ <li><a href="bow?action=admin">Admin</a></li> <%}%> <li><a href="bow?action=preferences">Preferences</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> + <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);">Bookmark add link (session)</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);">Bookmark add link (permanent)</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-16 07:59:52 UTC (rev 88) +++ trunk/src/main/webapp/bookmarkSearch.jsp 2010-07-17 12:55:53 UTC (rev 89) @@ -60,7 +60,7 @@ <div id="headback"> <div id="head"> <div id="headleft"> - <a class="logo" href="<%=url%>bow?action=home">bow</a>(Bookmarks On the Web) + <a class="logo" href="<%=url%>?action=home">bow</a>(Bookmarks On the Web) </div> <div id="headright"> <form action="bow?action=logout"> Modified: trunk/src/main/webapp/header.jsp =================================================================== --- trunk/src/main/webapp/header.jsp 2010-07-16 07:59:52 UTC (rev 88) +++ trunk/src/main/webapp/header.jsp 2010-07-17 12:55:53 UTC (rev 89) @@ -6,8 +6,8 @@ <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmark On the Web" /> <title>Bow</title> - <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>bow?action=temporaryXml" /> - <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>bow?action=permanentXml" /> + <link rel="search" type="application/opensearchdescription+xml" title="bowTemporarySearchEngine" href="<%=url%>?action=temporaryXml" /> + <link rel="search" type="application/opensearchdescription+xml" title="bowPermanentSearchEngine" href="<%=url%>?action=permanentXml" /> <link rel="stylesheet" type="text/css" href="./css/bookmark.css" /> <script type="text/javascript"> <!--

1 0

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

16 Jul '10

Author: bbrossaud Date: 2010-07-16 09:59:52 +0200 (Fri, 16 Jul 2010) New Revision: 88 Url: http://chorem.org/repositories/revision/bow/88 Log: remove sending Email when the user change his password in preferences 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-15 16:06:49 UTC (rev 87) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-16 07:59:52 UTC (rev 88) @@ -1072,7 +1072,6 @@ if (currentPassword.equals(newUser.getPassword())) { String md5 = StringUtil.encodeMD5(newPassword); newUser.setPassword(md5); - sendMail(newUser.getEmail(), newPassword); } } }

1 0

r87 - trunk
by bbrossaud＠users.chorem.org 15 Jul '10

15 Jul '10

Author: bbrossaud Date: 2010-07-15 18:06:49 +0200 (Thu, 15 Jul 2010) New Revision: 87 Url: http://chorem.org/repositories/revision/bow/87 Log: change version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-15 15:58:03 UTC (rev 86) +++ trunk/pom.xml 2010-07-15 16:06:49 UTC (rev 87) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.1-SNAPSHOT</version> + <version>0.2-SNAPSHOT</version> <dependencies>

1 0

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