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

r233 - trunk
by tchemit＠users.chorem.org 12 Mar '11

12 Mar '11

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 10 Mar '11

10 Mar '11

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 09 Mar '11

09 Mar '11

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 09 Mar '11

09 Mar '11

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 09 Mar '11

09 Mar '11

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 03 Mar '11

03 Mar '11

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

r227 - trunk/bow-ui
by kmorin＠users.chorem.org 25 Feb '11

25 Feb '11

Author: kmorin Date: 2011-02-25 18:31:10 +0100 (Fri, 25 Feb 2011) New Revision: 227 Url: http://chorem.org/repositories/revision/bow/227 Log: - debug module name Modified: trunk/bow-ui/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-02-25 17:09:22 UTC (rev 226) +++ trunk/bow-ui/pom.xml 2011-02-25 17:31:10 UTC (rev 227) @@ -267,8 +267,8 @@ <artifactItems> <artifactItem> <groupId>org.chorem</groupId> - <artifactId>bow-ext</artifactId> - <version>0.5-SNAPSHOT</version> + <artifactId>bow-extension-chromium</artifactId> + <version>${project.version}</version> <type>crx</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/${project.build.finalName}/extensions/</outputDirectory>

1 0

r226 - in trunk: . bow-extension-chromium
by kmorin＠users.chorem.org 25 Feb '11

25 Feb '11

Author: kmorin Date: 2011-02-25 18:09:22 +0100 (Fri, 25 Feb 2011) New Revision: 226 Url: http://chorem.org/repositories/revision/bow/226 Log: - format pom - remove folder which should not be here Removed: trunk/bow/ Modified: trunk/bow-extension-chromium/pom.xml Modified: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml 2011-02-25 17:04:26 UTC (rev 225) +++ trunk/bow-extension-chromium/pom.xml 2011-02-25 17:09:22 UTC (rev 226) @@ -1,65 +1,65 @@ <?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"> + 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> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.chorem</groupId> - <artifactId>bow</artifactId> - <version>0.5-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>bow</artifactId> + <version>0.5-SNAPSHOT</version> + </parent> - <artifactId>bow-extension-chromium</artifactId> + <artifactId>bow-extension-chromium</artifactId> -  -  -  - - <name>BOW :: Chromium extension</name> - <description>Chromium extension for BOW</description> - <inceptionYear>2011</inceptionYear> +  +  +  -  -  -  - - <packaging>crx</packaging> - - <properties> - <crx.pemKey>${basedir}/key.pem</crx.pemKey> - <crx.pemCert>${basedir}/cert.pem</crx.pemCert> - </properties> + <name>BOW :: Chromium extension</name> + <description>Chromium extension for BOW</description> + <inceptionYear>2011</inceptionYear> - <build> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>stage-crx</id> - <phase>prepare-package</phase> - <goals> - <goal>exploded</goal> - </goals> - </execution> - </executions> - </plugin> +  +  +  -  - <plugin> - <groupId>com.google.code</groupId> - <artifactId>crx-maven-plugin</artifactId> - <extensions>true</extensions> - </plugin> + <packaging>crx</packaging> - </plugins> - </build> + <properties> + <crx.pemKey>${basedir}/key.pem</crx.pemKey> + <crx.pemCert>${basedir}/cert.pem</crx.pemCert> + </properties> + <build> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>stage-crx</id> + <phase>prepare-package</phase> + <goals> + <goal>exploded</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>com.google.code</groupId> + <artifactId>crx-maven-plugin</artifactId> + <extensions>true</extensions> + </plugin> + + </plugins> + </build> + </project> \ No newline at end of file

1 0

r225 - trunk
by kmorin＠users.chorem.org 25 Feb '11

25 Feb '11

Author: kmorin Date: 2011-02-25 18:04:26 +0100 (Fri, 25 Feb 2011) New Revision: 225 Url: http://chorem.org/repositories/revision/bow/225 Log: Added: trunk/bow/

1 0

25 Feb '11

Author: kmorin Date: 2011-02-25 17:57:19 +0100 (Fri, 25 Feb 2011) New Revision: 224 Url: http://chorem.org/repositories/revision/bow/224 Log: Evolution #284 Multimodule Added: trunk/bow-extension-chromium/ trunk/bow-extension-chromium/LICENSE.txt trunk/bow-extension-chromium/README.txt trunk/bow-extension-chromium/cert.pem trunk/bow-extension-chromium/changelog.txt trunk/bow-extension-chromium/key.pem trunk/bow-extension-chromium/pom.xml trunk/bow-extension-chromium/src/ trunk/bow-extension-chromium/src/main/ trunk/bow-extension-chromium/src/main/webapp/ trunk/bow-extension-chromium/src/main/webapp/_locales/ trunk/bow-extension-chromium/src/main/webapp/_locales/en/ trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json trunk/bow-extension-chromium/src/main/webapp/_locales/fr/ trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json trunk/bow-extension-chromium/src/main/webapp/background.html trunk/bow-extension-chromium/src/main/webapp/css/ trunk/bow-extension-chromium/src/main/webapp/css/extension.css trunk/bow-extension-chromium/src/main/webapp/css/options.css trunk/bow-extension-chromium/src/main/webapp/img/ trunk/bow-extension-chromium/src/main/webapp/img/favicon.png trunk/bow-extension-chromium/src/main/webapp/img/fdboutonV.jpg trunk/bow-extension-chromium/src/main/webapp/img/fondconnexion.jpg trunk/bow-extension-chromium/src/main/webapp/img/fondhead.jpg trunk/bow-extension-chromium/src/main/webapp/img/logobow.jpg trunk/bow-extension-chromium/src/main/webapp/img/moyen-livre.jpg trunk/bow-extension-chromium/src/main/webapp/img/ptit-livre.jpg trunk/bow-extension-chromium/src/main/webapp/manifest.json trunk/bow-extension-chromium/src/main/webapp/options.html trunk/bow-extension-chromium/src/main/webapp/popup.html trunk/bow-extension-chromium/src/main/webapp/properties.js trunk/bow-ui/ trunk/bow-ui/LICENSE.txt trunk/bow-ui/README.txt trunk/bow-ui/changelog.txt trunk/bow-ui/pom.xml trunk/bow-ui/src/ Removed: trunk/bow-ui/src/main/webapp/extensions/ trunk/src/ Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowMigration04To05.java trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java trunk/bow-ui/src/main/webapp/template/simple/a-close.ftl trunk/bow-ui/src/main/xmi/README trunk/bow-ui/src/main/xmi/bow-0.4.zargo trunk/pom.xml Added: trunk/bow-extension-chromium/LICENSE.txt =================================================================== --- trunk/bow-extension-chromium/LICENSE.txt (rev 0) +++ trunk/bow-extension-chromium/LICENSE.txt 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 Affero 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/bow-extension-chromium/LICENSE.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/README.txt =================================================================== --- trunk/bow-extension-chromium/README.txt (rev 0) +++ trunk/bow-extension-chromium/README.txt 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,2 @@ +Bow : Bookmark on the web +http://www.chorem.org/projects/show/bow Property changes on: trunk/bow-extension-chromium/README.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/cert.pem =================================================================== --- trunk/bow-extension-chromium/cert.pem (rev 0) +++ trunk/bow-extension-chromium/cert.pem 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,6 @@ +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC3upb6K/xHuNfkNjzY4arR4djT +L8XwtiIU7kvE4b1+QUUtuQJ6cLZf0g7rRrbF2+EILnvdXTYnt3sbGxpgL9xQI7bT +i1zRS+m/cqjSV0L7ZJEk+lodYyF6vH0T8gsCypcXrA+bIds6Hxc9CGZyjitaCbV0 +V9lggUxXVXZLwGTcgQIDAQAB +-----END PUBLIC KEY----- Property changes on: trunk/bow-extension-chromium/cert.pem ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-extension-chromium/changelog.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/key.pem =================================================================== --- trunk/bow-extension-chromium/key.pem (rev 0) +++ trunk/bow-extension-chromium/key.pem 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,16 @@ +-----BEGIN PRIVATE KEY----- +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALe6lvor/Ee41+Q2 +PNjhqtHh2NMvxfC2IhTuS8ThvX5BRS25Anpwtl/SDutGtsXb4Qgue91dNie3exsb +GmAv3FAjttOLXNFL6b9yqNJXQvtkkST6Wh1jIXq8fRPyCwLKlxesD5sh2zofFz0I +ZnKOK1oJtXRX2WCBTFdVdkvAZNyBAgMBAAECgYEAsJr3DTrCod6YB5HrIz6oiF7j +oPzG8/7e++ejhXjIQVhUOwMf0roNVEYCeT3b6ozU3pxwC/TRXZQNDZ0b2WGoDu6h +qB2nq70RXDLUwaPzY4w1zIZJtZL8uDI1t1H/D3bNvn2NJV5u3Fjh62b/K0wpcGPF +qt2XayZcOv+nN2C08AECQQDoCI4TRyZl+xbRfZD5CYNcnGgJPuFe0nIHmiymARj/ +MV0MI3wKqFMbxaaigzm19CwCtAKtfVzhN+wwAFo/aithAkEAyrTDH37pvKwv1n9r +/F198xRA5kmoxrWOv+psYLzoSp7PsayeF7fTEbH2VM8z7Ass3kt1ZBBDSfaZ8eg4 +T5hlIQJAeJCBakjtDc5i8+Vf39bul795W1x99Cw7LfIRQwyM9YSryXPirxL5ZBPW +Wtj+sqm1+I2aWpUqHqhVJDf6rLq44QJAGfc7w24TbNq1qglagNJNDvU6NwWafBHH +vme+CEpKizx6qGzPN4SRogOk5UpBgWwRDEyoNfArXm8bWzR++hswYQJAIdU9ZGku +ggnOvTmRtEv5M+dr4yjf2t3pflvbNIf6biHxf8ZNlwKeuD+32HGgvsRMuUwPqEK2 +NGsnreHsq4WuBg== +-----END PRIVATE KEY----- Property changes on: trunk/bow-extension-chromium/key.pem ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml (rev 0) +++ trunk/bow-extension-chromium/pom.xml 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,65 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>bow</artifactId> + <version>0.5-SNAPSHOT</version> + </parent> + + <artifactId>bow-extension-chromium</artifactId> + +  +  +  + + <name>BOW :: Chromium extension</name> + <description>Chromium extension for BOW</description> + <inceptionYear>2011</inceptionYear> + +  +  +  + + <packaging>crx</packaging> + + <properties> + <crx.pemKey>${basedir}/key.pem</crx.pemKey> + <crx.pemCert>${basedir}/cert.pem</crx.pemCert> + </properties> + + <build> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>stage-crx</id> + <phase>prepare-package</phase> + <goals> + <goal>exploded</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>com.google.code</groupId> + <artifactId>crx-maven-plugin</artifactId> + <extensions>true</extensions> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file Property changes on: trunk/bow-extension-chromium/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,91 @@ +{ + "extensionName": { + "message": "BOW extension", + "description": "extension name" + }, + + "extensionDescription": { + "message": "BOW extension", + "description": "extension description" + }, + + "actionTitle": { + "message": "Bookmark this page in BOW", + "description": "action title" + }, + + "nameInputLabel": { + "message": "Name:", + "description": "label for name input" + }, + + "aliasInputLabel": { + "message": "Alias:", + "description": "label for alias input" + }, + + "tagsInputLabel": { + "message": "Tags:", + "description": "label for tags input" + }, + + "permanentTokenButton": { + "message": "Permanent token", + "description": "button to bookmark the page using the permanent token" + }, + + "emptyPermanentTokenMessage": { + "message": "You did not add your permanent token in the options. Please add it to be able to add bookmarks or use a session token.", + "description": "message when the user tries to ad bokkmark using his permanent token, but did not add it in the option" + }, + + "sessionTokenButton": { + "message": "Session token", + "description": "button to bookmark the page using the session token" + }, + + "noTokenMessage": { + "message": "You need to add either your permanent token or a session to token to be able to add a page in your BOW bookmarks.", + "description": "message displayed instead of the buttons when the user did not add his token ids" + }, + + "optionTitle": { + "message": "Options:", + "description": "option title" + }, + + "sessionTokenIdInputLabel": { + "message": "Session token ID:", + "description": "label for session token ID input" + }, + + "permanentTokenIdInputLabel": { + "message": "Permanent token ID:", + "description": "label for permanent token ID input" + }, + + "saveOptionButton": { + "message": "Save", + "description": "button to save options" + }, + + "licenseLink": { + "message": "AGPL license", + "description": "link to the license" + }, + + "bugReport": { + "message": "Bug report", + "description": "link to the bug report" + }, + + "userSupport": { + "message": "User support", + "description": "link to the user support" + }, + + "optionSavedMessage": { + "message": "Your options have been saved.", + "description": "message displayed when the user saves his options" + } +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,86 @@ +{ + "extensionName" : { + "message" : "Extension pour BOW", + "description" : "nom de l'extension" + }, + + "extensionDescription" : { + "message" : "Extension pour BOW", + "description" : "description de l'extension" + }, + + "actionTitle" : { + "message" : "Bookmarker cette page dans BOW", + "description" : "titre de l'action" + }, + + "nameInputLabel" : { + "message" : "Nom :", + "description" : "label pour l'input du nom" + }, + + "aliasInputLabel" : { + "message" : "Alias :", + "description" : "label pour l'input de l'alias" + }, + + "tagsInputLabel" : { + "message" : "Tags :", + "description" : "label pour l'input des tags" + }, + + "permanentTokenButton": { + "message": "Token permanent", + "description": "bouton pour bookmarker la page avec le token permanent" + }, + + "sessionTokenButton": { + "message": "Token de session", + "description": "bouton pour bookmarker la page avec le token de session" + }, + + "noTokenMessage": { + "message": "Vous devez renseigner votre identifiant de token permanent ou de token de session pour pouvoir bookmarker cette page dans BOW.", + "description": "message affiché à la place des boutons quand l'utilisateur n'a pas entré ses token ids" + }, + + "optionTitle" : { + "message" : "Options :", + "description" : "titre des options" + }, + + "sessionTokenIdInputLabel" : { + "message" : "Id du token de session :", + "description" : "label pour l'input de l'id du token de session" + }, + + "permanentTokenIdInputLabel" : { + "message" : "Id du token permanent :", + "description" : "label pour l'input de l'id du token permanent" + }, + + "saveOptionButton" : { + "message" : "Enregistrer", + "description" : "bouton d'enregistrement des options" + }, + + "licenseLink" : { + "message" : "Licence AGPL", + "description" : "lien vers la licence" + }, + + "bugReport" : { + "message" : "Rapport de bug", + "description" : "lien vers le rapport de bug" + }, + + "userSupport" : { + "message" : "Support utilisateur", + "description" : "lien vers le support utilisateur" + }, + + "optionSavedMessage": { + "message": "Vos options ont été enregistrées.", + "description": "message affiché quand l'utilisateur a enregistré ses options" + } +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/background.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/background.html (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/background.html 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,57 @@ + +<html> + <head> + <script> + var tabInfos = new Array(); + var currentTabId; + + function getTabInfos() { + return tabInfos[currentTabId]; + }; + + // Called when the url of a tab changes. + function showAction(tabId, changeInfo, tab) { + // ... show the page action. + chrome.pageAction.show(tabId); + tabInfos[tabId] = { + "title" : tab.title, + "url" : tab.url + }; + }; + + // Listen for any changes to the URL of any tab. + chrome.tabs.onUpdated.addListener(showAction); + + function updateCurrentTabId(tabId, selectInfo) { + currentTabId = tabId; + }; + + // Listen for any tab selection changes. + chrome.tabs.onSelectionChanged.addListener(updateCurrentTabId); + + </script> + </head> +</html> + Property changes on: trunk/bow-extension-chromium/src/main/webapp/background.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/css/extension.css =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/css/extension.css (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/css/extension.css 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,68 @@ +/* + * #%L + * bow + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +body { + width: 330px; + height: 288px; + font-size: 12px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-weight: bold; + background: #9EDCF8 url('/img/fondconnexion.jpg') no-repeat; + color: #804561; + padding: 5px 10px 5px 10px; +} + +h1 { + font-size: 18px; + width: 100%; + text-align: center; + margin-bottom: 20px; +} + +input[type="button"] { + float: right; + background: url('/img/fdboutonV.jpg') repeat-x; + color: #FFFFFF; + font-weight: bold; + border: none; + width: auto; + padding: 5px; + cursor: pointer; +} + +.labels { + margin-top: 10px; +} + +.inputs { + width: 100%; +} + +input[type="text"] { + width: 100%; +} + +#buttons { + width: 100%; + margin-top: 30px; + height: 30px; + text-align: center; + text-color: red; +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/css/extension.css ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/css/options.css =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/css/options.css (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/css/options.css 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,161 @@ +/* + * #%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% + */ +@charset "utf-8"; +/* CSS Document */ +* { + padding: 0; + margin: 0; +} + +body { + font-size: 10px; + font-family: Verdana, Arial, Helvetica, sans-serif; +} + +#wrap { + clear: both; + float: left; + overflow-x: hidden; + overflow-y: visible; + position: relative; + width: 100%; + background-color: #9EDCF8; +} + +#footer { + background-color: #804561; + padding-top: 30px; +} + +#footer a { + color: #bf8a9c; +} + +#footer p { + font-size: 14px; + text-align: center; + line-height: 50px; +} + +#header { + background: #FFFFFF url('/img/fondhead.jpg') repeat-x; + width: 100%; + float: left; + height: 100px; + clear: both; + margin: 0 auto; + position: relative; +} + +#header a.logo { + background: url('/img/logobow.jpg'); + width: 290px; + height: 100px; + text-indent: -99999px; + display: block; +} + +#main { + width: 1004px; + margin: 0 auto; + position: relative; + clear: both; +} + +#page { + width: 100%; + margin: 0 auto; + clear: both; +} + +#content { + width: 1004px; + position: relative; + margin: 0 auto; + padding-top: 20px; +} + +#formFrame { + width: 225px; + height: 315px; + background: url('/img/fondconnexion.jpg') no-repeat; + position: relative; + margin: 100px auto; + padding: 10px 70px; +} + +#formFrame h1 { + color: #804561; + width: 225px; + position: relative; + margin: 15px auto; +} + +#formFrame div div { + color: #804561; + font-size: 16px; + font-weight: bold; + width: 225px; +} + +.label { + margin-top: 30px; +} + +.buttons { + position: absolute; + top: 250px; + text-align: center; +} + +#formFrame input[type="text"] { + width: 225px; +} + +#formFrame a { + position: absolute; + color: #804561; + left: 75px; + font-weight: bold; + font-size: 12px; +} + +#formFrame .message { + width: 100%; + color: green; + font-size: 12px; + text-align: center; + margin-top: 30px; +} + +#formFrame input[type="button"] { + background: url('/img/fdboutonV.jpg') repeat-x; + height: 31px; + color: #FFFFFF; + font-weight: bold; + border: none; + width: auto; + padding: 5px; + cursor: pointer; +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/css/options.css ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/img/favicon.png =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/favicon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/fdboutonV.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/fdboutonV.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/fondconnexion.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/fondconnexion.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/fondhead.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/fondhead.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/logobow.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/logobow.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/moyen-livre.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/moyen-livre.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/ptit-livre.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/ptit-livre.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/manifest.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/manifest.json (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,23 @@ +{ + "name": "__MSG_extensionName__", + "version": "1.0", + "default_locale": "en", + + "description": "__MSG_extensionDescription__", + "icons": { "16": "img/ptit-livre.jpg", + "48": "img/moyen-livre.jpg", + "128": "img/moyen-livre.jpg" }, + + "page_action": { + "default_title": "__MSG_actionTitle__", + "default_icon": "img/favicon.png", + "default_popup": "popup.html" + }, + + "background_page": "background.html", + "options_page": "options.html", + "homepage_url": "http://www.codelutin.com", + "permissions": [ + "tabs", "http://bow.chorem.org/bow/*" + ] +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/manifest.json ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/options.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/options.html (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/options.html 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,142 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="Bookmarks On the Web" /> + + <title>BOW Extension Options</title> + + <link rel="icon" type="image/png" href="img/favicon.png" /> + <link rel="stylesheet" type="text/css" href="css/options.css" /> + + <script type="text/javascript" src="properties.js"></script> + <script type="text/javascript"> +  + </script> +</head> +<body onload="restore_options()"> + <div id="wrap"> + <div id="page"> + <div id="header"> + <a class="logo" id="bow_logo" href="#">bow</a> + </div> + <div id="main"> + <div id="content"> + <div id="formFrame"> + <h1 id="title"></h1> + <div> + <div class="label"> + <label for="sessionTokenIdInput" id="sessionTokenIdInputLabel"></label> + </div> + <div class="inputs"> + <input type="text" name="sessionTokenIdInput" id="sessionTokenIdInput" /> + </div> + <div class="label"> + <label for="permanentTokenIdInput" id="permanentTokenIdInputLabel"></label> + </div> + <div class="inputs"> + <input type="text" name="permanentTokenIdInput" id="permanentTokenIdInput" /> + </div> + <div class="buttons"> + <input type="button" id="saveOptionButton" onclick="save_options()" /> + </div> + <div class="message" id="formMessage"></div> + </div> + </div> + </div> + </div> + </div> + <div id="footer"> + <p> + <a shape="rect" id="bow_website" href="#" target="_blank">bow</a> + <a shape="rect" href="http://www.chorem.org/projects/list_files/bow">0.3-SNAPSHOT</a> - + <a shape="rect" href="http://www.gnu.org/licenses/agpl.html" id="licenseLink"></a> - + <span title="Copyright">©2010 - 2011</span> + <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - + <a shape="rect" href="http://www.chorem.org/projects/bow/issues" id="bugReport"></a> - + <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users" id="userSupport"></a> + </p> + </div> + </div> +</body> +</html> Property changes on: trunk/bow-extension-chromium/src/main/webapp/options.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/popup.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/popup.html (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/popup.html 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,142 @@ + +<html> + <head> + <script type="text/javascript" src="properties.js"></script> + <script> + + function bookmarkPermanent() { + var tokenId = localStorage["permanentTokenId"]; + if (tokenId != null) { + bookmark(tokenId); + } + } + + function bookmarkSession() { + var tokenId = localStorage["sessionTokenId"]; + if (tokenId != null) { + bookmark(tokenId); + } + } + + function bookmark(tokenId) { + var tabInfos = chrome.extension.getBackgroundPage().getTabInfos(); + var url = tabInfos["url"]; + + var nameInput = document.getElementById("nameInput"); + var nameValue = nameInput.value; + + var aliasInput = document.getElementById("aliasInput"); + var aliasValue = aliasInput.value; + + var tagsInput = document.getElementById("tagsInput"); + var tagsValue = tagsInput.value; + + //BOW_URL is defined in properties.js + var link = BOW_URL + "/bow?action=addUrl&token=" + tokenId + + "&url=" + encodeURIComponent(url) + + "&name=" + encodeURIComponent(nameValue) + + "&alias=" + encodeURIComponent(aliasValue) + + "&tags=" + encodeURIComponent(tagsValue); + + var xhr = new XMLHttpRequest(); + xhr.open("GET", link, true); + xhr.send(); + }; + + function init() { + var tabInfos = chrome.extension.getBackgroundPage().getTabInfos(); + + var title = document.getElementById("title"); + title.innerHTML = chrome.i18n.getMessage("actionTitle"); + + var nameInputLabel = document.getElementById("nameInputLabel"); + nameInputLabel.innerHTML = chrome.i18n.getMessage("nameInputLabel"); + + var nameInput = document.getElementById("nameInput"); + nameInput.value = tabInfos["title"]; + + var aliasInputLabel = document.getElementById("aliasInputLabel"); + aliasInputLabel.innerHTML = chrome.i18n.getMessage("aliasInputLabel"); + + var tagsInputLabel = document.getElementById("tagsInputLabel"); + tagsInputLabel.innerHTML = chrome.i18n.getMessage("tagsInputLabel"); + + var sessionTokenId = localStorage["sessionTokenId"]; + var sessionTokenButton = document.getElementById("sessionTokenButton"); + if (!isEmpty(sessionTokenId)) { + sessionTokenButton.value = chrome.i18n.getMessage("sessionTokenButton"); + } else { + sessionTokenButton.style.visibility = "hidden"; + } + + var permanentTokenId = localStorage["permanentTokenId"]; + var permanentTokenButton = document.getElementById("permanentTokenButton"); + if (!isEmpty(permanentTokenId)) { + permanentTokenButton.value = chrome.i18n.getMessage("permanentTokenButton"); + } else { + permanentTokenButton.style.visibility = "hidden"; + } + + if (isEmpty(permanentTokenId) && isEmpty(sessionTokenId)) { + var buttons = document.getElementById("buttons"); + buttons.innerHTML = chrome.i18n.getMessage("noTokenMessage"); + } + }; + + function isEmpty(string) { + return (string == null || string == ""); + } + + </script> + + <link rel="stylesheet" type="text/css" href="css/extension.css" /> + + </head> + <body onLoad="init()"> + <h1 id="title"></h1> + <div class="labels"> + <label for="nameInput" id="nameInputLabel"></label> + </div> + <div class="inputs"> + <input id="nameInput" name="nameInput" type="text" /> + </div> + <div class="labels"> + <label for="aliasInput" id="aliasInputLabel"></label> + </div> + <div class="inputs"> + <input id="aliasInput" name="aliasInput" type="text" /> + </div> + <div class="labels"> + <label for="tagsInput" id="tagsInputLabel"></label> + </div> + <div class="inputs"> + <input id="tagsInput" name="tagsInput" type="text" /> + </div> + <div id="buttons"> + <input id="permanentTokenButton" onclick="bookmarkPermanent()" type="button" /> + <input id="sessionTokenButton" onclick="bookmarkSession()" type="button" /> + </div> + </body> +</html> Property changes on: trunk/bow-extension-chromium/src/main/webapp/popup.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/properties.js =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/properties.js (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/properties.js 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1 @@ +var BOW_URL = "http://bow.chorem.org/bow"; Property changes on: trunk/bow-extension-chromium/src/main/webapp/properties.js ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-ui ___________________________________________________________________ Added: svn:ignore + target Added: trunk/bow-ui/LICENSE.txt =================================================================== --- trunk/bow-ui/LICENSE.txt (rev 0) +++ trunk/bow-ui/LICENSE.txt 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 Affero 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/bow-ui/LICENSE.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-ui/README.txt =================================================================== --- trunk/bow-ui/README.txt (rev 0) +++ trunk/bow-ui/README.txt 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,7 @@ +Bow : Bookmark on the web +http://www.chorem.org/projects/show/bow + +Installation +============ +- compile with maven +- copy war in jetty or tomcat installation Property changes on: trunk/bow-ui/README.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-ui/changelog.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml (rev 0) +++ trunk/bow-ui/pom.xml 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,286 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>bow</artifactId> + <version>0.5-SNAPSHOT</version> + </parent> + + <artifactId>bow-ui</artifactId> + + <name>BOW UI</name> + <description>bookmarks on web UI</description> + <inceptionYear>2010</inceptionYear> + + <packaging>war</packaging> + + <properties> + <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> + <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> + </properties> + + <dependencies> + +  + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> + + <dependency> + <groupId>com.opensymphony</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + +  + + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + </dependency> + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + +  + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + +  + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-spring-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>compile</scope> + </dependency> + + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> +  + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator + </templates> + <fullPackagePath>org.chorem.bow</fullPackagePath> + <defaultPackage>org.chorem.bow</defaultPackage> + <extractedPackages> + org.chorem.bow,org.nuiton.wikitty + </extractedPackages> + <generatedPackages>org.chorem.bow</generatedPackages> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${wikittyVersion}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <id>scan-java-sources</id> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + <execution> + <id>scan-jsp-sources</id> + <goals> + <goal>parserJsp</goal> + </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <sx> + http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sx> + <jsp>http://java.sun.com/JSP/Page</jsp> + <decorator> + http://www.opensymphony.com/sitemesh/decorator + </decorator> + </namespaces> + </configuration> + </execution> + <execution> + <id>gen-and-make-bundle</id> + <goals> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.chorem</groupId> + <artifactId>bow-ext</artifactId> + <version>0.5-SNAPSHOT</version> + <type>crx</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/${project.build.finalName}/extensions/</outputDirectory> + <destFileName>bow4chromium.crx</destFileName> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Property changes on: trunk/bow-ui/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowMigration04To05.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowMigration04To05.java 2011-02-25 15:12:31 UTC (rev 223) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowMigration04To05.java 2011-02-25 16:57:19 UTC (rev 224) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.bow; Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/BowMigration04To05.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/Migrate04To05Action.java 2011-02-25 15:12:31 UTC (rev 223) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java 2011-02-25 16:57:19 UTC (rev 224) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.bow.action; Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/bow-ui/src/main/webapp/template/simple/a-close.ftl =================================================================== --- trunk/src/main/webapp/template/simple/a-close.ftl 2011-02-25 15:12:31 UTC (rev 223) +++ trunk/bow-ui/src/main/webapp/template/simple/a-close.ftl 2011-02-25 16:57:19 UTC (rev 224) @@ -1,6 +1,6 @@ <#-- /* - * $Id: a-close.ftl 753015 2009-03-12 21:00:23Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/bow-ui/src/main/webapp/template/simple/a-close.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-ui/src/main/xmi/README ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-ui/src/main/xmi/bow-0.4.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-25 15:12:31 UTC (rev 223) +++ trunk/pom.xml 2011-02-25 16:57:19 UTC (rev 224) @@ -1,5 +1,6 @@ <?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> @@ -17,12 +18,17 @@ <artifactId>bow</artifactId> <version>0.5-SNAPSHOT</version> + <modules> + <module>bow-extension-chromium</module> + <module>bow-ui</module> + </modules> + <name>bow</name> <description>bookmarks on web</description> <inceptionYear>2010</inceptionYear> <url>http://maven-site.chorem.org/bow</url> - <packaging>war</packaging> + <packaging>pom</packaging> <licenses> <license> @@ -50,162 +56,131 @@ <wikittyVersion>3.0.5-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.1.8.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> + <jspApiVersion>2.0</jspApiVersion> + <h2Version>1.2.134</h2Version> + <crxMavenPluginVersion>1.1.0</crxMavenPluginVersion> - <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> - <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> -  <license.licenseName>agpl_v3</license.licenseName> </properties> - <dependencies> + <dependencyManagement> + <dependencies> -  +  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${wikittyVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork-core</artifactId> - <version>2.1.6</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>com.opensymphony</groupId> + <artifactId>xwork-core</artifactId> + <version>${xWorkCoreVersion}</version> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>${htmlParserVersion}</version> + </dependency> -  + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${javaxMailVersion}</version> + </dependency> - <dependency> - <groupId>org.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.6</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletApiVersion}</version> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.3</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspApiVersion}</version> + </dependency> -  + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${wikittyVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + </dependency> -  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>${wikittyVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-spring-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${wikittyVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.134</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-spring-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - </dependencies> + </dependencies> + </dependencyManagement> + <build> <resources> <resource> @@ -243,87 +218,23 @@ <version>${nuitonI18nVersion}</version> </plugin> + <plugin> + <groupId>com.google.code</groupId> + <artifactId>crx-maven-plugin</artifactId> + <version>${crxMavenPluginVersion}</version> + </plugin> + </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api generator</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - <input>classpath:model:/:wikitty.objectmodel</input> - </inputs> -  - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator - </templates> - <fullPackagePath>org.chorem.bow</fullPackagePath> - <defaultPackage>org.chorem.bow</defaultPackage> - <extractedPackages> - org.chorem.bow,org.nuiton.wikitty - </extractedPackages> - <generatedPackages>org.chorem.bow</generatedPackages> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> + </build> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${wikittyVersion}</version> - </dependency> - </dependencies> - </plugin> + <pluginRepositories> + <pluginRepository> + <name>crx-maven-plugin.googlecode.com</name> + <id>crx-maven-plugin.googlecode.com</id> + <url>http://crx-maven-plugin.googlecode.com/svn-history/maven2/</url> + </pluginRepository> + </pluginRepositories> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <id>scan-java-sources</id> - <goals> - <goal>parserJava</goal> - </goals> - </execution> - <execution> - <id>scan-jsp-sources</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx> - http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd - </sx> - <jsp>http://java.sun.com/JSP/Page</jsp> - <decorator> - http://www.opensymphony.com/sitemesh/decorator - </decorator> - </namespaces> - </configuration> - </execution> - <execution> - <id>gen-and-make-bundle</id> - <goals> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project>

1 0