Bow-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
February 2011
- 4 participants
- 48 discussions
r217 - in trunk/src/main: java/org/chorem/bow resources/i18n
by vbriand＠users.chorem.org Feb. 25, 2011
by vbriand＠users.chorem.org Feb. 25, 2011
Feb. 25, 2011
Author: vbriand
Date: 2011-02-25 10:53:59 +0100 (Fri, 25 Feb 2011)
New Revision: 217
Url: http://chorem.org/repositories/revision/bow/217
Log:
The token is now generated by UUID
Modified:
trunk/src/main/java/org/chorem/bow/BowUtils.java
trunk/src/main/resources/i18n/bow_fr_FR.properties
Modified: trunk/src/main/java/org/chorem/bow/BowUtils.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-02-25 09:15:39 UTC (rev 216)
+++ trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-02-25 09:53:59 UTC (rev 217)
@@ -23,6 +23,7 @@
*/
package org.chorem.bow;
+import java.util.UUID;
import org.nuiton.util.StringUtil;
import org.nuiton.wikitty.search.Criteria;
import org.nuiton.wikitty.WikittyProxy;
@@ -33,15 +34,25 @@
private BowUtils() {
}
+ /**
+ * Generates a random token
+ *
+ * @return the generated token
+ */
static public String generateToken() {
- Double rand = Math.random() * 100000000;
- int res = (int) Math.abs(rand); // generate a token between 0 and 100 000 000
- String tokenGenerated = String.valueOf(res);
+ UUID uuid = UUID.randomUUID();
+ String tokenGenerated = uuid.toString();
tokenGenerated = StringUtil.encodeMD5(tokenGenerated); // encode the token in MD5
- return tokenGenerated; // return the generate token
+ return tokenGenerated; // return the generated token
}
-
+ /**
+ * Redirects the user either on the home page or on the search page
+ *
+ * @param searchLine
+ * @param fullTextLine
+ * @return the page where the user will be redirected
+ */
static public String redirectTo(String searchLine, String fullTextLine) {
String result = "home.action";
@@ -51,6 +62,14 @@
return result;
}
+ /**
+ * Retrieves the user by the temporary or the permanent token
+ *
+ * @param session the session
+ * @param token either the temporary or the permanent token
+ * @return null if the token doesn't exist
+ * @return the user if the token is valid
+ */
static public BowUser checkToken(BowSession session, String token) {
BowUser result = null;
if (checkTemporaryToken(session, token) || checkPermanentToken(session, token)) {
Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-25 09:15:39 UTC (rev 216)
+++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-25 09:53:59 UTC (rev 217)
@@ -109,4 +109,4 @@
bow.search.orderby=Trier par
bow.search.submit=Rechercher
bow.search.title=Recherche
-bow.token.generate.successful=Le token a y00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s
+bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s
1
0
Author: vbriand
Date: 2011-02-25 10:15:39 +0100 (Fri, 25 Feb 2011)
New Revision: 216
Url: http://chorem.org/repositories/revision/bow/216
Log:
Replaced jsp tags by Struts2 tags whenever possible
Modified:
trunk/src/main/webapp/jsp/home.jsp
trunk/src/main/webapp/jsp/inc/bookmark.jsp
trunk/src/main/webapp/jsp/login.jsp
trunk/src/main/webapp/jsp/permanentXml.jsp
trunk/src/main/webapp/jsp/preferences.jsp
trunk/src/main/webapp/jsp/temporaryXml.jsp
Modified: trunk/src/main/webapp/jsp/home.jsp
===================================================================
--- trunk/src/main/webapp/jsp/home.jsp 2011-02-24 16:26:13 UTC (rev 215)
+++ trunk/src/main/webapp/jsp/home.jsp 2011-02-25 09:15:39 UTC (rev 216)
@@ -60,7 +60,7 @@
request.setAttribute("bookmark", bookmark);
request.setAttribute("sdf", sdf);
%>
- <jsp:include page="inc/bookmark.jsp" flush="true" />
+ <s:include value="inc/bookmark.jsp" />
<%
++count;
if (count >= nbBookmarks) {
@@ -86,7 +86,7 @@
request.setAttribute("bookmark", bookmark);
request.setAttribute("sdf", sdf);
%>
- <jsp:include page="inc/bookmark.jsp" flush="true" />
+ <s:include value="inc/bookmark.jsp" />
<%
++count;
if (count >= nbBookmarks) {
Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-24 16:26:13 UTC (rev 215)
+++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 09:15:39 UTC (rev 216)
@@ -23,7 +23,7 @@
-->
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@taglib prefix="s" uri="/struts-tags" %>
-
+<%@page import="org.chorem.bow.BowBookmark" %>
<div class="bookmark"
xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
xmlns:jsp="http://java.sun.com/JSP/Page">
Modified: trunk/src/main/webapp/jsp/login.jsp
===================================================================
--- trunk/src/main/webapp/jsp/login.jsp 2011-02-24 16:26:13 UTC (rev 215)
+++ trunk/src/main/webapp/jsp/login.jsp 2011-02-25 09:15:39 UTC (rev 216)
@@ -44,8 +44,8 @@
<s:submit key="bow.login.submit" name="submit" />
</p>
</s:form>
- <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br />
- <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a>
+ <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br />
+ <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a>
</div>
</div>
</body>
Modified: trunk/src/main/webapp/jsp/permanentXml.jsp
===================================================================
--- trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-24 16:26:13 UTC (rev 215)
+++ trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 09:15:39 UTC (rev 216)
@@ -23,22 +23,19 @@
#L%
-->
<%@page contentType="text/xml" pageEncoding="UTF-8"%>
+<%@taglib prefix="s" uri="/struts-tags" %>
<%@page import="org.chorem.bow.BowConfig" %>
-<%@page import="org.chorem.bow.BowSession" %>
<%
-BowSession bowSession = BowSession.getBowSession(session);
-String token = bowSession.getPermanentToken();
String url = BowConfig.getInstance().getBowUrl();
%>
-
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
xmlns:moz="http://www.mozilla.org/2006/browser/search/">
<ShortName>Bow (permanent)</ShortName>
<Description>bookmarkSearch</Description>
<InputEncoding>inputEncoding</InputEncoding>
<Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image>
- <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" />
- <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&searchLine={searchTerms}" />
+ <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" />
+ <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" />
<moz:SearchForm><%=url%></moz:SearchForm>
</OpenSearchDescription>
Modified: trunk/src/main/webapp/jsp/preferences.jsp
===================================================================
--- trunk/src/main/webapp/jsp/preferences.jsp 2011-02-24 16:26:13 UTC (rev 215)
+++ trunk/src/main/webapp/jsp/preferences.jsp 2011-02-25 09:15:39 UTC (rev 216)
@@ -23,17 +23,10 @@
-->
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@taglib prefix="s" uri="/struts-tags"%>
-<%@page import="org.chorem.bow.BowSession" %>
<%@page import="org.chorem.bow.BowImport" %>
<%@page import="org.nuiton.wikitty.search.FacetTopic" %>
<%@page import="java.util.List" %>
- <%
-BowSession bowSession = BowSession.getBowSession(session);
-String permanentToken = bowSession.getPermanentToken();
-String temporaryToken = bowSession.getTemporaryToken();
- %>
-
<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
xmlns:jsp="http://java.sun.com/JSP/Page">
<head>
@@ -72,10 +65,10 @@
<p>
<ul>
<li><strong><s:text name="bow.rightMenu.token.permanent"/>
- :</strong><%=permanentToken%>
+ :</strong><s:property value="%{#session.BowSession.getPermanentToken()}" />
</li>
<li><strong><s:text name="bow.rightMenu.token.temporary"/>
- :</strong><%=temporaryToken%>
+ :</strong><s:property value="%{#session.BowSession.getTemporaryToken()}" />
</li>
</ul>
<s:url var="regenPermToken" action="regenPermToken"/>
Modified: trunk/src/main/webapp/jsp/temporaryXml.jsp
===================================================================
--- trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-24 16:26:13 UTC (rev 215)
+++ trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-25 09:15:39 UTC (rev 216)
@@ -22,22 +22,19 @@
#L%
-->
<%@page contentType="text/xml" pageEncoding="UTF-8"%>
+<%@taglib prefix="s" uri="/struts-tags" %>
<%@page import="org.chorem.bow.BowConfig" %>
-<%@page import="org.chorem.bow.BowSession" %>
<%
-BowSession bowSession = BowSession.getBowSession(session);
-String token = bowSession.getTemporaryToken();
String url = BowConfig.getInstance().getBowUrl();
%>
-
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
xmlns:moz="http://www.mozilla.org/2006/browser/search/">
<ShortName>Bow (temporary)</ShortName>
<Description>bookmarkSearch</Description>
<InputEncoding>inputEncoding</InputEncoding>
<Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image>
- <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<%=token%>&searchLine={searchTerms}" />
- <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<%=token%>&search={searchTerms}" />
+ <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&searchLine={searchTerms}" />
+ <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&search={searchTerms}" />
<moz:SearchForm><%=url%></moz:SearchForm>
</OpenSearchDescription>
1
0
r215 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action resources/i18n webapp/css webapp/jsp webapp/jsp/inc
by vbriand＠users.chorem.org Feb. 24, 2011
by vbriand＠users.chorem.org Feb. 24, 2011
Feb. 24, 2011
Author: vbriand
Date: 2011-02-24 17:26:13 +0100 (Thu, 24 Feb 2011)
New Revision: 215
Url: http://chorem.org/repositories/revision/bow/215
Log:
Fixed admin page design
Modified:
trunk/src/main/java/org/chorem/bow/BookmarkUtils.java
trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
trunk/src/main/java/org/chorem/bow/action/RegisterAction.java
trunk/src/main/resources/i18n/bow_en_GB.properties
trunk/src/main/resources/i18n/bow_fr_FR.properties
trunk/src/main/webapp/css/bookmark.css
trunk/src/main/webapp/jsp/admin.jsp
trunk/src/main/webapp/jsp/inc/tagsCloud.jsp
Modified: trunk/src/main/java/org/chorem/bow/BookmarkUtils.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-02-24 16:26:13 UTC (rev 215)
@@ -141,20 +141,22 @@
+ "<DL><p>\n";
if (bookmarks != null) {
for (BowBookmark bookmark : bookmarks) {
- export += "<DT><A HREF=\"";
- export += bookmark.getLink() + "\" ";
- Date date = bookmark.getCreationDate();
- if (date != null) {
- long milli = date.getTime();
- String time = String.valueOf(milli / 1000);
- export += "ADD_DATE=\"" + time + "\" LAST_MODIFIED=\"" + time + "\" ";
+ if (bookmark != null) {
+ export += "<DT><A HREF=\"";
+ export += bookmark.getLink() + "\" ";
+ Date date = bookmark.getCreationDate();
+ if (date != null) {
+ long milli = date.getTime();
+ String time = String.valueOf(milli / 1000);
+ export += "ADD_DATE=\"" + time + "\" LAST_MODIFIED=\"" + time + "\" ";
+ }
+ export += "LAST_CHARSET=\"UTF-8\" ";
+ Set<String> tags = bookmark.getLabels();
+ if (tags != null && !tags.isEmpty()) {
+ export += "SHORTCUTURL=\"" + getBookmarkTagsString(bookmark) + "\"";
+ }
+ export += ">" + bookmark.getDescription() + "</A>\n";
}
- export += "LAST_CHARSET=\"UTF-8\" ";
- Set<String> tags = bookmark.getLabels();
- if (tags != null && !tags.isEmpty()) {
- export += "SHORTCUTURL=\"" + getBookmarkTagsString(bookmark) + "\"";
- }
- export += ">" + bookmark.getDescription() + "</A>\n";
}
}
export += "</DL><p>";
Modified: trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-24 16:26:13 UTC (rev 215)
@@ -113,12 +113,12 @@
String message = getText("bow.mail.badFormat");
addActionError(n_(message));
- log.error(message + " (email:" + email + ")");
+ log.error(message + " (email:" + email + ")", e);
} catch (MessagingException e) {
String message = getText("bow.mail.sendError");
addActionError(n_(message));
- log.error(message + "(" + e.getMessage() + ")");
+ log.error(message + "(" + e.getMessage() + ")", e);
}
result = SUCCESS;
} else { //If the email is not associated with an account
Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-24 16:26:13 UTC (rev 215)
@@ -264,7 +264,7 @@
}
} catch (IOException e2) {
addActionError(getText(n_("bow.error.internal")));
- log.error(e2.getMessage());
+ log.error(e2.getMessage(), e2);
}
}
return SUCCESS;
Modified: trunk/src/main/java/org/chorem/bow/action/RegisterAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-24 16:26:13 UTC (rev 215)
@@ -166,12 +166,12 @@
String message = getText("bow.mail.badFormat");
addActionError(n_(message));
- log.error(message + " (email:" + email + ")");
+ log.error(message + " (email:" + email + ")", e);
} catch (MessagingException e) {
String message = getText("bow.mail.sendError");
addActionError(n_(message));
- log.error(message + "(" + e.getMessage() + ")");
+ log.error(message + "(" + e.getMessage() + ")", e);
}
result = SUCCESS;
}
Modified: trunk/src/main/resources/i18n/bow_en_GB.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-02-24 16:26:13 UTC (rev 215)
@@ -1,5 +1,10 @@
bow.action.locale.english=English
bow.action.locale.french=Fran\u00E7ais
+bow.admin.dataMigration=Migrate all data from 0.4 to 0.5
+bow.admin.dataReindexation=All data reindexation
+bow.admin.forbidden=You don't have admin rights \!
+bow.admin.home=Return to the home page
+bow.admin.panel=Admin panel
bow.bookmark.add.successful=Bookmark successfully added
bow.bookmark.badFileFormat=Bad bookmarks file format \: unsuccessful import (expected Netscape-like bookmarks file)
bow.bookmark.description=Description
Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-24 16:26:13 UTC (rev 215)
@@ -1,5 +1,10 @@
bow.action.locale.english=English
bow.action.locale.french=Fran\u00E7ais
+bow.admin.dataMigration=Migrer toutes les donn\u00E9es de la version 0.4 \u00E0 0.5
+bow.admin.dataReindexation=R\u00E9indexation des donn\u00E9es
+bow.admin.forbidden=Vous n'\u00EAtes pas administrateur \!
+bow.admin.home=Retour sur la page d''accueil
+bow.admin.panel=Panneau d''administration
bow.bookmark.add.successful=Marque-page ajout\u00E9 avec succ\u00E8s
bow.bookmark.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le fichier doit avoir un format de type Netscape)
bow.bookmark.description=Description
Modified: trunk/src/main/webapp/css/bookmark.css
===================================================================
--- trunk/src/main/webapp/css/bookmark.css 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/webapp/css/bookmark.css 2011-02-24 16:26:13 UTC (rev 215)
@@ -492,4 +492,16 @@
#add h2{
margin-bottom:20px;
+}
+
+#adminActions li{
+ list-style-type:none;
+ padding-bottom:15px;
+}
+
+#adminActions li a{
+ text-decoration:none;
+ color:#804561;
+ font-size:11px;
+ font-weight:bold;
}
\ No newline at end of file
Modified: trunk/src/main/webapp/jsp/admin.jsp
===================================================================
--- trunk/src/main/webapp/jsp/admin.jsp 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/webapp/jsp/admin.jsp 2011-02-24 16:26:13 UTC (rev 215)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
#%L
bow
@@ -24,7 +23,6 @@
-->
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@taglib prefix="s" uri="/struts-tags"%>
-<%@page import="org.chorem.bow.BowSession" %>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
xmlns:jsp="http://java.sun.com/JSP/Page"
@@ -36,21 +34,22 @@
</head>
<body>
<div id="content">
- <div id="formFrame">
- <h1>Admin panel</h1>
+ <div class="menu clearfix">
+ <h2><s:text name="bow.admin.panel" /></h2>
+ </div>
+ <div class="formFrame">
<br /><br />
- <%
-BowSession bowSession = BowSession.getBowSession(session);
-if (bowSession.isAdmin()) {
- %>
- <ul>
- <li><a href="/bow/reIndexation.action">All data re-indexation</a></li>
- <li><a href="/bow/migrate04To05.action">Migration all data from 0.4 to 0.5</a></li>
- <li><a href="/bow/home.action" id="homePage">Return to the home page</a></li>
- </ul>
- <% } else {%>
- <h2>You don't have admin right !</h2>
- <% }%>
+
+ <s:if test="#session.BowSession.isAdmin()">
+ <ul id="adminActions">
+ <li><s:a action="reIndexation"><s:text name="bow.admin.dataReindexation" /></s:a></li>
+ <li><s:a action="migrate04To05"><s:text name="bow.admin.dataMigration" /></s:a></li>
+ <li><s:a action="home" id="homePage"><s:text name="bow.admin.home" /></s:a></li>
+ </ul>
+ </s:if>
+ <s:else>
+ <h2><s:text name="bow.admin.forbidden" /></h2>
+ </s:else>
</div>
</div>
</body>
Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-24 10:30:30 UTC (rev 214)
+++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-24 16:26:13 UTC (rev 215)
@@ -25,24 +25,25 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@taglib prefix="s" uri="/struts-tags" %>
-<div id="nuage"
- xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
- xmlns:jsp="http://java.sun.com/JSP/Page">
- <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}">
- <s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" />
-</s:if>
-<s:else>
- <s:set var="maxTags" value="#session.BowSession.preference.tags" />
-</s:else>
-<s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}">
- <s:url var="search" action="search" escapeAmp="true">
- <s:param name="addTag"><s:property value="topicName" /></s:param>
- <s:if test="%{request.searchLine != null}">
- <s:param name="searchLine">&searchLine=<s:property value="%{request.searchLine}" /></s:param>
- </s:if>
- </s:url>
- <!-- -->
- <s:a href="%{search}" title="%{count} results" cssClass="tag" cssStyle="font-size: %{#request.bookmarkActions.getFont(count)}px"><s:property value="topicName" /></s:a>
-</s:iterator>
-
-</div>
\ No newline at end of file
+<s:if test="#request.bookmarkActions != null">
+ <div id="nuage"
+ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ xmlns:jsp="http://java.sun.com/JSP/Page">
+ <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}">
+ <s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" />
+ </s:if>
+ <s:else>
+ <s:set var="maxTags" value="#session.BowSession.preference.tags" />
+ </s:else>
+ <s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}">
+ <s:url var="search" action="search" escapeAmp="true">
+ <s:param name="addTag"><s:property value="topicName" /></s:param>
+ <s:if test="%{request.searchLine != null}">
+ <s:param name="searchLine">&searchLine=<s:property value="%{request.searchLine}" /></s:param>
+ </s:if>
+ </s:url>
+ <!-- -->
+ <s:a href="%{search}" title="%{count} results" cssClass="tag" cssStyle="font-size: %{#request.bookmarkActions.getFont(count)}px"><s:property value="topicName" /></s:a>
+ </s:iterator>
+ </div>
+</s:if>
\ No newline at end of file
1
0
Feb. 24, 2011
Author: vbriand
Date: 2011-02-24 11:30:30 +0100 (Thu, 24 Feb 2011)
New Revision: 214
Url: http://chorem.org/repositories/revision/bow/214
Log:
The BufferedWriter is now closed even if an exception occurs
Modified:
trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java
Modified: trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-24 10:16:35 UTC (rev 213)
+++ trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-24 10:30:30 UTC (rev 214)
@@ -33,6 +33,7 @@
import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.io.IOUtils;
import org.apache.struts2.interceptor.ServletResponseAware;
import org.chorem.bow.BowBookmark;
import org.chorem.bow.BookmarkUtils;
@@ -70,17 +71,20 @@
.eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()).criteria();
List<BowBookmark> bookmarks = proxy.findAllByCriteria(BowBookmark.class, criteria).getAll();
String export = BookmarkUtils.getExportHtmlBookmark(bookmarks);
-
+ BufferedWriter out = null;
+
try {
File tmp = File.createTempFile("bookmarks", "tmp.html");
tmp.deleteOnExit();
- BufferedWriter out = new BufferedWriter(new FileWriter(tmp));
+ out = new BufferedWriter(new FileWriter(tmp));
out.write(export);
- out.close();
+
inputStream = new FileInputStream(tmp);
} catch (IOException e) {
- log.error("Error when exporting bookmarks to HTML : " + e.getMessage());
+ log.error("Error when exporting bookmarks to HTML : " + e.getMessage(), e);
+ } finally {
+ IOUtils.closeQuietly(out);
}
return SUCCESS;
}
1
0
r213 - in trunk/src/main: java/org/chorem/bow/action resources
by vbriand＠users.chorem.org Feb. 24, 2011
by vbriand＠users.chorem.org Feb. 24, 2011
Feb. 24, 2011
Author: vbriand
Date: 2011-02-24 11:16:35 +0100 (Thu, 24 Feb 2011)
New Revision: 213
Url: http://chorem.org/repositories/revision/bow/213
Log:
The bookmarks are now exported using Struts2
Modified:
trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java
trunk/src/main/resources/struts.xml
Modified: trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-24 09:06:09 UTC (rev 212)
+++ trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-24 10:16:35 UTC (rev 213)
@@ -23,10 +23,14 @@
*/
package org.chorem.bow.action;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
-import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.interceptor.ServletResponseAware;
@@ -39,19 +43,22 @@
/**
* Export son bookmark au format HTML
- * TODO poussin 20110211 n'y aurait-il pas une meilleur facon d'envoyer un fichier
- * en struts ???
*
* @author poussin
*/
public class ExportBookmarksAction extends BowBaseAction implements ServletResponseAware {
private static final long serialVersionUID = 45880214686011946L;
protected HttpServletResponse response;
+ protected InputStream inputStream;
@Override
public void setServletResponse(HttpServletResponse response) {
this.response = response;
}
+
+ public InputStream getInputStream() {
+ return inputStream;
+ }
/**
* Exports the bookmarks in HTML format
@@ -63,20 +70,17 @@
.eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()).criteria();
List<BowBookmark> bookmarks = proxy.findAllByCriteria(BowBookmark.class, criteria).getAll();
String export = BookmarkUtils.getExportHtmlBookmark(bookmarks);
- byte[] buff = export.getBytes();
- ServletOutputStream op;
try {
- op = response.getOutputStream();
- response.setContentType("application/octet-stream");
- response.setHeader("Content-Disposition", "attachment; filename=\"bookmarks.html\"");
- response.setContentLength(buff.length);
- op.write(buff, 0, buff.length);
- op.flush();
- op.close();
+ File tmp = File.createTempFile("bookmarks", "tmp.html");
+
+ tmp.deleteOnExit();
+ BufferedWriter out = new BufferedWriter(new FileWriter(tmp));
+ out.write(export);
+ out.close();
+ inputStream = new FileInputStream(tmp);
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error("Error when exporting bookmarks to HTML : " + e.getMessage());
}
return SUCCESS;
}
Modified: trunk/src/main/resources/struts.xml
===================================================================
--- trunk/src/main/resources/struts.xml 2011-02-24 09:06:09 UTC (rev 212)
+++ trunk/src/main/resources/struts.xml 2011-02-24 10:16:35 UTC (rev 213)
@@ -81,6 +81,11 @@
</action>
<action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction">
<interceptor-ref name="loginStack" />
+ <result type="stream">
+ <param name="contentType">application/octet-stream</param>
+ <param name="inputName">inputStream</param>
+ <param name="contentDisposition">attachment;filename="bookmarks.html"</param>
+ </result>
</action>
<action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction">
<interceptor-ref name="store">
1
0
Author: vbriand
Date: 2011-02-24 10:06:09 +0100 (Thu, 24 Feb 2011)
New Revision: 212
Url: http://chorem.org/repositories/revision/bow/212
Log:
Fixed anomaly #299
Modified:
trunk/src/main/webapp/jsp/inc/rightMenu.jsp
Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-18 18:12:04 UTC (rev 211)
+++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-24 09:06:09 UTC (rev 212)
@@ -23,21 +23,13 @@
-->
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@taglib prefix="s" uri="/struts-tags" %>
-<%@page import="org.chorem.bow.BookmarkActions" %>
<%@page import="org.chorem.bow.BowConfig" %>
-<%@page import="org.chorem.bow.BowSession" %>
<%
-BowSession bowSession = BowSession.getBowSession(session);
-BookmarkActions bookmarkActions = (BookmarkActions)request.getAttribute("bookmarkActions");
-
-String temporaryToken = bowSession.getTemporaryToken();
-String permanentToken = bowSession.getPermanentToken();
String bowUrl = BowConfig.getInstance().getBowUrl();
if (request.getAttribute("formAction") == null)
request.setAttribute("formAction", "addUrl");
%>
-
<div id="logoutDiv" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
xmlns:jsp="http://java.sun.com/JSP/Page">
<s:form action="logout">
@@ -53,20 +45,20 @@
<s:set var="fullTextLine" value="%{request.bookmarkActions.fullTextLine}" />
<div id="colonneD">
<ul class="droite">
- <%if (bowSession.isAdmin()) {%>
+ <s:if test="#session.BowSession.isAdmin()">
<li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li>
- <% } %>
+ </s:if>
<li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li>
- <li><s:a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" 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='<%=bowUrl%>addUrl.action?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);"><s:text name="bow.rightMenu.bookmark.temporaryLink" /></s:a></li>
- <li><s:a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" 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='<%=bowUrl%>addUrl.action?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);"><s:text name="bow.rightMenu.bookmark.permanentLink" /></s:a></li>
+ <li><a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" 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='<%=bowUrl%>addUrl.action?token=<s:property value='#session.BowSession.getTemporaryToken()' />&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.temporaryLink" /></a></li>
+ <li><a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" 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='<%=bowUrl%>addUrl.action?token=<s:property value='#session.BowSession.getPermanentToken()' />&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.permanentLink" /></a></li>
</ul>
<div id="extensions">
<h2><s:text name="bow.rightMenu.extensions" /></h2>
<ul class="droite">
<li><a href="extensions/bow4chromium.crx"><img src="img/chromium.png" alt="Chromium" class="extensionIcon" />
<s:text name="bow.rightMenu.chromiumExtension" /></a></li>
- <li><strong><s:text name="bow.rightMenu.token.permanent" /> :</strong><br /><%=permanentToken%></li>
- <li><strong><s:text name="bow.rightMenu.token.temporary" /> :</strong><br /><%=temporaryToken%></li>
+ <li><strong><s:text name="bow.rightMenu.token.permanent" /> :</strong><br /><s:property value="%{#session.BowSession.getPermanentToken()}" /></li>
+ <li><strong><s:text name="bow.rightMenu.token.temporary" /> :</strong><br /><s:property value="%{#session.BowSession.getTemporaryToken()}" /></li>
</ul>
</div>
<div id="add" class="clearfix">
1
0
r211 - in trunk/src/main: java/org/chorem/bow java/org/chorem/bow/action resources resources/i18n webapp/css webapp/jsp/inc
by vbriand＠users.chorem.org Feb. 18, 2011
by vbriand＠users.chorem.org Feb. 18, 2011
Feb. 18, 2011
Author: vbriand
Date: 2011-02-18 19:12:04 +0100 (Fri, 18 Feb 2011)
New Revision: 211
Url: http://chorem.org/repositories/revision/bow/211
Log:
Added confirmation and error messages which are displayed on the header.
Modified:
trunk/src/main/java/org/chorem/bow/BowSearch.java
trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java
trunk/src/main/java/org/chorem/bow/action/DeleteImportAction.java
trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java
trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java
trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java
trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java
trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java
trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java
trunk/src/main/java/org/chorem/bow/action/RegisterAction.java
trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java
trunk/src/main/java/org/chorem/bow/action/SearchAction.java
trunk/src/main/resources/i18n/bow_en_GB.properties
trunk/src/main/resources/i18n/bow_fr_FR.properties
trunk/src/main/resources/struts.xml
trunk/src/main/webapp/css/bookmark.css
trunk/src/main/webapp/css/connexion.css
trunk/src/main/webapp/css/global.css
trunk/src/main/webapp/jsp/inc/header.jsp
trunk/src/main/webapp/jsp/inc/rightMenu.jsp
Modified: trunk/src/main/java/org/chorem/bow/BowSearch.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowSearch.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/BowSearch.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -23,9 +23,6 @@
*/
package org.chorem.bow;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.nuiton.wikitty.search.Criteria;
@@ -35,8 +32,7 @@
public class BowSearch {
- static public void search(HttpServletRequest request, BowPreference user)
- throws IOException, ServletException {
+ static public void search(HttpServletRequest request, BowPreference user) {
String searchLine = request.getParameter("searchLine");
if (searchLine == null) {
@@ -59,18 +55,21 @@
BowSession session = BowSession.getBowSession(request);
WikittyProxy proxy = session.getProxy();
Criteria criteria = BookmarkUtils.getBookmarkListCriteriaByUser(user, searchLine);
- criteria = criteria.addSortDescending(BowBookmark.FQ_FIELD_BOWBOOKMARK_CLICK);
+
+ if (criteria != null ) {
+ criteria = criteria.addSortDescending(BowBookmark.FQ_FIELD_BOWBOOKMARK_CLICK);
- if (criteria != null) {
- PagedResult<BowBookmark> result =
+ if (criteria != null) {
+ PagedResult<BowBookmark> result =
proxy.findAllByCriteria(BowBookmark.class, criteria); //Selects all bookmarks by user
- BookmarkActions bookmarkActions = BookmarkUtils.createBookmarkActions(request, result, searchLine);
- request.setAttribute("bookmarkActions", bookmarkActions);
+ BookmarkActions bookmarkActions = BookmarkUtils.createBookmarkActions(request, result, searchLine);
+ request.setAttribute("bookmarkActions", bookmarkActions);
+ }
}
}
}
- static public void fullText(HttpServletRequest request, BowPreference user) throws IOException, ServletException {
+ static public void fullText(HttpServletRequest request, BowPreference user) {
String fullText = request.getParameter("fullTextLine");
if (fullText == null || fullText.isEmpty()) {
Modified: trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -31,6 +31,8 @@
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.search.Search;
+import static org.nuiton.i18n.I18n.n_;
+
/**
* Ajoute un bookmark, soit par le formulaire, soit par un appel javascript
*
@@ -175,6 +177,7 @@
}
if (bookmark != null && !bookmark.getDescription().isEmpty() && !bookmark.getBowUser().isEmpty()) {
proxy.store(bookmark); //Stores the bookmark if everything is ok
+ addActionMessage(getText(n_("bow.bookmark.add.successful")));
if (log.isDebugEnabled()) {
log.debug("Adding URL");
}
Modified: trunk/src/main/java/org/chorem/bow/action/DeleteImportAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/DeleteImportAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/DeleteImportAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -32,6 +32,8 @@
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.search.Search;
+import static org.nuiton.i18n.I18n.n_;
+
/**
* Supprime un import de bookmark
*
@@ -70,6 +72,7 @@
.eq(BowImport.FQ_FIELD_BOWIMPORT_IMPORTDATE, date).criteria();
List<BowImport> bookmarks = proxy.findAllByCriteria(BowImport.class, criteria).getAll();
proxy.delete(bookmarks);
+ addActionMessage(getText(n_("bow.bookmark.import.delete.successful")));
}
return SUCCESS;
}
Modified: trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -95,9 +95,11 @@
// TODO poussin 20110216 a revoir, incomprehensible :(
for (BowBookmark bookmark : bookmarks) {
- if (searchLine.isEmpty() && bookmark.getLabels() == null || !searchLine.isEmpty()
- || fullTextLine.isEmpty() && bookmark.getLabels() == null || !fullTextLine.isEmpty()) {
- ids.add(bookmark.getWikittyId());
+ if (bookmark != null) {
+ if (searchLine.isEmpty() && bookmark.getLabels() == null || !searchLine.isEmpty()
+ || fullTextLine.isEmpty() && bookmark.getLabels() == null || !fullTextLine.isEmpty()) {
+ ids.add(bookmark.getWikittyId());
+ }
}
}
proxy.delete(ids);
Modified: trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -23,9 +23,6 @@
*/
package org.chorem.bow.action;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.interceptor.ServletRequestAware;
@@ -122,15 +119,7 @@
BowInit.initHomePage(request, user);
result = "home";
} else {
- try {
- BowSearch.search(request, user);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ServletException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ BowSearch.search(request, user);
result = "search";
}
return result;
Modified: trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -84,39 +84,46 @@
email = email.trim();
if (!email.isEmpty()) {
WikittyProxy proxy = getBowProxy();
- Criteria criteria = Search.query().eq(BowUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria();
+ Criteria criteria = Search.query()
+ .eq(BowUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria();
BowUser user = proxy.findByCriteria(BowUser.class, criteria);
- if (user != null) {
-// boolean bool = true;
+ if (user != null) { //If the email address exists
String password = "";
String md5 = "";
-// while (bool) {
- password = RandomStringUtils.randomAlphanumeric(20);
- md5 = StringUtil.encodeMD5(password);
-// bool = passwordExists(md5);
-// }
+ password = RandomStringUtils.randomAlphanumeric(20);
+ md5 = StringUtil.encodeMD5(password);
try {
String mailContent;
- mailContent = getText(n_("bow.register.mailHi")) + ",\n\n" + getText(n_("bow.register.mailPwd")) + ": " + password + "\n\n" + getText(n_("bow.register.mailEmail")) + ": " + email + "\n\n";
- BowMail.sendMail(email, getText(n_("bow.register.mailSubject")), mailContent);
+ mailContent = getText(n_("bow.register.mailHi")) +
+ ",\n\n" + getText(n_("bow.register.mailPwd")) + ": " +
+ password + "\n\n" + getText(n_("bow.register.mailEmail")) +
+ ": " + email + "\n\n";
+ BowMail.sendMail(email,
+ getText(n_("bow.register.mailSubject")),
+ mailContent);
- // on ne change le mot de passe que si on a reussi a
- // envoyer le mail
+ //The password is changed only if the mail has been sent
user.setPassword(md5);
proxy.store(user);
} catch (AddressException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ //If the email address is invalid
+ String message = getText("bow.mail.badFormat");
+
+ addActionError(n_(message));
+ log.error(message + " (email:" + email + ")");
} catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ String message = getText("bow.mail.sendError");
+
+ addActionError(n_(message));
+ log.error(message + "(" + e.getMessage() + ")");
}
result = SUCCESS;
- } else {
- addFieldError("email", getText(n_("bow.forgotPassword.emailDoesntExist")));
+ } else { //If the email is not associated with an account
+ addFieldError("email",
+ getText(n_("bow.forgotPassword.emailDoesntExist")));
}
}
}
Modified: trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -23,9 +23,6 @@
*/
package org.chorem.bow.action;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.interceptor.ServletRequestAware;
@@ -84,15 +81,7 @@
BowSession session = getBowSession();
BowPreference user = session.getPreference();
- try {
- BowSearch.fullText(request, user);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ServletException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ BowSearch.fullText(request, user);
return SUCCESS;
}
}
Modified: trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -27,6 +27,8 @@
import org.chorem.bow.BowUtils;
import org.nuiton.wikitty.WikittyProxy;
+import static org.nuiton.i18n.I18n.n_;
+
/**
* Force la regeneration de token permanent et temporaire
*
@@ -49,7 +51,7 @@
String temporaryToken = BowUtils.generateToken();
getBowSession().setTemporaryToken(temporaryToken);
-
+ addActionMessage(getText(n_("bow.token.generate.successful")));
return SUCCESS;
}
}
\ No newline at end of file
Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -30,7 +30,6 @@
import java.util.Date;
import java.util.List;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.interceptor.ServletRequestAware;
@@ -228,7 +227,6 @@
public String execute() {
BowPreference user = getBowSession().getPreference();
- String result = SUCCESS;
if (upfile != null) {
// try {
@@ -253,41 +251,22 @@
if (searchLine == null || searchLine.isEmpty()) {
BowInit.initHomePage(request, user);
} else {
- try {
- BowSearch.search(request, user);
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (ServletException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
+ BowSearch.search(request, user);
}
+ addActionMessage(getText(n_("bow.bookmark.import.successful")));
} catch (ParserException e) {
- request.setAttribute("errorMsgUser",
- getText(n_("bow.bookmark.badFileFormat")));
- request.setAttribute("errorMsgTech", e.getMessage());
- redirectTo = BowUtils.redirectTo(searchLine, fullTextLine);
+ addActionError(getText(n_("bow.bookmark.badFileFormat")));
if (searchLine == null || searchLine.isEmpty()) {
BowInit.initHomePage(request, user);
} else {
- try {
- BowSearch.search(request, user);
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (ServletException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
+ BowSearch.search(request, user);
}
} catch (IOException e2) {
- // TODO Auto-generated catch block
- e2.printStackTrace();
- result = ERROR;
+ addActionError(getText(n_("bow.error.internal")));
+ log.error(e2.getMessage());
}
}
- return result;
+ return SUCCESS;
}
}
Modified: trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -29,6 +29,8 @@
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.search.Search;
+import static org.nuiton.i18n.I18n.n_;
+
/**
* Modifie une entree du bookmark
*
@@ -160,6 +162,7 @@
}
BookmarkUtils.updateBookmark(bookmark, name, link, tags, alias);
proxy.store(bookmark);
+ addActionMessage(getText(n_("bow.bookmark.update.successful")));
}
return SUCCESS;
}
Modified: trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -281,6 +281,7 @@
newUser = proxy.store(newUser);
getBowSession().setUser(newUser);
result = "update";
+ addActionMessage(getText(n_("bow.preferences.update.successful")));
}
} else {
// this email address is already used by someone else
Modified: trunk/src/main/java/org/chorem/bow/action/RegisterAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -162,11 +162,16 @@
mailContent = getText(n_("bow.register.mailHi")) + ",\n\n" + getText(n_("bow.register.mailPwd")) + ": " + password + "\n\n" + getText(n_("bow.register.mailEmail")) + ": " + email + "\n\n";
BowMail.sendMail(email, getText(n_("bow.register.mailSubject")), mailContent);
} catch (AddressException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ //If the email address is invalid
+ String message = getText("bow.mail.badFormat");
+
+ addActionError(n_(message));
+ log.error(message + " (email:" + email + ")");
} catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ String message = getText("bow.mail.sendError");
+
+ addActionError(n_(message));
+ log.error(message + "(" + e.getMessage() + ")");
}
result = SUCCESS;
}
Modified: trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -27,6 +27,8 @@
import org.chorem.bow.BowUtils;
import org.nuiton.wikitty.WikittyProxy;
+import static org.nuiton.i18n.I18n.n_;
+
/**
* Supprime un bookmark
*
@@ -99,6 +101,7 @@
if (bookmark != null) {
proxy.delete(bookmarkId);
+ addActionMessage(getText(n_("bow.bookmark.remove.successful")));
}
} catch (Exception e) {
log.error("Can't do action", e);
Modified: trunk/src/main/java/org/chorem/bow/action/SearchAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/SearchAction.java 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/java/org/chorem/bow/action/SearchAction.java 2011-02-18 18:12:04 UTC (rev 211)
@@ -23,9 +23,6 @@
*/
package org.chorem.bow.action;
-import java.io.IOException;
-
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.interceptor.ServletRequestAware;
@@ -95,16 +92,8 @@
* Searches a bookmark
*/
public String execute() {
- try {
- BowPreference user = getBowSession().getPreference();
- BowSearch.search(request, user);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ServletException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ BowPreference user = getBowSession().getPreference();
+ BowSearch.search(request, user);
return SUCCESS;
}
}
\ No newline at end of file
Modified: trunk/src/main/resources/i18n/bow_en_GB.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_en_GB.properties 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/resources/i18n/bow_en_GB.properties 2011-02-18 18:12:04 UTC (rev 211)
@@ -1,8 +1,13 @@
bow.action.locale.english=English
bow.action.locale.french=Fran\u00E7ais
-bow.bookmark.badFileFormat=
+bow.bookmark.add.successful=Bookmark successfully added
+bow.bookmark.badFileFormat=Bad bookmarks file format \: unsuccessful import (expected Netscape-like bookmarks file)
bow.bookmark.description=Description
+bow.bookmark.import.delete.successful=The imported bookmarks were deleted successfully
+bow.bookmark.import.successful=The bookmarks were imported successfully
+bow.bookmark.remove.successful=The bookmark was removed successfully
bow.bookmark.tags=Tags
+bow.bookmark.update.successful=The bookmark was updated successfully
bow.bookmarks.noBookmarks=No bookmarks
bow.config.alias.url.description=
bow.config.application.version.description=
@@ -14,6 +19,7 @@
bow.config.data.dir.description=
bow.config.search.engine.description=
bow.config.servlet.bow.description=
+bow.error.internal=An internal error occurred, please contact an administrator if the problem persists
bow.footer.bugreport=Bug report
bow.footer.license=AGPL License
bow.footer.userSupport=User support
@@ -36,6 +42,8 @@
bow.login.repeatPassword.required=Please repeat your password
bow.login.submit=Login
bow.login.title=Login
+bow.mail.badFormat=Your email format is incorrect and therefore the email hasn't been sent
+bow.mail.sendError=An error occurred while sending email
bow.preferences.badCurrentPassword=Your current password is incorrect
bow.preferences.bookmarksHomePage=Number of bookmarks displayed on the home page
bow.preferences.colors=Site color
@@ -52,6 +60,7 @@
bow.preferences.submit=Change
bow.preferences.tagsNb=Number of tags displayed in the tag cloud
bow.preferences.title=Preferences
+bow.preferences.update.successful=The preferences have been updated successfully
bow.preferences.userInfo=User information
bow.register.emailAldyUsed=This email address is already used
bow.register.invalidLogin=Something went wrong during your registration, please try again
@@ -95,3 +104,4 @@
bow.search.orderby=Order by
bow.search.submit=Search
bow.search.title=Search
+bow.token.generate.successful=The token has been regenerated successfully
Modified: trunk/src/main/resources/i18n/bow_fr_FR.properties
===================================================================
--- trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/resources/i18n/bow_fr_FR.properties 2011-02-18 18:12:04 UTC (rev 211)
@@ -1,8 +1,13 @@
bow.action.locale.english=English
bow.action.locale.french=Fran\u00E7ais
-bow.bookmark.badFileFormat=
+bow.bookmark.add.successful=Marque-page ajout\u00E9 avec succ\u00E8s
+bow.bookmark.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le fichier doit avoir un format de type Netscape)
bow.bookmark.description=Description
+bow.bookmark.import.delete.successful=Les marque-pages import\u00E9s ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s
+bow.bookmark.import.successful=Les marque-pages ont \u00E9t\u00E9 import\u00E9s avec succ\u00E8s
+bow.bookmark.remove.successful=Le marque-page a \u00E9t\u00E9 supprim\u00E9 avec succ\u00E8s
bow.bookmark.tags=Tags
+bow.bookmark.update.successful=Le marque-page a \u00E9t\u00E9 mis \u00E0 jour avec succ\u00E8s
bow.bookmarks.noBookmarks=Pas de marque-page
bow.config.alias.url.description=
bow.config.application.version.description=
@@ -14,6 +19,7 @@
bow.config.data.dir.description=
bow.config.search.engine.description=
bow.config.servlet.bow.description=
+bow.error.internal=Une erreur interne est survenue, merci de contacter un administrateur si cette erreur persiste
bow.footer.bugreport=Rapport de bug
bow.footer.license=Licence AGPL
bow.footer.userSupport=Support utilisateur
@@ -36,6 +42,8 @@
bow.login.repeatPassword.required=Veuillez retaper votre mot de passe
bow.login.submit=Connexion
bow.login.title=Connexion
+bow.mail.badFormat=Votre adresse email est mal form\u00E9e \: aucun mail n''a pu \u00EAtre envoy\u00E9
+bow.mail.sendError=Une erreur s''est produite lors de l''envoi du mail
bow.preferences.badCurrentPassword=Votre mot de passe actuel est incorrect
bow.preferences.bookmarksHomePage=Nombre de marque-pages affich\u00E9s
bow.preferences.colors=Couleur du site
@@ -52,6 +60,7 @@
bow.preferences.submit=Changer
bow.preferences.tagsNb=Nombre de tags affich\u00E9s sur le nuage de tags
bow.preferences.title=Pr\u00E9f\u00E9rences
+bow.preferences.update.successful=Vos pr\u00E9f\u00E9rences ont \u00E9t\u00E9 mises \u00E0 jour avec succ\u00E8s
bow.preferences.userInfo=Informations utilisateur
bow.register.emailAldyUsed=Cette adresse email est d\u00E9j\u00E0 utilis\u00E9e
bow.register.invalidLogin=Une erreur s''est produite pendant l''enregistrement de vos informations, merci d''essayer \u00E0 nouveau
@@ -95,3 +104,4 @@
bow.search.orderby=Trier par
bow.search.submit=Rechercher
bow.search.title=Recherche
+bow.token.generate.successful=Le token a y00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s
Modified: trunk/src/main/resources/struts.xml
===================================================================
--- trunk/src/main/resources/struts.xml 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/resources/struts.xml 2011-02-18 18:12:04 UTC (rev 211)
@@ -73,33 +73,47 @@
</interceptor-stack>
</interceptors>
<action name="importBookmarks" class="org.chorem.bow.action.ImportBookmarksAction">
+ <interceptor-ref name="store">
+ <param name="operationMode">STORE</param>
+ </interceptor-ref>
<interceptor-ref name="loginStack" />
- <result name="error" type="redirectAction">error</result>
- <result type="redirect">${redirectTo}</result>
+ <result type="redirect">${redirectTo}</result>
</action>
<action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction">
<interceptor-ref name="loginStack" />
</action>
<action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction">
- <interceptor-ref name="loginStack" />
- <result type="redirectAction">home</result>
+ <interceptor-ref name="store">
+ <param name="operationMode">STORE</param>
+ </interceptor-ref>
+ <interceptor-ref name="loginStack" />
+ <result type="redirectAction">home</result>
</action>
<action name="removeBookmark" class="org.chorem.bow.action.RemoveBookmarkAction">
- <interceptor-ref name="loginStack" />
- <result type="redirect">${redirectTo}</result>
+ <interceptor-ref name="store">
+ <param name="operationMode">STORE</param>
+ </interceptor-ref>
+ <interceptor-ref name="loginStack" />
+ <result type="redirect">${redirectTo}</result>
</action>
<action name="editBookmark" class="org.chorem.bow.action.EditBookmarkAction">
- <interceptor-ref name="loginStack" />
- <result name="home" type="redirectAction">home</result>
- <result name="search">/jsp/search.jsp</result>
+ <interceptor-ref name="loginStack" />
+ <result name="home" type="redirectAction">home</result>
+ <result name="search">/jsp/search.jsp</result>
</action>
<action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction">
- <interceptor-ref name="loginStack" />
- <result type="redirectAction">preferences</result>
+ <interceptor-ref name="store">
+ <param name="operationMode">STORE</param>
+ </interceptor-ref>
+ <interceptor-ref name="loginStack" />
+ <result type="redirectAction">preferences</result>
</action>
<action name="addUrl" class="org.chorem.bow.action.AddUrlAction">
- <interceptor-ref name="loginStack" />
- <result type="redirect">${redirectTo}</result>
+ <interceptor-ref name="store">
+ <param name="operationMode">STORE</param>
+ </interceptor-ref>
+ <interceptor-ref name="loginStack" />
+ <result type="redirect">${redirectTo}</result>
</action>
</package>
@@ -114,6 +128,9 @@
</interceptor-stack>
</interceptors>
<action name="search" class="org.chorem.bow.action.SearchAction">
+ <interceptor-ref name="store">
+ <param name="operationMode">RETRIEVE</param>
+ </interceptor-ref>
<interceptor-ref name="loginStack" />
<result>/jsp/search.jsp</result>
</action>
@@ -150,15 +167,22 @@
</interceptor-stack>
</interceptors>
<action name="home" class="org.chorem.bow.action.HomeAction">
- <interceptor-ref name="loginStack" />
- <result>/jsp/home.jsp</result>
+ <interceptor-ref name="store">
+ <param name="operationMode">RETRIEVE</param>
+ </interceptor-ref>
+ <interceptor-ref name="loginStack" />
+ <result>/jsp/home.jsp</result>
+ <result name="input" type="redirectAction">home</result>
</action>
<action name="locale" class="org.chorem.bow.action.LocaleAction">
<result type="redirect">/jsp/login.jsp</result>
</action>
<action name="regenPermToken" class="org.chorem.bow.action.GenerateTokenAction">
- <interceptor-ref name="loginStack" />
- <result type="redirectAction">preferences</result>
+ <interceptor-ref name="store">
+ <param name="operationMode">STORE</param>
+ </interceptor-ref>
+ <interceptor-ref name="loginStack" />
+ <result type="redirectAction">preferences</result>
</action>
<action name="deleteTag" class="org.chorem.bow.action.DeleteTagAction">
<interceptor-ref name="loginStack" />
@@ -173,23 +197,29 @@
<result>/jsp/{1}Xml.jsp</result>
</action>
<action name="preferences" class="org.chorem.bow.action.PreferencesAction">
- <interceptor-ref name="loginStack" />
- <result name="update" type="redirectAction">preferences</result>
- <result name="error">/jsp/preferences.jsp</result>
- <result>/jsp/preferences.jsp</result>
+ <interceptor-ref name="store">
+ <param name="operationMode">STORE</param>
+ </interceptor-ref>
+ <interceptor-ref name="store">
+ <param name="operationMode">RETRIEVE</param>
+ </interceptor-ref>
+ <interceptor-ref name="loginStack" />
+ <result name="update" type="redirectAction">preferences</result>
+ <result name="error">/jsp/preferences.jsp</result>
+ <result>/jsp/preferences.jsp</result>
</action>
<action name="admin">
- <interceptor-ref name="loginStack" />
- <result name="error">/jsp/login.jsp</result>
- <result>/jsp/admin.jsp</result>
+ <interceptor-ref name="loginStack" />
+ <result name="error">/jsp/login.jsp</result>
+ <result>/jsp/admin.jsp</result>
</action>
<action name="reIndexation" class="org.chorem.bow.action.ReIndexationAction">
- <interceptor-ref name="loginStack" />
- <result>/jsp/admin.jsp</result>
+ <interceptor-ref name="loginStack" />
+ <result>/jsp/admin.jsp</result>
</action>
<action name="migrate04To05" class="org.chorem.bow.action.Migrate04To05Action">
- <interceptor-ref name="loginStack" />
- <result>/jsp/admin.jsp</result>
+ <interceptor-ref name="loginStack" />
+ <result>/jsp/admin.jsp</result>
</action>
</package>
</struts>
Modified: trunk/src/main/webapp/css/bookmark.css
===================================================================
--- trunk/src/main/webapp/css/bookmark.css 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/webapp/css/bookmark.css 2011-02-18 18:12:04 UTC (rev 211)
@@ -36,7 +36,7 @@
background:#fff url('/bow/img/fondhead.jpg') repeat-x 0 0;
float:left;
position:absolute;
- right:77%;
+ right:85%;
top:0;
height:100px;
width:100%;
@@ -488,4 +488,8 @@
#bookmarkForm label{
margin-top:12px;
font-style:normal;
+}
+
+#add h2{
+ margin-bottom:20px;
}
\ No newline at end of file
Modified: trunk/src/main/webapp/css/connexion.css
===================================================================
--- trunk/src/main/webapp/css/connexion.css 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/webapp/css/connexion.css 2011-02-18 18:12:04 UTC (rev 211)
@@ -30,15 +30,17 @@
height:100px;
clear:both;
margin:0 auto;
- position: relative;
+ position:absolute;
}
#header a.logo{
- background:url(/bow/img/logobow.jpg);
- width:290px;
- height:100px;
- text-indent:-99999px;
- display:block;
+ background:transparent url('/bow/img/logobow.jpg') repeat scroll 0 0;
+ display:block;
+ height:100px;
+ text-indent:-99999px;
+ width:290px;
+ float:left;
+ position:relative;
}
#main{
@@ -62,7 +64,7 @@
width:1004px;
position:relative;
margin:0 auto;
- padding-top:20px;
+ padding-top:120px;
}
#formFrame{
Modified: trunk/src/main/webapp/css/global.css
===================================================================
--- trunk/src/main/webapp/css/global.css 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/webapp/css/global.css 2011-02-18 18:12:04 UTC (rev 211)
@@ -113,4 +113,22 @@
font-weight:normal;
font-size:12px;
color:red;
+}
+
+#actionmessageHeader{
+ color:blue;
+ position:relative;
+ left:25%;
+ top:12px;
+}
+
+#actionerrorHeader{
+ color:red;
+ position:relative;
+ left:25%;
+ top:12px;
+}
+
+#actionmessageHeader ul, #actionerrorHeader ul{
+ list-style-type:none;
}
\ No newline at end of file
Modified: trunk/src/main/webapp/jsp/inc/header.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/header.jsp 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/webapp/jsp/inc/header.jsp 2011-02-18 18:12:04 UTC (rev 211)
@@ -27,10 +27,15 @@
xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
xmlns:jsp="http://java.sun.com/JSP/Page">
<s:if test="%{#session.BowSession.user != null}">
- <a class="logo"
- href="<s:property value='%{#session.bowUrl}' />home.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />">bow</a>
+ <a class="logo" href="home.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />">bow</a>
</s:if>
<s:else>
- <a class="logo" href="">bow</a>
+ <a class="logo" href="home.action">bow</a>
</s:else>
+ <span id="actionmessageHeader">
+ <s:actionmessage />
+ </span>
+ <span id="actionerrorHeader">
+ <s:actionerror />
+ </span>
</div>
\ No newline at end of file
Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-18 10:40:36 UTC (rev 210)
+++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-18 18:12:04 UTC (rev 211)
@@ -71,7 +71,7 @@
</div>
<div id="add" class="clearfix">
<h2><s:text name="bow.rightMenu.bookmark.addModify" /></h2>
- <s:form var="bookmarkForm" action="%{#request.formAction}">
+ <s:form id="bookmarkForm" action="%{#request.formAction}">
<p>
<s:textfield key="bow.rightMenu.bookmark.link" name="link" value="%{#request.link}" labelSeparator="" /><br />
<s:textfield key="bow.rightMenu.bookmark.alias" name="alias" value="%{#request.alias}" labelSeparator="" /><br />
1
0
r210 - in trunk/src/main/java/org/chorem/bow: . action interceptor
by vbriand＠users.chorem.org Feb. 18, 2011
by vbriand＠users.chorem.org Feb. 18, 2011
Feb. 18, 2011
Author: vbriand
Date: 2011-02-18 11:40:36 +0100 (Fri, 18 Feb 2011)
New Revision: 210
Url: http://chorem.org/repositories/revision/bow/210
Log:
Fixed some code (added comments and removed multiple returns in a single method)
Modified:
trunk/src/main/java/org/chorem/bow/BowUtils.java
trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java
trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java
trunk/src/main/java/org/chorem/bow/action/DeleteImportAction.java
trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java
trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java
trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java
trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java
trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java
trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java
trunk/src/main/java/org/chorem/bow/action/HomeAction.java
trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
trunk/src/main/java/org/chorem/bow/action/LoginAction.java
trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java
trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java
trunk/src/main/java/org/chorem/bow/action/OpenSearchSuggestionAction.java
trunk/src/main/java/org/chorem/bow/action/OrderAction.java
trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java
trunk/src/main/java/org/chorem/bow/action/RegisterAction.java
trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java
trunk/src/main/java/org/chorem/bow/action/SearchAction.java
trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java
trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java
Modified: trunk/src/main/java/org/chorem/bow/BowUtils.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/BowUtils.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -43,11 +43,12 @@
static public String redirectTo(String searchLine, String fullTextLine) {
+ String result = "home.action";
+
if (!searchLine.equals("") || !fullTextLine.equals("")) {
- return "search.action?searchLine=" + searchLine + "&fullTextLine=" + fullTextLine;
- } else {
- return "home.action";
+ result = "search.action?searchLine=" + searchLine + "&fullTextLine=" + fullTextLine;
}
+ return result;
}
static public BowUser checkToken(BowSession session, String token) {
Modified: trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/SuggestionsComparator.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -34,12 +34,14 @@
@Override
public int compare(FacetTopic o1, FacetTopic o2) {
+ int result = 0;
+
if (o1.getCount() < o2.getCount()) {
- return 1;
+ result = 1;
}
- if (o1.getCount() > o2.getCount()) {
- return -1;
+ else if (o1.getCount() > o2.getCount()) {
+ result = -1;
}
- return 0;
+ return result;
}
}
Modified: trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -34,6 +34,12 @@
import org.chorem.bow.BowProxy;
import org.chorem.bow.BowSession;
+/**
+ * Base class which must be extended by every action
+ * Overrides the Struts2 methods to render text in order to explicitly show
+ * the missing i18n translations
+ * Allows access to the session and the proxy
+ */
public class BowBaseAction extends ActionSupport implements SessionAware {
private static final long serialVersionUID = 1L;
@@ -90,7 +96,8 @@
}
@Override
- public String getText(String aTextName, String defaultValue, List<Object> args) {
+ public String getText(String aTextName, String defaultValue,
+ List<Object> args) {
String value = super.getText(aTextName, defaultValue, args);
return getSafeText(aTextName, value);
}
@@ -102,17 +109,22 @@
}
@Override
- public String getText(String key, String defaultValue, List<Object> args, ValueStack stack) {
+ public String getText(String key, String defaultValue, List<Object> args,
+ ValueStack stack) {
String value = super.getText(key, defaultValue, args, stack);
return getSafeText(key, value);
}
@Override
- public String getText(String key, String defaultValue, String[] args, ValueStack stack) {
+ public String getText(String key, String defaultValue, String[] args,
+ ValueStack stack) {
String value = super.getText(key, defaultValue, args, stack);
return getSafeText(key, value);
}
+ /**
+ * Surrounds the non translated keys with a marker to make them visible
+ */
protected String getSafeText(String key, String value) {
if (StringUtils.isEmpty(value)) {
if (log.isWarnEnabled()) {
Modified: trunk/src/main/java/org/chorem/bow/action/DeleteImportAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/DeleteImportAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/DeleteImportAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -57,6 +57,9 @@
this.date = date;
}
+ /**
+ * Deletes a bookmark import
+ */
public String execute() {
if (date != null &&
date.matches("[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{1,3}Z")) {
Modified: trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -74,6 +74,9 @@
this.fullTextLine = fullTextLine;
}
+ /**
+ * Deletes the search results
+ */
public String execute() {
if (searchLine != null && fullTextLine != null) {
WikittyProxy proxy = getBowProxy();
Modified: trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -100,6 +100,9 @@
return redirectTo;
}
+ /**
+ * Deletes a bookmark's tag
+ */
public String execute() {
if (deleteTag != null && bookmarkId != null) {
if (!bookmarkId.isEmpty()) {
Modified: trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -98,6 +98,8 @@
}
public String execute() {
+ String result;
+
if (bookmarkId != null && !bookmarkId.isEmpty()) {
WikittyProxy proxy = getBowProxy();
BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId);
@@ -118,7 +120,7 @@
BowPreference user = getBowSession().getPreference();
if (searchLine == null || searchLine.equals("")) {
BowInit.initHomePage(request, user);
- return "home";
+ result = "home";
} else {
try {
BowSearch.search(request, user);
@@ -129,7 +131,8 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
- return "search";
+ result = "search";
}
+ return result;
}
}
\ No newline at end of file
Modified: trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -53,6 +53,9 @@
this.response = response;
}
+ /**
+ * Exports the bookmarks in HTML format
+ */
public String execute() {
WikittyProxy proxy = getBowProxy();
BowUser user = getBowSession().getUser();
Modified: trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -74,7 +74,12 @@
// return false;
// }
+ /**
+ * Generates a new password and sends it to the user
+ */
public String execute() {
+ String result = INPUT;
+
if (email != null) {
email = email.trim();
if (!email.isEmpty()) {
@@ -109,12 +114,12 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
- return SUCCESS;
+ result = SUCCESS;
} else {
addFieldError("email", getText(n_("bow.forgotPassword.emailDoesntExist")));
}
}
}
- return INPUT;
+ return result;
}
}
\ No newline at end of file
Modified: trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -77,6 +77,9 @@
this.fullTextLine = fullTextLine;
}
+ /**
+ * Fulltext search
+ */
public String execute() {
BowSession session = getBowSession();
BowPreference user = session.getPreference();
Modified: trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -36,6 +36,9 @@
private static final long serialVersionUID = 1141019772989666309L;
+ /**
+ * Generates a new permanent and temporary token
+ */
public String execute() {
BowUser user = getBowSession().getUser();
WikittyProxy proxy = getBowProxy();
Modified: trunk/src/main/java/org/chorem/bow/action/HomeAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/HomeAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/HomeAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -57,6 +57,9 @@
this.request = request;
}
+ /**
+ * Initializes everything before displaying the home page
+ */
public String execute() {
BowPreference user = getBowSession().getPreference();
Modified: trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -57,7 +57,8 @@
*
* @author poussin
*/
-public class ImportBookmarksAction extends BowBaseAction implements ServletRequestAware {
+public class ImportBookmarksAction extends BowBaseAction implements
+ ServletRequestAware {
private static final long serialVersionUID = -5962680416570797028L;
protected File upfile;
protected String upfileContentType;
@@ -75,7 +76,8 @@
}
/**
- * @param upfile the upfile to set
+ * @param upfile
+ * the upfile to set
*/
public void setUpfile(File upfile) {
this.upfile = upfile;
@@ -89,7 +91,8 @@
}
/**
- * @param upfileContentType the upfileContentType to set
+ * @param upfileContentType
+ * the upfileContentType to set
*/
public void setUpfileContentType(String upfileContentType) {
this.upfileContentType = upfileContentType;
@@ -103,7 +106,8 @@
}
/**
- * @param upfileFileName the upfileFileName to set
+ * @param upfileFileName
+ * the upfileFileName to set
*/
public void setUpfileFileName(String upfileFileName) {
this.upfileFileName = upfileFileName;
@@ -117,7 +121,8 @@
}
/**
- * @param searchLine the searchLine to set
+ * @param searchLine
+ * the searchLine to set
*/
public void setSearchLine(String searchLine) {
this.searchLine = searchLine;
@@ -131,7 +136,8 @@
}
/**
- * @param fullTextLine the fullTextLine to set
+ * @param fullTextLine
+ * the fullTextLine to set
*/
public void setFullTextLine(String fullTextLine) {
this.fullTextLine = fullTextLine;
@@ -146,135 +152,142 @@
@Override
public void setServletRequest(HttpServletRequest request) {
- this.request = request;
+ this.request = request;
}
-// protected void createImportExtension(List<Bookmark> bookmarks) {
-// if (bookmarks != null && !bookmarks.isEmpty()) {
-// WikittyProxy proxy = getBowProxy();
-// 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);
-// }
-// }
+ // protected void createImportExtension(List<Bookmark> bookmarks) {
+ // if (bookmarks != null && !bookmarks.isEmpty()) {
+ // WikittyProxy proxy = getBowProxy();
+ // 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);
+ // }
+ // }
protected void parseHtmlToBookmarks(NodeList list, BowUser user, Date date,
List<BowBookmark> bookmarks, List<String> tagList)
- throws ParserException {
- if (list != null) {
- boolean isFolder = false;
- SimpleNodeIterator it = list.elements();
+ throws ParserException {
+ if (list != null) {
+ boolean isFolder = false;
+ SimpleNodeIterator it = list.elements();
- while (it.hasMoreNodes()) {
- Node node = it.nextNode();
- String plainText = node.toPlainTextString(); //The text between two heads ==> <toto>plainText</toto>
- String text = node.getText(); //The text in the head ==> <text></toto>
+ while (it.hasMoreNodes()) {
+ Node node = it.nextNode();
+ String plainText = node.toPlainTextString(); // The text between
+ // two heads ==>
+ // <toto>plainText</toto>
+ String text = node.getText(); // The text in the head ==>
+ // <text></toto>
- if (text != null && text.startsWith("H3")) { // H3 = folder
- if (plainText != null && !plainText.isEmpty()) {
- tagList.add(plainText); //Adds the folder name to the tagList
- isFolder = true;
- }
- } else if (text != null && text.startsWith("A HREF")) { // HREF = new bookmarks
- BowBookmark bookmark = BookmarkUtils.createBookmarkFromHtml(text, plainText, user);
- Wikitty w = getBowProxy().getWikitty(bookmark);
- BowImportHelper.addExtension(w);
- BowImportHelper.setImportDate(w, date);
- BookmarkUtils.addTagsToBookmark(tagList, bookmark);
+ if (text != null && text.startsWith("H3")) { // H3 = folder
+ if (plainText != null && !plainText.isEmpty()) {
+ tagList.add(plainText); // Adds the folder name to the
+ // tagList
+ isFolder = true;
+ }
+ } else if (text != null && text.startsWith("A HREF")) { // HREF
+ // = new
+ // bookmarks
+ BowBookmark bookmark = BookmarkUtils
+ .createBookmarkFromHtml(text, plainText, user);
+ Wikitty w = getBowProxy().getWikitty(bookmark);
+ BowImportHelper.addExtension(w);
+ BowImportHelper.setImportDate(w, date);
+ BookmarkUtils.addTagsToBookmark(tagList, bookmark);
- if (bookmark != null) {
- bookmarks.add(bookmark);
- }
- }
- NodeList children = node.getChildren();
+ if (bookmark != null) {
+ bookmarks.add(bookmark);
+ }
+ }
+ NodeList children = node.getChildren();
- if (children != null) {
- parseHtmlToBookmarks(children, user, date, bookmarks, tagList); //If there is an under node = recursion
- }
- }
- if (isFolder) { //If we find a folder, we have to remove it
- int index = tagList.size() - 1;
+ if (children != null) {
+ parseHtmlToBookmarks(children, user, date, bookmarks,
+ tagList); // If there is an under node = recursion
+ }
+ }
+ if (isFolder) { // If we find a folder, we have to remove it
+ int index = tagList.size() - 1;
- if (index > -1) {
- tagList.remove(index);
- }
- }
- }
+ if (index > -1) {
+ tagList.remove(index);
+ }
+ }
+ }
}
public String execute() {
- BowPreference user = getBowSession().getPreference();
-
- if (upfile != null) {
-// try {
-// List<?> lines = FileUtils.readLines(upfile);
-// String content = "";
-//
-// for (Object line : lines) {
-// content += (String)line;
-// }
- WikittyProxy proxy = getBowProxy();
+ BowPreference user = getBowSession().getPreference();
+ String result = SUCCESS;
- try {
- URL url = upfile.toURI().toURL();
- Parser parser = new Parser(url.openConnection());
- NodeList list = parser.parse(null);
- List<BowBookmark> bookmarks = new ArrayList<BowBookmark>();
- parseHtmlToBookmarks(list, user, new Date(), bookmarks, new ArrayList<String>());
- bookmarks = proxy.store(bookmarks);
-// createImportExtension(bookmarks);
- redirectTo = BowUtils.redirectTo(searchLine, fullTextLine);
- if (searchLine == null || searchLine.isEmpty()) {
- BowInit.initHomePage(request, user);
- return SUCCESS;
- } else {
- try {
- BowSearch.search(request, user);
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (ServletException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- return SUCCESS;
- }
- } catch (ParserException e) {
- request.setAttribute("errorMsgUser", getText(n_("bow.bookmark.badFileFormat")));
- request.setAttribute("errorMsgTech", e.getMessage());
- redirectTo = BowUtils.redirectTo(searchLine, fullTextLine);
+ if (upfile != null) {
+ // try {
+ // List<?> lines = FileUtils.readLines(upfile);
+ // String content = "";
+ //
+ // for (Object line : lines) {
+ // content += (String)line;
+ // }
+ WikittyProxy proxy = getBowProxy();
- if (searchLine == null || searchLine.isEmpty()) {
- BowInit.initHomePage(request, user);
- return SUCCESS;
- } else {
- try {
- BowSearch.search(request, user);
- } catch (IOException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- } catch (ServletException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- return SUCCESS;
- }
- } catch (IOException e2) {
- // TODO Auto-generated catch block
- e2.printStackTrace();
- return ERROR;
- }
- }
- return SUCCESS;
+ try {
+ URL url = upfile.toURI().toURL();
+ Parser parser = new Parser(url.openConnection());
+ NodeList list = parser.parse(null);
+ List<BowBookmark> bookmarks = new ArrayList<BowBookmark>();
+ parseHtmlToBookmarks(list, user, new Date(), bookmarks,
+ new ArrayList<String>());
+ bookmarks = proxy.store(bookmarks);
+ // createImportExtension(bookmarks);
+ redirectTo = BowUtils.redirectTo(searchLine, fullTextLine);
+ if (searchLine == null || searchLine.isEmpty()) {
+ BowInit.initHomePage(request, user);
+ } else {
+ try {
+ BowSearch.search(request, user);
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (ServletException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ }
+ } catch (ParserException e) {
+ request.setAttribute("errorMsgUser",
+ getText(n_("bow.bookmark.badFileFormat")));
+ request.setAttribute("errorMsgTech", e.getMessage());
+ redirectTo = BowUtils.redirectTo(searchLine, fullTextLine);
+
+ if (searchLine == null || searchLine.isEmpty()) {
+ BowInit.initHomePage(request, user);
+ } else {
+ try {
+ BowSearch.search(request, user);
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (ServletException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ }
+ } catch (IOException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ result = ERROR;
+ }
+ }
+ return result;
}
-}
\ No newline at end of file
+}
Modified: trunk/src/main/java/org/chorem/bow/action/LoginAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/LoginAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/LoginAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -109,7 +109,12 @@
return result;
}
+ /**
+ * Authenticates the user if his email and password are valid
+ */
public String execute() {
+ String result = INPUT;
+
if (email != null) {
email = email.trim();
@@ -122,10 +127,10 @@
getBowSession().setUser(user);
BowPreference pref = getBowSession().getPreference();
BowInit.initHomePage(servletRequest, pref);
- return SUCCESS;
+ result = SUCCESS;
}
}
}
- return INPUT;
+ return result;
}
}
\ No newline at end of file
Modified: trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -142,6 +142,9 @@
this.fullTextLine = fullTextLine;
}
+ /**
+ * Modifies a bookmark
+ */
public String execute() {
WikittyProxy proxy = getBowProxy();
BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId);
Modified: trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -45,7 +45,8 @@
*
* @author poussin
*/
-public class OpenSearchResultAction extends BowBaseAction implements ServletRequestAware, ServletResponseAware {
+public class OpenSearchResultAction extends BowBaseAction implements ServletRequestAware,
+ServletResponseAware {
private static final long serialVersionUID = -1691325797986483856L;
protected String searchLine;
protected String token;
@@ -104,7 +105,7 @@
redirectTo = BowUtils.redirectTo(searchLine, null);
} else if (searchLine != null
&& (searchLine.startsWith(":") || searchLine.startsWith("t:"))) {
- //On fait une recherche sur les tags
+ //Search on tags
int index = searchLine.indexOf(":");
searchLine = searchLine.substring(index + 1); //Suppresses first ":"
@@ -118,7 +119,7 @@
request.setAttribute("token", token);
redirectTo = BowUtils.redirectTo(searchLine, null);
} else if (searchLine != null && searchLine.startsWith("f:")) {
- // recherche fulltext dans bow
+ //Fulltext search in bow
String fullText = searchLine.substring(2);
WikittyProxy proxy = getBowProxy();
Criteria criteria;
@@ -135,11 +136,11 @@
request.setAttribute("token", token);
redirectTo = BowUtils.redirectTo(searchLine, null);
} else if (searchLine != null && searchLine.startsWith("a:")) {
- // on redirige vers l'alias demande
+ //Redirects to the requested alias
searchLine = searchLine.substring(2);
redirectTo = BowConfig.getInstance().getAliasUrl() + searchLine;
} else {
- // on fait une recherche sur le moteur de recherche configure
+ //Search on the chosen search engine
BowPreference pref = getBowSession().getPreference();
String searchEngineURL = pref.getSearchEngineUrlResults();
Modified: trunk/src/main/java/org/chorem/bow/action/OpenSearchSuggestionAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/OpenSearchSuggestionAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/OpenSearchSuggestionAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -41,7 +41,7 @@
/**
* Retourne les suggestions pour l'opensearch en fonction de ce qui a ete deja
- * saisie
+ * saisi
*
* @author poussin
*/
Modified: trunk/src/main/java/org/chorem/bow/action/OrderAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/OrderAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/OrderAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -80,6 +80,9 @@
this.request = request;
}
+ /**
+ * Orders the bookmarks according to a criteria
+ */
public String execute() {
BowPreference user = getBowSession().getPreference();
Criteria baseCriteria = BookmarkUtils.getBookmarkListCriteriaByUser(user, searchLine);
Modified: trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -41,7 +41,7 @@
import static org.nuiton.i18n.I18n.n_;
/**
- * Change les preferences de l'utilisateur (coleur, password, email, ...)
+ * Change les preferences de l'utilisateur (couleur, password, email, ...)
*
* @author poussin
*/
@@ -254,10 +254,14 @@
return newUser;
}
+ /**
+ * Changes the user preferences
+ */
public String execute() {
BowProxy proxy = getBowSession().getProxy();
- // BowPreference etends BowUser, donc on l'utilise pour tout
+ // BowPreference extends BowUser, donc on l'utilise pour tout
BowPreference preference = getBowSession().getPreference();
+ String result = SUCCESS;
setBookmarksImportDate(BookmarkUtils.getBookmarksByImportDate(request, preference));
if (update != null) { //If the user submitted the form
@@ -268,20 +272,21 @@
Criteria criteria = Search.query().eq(BowUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria();
BowUser find = proxy.findByCriteria(BowUser.class, criteria);
+ //If this email address isn't already used (or if it hasn't changed)
if (find == null || find.getLogin().equals(preference.getLogin())) {
BowUser newUser = changeUser(preference);
if (newUser == null) {
- return ERROR;
+ result = ERROR;
+ } else {
+ newUser = proxy.store(newUser);
+ getBowSession().setUser(newUser);
+ result = "update";
}
- newUser = proxy.store(newUser);
- getBowSession().setUser(newUser);
-
- return "update";
} else {
// this email address is already used by someone else
setEmail(preference.getLogin());
addActionError(getText("bow.preferences.emailAldyExists"));
- return ERROR;
+ result = ERROR;
}
} else {
// If the user didn't submit the form, the fields are filled with
@@ -296,6 +301,6 @@
// retrieve last reference
preference = getBowSession().getPreference();
BowInit.initHomePage(request, preference);
- return SUCCESS;
+ return result;
}
}
Modified: trunk/src/main/java/org/chorem/bow/action/RegisterAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -100,67 +100,80 @@
this.request = request;
}
- protected boolean checkRegister(String passwordMD5) {
+ /**
+ *
+ * @param passwordMD5 the user password hashed in md5
+ * @return false if the email address isn't already registered, true
+ * otherwise
+ */
+ protected boolean alreadyRegistered(String passwordMD5) {
+ boolean result = true;
+
if (email != null && passwordMD5 != null) {
if (!email.isEmpty() && !passwordMD5.equals(StringUtil.encodeMD5(""))) {
WikittyProxy proxy = getBowProxy();
Criteria criteria = Search.query().eq(BowUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria(); //Retrieves user by user name (email)
+ //If the user doesn't already exist
if (proxy.findByCriteria(BowUser.class, criteria) == null) {
- return false;
+ result = false;
+ } else { //The email address is already used by someone
+ addFieldError("email", getText(n_("bow.register.emailAldyUsed")));
}
- //FIXME : message d'erreur mais return true ???
- addFieldError("email", getText(n_("bow.register.emailAldyUsed")));
- return true;
}
}
- //FIXME : message d'erreur mais return true ???
- //request.setAttribute("errorMsgUser", "Email and password must be correctly filled");
- return true;
+ return result;
}
+ /**
+ * Registers the new user and sends an email to confirm registration
+ */
public String execute() {
+ String result = INPUT;
+
if (email != null) {
email = email.trim();
if (password != null) {
if (!password.equals(repeatPassword)) {
addActionError(getText(n_("bow.register.pwdDontMatch")));
- return INPUT;
- }
- String md5 = StringUtil.encodeMD5(password);
+ } else {
+ String md5 = StringUtil.encodeMD5(password);
- if (!checkRegister(md5)) {
- WikittyProxy proxy = getBowProxy();
- BowUserImpl newUser = new BowUserImpl();
- newUser.setPassword(md5);
- newUser.setLogin(email);
- String permanentToken = BowUtils.generateToken();
- newUser.setPermanentToken(permanentToken);
- BowUser login = proxy.store(newUser); //Stores the new user
+ //If the email address isn't already used
+ if (!alreadyRegistered(md5)) {
+ WikittyProxy proxy = getBowProxy();
+ BowUserImpl newUser = new BowUserImpl();
+ newUser.setPassword(md5);
+ newUser.setLogin(email);
+ String permanentToken = BowUtils.generateToken();
+ newUser.setPermanentToken(permanentToken);
+ BowUser login = proxy.store(newUser); //Stores the new user
- if (login == null) {
- addFieldError("email", getText(n_("bow.register.invalidLogin")));
- } else {
- getBowSession().setUser(login);
- BowPreference pref = getBowSession().getPreference();
- BowInit.initHomePage(request, pref);
- try {
- String mailContent;
+ //If there was an error when storing the user
+ if (login == null) {
+ addFieldError("email", getText(n_("bow.register.invalidLogin")));
+ } else {
+ getBowSession().setUser(login);
+ BowPreference pref = getBowSession().getPreference();
+ BowInit.initHomePage(request, pref);
+ try {
+ String mailContent;
- mailContent = getText(n_("bow.register.mailHi")) + ",\n\n" + getText(n_("bow.register.mailPwd")) + ": " + password + "\n\n" + getText(n_("bow.register.mailEmail")) + ": " + email + "\n\n";
- BowMail.sendMail(email, getText(n_("bow.register.mailSubject")), mailContent);
- } catch (AddressException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (MessagingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ mailContent = getText(n_("bow.register.mailHi")) + ",\n\n" + getText(n_("bow.register.mailPwd")) + ": " + password + "\n\n" + getText(n_("bow.register.mailEmail")) + ": " + email + "\n\n";
+ BowMail.sendMail(email, getText(n_("bow.register.mailSubject")), mailContent);
+ } catch (AddressException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (MessagingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ result = SUCCESS;
}
- return SUCCESS;
}
}
}
}
- return INPUT;
+ return result;
}
}
Modified: trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -88,6 +88,9 @@
return redirectTo;
}
+ /**
+ * Removes a bookmark
+ */
public String execute() {
if (bookmarkId != null && !bookmarkId.isEmpty()) {
try {
Modified: trunk/src/main/java/org/chorem/bow/action/SearchAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/SearchAction.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/action/SearchAction.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -91,6 +91,9 @@
this.request = request;
}
+ /**
+ * Searches a bookmark
+ */
public String execute() {
try {
BowPreference user = getBowSession().getPreference();
Modified: trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/interceptor/AldyLoggedInterceptor.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -33,6 +33,10 @@
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import org.chorem.bow.BowSession;
+/**
+ * Interceptor used to redirect a logged user if he tries to access a page on
+ * which you mustn't be logged (example : login / register page)
+ */
public class AldyLoggedInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = -2411549996072421471L;
protected String redirect;
@@ -50,11 +54,14 @@
BowSession bowSession = BowSession.getBowSession(session);
BowUser user = bowSession.getUser();
+ String result = invocation.invoke();
+
+ //If the user is logged
if (user != null) {
ServletActionContext.getResponse().sendRedirect(redirect);
- return null;
+ result = null;
}
- return invocation.invoke();
+ return result;
}
}
Modified: trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-02-18 09:10:34 UTC (rev 209)
+++ trunk/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-02-18 10:40:36 UTC (rev 210)
@@ -34,6 +34,10 @@
import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import org.chorem.bow.BowSession;
+/**
+ * Interceptor used to redirect a non-logged user if he tries to access a page
+ * where logging is mandatory
+ */
public class LoginInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = -7520186185205372272L;
protected String redirect;
@@ -51,22 +55,28 @@
BowSession bowSession = BowSession.getBowSession(session);
BowUser user = bowSession.getUser();
+ String result = invocation.invoke();
+ //If the user isn't logged in
if (user == null) {
Map<String, Object> params = ActionContext.getContext().getParameters();
+ //Retrieves the token value in URL
String[] token = (String[]) params.get("token");
if (token != null && !token[0].isEmpty()) {
+ //Retrieves the user by token
user = BowUtils.checkToken(bowSession, token[0]);
+ //If the token is valid
if (user != null) {
+ //Authenticates the user
bowSession.setUser(user);
- return invocation.invoke();
}
+ } else { //If the token is empty
+ ServletActionContext.getResponse().sendRedirect(redirect);
+ result = null;
}
- ServletActionContext.getResponse().sendRedirect(redirect);
- return null;
}
- return invocation.invoke();
+ return result;
}
}
1
0
Feb. 18, 2011
Author: vbriand
Date: 2011-02-18 10:10:34 +0100 (Fri, 18 Feb 2011)
New Revision: 209
Url: http://chorem.org/repositories/revision/bow/209
Log:
Removed unused imports
Modified:
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/action/DeleteSearchResultsAction.java
trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java
trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java
trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java
trunk/src/main/java/org/chorem/bow/action/HomeAction.java
trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java
trunk/src/main/java/org/chorem/bow/action/OrderAction.java
trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java
trunk/src/main/java/org/chorem/bow/action/SearchAction.java
Modified: trunk/src/main/java/org/chorem/bow/BookmarkActions.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/BookmarkActions.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -24,12 +24,8 @@
package org.chorem.bow;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
import java.util.List;
import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.nuiton.util.StringUtil;
import org.nuiton.wikitty.search.FacetTopic;
Modified: trunk/src/main/java/org/chorem/bow/BowConfig.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowConfig.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/BowConfig.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -25,7 +25,6 @@
import static org.nuiton.i18n.I18n._;
-import java.io.File;
import org.apache.commons.lang.UnhandledException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: trunk/src/main/java/org/chorem/bow/BowProxy.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/BowProxy.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/BowProxy.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -24,11 +24,9 @@
package org.chorem.bow;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.nuiton.util.ApplicationConfig;
import org.nuiton.wikitty.entities.WikittyExtension;
-import org.nuiton.wikitty.services.WikittyExtensionMigration;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.WikittyService;
import org.nuiton.wikitty.WikittyServiceFactory;
Modified: trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -29,7 +29,6 @@
import org.chorem.bow.BowBookmark;
import org.chorem.bow.BookmarkUtils;
import org.chorem.bow.BowPreference;
-import org.chorem.bow.BowUser;
import org.nuiton.wikitty.search.Criteria;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.search.Search;
Modified: trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/EditBookmarkAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -35,7 +35,6 @@
import org.chorem.bow.BowInit;
import org.chorem.bow.BowPreference;
import org.chorem.bow.BowSearch;
-import org.chorem.bow.BowUser;
import org.nuiton.wikitty.WikittyProxy;
/**
Modified: trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -23,8 +23,6 @@
*/
package org.chorem.bow.action;
-import java.util.List;
-
import javax.mail.MessagingException;
import javax.mail.internet.AddressException;
Modified: trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -32,7 +32,6 @@
import org.chorem.bow.BowPreference;
import org.chorem.bow.BowSearch;
import org.chorem.bow.BowSession;
-import org.chorem.bow.BowUser;
/**
* Fait la recherche fulltext
Modified: trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -25,9 +25,7 @@
import org.chorem.bow.BowUser;
import org.chorem.bow.BowUtils;
-import org.nuiton.wikitty.search.Criteria;
import org.nuiton.wikitty.WikittyProxy;
-import org.nuiton.wikitty.search.Search;
/**
* Force la regeneration de token permanent et temporaire
Modified: trunk/src/main/java/org/chorem/bow/action/HomeAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/HomeAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/HomeAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -28,7 +28,6 @@
import org.apache.struts2.interceptor.ServletRequestAware;
import org.chorem.bow.BowInit;
import org.chorem.bow.BowPreference;
-import org.chorem.bow.BowUser;
/**
* Prepare l'affichage de la page d'accueil
Modified: trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -34,7 +34,6 @@
import org.chorem.bow.BowConfig;
import org.chorem.bow.BowUtils;
import org.chorem.bow.BowPreference;
-import org.chorem.bow.BowUser;
import org.nuiton.wikitty.search.Criteria;
import org.nuiton.wikitty.search.PagedResult;
import org.nuiton.wikitty.WikittyProxy;
Modified: trunk/src/main/java/org/chorem/bow/action/OrderAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/OrderAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/OrderAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -30,7 +30,6 @@
import org.chorem.bow.BookmarkActions;
import org.chorem.bow.BookmarkUtils;
import org.chorem.bow.BowPreference;
-import org.chorem.bow.BowUser;
import org.nuiton.wikitty.search.Criteria;
import org.nuiton.wikitty.search.PagedResult;
import org.nuiton.wikitty.WikittyProxy;
Modified: trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -23,7 +23,6 @@
*/
package org.chorem.bow.action;
-import java.security.NoSuchAlgorithmException;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -37,7 +36,6 @@
import org.nuiton.util.StringUtil;
import org.nuiton.wikitty.search.Criteria;
import org.nuiton.wikitty.search.FacetTopic;
-import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.search.Search;
import static org.nuiton.i18n.I18n.n_;
Modified: trunk/src/main/java/org/chorem/bow/action/SearchAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/SearchAction.java 2011-02-18 09:04:26 UTC (rev 208)
+++ trunk/src/main/java/org/chorem/bow/action/SearchAction.java 2011-02-18 09:10:34 UTC (rev 209)
@@ -31,7 +31,6 @@
import org.apache.struts2.interceptor.ServletRequestAware;
import org.chorem.bow.BowPreference;
import org.chorem.bow.BowSearch;
-import org.chorem.bow.BowUser;
/**
* gere les recherches de bookmark
1
0
r208 - in trunk/src/main: java/org/chorem/bow/action resources webapp/jsp/inc
by vbriand＠users.chorem.org Feb. 18, 2011
by vbriand＠users.chorem.org Feb. 18, 2011
Feb. 18, 2011
Author: vbriand
Date: 2011-02-18 10:04:26 +0100 (Fri, 18 Feb 2011)
New Revision: 208
Url: http://chorem.org/repositories/revision/bow/208
Log:
Renamed AddClickAction to RedirectToUrlAction
Added:
trunk/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java
Removed:
trunk/src/main/java/org/chorem/bow/action/AddClickAction.java
Modified:
trunk/src/main/resources/struts.xml
trunk/src/main/webapp/jsp/inc/bookmark.jsp
Deleted: trunk/src/main/java/org/chorem/bow/action/AddClickAction.java
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/AddClickAction.java 2011-02-18 08:35:57 UTC (rev 207)
+++ trunk/src/main/java/org/chorem/bow/action/AddClickAction.java 2011-02-18 09:04:26 UTC (rev 208)
@@ -1,76 +0,0 @@
-/*
- * #%L
- * bow
- *
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2010 - 2011 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.action;
-
-import org.chorem.bow.BowBookmark;
-import org.nuiton.wikitty.WikittyProxy;
-
-public class AddClickAction extends BowBaseAction {
-
- private static final long serialVersionUID = 8579081104294143087L;
- protected String bookmarkId;
- protected String link;
-
- /**
- * @return the bookmarkId
- */
- public String getBookmarkId() {
- return bookmarkId;
- }
- /**
- * @param bookmarkId the bookmarkId to set
- */
- public void setBookmarkId(String bookmarkId) {
- this.bookmarkId = bookmarkId;
- }
-
- /**
- * @return the link
- */
- public String getLink() {
- return link;
- }
- /**
- * @param link the link to set
- */
- public void setLink(String link) {
- this.link = link;
- }
-
- public String execute() {
- String result = ERROR;
- if (bookmarkId != null && !bookmarkId.isEmpty()) {
- WikittyProxy proxy = getBowProxy();
- BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId);
- if (bookmark != null) {
- bookmark.setClick(bookmark.getClick() + 1);
- proxy.store(bookmark);
- setLink(bookmark.getLink());
- result = SUCCESS;
- }
- }
- return result;
- }
-
-}
\ No newline at end of file
Copied: trunk/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java (from rev 206, trunk/src/main/java/org/chorem/bow/action/AddClickAction.java)
===================================================================
--- trunk/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java (rev 0)
+++ trunk/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java 2011-02-18 09:04:26 UTC (rev 208)
@@ -0,0 +1,86 @@
+/*
+ * #%L
+ * bow
+ *
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2010 - 2011 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.action;
+
+import org.chorem.bow.BowBookmark;
+import org.nuiton.wikitty.WikittyProxy;
+
+/**
+ * Retrieves the bookmark URL (where the user will be redirected) and increments
+ * the click counter for this bookmark
+ *
+ */
+public class RedirectToUrlAction extends BowBaseAction {
+
+ private static final long serialVersionUID = 8579081104294143087L;
+
+ protected String bookmarkId;
+ protected String link;
+
+ /**
+ * @return the bookmarkId
+ */
+ public String getBookmarkId() {
+ return bookmarkId;
+ }
+ /**
+ * @param bookmarkId the bookmarkId to set
+ */
+ public void setBookmarkId(String bookmarkId) {
+ this.bookmarkId = bookmarkId;
+ }
+
+ /**
+ * @return the link
+ */
+ public String getLink() {
+ return link;
+ }
+ /**
+ * @param link the link to set
+ */
+ public void setLink(String link) {
+ this.link = link;
+ }
+
+ /**
+ * Increments the click counter and sets the link (retrieved by Struts2)
+ * where the user will be redirected
+ */
+ public String execute() {
+ String result = ERROR;
+ if (bookmarkId != null && !bookmarkId.isEmpty()) {
+ WikittyProxy proxy = getBowProxy();
+ BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId);
+ if (bookmark != null) {
+ bookmark.setClick(bookmark.getClick() + 1);
+ proxy.store(bookmark);
+ setLink(bookmark.getLink());
+ result = SUCCESS;
+ }
+ }
+ return result;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/src/main/resources/struts.xml
===================================================================
--- trunk/src/main/resources/struts.xml 2011-02-18 08:35:57 UTC (rev 207)
+++ trunk/src/main/resources/struts.xml 2011-02-18 09:04:26 UTC (rev 208)
@@ -164,7 +164,7 @@
<interceptor-ref name="loginStack" />
<result type="redirect">${redirectTo}</result>
</action>
- <action name="addClick" class="org.chorem.bow.action.AddClickAction">
+ <action name="redirectToUrl" class="org.chorem.bow.action.RedirectToUrlAction">
<interceptor-ref name="loginStack" />
<result name="error" type="redirectAction">home</result>
<result type="redirect">${link}</result>
Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp
===================================================================
--- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-18 08:35:57 UTC (rev 207)
+++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-18 09:04:26 UTC (rev 208)
@@ -68,10 +68,10 @@
<div class="description">
<h3><s:text name="bow.bookmark.description" /> :</h3>
<p>
- <s:url var="addClick" action="addClick">
+ <s:url var="redirectTo" action="redirectToUrl">
<s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param>
</s:url>
- <s:a title="%{#bookmarkLink}" href="%{addClick}" onclick="window.open(this.href); return false;"><s:property value="%{#bookmarkDescription}" /></s:a>
+ <s:a title="%{#bookmarkLink}" href="%{redirectTo}" onclick="window.open(this.href); return false;"><s:property value="%{#bookmarkDescription}" /></s:a>
</p>
<p class="tags">
<strong><s:text name="bow.bookmark.tags" /> :</strong>
1
0