Author: tchemit Date: 2011-11-08 09:56:23 +0100 (Tue, 08 Nov 2011) New Revision: 19 Url: http://forge.codelutin.com/repositories/revision/echobase/19 Log: add missing configuration + readd i18n (needed for db editor) Modified: trunk/echobase-entities/src/license/THIRD-PARTY.properties trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextSupplierFactory.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserImpl.java trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.properties Modified: trunk/echobase-entities/src/license/THIRD-PARTY.properties =================================================================== --- trunk/echobase-entities/src/license/THIRD-PARTY.properties 2011-11-07 16:20:09 UTC (rev 18) +++ trunk/echobase-entities/src/license/THIRD-PARTY.properties 2011-11-08 08:56:23 UTC (rev 19) @@ -24,3 +24,4 @@ commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +echobase.title.dbEditor=Editeur de données Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-07 16:20:09 UTC (rev 18) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2011-11-08 08:56:23 UTC (rev 19) @@ -41,15 +41,16 @@ /** * EchoBase configuration * - * @author chemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.1 */ public class EchoBaseConfiguration { /** Logger. */ - protected static final Log log = LogFactory.getLog(EchoBaseConfiguration.class); + protected static final Log log = + LogFactory.getLog(EchoBaseConfiguration.class); - /** Delegate application config object containing all the configuration. */ + /** Delegate application config object containing configuration. */ protected ApplicationConfig applicationConfig; public EchoBaseConfiguration() { @@ -90,6 +91,18 @@ return file; } + public File getWarDirectory() { + File file = applicationConfig.getOptionAsFile(EchoBaseConfigurationOption.WAR_DIRECTORY.key); + Preconditions.checkNotNull(file); + return file; + } + + public File getWarLocation() { + File file = applicationConfig.getOptionAsFile(EchoBaseConfigurationOption.WAR_LOCATION.key); + Preconditions.checkNotNull(file); + return file; + } + public Version getApplicationVersion() { Version v = applicationConfig.getOptionAsVersion(EchoBaseConfigurationOption.VERSION.key); Preconditions.checkNotNull(v); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2011-11-07 16:20:09 UTC (rev 18) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2011-11-08 08:56:23 UTC (rev 19) @@ -34,31 +34,31 @@ /** * All EchoBase configuration options. * - * @author chemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.1 */ public enum EchoBaseConfigurationOption implements ApplicationConfig.OptionDef { /** Main directory where to put echobase data (logs, and others...). */ - DATA_DIRECTORY( - "data.directory", - n_("echobase.config.data.directory.description"), - "/var/local/echobase", - File.class), - - PASSWORD_DIGEST_ALGORITHM( - "password.digest.algorithm", - "Algorithme de hashage à utiliser pour les mot de passe", - "SHA1", String.class), - VERSION( - "project.version", + DATA_DIRECTORY("data.directory", + n_("echobase.config.data.directory.description"), + "/var/local/echobase", + File.class), + VERSION("project.version", "Version de l'application", "", Version.class), - SITE_URL( - "project.siteUrl", - "URL du site de l'application", - "", URL.class); + SITE_URL("project.siteUrl", + "URL du site de l'application", + "", URL.class), + WAR_DIRECTORY("war.directory", + "Répertoire où est stoqué le war", + "/var/local/echobase/war", File.class), + WAR_LOCATION("war.location", + "Chemin complêt d'accès au war", + "${war.directory}/echobase-${project.version}.war", + File.class); + /** Configuration key. */ protected final String key; Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java 2011-11-07 16:20:09 UTC (rev 18) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTechnicalException.java 2011-11-08 08:56:23 UTC (rev 19) @@ -24,7 +24,7 @@ package fr.ifremer.echobase; /** - * @author chemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.1 */ public class EchoBaseTechnicalException extends RuntimeException { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextSupplierFactory.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextSupplierFactory.java 2011-11-07 16:20:09 UTC (rev 18) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextSupplierFactory.java 2011-11-08 08:56:23 UTC (rev 19) @@ -42,7 +42,7 @@ import java.util.Set; /** - * @author chemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 0.1 */ public class EchoBaseTopiaRootContextSupplierFactory { Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserImpl.java 2011-11-07 16:20:09 UTC (rev 18) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserImpl.java 2011-11-08 08:56:23 UTC (rev 19) @@ -38,7 +38,6 @@ EchoBaseUserDTO dto = new EchoBaseUserDTOImpl(); dto.setAdmin(isAdmin()); dto.setEmail(getEmail()); -// dto.setPassword(getPassword()); dto.setId(getTopiaId()); return dto; } @@ -47,7 +46,5 @@ public void fromDTO(EchoBaseUserDTO dto) { setAdmin(dto.isAdmin()); setEmail(dto.getEmail()); -// setPassword(dto.getPassword()); } - } Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-07 16:20:09 UTC (rev 18) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-08 08:56:23 UTC (rev 19) @@ -1 +1,14 @@ -echobase.config.data.directory.description= +echobase.common.admin=Administrateur +echobase.common.description=Description +echobase.common.echoBaseUser=Utilisateur +echobase.common.echoBaseUserDTO= +echobase.common.email=Courriel +echobase.common.exportQuery=Requête d'export +echobase.common.exportQueryDTO= +echobase.common.id=Identifiant +echobase.common.lastModifiedDate=Date de dernière modification +echobase.common.lastModifiedUser=Utilisateur de dernière modification +echobase.common.name=Nom +echobase.common.password=Mot de passe +echobase.common.sqlQuery=Requête SQL +echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2011-11-07 16:20:09 UTC (rev 18) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2011-11-08 08:56:23 UTC (rev 19) @@ -22,7 +22,7 @@ # #L% ### -#model.tagValue.i18n=echobase.common. +model.tagValue.i18n=echobase.common. model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true