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

r234 - trunk/bow-extension-chromium/src/main/webapp
by echatellier＠users.chorem.org March 17, 2011

March 17, 2011

Author: echatellier Date: 2011-03-17 17:47:05 +0100 (Thu, 17 Mar 2011) New Revision: 234 Url: http://chorem.org/repositories/revision/bow/234 Log: Fix build Added: trunk/bow-extension-chromium/src/main/webapp/WEB-INF/

1 0

r233 - trunk
by tchemit＠users.chorem.org March 12, 2011

March 12, 2011

Author: tchemit Date: 2011-03-12 15:22:48 +0100 (Sat, 12 Mar 2011) New Revision: 233 Url: http://chorem.org/repositories/revision/bow/233 Log: Update mavenpom4redmine to 2.5.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-10 11:29:17 UTC (rev 232) +++ trunk/pom.xml 2011-03-12 14:22:48 UTC (rev 233) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -11,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r232 - in trunk: . bow-ui bow-ui/src/main/java/org/chorem/bow bow-ui/src/main/java/org/chorem/bow/action bow-ui/src/main/java/org/chorem/bow/interceptor bow-ui/src/main/resources bow-ui/src/main/resources/i18n bow-ui/src/main/webapp/css bow-ui/src/main/webapp/img bow-ui/src/main/webapp/jsp bow-ui/src/main/webapp/jsp/inc
by sletellier＠users.chorem.org March 10, 2011

March 10, 2011

Author: sletellier Date: 2011-03-10 12:29:17 +0100 (Thu, 10 Mar 2011) New Revision: 232 Url: http://chorem.org/repositories/revision/bow/232 Log: - Revert up version of struts (ticket #317) - Fix i18n file name - Fix javadoc - Fix #300 Importing bookmarks works with invalid files - Partial fix of evol #271 : move Import/Export to preference page - Fix css (msg dialog on Chromium) Modified: trunk/bow-ui/pom.xml trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java trunk/bow-ui/src/main/java/org/chorem/bow/BowUtils.java trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteImportAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/bow-ui/src/main/resources/log4j.properties trunk/bow-ui/src/main/resources/struts.xml trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/img/fondconnexion.jpg trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp trunk/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/pom.xml 2011-03-10 11:29:17 UTC (rev 232) @@ -56,7 +56,7 @@ </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> + <groupId>com.opensymphony</groupId> <artifactId>xwork-core</artifactId> </dependency> @@ -70,11 +70,11 @@ <artifactId>commons-logging</artifactId> </dependency> -  + </dependency> <dependency> <groupId>org.htmlparser</groupId> Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BookmarkUtils.java 2011-03-10 11:29:17 UTC (rev 232) @@ -23,17 +23,19 @@ */ 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.text.ParseException; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; @@ -43,6 +45,11 @@ public class BookmarkUtils { + /** + * Logger. + */ + public static Log log = LogFactory.getLog(BookmarkUtils.class); + static public Criteria getBookmarkListCriteriaByUser(BowPreference user, String searchLine) { Criteria criteria = null; if (user != null) { @@ -84,7 +91,7 @@ return bookmarkActions; } - static public List<FacetTopic> getBookmarksByImportDate(HttpServletRequest request, BowUser user) { + static public Map<String, Integer> getBookmarksByImportDate(HttpServletRequest request, BowUser user) throws ParseException { BowSession session = BowSession.getBowSession(request); WikittyProxy proxy = session.getProxy(); Criteria criteria = Search.query() @@ -92,14 +99,24 @@ .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()).criteria() .addFacetField(BowImport.FQ_FIELD_BOWIMPORT_IMPORTDATE) .setFirstIndex(0).setEndIndex(0); + List<FacetTopic> bookmarksImportDate = proxy.findAllByCriteria(BowImport.class, criteria) .getTopic(BowImport.FQ_FIELD_BOWIMPORT_IMPORTDATE); - request.setAttribute("bookmarksImportDate", bookmarksImportDate); - return bookmarksImportDate; + + // Extract imports + Map<String, Integer> result = new HashMap<String, Integer>(); + for (FacetTopic facet : bookmarksImportDate) { + String dateAsString = facet.getTopicName(); + + result.put(dateAsString, facet.getCount()); + } + + return result; } - /* @param html String html + /** + * @param html String html * @param name String name * @param user User user * @return Bookmark the bookmark filled @@ -112,7 +129,8 @@ return bookmark; } - /* @param html String html + /** + * @param html String html * @return Date from the html */ public static Date getDateFromHtml(String html) { @@ -131,7 +149,8 @@ return date; } - /* @param bookmarks List<Bookmarks> bookmarks + /** + * @param bookmarks List<Bookmarks> bookmarks * @return String the html file */ public static String getExportHtmlBookmark(List<BowBookmark> bookmarks) { @@ -163,8 +182,9 @@ return export; } - /* @param html String html - * + /** + * @param html String html + * @return url */ public static String getUrlFromHtml(String html) { String url = ""; @@ -190,12 +210,12 @@ return tags; } - /* @param url String which contains the bookmark url + /** + * @param url String which contains the bookmark url * @param nameAndTags String which contains the name and the tags of the * bookmark separated by '|' ==> name|tag1 tag2... * @param user bookmark user - * @return null if all fields are not correctly filled - * @return Bookmark the website bookmark + * @return Bookmark the website bookmark, null if all fields are not correctly filled */ public static BowBookmark createBookmark(String url, String nameAndTags, BowUser user) { @@ -257,16 +277,17 @@ /** * Create new Bookmark * - * @param url - * @param name - * @param tags - * @param user - * @param alias - * @param date - * @return + * @param url of bookmark + * @param name of bookmark + * @param tags of bookmark + * @param user creating bookmark + * @param alias of bookmark + * @param date of creation + * @return bookMarl created */ public static BowBookmark createBookmark(String url, String name, String tags, BowUser user, String alias, Date date) { + BowBookmark bookmark = new BowBookmarkImpl(); if (name != null) { name = name.trim(); Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowUtils.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowUtils.java 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowUtils.java 2011-03-10 11:29:17 UTC (rev 232) @@ -23,7 +23,12 @@ */ package org.chorem.bow; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.UUID; + +import org.apache.commons.lang.time.DateUtils; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.WikittyProxy; @@ -31,10 +36,39 @@ public class BowUtils { + public static String BOW_DATE_PATTERN = "dd/MM/yyyy HH:mm:ss"; + private BowUtils() { } /** + * Convert bow formated date to date object + * + * @param dateAsString bow formated date + * @return Date parsed + * @throws ParseException if error occured on parsing date + */ + static public Date parseDate(String dateAsString) throws ParseException { + return DateUtils.parseDate(dateAsString, new String[]{BOW_DATE_PATTERN}); + } + + /** + * Convert date to bow format + * + * @param date date to format + * @return formated date + * @throws ParseException if error occured on parsing date + */ + static public String formatDate(Date date) throws ParseException { + if (date == null) { + return null; + } + SimpleDateFormat format = new SimpleDateFormat(BOW_DATE_PATTERN); + return format.format(date); + } + + + /** * Generates a random token * * @return the generated token @@ -49,8 +83,8 @@ /** * Redirects the user either on the home page or on the search page * - * @param searchLine - * @param fullTextLine + * @param searchLine search line + * @param fullTextLine full text search * @return the page where the user will be redirected */ static public String redirectTo(String searchLine, String fullTextLine) { @@ -67,8 +101,7 @@ * * @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 + * @return the user if the token is valid, null if the token doesn't exist */ static public BowUser checkToken(BowSession session, String token) { BowUser result = null; @@ -81,9 +114,9 @@ /** * check if token exist, if true, put User associated with it, in BowSession * - * @param token String which contains the MD5 encoding token - * @return null the token doesn't exist - * @return User the token owner + * @param session bow session + * @param token which contains the MD5 encoding token + * @return User the token owner, null if the token doesn't exist */ protected static boolean checkPermanentToken(BowSession session, String token) { WikittyProxy proxy = session.getProxy(); @@ -103,9 +136,9 @@ /** * Check token with temporary token * - * @param token String which contains the MD5 encoding token - * @return null the token doesn't exist - * @return User the token owner + * @param session bow session + * @param token which contains the MD5 encoding token + * @return user the token owner, null if the token doesn't exist */ protected static boolean checkTemporaryToken(BowSession session, String token) { String temporaryToken = session.getTemporaryToken(); Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteImportAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteImportAction.java 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteImportAction.java 2011-03-10 11:29:17 UTC (rev 232) @@ -37,9 +37,6 @@ /** * Supprime un import de bookmark * - * FIXME poussin 20110211 la suppression devrait se faire par rapport a l'id - * de l'import et non pas par rapport a la date :( - * * @author poussin */ public class DeleteImportAction extends BowBaseAction { @@ -72,7 +69,13 @@ .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()) .eq(BowImport.FQ_FIELD_BOWIMPORT_IMPORTDATE, date).criteria(); List<BowImport> bookmarks = proxy.findAllByCriteria(BowImport.class, criteria).getAll(); + + if (log.isDebugEnabled()) { + log.debug("Will delete " + bookmarks.size() + " bookmarks"); + } + proxy.delete(bookmarks); + addActionMessage(getText(n_("bow.bookmark.import.delete.successful"))); } } catch (Exception e) { Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-03-10 11:29:17 UTC (rev 232) @@ -54,7 +54,7 @@ @Override public void setServletResponse(HttpServletResponse response) { - this.response = response; + this.response = response; } public InputStream getInputStream() { @@ -66,14 +66,22 @@ */ public String execute() { WikittyProxy proxy = getBowProxy(); + + // get current user BowUser user = getBowSession().getUser(); + + // Get all bookmark for user Criteria criteria = Search.query() .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()).criteria(); List<BowBookmark> bookmarks = proxy.findAllByCriteria(BowBookmark.class, criteria).getAll(); + + // Export all String export = BookmarkUtils.getExportHtmlBookmark(bookmarks); BufferedWriter out = null; try { + + // Write result in temp file File tmp = File.createTempFile("bookmarks", ".tmp.html"); tmp.deleteOnExit(); Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-03-10 11:29:17 UTC (rev 232) @@ -32,15 +32,9 @@ import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; import org.apache.struts2.interceptor.ServletRequestAware; -import org.chorem.bow.BowBookmark; -import org.chorem.bow.BookmarkUtils; -import org.chorem.bow.BowInit; -import org.chorem.bow.BowSearch; -import org.chorem.bow.BowUtils; -import org.chorem.bow.BowImportHelper; -import org.chorem.bow.BowPreference; -import org.chorem.bow.BowUser; +import org.chorem.bow.*; import org.htmlparser.Node; import org.htmlparser.Parser; import org.htmlparser.util.NodeList; @@ -58,7 +52,9 @@ */ public class ImportBookmarksAction extends BowBaseAction implements ServletRequestAware { + private static final long serialVersionUID = -5962680416570797028L; + protected File upfile; protected String upfileContentType; protected String upfileFileName; @@ -154,102 +150,77 @@ 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 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(); - 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> + boolean isFolder = false; + SimpleNodeIterator it = list.elements(); - 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); + 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 (bookmark != null) { - bookmarks.add(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; } - NodeList children = node.getChildren(); + } 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 (children != null) { - parseHtmlToBookmarks(children, user, date, bookmarks, - tagList); // If there is an under node = recursion - } + bookmarks.add(bookmark); } - if (isFolder) { // If we find a folder, we have to remove it - int index = tagList.size() - 1; + NodeList children = node.getChildren(); - if (index > -1) { - tagList.remove(index); - } + 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); + } + } } public String execute() { + + log.info("Importing boormarks : " + upfile); try { BowPreference user = getBowSession().getPreference(); + // Struts limite to html files, is null if not one if (upfile != null) { - // try { - // List<?> lines = FileUtils.readLines(upfile); - // String content = ""; - // - // for (Object line : lines) { - // content += (String)line; - // } WikittyProxy proxy = getBowProxy(); 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); + proxy.store(bookmarks); + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); - if (searchLine == null || searchLine.isEmpty()) { + if (StringUtils.isEmpty(searchLine)) { BowInit.initHomePage(request, user); } else { BowSearch.search(request, user); @@ -266,11 +237,16 @@ } catch (IOException e2) { addActionError(getText(n_("bow.error.internal"))); log.error(e2.getMessage(), e2); + return ERROR; } + } else { + addActionError(getText(n_("bow.bookmark.badFileFormat"))); + return ERROR; } } catch (Exception e) { addActionError(getText(n_("bow.error.internal"))); log.error(e.getMessage(), e); + return ERROR; } return SUCCESS; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-03-10 11:29:17 UTC (rev 232) @@ -23,16 +23,14 @@ */ package org.chorem.bow.action; +import java.util.Date; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.apache.struts2.interceptor.ServletRequestAware; -import org.chorem.bow.BookmarkUtils; -import org.chorem.bow.BowInit; -import org.chorem.bow.BowPreference; -import org.chorem.bow.BowProxy; -import org.chorem.bow.BowUser; +import org.chorem.bow.*; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; @@ -57,7 +55,7 @@ protected String currentPassword; protected String confirmNewPassword; protected String update; - protected List<FacetTopic> bookmarksImportDate; + protected Map<String, Integer> bookmarksImportDate; protected HttpServletRequest request; @@ -204,14 +202,14 @@ /** * @return the bookmarksImportDate */ - public List<FacetTopic> getBookmarksImportDate() { + public Map<String, Integer> getBookmarksImportDate() { return bookmarksImportDate; } /** * @param bookmarksImportDate the bookmarksImportDate to set */ - public void setBookmarksImportDate(List<FacetTopic> bookmarksImportDate) { + public void setBookmarksImportDate(Map<String, Integer> bookmarksImportDate) { this.bookmarksImportDate = bookmarksImportDate; } @@ -264,8 +262,13 @@ BowProxy proxy = getBowSession().getProxy(); // BowPreference extends BowUser, donc on l'utilise pour tout BowPreference preference = getBowSession().getPreference(); - - setBookmarksImportDate(BookmarkUtils.getBookmarksByImportDate(request, preference)); + + Map<String,Integer> bookmarksByImportDate = BookmarkUtils.getBookmarksByImportDate(request, preference); + + if (log.isDebugEnabled()) { + log.debug("bookmarksByImportDate found : " + (bookmarksByImportDate == null ? "null" : bookmarksByImportDate.size())); + } + setBookmarksImportDate(bookmarksByImportDate.isEmpty() ? null : bookmarksByImportDate); if (update != null) { //If the user submitted the form preference = changePreference(preference); preference = proxy.store(preference); Modified: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LoginInterceptor.java 2011-03-10 11:29:17 UTC (rev 232) @@ -72,7 +72,8 @@ //Authenticates the user bowSession.setUser(user); } - } else { //If the token is empty + } else { + //If the token is empty ServletActionContext.getResponse().sendRedirect(redirect); result = null; } Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-03-10 11:29:17 UTC (rev 232) @@ -58,6 +58,10 @@ bow.preferences.confirmNewPassword=Confirm new password bow.preferences.currentPassword=Current password bow.preferences.emailAldyExists=This email address is already linked with another account +bow.preferences.export.bookmarks=Export bookmarks +bow.preferences.import.bookmarks=Import bookmarks +bow.preferences.import.submit=Import +bow.preferences.importExport=Import / Export bow.preferences.importedBookmarks=Imported bookmarks bow.preferences.newPassword=New password bow.preferences.noImportedBookmarks=No imported bookmarks @@ -92,7 +96,6 @@ bow.rightMenu.bookmark.temporaryLink=Bookmark add link (session) bow.rightMenu.bookmark.temporaryLinkDescription=Add this link to your favourites to bookmark others in the future. This link is only available while you are connected on the site\! bow.rightMenu.chromiumExtension=Chromium extension -bow.rightMenu.exportBookmarks=Export bookmarks bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Find bow.rightMenu.fullTextSearch=Full text search Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-03-10 11:29:17 UTC (rev 232) @@ -8,7 +8,7 @@ bow.admin.panel=Panneau d''administration bow.admin.reIndexationDone=Les donn\u00E9es ont bien \u00E9t\u00E9 r\u00E9index\u00E9es 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.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le format de type Netscape n'est pas support\u00E9) 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 @@ -58,6 +58,10 @@ bow.preferences.confirmNewPassword=Confirmez votre mot de passe bow.preferences.currentPassword=Mot de passe actuel bow.preferences.emailAldyExists=Cette addresse email est d\u00E9j\u00E0 utilis\u00E9e par un autre compte +bow.preferences.export.bookmarks=Exporter les marque-pages +bow.preferences.import.bookmarks=Importer des marques-pages +bow.preferences.import.submit=Importer +bow.preferences.importExport=Import / Export bow.preferences.importedBookmarks=Marque-pages import\u00E9s bow.preferences.newPassword=Nouveau mot de passe bow.preferences.noImportedBookmarks=Aucun marque-page import\u00E9 @@ -92,7 +96,6 @@ bow.rightMenu.bookmark.temporaryLink=Ajouter un bookmark (session) bow.rightMenu.bookmark.temporaryLinkDescription=Ajoutez ce lien \u00E0 vos favoris pour pouvoir bookmarker vos liens dans le futur. Ce lien est seulement disponible tant que vous \u00EAtes connect\u00E9 sur le site \! bow.rightMenu.chromiumExtension=Extension pour chromium -bow.rightMenu.exportBookmarks=Exporter les marque-pages bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Rechercher bow.rightMenu.fullTextSearch=Recherche full text Modified: trunk/bow-ui/src/main/resources/log4j.properties =================================================================== --- trunk/bow-ui/src/main/resources/log4j.properties 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/resources/log4j.properties 2011-03-10 11:29:17 UTC (rev 232) @@ -22,7 +22,7 @@ # #L% ### # Global logging configuration -log4j.rootLogger=WARN, stdout +log4j.rootLogger=FATAL, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender @@ -30,5 +30,5 @@ log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n # package level -log4j.logger.org.chorem.bow=INFO -log4j.logger.org.nuiton=INFO +log4j.logger.org.chorem.bow=DEBUG +#log4j.logger.org.nuiton.util.TimeLog=WARN \ No newline at end of file Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-03-10 11:29:17 UTC (rev 232) @@ -23,218 +23,237 @@ #L% --> -<!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" - "http://struts.apache.org/dtds/struts-2.0.dtd"> +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.0.dtd"> <struts> - <constant name="struts.devMode" value="true" /> - <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> - -  - <package name="login" extends="struts-default"> - <interceptors> - <interceptor name="aldyLogged" class="org.chorem.bow.interceptor.AldyLoggedInterceptor"> - <param name="redirect">home.action</param> - </interceptor> - <interceptor-stack name="aldyLoggedStack"> - <interceptor-ref name="aldyLogged" /> - <interceptor-ref name="defaultStack" /> - </interceptor-stack> - </interceptors> - <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> - <interceptor-ref name="aldyLoggedStack" /> - <result name="input">/jsp/register.jsp</result> - <result type="redirectAction">home</result> - </action> - <action name="forgotPassword_*" method="{1}" class="org.chorem.bow.action.ForgotPasswordAction"> - <interceptor-ref name="aldyLoggedStack" /> - <result name="input">/jsp/forgotPassword.jsp</result> - <result type="redirectAction">login_input</result> - </action> - <action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction"> - <interceptor-ref name="aldyLoggedStack" /> - <result name="input">/jsp/login.jsp</result> - <result name="login" type="redirectAction">home</result> - <result type="redirectAction">home</result> - </action> - <action name="logout" class="org.chorem.bow.action.LogoutAction"> - <result type="redirectAction">login_input</result> - </action> - </package> + <constant name="struts.devMode" value="true"/> + <constant name="struts.ognl.allowStaticMethodAccess" value="true"/> +  + <package name="login" extends="struts-default"> + <interceptors> + <interceptor name="aldyLogged" class="org.chorem.bow.interceptor.AldyLoggedInterceptor"> + <param name="redirect">home.action</param> + </interceptor> + <interceptor-stack name="aldyLoggedStack"> + <interceptor-ref name="aldyLogged"/> + <interceptor-ref name="defaultStack"/> + </interceptor-stack> + </interceptors> + <action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction"> + <interceptor-ref name="aldyLoggedStack"/> + <result name="input">/jsp/register.jsp</result> + <result type="redirectAction">home</result> + </action> + <action name="forgotPassword_*" method="{1}" class="org.chorem.bow.action.ForgotPasswordAction"> + <interceptor-ref name="aldyLoggedStack"/> + <result name="input">/jsp/forgotPassword.jsp</result> + <result type="redirectAction">login_input</result> + </action> + <action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction"> + <interceptor-ref name="aldyLoggedStack"/> + <result name="input">/jsp/login.jsp</result> + <result name="login" type="redirectAction">home</result> + <result type="redirectAction">home</result> + </action> + <action name="logout" class="org.chorem.bow.action.LogoutAction"> + <result type="redirectAction">login_input</result> + </action> + </package> + <package name="bookmark" extends="struts-default"> - <interceptors> - <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> - <param name="redirect">login_input.action</param> - </interceptor> - <interceptor-stack name="loginStack"> - <interceptor-ref name="login" /> - <interceptor-ref name="defaultStack" /> - </interceptor-stack> - </interceptors> + <interceptors> + <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> + <param name="redirect">login_input.action</param> + </interceptor> + <interceptor-stack name="loginStack"> + <interceptor-ref name="login"/> + <interceptor-ref name="defaultStack"/> + </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 type="redirect">${redirectTo}</result> - <result name="input" type="redirect">${redirectTo}</result> + <interceptor-ref name="store"> + <param name="operationMode">STORE</param> + </interceptor-ref> + <interceptor-ref name="login"/> + <interceptor-ref name="exception"/> + <interceptor-ref name="alias"/> + <interceptor-ref name="servletConfig"/> + <interceptor-ref name="i18n"/> + <interceptor-ref name="prepare"/> + <interceptor-ref name="chain"/> + <interceptor-ref name="debugging"/> + +  + <interceptor-ref name="fileUpload"> + <param name="allowedExtensions">.html</param> + </interceptor-ref> + <interceptor-ref name="staticParams"/> + <interceptor-ref name="actionMappingParams"/> + <interceptor-ref name="params"> + <param name="excludeParams">dojo\..*,^struts\..*</param> + </interceptor-ref> + <interceptor-ref name="conversionError"/> + + <result type="redirectAction">preferences</result> + <result name="error">/jsp/preferences.jsp</result> </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> + <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"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack" /> - <result type="redirectAction">home</result> + <action name="modifyBookmark" class="org.chorem.bow.action.ModifyBookmarkAction"> + <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="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <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> + <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> </action> <action name="deleteImport" class="org.chorem.bow.action.DeleteImportAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <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="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <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> - + <package name="search" extends="struts-default"> - <interceptors> - <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> - <param name="redirect">login_input.action</param> - </interceptor> - <interceptor-stack name="loginStack"> - <interceptor-ref name="login" /> - <interceptor-ref name="defaultStack" /> - </interceptor-stack> - </interceptors> + <interceptors> + <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> + <param name="redirect">login_input.action</param> + </interceptor> + <interceptor-stack name="loginStack"> + <interceptor-ref name="login"/> + <interceptor-ref name="defaultStack"/> + </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> + <interceptor-ref name="store"> + <param name="operationMode">RETRIEVE</param> + </interceptor-ref> + <interceptor-ref name="loginStack"/> + <result>/jsp/search.jsp</result> </action> <action name="fullText" class="org.chorem.bow.action.FullTextSearchAction"> - <interceptor-ref name="loginStack" /> - <result>/jsp/search.jsp</result> + <interceptor-ref name="loginStack"/> + <result>/jsp/search.jsp</result> </action> <action name="order" class="org.chorem.bow.action.OrderAction"> - <interceptor-ref name="loginStack" /> - <result>/jsp/search.jsp</result> + <interceptor-ref name="loginStack"/> + <result>/jsp/search.jsp</result> </action> <action name="openSearchResult" class="org.chorem.bow.action.OpenSearchResultAction"> - <interceptor-ref name="loginStack" /> - <result type="redirect">${redirectTo}</result> + <interceptor-ref name="loginStack"/> + <result type="redirect">${redirectTo}</result> </action> <action name="openSearchSuggestion" class="org.chorem.bow.action.OpenSearchSuggestionAction"> - <interceptor-ref name="loginStack" /> - <result>/jsp/suggestions.jsp</result> + <interceptor-ref name="loginStack"/> + <result>/jsp/suggestions.jsp</result> </action> <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <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> </package> <package name="misc" extends="struts-default"> - <interceptors> - <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> - <param name="redirect">login_input.action</param> - </interceptor> - <interceptor-stack name="loginStack"> - <interceptor-ref name="login" /> - <interceptor-ref name="defaultStack" /> - </interceptor-stack> - </interceptors> + <interceptors> + <interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor"> + <param name="redirect">login_input.action</param> + </interceptor> + <interceptor-stack name="loginStack"> + <interceptor-ref name="login"/> + <interceptor-ref name="defaultStack"/> + </interceptor-stack> + </interceptors> <action name="home" class="org.chorem.bow.action.HomeAction"> - <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> + <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> + <result type="redirect">/jsp/login.jsp</result> + </action> <action name="regenPermToken" class="org.chorem.bow.action.GenerateTokenAction"> - <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <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="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <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="redirectToUrl" class="org.chorem.bow.action.RedirectToUrlAction"> - <interceptor-ref name="loginStack" /> - <result name="error" type="redirectAction">home</result> - <result type="redirect">${link}</result> + <interceptor-ref name="loginStack"/> + <result name="error" type="redirectAction">home</result> + <result type="redirect">${link}</result> </action> <action name="*Xml"> <result>/jsp/{1}Xml.jsp</result> </action> <action name="preferences" class="org.chorem.bow.action.PreferencesAction"> - <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> + <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="store"> - <param name="operationMode">STORE</param> - </interceptor-ref> - <interceptor-ref name="loginStack" /> - <result>/jsp/admin.jsp</result> + <interceptor-ref name="store"> + <param name="operationMode">STORE</param> + </interceptor-ref> + <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/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-03-10 11:29:17 UTC (rev 232) @@ -367,7 +367,7 @@ } .formFrame{ - width:365px; + width:400px; height:315px; background:url('../img/fondconnexion.jpg') no-repeat; position:relative; Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-03-10 11:29:17 UTC (rev 232) @@ -117,7 +117,7 @@ #actionmessageHeader{ color:blue; - position:relative; + position:fixed; left:25%; top:12px; } Modified: trunk/bow-ui/src/main/webapp/img/fondconnexion.jpg =================================================================== (Binary files differ) Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-03-10 11:29:17 UTC (rev 232) @@ -26,19 +26,23 @@ <div id="header" 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}"> - <s:url var="homeToken" action="home"> - <s:param name="token"><s:property value="%{#session.BowSession.getPermanentToken()}" /></s:param> - </s:url> - <s:a cssClass="logo" href="%{homeToken}">bow</s:a> - </s:if> - <s:else> - <s:a cssClass="logo" action="home">bow</s:a> - </s:else> - <span id="actionmessageHeader"> - <s:actionmessage /> - </span> - <span id="actionerrorHeader"> - <s:actionerror /> - </span> + <div> + <s:if test="%{#session.BowSession.user != null}"> + <s:url var="homeToken" action="home"> + <s:param name="token"><s:property value="%{#session.BowSession.getPermanentToken()}" /></s:param> + </s:url> + <s:a cssClass="logo" href="%{homeToken}">bow</s:a> + </s:if> + <s:else> + <s:a cssClass="logo" action="home">bow</s:a> + </s:else> + </div> + <div id="msg"> + <span id="actionmessageHeader"> + <s:actionmessage /> + </span> + <span id="actionerrorHeader"> + <s:actionerror /> + </span> + </div> </div> \ No newline at end of file Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-03-10 11:29:17 UTC (rev 232) @@ -103,17 +103,6 @@ </div> </s:form> </div> - <div id="import"> - <s:form action="importBookmarks" method="post" enctype="multipart/form-data"> - <div class="input"> - <s:file size="15%" name="upfile" key="bow.rightMenu.importBookmarks" labelSeparator="" /> - <s:hidden name="searchLine" value="%{searchLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:submit key="bow.rightMenu.import.submit" name="submit" /> - </div> - </s:form> - <s:a action="exportBookmarks"><s:text name="bow.rightMenu.exportBookmarks" /></s:a> - </div> <div class="colonnebas"> <img src="img/piedmenu.jpg" width="401" height="77" alt="Pied de menu" /> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-03-10 11:29:17 UTC (rev 232) @@ -1,136 +1,147 @@  -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@taglib prefix="s" uri="/struts-tags"%> -<%@page import="org.chorem.bow.BowImport" %> -<%@page import="org.nuiton.wikitty.search.FacetTopic" %> -<%@page import="java.util.List" %> +#%L +bow +$Id$ +$HeadURL$ +%% +Copyright (C) 2010 CodeLutin +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> + <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <head> - <title><s:text name="bow.preferences.title" /></title> - <s:url var="css" value="/css/bookmark.css" /> - <link href="${css}" rel="stylesheet" type="text/css" /> - <s:head /> - </head> - <body> - <div id="content"> - <div class="menu clearfix"> - <h2><s:text name="bow.preferences.title" /></h2> - </div> - <s:actionerror /> - <s:form action="preferences"> - <div class="formFrame"> - <h3><s:text name="bow.preferences.userInfo"/></h3> +<head> + <title><s:text name="bow.preferences.title"/></title> + <s:url var="css" value="/css/bookmark.css"/> + <link href="${css}" rel="stylesheet" type="text/css"/> + <s:head/> +</head> +<body> +<div id="content"> + <div class="menu clearfix"> + <h2><s:text name="bow.preferences.title"/></h2> + </div> + <s:actionerror/> + <s:form action="preferences"> + <div class="formFrame"> + <h3><s:text name="bow.preferences.userInfo"/></h3> - <p> - <s:textfield key="bow.login.email" name="email" - labelposition="top"/><br/> - <s:password key="bow.preferences.currentPassword" - name="currentPassword" labelposition="top"/><br/> - <s:password key="bow.preferences.newPassword" name="newPassword" - labelposition="top"/><br/> - <s:password key="bow.preferences.confirmNewPassword" - name="confirmNewPassword" labelposition="top"/><br/> - <s:submit key="bow.preferences.submit" name="submit"/><br/> - </p> - - <p> - <ul> - <li><strong><s:text name="bow.rightMenu.token.permanent"/> - :</strong><s:property value="%{#session.BowSession.getPermanentToken()}" /> - </li> - <li><strong><s:text name="bow.rightMenu.token.temporary"/> - :</strong><s:property value="%{#session.BowSession.getTemporaryToken()}" /> - </li> - </ul> - <s:url var="regenPermToken" action="regenPermToken"/> - <s:a href="%{regenPermToken}" id="regenPermToken"><s:text - name="bow.preferences.regenPermToken"/></s:a> - </p> - </div> - <div class="formFrame"> - <h3><s:text name="bow.preferences.siteLook" /></h3> - <p> - <s:textfield key="bow.preferences.colors" name="colors" labelposition="top" /><br /> - <s:textfield key="bow.preferences.tagsNb" name="tagsNb" labelposition="top" /><br /> - <s:textfield key="bow.preferences.bookmarksHomePage" name="bookmarksHomePage" labelposition="top" /><br /> - <s:textfield key="bow.preferences.searchEngineUrlSuggestions" name="searchEngineUrlSuggestions" labelposition="top" /><br /> - <s:textfield key="bow.preferences.searchEngineUrlResults" name="searchEngineUrlResults" labelposition="top" /><br /> - <s:hidden name="update" value="1" /> - <s:submit key="bow.preferences.submit" name="submit" /> - <br /><br /> - <s:url var="home" action="home" /> - <s:a href="%{home}" id="homePage"><s:text name="bow.home.title" /></s:a> - </p> - </div> - </s:form> - <div class="menu clearfix"> - <h2><s:text name="bow.preferences.importedBookmarks" /></h2> - </div> - <% - List<FacetTopic> bookmarkImportList = (List<FacetTopic>)request.getAttribute("bookmarksImportDate"); + <p> + <s:textfield key="bow.login.email" name="email" + labelposition="top"/><br/> + <s:password key="bow.preferences.currentPassword" + name="currentPassword" labelposition="top"/><br/> + <s:password key="bow.preferences.newPassword" name="newPassword" + labelposition="top"/><br/> + <s:password key="bow.preferences.confirmNewPassword" + name="confirmNewPassword" labelposition="top"/><br/> + <s:submit key="bow.preferences.submit" name="submit"/><br/> + </p> - if (bookmarkImportList != null) { - if (bookmarkImportList.size() > 0) { - String bgColors[] = {"Pink", "White"}; - int i = 0; - int colorsNb = bgColors.length; + <br/> + <br/> + <br/> + <br/> + <ul> + <li> + <strong><s:text name="bow.rightMenu.token.permanent"/> :</strong> + <s:property value="%{#session.BowSession.getPermanentToken()}"/> + </li> + <li> + <strong><s:text name="bow.rightMenu.token.temporary"/> :</strong> + <s:property value="%{#session.BowSession.getTemporaryToken()}"/> + </li> + </ul> - for (FacetTopic bookmarkImport : bookmarkImportList) { - String date = bookmarkImport.getTopicName(); - String dateSave = date; + <s:url var="regenPermToken" action="regenPermToken"/> + <s:a href="%{regenPermToken}" id="regenPermToken"> + <s:text name="bow.preferences.regenPermToken"/> + </s:a> + </div> + <div class="formFrame"> + <h3><s:text name="bow.preferences.siteLook"/></h3> - date = date.replaceAll("[^0-9:-]+", " ").trim(); - date = date.substring(0, date.lastIndexOf(' ')); - %> - <div class="deleteImport deleteImport<%=bgColors[i % colorsNb]%>"> - <span><%= date + " (" + bookmarkImport.getCount() + " bookmarks)" %></span> - <s:url var="deleteImport" action="deleteImport"> - <s:param name="date"><%=dateSave%></s:param> - </s:url> - <s:set var="deleteImport" value="%{deleteImport}" /> - <a class="deleteImportButton" href="" onclick="deleteConfirmation('${deleteImport}','<%=bookmarkImport.getCount()%>','<%=date%>'); return(false);"></a> - </div> - <% - i++; - } - } else { - %> - <div class="deleteImport deleteImportWhite"> - <span><s:text name="bow.preferences.noImportedBookmarks" /></span> - </div> - <% - } - } - %> - </div> - </body> + <p> + <s:textfield key="bow.preferences.colors" name="colors" labelposition="top"/><br/> + <s:textfield key="bow.preferences.tagsNb" name="tagsNb" labelposition="top"/><br/> + <s:textfield key="bow.preferences.bookmarksHomePage" name="bookmarksHomePage" labelposition="top"/><br/> + <s:textfield key="bow.preferences.searchEngineUrlSuggestions" name="searchEngineUrlSuggestions" + labelposition="top"/><br/> + <s:textfield key="bow.preferences.searchEngineUrlResults" name="searchEngineUrlResults" + labelposition="top"/><br/> + <s:hidden name="update" value="1"/> + <s:submit key="bow.preferences.submit" name="submit"/> + <br/><br/> + <s:url var="home" action="home"/> + <s:a href="%{home}" id="homePage"><s:text name="bow.home.title"/></s:a> + </p> + </div> + <div class="menu clearfix"> + <h2><s:text name="bow.preferences.importExport"/></h2> + </div> + </s:form> + + <div class="formFrame"> + <s:a action="exportBookmarks"><s:text name="bow.preferences.export.bookmarks"/></s:a> + <br/> + + <h3><s:text name="bow.preferences.import.bookmarks"/></h3> + <br/> + <s:form action="importBookmarks" method="post" enctype="multipart/form-data"> + <s:file name="upfile" labelSeparator=""/> + <s:hidden name="searchLine" value="%{searchLine}"/> + <s:hidden name="fullTextLine" value="%{fullTextLine}"/> + <br/> + <s:submit key="bow.preferences.import.submit" name="submit"/> + </s:form> + + <br/><br/> + <br/><br/> + <br/><br/> + + <s:if test="bookmarksImportDate != null"> + <s:iterator value="bookmarksImportDate"> + <div class="deleteImport"> + <% + String date = (String) request.getAttribute("key"); + String dateSave = date; + + date = date.replaceAll("[^0-9:-]+", " ").trim(); + date = date.substring(0, date.lastIndexOf(' ')); + %> + <span><%=date%> (<s:property value="value"/> bookmarks)</span> + <s:url var="deleteImport" action="deleteImport"> + <s:param name="date"><%=dateSave%> + </s:param> + </s:url> + <s:set name="date" value="%{key}"/> + <s:set name="count" value="%{value}"/> + <a class="deleteImportButton" href="" + onclick="deleteConfirmation('${deleteImport}','${count}','<%=date%>'); return(false);"></a> + </div> + </s:iterator> + </s:if> + <s:else> + <span><s:text name="bow.preferences.noImportedBookmarks"/></span> + </s:else> + </div> + +</div> +</body> </html> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-09 13:29:17 UTC (rev 231) +++ trunk/pom.xml 2011-03-10 11:29:17 UTC (rev 232) @@ -51,11 +51,12 @@ <projectId>bow</projectId> <eugenePluginVersion>2.3.2</eugenePluginVersion> - <nuitonUtilsVersion>2.0</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <wikittyVersion>3.0.5-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> - <struts2Version>2.2.1.1</struts2Version> + <struts2Version>2.1.8.1</struts2Version> + <xWorkCoreVersion>2.1.6</xWorkCoreVersion> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion> @@ -97,9 +98,9 @@ </dependency> <dependency> - <groupId>org.apache.struts.xwork</groupId> + <groupId>com.opensymphony</groupId> <artifactId>xwork-core</artifactId> - <version>${struts2Version}</version> + <version>${xWorkCoreVersion}</version> </dependency> <dependency> @@ -174,7 +175,7 @@ <artifactId>struts2-sitemesh-plugin</artifactId> <version>${struts2Version}</version> </dependency> - + </dependencies> </dependencyManagement>

1 0

r231 - in trunk: . bow-ui bow-ui/src/main/resources/i18n
by tchemit＠users.chorem.org March 9, 2011

March 9, 2011

Author: tchemit Date: 2011-03-09 14:29:17 +0100 (Wed, 09 Mar 2011) New Revision: 231 Url: http://chorem.org/repositories/revision/bow/231 Log: Evolution #317: Updates to struts2 2.2.1.1 (remove all stuff related to oensymphony project) Add i18n keys Modified: trunk/bow-ui/pom.xml trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties trunk/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-03-09 13:01:46 UTC (rev 230) +++ trunk/bow-ui/pom.xml 2011-03-09 13:29:17 UTC (rev 231) @@ -25,7 +25,8 @@ <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> <i18n.bundleOutputName>bow-i18n</i18n.bundleOutputName> - <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources + <i18n.bundleOutputDir> + ${basedir}/target/generated-sources/resources </i18n.bundleOutputDir> <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> </properties> @@ -55,7 +56,7 @@ </dependency> <dependency> - <groupId>com.opensymphony</groupId> + <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-03-09 13:01:46 UTC (rev 230) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-03-09 13:29:17 UTC (rev 231) @@ -109,14 +109,14 @@ bow.search.descclick=Desc. clicks nb bow.search.descdate=Desc. date bow.search.descname=Desc. name -bow.search.orderby=Order by -bow.search.results.deleted=Search results deleted successfully -bow.search.submit=Search -bow.search.title=Search bow.search.order.ascClick=Your search results have been sorted by ascendant clicks number bow.search.order.ascDate=Your search results have been sorted by ascendant date bow.search.order.ascName=Your search results have been sorted by ascendant name bow.search.order.descClick=Your search results have been sorted by descendant clicks number bow.search.order.descDate=Your search results have been sorted by descendant date bow.search.order.descName=Your search results have been sorted by descendant name +bow.search.orderby=Order by +bow.search.results.deleted=Search results deleted successfully +bow.search.submit=Search +bow.search.title=Search bow.token.generate.successful=The token has been regenerated successfully Modified: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-03-09 13:01:46 UTC (rev 230) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-03-09 13:29:17 UTC (rev 231) @@ -109,14 +109,14 @@ bow.search.descclick=Nb clics desc. bow.search.descdate=Date desc. bow.search.descname=Nom desc. -bow.search.orderby=Trier par -bow.search.results.deleted=Les r\u00E9sultats de la recherche ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s -bow.search.submit=Rechercher -bow.search.title=Recherche bow.search.order.ascClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics ascendants bow.search.order.ascDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date ascendante bow.search.order.ascName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom ascendant bow.search.order.descClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics descendants bow.search.order.descDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date descendante bow.search.order.descName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom descendant +bow.search.orderby=Trier par +bow.search.results.deleted=Les r\u00E9sultats de la recherche ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s +bow.search.submit=Rechercher +bow.search.title=Recherche bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-09 13:01:46 UTC (rev 230) +++ trunk/pom.xml 2011-03-09 13:29:17 UTC (rev 231) @@ -56,7 +56,6 @@ <wikittyVersion>3.0.5-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.1.1</struts2Version> - <xWorkCoreVersion>2.1.6</xWorkCoreVersion> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion> @@ -98,9 +97,9 @@ </dependency> <dependency> - <groupId>com.opensymphony</groupId> + <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${xWorkCoreVersion}</version> + <version>${struts2Version}</version> </dependency> <dependency>

1 0

r230 - trunk/bow-ui/src/main/resources/i18n
by tchemit＠users.chorem.org March 9, 2011

March 9, 2011

Author: tchemit Date: 2011-03-09 14:01:46 +0100 (Wed, 09 Mar 2011) New Revision: 230 Url: http://chorem.org/repositories/revision/bow/230 Log: fix i18n bundle names (was not done when multi-module was done) Added: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties Removed: trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties Copied: trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties (from rev 228, trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties) =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties (rev 0) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-03-09 13:01:46 UTC (rev 230) @@ -0,0 +1,122 @@ +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.dataMigration.success=Data migration successful +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.admin.reIndexationDone=Data reindexed successfully +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.tag.deleted=The tag 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= +bow.config.bow.addressFrom.description= +bow.config.bow.admins.description= +bow.config.bow.smtpServer.description= +bow.config.bow.url.description= +bow.config.configFileName.description= +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 +bow.forgotPassword.emailDoesntExist=This email address doesn''t exist +bow.forgotpwd.submit=Send +bow.forgotpwd.title=Forgot your password? +bow.home.latestBookmarks=The latest added bookmarks +bow.home.mostUsedBookmarks=The most used bookmarks +bow.home.title=Home +bow.label.locale.english= +bow.label.locale.french= +bow.login.admin.failback=Authentication problem, you must recreate index in admin page +bow.login.authenticationFailure=Either your email address doesn''t exist or your password is incorrect +bow.login.email=Email +bow.login.email.required=Email is required +bow.login.email.wrongformat=Your email address isn''t valid +bow.login.password=Password +bow.login.password.required=Password is required +bow.login.repeatPassword=Repeat your password +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 +bow.preferences.confirmNewPassword=Confirm new password +bow.preferences.currentPassword=Current password +bow.preferences.emailAldyExists=This email address is already linked with another account +bow.preferences.importedBookmarks=Imported bookmarks +bow.preferences.newPassword=New password +bow.preferences.noImportedBookmarks=No imported bookmarks +bow.preferences.regenPermToken=Regenerate permanent token +bow.preferences.searchEngineUrlResults=Search Engine URL Results ('{'searchTerms'}' will be replaced by your text) +bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions +bow.preferences.siteLook=Site look +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 +bow.register.mailEmail=Your email +bow.register.mailHi=Hi +bow.register.mailPwd=Your password +bow.register.mailSubject=[bow] Your account information +bow.register.pwdDontMatch=Passwords don''t match +bow.register.submit=Register +bow.register.title=Register +bow.requiredstring=${getText(fieldKey)} is required +bow.rightMenu.admin=Admin +bow.rightMenu.bookmark.addModify=Add / Modify +bow.rightMenu.bookmark.alias=ALIAS +bow.rightMenu.bookmark.link=URL +bow.rightMenu.bookmark.name=DESC +bow.rightMenu.bookmark.permanentLink=Bookmark add link (permanent) +bow.rightMenu.bookmark.permanentLinkDescription=Add this link to your favourites to bookmark others in the future. This link is always available\! +bow.rightMenu.bookmark.submit=Save +bow.rightMenu.bookmark.tags=TAGS +bow.rightMenu.bookmark.temporaryLink=Bookmark add link (session) +bow.rightMenu.bookmark.temporaryLinkDescription=Add this link to your favourites to bookmark others in the future. This link is only available while you are connected on the site\! +bow.rightMenu.chromiumExtension=Chromium extension +bow.rightMenu.exportBookmarks=Export bookmarks +bow.rightMenu.extensions=Extensions +bow.rightMenu.find.submit=Find +bow.rightMenu.fullTextSearch=Full text search +bow.rightMenu.help=Help +bow.rightMenu.import.submit=Import +bow.rightMenu.importBookmarks=Import bookmarks +bow.rightMenu.logout=Logout +bow.rightMenu.search=Search +bow.rightMenu.token.permanent=Permanent token id +bow.rightMenu.token.temporary=Session token id +bow.search.ascclick=Asc. clicks nb +bow.search.ascdate=Asc. date +bow.search.ascname=Asc. name +bow.search.descclick=Desc. clicks nb +bow.search.descdate=Desc. date +bow.search.descname=Desc. name +bow.search.orderby=Order by +bow.search.results.deleted=Search results deleted successfully +bow.search.submit=Search +bow.search.title=Search +bow.search.order.ascClick=Your search results have been sorted by ascendant clicks number +bow.search.order.ascDate=Your search results have been sorted by ascendant date +bow.search.order.ascName=Your search results have been sorted by ascendant name +bow.search.order.descClick=Your search results have been sorted by descendant clicks number +bow.search.order.descDate=Your search results have been sorted by descendant date +bow.search.order.descName=Your search results have been sorted by descendant name +bow.token.generate.successful=The token has been regenerated successfully Copied: trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties (from rev 228, trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties) =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties (rev 0) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-03-09 13:01:46 UTC (rev 230) @@ -0,0 +1,122 @@ +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.dataMigration.success=Les donn\u00E9es ont \u00E9t\u00E9 migr\u00E9es avec succ\u00E8s +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.admin.reIndexationDone=Les donn\u00E9es ont bien \u00E9t\u00E9 r\u00E9index\u00E9es +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.tag.deleted=Le tag 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= +bow.config.bow.addressFrom.description= +bow.config.bow.admins.description= +bow.config.bow.smtpServer.description= +bow.config.bow.url.description= +bow.config.configFileName.description= +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 +bow.forgotPassword.emailDoesntExist=Cette adresse email n''existe pas +bow.forgotpwd.submit=Envoyer +bow.forgotpwd.title=Vous avez oubli\u00E9 votre mot de passe ? +bow.home.latestBookmarks=Les derniers marque-pages ajout\u00E9s +bow.home.mostUsedBookmarks=Les marque-pages les plus utilis\u00E9s +bow.home.title=Accueil +bow.label.locale.english= +bow.label.locale.french= +bow.login.admin.failback=Probl\u00E8me d''authentification, vous devriez reconstruire l''index via la page d'admin +bow.login.authenticationFailure=Soit votre adresse email n''existe pas, soit votre mot de passe est eronn\u00E9 +bow.login.email=Email +bow.login.email.required=Veuillez entrer votre adresse email +bow.login.email.wrongformat=Votre adresse email est invalide +bow.login.password=Mot de passe +bow.login.password.required=Veuillez entrer votre mot de passe +bow.login.repeatPassword=Confirmation +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 +bow.preferences.confirmNewPassword=Confirmez votre mot de passe +bow.preferences.currentPassword=Mot de passe actuel +bow.preferences.emailAldyExists=Cette addresse email est d\u00E9j\u00E0 utilis\u00E9e par un autre compte +bow.preferences.importedBookmarks=Marque-pages import\u00E9s +bow.preferences.newPassword=Nouveau mot de passe +bow.preferences.noImportedBookmarks=Aucun marque-page import\u00E9 +bow.preferences.regenPermToken=Reg\u00E9n\u00E9rer le token permanent +bow.preferences.searchEngineUrlResults=Search Engine URL Results ('{'searchTerms'}' sera remplac\u00E9 par votre recherche) +bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions +bow.preferences.siteLook=Pr\u00E9f\u00E9rences du site +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 +bow.register.mailEmail=Votre email +bow.register.mailHi=Bonjour +bow.register.mailPwd=Votre mot de passe +bow.register.mailSubject=[bow] Vos informations utilisateur +bow.register.pwdDontMatch=Les mots de passe sont diff\u00E9rents +bow.register.submit=S''enregistrer +bow.register.title=S''enregistrer +bow.requiredstring=${getText(fieldKey)} est obligatoire +bow.rightMenu.admin=Admin +bow.rightMenu.bookmark.addModify=Ajouter / Modifier +bow.rightMenu.bookmark.alias=ALIAS +bow.rightMenu.bookmark.link=URL +bow.rightMenu.bookmark.name=DESC +bow.rightMenu.bookmark.permanentLink=Ajouter un bookmark (permanent) +bow.rightMenu.bookmark.permanentLinkDescription=Ajoutez ce lien \u00E0 vos favoris pour pouvoir bookmarker vos liens dans le futur. Ce lien est toujours disponible \! +bow.rightMenu.bookmark.submit=Sauvegarder +bow.rightMenu.bookmark.tags=TAGS +bow.rightMenu.bookmark.temporaryLink=Ajouter un bookmark (session) +bow.rightMenu.bookmark.temporaryLinkDescription=Ajoutez ce lien \u00E0 vos favoris pour pouvoir bookmarker vos liens dans le futur. Ce lien est seulement disponible tant que vous \u00EAtes connect\u00E9 sur le site \! +bow.rightMenu.chromiumExtension=Extension pour chromium +bow.rightMenu.exportBookmarks=Exporter les marque-pages +bow.rightMenu.extensions=Extensions +bow.rightMenu.find.submit=Rechercher +bow.rightMenu.fullTextSearch=Recherche full text +bow.rightMenu.help=Aide +bow.rightMenu.import.submit=Importer +bow.rightMenu.importBookmarks=Importer des marque-pages +bow.rightMenu.logout=D\u00E9connexion +bow.rightMenu.search=Recherche +bow.rightMenu.token.permanent=Token permanent +bow.rightMenu.token.temporary=Token session +bow.search.ascclick=Nb clics asc. +bow.search.ascdate=Date asc. +bow.search.ascname=Nom asc. +bow.search.descclick=Nb clics desc. +bow.search.descdate=Date desc. +bow.search.descname=Nom desc. +bow.search.orderby=Trier par +bow.search.results.deleted=Les r\u00E9sultats de la recherche ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s +bow.search.submit=Rechercher +bow.search.title=Recherche +bow.search.order.ascClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics ascendants +bow.search.order.ascDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date ascendante +bow.search.order.ascName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom ascendant +bow.search.order.descClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics descendants +bow.search.order.descDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date descendante +bow.search.order.descName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom descendant +bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s Deleted: trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties 2011-03-09 12:58:35 UTC (rev 229) +++ trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties 2011-03-09 13:01:46 UTC (rev 230) @@ -1,122 +0,0 @@ -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.dataMigration.success=Data migration successful -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.admin.reIndexationDone=Data reindexed successfully -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.tag.deleted=The tag 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= -bow.config.bow.addressFrom.description= -bow.config.bow.admins.description= -bow.config.bow.smtpServer.description= -bow.config.bow.url.description= -bow.config.configFileName.description= -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 -bow.forgotPassword.emailDoesntExist=This email address doesn''t exist -bow.forgotpwd.submit=Send -bow.forgotpwd.title=Forgot your password? -bow.home.latestBookmarks=The latest added bookmarks -bow.home.mostUsedBookmarks=The most used bookmarks -bow.home.title=Home -bow.label.locale.english= -bow.label.locale.french= -bow.login.admin.failback=Authentication problem, you must recreate index in admin page -bow.login.authenticationFailure=Either your email address doesn''t exist or your password is incorrect -bow.login.email=Email -bow.login.email.required=Email is required -bow.login.email.wrongformat=Your email address isn''t valid -bow.login.password=Password -bow.login.password.required=Password is required -bow.login.repeatPassword=Repeat your password -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 -bow.preferences.confirmNewPassword=Confirm new password -bow.preferences.currentPassword=Current password -bow.preferences.emailAldyExists=This email address is already linked with another account -bow.preferences.importedBookmarks=Imported bookmarks -bow.preferences.newPassword=New password -bow.preferences.noImportedBookmarks=No imported bookmarks -bow.preferences.regenPermToken=Regenerate permanent token -bow.preferences.searchEngineUrlResults=Search Engine URL Results ('{'searchTerms'}' will be replaced by your text) -bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions -bow.preferences.siteLook=Site look -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 -bow.register.mailEmail=Your email -bow.register.mailHi=Hi -bow.register.mailPwd=Your password -bow.register.mailSubject=[bow] Your account information -bow.register.pwdDontMatch=Passwords don''t match -bow.register.submit=Register -bow.register.title=Register -bow.requiredstring=${getText(fieldKey)} is required -bow.rightMenu.admin=Admin -bow.rightMenu.bookmark.addModify=Add / Modify -bow.rightMenu.bookmark.alias=ALIAS -bow.rightMenu.bookmark.link=URL -bow.rightMenu.bookmark.name=DESC -bow.rightMenu.bookmark.permanentLink=Bookmark add link (permanent) -bow.rightMenu.bookmark.permanentLinkDescription=Add this link to your favourites to bookmark others in the future. This link is always available\! -bow.rightMenu.bookmark.submit=Save -bow.rightMenu.bookmark.tags=TAGS -bow.rightMenu.bookmark.temporaryLink=Bookmark add link (session) -bow.rightMenu.bookmark.temporaryLinkDescription=Add this link to your favourites to bookmark others in the future. This link is only available while you are connected on the site\! -bow.rightMenu.chromiumExtension=Chromium extension -bow.rightMenu.exportBookmarks=Export bookmarks -bow.rightMenu.extensions=Extensions -bow.rightMenu.find.submit=Find -bow.rightMenu.fullTextSearch=Full text search -bow.rightMenu.help=Help -bow.rightMenu.import.submit=Import -bow.rightMenu.importBookmarks=Import bookmarks -bow.rightMenu.logout=Logout -bow.rightMenu.search=Search -bow.rightMenu.token.permanent=Permanent token id -bow.rightMenu.token.temporary=Session token id -bow.search.ascclick=Asc. clicks nb -bow.search.ascdate=Asc. date -bow.search.ascname=Asc. name -bow.search.descclick=Desc. clicks nb -bow.search.descdate=Desc. date -bow.search.descname=Desc. name -bow.search.orderby=Order by -bow.search.results.deleted=Search results deleted successfully -bow.search.submit=Search -bow.search.title=Search -bow.search.order.ascClick=Your search results have been sorted by ascendant clicks number -bow.search.order.ascDate=Your search results have been sorted by ascendant date -bow.search.order.ascName=Your search results have been sorted by ascendant name -bow.search.order.descClick=Your search results have been sorted by descendant clicks number -bow.search.order.descDate=Your search results have been sorted by descendant date -bow.search.order.descName=Your search results have been sorted by descendant name -bow.token.generate.successful=The token has been regenerated successfully Deleted: trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties 2011-03-09 12:58:35 UTC (rev 229) +++ trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties 2011-03-09 13:01:46 UTC (rev 230) @@ -1,122 +0,0 @@ -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.dataMigration.success=Les donn\u00E9es ont \u00E9t\u00E9 migr\u00E9es avec succ\u00E8s -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.admin.reIndexationDone=Les donn\u00E9es ont bien \u00E9t\u00E9 r\u00E9index\u00E9es -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.tag.deleted=Le tag 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= -bow.config.bow.addressFrom.description= -bow.config.bow.admins.description= -bow.config.bow.smtpServer.description= -bow.config.bow.url.description= -bow.config.configFileName.description= -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 -bow.forgotPassword.emailDoesntExist=Cette adresse email n''existe pas -bow.forgotpwd.submit=Envoyer -bow.forgotpwd.title=Vous avez oubli\u00E9 votre mot de passe ? -bow.home.latestBookmarks=Les derniers marque-pages ajout\u00E9s -bow.home.mostUsedBookmarks=Les marque-pages les plus utilis\u00E9s -bow.home.title=Accueil -bow.label.locale.english= -bow.label.locale.french= -bow.login.admin.failback=Probl\u00E8me d''authentification, vous devriez reconstruire l''index via la page d'admin -bow.login.authenticationFailure=Soit votre adresse email n''existe pas, soit votre mot de passe est eronn\u00E9 -bow.login.email=Email -bow.login.email.required=Veuillez entrer votre adresse email -bow.login.email.wrongformat=Votre adresse email est invalide -bow.login.password=Mot de passe -bow.login.password.required=Veuillez entrer votre mot de passe -bow.login.repeatPassword=Confirmation -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 -bow.preferences.confirmNewPassword=Confirmez votre mot de passe -bow.preferences.currentPassword=Mot de passe actuel -bow.preferences.emailAldyExists=Cette addresse email est d\u00E9j\u00E0 utilis\u00E9e par un autre compte -bow.preferences.importedBookmarks=Marque-pages import\u00E9s -bow.preferences.newPassword=Nouveau mot de passe -bow.preferences.noImportedBookmarks=Aucun marque-page import\u00E9 -bow.preferences.regenPermToken=Reg\u00E9n\u00E9rer le token permanent -bow.preferences.searchEngineUrlResults=Search Engine URL Results ('{'searchTerms'}' sera remplac\u00E9 par votre recherche) -bow.preferences.searchEngineUrlSuggestions=Search Engine URL Suggestions -bow.preferences.siteLook=Pr\u00E9f\u00E9rences du site -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 -bow.register.mailEmail=Votre email -bow.register.mailHi=Bonjour -bow.register.mailPwd=Votre mot de passe -bow.register.mailSubject=[bow] Vos informations utilisateur -bow.register.pwdDontMatch=Les mots de passe sont diff\u00E9rents -bow.register.submit=S''enregistrer -bow.register.title=S''enregistrer -bow.requiredstring=${getText(fieldKey)} est obligatoire -bow.rightMenu.admin=Admin -bow.rightMenu.bookmark.addModify=Ajouter / Modifier -bow.rightMenu.bookmark.alias=ALIAS -bow.rightMenu.bookmark.link=URL -bow.rightMenu.bookmark.name=DESC -bow.rightMenu.bookmark.permanentLink=Ajouter un bookmark (permanent) -bow.rightMenu.bookmark.permanentLinkDescription=Ajoutez ce lien \u00E0 vos favoris pour pouvoir bookmarker vos liens dans le futur. Ce lien est toujours disponible \! -bow.rightMenu.bookmark.submit=Sauvegarder -bow.rightMenu.bookmark.tags=TAGS -bow.rightMenu.bookmark.temporaryLink=Ajouter un bookmark (session) -bow.rightMenu.bookmark.temporaryLinkDescription=Ajoutez ce lien \u00E0 vos favoris pour pouvoir bookmarker vos liens dans le futur. Ce lien est seulement disponible tant que vous \u00EAtes connect\u00E9 sur le site \! -bow.rightMenu.chromiumExtension=Extension pour chromium -bow.rightMenu.exportBookmarks=Exporter les marque-pages -bow.rightMenu.extensions=Extensions -bow.rightMenu.find.submit=Rechercher -bow.rightMenu.fullTextSearch=Recherche full text -bow.rightMenu.help=Aide -bow.rightMenu.import.submit=Importer -bow.rightMenu.importBookmarks=Importer des marque-pages -bow.rightMenu.logout=D\u00E9connexion -bow.rightMenu.search=Recherche -bow.rightMenu.token.permanent=Token permanent -bow.rightMenu.token.temporary=Token session -bow.search.ascclick=Nb clics asc. -bow.search.ascdate=Date asc. -bow.search.ascname=Nom asc. -bow.search.descclick=Nb clics desc. -bow.search.descdate=Date desc. -bow.search.descname=Nom desc. -bow.search.orderby=Trier par -bow.search.results.deleted=Les r\u00E9sultats de la recherche ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s -bow.search.submit=Rechercher -bow.search.title=Recherche -bow.search.order.ascClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics ascendants -bow.search.order.ascDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date ascendante -bow.search.order.ascName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom ascendant -bow.search.order.descClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics descendants -bow.search.order.descDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date descendante -bow.search.order.descName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom descendant -bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s

1 0

r229 - trunk
by tchemit＠users.chorem.org March 9, 2011

March 9, 2011

Author: tchemit Date: 2011-03-09 13:58:35 +0100 (Wed, 09 Mar 2011) New Revision: 229 Url: http://chorem.org/repositories/revision/bow/229 Log: Evolution #317: Updates to struts2 2.2.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-03 10:59:29 UTC (rev 228) +++ trunk/pom.xml 2011-03-09 12:58:35 UTC (rev 229) @@ -55,8 +55,7 @@ <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <wikittyVersion>3.0.5-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> - <struts2Version>2.1.8.1</struts2Version> - <struts2Version>2.1.8.1</struts2Version> + <struts2Version>2.2.1.1</struts2Version> <xWorkCoreVersion>2.1.6</xWorkCoreVersion> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion>

1 0

r228 - in trunk: bow-extension-chromium bow-ui bow-ui/src/main/java/org/chorem/bow/action bow-ui/src/main/resources bow-ui/src/main/resources/i18n bow-ui/src/main/webapp/WEB-INF bow-ui/src/main/webapp/css bow-ui/src/main/webapp/jsp/inc
by vbriand＠users.chorem.org March 3, 2011

March 3, 2011

Author: vbriand Date: 2011-03-03 11:59:29 +0100 (Thu, 03 Mar 2011) New Revision: 228 Url: http://chorem.org/repositories/revision/bow/228 Log: Fixed images links. Added missing confirmations messages and surrounded every action with try/catch in order to warn the user when an internal error occurs. Modified: trunk/bow-extension-chromium/ trunk/bow-ui/ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteImportAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/FullTextSearchAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/GenerateTokenAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/HomeAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java trunk/bow-ui/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/OrderAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/ReIndexationAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/RegisterAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/SearchAction.java trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties trunk/bow-ui/src/main/resources/struts.xml trunk/bow-ui/src/main/webapp/WEB-INF/web.xml trunk/bow-ui/src/main/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/connexion.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp Property changes on: trunk/bow-extension-chromium ___________________________________________________________________ Added: svn:ignore + target Property changes on: trunk/bow-ui ___________________________________________________________________ Modified: svn:ignore - target + target PutObjectStoreDirHere Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/AddUrlAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -156,33 +156,38 @@ } public String execute() { - WikittyProxy proxy = getBowProxy(); - BowBookmark bookmark = null; + try { + WikittyProxy proxy = getBowProxy(); + BowBookmark bookmark = null; - BowUser user = getBowSession().getUser(); - if (name != null) { - if (alias != null && !alias.isEmpty()) { - Criteria criteria = Search.query().eq( - BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias).criteria(); + BowUser user = getBowSession().getUser(); + if (name != null) { + if (alias != null && !alias.isEmpty()) { + Criteria criteria = Search.query().eq( + BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias).criteria(); - if (proxy.findByCriteria(BowBookmark.class, criteria) != null) { - alias = ""; + if (proxy.findByCriteria(BowBookmark.class, criteria) != null) { + alias = ""; + } } + bookmark = BookmarkUtils.createBookmark(link, name, tags, user, alias, null); + } else { //This part is for the bookmark addition by script + if (nameAndTags != null) { + bookmark = BookmarkUtils.createBookmark(link, nameAndTags, user); + } } - bookmark = BookmarkUtils.createBookmark(link, name, tags, user, alias, null); - } else { //This part is for the bookmark addition by script - if (nameAndTags != null) { - bookmark = BookmarkUtils.createBookmark(link, nameAndTags, user); + 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"); + } } + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } - 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"); - } - } - redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteImportAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteImportAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteImportAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -63,16 +63,21 @@ * 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")) { - WikittyProxy proxy = getBowProxy(); - BowUser user = getBowSession().getUser(); - Criteria criteria = Search.query() - .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()) - .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"))); + try { + 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")) { + WikittyProxy proxy = getBowProxy(); + BowUser user = getBowSession().getUser(); + Criteria criteria = Search.query() + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()) + .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"))); + } + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return SUCCESS; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteSearchResultsAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -33,6 +33,8 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.search.Search; +import static org.nuiton.i18n.I18n.n_; + /** * Supprime des bookmarks qui satisfont le critere de recherche. Si fullTextLine * est non vide, alors elle est utilisee, pour la recherche, sinon on utilise @@ -78,31 +80,38 @@ * Deletes the search results */ public String execute() { - if (searchLine != null && fullTextLine != null) { - WikittyProxy proxy = getBowProxy(); - Criteria criteria; + try { + if (searchLine != null && fullTextLine != null) { + WikittyProxy proxy = getBowProxy(); + Criteria criteria; + BowPreference user = getBowSession().getPreference(); - BowPreference user = getBowSession().getPreference(); - if (fullTextLine.isEmpty()) { - criteria = BookmarkUtils.getBookmarkListCriteriaByUser(user, searchLine); - } else { - criteria = Search.query().keyword(fullTextLine) - .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()).criteria() - .addFacetField(BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS); - } - List<BowBookmark> bookmarks = proxy.findAllByCriteria(BowBookmark.class, criteria).getAll(); - List<String> ids = new ArrayList<String>(); + if (fullTextLine.isEmpty()) { + criteria = BookmarkUtils.getBookmarkListCriteriaByUser(user, searchLine); + } else { + criteria = Search.query().keyword(fullTextLine) + .eq(BowBookmark.FQ_FIELD_BOWBOOKMARK_BOWUSER, user.getWikittyId()).criteria() + .addFacetField(BowBookmark.FQ_FIELD_WIKITTYLABEL_LABELS); + } + List<BowBookmark> bookmarks = proxy.findAllByCriteria(BowBookmark.class, criteria).getAll(); + List<String> ids = new ArrayList<String>(); - // TODO poussin 20110216 a revoir, incomprehensible :( - for (BowBookmark bookmark : bookmarks) { - if (bookmark != null) { - if (searchLine.isEmpty() && bookmark.getLabels() == null || !searchLine.isEmpty() - || fullTextLine.isEmpty() && bookmark.getLabels() == null || !fullTextLine.isEmpty()) { - ids.add(bookmark.getWikittyId()); + // TODO poussin 20110216 a revoir, incomprehensible :( + for (BowBookmark bookmark : bookmarks) { + 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); + addActionMessage(getText(n_("bow.search.results.deleted"))); } - proxy.delete(ids); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return SUCCESS; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/DeleteTagAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -27,6 +27,8 @@ import org.chorem.bow.BowUtils; import org.nuiton.wikitty.WikittyProxy; +import static org.nuiton.i18n.I18n.n_; + /** * Supprime un tag d'un bookmark * @@ -104,18 +106,24 @@ * Deletes a bookmark's tag */ public String execute() { - if (deleteTag != null && bookmarkId != null) { - if (!bookmarkId.isEmpty()) { - WikittyProxy proxy = getBowProxy(); - BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId); + try { + if (deleteTag != null && bookmarkId != null) { + if (!bookmarkId.isEmpty()) { + WikittyProxy proxy = getBowProxy(); + BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId); - if (bookmark != null) { - bookmark.removeLabels(deleteTag); - proxy.store(bookmark); + if (bookmark != null) { + bookmark.removeLabels(deleteTag); + proxy.store(bookmark); + addActionMessage(getText(n_("bow.bookmark.tag.deleted"))); + } } } + redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } - redirectTo = BowUtils.redirectTo(searchLine, fullTextLine); return SUCCESS; } } \ No newline at end of file Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ExportBookmarksAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -74,7 +74,7 @@ BufferedWriter out = null; try { - File tmp = File.createTempFile("bookmarks", "tmp.html"); + File tmp = File.createTempFile("bookmarks", ".tmp.html"); tmp.deleteOnExit(); out = new BufferedWriter(new FileWriter(tmp)); Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ForgotPasswordAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -80,52 +80,57 @@ public String execute() { String result = INPUT; - if (email != null) { - email = email.trim(); - if (!email.isEmpty()) { - WikittyProxy proxy = getBowProxy(); - Criteria criteria = Search.query() - .eq(BowUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria(); - BowUser user = proxy.findByCriteria(BowUser.class, criteria); + try { + if (email != null) { + email = email.trim(); + if (!email.isEmpty()) { + WikittyProxy proxy = getBowProxy(); + Criteria criteria = Search.query() + .eq(BowUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria(); + BowUser user = proxy.findByCriteria(BowUser.class, criteria); - if (user != null) { //If the email address exists - String password = ""; - String md5 = ""; + if (user != null) { //If the email address exists + String password = ""; + String md5 = ""; - password = RandomStringUtils.randomAlphanumeric(20); - md5 = StringUtil.encodeMD5(password); - try { - String mailContent; + 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); - - //The password is changed only if the mail has been sent - user.setPassword(md5); - proxy.store(user); - } catch (AddressException e) { - //If the email address is invalid - String message = getText("bow.mail.badFormat"); - - addActionError(n_(message)); - log.error(message + " (email:" + email + ")", e); - } catch (MessagingException e) { - String message = getText("bow.mail.sendError"); - - addActionError(n_(message)); - log.error(message + "(" + e.getMessage() + ")", e); + 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); + + //The password is changed only if the mail has been sent + user.setPassword(md5); + proxy.store(user); + } catch (AddressException e) { + //If the email address is invalid + String message = getText("bow.mail.badFormat"); + + addActionError(n_(message)); + log.error(message + " (email:" + email + ")", e); + } catch (MessagingException e) { + String message = getText("bow.mail.sendError"); + + addActionError(n_(message)); + log.error(message + "(" + e.getMessage() + ")", e); + } + result = SUCCESS; + } else { //If the email is not associated with an account + addFieldError("email", + getText(n_("bow.forgotPassword.emailDoesntExist"))); } - result = SUCCESS; - } else { //If the email is not associated with an account - addFieldError("email", - getText(n_("bow.forgotPassword.emailDoesntExist"))); } } + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return result; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/FullTextSearchAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/FullTextSearchAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -30,6 +30,8 @@ import org.chorem.bow.BowSearch; import org.chorem.bow.BowSession; +import static org.nuiton.i18n.I18n.n_; + /** * Fait la recherche fulltext * @@ -78,10 +80,15 @@ * Fulltext search */ public String execute() { - BowSession session = getBowSession(); - BowPreference user = session.getPreference(); + try { + BowSession session = getBowSession(); + BowPreference user = session.getPreference(); - BowSearch.fullText(request, user); + BowSearch.fullText(request, user); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); + } return SUCCESS; } } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/GenerateTokenAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/GenerateTokenAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -42,16 +42,21 @@ * Generates a new permanent and temporary token */ public String execute() { - BowUser user = getBowSession().getUser(); - WikittyProxy proxy = getBowProxy(); - - String permanentToken = BowUtils.generateToken(); - user.setPermanentToken(permanentToken); - proxy.store(user); - - String temporaryToken = BowUtils.generateToken(); - getBowSession().setTemporaryToken(temporaryToken); - addActionMessage(getText(n_("bow.token.generate.successful"))); + try { + BowUser user = getBowSession().getUser(); + WikittyProxy proxy = getBowProxy(); + + String permanentToken = BowUtils.generateToken(); + user.setPermanentToken(permanentToken); + proxy.store(user); + + String temporaryToken = BowUtils.generateToken(); + getBowSession().setTemporaryToken(temporaryToken); + addActionMessage(getText(n_("bow.token.generate.successful"))); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); + } return SUCCESS; } } \ No newline at end of file Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/HomeAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/HomeAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/HomeAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -29,6 +29,8 @@ import org.chorem.bow.BowInit; import org.chorem.bow.BowPreference; +import static org.nuiton.i18n.I18n.n_; + /** * Prepare l'affichage de la page d'accueil * @@ -61,9 +63,14 @@ * Initializes everything before displaying the home page */ public String execute() { - BowPreference user = getBowSession().getPreference(); + try { + BowPreference user = getBowSession().getPreference(); - BowInit.initHomePage(request, user); + BowInit.initHomePage(request, user); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); + } return SUCCESS; } } \ No newline at end of file Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -226,46 +226,51 @@ } public String execute() { - BowPreference user = getBowSession().getPreference(); + try { + 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(); + if (upfile != null) { + // try { + // List<?> lines = FileUtils.readLines(upfile); + // String content = ""; + // + // for (Object line : lines) { + // content += (String)line; + // } + WikittyProxy proxy = getBowProxy(); - 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 { - BowSearch.search(request, user); - } - addActionMessage(getText(n_("bow.bookmark.import.successful"))); - } catch (ParserException e) { - addActionError(getText(n_("bow.bookmark.badFileFormat"))); + 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 { + BowSearch.search(request, user); + } + addActionMessage(getText(n_("bow.bookmark.import.successful"))); + } catch (ParserException e) { + addActionError(getText(n_("bow.bookmark.badFileFormat"))); - if (searchLine == null || searchLine.isEmpty()) { - BowInit.initHomePage(request, user); - } else { - BowSearch.search(request, user); + if (searchLine == null || searchLine.isEmpty()) { + BowInit.initHomePage(request, user); + } else { + BowSearch.search(request, user); + } + } catch (IOException e2) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e2.getMessage(), e2); } - } catch (IOException e2) { - addActionError(getText(n_("bow.error.internal"))); - log.error(e2.getMessage(), e2); } + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return SUCCESS; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -115,21 +115,26 @@ public String execute() { String result = INPUT; - if (email != null) { - email = email.trim(); + try { + if (email != null) { + email = email.trim(); - if (password != null) { - String md5 = StringUtil.encodeMD5(password); - BowUser user; + if (password != null) { + String md5 = StringUtil.encodeMD5(password); + BowUser user; - user = checkLogin(email, md5); - if (user != null) { - getBowSession().setUser(user); - BowPreference pref = getBowSession().getPreference(); - BowInit.initHomePage(servletRequest, pref); - result = SUCCESS; + user = checkLogin(email, md5); + if (user != null) { + getBowSession().setUser(user); + BowPreference pref = getBowSession().getPreference(); + BowInit.initHomePage(servletRequest, pref); + result = SUCCESS; + } } } + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return result; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java 2011-03-03 10:59:29 UTC (rev 228) @@ -30,6 +30,8 @@ import org.chorem.bow.BowSession; import org.nuiton.wikitty.WikittyProxy; +import static org.nuiton.i18n.I18n.n_; + /** * Lance la migration des données de la version 0.4 vers 0.5 * @@ -45,11 +47,17 @@ static private Log log = LogFactory.getLog(Migrate04To05Action.class); public String execute() { - BowSession session = getBowSession(); - if (session.isAdmin()) { //If is admin - WikittyProxy proxy = getBowProxy(); - - BowMigration04To05.migrate(proxy); + try { + BowSession session = getBowSession(); + if (session.isAdmin()) { //If is admin + WikittyProxy proxy = getBowProxy(); + + BowMigration04To05.migrate(proxy); + addActionMessage(getText(n_("bow.admin.dataMigration.success"))); + } + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return SUCCESS; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ModifyBookmarkAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -148,21 +148,26 @@ * Modifies a bookmark */ public String execute() { - WikittyProxy proxy = getBowProxy(); - BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId); + try { + WikittyProxy proxy = getBowProxy(); + BowBookmark bookmark = proxy.restore(BowBookmark.class, bookmarkId); - if (bookmark != null) { - if (alias != null && !alias.isEmpty()) { - Criteria criteria = Search.query().eq( - BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias).criteria(); + if (bookmark != null) { + if (alias != null && !alias.isEmpty()) { + Criteria criteria = Search.query().eq( + BowBookmark.FQ_FIELD_BOWBOOKMARK_PRIVATEALIAS, alias).criteria(); - if (proxy.findByCriteria(BowBookmark.class, criteria) != null) { - alias = bookmark.getPrivateAlias(); + if (proxy.findByCriteria(BowBookmark.class, criteria) != null) { + alias = bookmark.getPrivateAlias(); + } } + BookmarkUtils.updateBookmark(bookmark, name, link, tags, alias); + proxy.store(bookmark); + addActionMessage(getText(n_("bow.bookmark.update.successful"))); } - BookmarkUtils.updateBookmark(bookmark, name, link, tags, alias); - proxy.store(bookmark); - addActionMessage(getText(n_("bow.bookmark.update.successful"))); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return SUCCESS; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/OrderAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/OrderAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/OrderAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -34,6 +34,8 @@ import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.WikittyProxy; +import static org.nuiton.i18n.I18n.n_; + /** * Permet de modifie l'ordre de tri des bookmarks * TODO poussin 20110211 cette action n'est pas vraiment pertinente et devrait @@ -84,41 +86,52 @@ * Orders the bookmarks according to a criteria */ public String execute() { - BowPreference user = getBowSession().getPreference(); - Criteria baseCriteria = BookmarkUtils.getBookmarkListCriteriaByUser(user, searchLine); + try { + BowPreference user = getBowSession().getPreference(); + Criteria baseCriteria = BookmarkUtils.getBookmarkListCriteriaByUser(user, searchLine); - if (type != null && baseCriteria != null && !type.isEmpty()) { - WikittyProxy proxy = getBowProxy(); - PagedResult<BowBookmark> result = null; + if (type != null && baseCriteria != null && !type.isEmpty()) { + WikittyProxy proxy = getBowProxy(); + PagedResult<BowBookmark> result = null; - if (type.equals("ascName")) { - Criteria criteria = baseCriteria.addSortAscending( - BowBookmark.FQ_FIELD_BOWBOOKMARK_DESCRIPTION); - result = proxy.findAllByCriteria(BowBookmark.class, criteria); - } else if (type.equals("ascDate")) { - Criteria criteria = baseCriteria.addSortAscending( - BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE); - result = proxy.findAllByCriteria(BowBookmark.class, criteria); - } else if (type.equals("ascClick")) { - Criteria criteria = baseCriteria.addSortAscending( - BowBookmark.FQ_FIELD_BOWBOOKMARK_CLICK); - result = proxy.findAllByCriteria(BowBookmark.class, criteria); - } else if (type.equals("descName")) { - Criteria criteria = baseCriteria.addSortDescending( - BowBookmark.FQ_FIELD_BOWBOOKMARK_DESCRIPTION); - result = proxy.findAllByCriteria(BowBookmark.class, criteria); - } else if (type.equals("descDate")) { - Criteria criteria = baseCriteria.addSortDescending( - BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE); - result = proxy.findAllByCriteria(BowBookmark.class, criteria); - } else if (type.equals("descClick")) { - Criteria criteria = baseCriteria.addSortDescending( - BowBookmark.FQ_FIELD_BOWBOOKMARK_CLICK); - result = proxy.findAllByCriteria(BowBookmark.class, criteria); + if (type.equals("ascName")) { + Criteria criteria = baseCriteria.addSortAscending( + BowBookmark.FQ_FIELD_BOWBOOKMARK_DESCRIPTION); + result = proxy.findAllByCriteria(BowBookmark.class, criteria); + addActionMessage(getText(n_("bow.search.order.ascName"))); + } else if (type.equals("ascDate")) { + Criteria criteria = baseCriteria.addSortAscending( + BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE); + result = proxy.findAllByCriteria(BowBookmark.class, criteria); + addActionMessage(getText(n_("bow.search.order.ascDate"))); + } else if (type.equals("ascClick")) { + Criteria criteria = baseCriteria.addSortAscending( + BowBookmark.FQ_FIELD_BOWBOOKMARK_CLICK); + result = proxy.findAllByCriteria(BowBookmark.class, criteria); + addActionMessage(getText(n_("bow.search.order.ascClick"))); + } else if (type.equals("descName")) { + Criteria criteria = baseCriteria.addSortDescending( + BowBookmark.FQ_FIELD_BOWBOOKMARK_DESCRIPTION); + result = proxy.findAllByCriteria(BowBookmark.class, criteria); + addActionMessage(getText(n_("bow.search.order.descName"))); + } else if (type.equals("descDate")) { + Criteria criteria = baseCriteria.addSortDescending( + BowBookmark.FQ_FIELD_BOWBOOKMARK_CREATIONDATE); + result = proxy.findAllByCriteria(BowBookmark.class, criteria); + addActionMessage(getText(n_("bow.search.order.descDate"))); + } else if (type.equals("descClick")) { + Criteria criteria = baseCriteria.addSortDescending( + BowBookmark.FQ_FIELD_BOWBOOKMARK_CLICK); + result = proxy.findAllByCriteria(BowBookmark.class, criteria); + addActionMessage(getText(n_("bow.search.order.descClick"))); + } + BookmarkActions bookmarkActions = + BookmarkUtils.createBookmarkActions(request, result, searchLine); + request.setAttribute("bookmarkActions", bookmarkActions); } - BookmarkActions bookmarkActions = - BookmarkUtils.createBookmarkActions(request, result, searchLine); - request.setAttribute("bookmarkActions", bookmarkActions); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return SUCCESS; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -258,50 +258,56 @@ * Changes the user preferences */ public String execute() { - BowProxy proxy = getBowSession().getProxy(); - // BowPreference extends BowUser, donc on l'utilise pour tout - BowPreference preference = getBowSession().getPreference(); String result = SUCCESS; + + try { + BowProxy proxy = getBowSession().getProxy(); + // BowPreference extends BowUser, donc on l'utilise pour tout + BowPreference preference = getBowSession().getPreference(); + + setBookmarksImportDate(BookmarkUtils.getBookmarksByImportDate(request, preference)); + if (update != null) { //If the user submitted the form + preference = changePreference(preference); + preference = proxy.store(preference); + getBowSession().setPreference(preference); - setBookmarksImportDate(BookmarkUtils.getBookmarksByImportDate(request, preference)); - if (update != null) { //If the user submitted the form - preference = changePreference(preference); - preference = proxy.store(preference); - getBowSession().setPreference(preference); + Criteria criteria = Search.query().eq(BowUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria(); + BowUser find = proxy.findByCriteria(BowUser.class, criteria); - 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) { + //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) { + result = ERROR; + } else { + 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 + setEmail(preference.getLogin()); + addActionError(getText("bow.preferences.emailAldyExists")); result = ERROR; - } else { - 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 + // If the user didn't submit the form, the fields are filled with + // the current preferences values setEmail(preference.getLogin()); - addActionError(getText("bow.preferences.emailAldyExists")); - result = ERROR; + setColors(preference.getColors()); + setTagsNb(String.valueOf(preference.getTags())); + setBookmarksHomePage(String.valueOf(preference.getBookmarks())); + setSearchEngineUrlSuggestions(preference.getSearchEngineUrlSuggestions()); + setSearchEngineUrlResults(preference.getSearchEngineUrlResults()); } - } else { - // If the user didn't submit the form, the fields are filled with - // the current preferences values - setEmail(preference.getLogin()); - setColors(preference.getColors()); - setTagsNb(String.valueOf(preference.getTags())); - setBookmarksHomePage(String.valueOf(preference.getBookmarks())); - setSearchEngineUrlSuggestions(preference.getSearchEngineUrlSuggestions()); - setSearchEngineUrlResults(preference.getSearchEngineUrlResults()); + // retrieve last reference + preference = getBowSession().getPreference(); + BowInit.initHomePage(request, preference); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } - // retrieve last reference - preference = getBowSession().getPreference(); - BowInit.initHomePage(request, preference); return result; } } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/ReIndexationAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/ReIndexationAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ReIndexationAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -26,6 +26,8 @@ import org.chorem.bow.BowSession; import org.nuiton.wikitty.WikittyProxy; +import static org.nuiton.i18n.I18n.n_; + /** * Lance la reindexation solr * @@ -36,11 +38,17 @@ private static final long serialVersionUID = 6226574522402739559L; public String execute() { - BowSession session = getBowSession(); - if (session.isAdmin()) { //If is admin - WikittyProxy proxy = getBowProxy(); + try { + BowSession session = getBowSession(); + if (session.isAdmin()) { //If is admin + WikittyProxy proxy = getBowProxy(); - proxy.getWikittyService().syncSearchEngine(proxy.getSecurityToken()); + proxy.getWikittyService().syncSearchEngine(proxy.getSecurityToken()); + addActionMessage(getText(n_("bow.admin.reIndexationDone"))); + } + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return SUCCESS; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/RedirectToUrlAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -26,6 +26,8 @@ import org.chorem.bow.BowBookmark; import org.nuiton.wikitty.WikittyProxy; +import static org.nuiton.i18n.I18n.n_; + /** * Retrieves the bookmark URL (where the user will be redirected) and increments * the click counter for this bookmark @@ -70,15 +72,21 @@ */ 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; + + try { + 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; + } } + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return result; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/RegisterAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/RegisterAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -131,53 +131,59 @@ 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"))); - } else { - String md5 = StringUtil.encodeMD5(password); + try { + if (email != null) { + email = email.trim(); + if (password != null) { + if (!password.equals(repeatPassword)) { + addActionError(getText(n_("bow.register.pwdDontMatch"))); + } else { + String md5 = StringUtil.encodeMD5(password); - //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 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 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; + //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); - 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) { - //If the email address is invalid - String message = getText("bow.mail.badFormat"); + try { + String mailContent; - addActionError(n_(message)); - log.error(message + " (email:" + email + ")", e); - } catch (MessagingException e) { - String message = getText("bow.mail.sendError"); + 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) { + //If the email address is invalid + String message = getText("bow.mail.badFormat"); - addActionError(n_(message)); - log.error(message + "(" + e.getMessage() + ")", e); + addActionError(n_(message)); + log.error(message + " (email:" + email + ")", e); + } catch (MessagingException e) { + String message = getText("bow.mail.sendError"); + + addActionError(n_(message)); + log.error(message + "(" + e.getMessage() + ")", e); + } + result = SUCCESS; } - result = SUCCESS; } } } } + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); } return result; } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/RemoveBookmarkAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -104,6 +104,7 @@ addActionMessage(getText(n_("bow.bookmark.remove.successful"))); } } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); log.error("Can't do action", e); } } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/SearchAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/SearchAction.java 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/SearchAction.java 2011-03-03 10:59:29 UTC (rev 228) @@ -29,6 +29,8 @@ import org.chorem.bow.BowPreference; import org.chorem.bow.BowSearch; +import static org.nuiton.i18n.I18n.n_; + /** * gere les recherches de bookmark * @@ -92,8 +94,14 @@ * Searches a bookmark */ public String execute() { - BowPreference user = getBowSession().getPreference(); - BowSearch.search(request, user); + try { + BowPreference user = getBowSession().getPreference(); + BowSearch.search(request, user); + } catch (Exception e) { + addActionError(getText(n_("bow.error.internal"))); + log.error(e.getMessage(), e); + } return SUCCESS; + } } \ No newline at end of file Modified: trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/resources/i18n/bow_en_GB.properties 2011-03-03 10:59:29 UTC (rev 228) @@ -1,16 +1,19 @@ 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.dataMigration.success=Data migration successful 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.admin.reIndexationDone=Data reindexed successfully 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.tag.deleted=The tag was removed successfully bow.bookmark.tags=Tags bow.bookmark.update.successful=The bookmark was updated successfully bow.bookmarks.noBookmarks=No bookmarks @@ -107,6 +110,13 @@ bow.search.descdate=Desc. date bow.search.descname=Desc. name bow.search.orderby=Order by +bow.search.results.deleted=Search results deleted successfully bow.search.submit=Search bow.search.title=Search +bow.search.order.ascClick=Your search results have been sorted by ascendant clicks number +bow.search.order.ascDate=Your search results have been sorted by ascendant date +bow.search.order.ascName=Your search results have been sorted by ascendant name +bow.search.order.descClick=Your search results have been sorted by descendant clicks number +bow.search.order.descDate=Your search results have been sorted by descendant date +bow.search.order.descName=Your search results have been sorted by descendant name bow.token.generate.successful=The token has been regenerated successfully Modified: trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties =================================================================== --- trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/resources/i18n/bow_fr_FR.properties 2011-03-03 10:59:29 UTC (rev 228) @@ -1,16 +1,19 @@ 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.dataMigration.success=Les donn\u00E9es ont \u00E9t\u00E9 migr\u00E9es avec succ\u00E8s 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.admin.reIndexationDone=Les donn\u00E9es ont bien \u00E9t\u00E9 r\u00E9index\u00E9es 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.tag.deleted=Le tag 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 @@ -107,6 +110,13 @@ bow.search.descdate=Date desc. bow.search.descname=Nom desc. bow.search.orderby=Trier par +bow.search.results.deleted=Les r\u00E9sultats de la recherche ont \u00E9t\u00E9 supprim\u00E9s avec succ\u00E8s bow.search.submit=Rechercher bow.search.title=Recherche +bow.search.order.ascClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics ascendants +bow.search.order.ascDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date ascendante +bow.search.order.ascName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom ascendant +bow.search.order.descClick=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nombre de clics descendants +bow.search.order.descDate=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par date descendante +bow.search.order.descName=Les r\u00E9sultats de votre recherche ont \u00E9t\u00E9 tri\u00E9s par nom descendant bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s Modified: trunk/bow-ui/src/main/resources/struts.xml =================================================================== --- trunk/bow-ui/src/main/resources/struts.xml 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/resources/struts.xml 2011-03-03 10:59:29 UTC (rev 228) @@ -78,6 +78,7 @@ </interceptor-ref> <interceptor-ref name="loginStack" /> <result type="redirect">${redirectTo}</result> + <result name="input" type="redirect">${redirectTo}</result> </action> <action name="exportBookmarks" class="org.chorem.bow.action.ExportBookmarksAction"> <interceptor-ref name="loginStack" /> @@ -156,6 +157,9 @@ <result>/jsp/suggestions.jsp</result> </action> <action name="deleteSearchResults" class="org.chorem.bow.action.DeleteSearchResultsAction"> + <interceptor-ref name="store"> + <param name="operationMode">STORE</param> + </interceptor-ref> <interceptor-ref name="loginStack" /> <result type="redirectAction">home</result> </action> @@ -190,13 +194,16 @@ <result type="redirectAction">preferences</result> </action> <action name="deleteTag" class="org.chorem.bow.action.DeleteTagAction"> - <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="redirectToUrl" class="org.chorem.bow.action.RedirectToUrlAction"> - <interceptor-ref name="loginStack" /> - <result name="error" type="redirectAction">home</result> - <result type="redirect">${link}</result> + <interceptor-ref name="loginStack" /> + <result name="error" type="redirectAction">home</result> + <result type="redirect">${link}</result> </action> <action name="*Xml"> <result>/jsp/{1}Xml.jsp</result> @@ -219,6 +226,9 @@ <result>/jsp/admin.jsp</result> </action> <action name="reIndexation" class="org.chorem.bow.action.ReIndexationAction"> + <interceptor-ref name="store"> + <param name="operationMode">STORE</param> + </interceptor-ref> <interceptor-ref name="loginStack" /> <result>/jsp/admin.jsp</result> </action> Modified: trunk/bow-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/web.xml 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/webapp/WEB-INF/web.xml 2011-03-03 10:59:29 UTC (rev 228) @@ -67,28 +67,12 @@ </listener>  - - <servlet> <servlet-name>jspSupportServlet</servlet-name> <servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class> <load-on-startup>5</load-on-startup> </servlet> -  <welcome-file-list> <welcome-file>index.jsp</welcome-file> Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-03-03 10:59:29 UTC (rev 228) @@ -33,7 +33,7 @@ } #header{ - background:#fff url('/bow/img/fondhead.jpg') repeat-x 0 0; + background:#fff url('../img/fondhead.jpg') repeat-x 0 0; float:left; position:absolute; right:85%; @@ -43,7 +43,7 @@ } #header a.logo{ - background:transparent url('/bow/img/logobow.jpg') repeat scroll 0 0; + background:transparent url('../img/logobow.jpg') repeat scroll 0 0; display:block; height:100px; text-indent:-99999px; @@ -106,7 +106,7 @@ } .bookmark .bookmarkhead .edit{ - background:url('/bow/img/edit.jpg') no-repeat; + background:url('../img/edit.jpg') no-repeat; width:31px; height:32px; position:absolute; @@ -115,7 +115,7 @@ } .bookmark .bookmarkhead .supprim{ - background:url('/bow/img/croix.jpg') no-repeat; + background:url('../img/croix.jpg') no-repeat; width:31px; height:32px; position:absolute; @@ -129,7 +129,7 @@ font-size:14px; line-height:32px; padding-left:40px; - background:url('/bow/img/ptit_livre.jpg') no-repeat; + background:url('../img/ptit_livre.jpg') no-repeat; height:32px; display:block; text-decoration:none; @@ -142,7 +142,7 @@ float:left; margin-right:15px; display:block; - background:url('/bow/img/ptit-livre.jpg') no-repeat; + background:url('../img/ptit-livre.jpg') no-repeat; } .bookmark .screenshot{ @@ -150,7 +150,7 @@ margin:5px 10px; width:100px; height:75px; - background:url('/bow/img/livreG.jpg') no-repeat; + background:url('../img/livreG.jpg') no-repeat; } .bookmark .description{ @@ -170,7 +170,7 @@ .bookmark .description .tags{ color:#88516c; - background:url('/bow/img/tag.jpg') no-repeat left center; + background:url('../img/tag.jpg') no-repeat left center; font-size:12px; padding-left:30px; height:auto; @@ -181,7 +181,7 @@ } .bookmark .click{ - background:transparent url('/bow/img/click.jpg') no-repeat scroll 0 0; + background:transparent url('../img/click.jpg') no-repeat scroll 0 0; float:right; height:27px; margin:10px -25px 5px 5px; @@ -202,12 +202,12 @@ position:relative; right:67%; width:33%; - background:#BF8A9C url('/bow/img/moyen-livre.jpg') no-repeat scroll 7% 44%; + background:#BF8A9C url('../img/moyen-livre.jpg') no-repeat scroll 7% 44%; height:100px; } #logoutDiv a.help{ - background:transparent url('/bow/img/aide.jpg') no-repeat scroll 0 0; + background:transparent url('../img/aide.jpg') no-repeat scroll 0 0; display:block; height:34px; text-indent:-99999px; @@ -218,7 +218,7 @@ } #logoutDiv form input{ - background:transparent url('/bow/img/fondbouton.jpg') repeat-x scroll 0 0; + background:transparent url('../img/fondbouton.jpg') repeat-x scroll 0 0; border:medium none; color:#9C7186; font-size:12px; @@ -332,7 +332,7 @@ } #colonneD form input[type="submit"]{ - background:transparent url('/bow/img/fondbouton.jpg') repeat-x scroll 0 0; + background:transparent url('../img/fondbouton.jpg') repeat-x scroll 0 0; border:medium none; color:#9C7186; display:block; @@ -369,7 +369,7 @@ .formFrame{ width:365px; height:315px; - background:url('/bow/img/fondconnexion.jpg') no-repeat; + background:url('../img/fondconnexion.jpg') no-repeat; position:relative; margin-top:20px; margin-bottom:20px; @@ -403,7 +403,7 @@ .formFrame input[type="submit"]{ float:left; margin-top:20px; - background:url('/bow/img/fdboutonV.jpg') repeat-x; + background:url('../img/fdboutonV.jpg') repeat-x; height:31px; line-height:31px; color:#FFFFFF; @@ -457,7 +457,7 @@ } .deleteImport .deleteImportButton{ - background:url('/bow/img/croixtr.png') no-repeat; + background:url('../img/croixtr.png') no-repeat; width:31px; height:32px; float:right; @@ -467,7 +467,7 @@ } #deleteSearchResultsButton{ - background:url('/bow/img/croixtr.png') no-repeat; + background:url('../img/croixtr.png') no-repeat; width:31px; height:32px; float:right; Modified: trunk/bow-ui/src/main/webapp/css/connexion.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/connexion.css 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/webapp/css/connexion.css 2011-03-03 10:59:29 UTC (rev 228) @@ -24,7 +24,7 @@ */ #header{ - background:#FFFFFF url('/bow/img/fondhead.jpg') repeat-x; + background:#FFFFFF url('../img/fondhead.jpg') repeat-x; width:100%; float:left; height:100px; @@ -34,7 +34,7 @@ } #header a.logo{ - background:transparent url('/bow/img/logobow.jpg') repeat scroll 0 0; + background:transparent url('../img/logobow.jpg') repeat scroll 0 0; display:block; height:100px; text-indent:-99999px; @@ -70,7 +70,7 @@ #formFrame{ width:225px; height:315px; - background:url('/bow/img/fondconnexion.jpg') no-repeat; + background:url('../img/fondconnexion.jpg') no-repeat; position:relative; margin:100px auto; padding:10px 70px; @@ -122,7 +122,7 @@ input[type="submit"]{ float:right; margin-top:20px; - background:url('/bow/img/fdboutonV.jpg') repeat-x; + background:url('../img/fdboutonV.jpg') repeat-x; height:31px; line-height:31px; color:#FFFFFF; Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-03-03 10:59:29 UTC (rev 228) @@ -59,7 +59,7 @@ #main .menu{ width:90%; height:35px; - background:#804561 url('/bow/img/pointemenu.jpg') no-repeat right; + background:#804561 url('../img/pointemenu.jpg') no-repeat right; margin-bottom:15px; padding:0 40px; line-height:35px; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 17:31:10 UTC (rev 227) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-03-03 10:59:29 UTC (rev 228) @@ -28,76 +28,78 @@ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <s:set var="searchLine" value="%{#request.searchLine}" /> - <s:set var="fullTextLine" value="%{#request.fullTextLine}" /> - <s:set var="wikittyId" value="%{#request.bookmark.getWikittyId()}" /> - <s:set var="bookmarkLink" value="%{#request.bookmark.getLink()}" /> - <s:set var="bookmarkAlias" value="%{#request.bookmark.getPrivateAlias()}" /> - <s:set var="bookmarkDescription" value="%{#request.bookmark.getDescription()}" /> - <s:set var="bookmarkClicks" value="%{#request.bookmark.getClick()}" /> - <s:set var="formBookmarkId" value="%{#request.formBookmarkId}" /> - <s:set var="aliasUrl" value="%{@org.chorem.bow.BowConfig@getInstance().getServletAliasUrl() + #bookmarkAlias}" /> - <s:set var="date" value="%{#request.sdf.format(#request.bookmark.getCreationDate())}" /> - - <div class="bookmarkhead"> - <s:a cssClass="alias" href="%{#aliasUrl}" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> - <s:property value="%{#bookmarkAlias}" /> - </s:a> - <p class="date">(<s:property value="%{date}" />)</p> - <s:url var="editBookmarkModify" action="modifyBookmark" escapeAmp="false"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> - </s:url> - <s:url var="editBookmark" action="modifyBookmark" escapeAmp="true"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> - </s:url> - <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmarkModify}', '%{#wikittyId}');"></s:a> - <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> - </s:url> - <s:a cssClass="supprim" href="%{removeBookmark}"></s:a> - </div> - <div class="bookmarkcontenu"> - <div class="screenshot"></div> - <div class="click"><s:property value="%{#bookmarkClicks}" /></div> - <div class="description"> - <h3><s:text name="bow.bookmark.description" /> :</h3> - <p> - <s:url var="redirectTo" action="redirectToUrl"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - </s:url> - <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> - <s:iterator value="#request.bookmark.labels"> - <s:url var="deleteTag" action="deleteTag"> - <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> - <s:param name="deleteTag"><s:property /></s:param> - <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> - <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> - </s:url> - <s:if test="%{!(formBookmarkId == null || !formBookmarkId.equals(wikittyId))}"> - <s:a cssStyle="text-decoration:none;" href="%{deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - </s:if> - <s:else> - <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteTag}"> - <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </s:a> - </s:else> - <s:url var="search" action="search"> - <s:param name="searchLine"><s:property /></s:param> - </s:url> - <s:a href="%{search}" cssStyle="text-decoration:none"><s:property /></s:a> - </s:iterator> - </p> + <s:if test="%{#request.bookmark != null}"> + <s:set var="searchLine" value="%{#request.searchLine}" /> + <s:set var="fullTextLine" value="%{#request.fullTextLine}" /> + <s:set var="wikittyId" value="%{#request.bookmark.getWikittyId()}" /> + <s:set var="bookmarkLink" value="%{#request.bookmark.getLink()}" /> + <s:set var="bookmarkAlias" value="%{#request.bookmark.getPrivateAlias()}" /> + <s:set var="bookmarkDescription" value="%{#request.bookmark.getDescription()}" /> + <s:set var="bookmarkClicks" value="%{#request.bookmark.getClick()}" /> + <s:set var="formBookmarkId" value="%{#request.formBookmarkId}" /> + <s:set var="aliasUrl" value="%{@org.chorem.bow.BowConfig@getInstance().getServletAliasUrl() + #bookmarkAlias}" /> + <s:set var="date" value="%{#request.sdf.format(#request.bookmark.getCreationDate())}" /> + + <div class="bookmarkhead"> + <s:a cssClass="alias" href="%{#aliasUrl}" title="%{#bookmarkLink}" onclick="window.open(this.href); return false;"> + <s:property value="%{#bookmarkAlias}" /> + </s:a> + <p class="date">(<s:property value="%{date}" />)</p> + <s:url var="editBookmarkModify" action="modifyBookmark" escapeAmp="false"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + </s:url> + <s:url var="editBookmark" action="modifyBookmark" escapeAmp="true"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + </s:url> + <s:a cssClass="edit" href="%{editBookmark}" onclick="return modify('%{#bookmarkDescription}', '%{#bookmarkAlias}', '%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}', '%{#bookmarkLink}', '%{editBookmarkModify}', '%{#wikittyId}');"></s:a> + <s:url var="removeBookmark" action="removeBookmark" escapeAmp="true"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + </s:url> + <s:a cssClass="supprim" href="%{removeBookmark}"></s:a> </div> - </div> + <div class="bookmarkcontenu"> + <div class="screenshot"></div> + <div class="click"><s:property value="%{#bookmarkClicks}" /></div> + <div class="description"> + <h3><s:text name="bow.bookmark.description" /> :</h3> + <p> + <s:url var="redirectTo" action="redirectToUrl"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> + </s:url> + <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> + <s:iterator value="#request.bookmark.labels"> + <s:url var="deleteTag" action="deleteTag"> + <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> + <s:param name="deleteTag"><s:property /></s:param> + <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> + <s:param name="fullTextLine"><s:property value="%{#fullTextLine}" /></s:param> + </s:url> + <s:if test="%{!(formBookmarkId == null || !formBookmarkId.equals(wikittyId))}"> + <s:a cssStyle="text-decoration:none;" href="%{deleteTag}"> + <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> + </s:a> + </s:if> + <s:else> + <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteTag}"> + <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> + </s:a> + </s:else> + <s:url var="search" action="search"> + <s:param name="searchLine"><s:property /></s:param> + </s:url> + <s:a href="%{search}" cssStyle="text-decoration:none"><s:property /></s:a> + </s:iterator> + </p> + </div> + </div> + </s:if> </div>

1 0