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

r293 - tags
by sletellier＠users.chorem.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 17:15:34 +0200 (Tue, 17 May 2011) New Revision: 293 Url: http://chorem.org/repositories/revision/bow/293 Log: [maven-release-plugin] copy for tag bow-1.0 Added: tags/bow-1.0/

1 0

r292 - in trunk: . bow-extension-chromium bow-ui
by sletellier＠users.chorem.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 17:15:32 +0200 (Tue, 17 May 2011) New Revision: 292 Url: http://chorem.org/repositories/revision/bow/292 Log: [maven-release-plugin] prepare release bow-1.0 Modified: trunk/bow-extension-chromium/pom.xml trunk/bow-ui/pom.xml trunk/pom.xml Modified: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml 2011-05-17 15:01:13 UTC (rev 291) +++ trunk/bow-extension-chromium/pom.xml 2011-05-17 15:15:32 UTC (rev 292) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.6-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>bow-extension-chromium</artifactId> Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-05-17 15:01:13 UTC (rev 291) +++ trunk/bow-ui/pom.xml 2011-05-17 15:15:32 UTC (rev 292) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.6-SNAPSHOT</version> + <version>1.0</version> </parent> <artifactId>bow-ui</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-17 15:01:13 UTC (rev 291) +++ trunk/pom.xml 2011-05-17 15:15:32 UTC (rev 292) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>0.6-SNAPSHOT</version> + <version>1.0</version> <modules> <module>bow-extension-chromium</module> @@ -108,11 +108,11 @@ </contributors> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/bow/tags/bow-1.0</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/bow/trunk + scm:svn:http://svn.chorem.org/svn/bow/tags/bow-1.0 </developerConnection> - <url>http://www.chorem.org/repositories/browse/bow/trunk</url> + <url>http://www.chorem.org/repositories/browse/bow/tags/bow-1.0</url> </scm> <properties>

1 0

r291 - in trunk: . bow-ui bow-ui/src/license 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/webapp/css bow-ui/src/main/webapp/css/images bow-ui/src/main/webapp/img bow-ui/src/main/webapp/js bow-ui/src/main/webapp/jsp/inc
by sletellier＠users.chorem.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 17:01:13 +0200 (Tue, 17 May 2011) New Revision: 291 Url: http://chorem.org/repositories/revision/bow/291 Log: - Fix third party - Update headers - Fix svn:keywords - Change javaassist to scope runtime - Up to wikitty 3.1.2 Modified: trunk/bow-ui/pom.xml trunk/bow-ui/src/license/THIRD-PARTY.properties trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_75_dbdbdb_40x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_highlight-soft_75_bf8a9c_1x100.png trunk/bow-ui/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_222222_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_454545_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_888888_256x240.png trunk/bow-ui/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css trunk/bow-ui/src/main/webapp/img/add.png trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp trunk/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/bow-ui/pom.xml 2011-05-17 15:01:13 UTC (rev 291) @@ -63,6 +63,7 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> + <scope>runtime</scope> </dependency> <dependency> Modified: trunk/bow-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/bow-ui/src/license/THIRD-PARTY.properties 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/bow-ui/src/license/THIRD-PARTY.properties 2011-05-17 15:01:13 UTC (rev 291) @@ -3,6 +3,7 @@ # Already used licenses in project : # - Apache 2 # - Apache License +# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -17,18 +18,22 @@ # - LGPL 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License +# - MPL 1.1 # - Public Domain +# - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - The OpenSymphony Software License 1.1 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Apr 26 16:51:54 CEST 2011 +#Tue May 17 16:35:20 CEST 2011 antlr--antlr--2.7.2--jar=BSD License +asm--asm--3.1--jar=http://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http://asm.ow2.org/license.html commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. dom4j--dom4j--1.1--jar=BSD License @@ -36,7 +41,6 @@ javax.servlet--jsp-api--2.0--jar=Common Development and Distribution License (CDDL) v1.0 javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) v1.0 -ognl--ognl--2.7.3--jar=The OpenSymphony Software License 1.1 org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java 2011-05-17 15:01:13 UTC (rev 291) @@ -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; import org.nuiton.util.ApplicationConfig; Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/action/AliasAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/action/EditBookmarkAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/interceptor/LogoutInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_flat_75_dbdbdb_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_65_ffffff_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_dadada_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_glass_75_e6e6e6_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_highlight-soft_75_bf8a9c_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_2e83ff_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_888888_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/css/jquery-ui-1.8.11.custom.bow.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/img/add.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/js/jquery-1.5.2.min.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/js/jquery-ui-1.8.11.custom.min.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-05-17 15:01:13 UTC (rev 291) @@ -1,25 +1,24 @@  <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> @@ -80,4 +79,4 @@ <s:actionerror /> </span> </div> -</div> \ No newline at end of file +</div> Property changes on: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-17 09:01:05 UTC (rev 290) +++ trunk/pom.xml 2011-05-17 15:01:13 UTC (rev 291) @@ -122,7 +122,7 @@ <eugenePluginVersion>2.3.2</eugenePluginVersion> <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> <nuitonI18nVersion>2.3.1</nuitonI18nVersion> - <wikittyVersion>3.1.1</wikittyVersion> + <wikittyVersion>3.1.2</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.2.3</struts2Version> <htmlParserVersion>1.6</htmlParserVersion>

1 0

r290 - in trunk: . bow-ui/src/main/java/org/chorem/bow/action bow-ui/src/main/resources/i18n bow-ui/src/main/webapp/css bow-ui/src/main/webapp/jsp bow-ui/src/main/webapp/jsp/inc
by sletellier＠users.chorem.org 17 May '11

17 May '11

Author: sletellier Date: 2011-05-17 11:01:05 +0200 (Tue, 17 May 2011) New Revision: 290 Url: http://chorem.org/repositories/revision/bow/290 Log: - #317 Update to struts 2.2.3 - Fix css Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.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/webapp/css/bookmark.css trunk/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp trunk/bow-ui/src/main/webapp/jsp/login.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp trunk/pom.xml Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/BowBaseAction.java 2011-05-17 09:01:05 UTC (rev 290) @@ -86,7 +86,7 @@ } @Override - public String getText(String aTextName, List<Object> args) { + public String getText(String aTextName, List<?> args) { String value = super.getText(aTextName, args); return getSafeText(aTextName, value); } @@ -98,8 +98,7 @@ } @Override - public String getText(String aTextName, String defaultValue, - List<Object> args) { + public String getText(String aTextName, String defaultValue, List<?> args) { String value = super.getText(aTextName, defaultValue, args); return getSafeText(aTextName, value); } @@ -111,7 +110,7 @@ } @Override - public String getText(String key, String defaultValue, List<Object> args, + public String getText(String key, String defaultValue, List<?> args, ValueStack stack) { String value = super.getText(key, defaultValue, args, stack); return getSafeText(key, value); 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-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-05-17 09:01:05 UTC (rev 290) @@ -1,6 +1,6 @@ alias= bow.action.locale.english=English -bow.action.locale.french=Fran\u00e7ais +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 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-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-05-17 09:01:05 UTC (rev 290) @@ -1,25 +1,25 @@ alias= 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.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.alias.already.exists=L''alias {0} existe d\u00e9j\u00e0 -bow.alias.bookmarkId.unknown=Il n''y a pas de marque-page correspondant \u00e0 l''identifiant {0} -bow.bookmark.add.successful=Marque-page ajout\u00e9 avec succ\u00e8s -bow.bookmark.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le format de type Netscape n'est pas support\u00e9) +bow.admin.reIndexationDone=Les donn\u00E9es ont bien \u00E9t\u00E9 r\u00E9index\u00E9es +bow.alias.already.exists=L''alias {0} existe d\u00E9j\u00E0 +bow.alias.bookmarkId.unknown=Il n''y a pas de marque-page correspondant \u00E0 l''identifiant {0} +bow.bookmark.add.successful=Marque-page ajout\u00E9 avec succ\u00E8s +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.edit= -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.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.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= @@ -37,14 +37,14 @@ 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.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.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 @@ -54,57 +54,57 @@ 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.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.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.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.importedBookmarks=Marque-pages import\u00E9s bow.preferences.labels=Gestion des labels bow.preferences.labels.delete.submit=Supprimer bow.preferences.labels.name.field=Nouveau nom bow.preferences.labels.rename.submit=Renomer 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.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.siteLook=Pr\u00E9f\u00E9rences du site bow.preferences.submit=Changer bow.preferences.tagsManagement=Edition des tags -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.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.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.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.addUrl.link=Ajouter une entr\u00e9e +bow.rightMenu.addUrl.link=Ajouter une entr\u00E9e 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.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.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.extensions=Extensions bow.rightMenu.find.submit=Rechercher @@ -112,7 +112,7 @@ bow.rightMenu.help=Aide bow.rightMenu.import.submit=Importer bow.rightMenu.importBookmarks=Importer des marque-pages -bow.rightMenu.logout=D\u00e9connexion +bow.rightMenu.logout=D\u00E9connexion bow.rightMenu.search.tags=Recherche par tags bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session @@ -122,18 +122,18 @@ bow.search.descclick=Nb clics desc. bow.search.descdate=Date desc. bow.search.descname=Nom desc. -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.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.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 -popup.addurl.alias.private=Alias priv\u00e9 +bow.token.generate.successful=Le token a \u00E9t\u00E9 reg\u00E9n\u00E9r\u00E9 avec succ\u00E8s +popup.addurl.alias.private=Alias priv\u00E9 popup.addurl.alias.public=Alias public popup.addurl.link=Url popup.addurl.name=Description Modified: trunk/bow-ui/src/main/webapp/css/bookmark.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/webapp/css/bookmark.css 2011-05-17 09:01:05 UTC (rev 290) @@ -87,7 +87,7 @@ width:100%; height:32px; background-color:#bf8a9c; - border-bottom:2px solid #9EDCF8; + border-bottom: 0 solid #9EDCF8; position:relative; clear:both; } @@ -228,7 +228,7 @@ display:block; text-decoration:none; text-align:center; - width:72px; + width:100px; float:left; margin-left:25%; margin-top:6%; @@ -242,6 +242,7 @@ #colonneD{ overflow-x:auto; background-color:#804561; + margin-top: -2px; } #colonneD a{ @@ -251,7 +252,7 @@ #colonneD ul.droite{ padding:5% 10%; - border-bottom:2px solid #9edcf8; + border-bottom: 0 solid #9edcf8; } #colonneD ul.droite li{ @@ -293,7 +294,7 @@ #colonneD #import, #colonneD #add{ padding:4% 10%; - border-bottom:2px solid #9edcf8; + border-bottom: 0 solid #9edcf8; } #colonneD h2{ @@ -315,7 +316,6 @@ } #colonneD form input{ - height:22px; width:50%; border:none; height:28px; Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-05-17 09:01:05 UTC (rev 290) @@ -178,7 +178,7 @@ padding:10px; } -form{ +form, .wwFormTable{ color:#804561; font-size:11px; font-weight:bold; Modified: trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/webapp/jsp/editBookmark.jsp 2011-05-17 09:01:05 UTC (rev 290) @@ -44,16 +44,14 @@ </div> <div class="formFrame fond"> <s:form id="popupAddUrlForm" action="addUrl" method="post"> - <p> - <s:hidden name="searchLine" value="%{searchLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> - <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator=" " value="%{bookmark.link}" /><br /> - <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator=" " value="%{bookmark.description}" /><br /> - <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " value="%{bookmark.privateAlias}" /><br /> - <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " value="%{bookmark.publicAlias}" /><br /> - <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /><br /> - </p> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> + <input type="hidden" id="popupAddUrlFormBookmarkId" name="bookmarkId" value="<%=bookmark == null ? null : bookmark.getWikittyId()%>"/> + <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator=" " value="%{bookmark.link}" /> + <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator=" " value="%{bookmark.description}" /> + <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " value="%{bookmark.privateAlias}" /> + <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " value="%{bookmark.publicAlias}" /> + <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " value="%{@org.chorem.bow.BookmarkUtils@getBookmarkTagsString(#request.bookmark)}" /> <s:submit key="popup.commons.submit" name="submit" /> </s:form> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-05-17 09:01:05 UTC (rev 290) @@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<%@ page import="static org.nuiton.i18n.I18n._" %> <%-- Document : popupAddUrl Created on : 20 avr. 2011, 17:03:37 @@ -79,24 +78,17 @@ </s:set> <div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - id="addUrlPopup" title="${title}"> - <s:form id="popupAddUrlForm" action="addUrl" method="post" theme="simple"> - <p> - <s:hidden id="popupAddUrlFormBookmarkId" name="bookmarkId" /> - <s:hidden name="searchLine" value="%{searchLine}" /> - <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:text name="popup.addurl.link"/><br/> - <s:textfield id="popupAddUrlFormLink" name="link" labelSeparator=" " /><br /> - <s:text name="popup.addurl.name"/><br/> - <s:textarea id="popupAddUrlFormName" name="name" labelSeparator=" " /><br /> - <s:text name="popup.addurl.alias.private"/><br/> - <s:textfield id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " /><br /> - <s:text name="popup.addurl.alias.public"/><br/> - <s:textfield id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " /><br /> - <s:text name="popup.addurl.tags"/><br/> - <s:textfield id="popupAddUrlFormTags" name="tags" labelSeparator=" " /><br /> - </p> - <a class="button" onclick="submitAddUrl()"><s:text name="popup.commons.submit"/></a> - <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.commons.cancel"/></a> + id="addUrlPopup" title="${title}"> + <s:form id="popupAddUrlForm" action="addUrl" method="post"> + <s:hidden id="popupAddUrlFormBookmarkId" name="bookmarkId" /> + <s:hidden name="searchLine" value="%{searchLine}" /> + <s:hidden name="fullTextLine" value="%{fullTextLine}" /> + <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator=" " /> + <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator=" " /> + <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " /> + <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " /> + <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " /> </s:form> + <a class="button" onclick="submitAddUrl()"><s:text name="popup.commons.submit"/> </a> + <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.commons.cancel"/> </a> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupPublicAlias.jsp 2011-05-17 09:01:05 UTC (rev 290) @@ -73,11 +73,9 @@ <div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" id="setPublicAliasPopup" title="${title}"> <s:form id="setPublicAliasForm" action="createAlias"> - <p> - <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" /> - <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" /> - </p> - <a class="button" onclick="submitPublicAlias()"><s:text name="popup.commons.submit"/></a> - <a class="button" onclick="closePopupPublicAlias()"><s:text name="popup.commons.cancel"/></a> + <s:textfield key="bow.rightMenu.bookmark.alias" name="alias" class="text ui-widget-content ui-corner-all" /> + <s:hidden id="publicAliasFormBookmarkId" name="bookmarkId" /> </s:form> + <a class="button" onclick="submitPublicAlias()"><s:text name="popup.commons.submit"/></a> + <a class="button" onclick="closePopupPublicAlias()"><s:text name="popup.commons.cancel"/></a> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/login.jsp 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/webapp/jsp/login.jsp 2011-05-17 09:01:05 UTC (rev 290) @@ -36,6 +36,8 @@ <div id="content"> <div id="formFrame" class="fond"> <h1><s:text name="bow.login.title" /></h1> + <br/> + <br/> <s:actionerror /> <s:form action="login"> <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-17 09:01:05 UTC (rev 290) @@ -140,6 +140,7 @@ <div class="formFrame fond"> <h3><s:text name="bow.preferences.labels"/></h3> + <br/> <s:form id="labelsForm" action="adminlabels" method="post" theme="simple"> <ul> <% for (FacetTopic topic : action.getLabels()) { %> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-16 15:41:45 UTC (rev 289) +++ trunk/pom.xml 2011-05-17 09:01:05 UTC (rev 290) @@ -124,7 +124,7 @@ <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <wikittyVersion>3.1.1</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> - <struts2Version>2.2.1.1</struts2Version> + <struts2Version>2.2.3</struts2Version> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion>

1 0

r289 - in trunk: . bow-ui bow-ui/src/main/resources/i18n bow-ui/src/main/webapp/css bow-ui/src/main/webapp/jsp bow-ui/src/main/webapp/jsp/inc
by sletellier＠users.chorem.org 16 May '11

16 May '11

Author: sletellier Date: 2011-05-16 17:41:45 +0200 (Mon, 16 May 2011) New Revision: 289 Url: http://chorem.org/repositories/revision/bow/289 Log: #317 Updates to struts2 2.2.1.1 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/bow-ui/src/main/webapp/css/global.css trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp trunk/bow-ui/src/main/webapp/jsp/login.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-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/pom.xml 2011-05-16 15:41:45 UTC (rev 289) @@ -56,11 +56,16 @@ </dependency> <dependency> - <groupId>com.opensymphony</groupId> + <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</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-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_en_GB.properties 2011-05-16 15:41:45 UTC (rev 289) @@ -1,6 +1,6 @@ alias= bow.action.locale.english=English -bow.action.locale.french=Fran\u00E7ais +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 @@ -108,12 +108,12 @@ bow.rightMenu.chromiumExtension=Chromium extension bow.rightMenu.extensions=Extensions bow.rightMenu.find.submit=Find -bow.rightMenu.fullTextSearch=Full text +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.tags=by tags +bow.rightMenu.search.tags=Search by tags bow.rightMenu.token.permanent=Permanent token id bow.rightMenu.token.temporary=Session token id bow.search.ascclick=Asc. clicks nb 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-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/src/main/resources/i18n/bow-ui_fr_FR.properties 2011-05-16 15:41:45 UTC (rev 289) @@ -1,25 +1,25 @@ alias= 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.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.alias.already.exists=L''alias {0} existe d\u00E9j\u00E0 -bow.alias.bookmarkId.unknown=Il n''y a pas de marque-page correspondant \u00E0 l''identifiant {0} -bow.bookmark.add.successful=Marque-page ajout\u00E9 avec succ\u00E8s -bow.bookmark.badFileFormat=Mauvais format de fichier de favoris \: import impossible (le format de type Netscape n'est pas support\u00E9) +bow.admin.reIndexationDone=Les donn\u00e9es ont bien \u00e9t\u00e9 r\u00e9index\u00e9es +bow.alias.already.exists=L''alias {0} existe d\u00e9j\u00e0 +bow.alias.bookmarkId.unknown=Il n''y a pas de marque-page correspondant \u00e0 l''identifiant {0} +bow.bookmark.add.successful=Marque-page ajout\u00e9 avec succ\u00e8s +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.edit= -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.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.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= @@ -37,14 +37,14 @@ 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.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.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 @@ -54,66 +54,66 @@ 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.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.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.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.importedBookmarks=Marque-pages import\u00e9s bow.preferences.labels=Gestion des labels bow.preferences.labels.delete.submit=Supprimer bow.preferences.labels.name.field=Nouveau nom bow.preferences.labels.rename.submit=Renomer 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.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.siteLook=Pr\u00e9f\u00e9rences du site bow.preferences.submit=Changer bow.preferences.tagsManagement=Edition des tags -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.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.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.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.addUrl.link=Ajouter une entr\u00E9e +bow.rightMenu.addUrl.link=Ajouter une entr\u00e9e 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.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.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.extensions=Extensions bow.rightMenu.find.submit=Rechercher -bow.rightMenu.fullTextSearch=Full text +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.tags=Par tags +bow.rightMenu.logout=D\u00e9connexion +bow.rightMenu.search.tags=Recherche par tags bow.rightMenu.token.permanent=Token permanent bow.rightMenu.token.temporary=Token session bow.search.ascclick=Nb clics asc. @@ -122,18 +122,18 @@ bow.search.descclick=Nb clics desc. bow.search.descdate=Date desc. bow.search.descname=Nom desc. -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.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.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 -popup.addurl.alias.private=Alias priv\u00E9 +bow.token.generate.successful=Le token a \u00e9t\u00e9 reg\u00e9n\u00e9r\u00e9 avec succ\u00e8s +popup.addurl.alias.private=Alias priv\u00e9 popup.addurl.alias.public=Alias public popup.addurl.link=Url popup.addurl.name=Description Modified: trunk/bow-ui/src/main/webapp/css/global.css =================================================================== --- trunk/bow-ui/src/main/webapp/css/global.css 2011-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/src/main/webapp/css/global.css 2011-05-16 15:41:45 UTC (rev 289) @@ -177,3 +177,9 @@ padding:10px; } + +form{ + color:#804561; + font-size:11px; + font-weight:bold; +} \ No newline at end of file Modified: trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/src/main/webapp/jsp/inc/header.jsp 2011-05-16 15:41:45 UTC (rev 289) @@ -1,26 +1,26 @@  +#%L +bow + +$Id$ +$HeadURL$ +%% +Copyright (C) 2010 - 2011 CodeLutin +%% +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +#L% +--> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> <div id="header" @@ -39,37 +39,37 @@ </div> <s:if test="%{#session.BowSession.user != null}"> <div class="recherche right"> - <h5>Recherche</h5> - <s:form action="search"> - <div class="input"> - <s:textfield key="bow.rightMenu.search.tags" name="searchLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> - </s:form> - <s:form action="fullText"> - <div class="input"> - <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> - </s:form> -<%-- - <div class="right"> - <s:form action="search"> - <div class="input"> - <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> + <h3>Recherche</h3> + <div class="input"> + <s:form action="search" theme="simple"> + <s:textfield name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.search.tags" name="submit" /> </s:form> </div> - <div class="left"> - <s:form action="fullText"> - <div class="input"> - <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> - <s:submit key="bow.rightMenu.find.submit" name="submit" /> - </div> + <div class="input"> + <s:form action="fullText" theme="simple"> + <s:textfield name="fullTextLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.fullTextSearch" name="submit" /> </s:form> </div> ---%> + <%-- + <div class="right"> + <s:form action="search"> + <div class="input"> + <s:textfield key="bow.rightMenu.search" name="searchLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + </div> + <div class="left"> + <s:form action="fullText"> + <div class="input"> + <s:textfield key="bow.rightMenu.fullTextSearch" name="fullTextLine" labelSeparator="" /> + <s:submit key="bow.rightMenu.find.submit" name="submit" /> + </div> + </s:form> + </div> + --%> </div> </s:if> <div id="msg"> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/src/main/webapp/jsp/inc/popupAddUrl.jsp 2011-05-16 15:41:45 UTC (rev 289) @@ -80,16 +80,21 @@ <div xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" id="addUrlPopup" title="${title}"> - <s:form id="popupAddUrlForm" action="addUrl" method="post"> + <s:form id="popupAddUrlForm" action="addUrl" method="post" theme="simple"> <p> <s:hidden id="popupAddUrlFormBookmarkId" name="bookmarkId" /> <s:hidden name="searchLine" value="%{searchLine}" /> <s:hidden name="fullTextLine" value="%{fullTextLine}" /> - <s:textfield key="popup.addurl.link" id="popupAddUrlFormLink" name="link" labelSeparator=" " /><br /> - <s:textarea key="popup.addurl.name" id="popupAddUrlFormName" name="name" labelSeparator=" " /><br /> - <s:textfield key="popup.addurl.alias.private" id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " /><br /> - <s:textfield key="popup.addurl.alias.public" id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " /><br /> - <s:textfield key="popup.addurl.tags" id="popupAddUrlFormTags" name="tags" labelSeparator=" " /><br /> + <s:text name="popup.addurl.link"/><br/> + <s:textfield id="popupAddUrlFormLink" name="link" labelSeparator=" " /><br /> + <s:text name="popup.addurl.name"/><br/> + <s:textarea id="popupAddUrlFormName" name="name" labelSeparator=" " /><br /> + <s:text name="popup.addurl.alias.private"/><br/> + <s:textfield id="popupAddUrlFormPrivateAlias" name="privateAlias" labelSeparator=" " /><br /> + <s:text name="popup.addurl.alias.public"/><br/> + <s:textfield id="popupAddUrlFormPublicAlias" name="publicAlias" labelSeparator=" " /><br /> + <s:text name="popup.addurl.tags"/><br/> + <s:textfield id="popupAddUrlFormTags" name="tags" labelSeparator=" " /><br /> </p> <a class="button" onclick="submitAddUrl()"><s:text name="popup.commons.submit"/></a> <a class="button" onclick="closePopupAddUrl()"><s:text name="popup.commons.cancel"/></a> Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-05-16 15:41:45 UTC (rev 289) @@ -33,7 +33,7 @@ %> <div id="logoutDiv" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <s:form action="logout"> + <s:form action="logout" theme="simple"> <div class="input"> <s:submit key="bow.rightMenu.logout" name="submit" /> </div> Modified: trunk/bow-ui/src/main/webapp/jsp/login.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/login.jsp 2011-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/src/main/webapp/jsp/login.jsp 2011-05-16 15:41:45 UTC (rev 289) @@ -38,11 +38,9 @@ <h1><s:text name="bow.login.title" /></h1> <s:actionerror /> <s:form action="login"> - <p> - <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /><br /><br /> - <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /><br /><br /> - <s:submit key="bow.login.submit" name="submit" /> - </p> + <s:textfield key="bow.login.email" name="email" labelposition="top" labelSeparator=" :" /> + <s:password key="bow.login.password" name="password" labelposition="top" labelSeparator=" :" /> + <s:submit key="bow.login.submit" name="submit" /> </s:form> <s:a action="register_input" id="registerLink"><s:text name="bow.register.title" /></s:a><br /> <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="bow.forgotpwd.title" /></s:a> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 14:06:42 UTC (rev 288) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 15:41:45 UTC (rev 289) @@ -28,8 +28,8 @@ <%@taglib prefix="s" uri="/struts-tags" %> <% -PreferencesAction action = PreferencesAction.getAction(); -String bowUrl = BowConfig.getBowUrl(); + PreferencesAction action = PreferencesAction.getAction(); + String bowUrl = BowConfig.getBowUrl(); %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -46,7 +46,7 @@ <h2><s:text name="bow.preferences.title"/></h2> </div> <s:actionerror/> - + <div class="formFrame fond"> <s:set var="permanentToken" value="#session.BowSession.getPermanentToken()" /> <s:set var="temporaryToken" value="#session.BowSession.getTemporaryToken()" /> @@ -78,70 +78,83 @@ <s:property value="%{#temporaryToken}"/> </li> </ul> - + <s:url var="regenPermToken" action="regenPermToken"/> <s:a href="%{regenPermToken}" id="regenPermToken"> <s:text name="bow.preferences.regenPermToken"/> </s:a> </div> - - <s:form action="preferences"> - <div class="formFrame fond"> - <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> - </div> - <div class="formFrame fond"> - <h3><s:text name="bow.preferences.siteLook"/></h3> + <div class="formFrame fond"> + <h3><s:text name="bow.preferences.userInfo"/></h3> + <br/> + <s:form action="preferences" theme="simple"> + <s:text name="bow.login.email"/><br/> + <s:textfield name="email" + labelposition="top"/><br/> - <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> + <s:text name="bow.preferences.currentPassword"/><br/> + <s:password name="currentPassword" + labelposition="top"/><br/> + <s:text name="bow.preferences.newPassword"/><br/> + <s:password name="newPassword" + labelposition="top"/><br/> + + <s:text name="bow.preferences.confirmNewPassword"/><br/> + <s:password name="confirmNewPassword" + labelposition="top"/><br/> + <s:submit key="bow.preferences.submit" name="submit"/> + </s:form> + </div> + <div class="formFrame fond"> + <h3><s:text name="bow.preferences.siteLook"/></h3> + <br/> + <s:form action="preferences" theme="simple"> + <s:text name="bow.preferences.colors"/><br/> + <s:textfield name="colors" labelposition="top"/><br/> + + <s:text name="bow.preferences.tagsNb"/><br/> + <s:textfield name="tagsNb" labelposition="top"/><br/> + + <s:text name="bow.preferences.bookmarksHomePage"/><br/> + <s:textfield name="bookmarksHomePage" labelposition="top"/><br/> + + <s:text name="bow.preferences.searchEngineUrlSuggestions"/><br/> + <s:textfield name="searchEngineUrlSuggestions" + labelposition="top"/><br/> + + <s:text name="bow.preferences.searchEngineUrlResults"/><br/> + <s:textfield name="searchEngineUrlResults" + size="50" + labelposition="top"/><br/> + + <s:hidden name="update" value="1"/> + <s:submit key="bow.preferences.submit" name="submit"/> + </s:form> + </div> + <div class="menu clearfix"> <h2><s:text name="bow.preferences.tagsManagement"/></h2> </div> <div class="formFrame fond"> <h3><s:text name="bow.preferences.labels"/></h3> - <s:form id="labelsForm" action="adminlabels" method="post"> + <s:form id="labelsForm" action="adminlabels" method="post" theme="simple"> <ul> <% for (FacetTopic topic : action.getLabels()) { %> <div> - <%-- impossible de mettre un <s:checkbox, a priori erreur soit - disant que la tld ne permet pas d'expression :(. Comme - ca marche tres bien en HTML pure, vive le HTML :) --%> + <%-- impossible de mettre un <s:checkbox, a priori erreur soit + disant que la tld ne permet pas d'expression :(. Comme + ca marche tres bien en HTML pure, vive le HTML :) --%> <input type="checkbox" name="selectedLabels" value="<%=topic.getTopicName()%>"> - <%=topic.getTopicName()%>(<%=topic.getCount()%>) + <%=topic.getTopicName()%>(<%=topic.getCount()%>) </input> </div> <% } %> <div> - <s:textfield name="newLabel" key="bow.preferences.labels.name.field" /> + <s:text name="bow.preferences.labels.name.field"/><s:textfield name="newLabel" /> <s:submit name="rename" key="bow.preferences.labels.rename.submit" /> <s:submit name="delete" key="bow.preferences.labels.delete.submit" /> </div> @@ -159,17 +172,13 @@ <h3><s:text name="bow.preferences.import.bookmarks"/></h3> <br/> - <s:form action="importBookmarks" method="post" enctype="multipart/form-data"> + <s:form action="importBookmarks" method="post" enctype="multipart/form-data" theme="simple"> <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"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-16 14:06:42 UTC (rev 288) +++ trunk/pom.xml 2011-05-16 15:41:45 UTC (rev 289) @@ -124,8 +124,7 @@ <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <wikittyVersion>3.1.1</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> - <struts2Version>2.1.8.1</struts2Version> - <xWorkCoreVersion>2.1.6</xWorkCoreVersion> + <struts2Version>2.2.1.1</struts2Version> <htmlParserVersion>1.6</htmlParserVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion> @@ -167,12 +166,18 @@ </dependency> <dependency> - <groupId>com.opensymphony</groupId> + <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${xWorkCoreVersion}</version> + <version>${struts2Version}</version> </dependency> <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.12.1.GA</version> + </dependency> + + <dependency> <groupId>org.htmlparser</groupId> <artifactId>htmlparser</artifactId> <version>${htmlParserVersion}</version>

1 0

r288 - trunk/bow-ui/src/main/webapp/WEB-INF
by sletellier＠users.chorem.org 16 May '11

16 May '11

Author: sletellier Date: 2011-05-16 16:06:42 +0200 (Mon, 16 May 2011) New Revision: 288 Url: http://chorem.org/repositories/revision/bow/288 Log: #365 Remove spring and dwr Removed: trunk/bow-ui/src/main/webapp/WEB-INF/dwr.xml Deleted: trunk/bow-ui/src/main/webapp/WEB-INF/dwr.xml =================================================================== --- trunk/bow-ui/src/main/webapp/WEB-INF/dwr.xml 2011-05-16 13:52:58 UTC (rev 287) +++ trunk/bow-ui/src/main/webapp/WEB-INF/dwr.xml 2011-05-16 14:06:42 UTC (rev 288) @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!DOCTYPE dwr PUBLIC - "-//GetAhead Limited//DTD Direct Web Remoting 1.0//EN" - "http://www.getahead.ltd.uk/dwr/dwr10.dtd"> - -<dwr> - <allow> - <create creator="new" javascript="validator"> - <param name="class" value="org.apache.struts2.validators.DWRValidator"/> - </create> - <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/> - </allow> - - <signatures> - <![CDATA[ - import java.util.Map; - import org.apache.struts2.validators.DWRValidator; - - DWRValidator.doPost(String, String, Map<String, String>); - ]]> - </signatures> -</dwr>

1 0

r287 - in trunk/bow-ui/src/main/webapp: js jsp jsp/inc
by sletellier＠users.chorem.org 16 May '11

16 May '11

Author: sletellier Date: 2011-05-16 15:52:58 +0200 (Mon, 16 May 2011) New Revision: 287 Url: http://chorem.org/repositories/revision/bow/287 Log: #276 Confirmation on bookmark deletion Modified: trunk/bow-ui/src/main/webapp/js/bookmark.js trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp Modified: trunk/bow-ui/src/main/webapp/js/bookmark.js =================================================================== --- trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-05-16 13:22:33 UTC (rev 286) +++ trunk/bow-ui/src/main/webapp/js/bookmark.js 2011-05-16 13:52:58 UTC (rev 287) @@ -37,20 +37,31 @@ } -function deleteConfirmation(goTo, bookmarksNb, importDate) { +function deleteBookmarkConfirmation(goTo, bookmarkName) { + deleteConfirmation(goTo, bookmarkName, 0, undefined); +} + +function deleteImportConfirmation(goTo, bookmarksNb, importDate) { + deleteConfirmation(goTo, undefined, bookmarksNb, importDate); +} + +function deleteConfirmation(goTo, bookmarkName, bookmarksNb, importDate) { +// TODO sletellier 20110516 : use i18n to translate this ! + var confMsg = "Do you really want to delete "; if (bookmarksNb > 1) { confMsg += "these " + bookmarksNb + " bookmarks"; } else { - confMsg += "this bookmark"; + confMsg += "bookmark '" + bookmarkName + "'"; } if (importDate !== undefined) - confMsg += " imported the " + importDate + "?"; + confMsg += " imported the " + importDate + " ?"; else - confMsg += "?"; + confMsg += " ?"; if (confirm(confMsg)) { window.location = goTo; } + return false; } Modified: trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-05-16 13:22:33 UTC (rev 286) +++ trunk/bow-ui/src/main/webapp/jsp/inc/bookmark.jsp 2011-05-16 13:52:58 UTC (rev 287) @@ -105,7 +105,8 @@ <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> + <s:a cssClass="supprim" href="%{removeBookmark}" + onclick="return deleteConfirmation('%{#removeBookmark}','%{#bookmarkAlias}');"></s:a> </div> <div class="bookmarkcontenu"> <div class="screenshot"></div> Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 13:22:33 UTC (rev 286) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 13:52:58 UTC (rev 287) @@ -188,8 +188,8 @@ </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> + <a class="deleteImportButton" href="%{deleteImport}" + onclick="return deleteConfirmation('${deleteImport}','${count}','<%=date%>');"></a> </div> </s:iterator> </s:if>

1 0

r286 - trunk/bow-ui/src/main/java/org/chorem/bow/action
by sletellier＠users.chorem.org 16 May '11

16 May '11

Author: sletellier Date: 2011-05-16 15:22:33 +0200 (Mon, 16 May 2011) New Revision: 286 Url: http://chorem.org/repositories/revision/bow/286 Log: Make ImportBookmarksAction extends PreferencesAction to prevent class cast exception Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 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-05-16 13:21:52 UTC (rev 285) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/ImportBookmarksAction.java 2011-05-16 13:22:33 UTC (rev 286) @@ -50,7 +50,7 @@ * * @author poussin */ -public class ImportBookmarksAction extends BowBaseAction implements +public class ImportBookmarksAction extends PreferencesAction implements ServletRequestAware { private static final long serialVersionUID = -5962680416570797028L;

1 0

r285 - in trunk/bow-ui/src/main: java/org/chorem/bow java/org/chorem/bow/action webapp/jsp webapp/jsp/inc
by sletellier＠users.chorem.org 16 May '11

16 May '11

Author: sletellier Date: 2011-05-16 15:21:52 +0200 (Mon, 16 May 2011) New Revision: 285 Url: http://chorem.org/repositories/revision/bow/285 Log: - Allow to use directly BowConfig.getXXX with default config - Move inner BowConfigOption to external class Added: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java Removed: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigHelper.java Modified: trunk/bow-ui/src/main/java/org/chorem/bow/AliasServlet.java trunk/bow-ui/src/main/java/org/chorem/bow/BowConfig.java trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java trunk/bow-ui/src/main/java/org/chorem/bow/BowMail.java trunk/bow-ui/src/main/java/org/chorem/bow/BowSession.java trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp trunk/bow-ui/src/main/webapp/jsp/preferences.jsp trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp Modified: trunk/bow-ui/src/main/java/org/chorem/bow/AliasServlet.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/AliasServlet.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/AliasServlet.java 2011-05-16 13:21:52 UTC (rev 285) @@ -24,7 +24,6 @@ package org.chorem.bow; import org.apache.commons.lang.StringUtils; -import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; import javax.servlet.ServletException; @@ -46,8 +45,7 @@ protected String bowServletUrl = ""; public AliasServlet() { - ApplicationConfig config = BowConfig.getConfig(); - bowServletUrl = BowConfigHelper.getBowUrl(config) + BowConfigHelper.getServletBow(config); + bowServletUrl = BowConfig.getBowUrl() + BowConfig.getServletBow(); } @Override Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfig.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowConfig.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowConfig.java 2011-05-16 13:21:52 UTC (rev 285) @@ -50,135 +50,263 @@ private BowConfig() { } - public static synchronized ApplicationConfig getConfig(String... args) { + public static ApplicationConfig getConfig(String... args) { if (config == null) { - try { - config = new ApplicationConfig(BowOption.CONFIG_FILE.getDefaultValue()); + synchronized (BowConfig.class) { + if (config == null) { + try { + config = new ApplicationConfig(BowConfigOption.CONFIG_FILE.getDefaultValue()); - // Load wikitty options - config.loadDefaultOptions(WikittyConfigOption.class); + // Load wikitty options + config.loadDefaultOptions(WikittyConfigOption.class); - // Load bow options - config.loadDefaultOptions(BowOption.class); + // Load bow options + config.loadDefaultOptions(BowConfigOption.class); - // Parse args - config.parse(args); - } catch (Exception e) { - throw new UnhandledException(e); + // Parse args + config.parse(args); + } catch (Exception e) { + throw new UnhandledException(e); + } + } } } return config; } /** - * Bow option definition. + * Get version as string. + * Default bow applicationConfig will be used + * + * @return version */ - public enum BowOption implements ApplicationConfig.OptionDef { + public static String getVersion() { + return getVersion(getConfig()); + } - CONFIG_FILE( - ApplicationConfig.CONFIG_FILE_NAME, - _("bow.config.configFileName.description"), - "bow.properties", String.class, false, false), - APPLICATION_VERSION( - "application.version", - _("bow.config.application.version.description"), - null, String.class, true, true), - BOW_URL( - "bow.url", - _("bow.config.bow.url.description"), - null, String.class, false, false), - // FIXME sletellier 20110512 : A quoi ça sert ? La valeur est utilise en dur ("alias/") dans struts.xml - ALIAS_URL( - "alias.url", - _("bow.config.alias.url.description"), - null, String.class, false, false), - SERVLET_BOW( - "servlet.bow", - _("bow.config.servlet.bow.description"), - null, String.class, false, false), + /** + * Get version as string. + * + * @param config bow configuration + * @return version + */ + public static String getVersion(ApplicationConfig config) { + return config.getOption(BowConfigOption.APPLICATION_VERSION.key); + } - // FIXME sletellier 20110512 : A quoi ça sert ? La valeur est utilise en dur ("alias/") dans struts.xml - SERVLET_ALIAS( - "servlet.alias", - _("bow.config.servlet.bow.description"), - null, String.class, false, false), - SEARCH_ENGINE( - "search.engine", - _("bow.config.search.engine.description"), - null, String.class, false, false), - BOW_SMTPSERVER( - "bow.smtpServer", - _("bow.config.bow.smtpServer.description"), - null, String.class, false, false), - BOW_ADDRESSFROM( - "bow.addressFrom", - _("bow.config.bow.addressFrom.description"), - null, String.class, false, false), - BOW_ADMINS( - "bow.admins", - _("bow.config.bow.admins.description"), - null, String.class, false, false); + /** + * Get bow url as string. + * Default bow applicationConfig will be used + * + * @return url + */ + public static String getBowUrl() { + return getBowUrl(getConfig()); + } - public String key; - public String description; - public String defaultValue; - public Class<?> type; - public boolean isTransient; - public boolean isFinal; - - BowOption(String key, String description, String defaultValue, - Class<?> type, boolean isTransient, boolean isFinal) { - this.key = key; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - this.isFinal = isFinal; - this.isTransient = isTransient; + /** + * Get bow url as string. + * + * @param config bow configuration + * @return url + */ + public static String getBowUrl(ApplicationConfig config) { + String result = config.getOption(BowConfigOption.BOW_URL.key); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; } + return result; + } - @Override - public boolean isFinal() { - return isFinal; - } + /** + * Get alias url as string. + * Default bow applicationConfig will be used + * + * @return url + */ + public static String getAliasUrl() { + return getAliasUrl(getConfig()); + } - @Override - public boolean isTransient() { - return isTransient; + /** + * Get alias url as string. + * + * @param config bow configuration + * @return url + */ + public static String getAliasUrl(ApplicationConfig config) { + String result = config.getOption(BowConfigOption.ALIAS_URL.key); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; } + return result; + } - @Override - public String getDefaultValue() { - return defaultValue; - } + /** + * Get bow servlet as string. + * Default bow applicationConfig will be used + * + * @return servlet name + */ + public static String getServletBow() { + return getServletBow(getConfig()); + } - @Override - public String getDescription() { - return description; - } + /** + * Get bow servlet as string. + * + * @param config bow configuration + * @return servlet name + */ + public static String getServletBow(ApplicationConfig config) { + return config.getOption(BowConfigOption.SERVLET_BOW.key); + } - @Override - public String getKey() { - return key; - } + /** + * Get alias servlet as string. + * Default bow applicationConfig will be used + * + * @return servlet name + */ + public static String getServletAlias() { + return getServletAlias(getConfig()); + } - @Override - public Class<?> getType() { - return type; - } + /** + * Get alias servlet as string. + * + * @param config bow configuration + * @return servlet name + */ + public static String getServletAlias(ApplicationConfig config) { + return config.getOption(BowConfigOption.SERVLET_ALIAS.key); + } - @Override - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } + /** + * Get alias servlet url as string. + * Default bow applicationConfig will be used + * + * @return servlet name + */ + public static String getServletAliasUrl() { + return getServletAliasUrl(getConfig()); + } - @Override - public void setTransient(boolean isTransient) { - this.isTransient = isTransient; + /** + * Get alias servlet url as string. + * + * @param config bow configuration + * @return servlet name + */ + public static String getServletAliasUrl(ApplicationConfig config) { + String result = getAliasUrl(config) + getServletAlias(config); + if (result != null && result.charAt(result.length() - 1) != '/') { + result += '/'; } + return result; + } - @Override - public void setFinal(boolean isFinal) { - this.isFinal = isFinal; - } + /** + * Get bow smtp server as string. + * Default bow applicationConfig will be used + * + * @return smtpServer + */ + public static String getSmtpServer() { + return getSmtpServer(getConfig()); } + + /** + * Get bow smtp server as string. + * + * @param config bow configuration + * @return smtpServer + */ + public static String getSmtpServer(ApplicationConfig config) { + return config.getOption(BowConfigOption.BOW_SMTPSERVER.key); + } + + /** + * Get default search engine + * Default bow applicationConfig will be used + * + * @return search engine url + */ + public static String getSearchEngine() { + return getSearchEngine(getConfig()); + } + + /** + * Get default search engine + * + * @param config bow configuration + * @return search engine url + */ + public static String getSearchEngine(ApplicationConfig config) { + return config.getOption(BowConfigOption.SEARCH_ENGINE.key); + } + + /** + * Get bow address from as string. + * Default bow applicationConfig will be used + * + * @return addressFrom + */ + public static String getAddressFrom() { + return getAddressFrom(getConfig()); + } + + /** + * Get bow address from as string. + * + * @param config bow configuration + * @return addressFrom + */ + public static String getAddressFrom(ApplicationConfig config) { + return config.getOption(BowConfigOption.BOW_ADDRESSFROM.key); + } + + /** + * Get admins accounts + * Default bow applicationConfig will be used + * + * @return admins + */ + public static String[] getAdmins() { + return getAdmins(getConfig()); + } + + /** + * Get admins accounts + * + * @param config bow configuration + * @return admins + */ + public static String[] getAdmins(ApplicationConfig config) { + String str = config.getOption(BowConfigOption.BOW_ADMINS.key); + return StringUtil.split(str, ","); + } + + /** + * Return password for specified admin email + * Default bow applicationConfig will be used + * + * @param admin emails account + * @return null or password if available + */ + public static String getAdminPassword(String admin) { + return getAdminPassword(getConfig(), admin); + } + + /** + * Return password for specified admin email + * + * @param config bow configuration + * @param admin emails account + * @return null or password if available + */ + public static String getAdminPassword(ApplicationConfig config, String admin) { + return config.getOption(BowConfigOption.BOW_ADMINS.key + ".password." + admin); + } + } Deleted: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigHelper.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigHelper.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigHelper.java 2011-05-16 13:21:52 UTC (rev 285) @@ -1,128 +0,0 @@ -package org.chorem.bow; - -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.StringUtil; - -/** - * @author sletellier - */ -public class BowConfigHelper { - /** - * Get version as string. - * - * @param config bow configuration - * @return version - */ - public static String getVersion(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.APPLICATION_VERSION.key); - } - - /** - * Get bow url as string. - * - * @param config bow configuration - * @return url - */ - public static String getBowUrl(ApplicationConfig config) { - String result = config.getOption(BowConfig.BowOption.BOW_URL.key); - if (result != null && result.charAt(result.length() - 1) != '/') { - result += '/'; - } - return result; - } - - /** - * Get alias url as string. - * - * @param config bow configuration - * @return url - */ - public static String getAliasUrl(ApplicationConfig config) { - String result = config.getOption(BowConfig.BowOption.ALIAS_URL.key); - if (result != null && result.charAt(result.length() - 1) != '/') { - result += '/'; - } - return result; - } - - /** - * Get bow servlet as string. - * - * @param config bow configuration - * @return servlet name - */ - public static String getServletBow(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.SERVLET_BOW.key); - } - - /** - * Get alias servlet as string. - * - * @param config bow configuration - * @return servlet name - */ - public static String getServletAlias(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.SERVLET_ALIAS.key); - } - - /** - * Get alias servlet url as string. - * - * @param config bow configuration - * @return servlet name - */ - public static String getServletAliasUrl(ApplicationConfig config) { - String result = getAliasUrl(config) + getServletAlias(config); - if (result != null && result.charAt(result.length() - 1) != '/') { - result += '/'; - } - return result; - } - - /** - * Get bow smtp server as string. - * - * @param config bow configuration - * @return smtpServer - */ - public static String getSmtpServer(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.BOW_SMTPSERVER.key); - } - - /** - * Get default search engine - * - * @param config bow configuration - * @return search engine url - */ - public static String getSearchEngine(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.SEARCH_ENGINE.key); - } - - /** - * Get bow address from as string. - * - * @param config bow configuration - * @return addressFrom - */ - public static String getAddressFrom(ApplicationConfig config) { - return config.getOption(BowConfig.BowOption.BOW_ADDRESSFROM.key); - } - - public static String[] getAdmins(ApplicationConfig config) { - String str = config.getOption(BowConfig.BowOption.BOW_ADMINS.key); - return StringUtil.split(str, ","); - } - - /** - * Return password for specified admin email - * - * @param config bow configuration - * @param admin - * @return null or password if available - */ - public static String getAdminPassword(ApplicationConfig config, String admin) { - String str = config.getOption(BowConfig.BowOption.BOW_ADMINS.key + ".password." + admin); - return str; - } -} Added: trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java (rev 0) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowConfigOption.java 2011-05-16 13:21:52 UTC (rev 285) @@ -0,0 +1,116 @@ +package org.chorem.bow; + +import org.nuiton.util.ApplicationConfig; + +import static org.nuiton.i18n.I18n._; + +/** + * Bow option definition. + */ +public enum BowConfigOption implements ApplicationConfig.OptionDef { + + CONFIG_FILE( + ApplicationConfig.CONFIG_FILE_NAME, + _("bow.config.configFileName.description"), + "bow.properties", String.class, false, false), + APPLICATION_VERSION( + "application.version", + _("bow.config.application.version.description"), + null, String.class, true, true), + BOW_URL( + "bow.url", + _("bow.config.bow.url.description"), + null, String.class, false, false), + // For apache url rewriting + ALIAS_URL( + "alias.url", + _("bow.config.alias.url.description"), + "alias/", String.class, false, false), + SERVLET_BOW( + "servlet.bow", + _("bow.config.servlet.bow.description"), + null, String.class, false, false), + // For apache url rewriting + SERVLET_ALIAS( + "servlet.alias", + _("bow.config.servlet.bow.description"), + null, String.class, false, false), + SEARCH_ENGINE( + "search.engine", + _("bow.config.search.engine.description"), + null, String.class, false, false), + BOW_SMTPSERVER( + "bow.smtpServer", + _("bow.config.bow.smtpServer.description"), + null, String.class, false, false), + BOW_ADDRESSFROM( + "bow.addressFrom", + _("bow.config.bow.addressFrom.description"), + null, String.class, false, false), + BOW_ADMINS( + "bow.admins", + _("bow.config.bow.admins.description"), + null, String.class, false, false); + + public String key; + public String description; + public String defaultValue; + public Class<?> type; + public boolean isTransient; + public boolean isFinal; + + BowConfigOption(String key, String description, String defaultValue, + Class<?> type, boolean isTransient, boolean isFinal) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this.isFinal = isFinal; + this.isTransient = isTransient; + } + + @Override + public boolean isFinal() { + return isFinal; + } + + @Override + public boolean isTransient() { + return isTransient; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public void setTransient(boolean isTransient) { + this.isTransient = isTransient; + } + + @Override + public void setFinal(boolean isFinal) { + this.isFinal = isFinal; + } +} \ No newline at end of file Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowInit.java 2011-05-16 13:21:52 UTC (rev 285) @@ -130,6 +130,6 @@ } request.setAttribute("bookmarkActions", bookmarkActions); } - request.setAttribute(ALIAS_SERVLET_URL, BowConfigHelper.getServletAliasUrl(BowConfig.getConfig())); + request.setAttribute(ALIAS_SERVLET_URL, BowConfig.getServletAliasUrl()); } } Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowMail.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowMail.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowMail.java 2011-05-16 13:21:52 UTC (rev 285) @@ -38,8 +38,7 @@ public class BowMail { static public void sendMail(String sendToEmail, String mailSubject, String mailContent) throws AddressException, MessagingException { - ApplicationConfig config = BowConfig.getConfig(); - String smtpServer = BowConfigHelper.getSmtpServer(config); + String smtpServer = BowConfig.getSmtpServer(); Properties properties = new Properties(); properties.put("mail.smtp.host", smtpServer); @@ -49,7 +48,7 @@ Message msg = new MimeMessage(session); msg.addRecipient(Message.RecipientType.TO, new InternetAddress(sendToEmail)); - msg.setFrom(new InternetAddress(BowConfigHelper.getAddressFrom(config))); + msg.setFrom(new InternetAddress(BowConfig.getAddressFrom())); msg.setSubject(mailSubject); msg.setContent(mailContent, "text/plain"); Transport.send(msg); Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowSession.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/BowSession.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowSession.java 2011-05-16 13:21:52 UTC (rev 285) @@ -104,7 +104,7 @@ // check if this user is admin String login = preference.getLogin(); - String[] admins = BowConfigHelper.getAdmins(BowConfig.getConfig()); + String[] admins = BowConfig.getAdmins(); boolean isAdmin = false; if (admins != null) { for (String admin : admins) { @@ -159,7 +159,7 @@ preference.setColors(""); } if (preference.getSearchEngineUrlResults() == null) { - preference.setSearchEngineUrlResults(BowConfigHelper.getSearchEngine(BowConfig.getConfig())); + preference.setSearchEngineUrlResults(BowConfig.getSearchEngine()); } if (preference.getSearchEngineUrlSuggestions() == null) { preference.setSearchEngineUrlSuggestions(""); // TODO add default value in config 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-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/LoginAction.java 2011-05-16 13:21:52 UTC (rev 285) @@ -28,7 +28,6 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.bow.BowConfig; -import org.chorem.bow.BowConfigHelper; import org.chorem.bow.BowUser; import org.chorem.bow.BowInit; import org.chorem.bow.BowPreference; @@ -90,7 +89,7 @@ if (result == null) { // failback: try to authenticate admin with config info - String configPassword = BowConfigHelper.getAdminPassword(BowConfig.getConfig(), email); + String configPassword = BowConfig.getAdminPassword(email); log.info("failback password: " + password + " configPassword: " + configPassword); if (password.equals(configPassword)) { // admin authenticate with config, this is possible when Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java =================================================================== --- trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/OpenSearchResultAction.java 2011-05-16 13:21:52 UTC (rev 285) @@ -33,10 +33,8 @@ import org.chorem.bow.BookmarkActions; import org.chorem.bow.BookmarkUtils; import org.chorem.bow.BowConfig; -import org.chorem.bow.BowConfigHelper; import org.chorem.bow.BowUtils; import org.chorem.bow.BowPreference; -import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.WikittyProxy; @@ -105,7 +103,6 @@ public String execute() { BowPreference user = getBowSession().getPreference(); - ApplicationConfig config = BowConfig.getConfig(); if (searchLine != null && searchLine.matches("^http://[^ ]*")) { redirectTo = BowUtils.redirectTo(searchLine, null); } else if (searchLine != null @@ -152,12 +149,12 @@ // si on retrouve l'alias prive on l'utilise, // sinon on espere qu'il existe un alias public portant ce nom if (bookmarkId != null) { - redirectTo = BowConfigHelper.getAliasUrl(config) + bookmarkId + ".action"; + redirectTo = BowConfig.getAliasUrl() + bookmarkId + ".action"; if (log.isDebugEnabled()) { log.debug("Private alias found, redirect to: " + redirectTo); } } else { - redirectTo = BowConfigHelper.getAliasUrl(config) + privateAlias + ".action"; + redirectTo = BowConfig.getAliasUrl() + privateAlias + ".action"; if (log.isDebugEnabled()) { log.debug("Private alias not found, redirect to: " + redirectTo); } @@ -168,7 +165,7 @@ String searchEngineURL = pref.getSearchEngineUrlResults(); if (StringUtils.isEmpty(searchEngineURL)) { - searchEngineURL = BowConfigHelper.getSearchEngine(config); + searchEngineURL = BowConfig.getSearchEngine(); } searchEngineURL = searchEngineURL.replace("{searchTerms}", searchLine); searchEngineURL = response.encodeRedirectURL(searchEngineURL); 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-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/PreferencesAction.java 2011-05-16 13:21:52 UTC (rev 285) @@ -63,8 +63,10 @@ private static final long serialVersionUID = -58341106356599721L; static public PreferencesAction getAction() { - return (PreferencesAction)ActionContext.getContext().get(CONTEXT_ACTION_KEY); + Object action = ActionContext.getContext().get(CONTEXT_ACTION_KEY); + return (PreferencesAction) action; } + protected String colors; protected String tagsNb; protected String bookmarksHomePage; Modified: trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/webapp/jsp/inc/rightMenu.jsp 2011-05-16 13:21:52 UTC (rev 285) @@ -24,9 +24,8 @@ <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@ page import="org.chorem.bow.BowConfigHelper" %> <% -String bowUrl = BowConfigHelper.getBowUrl(BowConfig.getConfig()); +String bowUrl = BowConfig.getBowUrl(); if (request.getAttribute("formAction") == null) { request.setAttribute("formAction", "addUrl"); Modified: trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/webapp/jsp/permanentXml.jsp 2011-05-16 13:21:52 UTC (rev 285) @@ -24,10 +24,9 @@ <%@page contentType="text/xml" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@ page import="org.chorem.bow.BowConfigHelper" %> <% -String url = BowConfigHelper.getBowUrl(BowConfig.getConfig()); +String url = BowConfig.getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/" Modified: trunk/bow-ui/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/webapp/jsp/preferences.jsp 2011-05-16 13:21:52 UTC (rev 285) @@ -1,7 +1,3 @@ -<%@page import="org.chorem.bow.BowConfig"%> -<%@page import="org.nuiton.wikitty.search.FacetTopic"%> -<%@page import="org.chorem.bow.action.PreferencesAction"%> -<%@ page import="org.chorem.bow.BowConfigHelper" %>  <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@page import="org.chorem.bow.BowConfig"%> +<%@page import="org.nuiton.wikitty.search.FacetTopic"%> +<%@page import="org.chorem.bow.action.PreferencesAction"%> <%@taglib prefix="s" uri="/struts-tags" %> <% PreferencesAction action = PreferencesAction.getAction(); -String bowUrl = BowConfigHelper.getBowUrl(BowConfig.getConfig()); +String bowUrl = BowConfig.getBowUrl(); %> <html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" @@ -128,7 +127,7 @@ <div class="formFrame fond"> <h3><s:text name="bow.preferences.labels"/></h3> - <s:form action="adminlabels" method="post"> + <s:form id="labelsForm" action="adminlabels" method="post"> <ul> <% for (FacetTopic topic : action.getLabels()) { %> <div> Modified: trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp =================================================================== --- trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp 2011-05-14 11:45:57 UTC (rev 284) +++ trunk/bow-ui/src/main/webapp/jsp/temporaryXml.jsp 2011-05-16 13:21:52 UTC (rev 285) @@ -24,10 +24,9 @@ <%@page contentType="text/xml" pageEncoding="UTF-8"%> <%@taglib prefix="s" uri="/struts-tags" %> <%@page import="org.chorem.bow.BowConfig" %> -<%@ page import="org.chorem.bow.BowConfigHelper" %> <% -String url = BowConfigHelper.getBowUrl(BowConfig.getConfig()); +String url = BowConfig.getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"

1 0

r284 - trunk
by tchemit＠users.chorem.org 14 May '11

14 May '11

Author: tchemit Date: 2011-05-14 13:45:57 +0200 (Sat, 14 May 2011) New Revision: 284 Url: http://chorem.org/repositories/revision/bow/284 Log: Update mavenpom4redmine to 2.5.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-12 14:29:07 UTC (rev 283) +++ trunk/pom.xml 2011-05-14 11:45:57 UTC (rev 284) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.5.3</version> + <version>2.5.4</version> </parent> <groupId>org.chorem</groupId>

1 0