Vradi-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
May 2011
- 4 participants
- 74 discussions
May 20, 2011
Author: sletellier
Date: 2011-05-20 16:08:45 +0200 (Fri, 20 May 2011)
New Revision: 32
Url: http://chorem.org/repositories/revision/vradi/32
Log:
#376 Cr?\195?\169ation de l'authentification
Added:
trunk/vradi-web/src/main/java/org/chorem/vradi/actions/
trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ForgotPasswordAction.java
trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java
trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java
trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LogoutAction.java
trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java
trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java
trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/
trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java
trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LogoutInterceptor.java
trunk/vradi-web/src/main/resources/struts.properties
trunk/vradi-web/src/main/webapp/index.html
trunk/vradi-web/src/main/webapp/jsp/
trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp
trunk/vradi-web/src/main/webapp/jsp/home.jsp
trunk/vradi-web/src/main/webapp/jsp/login.jsp
trunk/vradi-web/src/main/webapp/jsp/register.jsp
Removed:
trunk/vradi-web/src/main/webapp/index.jsp
Modified:
trunk/pom.xml
trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java
trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/ImportXmlStreamTasks.java
trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfig.java
trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java
trunk/vradi-web/pom.xml
trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java
trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java
trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties
trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties
trunk/vradi-web/src/main/resources/struts.xml
trunk/vradi-web/src/main/resources/vradi-web.properties
trunk/vradi-web/src/main/webapp/WEB-INF/web.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/pom.xml 2011-05-20 14:08:45 UTC (rev 32)
@@ -114,7 +114,7 @@
<nuitonI18nVersion>2.4</nuitonI18nVersion>
<nuitonWidgetVersion>1.1.1</nuitonWidgetVersion>
<generatorPluginVersion>2.3.3</generatorPluginVersion>
- <wikittyVersion>3.1.2</wikittyVersion>
+ <wikittyVersion>3.1.3-SNAPSHOT</wikittyVersion>
<oooVersion>3.2.1</oooVersion>
<javamailVersion>1.4.3</javamailVersion>
<slf4jVersion>1.6.1</slf4jVersion>
Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java
===================================================================
--- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -149,53 +149,8 @@
}
return null;
}
- String result;
- // TODO EC-20100505 use Session.getDefaultInstance()
- // and common Properties form receiving/sending mails !
- Properties props = new Properties();
- props.put("mail.smtp.host", VradiServiceConfigurationHelper.getSmtpHost(config));
- props.put("mail.smtp.port", VradiServiceConfigurationHelper.getSmtpPort(config));
- //props.put("mail.smtp.auth", "true");
- //props.put("mail.smtp.socketFactory.port", config.getSmtpPort());
- //props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
- //props.put("mail.smtp.socketFactory.fallback", "false");
- //props.put("mail.debug", config.isMailDebug());
-
- Session session = Session.getInstance(props,
- new Authenticator() {
- @Override
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication(
- VradiServiceConfigurationHelper.getMailUser(config),
- VradiServiceConfigurationHelper.getMailPassword(config));
- }
- });
-
- // EC-20100427 : attention, ca affiche le contenu des pdf joint
- // c'est absolument illisible
- //session.setDebug(log.isDebugEnabled());
-
- // create a message
- MimeMessage msg = new MimeMessage(session);
-
try {
- // set the from and to address
- InternetAddress addressFrom = new InternetAddress(
- VradiServiceConfigurationHelper.getMailFrom(config),
- VradiServiceConfigurationHelper.getMailFromName(config));
-
- msg.setFrom(addressFrom);
-
- InternetAddress addressTo = new InternetAddress(recipient);
- msg.addRecipient(Message.RecipientType.TO, addressTo);
-
- if (receptionProof) {
- // Optional : You can also set your custom headers in the Email if you Want
- msg.addHeader("Return-Receipt-To", VradiServiceConfigurationHelper.getMailFrom(config));
- msg.addHeader("Disposition-Notification-To", VradiServiceConfigurationHelper.getMailFrom(config));
- }
-
Multipart multiparts = new MimeMultipart();
// create the message part
@@ -263,6 +218,106 @@
}
}
+ return postMail(config, recipient, subject, receptionProof, multiparts);
+ } catch (MessagingException eee) {
+ if (log.isErrorEnabled()) {
+ log.error("Can't generate message", eee);
+ }
+ throw new VradiException(_("vradi.error.sending.send", eee.getMessage()));
+ }
+ }
+
+ /**
+ * Sends an email to the specified recipient with the specified subject
+ * and the specified message and the specified forms PDF.
+ *
+ * @param recipient the email address of the recipient
+ * @param subject mail subject
+ * @param receptionProof if true, ask for a reception proof
+ * @param msg content of mail
+ * @return the message id of the email sent
+ * @throws VradiException
+ */
+ public static String postMail(ApplicationConfig config, String recipient, String subject,
+ boolean receptionProof,
+ String msg) throws MessagingException, VradiException {
+
+ Multipart multiparts = new MimeMultipart();
+
+ // create the message part
+ MimeBodyPart msgBodyPart = new MimeBodyPart();
+ msgBodyPart.setText(msg);
+ multiparts.addBodyPart(msgBodyPart);
+
+ return postMail(config, recipient, subject, receptionProof, multiparts);
+ }
+
+ /**
+ * Sends an email to the specified recipient with the specified subject
+ * and the specified message and the specified forms PDF.
+ *
+ * @param recipient the email address of the recipient
+ * @param subject mail subject
+ * @param receptionProof if true, ask for a reception proof
+ * @param multiparts content of mail
+ * @return the message id of the email sent
+ * @throws VradiException
+ */
+ public static String postMail(ApplicationConfig config, String recipient, String subject,
+ boolean receptionProof,
+ Multipart multiparts) throws VradiException {
+
+ if (StringUtils.isBlank(recipient)) {
+ if (log.isWarnEnabled()) {
+ log.warn(_("Nothing to send : %s", recipient));
+ }
+ return null;
+ }
+ String result;
+
+ // TODO EC-20100505 use Session.getDefaultInstance()
+ // and common Properties form receiving/sending mails !
+ Properties props = new Properties();
+ props.put("mail.smtp.host", VradiServiceConfigurationHelper.getSmtpHost(config));
+ props.put("mail.smtp.port", VradiServiceConfigurationHelper.getSmtpPort(config));
+ //props.put("mail.smtp.auth", "true");
+ //props.put("mail.smtp.socketFactory.port", config.getSmtpPort());
+ //props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
+ //props.put("mail.smtp.socketFactory.fallback", "false");
+ //props.put("mail.debug", config.isMailDebug());
+
+ final String mailUser = VradiServiceConfigurationHelper.getMailUser(config);
+ final String mailPassword = VradiServiceConfigurationHelper.getMailPassword(config);
+ Session session = Session.getInstance(props,
+ new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(
+ mailUser,
+ mailPassword);
+ }
+ });
+
+ // create a message
+ MimeMessage msg = new MimeMessage(session);
+
+ try {
+ // set the from and to address
+ InternetAddress addressFrom = new InternetAddress(
+ VradiServiceConfigurationHelper.getMailFrom(config),
+ VradiServiceConfigurationHelper.getMailFromName(config));
+
+ msg.setFrom(addressFrom);
+
+ InternetAddress addressTo = new InternetAddress(recipient);
+ msg.addRecipient(Message.RecipientType.TO, addressTo);
+
+ if (receptionProof) {
+ // Optional : You can also set your custom headers in the Email if you Want
+ msg.addHeader("Return-Receipt-To", VradiServiceConfigurationHelper.getMailFrom(config));
+ msg.addHeader("Disposition-Notification-To", VradiServiceConfigurationHelper.getMailFrom(config));
+ }
+
// Put parts in message
msg.setContent(multiparts);
@@ -303,7 +358,6 @@
}
return result;
}
-
/**
* Receives the emails and check if some are error emails or reception proofs
* and treat them in consequence.
Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/ImportXmlStreamTasks.java
===================================================================
--- trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/ImportXmlStreamTasks.java 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/tasks/ImportXmlStreamTasks.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -32,25 +32,14 @@
import org.chorem.vradi.entities.XmlStream;
import org.chorem.vradi.services.VradiException;
import org.chorem.vradi.services.managers.BindingManager;
+import org.chorem.vradi.services.managers.MailingManager;
import org.nuiton.util.ApplicationConfig;
import org.nuiton.util.ExceptionUtil;
import org.nuiton.util.TimeLog;
import org.nuiton.wikitty.WikittyProxy;
-import javax.mail.Authenticator;
-import javax.mail.Message;
import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import java.io.UnsupportedEncodingException;
import java.util.List;
-import java.util.Properties;
import java.util.TimerTask;
import static org.nuiton.i18n.I18n._;
@@ -139,74 +128,19 @@
}
return;
}
+ String msg = _("vradi.error.errorImportXmlStream", xmlStream.getName(),
+ ExceptionUtil.stackTrace(error));
- // TODO EC-20100505 use Session.getDefaultInstance()
- // and common Properties form receiving/sending mails !
- Properties props = new Properties();
- props.put("mail.smtp.host", VradiServiceConfigurationHelper.getSmtpHost(config));
- props.put("mail.smtp.port", VradiServiceConfigurationHelper.getSmtpPort(config));
- //props.put("mail.smtp.auth", "true");
- //props.put("mail.smtp.socketFactory.port", config.getSmtpPort());
- //props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
- //props.put("mail.smtp.socketFactory.fallback", "false");
- //props.put("mail.debug", config.isMailDebug());
+ // Setting the Subject and Content Type
+ String subject = _("vradi.error.errorImportXmlStream.subject", xmlStream.getName());
- Session session = Session.getInstance(props,
- new Authenticator() {
- @Override
- protected PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication(
- VradiServiceConfigurationHelper.getMailUser(config),
- VradiServiceConfigurationHelper.getMailPassword(config));
- }
- });
-
- // EC-20100427 : attention, ca affiche le contenu des pdf joint
- // c'est absolument illisible
- //session.setDebug(log.isDebugEnabled());
-
- // create a message
- MimeMessage msg = new MimeMessage(session);
-
try {
- // set the from and to address
- InternetAddress addressFrom = new InternetAddress(VradiServiceConfigurationHelper.getMailFrom(config),
- VradiServiceConfigurationHelper.getMailFromName(config));
-
- msg.setFrom(addressFrom);
-
- InternetAddress addressTo = new InternetAddress(email);
- msg.addRecipient(Message.RecipientType.TO, addressTo);
-
- Multipart multiparts = new MimeMultipart();
-
- // create the message part
- MimeBodyPart msgBodyPart = new MimeBodyPart();
- msgBodyPart.setText(_("vradi.error.errorImportXmlStream", xmlStream.getName(),
- ExceptionUtil.stackTrace(error)));
-
- multiparts.addBodyPart(msgBodyPart);
-
- // Put parts in message
- msg.setContent(multiparts);
-
- // Setting the Subject and Content Type
- msg.setSubject(_("vradi.error.errorImportXmlStream.subject", xmlStream.getName()));
-
- try {
- Transport.send(msg);
- } catch (MessagingException eee) {
- if (log.isErrorEnabled()) {
- log.error("Cant send mail", eee);
- }
- }
-
-
+ MailingManager.postMail(config, email, subject, false, msg);
} catch (MessagingException eee) {
if (log.isErrorEnabled()) {
log.error("Can't generate message", eee);
}
- } catch (UnsupportedEncodingException eee) {
+ } catch (VradiException eee) {
if (log.isErrorEnabled()) {
log.error("Can't generate message", eee);
}
Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfig.java
===================================================================
--- trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfig.java 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfig.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -73,12 +73,12 @@
// Creating instance of ApplicationConfig
config = new ApplicationConfig(VradiSwingOption.CONFIG_FILE.getDefaultValue());
+ // Load wikitty options
+ config.loadDefaultOptions(WikittyConfigOption.class);
+
// Load service options
config.loadDefaultOptions(VradiServiceConfiguration.VradiServiceOption.class);
- // Load wikitty options
- config.loadDefaultOptions(WikittyConfigOption.class);
-
// Load vradi options
config.loadDefaultOptions(VradiSwingOption.class);
Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java
===================================================================
--- trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -28,6 +28,8 @@
import org.apache.commons.logging.LogFactory;
import org.chorem.vradi.VradiConfigHelper;
import org.nuiton.util.ApplicationConfig;
+import org.nuiton.wikitty.WikittyConfig;
+import org.nuiton.wikitty.WikittyConfigOption;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.WikittyService;
import org.nuiton.wikitty.WikittyServiceFactory;
Modified: trunk/vradi-web/pom.xml
===================================================================
--- trunk/vradi-web/pom.xml 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/pom.xml 2011-05-20 14:08:45 UTC (rev 32)
@@ -137,6 +137,12 @@
</dependency>
<dependency>
+ <groupId>org.nuiton.wikitty</groupId>
+ <artifactId>wikitty-hessian-client</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>runtime</scope>
@@ -173,6 +179,7 @@
</dependencies>
<build>
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -205,13 +212,8 @@
</userRulesFiles>
<namespaces>
<s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s>
- <sx>
- http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
- </sx>
+ <sx>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</sx>
<jsp>http://java.sun.com/JSP/Page</jsp>
- <decorator>
- http://www.opensymphony.com/sitemesh/decorator
- </decorator>
</namespaces>
</configuration>
</execution>
Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -1,15 +1,19 @@
package org.chorem.vradi;
+import java.util.Locale;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.chorem.vradi.entities.VradiUser;
+import org.nuiton.i18n.I18n;
+import org.nuiton.i18n.init.DefaultI18nInitializer;
import org.nuiton.util.ApplicationConfig;
+import org.nuiton.wikitty.WikittyConfigOption;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.WikittyService;
import org.nuiton.wikitty.WikittyServiceFactory;
-import org.nuiton.wikitty.entities.WikittyUser;
/**
* Classe utilisee pour stocker les objets utils en session utilisateur
@@ -28,18 +32,28 @@
static final private String VRADI_SESSION_KEY = VradiSession.class.getSimpleName();
protected WikittyProxy proxy;
- private WikittyUser user;
+ protected ApplicationConfig config;
+ private VradiUser user;
public VradiSession() {
- ApplicationConfig config = VradiWebConfig.getConfig();
+ config = VradiWebConfig.getConfig();
+
+ // Init wikitty service
WikittyService ws = WikittyServiceFactory.buildWikittyService(config);
proxy = new WikittyProxy(config, ws);
+
+ // init I18n
+// I18n.init(new DefaultI18nInitializer("vradi-i18n"), null);
}
- static public void invalidate(Map<String, Object> session) {
- session.remove(VRADI_SESSION_KEY);
+ public void invalidate() {
+ this.user = null;
}
+ public ApplicationConfig getConfig() {
+ return config;
+ }
+
static public VradiSession getVradiSession(HttpServletRequest request) {
HttpSession session = request.getSession();
VradiSession result = getVradiSession(session);
@@ -68,7 +82,11 @@
return proxy;
}
- public WikittyUser getUser() {
+ public VradiUser getUser() {
return user;
}
+
+ public void setUser(VradiUser user) {
+ this.user = user;
+ }
}
Modified: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -38,12 +38,12 @@
// Creating instance of ApplicationConfig
config = new ApplicationConfig(VradiWebOption.CONFIG_FILE.getDefaultValue());
+ // Load wikitty options
+ config.loadDefaultOptions(WikittyConfigOption.class);
+
// Load service options
config.loadDefaultOptions(VradiServiceConfiguration.VradiServiceOption.class);
- // Load wikitty options
- config.loadDefaultOptions(WikittyConfigOption.class);
-
// Load vradi options
config.loadDefaultOptions(VradiWebOption.class);
@@ -80,7 +80,7 @@
CONFIG_FILE(
ApplicationConfig.CONFIG_FILE_NAME,
_("vradi.config.configFileName.description"),
- "vradi.properties", String.class, true, true),
+ "vradi-web.properties", String.class, true, true),
VRADI_VERSION(
"vradi.version",
@@ -108,7 +108,7 @@
REMOTE_ENDPOINT(
"vradi.remote.endpoint",
_("vradi.config.remote.endpoint.description"),
- "", String.class, false, false);
+ "http://localhost:8080", String.class, false, false);
public String key;
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ForgotPasswordAction.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ForgotPasswordAction.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/ForgotPasswordAction.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,105 @@
+package org.chorem.vradi.actions;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
+
+import org.apache.commons.lang.RandomStringUtils;
+import org.chorem.vradi.entities.VradiUser;
+import org.chorem.vradi.services.managers.MailingManager;
+import org.nuiton.util.StringUtil;
+import org.nuiton.wikitty.search.Criteria;
+import org.nuiton.wikitty.WikittyProxy;
+import org.nuiton.wikitty.search.Search;
+
+import static org.nuiton.i18n.I18n.n_;
+
+/**
+ * Genere un nouveau mot de passe pour l'utilisateur et lui envoie par mail
+ * TODO poussin 20110211 il faudrait ajouter une securite pour eviter que
+ * quelqu'un s'amuse a demander la modification de password de quelqu'un d'autre
+ * toutes les 2s
+ * - soit en ne permettant l'envoi qu'une fois par jour
+ * - soit ????
+ *
+ * @author poussin
+ */
+public class ForgotPasswordAction extends VradiBaseAction {
+ private static final long serialVersionUID = -8207951465957204954L;
+ protected String email;
+
+ /**
+ * @return the email
+ */
+ public String getEmail() {
+ return email;
+ }
+
+ /**
+ * @param email the email to set
+ */
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ /**
+ * Generates a new password and sends it to the user
+ */
+ public String execute() {
+ String result = INPUT;
+
+ try {
+ if (email != null) {
+ email = email.trim();
+ if (!email.isEmpty()) {
+ WikittyProxy proxy = getProxy();
+ Criteria criteria = Search.query()
+ .eq(VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria();
+ VradiUser user = proxy.findByCriteria(VradiUser.class, criteria);
+
+ if (user != null) { //If the email address exists
+ String password = "";
+ String md5 = "";
+
+ password = RandomStringUtils.randomAlphanumeric(20);
+ md5 = StringUtil.encodeMD5(password);
+ try {
+ String mailContent;
+
+ mailContent = getText(n_("vradi.register.mailHi")) +
+ ",\n\n" + getText(n_("vradi.register.mailPwd")) + ": " +
+ password + "\n\n" + getText(n_("vradi.register.mailEmail")) +
+ ": " + email + "\n\n";
+ MailingManager.postMail(getConfig(), email,
+ getText(n_("vradi.register.mailSubject")),
+ false,
+ mailContent);
+
+ //The password is changed only if the mail has been sent
+ user.setPassword(md5);
+ proxy.store(user);
+ } catch (AddressException e) {
+ //If the email address is invalid
+ String message = getText("vradi.mail.badFormat");
+
+ addActionError(n_(message));
+ log.error(message + " (email:" + email + ")", e);
+ } catch (MessagingException e) {
+ String message = getText("vradi.mail.sendError");
+
+ addActionError(n_(message));
+ log.error(message + "(" + e.getMessage() + ")", e);
+ }
+ result = SUCCESS;
+ } else { //If the email is not associated with an account
+ addFieldError("email",
+ getText(n_("vradi.forgotPassword.emailDoesntExist")));
+ }
+ }
+ }
+ } catch (Exception e) {
+ addActionError(getText(n_("vradi.error.internal")));
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+}
\ No newline at end of file
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/HomeAction.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,18 @@
+package org.chorem.vradi.actions;
+
+/**
+ * Prepare l'affichage de la page d'accueil
+ *
+ * @author poussin
+ */
+public class HomeAction extends VradiBaseAction {
+
+ private static final long serialVersionUID = -3735250067223062719L;
+
+ /**
+ * Initializes everything before displaying the home page
+ */
+ public String execute() {
+ return SUCCESS;
+ }
+}
\ No newline at end of file
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LoginAction.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,84 @@
+package org.chorem.vradi.actions;
+
+import org.chorem.vradi.entities.VradiUser;
+import org.nuiton.util.StringUtil;
+import org.nuiton.wikitty.search.Criteria;
+import org.nuiton.wikitty.WikittyProxy;
+import org.nuiton.wikitty.search.Search;
+
+import static org.nuiton.i18n.I18n.n_;
+
+/**
+ * authentifie l'utilisateur et place son objet User dans la vradi session
+ *
+ * @author poussin
+ */
+public class LoginAction extends VradiBaseAction {
+
+ private static final long serialVersionUID = 6891064800288772246L;
+
+ protected String email;
+ protected String password;
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ /**
+ * Check password in solr index, if fail try to check password admin in config file
+ *
+ * @param email email login
+ * @param password password
+ * @return null if not found
+ */
+ protected VradiUser checkLogin(String email, String password) {
+ VradiUser result = null;
+ if (email != null && password != null) {
+ if (!email.isEmpty() && !password.equals(StringUtil.encodeMD5(""))) {
+ WikittyProxy proxy = getProxy();
+ Criteria criteria = Search.query().eq(VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).
+ eq(VradiUser.FQ_FIELD_WIKITTYUSER_PASSWORD, password).criteria();
+ result = proxy.findByCriteria(VradiUser.class, criteria);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Authenticates the user if his email and password are valid
+ */
+ public String execute() {
+ String result = INPUT;
+
+ try {
+ if (email != null) {
+ email = email.trim();
+
+ if (password != null) {
+ String md5 = StringUtil.encodeMD5(password);
+ VradiUser user = checkLogin(email, md5);
+ if (user != null) {
+ getVradiSession().setUser(user);
+ result = SUCCESS;
+ }
+ }
+ }
+ } catch (Exception e) {
+ addActionError(getText(n_("vradi.error.internal")));
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+}
\ No newline at end of file
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LogoutAction.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LogoutAction.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/LogoutAction.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,11 @@
+package org.chorem.vradi.actions;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: letellier
+ * Date: 19/05/11
+ * Time: 12:05
+ * To change this template use File | Settings | File Templates.
+ */
+public class LogoutAction {
+}
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/RegisterAction.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,160 @@
+package org.chorem.vradi.actions;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.interceptor.ServletRequestAware;
+import org.chorem.vradi.entities.VradiUser;
+import org.chorem.vradi.entities.VradiUserImpl;
+import org.chorem.vradi.services.managers.MailingManager;
+import org.nuiton.util.StringUtil;
+import org.nuiton.wikitty.search.Criteria;
+import org.nuiton.wikitty.WikittyProxy;
+import org.nuiton.wikitty.search.Search;
+
+import static org.nuiton.i18n.I18n.n_;
+
+/**
+ * Enregistre un nouvel utilisateur
+ *
+ * @author poussin
+ */
+public class RegisterAction extends VradiBaseAction implements ServletRequestAware {
+ private static final long serialVersionUID = 2204772861770399542L;
+ protected String email;
+ protected String password;
+ protected String repeatPassword;
+ protected HttpServletRequest request;
+
+ /**
+ * @return the email
+ */
+ public String getEmail() {
+ return email;
+ }
+
+ /**
+ * @param email the email to set
+ */
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ /**
+ * @return the password
+ */
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ * @param password the password to set
+ */
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ /**
+ * @return the repeatPassword
+ */
+ public String getRepeatPassword() {
+ return repeatPassword;
+ }
+
+ /**
+ * @param repeatPassword the repeatPassword to set
+ */
+ public void setRepeatPassword(String repeatPassword) {
+ this.repeatPassword = repeatPassword;
+ }
+
+ @Override
+ public void setServletRequest(HttpServletRequest request) {
+ this.request = request;
+ }
+
+ /**
+ *
+ * @param passwordMD5 the user password hashed in md5
+ * @return false if the email address isn't already registered, true
+ * otherwise
+ */
+ protected boolean alreadyRegistered(String passwordMD5) {
+ boolean result = true;
+
+ if (email != null && passwordMD5 != null) {
+ if (!email.isEmpty() && !passwordMD5.equals(StringUtil.encodeMD5(""))) {
+ WikittyProxy proxy = getProxy();
+ Criteria criteria = Search.query().eq(VradiUser.FQ_FIELD_WIKITTYUSER_LOGIN, email).criteria(); //Retrieves user by user name (email)
+
+ //If the user doesn't already exist
+ if (proxy.findByCriteria(VradiUser.class, criteria) == null) {
+ result = false;
+ } else { //The email address is already used by someone
+ addFieldError("email", getText(n_("vradi.register.emailAldyUsed")));
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Registers the new user and sends an email to confirm registration
+ */
+ public String execute() {
+ String result = INPUT;
+
+ try {
+ if (email != null) {
+ email = email.trim();
+ if (password != null) {
+ if (!password.equals(repeatPassword)) {
+ addActionError(getText(n_("vradi.register.pwdDontMatch")));
+ } else {
+ String md5 = StringUtil.encodeMD5(password);
+
+ //If the email address isn't already used
+ if (!alreadyRegistered(md5)) {
+ WikittyProxy proxy = getProxy();
+ VradiUserImpl newUser = new VradiUserImpl();
+ newUser.setPassword(md5);
+ newUser.setLogin(email);
+ VradiUser login = proxy.store(newUser); //Stores the new user
+
+ //If there was an error when storing the user
+ if (login == null) {
+ addFieldError("email", getText(n_("vradi.register.invalidLogin")));
+ } else {
+ getVradiSession().setUser(login);
+
+ try {
+ String mailContent;
+
+ mailContent = getText(n_("vradi.register.mailHi")) + ",\n\n" + getText(n_("vradi.register.mailPwd")) + ": " + password + "\n\n" + getText(n_("bow.register.mailEmail")) + ": " + email + "\n\n";
+ MailingManager.postMail(getConfig(), email, getText(n_("vradi.register.mailSubject")), false, mailContent);
+ } catch (AddressException e) {
+ //If the email address is invalid
+ String message = getText("vradi.mail.badFormat");
+
+ addActionError(n_(message));
+ log.error(message + " (email:" + email + ")", e);
+ } catch (MessagingException e) {
+ String message = getText("vradi.mail.sendError");
+
+ addActionError(n_(message));
+ log.error(message + "(" + e.getMessage() + ")", e);
+ }
+ result = SUCCESS;
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ addActionError(getText(n_("vradi.error.internal")));
+ log.error(e.getMessage(), e);
+ }
+ return result;
+ }
+}
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/actions/VradiBaseAction.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,124 @@
+package org.chorem.vradi.actions;
+
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import java.util.List;
+import java.util.Map;
+import org.apache.struts2.interceptor.SessionAware;
+import org.chorem.vradi.VradiSession;
+import org.nuiton.util.ApplicationConfig;
+import org.nuiton.wikitty.WikittyProxy;
+
+/**
+ * TODO sletellier 20110519 : move this method to nuiton utils web
+ *
+ * Base class which must be extended by every action
+ * Overrides the Struts2 methods to render text in order to explicitly show
+ * the missing i18n translations
+ * Allows access to the session and the proxy
+ */
+public class VradiBaseAction extends ActionSupport implements SessionAware {
+
+ private static final long serialVersionUID = 1L;
+
+ protected static final Log log = LogFactory.getLog(VradiBaseAction.class);
+
+ public static final String UNTRANSLATED_MARKER = "???";
+
+ protected Map<String, Object> session;
+
+ public VradiSession getVradiSession() {
+ VradiSession result = VradiSession.getVradiSession(session);
+ return result;
+ }
+
+ public WikittyProxy getProxy() {
+ WikittyProxy result = getVradiSession().getProxy();
+ return result;
+ }
+
+ public ApplicationConfig getConfig() {
+ return getVradiSession().getConfig();
+ }
+
+ @Override
+ public void setSession(Map<String, Object> session) {
+ this.session = session;
+ }
+
+ @Override
+ public String getText(String aTextName) {
+ String value = super.getText(aTextName);
+ return getSafeText(aTextName, value);
+ }
+
+ @Override
+ public String getText(String aTextName, String defaultValue) {
+ String value = super.getText(aTextName, defaultValue);
+ return getSafeText(aTextName, value);
+ }
+
+ @Override
+ public String getText(String aTextName, String defaultValue, String obj) {
+ String value = super.getText(aTextName, defaultValue, obj);
+ return getSafeText(aTextName, value);
+ }
+
+ @Override
+ public String getText(String aTextName, List<?> args) {
+ String value = super.getText(aTextName, args);
+ return getSafeText(aTextName, value);
+ }
+
+ @Override
+ public String getText(String key, String[] args) {
+ String value = super.getText(key, args);
+ return getSafeText(key, value);
+ }
+
+ @Override
+ public String getText(String aTextName, String defaultValue, List<?> args) {
+ String value = super.getText(aTextName, defaultValue, args);
+ return getSafeText(aTextName, value);
+ }
+
+ @Override
+ public String getText(String key, String defaultValue, String[] args) {
+ String value = super.getText(key, defaultValue, args);
+ return getSafeText(key, value);
+ }
+
+ @Override
+ public String getText(String key, String defaultValue, List<?> args,
+ ValueStack stack) {
+ String value = super.getText(key, defaultValue, args, stack);
+ return getSafeText(key, value);
+ }
+
+ @Override
+ public String getText(String key, String defaultValue, String[] args,
+ ValueStack stack) {
+ String value = super.getText(key, defaultValue, args, stack);
+ return getSafeText(key, value);
+ }
+
+ /**
+ * Surrounds the non translated keys with a marker to make them visible
+ *
+ * @param key i18n key
+ * @param value text to check
+ * @return translated text
+ */
+ protected String getSafeText(String key, String value) {
+ if (StringUtils.isEmpty(value)) {
+ if (log.isWarnEnabled()) {
+ log.warn("Key [" + key + "] is not translated");
+ }
+ return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER;
+ }
+ return value;
+ }
+}
\ No newline at end of file
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LoginInterceptor.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,46 @@
+package org.chorem.vradi.interceptors;
+
+import java.util.Map;
+
+import org.apache.struts2.ServletActionContext;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import org.chorem.vradi.VradiSession;
+import org.chorem.vradi.entities.VradiUser;
+
+/**
+ * Interceptor used to loginRedirect a non-logged user if he tries to access a page
+ * where logging is mandatory
+ */
+public class LoginInterceptor extends AbstractInterceptor {
+ private static final long serialVersionUID = -7520186185205372272L;
+
+ protected String loginRedirect;
+
+ /**
+ * @param loginRedirect the loginRedirect to set
+ */
+ public void setLoginRedirect(String loginRedirect) {
+ this.loginRedirect = loginRedirect;
+ }
+
+ @Override
+ public String intercept(ActionInvocation invocation) throws Exception {
+ Map<String, Object> session = ActionContext.getContext().getSession();
+
+ VradiSession vradiSession = VradiSession.getVradiSession(session);
+ VradiUser user = vradiSession.getUser();
+ String result = null;
+
+ //If the user isn't logged in
+ if (user == null) {
+ ServletActionContext.getResponse().sendRedirect(loginRedirect);
+ } else {
+ result = invocation.invoke();
+ }
+
+ return result;
+ }
+}
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LogoutInterceptor.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LogoutInterceptor.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/interceptors/LogoutInterceptor.java 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,23 @@
+package org.chorem.vradi.interceptors;
+
+import java.util.Map;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+import org.chorem.vradi.VradiSession;
+
+/**
+ * Interceptor used to remove all trace of user in session. Used for login page
+ */
+public class LogoutInterceptor extends AbstractInterceptor {
+ private static final long serialVersionUID = -7520186185205372272L;
+
+ @Override
+ public String intercept(ActionInvocation invocation) throws Exception {
+ Map<String, Object> session = ActionContext.getContext().getSession();
+ VradiSession.getVradiSession(session).invalidate();
+ String result = invocation.invoke();
+ return result;
+ }
+}
Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties
===================================================================
--- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-20 14:08:45 UTC (rev 32)
@@ -3,4 +3,22 @@
vradi.config.last.version.description=Last started version
vradi.config.remote.endpoint.description=Url of vradi service
vradi.config.ui.locale=Vradi web locale
-vradi.config.version.description=Vradi web version
\ No newline at end of file
+vradi.config.version.description=Vradi web version
+vradi.register.emailAldyUsed=This address mail is already used
+vradi.register.invalidLogin=An error occured during login
+vradi.register.pwdDontMatch=Both passwords doesn't matches
+vradi.error.internal=Error occured, thaks contact an admin
+vradi.forgotPassword.emailDoesntExist=This email address doesn't exist
+vradi.forgotpwd.submit=Send
+vradi.forgotpwd.title=You are forgotten your password ?
+vradi.login.email=Email
+vradi.login.password=Password
+vradi.login.repeatPassword=Confirm
+vradi.login.submit=Please retape your password
+vradi.login.title=Connection
+vradi.register.mailEmail=Your email
+vradi.register.mailHi=Hello
+vradi.register.mailPwd=Your password
+vradi.register.mailSubject=[Vradi] Your user informations
+vradi.register.submit=Login
+vradi.register.title=Login
\ No newline at end of file
Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties
===================================================================
--- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-20 14:08:45 UTC (rev 32)
@@ -1,3 +1,4 @@
+bow.register.mailEmail=
vradi.config.configFileName.description=Fichier de configuration de Vradi web
vradi.config.database.version.description=Version de la base de donnée
vradi.config.last.version.description=Dernière version de Vradi web lancée
@@ -4,3 +5,21 @@
vradi.config.remote.endpoint.description=Url de l'addresse de Vradi service
vradi.config.ui.locale=Locale de l'instance de Vradi web
vradi.config.version.description=Version de Vradi web
+vradi.error.internal=Une erreur interne est survenue, merci de contacter un administrateur si cette erreur persiste
+vradi.forgotPassword.emailDoesntExist=Cette adresse email n''existe pas
+vradi.forgotpwd.submit=Envoyer
+vradi.forgotpwd.title=Vous avez oublié votre mot de passe ?
+vradi.login.email=Email
+vradi.login.password=Mot de passe
+vradi.login.repeatPassword=Confiramtion
+vradi.login.submit=Veuillez retaper votre mot de passe
+vradi.login.title=Connection
+vradi.register.emailAldyUsed=Cette adresse email est déjà utilisée
+vradi.register.invalidLogin=Une erreur s''est produite pendant l''enregistrement de vos informations, merci d''essayer à nouveau
+vradi.register.mailEmail=Votre email
+vradi.register.mailHi=Bonjour
+vradi.register.mailPwd=Votre mot de passe
+vradi.register.mailSubject=[Vradi] Vos informations utilisateurs
+vradi.register.pwdDontMatch=Les mots de passe sont différents
+vradi.register.submit=S''enregistrer
+vradi.register.title=S''enregistrer
Added: trunk/vradi-web/src/main/resources/struts.properties
===================================================================
--- trunk/vradi-web/src/main/resources/struts.properties (rev 0)
+++ trunk/vradi-web/src/main/resources/struts.properties 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,45 @@
+struts.locale=fr_FR
+struts.i18n.encoding=UTF-8
+
+# struts.multipart.parser=cos
+# struts.multipart.parser=pell
+struts.multipart.parser=jakarta
+# uses javax.servlet.context.tempdir by default
+struts.multipart.saveDir=
+struts.multipart.maxSize=2097152
+
+# struts.custom.properties=application,com/webwork/extension/custom
+
+#struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
+
+struts.action.extension=action
+
+struts.serve.static=true
+
+struts.serve.static.browserCache=true
+
+struts.tag.altSyntax=true
+
+struts.devMode=true
+
+struts.i18n.reload=true
+
+struts.ui.theme=xhtml
+struts.ui.templateDir=template
+#sets the default template type. Either ftl, vm, or jsp
+struts.ui.templateSuffix=ftl
+
+struts.configuration.xml.reload=false
+
+struts.url.http.port = 80
+struts.url.https.port = 443
+
+struts.custom.i18n.resources=vradi-web-i18n
+
+struts.dispatcher.parametersWorkaround = false
+
+#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager
+
+struts.freemarker.wrapper.altMap=true
+
+struts.xslt.nocache=false
Modified: trunk/vradi-web/src/main/resources/struts.xml
===================================================================
--- trunk/vradi-web/src/main/resources/struts.xml 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-20 14:08:45 UTC (rev 32)
@@ -1,28 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- #%L
- bow
- $Id: struts.xml 276 2011-04-29 21:02:55Z bpoussin $
- $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/resources/struts.xml $
- %%
- 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%
- -->
-
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd">
@@ -38,10 +15,7 @@
<package name="publicArea" extends="struts-default">
<interceptors>
<interceptor-stack name="publicAreaStack">
- <interceptor-ref name="defaultStack">
- <param name="store.operationMode">AUTOMATIC</param>
- <param name="fileUpload.allowedExtensions">.html</param>
- </interceptor-ref>
+ <interceptor-ref name="defaultStack"/>
</interceptor-stack>
</interceptors>
<default-interceptor-ref name="publicAreaStack"/>
@@ -51,50 +25,58 @@
| Definition d'un package pour l'espace des page de login
| - ajout de l'intercepteur qui verifie que la personne est bien identifiee
+-->
- <!--<package name="loginArea" extends="publicArea">-->
- <!--<interceptors>-->
- <!--<interceptor name="logout" class="org.chorem.bow.interceptor.LogoutInterceptor"/>-->
- <!--<interceptor-stack name="loginAreaStack">-->
- <!--<interceptor-ref name="logout"/>-->
- <!--<interceptor-ref name="publicAreaStack"/>-->
- <!--</interceptor-stack>-->
- <!--</interceptors>-->
- <!--<default-interceptor-ref name="loginAreaStack"/>-->
- <!--</package>-->
+ <package name="loginArea" extends="publicArea">
+ <interceptors>
+ <interceptor name="logout" class="org.chorem.vradi.interceptors.LogoutInterceptor"/>
+ <interceptor-stack name="loginAreaStack">
+ <interceptor-ref name="logout"/>
+ <interceptor-ref name="publicAreaStack"/>
+ </interceptor-stack>
+ </interceptors>
+ <default-interceptor-ref name="loginAreaStack"/>
+ </package>
<!--
| Definition d'un package pour l'espace prive
| - ajout de l'intercepteur qui verifie que la personne est bien identifiee
+-->
- <!--<package name="restrictedArea" extends="publicArea">-->
- <!--<interceptors>-->
- <!--<interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor">-->
- <!--<param name="redirect">login_input.action</param>-->
- <!--</interceptor>-->
- <!--<interceptor-stack name="restrictedAreaStack">-->
- <!--<interceptor-ref name="login"/>-->
- <!--<interceptor-ref name="publicAreaStack"/>-->
- <!--</interceptor-stack>-->
- <!--</interceptors>-->
- <!--<default-interceptor-ref name="restrictedAreaStack"/>-->
- <!--</package>-->
+ <package name="restrictedArea" extends="publicArea">
+ <interceptors>
+ <interceptor name="login" class="org.chorem.vradi.interceptors.LoginInterceptor">
+ <param name="loginRedirect">login.action</param>
+ </interceptor>
+ <interceptor-stack name="restrictedAreaStack">
+ <interceptor-ref name="login"/>
+ <interceptor-ref name="publicAreaStack"/>
+ </interceptor-stack>
+ </interceptors>
+ <default-interceptor-ref name="restrictedAreaStack"/>
+ </package>
- <!--<package name="login" extends="loginArea">-->
- <!--<action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction">-->
- <!--<result name="input">/jsp/register.jsp</result>-->
- <!--<result type="redirectAction">home</result>-->
- <!--</action>-->
- <!--<action name="forgotPassword_*" method="{1}" class="org.chorem.bow.action.ForgotPasswordAction">-->
- <!--<result name="input">/jsp/forgotPassword.jsp</result>-->
- <!--<result type="redirectAction">login_input</result>-->
- <!--</action>-->
- <!--<action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction">-->
- <!--<result name="input">/jsp/login.jsp</result>-->
- <!--<result name="login" type="redirectAction">home</result>-->
- <!--<result type="redirectAction">home</result>-->
- <!--</action>-->
- <!--<action name="logout" class="org.chorem.bow.action.LogoutAction">-->
- <!--<result type="redirectAction">login_input</result>-->
- <!--</action>-->
- <!--</package>-->
+ <package name="login" extends="loginArea">
+ <action name="register_*" method="{1}" class="org.chorem.vradi.actions.RegisterAction">
+ <result name="input">/jsp/register.jsp</result>
+ <result type="redirectAction">home</result>
+ </action>
+ <action name="forgotPassword_*" method="{1}" class="org.chorem.vradi.actions.ForgotPasswordAction">
+ <result name="input">/jsp/forgotPassword.jsp</result>
+ <result type="redirectAction">login_input</result>
+ </action>
+ <action name="login_*" method="{1}" class="org.chorem.vradi.actions.LoginAction">
+ <result name="input">/jsp/login.jsp</result>
+ <result name="login" type="redirectAction">home</result>
+ <result type="redirectAction">home</result>
+ </action>
+ <action name="logout" class="org.chorem.vradi.actions.LogoutAction">
+ <result type="redirectAction">login_input</result>
+ </action>
+ </package>
+
+ <package name="misc" extends="restrictedArea">
+ <action name="home" class="org.chorem.vradi.actions.HomeAction">
+ <result>/jsp/home.jsp</result>
+ <result name="input" type="redirectAction">home</result>
+ </action>
+ </package>
+
</struts>
Modified: trunk/vradi-web/src/main/resources/vradi-web.properties
===================================================================
--- trunk/vradi-web/src/main/resources/vradi-web.properties 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/src/main/resources/vradi-web.properties 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,23 @@
+application.name=${project.name}
+application.version=${project.version}
+application.site.url=http://maven-site.chorem.org/vradi/index.html
+#licence.name=${project.licenses[0].license.name}
+#licence.url=${project.licenses.0.url}
+application.organisation.name=${project.organization.name}
+application.organisation.url=${project.organization.url}
+
+# Wikitty
+wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceHessianClient,\
+org.nuiton.wikitty.services.WikittyServiceNotifier,\
+org.nuiton.wikitty.services.WikittyServiceCached,\
+org.nuiton.wikitty.services.WikittyServiceSecurity
+wikitty.service.cache.allwaysRestoreCopies=false
+wikitty.service.event.propagate=false
+wikitty.service.event.listen=true
+wikitty.service.event.propagate.transporter=org.nuiton.wikitty.services.XMPPNotifierTransporter
+wikitty.WikittyServiceCached.components=org.nuiton.wikitty.services.WikittyCacheJCS
+wikitty.service.server.url=${vradi.remote.endpoint}/wikittyservice
+wikitty.service.cache.priority.extensions=Thesaurus, User, Status, XmlStream
+jcs.default=
+jcs.default.cacheattributes.MaxObjects=1000
+jcs.priority.cacheattributes.MaxObjects=10000
Modified: trunk/vradi-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-20 14:08:45 UTC (rev 32)
@@ -31,31 +31,18 @@
<!-- Filters -->
<filter>
- <filter-name>action2-cleanup</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
- </filter>
- <filter>
<filter-name>struts2</filter-name>
<filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
</filter>
<filter-mapping>
- <filter-name>action2-cleanup</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
<filter-name>struts2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<!-- Welcome file lists -->
<welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
</welcome-file-list>
- <jsp-config>
- <jsp-property-group>
- <url-pattern>*.jsp</url-pattern>
- </jsp-property-group>
- </jsp-config>
</web-app>
Copied: trunk/vradi-web/src/main/webapp/index.html (from rev 31, trunk/vradi-web/src/main/webapp/index.jsp)
===================================================================
--- trunk/vradi-web/src/main/webapp/index.html (rev 0)
+++ trunk/vradi-web/src/main/webapp/index.html 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="refresh" content="0;URL=home.action"/>
+ <title>Vradi web</title>
+ </head>
+
+ <body onload="">
+
+ </body>
+</html>
\ No newline at end of file
Deleted: trunk/vradi-web/src/main/webapp/index.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/index.jsp 2011-05-18 15:56:32 UTC (rev 31)
+++ trunk/vradi-web/src/main/webapp/index.jsp 2011-05-20 14:08:45 UTC (rev 32)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <%--<meta http-equiv="refresh" content="0;URL=home.action?request_locale=fr_FR"/>--%>
- <title>Vradi web</title>
- </head>
-
- <body onload="">
-
- </body>
-</html>
\ No newline at end of file
Added: trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp (rev 0)
+++ trunk/vradi-web/src/main/webapp/jsp/forgotPassword.jsp 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,24 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="s" uri="/struts-tags" %>
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ xmlns:jsp="http://java.sun.com/JSP/Page">
+ <head>
+ <title><s:text name="vradi.forgotpwd.title" /></title>
+ <s:head />
+ </head>
+ <body>
+ <div id="content">
+ <div id="formFrame fond">
+ <h1><s:text name="vradi.forgotpwd.title" /></h1>
+ <s:form action="forgotPassword">
+ <p>
+ <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" />
+ <s:submit key="vradi.forgotpwd.submit" name="submit" />
+ </p>
+ </s:form>
+ <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a>
+ </div>
+ </div>
+ </body>
+</html>
Added: trunk/vradi-web/src/main/webapp/jsp/home.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/jsp/home.jsp (rev 0)
+++ trunk/vradi-web/src/main/webapp/jsp/home.jsp 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,5 @@
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<html>
+<head><title>Simple jsp page</title></head>
+<body>Place your content here</body>
+</html>
\ No newline at end of file
Added: trunk/vradi-web/src/main/webapp/jsp/login.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/jsp/login.jsp (rev 0)
+++ trunk/vradi-web/src/main/webapp/jsp/login.jsp 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,27 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@taglib prefix="s" uri="/struts-tags"%>
+
+<html xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ xmlns:jsp="http://java.sun.com/JSP/Page">
+ <head>
+ <title><s:text name="vradi.login.title" /></title>
+ <s:head />
+ </head>
+ <body>
+ <div id="content">
+ <div id="formFrame" class="fond">
+ <h1><s:text name="vradi.login.title" /></h1>
+ <br/>
+ <br/>
+ <s:actionerror />
+ <s:form action="login">
+ <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" />
+ <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" />
+ <s:submit key="vradi.login.submit" name="submit" />
+ </s:form>
+ <s:a action="register_input" id="registerLink"><s:text name="vradi.register.title" /></s:a><br />
+ <s:a action="forgotPassword_input" id="forgotPwd"><s:text name="vradi.forgotpwd.title" /></s:a>
+ </div>
+ </div>
+ </body>
+</html>
Added: trunk/vradi-web/src/main/webapp/jsp/register.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/jsp/register.jsp (rev 0)
+++ trunk/vradi-web/src/main/webapp/jsp/register.jsp 2011-05-20 14:08:45 UTC (rev 32)
@@ -0,0 +1,27 @@
+<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@taglib prefix="s" uri="/struts-tags" %>
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ xmlns:jsp="http://java.sun.com/JSP/Page">
+ <head>
+ <title><s:text name="vradi.register.title" /></title>
+ <s:head />
+ </head>
+ <body>
+ <div id="content">
+ <div id="formFrame" class="fond">
+ <h1><s:text name="vradi.register.title" /></h1>
+ <s:form action="register">
+ <s:actionerror />
+ <p>
+ <s:textfield key="vradi.login.email" name="email" labelposition="top" labelSeparator=" :" />
+ <s:password key="vradi.login.password" name="password" labelposition="top" labelSeparator=" :" />
+ <s:password key="vradi.login.repeatPassword" name="repeatPassword" labelposition="top" labelSeparator=" :" />
+ <s:submit key="vradi.register.submit" name="submit" />
+ </p>
+ </s:form>
+ <s:a action="login_input" id="loginLink"><s:text name="vradi.login.title" /></s:a>
+ </div>
+ </div>
+ </body>
+</html>
1
0
r31 - in trunk: . vradi-swing/src/main/java/org/chorem/vradi/services vradi-web vradi-web/src/main/java vradi-web/src/main/java/org vradi-web/src/main/java/org/chorem vradi-web/src/main/java/org/chorem/vradi vradi-web/src/main/resources/i18n vradi-web/src/main/webapp vradi-web/src/main/webapp/WEB-INF
by sletellier＠users.chorem.org May 18, 2011
by sletellier＠users.chorem.org May 18, 2011
May 18, 2011
Author: sletellier
Date: 2011-05-18 17:56:32 +0200 (Wed, 18 May 2011)
New Revision: 31
Url: http://chorem.org/repositories/revision/vradi/31
Log:
#375 Initialisation du module Vradi-web
Added:
trunk/vradi-web/src/main/java/org/
trunk/vradi-web/src/main/java/org/chorem/
trunk/vradi-web/src/main/java/org/chorem/vradi/
trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java
trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java
trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties
Modified:
trunk/pom.xml
trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java
trunk/vradi-web/pom.xml
trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties
trunk/vradi-web/src/main/webapp/WEB-INF/web.xml
trunk/vradi-web/src/main/webapp/index.jsp
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-18 15:00:05 UTC (rev 30)
+++ trunk/pom.xml 2011-05-18 15:56:32 UTC (rev 31)
@@ -17,8 +17,8 @@
<module>vradi-entities</module>
<module>vradi-services</module>
<module>vradi-services-web</module>
+ <module>vradi-web</module>
<module>vradi-swing</module>
- <module>vradi-web</module>
</modules>
<name>Vradi</name>
Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java
===================================================================
--- trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java 2011-05-18 15:00:05 UTC (rev 30)
+++ trunk/vradi-swing/src/main/java/org/chorem/vradi/services/VradiService.java 2011-05-18 15:56:32 UTC (rev 31)
@@ -26,7 +26,6 @@
import com.caucho.hessian.client.HessianProxyFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.chorem.vradi.VradiConfig;
import org.chorem.vradi.VradiConfigHelper;
import org.nuiton.util.ApplicationConfig;
import org.nuiton.wikitty.WikittyProxy;
Modified: trunk/vradi-web/pom.xml
===================================================================
--- trunk/vradi-web/pom.xml 2011-05-18 15:00:05 UTC (rev 30)
+++ trunk/vradi-web/pom.xml 2011-05-18 15:56:32 UTC (rev 31)
@@ -15,6 +15,7 @@
<version>0.7-SNAPSHOT</version>
</parent>
+ <groupId>org.chorem.vradi</groupId>
<artifactId>vradi-web</artifactId>
<name>Vradi :: Web</name>
@@ -34,6 +35,25 @@
<dependencies>
+ <!-- project dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>vradi-entities</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>vradi-services</artifactId>
+ <version>${project.version}</version>
+ <!-- WARNING! check it works chemit 2010-10-28 : it comes from wikitty-solr-impl but conflits with stax -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- compile dependencies -->
<dependency>
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiSession.java 2011-05-18 15:56:32 UTC (rev 31)
@@ -0,0 +1,74 @@
+package org.chorem.vradi;
+
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.util.ApplicationConfig;
+import org.nuiton.wikitty.WikittyProxy;
+import org.nuiton.wikitty.WikittyService;
+import org.nuiton.wikitty.WikittyServiceFactory;
+import org.nuiton.wikitty.entities.WikittyUser;
+
+/**
+ * Classe utilisee pour stocker les objets utils en session utilisateur
+ *
+ * @author poussin
+ * @version $Revision: 285 $
+ *
+ * Last update: $Date: 2011-05-16 15:21:52 +0200 (lun. 16 mai 2011) $
+ * by : $Author: sletellier $
+ */
+public class VradiSession {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ static private Log log = LogFactory.getLog(VradiSession.class);
+
+ static final private String VRADI_SESSION_KEY = VradiSession.class.getSimpleName();
+
+ protected WikittyProxy proxy;
+ private WikittyUser user;
+
+ public VradiSession() {
+ ApplicationConfig config = VradiWebConfig.getConfig();
+ WikittyService ws = WikittyServiceFactory.buildWikittyService(config);
+ proxy = new WikittyProxy(config, ws);
+ }
+
+ static public void invalidate(Map<String, Object> session) {
+ session.remove(VRADI_SESSION_KEY);
+ }
+
+ static public VradiSession getVradiSession(HttpServletRequest request) {
+ HttpSession session = request.getSession();
+ VradiSession result = getVradiSession(session);
+ return result;
+ }
+
+ static public VradiSession getVradiSession(HttpSession httpSession) {
+ VradiSession result = (VradiSession) httpSession.getAttribute(VRADI_SESSION_KEY);
+ if (result == null) {
+ result = new VradiSession();
+ httpSession.setAttribute(VRADI_SESSION_KEY, result);
+ }
+ return result;
+ }
+
+ static public VradiSession getVradiSession(Map<String, Object> session) {
+ VradiSession result = (VradiSession)session.get(VRADI_SESSION_KEY);
+ if (result == null) {
+ result = new VradiSession();
+ session.put(VRADI_SESSION_KEY, result);
+ }
+ return result;
+ }
+
+ public WikittyProxy getProxy() {
+ return proxy;
+ }
+
+ public WikittyUser getUser() {
+ return user;
+ }
+}
Added: trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java
===================================================================
--- trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java (rev 0)
+++ trunk/vradi-web/src/main/java/org/chorem/vradi/VradiWebConfig.java 2011-05-18 15:56:32 UTC (rev 31)
@@ -0,0 +1,179 @@
+package org.chorem.vradi;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.util.ApplicationConfig;
+import org.nuiton.util.ArgumentsParserException;
+import org.nuiton.util.Version;
+import org.nuiton.util.VersionUtil;
+import org.nuiton.wikitty.WikittyConfigOption;
+
+import java.util.Locale;
+
+import static org.nuiton.i18n.I18n._;
+
+/**
+ * Vradi Web configuration.
+ *
+ * @author sletellier
+ * @version $Revision: 21 $
+ * <p/>
+ * Last update : $Date: 2011-05-09 18:43:58 +0200 (lun. 09 mai 2011) $
+ * By : $Author: sletellier $
+ */
+public class VradiWebConfig {
+
+ /** to use log facility, just put in your code: log.info(\"...\"); */
+ static private Log log = LogFactory.getLog(VradiWebConfig.class);
+
+ private static ApplicationConfig config;
+
+ private VradiWebConfig() {
+ }
+
+ public static ApplicationConfig getConfig(String... args) {
+
+ if (config == null) {
+
+ // Creating instance of ApplicationConfig
+ config = new ApplicationConfig(VradiWebOption.CONFIG_FILE.getDefaultValue());
+
+ // Load service options
+ config.loadDefaultOptions(VradiServiceConfiguration.VradiServiceOption.class);
+
+ // Load wikitty options
+ config.loadDefaultOptions(WikittyConfigOption.class);
+
+ // Load vradi options
+ config.loadDefaultOptions(VradiWebOption.class);
+
+ try {
+ // Parse args
+ config.parse(args);
+
+ // on supprime le stamp de snapshot s'il existe
+ String sVersion = VersionUtil.removeSnapshot(config.getOption("application.version"));
+ Version version = VersionUtil.valueOf(sVersion);
+ config.setDefaultOption(VradiWebOption.VRADI_VERSION.key, version.getVersion());
+
+ // la version de la base est sans classifier (pas de alpha, ou rc,...)
+ Version dbVersion;
+ if (version.hasClassifier()) {
+ dbVersion = VersionUtil.removeClassifier(version);
+ } else {
+ dbVersion = VersionUtil.valueOf(version.toString());
+ }
+
+ config.setDefaultOption(VradiWebOption.VRADI_DATABASE_VERSION.key, dbVersion.getVersion());
+ } catch (ArgumentsParserException eee) {
+ if (log.isErrorEnabled()) {
+ log.error("Can't load vradi configuration", eee);
+ }
+ }
+ }
+ return config;
+ }
+
+ /** Vradi option enum. */
+ public enum VradiWebOption implements ApplicationConfig.OptionDef {
+
+ CONFIG_FILE(
+ ApplicationConfig.CONFIG_FILE_NAME,
+ _("vradi.config.configFileName.description"),
+ "vradi.properties", String.class, true, true),
+
+ VRADI_VERSION(
+ "vradi.version",
+ _("vradi.config.version.description"),
+ null, String.class, true, true),
+
+ VRADI_DATABASE_VERSION(
+ "vradi.database.version",
+ _("vradi.config.database.version.description"),
+ null, String.class, true, true),
+
+ VRADI_LAST_VERSION(
+ "vradi.last.version",
+ _("vradi.config.last.version.description"),
+ null, String.class, true, true),
+
+ // ui config
+ LOCALE(
+ "ui.locale",
+ _("vradi.config.ui.locale"),
+ Locale.FRANCE.toString(),
+ Locale.class, false, false),
+
+ // achitecture client serveur
+ REMOTE_ENDPOINT(
+ "vradi.remote.endpoint",
+ _("vradi.config.remote.endpoint.description"),
+ "", String.class, false, false);
+
+ public String key;
+
+ public String description;
+
+ public String defaultValue;
+
+ public Class<?> type;
+
+ public boolean isTransient;
+
+ public boolean isFinal;
+
+ VradiWebOption(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.isTransient = isTransient;
+ this.isFinal = isFinal;
+ }
+
+ @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;
+ }
+ }
+}
Added: trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties
===================================================================
--- trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties (rev 0)
+++ trunk/vradi-web/src/main/resources/i18n/vradi-web_en_GB.properties 2011-05-18 15:56:32 UTC (rev 31)
@@ -0,0 +1,6 @@
+vradi.config.configFileName.description=Vradi web config files name
+vradi.config.database.version.description=Database version
+vradi.config.last.version.description=Last started version
+vradi.config.remote.endpoint.description=Url of vradi service
+vradi.config.ui.locale=Vradi web locale
+vradi.config.version.description=Vradi web version
\ No newline at end of file
Modified: trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties
===================================================================
--- trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-18 15:00:05 UTC (rev 30)
+++ trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties 2011-05-18 15:56:32 UTC (rev 31)
@@ -0,0 +1,6 @@
+vradi.config.configFileName.description=Fichier de configuration de Vradi web
+vradi.config.database.version.description=Version de la base de donnée
+vradi.config.last.version.description=Dernière version de Vradi web lancée
+vradi.config.remote.endpoint.description=Url de l'addresse de Vradi service
+vradi.config.ui.locale=Locale de l'instance de Vradi web
+vradi.config.version.description=Version de Vradi web
Modified: trunk/vradi-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-18 15:00:05 UTC (rev 30)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-18 15:56:32 UTC (rev 31)
@@ -56,7 +56,6 @@
<jsp-config>
<jsp-property-group>
<url-pattern>*.jsp</url-pattern>
- <trim-directive-whitespaces>true</trim-directive-whitespaces>
</jsp-property-group>
</jsp-config>
</web-app>
Modified: trunk/vradi-web/src/main/webapp/index.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/index.jsp 2011-05-18 15:00:05 UTC (rev 30)
+++ trunk/vradi-web/src/main/webapp/index.jsp 2011-05-18 15:56:32 UTC (rev 31)
@@ -1,5 +1,13 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<html>
-<head><title>Simple jsp page</title></head>
-<body>Place your content here</body>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <%--<meta http-equiv="refresh" content="0;URL=home.action?request_locale=fr_FR"/>--%>
+ <title>Vradi web</title>
+ </head>
+
+ <body onload="">
+
+ </body>
</html>
\ No newline at end of file
1
0
Author: sletellier
Date: 2011-05-18 17:00:05 +0200 (Wed, 18 May 2011)
New Revision: 30
Url: http://chorem.org/repositories/revision/vradi/30
Log:
Remove idea file
Removed:
trunk/vradi-web/vradi-web.iml
Deleted: trunk/vradi-web/vradi-web.iml
===================================================================
--- trunk/vradi-web/vradi-web.iml 2011-05-18 14:47:27 UTC (rev 29)
+++ trunk/vradi-web/vradi-web.iml 2011-05-18 15:00:05 UTC (rev 30)
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <descriptors>
- <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
- </descriptors>
- <webroots>
- <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
- <root url="file://$MODULE_DIR$/src/main/webapp/WEB-INF" relative="WEB-INF" />
- </webroots>
- </configuration>
- </facet>
- <facet type="gwt" name="GWT">
- <configuration>
- <setting name="webFacet" value="Web" />
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/i18n" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.nuiton:nuiton-utils:2.2" level="project" />
- <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: commons-primitives:commons-primitives:1.0" level="project" />
- <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
- <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
- <orderEntry type="library" name="Maven: org.nuiton.i18n:nuiton-i18n:2.4" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.nuiton.wikitty:wikitty-api:3.1.2" level="project" />
- <orderEntry type="library" name="Maven: gnu.cajo:cajo:1.168" level="project" />
- <orderEntry type="library" name="Maven: org.apache.jcs:jcs:1.3" level="project" />
- <orderEntry type="library" name="Maven: concurrent:concurrent:1.0" level="project" />
- <orderEntry type="library" name="Maven: net.iharder:base64:2.3.8" level="project" />
- <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
- <orderEntry type="library" name="Maven: net.sf.opencsv:opencsv:2.1" level="project" />
- <orderEntry type="library" name="Maven: jboss.jbossts:jbossjta:4.9.0.GA" level="project" />
- <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
- <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
- <orderEntry type="library" name="Maven: jivesoftware:smack:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: jivesoftware:smackx:3.1.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.2.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.2.3" level="project" />
- <orderEntry type="library" name="Maven: ognl:ognl:3.0.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: javassist:javassist:3.12.1.GA" level="project" />
- <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
- <orderEntry type="library" name="Maven: asm:asm-commons:3.1" level="project" />
- <orderEntry type="library" name="Maven: asm:asm-tree:3.1" level="project" />
- <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.16" level="project" />
- <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />
- <orderEntry type="library" name="Maven: com.sun:tools:1.5.0" level="project" />
- <orderEntry type="library" name="Maven: javax.mail:mail:1.4.3" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:jsp-api:2.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.16" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.nuiton.wikitty:wikitty-jdbc:3.1.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.nuiton.wikitty:wikitty-solr:3.1.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.solr:solr-core:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.solr:solr-solrj:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-core:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: commons-codec:commons-codec:1.4" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: jline:jline:0.9.94" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:wstx-asl:3.2.7" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: stax:stax-api:1.0.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.solr:solr-noggit:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-analyzers:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-highlighter:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-memory:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-queries:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: jakarta-regexp:jakarta-regexp:1.4" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-misc:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-spatial:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-spellchecker:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.solr:solr-commons-csv:3.1.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.velocity:velocity:1.6.4" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: oro:oro:2.0.8" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: commons-digester:commons-digester:1.8" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: commons-chain:commons-chain:1.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: commons-validator:commons-validator:1.3.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: dom4j:dom4j:1.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: sslext:sslext:1.2-0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.struts:struts-core:1.3.8" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.2" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.struts:struts-taglib:1.3.8" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.struts:struts-tiles:1.3.8" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.6.1" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: com.h2database:h2:1.2.127" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.struts:struts2-config-browser-plugin:2.2.3" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: postgresql:postgresql:8.4-701.jdbc4" level="project" />
- </component>
-</module>
-
1
0
r29 - in trunk: . vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers vradi-web vradi-web/src vradi-web/src/main vradi-web/src/main/i18n vradi-web/src/main/resources vradi-web/src/main/resources/i18n vradi-web/src/main/webapp vradi-web/src/main/webapp/WEB-INF vradi-web/src/test
by sletellier＠users.chorem.org May 18, 2011
by sletellier＠users.chorem.org May 18, 2011
May 18, 2011
Author: sletellier
Date: 2011-05-18 16:47:27 +0200 (Wed, 18 May 2011)
New Revision: 29
Url: http://chorem.org/repositories/revision/vradi/29
Log:
#375 Initialisation du module Vradi-web
Added:
trunk/vradi-web/
trunk/vradi-web/LICENSE.txt
trunk/vradi-web/README.txt
trunk/vradi-web/changelog.txt
trunk/vradi-web/pom.xml
trunk/vradi-web/src/
trunk/vradi-web/src/main/
trunk/vradi-web/src/main/i18n/
trunk/vradi-web/src/main/i18n/jsp.rules
trunk/vradi-web/src/main/java/
trunk/vradi-web/src/main/resources/
trunk/vradi-web/src/main/resources/i18n/
trunk/vradi-web/src/main/resources/i18n/vradi-web_fr_FR.properties
trunk/vradi-web/src/main/resources/log4j.properties
trunk/vradi-web/src/main/resources/struts.xml
trunk/vradi-web/src/main/resources/vradi-web.properties
trunk/vradi-web/src/main/webapp/
trunk/vradi-web/src/main/webapp/WEB-INF/
trunk/vradi-web/src/main/webapp/WEB-INF/web.xml
trunk/vradi-web/src/main/webapp/index.jsp
trunk/vradi-web/src/test/
trunk/vradi-web/src/test/java/
trunk/vradi-web/vradi-web.iml
Modified:
trunk/pom.xml
trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusDataHelper.java
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-17 15:21:57 UTC (rev 28)
+++ trunk/pom.xml 2011-05-18 14:47:27 UTC (rev 29)
@@ -18,6 +18,7 @@
<module>vradi-services</module>
<module>vradi-services-web</module>
<module>vradi-swing</module>
+ <module>vradi-web</module>
</modules>
<name>Vradi</name>
@@ -109,7 +110,7 @@
<!-- libraries version -->
<jaxxVersion>2.4</jaxxVersion>
- <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion>
+ <nuitonUtilsVersion>2.2</nuitonUtilsVersion>
<nuitonI18nVersion>2.4</nuitonI18nVersion>
<nuitonWidgetVersion>1.1.1</nuitonWidgetVersion>
<generatorPluginVersion>2.3.3</generatorPluginVersion>
@@ -117,6 +118,9 @@
<oooVersion>3.2.1</oooVersion>
<javamailVersion>1.4.3</javamailVersion>
<slf4jVersion>1.6.1</slf4jVersion>
+ <struts2Version>2.2.3</struts2Version>
+ <servletApiVersion>2.5</servletApiVersion>
+ <jspApiVersion>2.0</jspApiVersion>
<!-- license header default copyright holder -->
<license.organizationName>Codelutin</license.organizationName>
@@ -204,12 +208,6 @@
</dependency>
<dependency>
- <groupId>org.apache.struts.xwork</groupId>
- <artifactId>xwork-core</artifactId>
- <version>2.2.1.1</version>
- </dependency>
-
- <dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swingx-core</artifactId>
<version>1.6.2-2</version>
@@ -247,26 +245,23 @@
</dependency>
<dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.4c</version>
- </dependency>
-
- <dependency>
<groupId>org.nuiton.wikitty</groupId>
<artifactId>wikitty-api</artifactId>
<version>${wikittyVersion}</version>
</dependency>
+
<dependency>
<groupId>org.nuiton.wikitty</groupId>
<artifactId>wikitty-jdbc</artifactId>
<version>${wikittyVersion}</version>
</dependency>
+
<dependency>
<groupId>org.nuiton.wikitty</groupId>
<artifactId>wikitty-solr</artifactId>
<version>${wikittyVersion}</version>
</dependency>
+
<dependency>
<groupId>org.nuiton.wikitty</groupId>
<artifactId>wikitty-hessian-client</artifactId>
@@ -374,13 +369,6 @@
<!-- Needed in runtime by solr (set provided where needed) -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1</version>
@@ -405,6 +393,45 @@
<version>3.1.0</version>
</dependency>
+ <!-- Vradi Web -->
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>${struts2Version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-config-browser-plugin</artifactId>
+ <version>${struts2Version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts.xwork</groupId>
+ <artifactId>xwork-core</artifactId>
+ <version>${struts2Version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.12.1.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jspApiVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servletApiVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusDataHelper.java
===================================================================
--- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusDataHelper.java 2011-05-17 15:21:57 UTC (rev 28)
+++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/thesaurus/helpers/ThesaurusDataHelper.java 2011-05-18 14:47:27 UTC (rev 29)
@@ -23,21 +23,19 @@
*/
package org.chorem.vradi.ui.thesaurus.helpers;
-import org.apache.commons.lang.xwork.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.vradi.entities.RootThesaurus;
import org.chorem.vradi.entities.Thesaurus;
import org.chorem.vradi.services.VradiException;
import org.chorem.vradi.services.VradiService;
+import org.nuiton.util.StringUtil;
import org.nuiton.wikitty.WikittyProxy;
import org.nuiton.wikitty.search.TreeNodeResult;
-import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Map;
public class ThesaurusDataHelper {
@@ -141,7 +139,7 @@
}
String result;
if (thesaurus.getTags() != null) {
- result = StringUtils.join(thesaurus.getTags(), " ,");
+ result = StringUtil.join(thesaurus.getTags(), " ,", true);
} else {
result = "";
}
Property changes on: trunk/vradi-web
___________________________________________________________________
Added: svn:ignore
+ *.ipr
*.iws
*.iml
target
solr
*.log
*.log.*
nbactions.xml
.settings
PutObjectStoreDirHere
.project
Added: trunk/vradi-web/LICENSE.txt
===================================================================
--- trunk/vradi-web/LICENSE.txt (rev 0)
+++ trunk/vradi-web/LICENSE.txt 2011-05-18 14:47:27 UTC (rev 29)
@@ -0,0 +1,661 @@
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU Affero General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
\ No newline at end of file
Added: trunk/vradi-web/pom.xml
===================================================================
--- trunk/vradi-web/pom.xml (rev 0)
+++ trunk/vradi-web/pom.xml 2011-05-18 14:47:27 UTC (rev 29)
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- ************************************************************* -->
+ <!-- *** POM Relationships *************************************** -->
+ <!-- ************************************************************* -->
+
+ <parent>
+ <artifactId>vradi</artifactId>
+ <groupId>org.chorem</groupId>
+ <version>0.7-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>vradi-web</artifactId>
+
+ <name>Vradi :: Web</name>
+ <description>Vradi Web</description>
+
+ <packaging>war</packaging>
+
+ <properties>
+ <i18n.bundles>fr_FR,en_GB</i18n.bundles>
+ <i18n.silent>true</i18n.silent>
+ <i18n.bundleOutputName>vradi-web-i18n</i18n.bundleOutputName>
+ <i18n.bundleOutputDir>
+ ${basedir}/target/generated-sources/resources
+ </i18n.bundleOutputDir>
+ <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent>
+ </properties>
+
+ <dependencies>
+
+ <!-- compile dependencies -->
+
+ <dependency>
+ <groupId>org.nuiton</groupId>
+ <artifactId>nuiton-utils</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>nuiton-i18n</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton.wikitty</groupId>
+ <artifactId>wikitty-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts.xwork</groupId>
+ <artifactId>xwork-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+
+ <!-- provided dependencies -->
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- runtime dependencies -->
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton.wikitty</groupId>
+ <artifactId>wikitty-jdbc</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.nuiton.wikitty</groupId>
+ <artifactId>wikitty-solr</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-config-browser-plugin</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.nuiton.i18n</groupId>
+ <artifactId>maven-i18n-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scan-java-sources</id>
+ <goals>
+ <goal>parserJava</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>scan-jsp-sources</id>
+ <goals>
+ <goal>parserJsp</goal>
+ </goals>
+ <configuration>
+ <userRulesFiles>
+ <file>${basedir}/src/main/i18n/jsp.rules</file>
+ </userRulesFiles>
+ <namespaces>
+ <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s>
+ <sx>
+ http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
+ </sx>
+ <jsp>http://java.sun.com/JSP/Page</jsp>
+ <decorator>
+ http://www.opensymphony.com/sitemesh/decorator
+ </decorator>
+ </namespaces>
+ </configuration>
+ </execution>
+ <execution>
+ <id>gen-and-make-bundle</id>
+ <goals>
+ <goal>gen</goal>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: trunk/vradi-web/src/main/i18n/jsp.rules
===================================================================
--- trunk/vradi-web/src/main/i18n/jsp.rules (rev 0)
+++ trunk/vradi-web/src/main/i18n/jsp.rules 2011-05-18 14:47:27 UTC (rev 29)
@@ -0,0 +1,9 @@
+# Règles i18n pour les jsp
+
+//s:text/@name
+//s:submit/@key
+//s:textfield/@key
+//s:password/@key
+//s:file/@key
+
+//sx:datetimepicker/@key
Added: trunk/vradi-web/src/main/resources/struts.xml
===================================================================
--- trunk/vradi-web/src/main/resources/struts.xml (rev 0)
+++ trunk/vradi-web/src/main/resources/struts.xml 2011-05-18 14:47:27 UTC (rev 29)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #%L
+ bow
+
+ $Id: struts.xml 276 2011-04-29 21:02:55Z bpoussin $
+ $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/resources/struts.xml $
+ %%
+ 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%
+ -->
+
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd">
+<struts>
+ <constant name="struts.devMode" value="true"/>
+ <constant name="struts.ognl.allowStaticMethodAccess" value="true"/>
+ <constant name="struts.enable.SlashesInActionNames" value="true"/>
+
+ <!--
+ | Definition d'un package pour l'espace public
+ | - surcharge de parametre de certain intercepteur
+ +-->
+ <package name="publicArea" extends="struts-default">
+ <interceptors>
+ <interceptor-stack name="publicAreaStack">
+ <interceptor-ref name="defaultStack">
+ <param name="store.operationMode">AUTOMATIC</param>
+ <param name="fileUpload.allowedExtensions">.html</param>
+ </interceptor-ref>
+ </interceptor-stack>
+ </interceptors>
+ <default-interceptor-ref name="publicAreaStack"/>
+ </package>
+
+ <!--
+ | Definition d'un package pour l'espace des page de login
+ | - ajout de l'intercepteur qui verifie que la personne est bien identifiee
+ +-->
+ <!--<package name="loginArea" extends="publicArea">-->
+ <!--<interceptors>-->
+ <!--<interceptor name="logout" class="org.chorem.bow.interceptor.LogoutInterceptor"/>-->
+ <!--<interceptor-stack name="loginAreaStack">-->
+ <!--<interceptor-ref name="logout"/>-->
+ <!--<interceptor-ref name="publicAreaStack"/>-->
+ <!--</interceptor-stack>-->
+ <!--</interceptors>-->
+ <!--<default-interceptor-ref name="loginAreaStack"/>-->
+ <!--</package>-->
+
+ <!--
+ | Definition d'un package pour l'espace prive
+ | - ajout de l'intercepteur qui verifie que la personne est bien identifiee
+ +-->
+ <!--<package name="restrictedArea" extends="publicArea">-->
+ <!--<interceptors>-->
+ <!--<interceptor name="login" class="org.chorem.bow.interceptor.LoginInterceptor">-->
+ <!--<param name="redirect">login_input.action</param>-->
+ <!--</interceptor>-->
+ <!--<interceptor-stack name="restrictedAreaStack">-->
+ <!--<interceptor-ref name="login"/>-->
+ <!--<interceptor-ref name="publicAreaStack"/>-->
+ <!--</interceptor-stack>-->
+ <!--</interceptors>-->
+ <!--<default-interceptor-ref name="restrictedAreaStack"/>-->
+ <!--</package>-->
+
+ <!--<package name="login" extends="loginArea">-->
+ <!--<action name="register_*" method="{1}" class="org.chorem.bow.action.RegisterAction">-->
+ <!--<result name="input">/jsp/register.jsp</result>-->
+ <!--<result type="redirectAction">home</result>-->
+ <!--</action>-->
+ <!--<action name="forgotPassword_*" method="{1}" class="org.chorem.bow.action.ForgotPasswordAction">-->
+ <!--<result name="input">/jsp/forgotPassword.jsp</result>-->
+ <!--<result type="redirectAction">login_input</result>-->
+ <!--</action>-->
+ <!--<action name="login_*" method="{1}" class="org.chorem.bow.action.LoginAction">-->
+ <!--<result name="input">/jsp/login.jsp</result>-->
+ <!--<result name="login" type="redirectAction">home</result>-->
+ <!--<result type="redirectAction">home</result>-->
+ <!--</action>-->
+ <!--<action name="logout" class="org.chorem.bow.action.LogoutAction">-->
+ <!--<result type="redirectAction">login_input</result>-->
+ <!--</action>-->
+ <!--</package>-->
+</struts>
Added: trunk/vradi-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/vradi-web/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ trunk/vradi-web/src/main/webapp/WEB-INF/web.xml 2011-05-18 14:47:27 UTC (rev 29)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ #%L
+ bow
+
+ $Id: web.xml 280 2011-05-05 09:32:39Z echatellier $
+ $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/webapp/WEB-INF/web.xml $
+ %%
+ Copyright (C) 2010 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ -->
+
+<web-app id="bow" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <display-name>Bow</display-name>
+
+ <!-- Filters -->
+ <filter>
+ <filter-name>action2-cleanup</filter-name>
+ <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
+ </filter>
+ <filter>
+ <filter-name>struts2</filter-name>
+ <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>action2-cleanup</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>struts2</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <!-- Welcome file lists -->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+ <jsp-config>
+ <jsp-property-group>
+ <url-pattern>*.jsp</url-pattern>
+ <trim-directive-whitespaces>true</trim-directive-whitespaces>
+ </jsp-property-group>
+ </jsp-config>
+</web-app>
Added: trunk/vradi-web/src/main/webapp/index.jsp
===================================================================
--- trunk/vradi-web/src/main/webapp/index.jsp (rev 0)
+++ trunk/vradi-web/src/main/webapp/index.jsp 2011-05-18 14:47:27 UTC (rev 29)
@@ -0,0 +1,5 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head><title>Simple jsp page</title></head>
+<body>Place your content here</body>
+</html>
\ No newline at end of file
Added: trunk/vradi-web/vradi-web.iml
===================================================================
--- trunk/vradi-web/vradi-web.iml (rev 0)
+++ trunk/vradi-web/vradi-web.iml 2011-05-18 14:47:27 UTC (rev 29)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="FacetManager">
+ <facet type="web" name="Web">
+ <configuration>
+ <descriptors>
+ <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
+ </descriptors>
+ <webroots>
+ <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+ <root url="file://$MODULE_DIR$/src/main/webapp/WEB-INF" relative="WEB-INF" />
+ </webroots>
+ </configuration>
+ </facet>
+ <facet type="gwt" name="GWT">
+ <configuration>
+ <setting name="webFacet" value="Web" />
+ </configuration>
+ </facet>
+ </component>
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/i18n" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.nuiton:nuiton-utils:2.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-primitives:commons-primitives:1.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
+ <orderEntry type="library" name="Maven: org.nuiton.i18n:nuiton-i18n:2.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:2.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.nuiton.wikitty:wikitty-api:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: gnu.cajo:cajo:1.168" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.jcs:jcs:1.3" level="project" />
+ <orderEntry type="library" name="Maven: concurrent:concurrent:1.0" level="project" />
+ <orderEntry type="library" name="Maven: net.iharder:base64:2.3.8" level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+ <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
+ <orderEntry type="library" name="Maven: net.sf.opencsv:opencsv:2.1" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjta:4.9.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.3.4.O" level="project" />
+ <orderEntry type="library" name="Maven: jivesoftware:smack:3.1.0" level="project" />
+ <orderEntry type="library" name="Maven: jivesoftware:smackx:3.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts:struts2-core:2.2.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.struts.xwork:xwork-core:2.2.3" level="project" />
+ <orderEntry type="library" name="Maven: ognl:ognl:3.0.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: javassist:javassist:3.12.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm-commons:3.1" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm-tree:3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.16" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: com.sun:tools:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.mail:mail:1.4.3" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:jsp-api:2.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.16" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.nuiton.wikitty:wikitty-jdbc:3.1.2" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.nuiton.wikitty:wikitty-solr:3.1.2" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.solr:solr-core:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.solr:solr-solrj:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-core:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: commons-codec:commons-codec:1.4" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.zookeeper:zookeeper:3.3.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: jline:jline:0.9.94" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.8.2" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.woodstox:wstx-asl:3.2.7" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: stax:stax-api:1.0.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.solr:solr-noggit:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-analyzers:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-highlighter:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-memory:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-queries:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: jakarta-regexp:jakarta-regexp:1.4" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-misc:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-spatial:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.lucene:lucene-spellchecker:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.solr:solr-commons-csv:3.1.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.velocity:velocity:1.6.4" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: oro:oro:2.0.8" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: commons-digester:commons-digester:1.8" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: commons-chain:commons-chain:1.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: commons-validator:commons-validator:1.3.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: dom4j:dom4j:1.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: sslext:sslext:1.2-0" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.struts:struts-core:1.3.8" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: antlr:antlr:2.7.2" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.struts:struts-taglib:1.3.8" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.struts:struts-tiles:1.3.8" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.slf4j:slf4j-log4j12:1.6.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: com.h2database:h2:1.2.127" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.struts:struts2-config-browser-plugin:2.2.3" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: postgresql:postgresql:8.4-701.jdbc4" level="project" />
+ </component>
+</module>
+
1
0
r28 - in trunk: . vradi-entities vradi-services vradi-services-web vradi-swing
by sletellier＠users.chorem.org May 17, 2011
by sletellier＠users.chorem.org May 17, 2011
May 17, 2011
Author: sletellier
Date: 2011-05-17 17:21:57 +0200 (Tue, 17 May 2011)
New Revision: 28
Url: http://chorem.org/repositories/revision/vradi/28
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
trunk/pom.xml
trunk/vradi-entities/pom.xml
trunk/vradi-services-web/pom.xml
trunk/vradi-services/pom.xml
trunk/vradi-swing/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-17 15:21:55 UTC (rev 27)
+++ trunk/pom.xml 2011-05-17 15:21:57 UTC (rev 28)
@@ -11,7 +11,7 @@
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
<modules>
<module>vradi-entities</module>
@@ -93,11 +93,11 @@
</developers>
<scm>
- <connection>scm:svn:http://svn.chorem.org/svn/vradi/tags/vradi-0.6</connection>
+ <connection>scm:svn:http://svn.chorem.org/svn/vradi/trunk</connection>
<developerConnection>
- scm:svn:http://svn.chorem.org/svn/vradi/tags/vradi-0.6
+ scm:svn:http://svn.chorem.org/svn/vradi/trunk
</developerConnection>
- <url>http://www.chorem.org/repositories/browse/vradi/tags/vradi-0.6</url>
+ <url>http://www.chorem.org/repositories/browse/vradi/trunk</url>
</scm>
<packaging>pom</packaging>
Modified: trunk/vradi-entities/pom.xml
===================================================================
--- trunk/vradi-entities/pom.xml 2011-05-17 15:21:55 UTC (rev 27)
+++ trunk/vradi-entities/pom.xml 2011-05-17 15:21:57 UTC (rev 28)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<groupId>org.chorem.vradi</groupId>
Modified: trunk/vradi-services/pom.xml
===================================================================
--- trunk/vradi-services/pom.xml 2011-05-17 15:21:55 UTC (rev 27)
+++ trunk/vradi-services/pom.xml 2011-05-17 15:21:57 UTC (rev 28)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<groupId>org.chorem.vradi</groupId>
Modified: trunk/vradi-services-web/pom.xml
===================================================================
--- trunk/vradi-services-web/pom.xml 2011-05-17 15:21:55 UTC (rev 27)
+++ trunk/vradi-services-web/pom.xml 2011-05-17 15:21:57 UTC (rev 28)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<groupId>org.chorem.vradi</groupId>
Modified: trunk/vradi-swing/pom.xml
===================================================================
--- trunk/vradi-swing/pom.xml 2011-05-17 15:21:55 UTC (rev 27)
+++ trunk/vradi-swing/pom.xml 2011-05-17 15:21:57 UTC (rev 28)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6</version>
+ <version>0.7-SNAPSHOT</version>
</parent>
<groupId>org.chorem.vradi</groupId>
1
0
Author: sletellier
Date: 2011-05-17 17:21:55 +0200 (Tue, 17 May 2011)
New Revision: 27
Url: http://chorem.org/repositories/revision/vradi/27
Log:
[maven-release-plugin] copy for tag vradi-0.6
Added:
tags/vradi-0.6/
1
0
r26 - in trunk: . vradi-entities vradi-services vradi-services-web vradi-swing
by sletellier＠users.chorem.org May 17, 2011
by sletellier＠users.chorem.org May 17, 2011
May 17, 2011
Author: sletellier
Date: 2011-05-17 17:21:52 +0200 (Tue, 17 May 2011)
New Revision: 26
Url: http://chorem.org/repositories/revision/vradi/26
Log:
[maven-release-plugin] prepare release vradi-0.6
Modified:
trunk/pom.xml
trunk/vradi-entities/pom.xml
trunk/vradi-services-web/pom.xml
trunk/vradi-services/pom.xml
trunk/vradi-swing/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-17 15:15:25 UTC (rev 25)
+++ trunk/pom.xml 2011-05-17 15:21:52 UTC (rev 26)
@@ -11,7 +11,7 @@
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
<modules>
<module>vradi-entities</module>
@@ -93,11 +93,11 @@
</developers>
<scm>
- <connection>scm:svn:http://svn.chorem.org/svn/vradi/trunk</connection>
+ <connection>scm:svn:http://svn.chorem.org/svn/vradi/tags/vradi-0.6</connection>
<developerConnection>
- scm:svn:http://svn.chorem.org/svn/vradi/trunk
+ scm:svn:http://svn.chorem.org/svn/vradi/tags/vradi-0.6
</developerConnection>
- <url>http://www.chorem.org/repositories/browse/vradi/trunk</url>
+ <url>http://www.chorem.org/repositories/browse/vradi/tags/vradi-0.6</url>
</scm>
<packaging>pom</packaging>
Modified: trunk/vradi-entities/pom.xml
===================================================================
--- trunk/vradi-entities/pom.xml 2011-05-17 15:15:25 UTC (rev 25)
+++ trunk/vradi-entities/pom.xml 2011-05-17 15:21:52 UTC (rev 26)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<groupId>org.chorem.vradi</groupId>
Modified: trunk/vradi-services/pom.xml
===================================================================
--- trunk/vradi-services/pom.xml 2011-05-17 15:15:25 UTC (rev 25)
+++ trunk/vradi-services/pom.xml 2011-05-17 15:21:52 UTC (rev 26)
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<groupId>org.chorem.vradi</groupId>
Modified: trunk/vradi-services-web/pom.xml
===================================================================
--- trunk/vradi-services-web/pom.xml 2011-05-17 15:15:25 UTC (rev 25)
+++ trunk/vradi-services-web/pom.xml 2011-05-17 15:21:52 UTC (rev 26)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<groupId>org.chorem.vradi</groupId>
Modified: trunk/vradi-swing/pom.xml
===================================================================
--- trunk/vradi-swing/pom.xml 2011-05-17 15:15:25 UTC (rev 25)
+++ trunk/vradi-swing/pom.xml 2011-05-17 15:21:52 UTC (rev 26)
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.chorem</groupId>
<artifactId>vradi</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6</version>
</parent>
<groupId>org.chorem.vradi</groupId>
1
0
Author: sletellier
Date: 2011-05-17 17:15:25 +0200 (Tue, 17 May 2011)
New Revision: 25
Url: http://chorem.org/repositories/revision/vradi/25
Log:
Up to wikitty 3.1.2
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-17 13:52:51 UTC (rev 24)
+++ trunk/pom.xml 2011-05-17 15:15:25 UTC (rev 25)
@@ -113,7 +113,7 @@
<nuitonI18nVersion>2.4</nuitonI18nVersion>
<nuitonWidgetVersion>1.1.1</nuitonWidgetVersion>
<generatorPluginVersion>2.3.3</generatorPluginVersion>
- <wikittyVersion>3.1.2-SNAPSHOT</wikittyVersion>
+ <wikittyVersion>3.1.2</wikittyVersion>
<oooVersion>3.2.1</oooVersion>
<javamailVersion>1.4.3</javamailVersion>
<slf4jVersion>1.6.1</slf4jVersion>
1
0
r24 - in trunk: vradi-services/src/main/java/org/chorem/vradi/services/managers vradi-swing/src/main/java/org/chorem/vradi vradi-swing/src/main/java/org/chorem/vradi/ui vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content
by sletellier＠users.chorem.org May 17, 2011
by sletellier＠users.chorem.org May 17, 2011
May 17, 2011
Author: sletellier
Date: 2011-05-17 15:52:51 +0200 (Tue, 17 May 2011)
New Revision: 24
Url: http://chorem.org/repositories/revision/vradi/24
Log:
- Fix cartography
- Remove full screen menu
Modified:
trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/ThesaurusManager.java
trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfigHelper.java
trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/VradiMainUI.jaxx
trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminThesaurusHandler.java
Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/ThesaurusManager.java
===================================================================
--- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/ThesaurusManager.java 2011-05-17 13:52:07 UTC (rev 23)
+++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/ThesaurusManager.java 2011-05-17 13:52:51 UTC (rev 24)
@@ -212,7 +212,7 @@
// return entry.getValue();
// FIXME sletellier 20110427: verify that return same result
- TreeNodeResult<Thesaurus> tree = wikittyProxy.findTreeNode(Thesaurus.class, thesaurusId, 0, true, null);
+ TreeNodeResult<Thesaurus> tree = wikittyProxy.findTreeNode(Thesaurus.class, thesaurusId, 1, true, null);
return tree.getAttCount();
}
Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfigHelper.java
===================================================================
--- trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfigHelper.java 2011-05-17 13:52:07 UTC (rev 23)
+++ trunk/vradi-swing/src/main/java/org/chorem/vradi/VradiConfigHelper.java 2011-05-17 13:52:51 UTC (rev 24)
@@ -108,17 +108,17 @@
return result != null && result;
}
- public static Locale getLocale(ApplicationConfig config) {
- Locale result = config.getOption(Locale.class, VradiConfig.VradiSwingOption.LOCALE.key);
- return result;
- }
-
public static void setFullscreen(ApplicationConfig config, boolean fullscreen) {
boolean oldValue = isFullScreen(config);
config.setOption(VradiConfig.VradiSwingOption.FULL_SCREEN.key, fullscreen + "");
config.saveForUser();
}
+ public static Locale getLocale(ApplicationConfig config) {
+ Locale result = config.getOption(Locale.class, VradiConfig.VradiSwingOption.LOCALE.key);
+ return result;
+ }
+
public static void setLocale(ApplicationConfig config, Locale newLocale) {
config.setOption(VradiConfig.VradiSwingOption.LOCALE.key, newLocale.toString());
config.saveForUser();
Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/VradiMainUI.jaxx
===================================================================
--- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/VradiMainUI.jaxx 2011-05-17 13:52:07 UTC (rev 23)
+++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/VradiMainUI.jaxx 2011-05-17 13:52:51 UTC (rev 24)
@@ -76,12 +76,14 @@
onActionPerformed="getHandler().changeLanguage(this, Locale.UK)"/-->
</JMenu>
- <JSeparator/>
+
+ <!-- sletellier 20110510 : Dont work anymore... -->
+ <!--JSeparator/>
<JMenuItem id='menuFileFullscreen'
onActionPerformed="getHandler().changeScreen(this, true)"/>
<JMenuItem id='menuFileNormalscreen'
onActionPerformed="getHandler().changeScreen(this, false)"/>
- <JSeparator/>
+ <JSeparator/-->
<JMenuItem id='menuFileExit'
onActionPerformed="getHandler().close(mainFrame)"/>
</JMenu>
Modified: trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminThesaurusHandler.java
===================================================================
--- trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminThesaurusHandler.java 2011-05-17 13:52:07 UTC (rev 23)
+++ trunk/vradi-swing/src/main/java/org/chorem/vradi/ui/admin/content/AdminThesaurusHandler.java 2011-05-17 13:52:51 UTC (rev 24)
@@ -77,6 +77,7 @@
/** @author sletellier <letellier(a)codelutin.com> */
public class AdminThesaurusHandler {
+
/** to use log facility, just put in your code: log.info(\"...\"); */
static private Log log = LogFactory.getLog(AdminThesaurusHandler.class);
1
0
r23 - in trunk: . vradi-services/src/main/resources/i18n vradi-swing/src/main/resources/i18n
by sletellier＠users.chorem.org May 17, 2011
by sletellier＠users.chorem.org May 17, 2011
May 17, 2011
Author: sletellier
Date: 2011-05-17 15:52:07 +0200 (Tue, 17 May 2011)
New Revision: 23
Url: http://chorem.org/repositories/revision/vradi/23
Log:
#371 Updates to i18n 2.4
Modified:
trunk/pom.xml
trunk/vradi-services/src/main/resources/i18n/vradi-services_fr_FR.properties
trunk/vradi-swing/src/main/resources/i18n/vradi-swing_fr_FR.properties
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-14 11:46:15 UTC (rev 22)
+++ trunk/pom.xml 2011-05-17 13:52:07 UTC (rev 23)
@@ -110,10 +110,10 @@
<!-- libraries version -->
<jaxxVersion>2.4</jaxxVersion>
<nuitonUtilsVersion>2.1.2</nuitonUtilsVersion>
- <nuitonI18nVersion>2.3.2</nuitonI18nVersion>
+ <nuitonI18nVersion>2.4</nuitonI18nVersion>
<nuitonWidgetVersion>1.1.1</nuitonWidgetVersion>
<generatorPluginVersion>2.3.3</generatorPluginVersion>
- <wikittyVersion>3.1.1</wikittyVersion>
+ <wikittyVersion>3.1.2-SNAPSHOT</wikittyVersion>
<oooVersion>3.2.1</oooVersion>
<javamailVersion>1.4.3</javamailVersion>
<slf4jVersion>1.6.1</slf4jVersion>
Modified: trunk/vradi-services/src/main/resources/i18n/vradi-services_fr_FR.properties
===================================================================
--- trunk/vradi-services/src/main/resources/i18n/vradi-services_fr_FR.properties 2011-05-14 11:46:15 UTC (rev 22)
+++ trunk/vradi-services/src/main/resources/i18n/vradi-services_fr_FR.properties 2011-05-17 13:52:07 UTC (rev 23)
@@ -1,29 +1,29 @@
-Already\ opened\ session\ on\ %tF=Vous disposez d\u00E9j\u00E0 d'une session ouverte (le %1$td/%1$tm/%1$tY)
+Already\ opened\ session\ on\ %tF=Vous disposez déjà d'une session ouverte (le %1$td/%1$tm/%1$tY)
File\ upload\ failed\ \:\ invalid\ response=
File\ upload\ failed\ \:\ server\ response\ %d=
Nothing\ to\ send\ \:\ %s=
-SMTP\ fail\ to\ send\ mail\ \:\\n(%s)=L'envoi de l'email a \u00E9chou\u00E9 \:\n(%s)
+SMTP\ fail\ to\ send\ mail\ \:\\n(%s)=L'envoi de l'email a échoué \:\n(%s)
Unsupported\ query\:\ %s=
Version\ change\ detected\ \:\ %s.\ Reindexing\ data...=
vradi.adminXmlStream.config.interval.days=jours
vradi.adminXmlStream.config.interval.hours=heures
vradi.adminXmlStream.config.interval.minutes=minutes
vradi.autoSend.hour.description=
-vradi.email.status.deleted=Supprim\u00E9e
+vradi.email.status.deleted=Supprimée
vradi.email.status.error=Erreur
-vradi.email.status.received=Re\u00E7u
-vradi.email.status.sent=Envoy\u00E9
-vradi.email.status.toSend=\u00C0 envoyer
-vradi.email.status.waitingReceptionProof=En attente de l'accus\u00E9
-vradi.error.errorImportXmlStream=L'import automatique des flux xml '%1$s' \u00E0 \u00E9chou\u00E9 \:\n\n %2$s
-vradi.error.errorImportXmlStream.subject=L'import automatique des flux xml '%1$s' \u00E0 \u00E9chou\u00E9
+vradi.email.status.received=Reçu
+vradi.email.status.sent=Envoyé
+vradi.email.status.toSend=À envoyer
+vradi.email.status.waitingReceptionProof=En attente de l'accusé
+vradi.error.errorImportXmlStream=L'import automatique des flux xml '%1$s' à échoué \:\n\n %2$s
+vradi.error.errorImportXmlStream.subject=L'import automatique des flux xml '%1$s' à échoué
vradi.error.sending.emailIsBlank=L'email de l'envoi pour l'utilisateur '%1$s' est vide
-vradi.error.sending.failedToSend=L'envoi pour l'utilisateur '%1$s' a \u00E9chou\u00E9 \: %2$s
+vradi.error.sending.failedToSend=L'envoi pour l'utilisateur '%1$s' a échoué \: %2$s
vradi.error.sending.formsEmpty=L'envoi pour l'utilisateur '%1$s' ne contient pas de formulaire
-vradi.error.sending.generation=Erreur lors de la g\u00E9n\u00E9ration du m\u00E9ssage \: %1$s
-vradi.error.sending.noAttachedPDF=Pas de pdf associ\u00E9
-vradi.error.sending.send=Erreur lors de l'envoie du m\u00E9ssage \: %1$s
-vradi.error.session.stopped=L'envoie de la session '%1$s %2$s' a \u00E9t\u00E9 stopp\u00E9 par l'utilisateur
+vradi.error.sending.generation=Erreur lors de la génération du méssage \: %1$s
+vradi.error.sending.noAttachedPDF=Pas de pdf associé
+vradi.error.sending.send=Erreur lors de l'envoie du méssage \: %1$s
+vradi.error.session.stopped=L'envoie de la session '%1$s %2$s' a été stoppé par l'utilisateur
vradi.service.config.application.version.description=
vradi.service.config.cacheusecopies.description=
vradi.service.config.configFileName.description=
@@ -66,18 +66,18 @@
vradi.service.config.wikitty.xmpp.server=
vradi.service.config.wikitty.xmpp.server.description=
vradi.sessionStatus.active=Active
-vradi.sessionStatus.canceled=Annul\u00E9e
+vradi.sessionStatus.canceled=Annulée
vradi.sessionStatus.error=Erreur
-vradi.sessionStatus.sent=Envoy\u00E9e
-vradi.sessionStatus.stopped=Stopp\u00E9e
-vradi.status.nonselectionne.description=Trait\u00E9 et non s\u00E9lectionn\u00E9
-vradi.status.nonselectionne.name=Non s\u00E9lectionn\u00E9
-vradi.status.nontraite.description=Par d\u00E9faut toute nouvelle information
-vradi.status.nontraite.name=Non trait\u00E9
-vradi.status.preselectionne.description=Trait\u00E9 et pr\u00E9s\u00E9lectionn\u00E9
-vradi.status.preselectionne.name=Pr\u00E9selectionn\u00E9
-vradi.status.selectionne.description=Trait\u00E9 et s\u00E9lectionn\u00E9
-vradi.status.selectionne.name=S\u00E9lectionn\u00E9
+vradi.sessionStatus.sent=Envoyée
+vradi.sessionStatus.stopped=Stoppée
+vradi.status.nonselectionne.description=Traité et non sélectionné
+vradi.status.nonselectionne.name=Non sélectionné
+vradi.status.nontraite.description=Par défaut toute nouvelle information
+vradi.status.nontraite.name=Non traité
+vradi.status.preselectionne.description=Traité et présélectionné
+vradi.status.preselectionne.name=Préselectionné
+vradi.status.selectionne.description=Traité et sélectionné
+vradi.status.selectionne.name=Sélectionné
vradi.xmlStreams=
vradi.xmlStreams.config=
vradi.xmlStreams.config.interval=
Modified: trunk/vradi-swing/src/main/resources/i18n/vradi-swing_fr_FR.properties
===================================================================
--- trunk/vradi-swing/src/main/resources/i18n/vradi-swing_fr_FR.properties 2011-05-14 11:46:15 UTC (rev 22)
+++ trunk/vradi-swing/src/main/resources/i18n/vradi-swing_fr_FR.properties 2011-05-17 13:52:07 UTC (rev 23)
@@ -1,11 +1,11 @@
-Can't\ create\ new\ session=Impossible de cr\u00E9er une nouvelle session
-Can't\ create\ new\ session\ for\ reason\ \:\ %s=Impossible de cr\u00E9er une nouvelle session \:\n%s
+Can't\ create\ new\ session=Impossible de créer une nouvelle session
+Can't\ create\ new\ session\ for\ reason\ \:\ %s=Impossible de créer une nouvelle session \:\n%s
Can't\ download\ file=
-Can't\ found\ any\ opened\ mail\ session,\ please\ create\ a\ new\ session\ in\ mail\ management=Aucune session de mail trouv\u00E9e. Merci de cr\u00E9er une nouvelle session dans la gestion des mails.
+Can't\ found\ any\ opened\ mail\ session,\ please\ create\ a\ new\ session\ in\ mail\ management=Aucune session de mail trouvée. Merci de créer une nouvelle session dans la gestion des mails.
Can't\ upload\ file=
Confirm\ thesaurus\ deletion=Confirmation de suppression du thesaurus
Error=Erreur
-Warning\ all\ your\ thesaurus\ will\ be\ deleted\ before\ new\ import.\ Do\ you\ want\ to\ continue\ ?=Attention, tous les thesaurus seront entierrement supprim\u00E9s avant le nouvel import.\n\u00CAtes-vous s\u00FBr de vouloir continuer ?
+Warning\ all\ your\ thesaurus\ will\ be\ deleted\ before\ new\ import.\ Do\ you\ want\ to\ continue\ ?=Attention, tous les thesaurus seront entierrement supprimés avant le nouvel import.\nÊtes-vous sûr de vouloir continuer ?
vradi.action.about=A propos
vradi.action.about.tip=A propos de l'application Vradi...
vradi.action.cancel=Annuler
@@ -18,24 +18,24 @@
vradi.action.configuration.tip=Modifier la configuration
vradi.action.exit=Quitter
vradi.action.exit.tip=Quitter vradi
-vradi.action.fullscreen=Plein \u00E9cran
-vradi.action.fullscreen.tip=Passer en mode plein \u00E9cran
+vradi.action.fullscreen=Plein écran
+vradi.action.fullscreen.tip=Passer en mode plein écran
vradi.action.help=Aide
vradi.action.help.tip=Afficher l'aide
vradi.action.locale.=
-vradi.action.locale.fr=Fran\u00E7ais
-vradi.action.locale.fr.tip=Changer la langue en fran\u00E7ais
+vradi.action.locale.fr=Français
+vradi.action.locale.fr.tip=Changer la langue en français
vradi.action.locale.uk=Anglais
vradi.action.locale.uk.tip=Changer la langue en anglais
vradi.action.normalscreen=Ecran normal
vradi.action.normalscreen.tip=Revenir en mode normal
vradi.action.select=Selectionnez
vradi.action.site=Site
-vradi.action.site.tip=Acc\u00E9der au site de Vradi
+vradi.action.site.tip=Accéder au site de Vradi
vradi.action.stat=
vradi.action.test=
vradi.action.valid=Valider
-vradi.admin.cancel.message=\u00CAtes-vous s\u00FBr de vouloir annuler les changements ?
+vradi.admin.cancel.message=Êtes-vous sûr de vouloir annuler les changements ?
vradi.admin.cancel.title=Annuler les changements ?
vradi.admin.client=Gestion des clients
vradi.admin.confirmDelete=Voulez vous supprimer \: %1$s ?
@@ -44,35 +44,35 @@
vradi.admin.exportCSV=Export
vradi.admin.exportTitle=Export des clients, utilisateurs et groupes
vradi.admin.form=Gestion des formulaires
-vradi.admin.formsCreated.message=R\u00E9sultat de la cr\u00E9ation \:\n
-vradi.admin.formsCreated.message.allWarning=- %1$s formulaires cr\u00E9\u00E9s\n- %2$d formulaires existants\n- %3$s erreurs de date\n- %4$s erreurs de nombre
-vradi.admin.formsCreated.missingFormType=Aucun Type de formulaire associ\u00E9.
-vradi.admin.formsCreated.title=R\u00E9sultat de la cr\u00E9ation
+vradi.admin.formsCreated.message=Résultat de la création \:\n
+vradi.admin.formsCreated.message.allWarning=- %1$s formulaires créés\n- %2$d formulaires existants\n- %3$s erreurs de date\n- %4$s erreurs de nombre
+vradi.admin.formsCreated.missingFormType=Aucun Type de formulaire associé.
+vradi.admin.formsCreated.title=Résultat de la création
vradi.admin.group=Gestion des groupes
vradi.admin.importButtonText=Importer
vradi.admin.importCSV=Import
vradi.admin.importTitle=Import des clients, utilisateurs et groupes
-vradi.admin.isInUse=Le status %1$s est encore utilis\u00E9, la suppression est impossible.
+vradi.admin.isInUse=Le status %1$s est encore utilisé, la suppression est impossible.
vradi.admin.isInUse.title=Impossible de supprimer le status
-vradi.admin.noSelection=Veuillez s\u00E9lectionner un noeud de l'arbre.
+vradi.admin.noSelection=Veuillez sélectionner un noeud de l'arbre.
vradi.admin.saveAnswer=Modification en cours, voulez vous sauvegarder \:
vradi.admin.saveTitle=Sauvegarder ?
vradi.admin.status=Gestion des statuts
-vradi.admin.thesaurus=Gestion des th\u00E9saurus
+vradi.admin.thesaurus=Gestion des thésaurus
vradi.admin.title=Administration
vradi.admin.userEnable=Actif
vradi.admin.warnTitle=
vradi.admin.xmlStream=Gestion des flux XML
vradi.adminClient.adresse=Adresse
vradi.adminClient.contact=Contact
-vradi.adminClient.createClient=Cr\u00E9er un client
-vradi.adminClient.createUser=Cr\u00E9er un utilisateur
+vradi.adminClient.createClient=Créer un client
+vradi.adminClient.createUser=Créer un utilisateur
vradi.adminClient.deleteClient=Supprimer
vradi.adminClient.deleteGroup=Supprimer le groupe
vradi.adminClient.listGroup=Groupes
vradi.adminClient.name=Nom
vradi.adminClient.newClientName=Nouveau client
-vradi.adminClient.tel=T\u00E9l\u00E9phone
+vradi.adminClient.tel=Téléphone
vradi.adminClient.title=Client \: %1$s
vradi.adminField.desc=Description
vradi.adminField.lbl=Label
@@ -80,26 +80,26 @@
vradi.adminField.new=Ajouter
vradi.adminField.title=Champs du formulaire
vradi.adminField.type=Type
-vradi.adminForm.createForm=Cr\u00E9er un type de formulaire
+vradi.adminForm.createForm=Créer un type de formulaire
vradi.adminForm.deleteFormType=Supprimer un type de formulaire
vradi.adminForm.title=Type de formulaire \: %1$s
vradi.adminFormType.askName=Nom du type de formulaire \:
-vradi.adminFormType.askNameInvalid=Le nom du type de formulaire contient des caracteres non alphanum\u00E9rique \!
+vradi.adminFormType.askNameInvalid=Le nom du type de formulaire contient des caracteres non alphanumérique \!
vradi.adminFormType.askNameTitle=Nouveau type de formulaire
vradi.adminFormType.deleteFormType=Supprimer le type de formulaire
vradi.adminFormType.hideInfogene=Cacher l'infogene
vradi.adminFormType.showInfogene=Afficher l'infogene
-vradi.adminFormType.template.download=T\u00E9l\u00E9charger
+vradi.adminFormType.template.download=Télécharger
vradi.adminFormType.template.fieldBinding=Associez les champs
vradi.adminFormType.template.fieldBinding.label=Associez les champs du document OpenOffice aux champs du formulaire \:
vradi.adminFormType.template.fieldBinding.title=Associez les champs du document OpenOffice aux champs du formulaire
-vradi.adminFormType.template.label=Mod\u00E8le de g\u00E9n\u00E9ration PDF \:
+vradi.adminFormType.template.label=Modèle de génération PDF \:
vradi.adminFormType.template.new=Ajouter
vradi.adminFormType.template.showExample=Voir un exemple
-vradi.adminFormType.template.showExample.error.message=Aucun formulaire de ce type n'a \u00E9t\u00E9 enregistr\u00E9.\nAucun aper\u00E7u n'est donc disponible.
+vradi.adminFormType.template.showExample.error.message=Aucun formulaire de ce type n'a été enregistré.\nAucun aperçu n'est donc disponible.
vradi.adminFormType.template.showExample.error.title=Aucun formulaire de ce type
-vradi.adminGroup.addUser=Ajout l'utilisateur s\u00E9lectionn\u00E9 dans le groupe
-vradi.adminGroup.createGroup=Cr\u00E9er un groupe
+vradi.adminGroup.addUser=Ajout l'utilisateur sélectionné dans le groupe
+vradi.adminGroup.createGroup=Créer un groupe
vradi.adminGroup.listUsers=Utilisateurs
vradi.adminGroup.name=Groupes
vradi.adminGroup.newGroupName=Nouveau groupe
@@ -107,47 +107,47 @@
vradi.adminGroup.title=Groupe \: %1$s
vradi.adminRequest.cancel=Annuler
vradi.adminRequest.edit=Editer
-vradi.adminRequest.history.show=Voir l'historique des requ\u00EAtes
-vradi.adminRequest.new=Nouvelle requ\u00EAte
+vradi.adminRequest.history.show=Voir l'historique des requêtes
+vradi.adminRequest.new=Nouvelle requête
vradi.adminRequest.remove=Supprimer
-vradi.adminRequest.title=Requ\u00EAtes \:
+vradi.adminRequest.title=Requêtes \:
vradi.adminRequest.valid=Valider
-vradi.adminStatus.createStatus=Cr\u00E9er un nouveau statut
+vradi.adminStatus.createStatus=Créer un nouveau statut
vradi.adminStatus.desc=Description
vradi.adminStatus.name=Nom
vradi.adminStatus.newStatusName=Nouveau statut
vradi.adminStatus.title=Gestion des statuts
-vradi.adminThesaurus.askCreateRootThesaurus=\u00CAtes-vous s\u00FBr de vouloir cr\u00E9ez le nouveau th\u00E9saurus %1$s ?
-vradi.adminThesaurus.askDeleteRootThesaurus=\u00CAtes-vous s\u00FBr de vouloir supprimer le th\u00E9saurus %1$s ainsi que tout ses descripteurs ?
-vradi.adminThesaurus.askDeleteThesaurus=\u00CAtes-vous s\u00FBr de vouloir supprimer le descripteur %1$s ainsi que tout ses fils (%2$s formulaires seront impact\u00E9) ?
-vradi.adminThesaurus.askEditRootThesaurus=\u00CAtes-vous s\u00FBr de vouloir renommer le th\u00E9saurus %1$s en %2$s ?
-vradi.adminThesaurus.askEditThesaurus=Voulez-vous sauvegarder les modifications pour le descripteur %1$s (%2$s formulaires seront impact\u00E9) ?
-vradi.adminThesaurus.askMoveThesaurus=\u00CAtes-vous s\u00FBr de vouloir d\u00E9placer le descripteur %1$s ?
-vradi.adminThesaurus.askRootThesaurusEditName=Choisisez un nouveau nom pour le th\u00E9saurus %1$s
-vradi.adminThesaurus.askRootThesaurusName=Choisisez un nom pour le th\u00E9saurus
-vradi.adminThesaurus.askRootThesaurusTitle=Nouveau th\u00E9saurus
+vradi.adminThesaurus.askCreateRootThesaurus=Êtes-vous sûr de vouloir créez le nouveau thésaurus %1$s ?
+vradi.adminThesaurus.askDeleteRootThesaurus=Êtes-vous sûr de vouloir supprimer le thésaurus %1$s ainsi que tout ses descripteurs ?
+vradi.adminThesaurus.askDeleteThesaurus=Êtes-vous sûr de vouloir supprimer le descripteur %1$s ainsi que tout ses fils (%2$s formulaires seront impacté) ?
+vradi.adminThesaurus.askEditRootThesaurus=Êtes-vous sûr de vouloir renommer le thésaurus %1$s en %2$s ?
+vradi.adminThesaurus.askEditThesaurus=Voulez-vous sauvegarder les modifications pour le descripteur %1$s (%2$s formulaires seront impacté) ?
+vradi.adminThesaurus.askMoveThesaurus=Êtes-vous sûr de vouloir déplacer le descripteur %1$s ?
+vradi.adminThesaurus.askRootThesaurusEditName=Choisisez un nouveau nom pour le thésaurus %1$s
+vradi.adminThesaurus.askRootThesaurusName=Choisisez un nom pour le thésaurus
+vradi.adminThesaurus.askRootThesaurusTitle=Nouveau thésaurus
vradi.adminThesaurus.comment=Commentaire
-vradi.adminThesaurus.creationTitle=Cr\u00E9ation d'un descripteur
+vradi.adminThesaurus.creationTitle=Création d'un descripteur
vradi.adminThesaurus.editTitle=Edition du descripteur \: %1$s
vradi.adminThesaurus.exportButtonText=Exporter
vradi.adminThesaurus.exportThesaurusCSV=Export
-vradi.adminThesaurus.exportThesaurusTitle=Exporter le th\u00E9saurus
+vradi.adminThesaurus.exportThesaurusTitle=Exporter le thésaurus
vradi.adminThesaurus.importButtonText=Importer
vradi.adminThesaurus.importThesaurusCSV=Import
-vradi.adminThesaurus.importTitle=Importer le th\u00E9saurus
-vradi.adminThesaurus.move=D\u00E9placer
+vradi.adminThesaurus.importTitle=Importer le thésaurus
+vradi.adminThesaurus.move=Déplacer
vradi.adminThesaurus.moveTitle=Sauvegarder ?
vradi.adminThesaurus.orderName=Ordre - Nom
vradi.adminThesaurus.path=Chemin \:
-vradi.adminThesaurus.rootThesaurusInvalidName=Le nom du th\u00E9saurus est utilis\u00E9 pour cr\u00E9er des requ\u00EAtes,\nil ne doit contenir que des carat\u00E8res alphanum\u00E9rique.
-vradi.adminThesaurus.select=S\u00E9lectionnez le descripteur de destination
-vradi.adminThesaurus.selectAsk=D\u00E9placer le descripteur vers...
+vradi.adminThesaurus.rootThesaurusInvalidName=Le nom du thésaurus est utilisé pour créer des requêtes,\nil ne doit contenir que des caratères alphanumérique.
+vradi.adminThesaurus.select=Sélectionnez le descripteur de destination
+vradi.adminThesaurus.selectAsk=Déplacer le descripteur vers...
vradi.adminThesaurus.tags=Tags
-vradi.adminThesaurus.warnNameIsExisting=Le descripteur "%s" existe d\u00E9j\u00E0 dans ce thesaurus
+vradi.adminThesaurus.warnNameIsExisting=Le descripteur "%s" existe déjà dans ce thesaurus
vradi.adminThesaurus.warnTitle=Descripteur existant
vradi.adminUi.invalid.email=Adresse email non valide
vradi.adminUi.invalid.url=URL non valide
-vradi.adminUi.regex.fieldselect.nameValue=Les caract\u00E8res sp\u00E9ciaux ne sont pas autoris\u00E9s
+vradi.adminUi.regex.fieldselect.nameValue=Les caractères spéciaux ne sont pas autorisés
vradi.adminUi.required.client.name=Ce champ est obligatoire
vradi.adminUi.required.fieldselect.nameValue=Ce champ est obligatoire
vradi.adminUi.required.fieldselect.type=Ce champ est obligatoire
@@ -156,47 +156,47 @@
vradi.adminUi.required.xmlStream.formTypeName=Ce champ est obligatoire
vradi.adminUi.required.xmlStream.name=Ce champ est obligatoire
vradi.adminUi.required.xmlStream.url=Ce champ est obligatoire
-vradi.adminUser.addGroup=Ajouter l'utilisateur au groupe s\u00E9lectionn\u00E9
+vradi.adminUser.addGroup=Ajouter l'utilisateur au groupe sélectionné
vradi.adminUser.adresse=Adresse
-vradi.adminUser.beginSearchDate=Date de d\u00E9but de recherche
-vradi.adminUser.createUser=Cr\u00E9er un utilisateur
+vradi.adminUser.beginSearchDate=Date de début de recherche
+vradi.adminUser.createUser=Créer un utilisateur
vradi.adminUser.deleteUser=Supprimer
vradi.adminUser.mail=Email
vradi.adminUser.name=Nom
vradi.adminUser.newUserName=Nouvel utilisateur
-vradi.adminUser.phone=T\u00E9l\u00E9phone
-vradi.adminUser.removeGroup=Retirer l'utilisateur du groupe s\u00E9lectionn\u00E9
+vradi.adminUser.phone=Téléphone
+vradi.adminUser.removeGroup=Retirer l'utilisateur du groupe sélectionné
vradi.adminUser.service=Service
vradi.adminUser.title=Utilisateur \: %1$s
-vradi.adminXmlStream.assignAuto=S\u00E9lection automatique des formulaires
+vradi.adminXmlStream.assignAuto=Sélection automatique des formulaires
vradi.adminXmlStream.config=Configurer les flux XML
-vradi.adminXmlStream.config.label.hours=\u00E0 la minute
-vradi.adminXmlStream.config.load=Charger les nouveaux formulaires \u00E0
+vradi.adminXmlStream.config.label.hours=à la minute
+vradi.adminXmlStream.config.load=Charger les nouveaux formulaires à
vradi.adminXmlStream.config.title=Configuration des flux XML
vradi.adminXmlStream.createForms=Forcer l'import du flux
vradi.adminXmlStream.createNewWebHarvest.toolTip=Ouvrir l'editeur de script web harvest
-vradi.adminXmlStream.createWebHarvestStream=Cr\u00E9er un flux Web Harvest
-vradi.adminXmlStream.createXmlStream=Cr\u00E9er un flux
+vradi.adminXmlStream.createWebHarvestStream=Créer un flux Web Harvest
+vradi.adminXmlStream.createXmlStream=Créer un flux
vradi.adminXmlStream.deleteXmlStream=Supprimer le flux XML
-vradi.adminXmlStream.formType=Type de formulaire associ\u00E9
-vradi.adminXmlStream.hideForm=Cacher les d\u00E9tails du flux XML
+vradi.adminXmlStream.formType=Type de formulaire associé
+vradi.adminXmlStream.hideForm=Cacher les détails du flux XML
vradi.adminXmlStream.name=Nom
vradi.adminXmlStream.newFormTypeName=Nouveau type de formulaire
vradi.adminXmlStream.newStreamName=Nouveau flux
vradi.adminXmlStream.newWebHarvestStreamName=Nouveau flux web harvest
-vradi.adminXmlStream.showForm=Voir les d\u00E9tails du flux XML
-vradi.adminXmlStream.startUrl=URL d'entr\u00E9 du script
-vradi.adminXmlStream.table.field.defaultValue=Valeur par d\u00E9faut
-vradi.adminXmlStream.table.field.defaultValue.tip=Valeur par d\u00E9faut
+vradi.adminXmlStream.showForm=Voir les détails du flux XML
+vradi.adminXmlStream.startUrl=URL d'entré du script
+vradi.adminXmlStream.table.field.defaultValue=Valeur par défaut
+vradi.adminXmlStream.table.field.defaultValue.tip=Valeur par défaut
vradi.adminXmlStream.table.field.name=Champs du type de formulaire
-vradi.adminXmlStream.table.field.name.tip=Champs du type de formulaire \u00E0 associer
+vradi.adminXmlStream.table.field.name.tip=Champs du type de formulaire à associer
vradi.adminXmlStream.table.field.values=Valeur du flux
-vradi.adminXmlStream.table.field.values.tip=Valeur du flux xml \u00E0 associer au type de formulaire
+vradi.adminXmlStream.table.field.values.tip=Valeur du flux xml à associer au type de formulaire
vradi.adminXmlStream.title=Flux XML \: %1$s
vradi.adminXmlStream.url=URL du flux XML
vradi.adminXmlStream.validateUrl=Valider
-vradi.adminXmlStream.webHarvestScript=Script \u00E0 executer
-vradi.binding.forms.concurrence.message=Une erreur de concurrence est apparue.\nV\u00E9rifiez que personne n'effectue la m\u00EAme op\u00E9ration et recommencez.
+vradi.adminXmlStream.webHarvestScript=Script à executer
+vradi.binding.forms.concurrence.message=Une erreur de concurrence est apparue.\nVérifiez que personne n'effectue la même opération et recommencez.
vradi.changelog.title=Changelog
vradi.client.category=Clients
vradi.common.alls=Tous
@@ -209,11 +209,11 @@
vradi.common.ok=Valider
vradi.common.paste=Coller
vradi.common.save=Sauvegarder
-vradi.common.select=S\u00E9lectionner
+vradi.common.select=Sélectionner
vradi.common.timeseparator=\:
vradi.common.validate=Valider
-vradi.config.category.directories=R\u00E9pertoires
-vradi.config.category.directories.description=R\u00E9pertoires de l'application
+vradi.config.category.directories=Répertoires
+vradi.config.category.directories.description=Répertoires de l'application
vradi.config.category.other=Autre
vradi.config.category.other.description=Autres options
vradi.config.category.remote=Serveur
@@ -235,34 +235,34 @@
vradi.config.thesaurus.color.description=
vradi.config.thesaurus.description=
vradi.config.thesaurus.expanded.description=
-vradi.config.ui.fullscreen=Pour afficher l'aplication en mode plein \u00E9cran
-vradi.config.ui.locale=Langue utilis\u00E9e par l'application (fr_FR, en_GB)
+vradi.config.ui.fullscreen=Pour afficher l'aplication en mode plein écran
+vradi.config.ui.locale=Langue utilisée par l'application (fr_FR, en_GB)
vradi.config.version.description=
-vradi.config.wikitty.notifier.transporter.class.description=Class utilis\u00E9 pour transporter les \u00E9venements
+vradi.config.wikitty.notifier.transporter.class.description=Class utilisé pour transporter les évenements
vradi.config.wikitty.propagate.propagateEvent.description=Definie si l'instance est en mode serveur ou non
-vradi.config.wikitty.xmpp.room.description=Adresse du salon XMPP auquel ce connecter pour recevoir les \u00E9venements
+vradi.config.wikitty.xmpp.room.description=Adresse du salon XMPP auquel ce connecter pour recevoir les évenements
vradi.config.wikitty.xmpp.server.description=Adresse du serveur XMPP
vradi.config.xmlStreams.description=
vradi.createForm.askName=Nom du nouveau formulaire
vradi.createForm.askType=Type du nouveau formulaire
vradi.criteria.cartography=Cartographie / Thesaurus
vradi.criteria.clear=Effacer
-vradi.criteria.collapse=Avanc\u00E9e -
+vradi.criteria.collapse=Avancée -
vradi.criteria.empty=Aucun
vradi.criteria.formType=Type de formulaire
vradi.criteria.from=De
-vradi.criteria.notCollapse=Avanc\u00E9e +
+vradi.criteria.notCollapse=Avancée +
vradi.criteria.search=Rechercher
vradi.criteria.searchLast30days=30 derniers jours
vradi.criteria.searchLastDay=Hier
vradi.criteria.searchThisMonth=Mois courant
vradi.criteria.searchToDay=Aujourd'hui
vradi.criteria.status=Statut \:
-vradi.criteria.to=\u00E0
-vradi.criteria.typeDate=Date concern\u00E9e
-vradi.criteria.typeDate.Form.datePeremption=Date de p\u00E9remption
+vradi.criteria.to=à
+vradi.criteria.typeDate=Date concernée
+vradi.criteria.typeDate.Form.datePeremption=Date de péremption
vradi.criteria.typeDate.Form.datePub=Date de publication
-vradi.criteria.typeDate.Infogene.creationDate=Date de cr\u00E9ation
+vradi.criteria.typeDate.Infogene.creationDate=Date de création
vradi.criteria.xmlStream=Flux XML \:
vradi.date.required.value=Ce champ est obligatoire
vradi.edit.proposition=Propositions
@@ -275,24 +275,24 @@
vradi.editor.removeXML=<...>
vradi.editor.removeXMLToolTip=Supprimer les balises XML
vradi.editor.unescapeXML=XML
-vradi.editor.unescapeXMLToolTip=Suppression des caract\u00E8res sp\u00E9ciaux XML
-vradi.email.addGroup=Envoyer \u00E0 un groupe
-vradi.email.addUser=Envoyer \u00E0 un utilisateur
+vradi.editor.unescapeXMLToolTip=Suppression des caractères spéciaux XML
+vradi.email.addGroup=Envoyer à un groupe
+vradi.email.addUser=Envoyer à un utilisateur
vradi.email.askAbordSendingTitle=Continuer l'envoi ?
-vradi.email.askModelEmpty=Le type de formulaire %1$s n'a pas de template associ\u00E9.\n\u00EAtes-vous s\u00FBr de vouloir continuer l'envoi ?
-vradi.email.askUserEmailEmpty=L'utilisateur %1$s (du client %2$s) n'a pas d'email.\n\u00EAtes-vous s\u00FBr de vouloir continuer l'envoi ?
+vradi.email.askModelEmpty=Le type de formulaire %1$s n'a pas de template associé.\nêtes-vous sûr de vouloir continuer l'envoi ?
+vradi.email.askUserEmailEmpty=L'utilisateur %1$s (du client %2$s) n'a pas d'email.\nêtes-vous sûr de vouloir continuer l'envoi ?
vradi.email.bindSession=Associer les formulaires aux utilisateurs
vradi.email.clientFilter=par clients
-vradi.email.confimCloseSession=\u00CAtes-vous s\u00FBr de vouloir supprimer la session active ?\n\nATTENTION \: La session ne pourra pas \u00EAtre r\u00E9ouverte \!
+vradi.email.confimCloseSession=Êtes-vous sûr de vouloir supprimer la session active ?\n\nATTENTION \: La session ne pourra pas être réouverte \!
vradi.email.confimCloseSession.titles=Supprimer la session active ?
-vradi.email.confirmAddGroup=\u00CAtes-vous s\u00FBr de vouloir ajouter l'envoi des formulaires \: \n%1$s \n\naux groupes suivants \: \n%2$s
-vradi.email.confirmAddTitle=Ajout des formulaires \u00E0 la session d'envoie
-vradi.email.confirmAddUser=\u00CAtes-vous s\u00FBr de vouloir ajouter l'envoi des formulaires \: \n%1$s \n\naux utilisateurs suivants \: \n%2$s
-vradi.email.confirmDelete=\u00CAtes-vous s\u00FBr de vouloir supprimer l'envoi de ce formulaire \: %1$s
+vradi.email.confirmAddGroup=Êtes-vous sûr de vouloir ajouter l'envoi des formulaires \: \n%1$s \n\naux groupes suivants \: \n%2$s
+vradi.email.confirmAddTitle=Ajout des formulaires à la session d'envoie
+vradi.email.confirmAddUser=Êtes-vous sûr de vouloir ajouter l'envoi des formulaires \: \n%1$s \n\naux utilisateurs suivants \: \n%2$s
+vradi.email.confirmDelete=Êtes-vous sûr de vouloir supprimer l'envoi de ce formulaire \: %1$s
vradi.email.confirmDeleteTitle=Suppression d'un formulaire ?
-vradi.email.confirmRemoveForms=\u00CAtes-vous s\u00FBr de vouloir supprimer les formulaires suivantes de la session pour tout les utilisateurs \:\n%1$s
+vradi.email.confirmRemoveForms=Êtes-vous sûr de vouloir supprimer les formulaires suivantes de la session pour tout les utilisateurs \:\n%1$s
vradi.email.confirmRemoveFormsTitle=Suppression de formulaires
-vradi.email.confirmRemoveUserForms=\u00CAtes-vous s\u00FBr de vouloir supprimer les formulaires suivantes de la session pour l'utilisateurs %1$s \:\n%1$s
+vradi.email.confirmRemoveUserForms=Êtes-vous sûr de vouloir supprimer les formulaires suivantes de la session pour l'utilisateurs %1$s \:\n%1$s
vradi.email.confirmRemoveUserFormsTitle=Suppression de formulaires
vradi.email.confirmRevertFormDeletion=Etes-vous sur le vouloir annuler la suppression des formulaires suivants \: \n%1$s
vradi.email.confirmRevertFormDeletionTitle=Annuler la suppression des formulaires ?
@@ -300,68 +300,68 @@
vradi.email.confirmRevertGroupFormDeletionTitle=Annuler la suppression des formulaires ?
vradi.email.confirmRevertUserFormDeletion=Etes-vous sur le vouloir annuler pour les utilisateurs \n\n'%2$s'\n\nla suppression des formulaires suivants \: \n%1$s
vradi.email.confirmRevertUserFormDeletionTitle=Annuler la suppression des formulaires ?
-vradi.email.confirmSelectionForm=Le formulaire '%1$s' doit \u00EAtre s\u00E9lectionn\u00E9 pour l'envoi,\n\u00EAtes-vous sur de vouloir s\u00E9lectionner ce formulaire ?
+vradi.email.confirmSelectionForm=Le formulaire '%1$s' doit être sélectionné pour l'envoi,\nêtes-vous sur de vouloir sélectionner ce formulaire ?
vradi.email.confirmSelectionForm.title=Changer le status du formulaire
-vradi.email.confirmSendSending=\u00CAtes-vous s\u00FBr de vouloir r\u00E9envoyer les emails \u00E0 %1$s ?
+vradi.email.confirmSendSending=Êtes-vous sûr de vouloir réenvoyer les emails à %1$s ?
vradi.email.confirmSendSending.askMail=Veuillez saisir l'adresse mail \:
-vradi.email.confirmSendSending.askMailTitle=Destinataire personnalis\u00E9
+vradi.email.confirmSendSending.askMailTitle=Destinataire personnalisé
vradi.email.confirmSendSending.optionNo=Non
vradi.email.confirmSendSending.optionOtherMail=Saisir l'email du destinataire
vradi.email.confirmSendSending.optionYes=Oui
-vradi.email.confirmSendSendingTitle=R\u00E9envoy\u00E9 ?
-vradi.email.confirmSendSession=\u00CAtes-vous s\u00FBr de vouloir traiter la session en cours ?
+vradi.email.confirmSendSendingTitle=Réenvoyé ?
+vradi.email.confirmSendSession=Êtes-vous sûr de vouloir traiter la session en cours ?
vradi.email.confirmSendSessionTitle=Confirmation d'envoi
-vradi.email.deleteSession=D\u00E9truire la session
+vradi.email.deleteSession=Détruire la session
vradi.email.filter=Filtrer
vradi.email.formFilter=par formulaires
vradi.email.formGroupTitle=Groupes
vradi.email.formUserTitle=Utilisateurs
vradi.email.forms.revertDeletion=Annuler les suppressions
-vradi.email.generation=G\u00E9n\u00E9ration des pdf
-vradi.email.generation.msg=G\u00E9n\u00E9ration des pdf
-vradi.email.generation.title=Les PDF sont en cours de g\u00E9n\u00E9ration
+vradi.email.generation=Génération des pdf
+vradi.email.generation.msg=Génération des pdf
+vradi.email.generation.title=Les PDF sont en cours de génération
vradi.email.groupFilter=par groupes
vradi.email.hideForm=
vradi.email.hideSessionParagraph=Cacher le paragraphe de la session
vradi.email.invalid.value=
-vradi.email.newSession=Cr\u00E9er une nouvelle session
-vradi.email.noSelection=Veuillez s\u00E9lectionner un utilisateur ou une s\u00E9ssion dans l'arbre.
+vradi.email.newSession=Créer une nouvelle session
+vradi.email.noSelection=Veuillez sélectionner un utilisateur ou une séssion dans l'arbre.
vradi.email.paragraph=Paragraphe
-vradi.email.receptionProof=Accus\u00E9 de r\u00E9ception
-vradi.email.removeFormFromSession=Supprimer les formulaires selectionn\u00E9 de la session
-vradi.email.removeFormFromSessionForUser=Supprimer les formulaires selectionn\u00E9 de la session pour l'utilisateur
+vradi.email.receptionProof=Accusé de réception
+vradi.email.removeFormFromSession=Supprimer les formulaires selectionné de la session
+vradi.email.removeFormFromSessionForUser=Supprimer les formulaires selectionné de la session pour l'utilisateur
vradi.email.required.value=Email requis
-vradi.email.sendSending=R\u00E9envoyer les formulaires
-vradi.email.sendSending.sendError=L'envoi de l'email a \u00E9chou\u00E9 \: %1$s
+vradi.email.sendSending=Réenvoyer les formulaires
+vradi.email.sendSending.sendError=L'envoi de l'email a échoué \: %1$s
vradi.email.sendSession=Envoyer les formulaires de la session
-vradi.email.sendSession.error=L'envoi des emails a \u00E9chou\u00E9
+vradi.email.sendSession.error=L'envoi des emails a échoué
vradi.email.sendSession.msg=Envoi des messages
vradi.email.sendSession.title=Les messages sont en cours d'envoi
vradi.email.session=Date d'envoi
-vradi.email.sessionAttachedfile=Fichiers attach\u00E9s
+vradi.email.sessionAttachedfile=Fichiers attachés
vradi.email.sessionParagraph=Paragraphe pour cette session
vradi.email.showForm=
vradi.email.showSessionParagraph=Afficher le paragraphe de la session
vradi.email.status=Statuts \:
-vradi.email.thesaurusToolTipTitle=Descripteurs associ\u00E9s \:
+vradi.email.thesaurusToolTipTitle=Descripteurs associés \:
vradi.email.title=Envoi des emails
vradi.email.titleGroup=Session d'envoi pour le groupe %1$s
vradi.email.titleUser=Session d'envoi pour l'utilisateur %1$s
vradi.email.userFilter=par utilisateurs
-vradi.entity.creation.date=cr\u00E9\u00E9 le %1$td/%1$tm/%1$ty \u00E0 %1$tk\:%1$tM\:%1$tS
-vradi.entity.lastModified.date.user=derni\u00E8re modification le %1$td/%1$tm/%1$ty \u00E0 %1$tk\:%1$tM\:%1$tS par %2$s
+vradi.entity.creation.date=créé le %1$td/%1$tm/%1$ty à %1$tk\:%1$tM\:%1$tS
+vradi.entity.lastModified.date.user=dernière modification le %1$td/%1$tm/%1$ty à %1$tk\:%1$tM\:%1$tS par %2$s
vradi.error.cantOpenHistory=Impossible d'ouvrir l'historique des requettes.
vradi.error.cantOpenHistory.title=Impossible d'ouvrir l'historique des requettes
-vradi.error.executeTask=La t\u00E2che est en erreur \:
-vradi.error.fieldsBinding.errors=[Erreur] Voici la liste des champs du mod\u00E8le qui ne sont pas associ\u00E9 \:\n%1$s\n\n
-vradi.error.fieldsBinding.msg=Tous les champs ne sont pas associ\u00E9, \u00EAtes vous s\u00FBr de vouloir sauvegarder ?\n\n
-vradi.error.fieldsBinding.title=Etes vous s\u00FBr de vouloir sauvegarder ?
-vradi.error.fieldsBinding.warns=[Attention] Voici la liste des champs du type de formulaire qui ne sont pas associ\u00E9 \:\n%1$s\n\n
-vradi.error.fileNotFound=Le fichier '%1$s' n'a pas \u00E9t\u00E9 trouv\u00E9 sur le serveur, \nassurez-vous de bien avoir sauvegard\u00E9 le formulaire avant de t\u00E9lecharger un fichier joint.
-vradi.error.fileNotFound.title=Fichier non pr\u00E9sent sur le serveur
-vradi.error.formTypeDeletionUsed=Le type de formulaire '%1$s' est encore utilis\u00E9, la suppression est impossible.
+vradi.error.executeTask=La tâche est en erreur \:
+vradi.error.fieldsBinding.errors=[Erreur] Voici la liste des champs du modèle qui ne sont pas associé \:\n%1$s\n\n
+vradi.error.fieldsBinding.msg=Tous les champs ne sont pas associé, êtes vous sûr de vouloir sauvegarder ?\n\n
+vradi.error.fieldsBinding.title=Etes vous sûr de vouloir sauvegarder ?
+vradi.error.fieldsBinding.warns=[Attention] Voici la liste des champs du type de formulaire qui ne sont pas associé \:\n%1$s\n\n
+vradi.error.fileNotFound=Le fichier '%1$s' n'a pas été trouvé sur le serveur, \nassurez-vous de bien avoir sauvegardé le formulaire avant de télecharger un fichier joint.
+vradi.error.fileNotFound.title=Fichier non présent sur le serveur
+vradi.error.formTypeDeletionUsed=Le type de formulaire '%1$s' est encore utilisé, la suppression est impossible.
vradi.error.formTypeDeletionUsed.title=Suppression impossible
-vradi.error.formWikittyObselete=Le formulaire '%1$s' \u00E0 \u00E9t\u00E9 modifi\u00E9 pendant que vous l'\u00E9ditiez, \nles modifications serons perdus.
+vradi.error.formWikittyObselete=Le formulaire '%1$s' à été modifié pendant que vous l'éditiez, \nles modifications serons perdus.
vradi.error.formWikittyObselete.title=Sauvegarde impossible
vradi.error.sending.sendDialogError=Voici l'erreur survenus pendant l'envoie de l'email \:\n%1$s
vradi.error.sending.sendDialogError.title=Erreur lors de l'envoie de l'email
@@ -373,43 +373,43 @@
vradi.export.filter.csv=Fichier csv
vradi.export.validate.label=Exporter
vradi.file.template.description=Fichier OpenOffice (*.odt, *.ott)
-vradi.file.template.wrongFileNamePattern=Le nom de fichier %s n'est pas valide \!\nIl ne doit \u00EAtre compos\u00E9 que \u00DE caract\u00E8res alphanum\u00E9riques.
+vradi.file.template.wrongFileNamePattern=Le nom de fichier %s n'est pas valide \!\nIl ne doit être composé que Þ caractères alphanumériques.
vradi.form.datePeremption=Date de peremption
vradi.form.datePub=Date de publication
vradi.form.xmlStream=Flux
vradi.formType.category=Type de formulaires
-vradi.forms.returned=formulaires trouv\u00E9s
-vradi.forms.shown=Nombre de formulaires \u00E0 afficher
+vradi.forms.returned=formulaires trouvés
+vradi.forms.shown=Nombre de formulaires à afficher
vradi.group.category=Groupes
vradi.help.top.title=
vradi.infogene.country=Pays
-vradi.infogene.creationDate=Date de cr\u00E9ation
-vradi.infogene.department=D\u00E9partement
+vradi.infogene.creationDate=Date de création
+vradi.infogene.department=Département
vradi.infogene.description=Description
-vradi.infogene.entity=Entit\u00E9
+vradi.infogene.entity=Entité
vradi.infogene.id=Identifiant
vradi.infogene.objet=Objet
vradi.infogene.sourceText=Source
vradi.infogene.sourceURL=URL source
vradi.infogene.status=Status
-vradi.init.closed=Vradi a \u00E9t\u00E9 ferm\u00E9 \u00E0 %1$s
-vradi.init.context.done=Initialisation du contexte termin\u00E9e en %1$s.
-vradi.init.ui.done=Initialisation de l'interface graphique termin\u00E9e en %1$s.
-vradi.list.requests=Requ\u00EAtes
+vradi.init.closed=Vradi a été fermé à %1$s
+vradi.init.context.done=Initialisation du contexte terminée en %1$s.
+vradi.init.ui.done=Initialisation de l'interface graphique terminée en %1$s.
+vradi.list.requests=Requêtes
vradi.login.cancel=Annuler
vradi.login.email=Email
vradi.login.error=Erreur d'authentification
-vradi.login.error.message=Vous avez entr\u00E9 un mauvais mot de passe ou le nom d'utilisateur n'existe pas.
+vradi.login.error.message=Vous avez entré un mauvais mot de passe ou le nom d'utilisateur n'existe pas.
vradi.login.login=Login
vradi.login.password=Mot de passe
vradi.login.register=Enregistrement
-vradi.login.repeatPassword=V\u00E9rification du mot de passe
+vradi.login.repeatPassword=Vérification du mot de passe
vradi.login.title=Authentification
vradi.login.validate=Valider
vradi.menu.addChildThesaurus=Ajouter un descripteur
vradi.menu.addColumns=Ajouter une colonne
-vradi.menu.addCriteria=Ajouter ce noeud comme crit\u00E8re de recherche
-vradi.menu.addRootChildThesaurus=Ajouter un th\u00E9saurus
+vradi.menu.addCriteria=Ajouter ce noeud comme critère de recherche
+vradi.menu.addRootChildThesaurus=Ajouter un thésaurus
vradi.menu.addThesaurus=Afficher le descripteur en colonne
vradi.menu.admin=Administration
vradi.menu.client=Gestion des clients
@@ -420,35 +420,35 @@
vradi.menu.email.admin=Administration des Emails
vradi.menu.file=Fichier
vradi.menu.file.locale=Langues
-vradi.menu.file.offerList=Nouvelle fen\u00EAtre de recherche
+vradi.menu.file.offerList=Nouvelle fenêtre de recherche
vradi.menu.form=Formulaires
-vradi.menu.form.new=Cr\u00E9er un nouveau %1$s
+vradi.menu.form.new=Créer un nouveau %1$s
vradi.menu.formType=Gestion des types de formulaires
vradi.menu.group=Gestion des groupes
vradi.menu.help=Aide
vradi.menu.menuChangeColorSeleted=Changer la couleur pour cette profondeur
-vradi.menu.moveThesaurusSelected=D\u00E9placer le descripteur
-vradi.menu.removeCriteria=Supprimer ce crit\u00E8re de recherche
+vradi.menu.moveThesaurusSelected=Déplacer le descripteur
+vradi.menu.removeCriteria=Supprimer ce critère de recherche
vradi.menu.status=Gestion des statuts
-vradi.menu.thesaurus=Gestion des th\u00E9saurus
+vradi.menu.thesaurus=Gestion des thésaurus
vradi.menu.xmlStream=Gestion des flux XML
vradi.message.cannot.display.address=Une erreur est apparue en essayant d'afficher l'adresse.
vradi.message.cannot.display.history=Aucun historique disponible pour ce groupe.
vradi.message.cannot.display.stream=Une erreur est apparue en essayant d'afficher le flux.
vradi.message.cannot.display.url=Une erreur est apparue en essayant d'afficher l'URL.
-vradi.message.config.loaded=Configuration de Vradi v. %1$s charg\u00E9e.
-vradi.message.goto.site=Acc\u00E9der au site de Vradi (%1$s)
+vradi.message.config.loaded=Configuration de Vradi v. %1$s chargée.
+vradi.message.goto.site=Accéder au site de Vradi (%1$s)
vradi.message.help.usage=Aide de Vradi v %1$s
-vradi.modificationTag.lastModifier=Auteur de la derni\u00E8re modification
+vradi.modificationTag.lastModifier=Auteur de la dernière modification
vradi.num.required.value=Ce champ est obligatoire
-vradi.offer.Form.datePeremption=Date p\u00E9remption
+vradi.offer.Form.datePeremption=Date péremption
vradi.offer.Form.datePub=Date publication
vradi.offer.Form.xmlStream=Flux XML
vradi.offer.Infogene.country=Pays
-vradi.offer.Infogene.creationDate=Date cr\u00E9ation
-vradi.offer.Infogene.department=D\u00E9partement
+vradi.offer.Infogene.creationDate=Date création
+vradi.offer.Infogene.department=Département
vradi.offer.Infogene.description=Description
-vradi.offer.Infogene.entity=Entit\u00E9
+vradi.offer.Infogene.entity=Entité
vradi.offer.Infogene.id=Id
vradi.offer.Infogene.objet=Objet
vradi.offer.Infogene.sourceText=Source
@@ -459,73 +459,73 @@
vradi.offer.email.removeForm=Supprimer les formulaires de la session courante
vradi.offer.email.removeForm.msg=Voulez-vous supprimer %1$s formulaires de la session courante ?
vradi.offer.email.removeForm.title=Suppression des formulaires de la session courante
-vradi.offer.status.change=Changer le status \u00E0
-vradi.offerEdit.affectedQueries=Requ\u00EAte ?
-vradi.offerEdit.askRelatedFormName=Quel nom voulez-vous donner au formulaire li\u00E9 ?
+vradi.offer.status.change=Changer le status à
+vradi.offerEdit.affectedQueries=Requête ?
+vradi.offerEdit.askRelatedFormName=Quel nom voulez-vous donner au formulaire lié ?
vradi.offerEdit.askReplaceFormName=Quel nom voulez-vous donner au formulaire de remplacement ?
-vradi.offerEdit.attachedfile=Fichiers attach\u00E9s \:
-vradi.offerEdit.attachmentfile=Pi\u00E8ces jointes \:
-vradi.offerEdit.cantGeneratePDF=Le type de formulaire n'a pas de model de g\u00E9n\u00E9ration PDF associ\u00E9.
-vradi.offerEdit.cantGeneratePDFTitle=Impossible de g\u00E9n\u00E9rer le PDF
-vradi.offerEdit.embeddedfile=Fichiers encapsul\u00E9s \:
+vradi.offerEdit.attachedfile=Fichiers attachés \:
+vradi.offerEdit.attachmentfile=Pièces jointes \:
+vradi.offerEdit.cantGeneratePDF=Le type de formulaire n'a pas de model de génération PDF associé.
+vradi.offerEdit.cantGeneratePDFTitle=Impossible de générer le PDF
+vradi.offerEdit.embeddedfile=Fichiers encapsulés \:
vradi.offerEdit.otherIndexationTitle=Autre indexation du formulaire \: '%1$s'
-vradi.offerEdit.relatedForm=Formulaires li\u00E9es
+vradi.offerEdit.relatedForm=Formulaires liées
vradi.offerEdit.replaceForm=Autres indexations
vradi.offerEdit.view.pdf=Voir en PDF
-vradi.offerList.status.change.confirmation.message=\u00CAtes-vous s\u00FBr de vouloir changer le statut des formulaires \u00E0 '%1$s' ?
+vradi.offerList.status.change.confirmation.message=Êtes-vous sûr de vouloir changer le statut des formulaires à '%1$s' ?
vradi.offerList.status.change.confirmation.title=Modification des statuts
vradi.progressBar.title=Patientez SVP
-vradi.register.ok=Enregistrement r\u00E9ussi
-vradi.register.ok.message=Votre compte utilisateur a bien \u00E9t\u00E9 cr\u00E9\u00E9.
+vradi.register.ok=Enregistrement réussi
+vradi.register.ok.message=Votre compte utilisateur a bien été créé.
vradi.register.password.error=Erreur de mot de passe
-vradi.register.password.error.message=Vous n'avez pas entr\u00E9 deux mots de passe identiques.
+vradi.register.password.error.message=Vous n'avez pas entré deux mots de passe identiques.
vradi.register.title=Enregistrement
vradi.register.user.error=Nom incorrect
-vradi.register.user.error.message=Le nom d'utilisateur est d\u00E9j\u00E0 utilis\u00E9.
-vradi.reindex.message=\u00CAtes-vous s\u00FBr de vouloir r\u00E9indexer les donn\u00E9es ?
+vradi.register.user.error.message=Le nom d'utilisateur est déjà utilisé.
+vradi.reindex.message=Êtes-vous sûr de vouloir réindexer les données ?
vradi.reindex.title=Reindexation
vradi.request.form=Champs du formulaires
-vradi.request.infogene=Champs de l'infog\u00E8ne
+vradi.request.infogene=Champs de l'infogène
vradi.request.keywords=Champs
vradi.request.searchOnExt=Recherche sur le type de formulaire
vradi.requestFormView.resultTable.description=Description
vradi.requestFormView.resultTable.name=Nom
-vradi.requestFormView.resultTable.newQuery=Nouvelle requ\u00EAte
-vradi.requestFormView.resultTable.oldQuery=Ancienne requ\u00EAte
-vradi.requestFormView.resultTable.query=Requ\u00EAte
-vradi.requestFormView.tab.table=Liste des requ\u00EAtes
-vradi.requestFormView.tab.treetable=R\u00E9partition des requ\u00EAtes
-vradi.requestFormView.title=Liste des requ\u00EAtes
+vradi.requestFormView.resultTable.newQuery=Nouvelle requête
+vradi.requestFormView.resultTable.oldQuery=Ancienne requête
+vradi.requestFormView.resultTable.query=Requête
+vradi.requestFormView.tab.table=Liste des requêtes
+vradi.requestFormView.tab.treetable=Répartition des requêtes
+vradi.requestFormView.title=Liste des requêtes
vradi.requestSelectUI.description=Description
vradi.requestSelectUI.name=Nom
-vradi.selectForm.title=Selection d'un formulaire li\u00E9
+vradi.selectForm.title=Selection d'un formulaire lié
vradi.status.category=Status
vradi.status.required.name=Ce champ est obligatoire
vradi.status.validate=Choisir le statut pour valider \:
vradi.stream.category=Flux xml
vradi.string.required.value=Ce champ est obligatoire
vradi.table.field.name=Champ
-vradi.table.field.name.tip=Champ du mod\u00E8le OpenOffice \u00E0 remplacer
+vradi.table.field.name.tip=Champ du modèle OpenOffice à remplacer
vradi.table.field.values=Valeur
-vradi.table.field.values.tip=Valeur par laquelle le champ va \u00EAtre remplac\u00E9
+vradi.table.field.values.tip=Valeur par laquelle le champ va être remplacé
vradi.text.required.value=Ce champ est obligatoire
vradi.thesaurus.colomns.name=Nom
-vradi.thesaurus.colomns.nbForm=Nombres de formulaires associ\u00E9s au descripteur
+vradi.thesaurus.colomns.nbForm=Nombres de formulaires associés au descripteur
vradi.thesaurus.colomns.tags=Tags
-vradi.thesaurus.colorTitle=Choisir une couleur pour la profondeur s\u00E9lectionn\u00E9e
+vradi.thesaurus.colorTitle=Choisir une couleur pour la profondeur sélectionnée
vradi.thesaurus.commentToolTip=Commentaire \:
vradi.thesaurus.confirm.save=Sauvegarder
-vradi.thesaurus.createNewRoot=Cr\u00E9er un th\u00E9saurus
-vradi.thesaurus.expendByDefault=D\u00E9plier les descripteurs lors de la s\u00E9lection
+vradi.thesaurus.createNewRoot=Créer un thésaurus
+vradi.thesaurus.expendByDefault=Déplier les descripteurs lors de la sélection
vradi.thesaurus.name=Nom
vradi.thesaurus.nameToolTip=Chemin \:
-vradi.thesaurus.nbforms=Nombre de formulaires attach\u00E9s
+vradi.thesaurus.nbforms=Nombre de formulaires attachés
vradi.thesaurus.showApply=Montrer les implications
vradi.thesaurus.tags=Tags
vradi.thesaurus.tagsToolTip=Tags \:
vradi.thesaurus.toolTipTitle=Thesaurus \: %1$s
-vradi.thesaurusCartographyUI.title=Cartographie des r\u00E9sultats de recherche
-vradi.thesaurusQueryChangesUI.confirm.cancel=Vous allez annuler la modification des requ\u00EAtes.\nLes modifications des th\u00E9saurus sont d\u00E9j\u00E0 enregistr\u00E9es.\n\u00CAtes-vous s\u00FBr de vouloir continuer ?
+vradi.thesaurusCartographyUI.title=Cartographie des résultats de recherche
+vradi.thesaurusQueryChangesUI.confirm.cancel=Vous allez annuler la modification des requêtes.\nLes modifications des thésaurus sont déjà enregistrées.\nÊtes-vous sûr de vouloir continuer ?
vradi.title.about=A propos de Vradi...
vradi.title.welcome=Vradi
vradi.url.invalid.value=
@@ -533,5 +533,5 @@
vradi.user.category=Utilisateurs
vradi.vradiUser.regex.login=Ce champ n'est pas valide
vradi.vradiUser.required.login=Ce champ est obligatoire
-vradi.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java.
-vradi.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9
+vradi.warning.nimbus.landf=Le look and Feel Nimbus n'a pas été trouvé, il faut au moins la version 1.6u10 de java.
+vradi.warning.no.ui=Aucun environnement graphique détecté
1
0