Author: tchemit Date: 2014-02-12 14:40:05 +0100 (Wed, 12 Feb 2014) New Revision: 930 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/930 Log: fixes #4061: Updates mavenpom to 4.7 fixes #4425: Updates I18n to 3.0 and all the nuiton-xxx libs fixes licenses Modified: trunk/LICENSE.txt trunk/echobase-domain/LICENSE.txt trunk/echobase-domain/pom.xml trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java trunk/echobase-services/LICENSE.txt trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java trunk/echobase-ui/LICENSE.txt trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java trunk/pom.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/LICENSE.txt 2014-02-12 13:40:05 UTC (rev 930) @@ -658,4 +658,4 @@ 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 +<http://www.gnu.org/licenses/>. Modified: trunk/echobase-domain/LICENSE.txt =================================================================== --- trunk/echobase-domain/LICENSE.txt 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-domain/LICENSE.txt 2014-02-12 13:40:05 UTC (rev 930) @@ -658,4 +658,4 @@ 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 +<http://www.gnu.org/licenses/>. Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-domain/pom.xml 2014-02-12 13:40:05 UTC (rev 930) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> @@ -73,25 +73,6 @@ </goals> </execution> </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topiaVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-templates</artifactId> - <version>${topiaVersion}</version> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - </dependency> - </dependencies> </plugin> <plugin> Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseApplicationConfigProvider.java 2014-02-12 13:40:05 UTC (rev 930) @@ -29,7 +29,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * To generate configuration report. @@ -46,7 +46,7 @@ @Override public String getDescription(Locale locale) { - return l_(locale, "echobase.configuration.description"); + return l(locale, "echobase.configuration.description"); } @Override Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java 2014-02-12 13:40:05 UTC (rev 930) @@ -28,7 +28,7 @@ import java.io.File; import java.net.URL; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * All EchoBase configuration options. @@ -40,42 +40,42 @@ /** Main directory where to put echobase data (logs, and others...). */ DATA_DIRECTORY("echobase.data.directory", - n_("echobase.config.data.directory.description"), + n("echobase.config.data.directory.description"), "/var/local/echobase/data", File.class), LIBRARY_DIRECTORY("echobase.lib.directory", - n_("echobase.config.lib.directory.description"), + n("echobase.config.lib.directory.description"), "${echobase.data.directory}/lib", File.class), INTERNAL_DB_DIRECTORY( "echobase.internal.db.directory", - n_("echobase.config.internal.db.directory.description"), + n("echobase.config.internal.db.directory.description"), "${echobase.data.directory}/internaldb", File.class), EMBEDDED("echobase.embedded", - n_("echobase.config.embedded.description"), + n("echobase.config.embedded.description"), "false", boolean.class), VERSION("echobase.version", - n_("echobase.config.version.description"), + n("echobase.config.version.description"), "", Version.class), H2_VERSION("echobase.h2Version", - n_("echobase.config.h2Version.description"), + n("echobase.config.h2Version.description"), "", String.class), POSTGRESQL_VERSION("echobase.postgresqlVersion", - n_("echobase.config.postgresqlVersion.description"), + n("echobase.config.postgresqlVersion.description"), "", String.class), CSV_SEPARATOR("echobase.csv.separator", - n_("echobase.config.csv.separator.description"), + n("echobase.config.csv.separator.description"), ";", char.class), WAR_LOCATION("echobase.war.location", - n_("echobase.config.war.location.description"), + n("echobase.config.war.location.description"), "${echobase.lib.directory}/echobase-embedded-${echobase.version}.war", File.class), LOG_CONFIG_FILE("echobase.log.config.file", - n_("echobase.config.log.config.file.description"), + n("echobase.config.log.config.file.description"), "${echobase.data.directory}/echobase-log.config", File.class), DOCUMENTATION_URL("echobase.documentationUrl", - n_("echobase.config.documentationUrl.description"), + n("echobase.config.documentationUrl.description"), "http://maven-site.forge.codelutin.com/echobase", URL.class); Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/DriverType.java 2014-02-12 13:40:05 UTC (rev 930) @@ -28,7 +28,7 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.PostgreSQL82Dialect; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * To define a type of driver (h2 or postgres for the moment). @@ -40,7 +40,7 @@ H2(org.h2.Driver.class, H2Dialect.class, - n_("echobase.common.driverType.h2")) { + n("echobase.common.driverType.h2")) { @Override public String getPilotVersion(EchoBaseConfiguration config) { String version = config.getH2Version(); @@ -49,7 +49,7 @@ }, POSTGRESQL(org.postgresql.Driver.class, PostgreSQL82Dialect.class, - n_("echobase.common.driverType.postgres")) { + n("echobase.common.driverType.postgres")) { @Override public String getPilotVersion(EchoBaseConfiguration config) { String version = config.getPostgresqlVersion(); Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportType.java 2014-02-12 13:40:05 UTC (rev 930) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.I18nAble; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Define what import has been done. @@ -36,56 +36,56 @@ public enum ImportType implements I18nAble { /** Import a voyage with all his data. */ - VOYAGE(n_("echobase.common.importType.voyage"), - n_("echobase.common.importType.voyage.short")), + VOYAGE(n("echobase.common.importType.voyage"), + n("echobase.common.importType.voyage.short")), /** Import Voyage / Transit / Transect. */ - COMMON_ALL(n_("echobase.common.importType.commonDataAll"), - n_("echobase.common.importType.commonDataAll.short")), + COMMON_ALL(n("echobase.common.importType.commonDataAll"), + n("echobase.common.importType.commonDataAll.short")), /** Import Voyage. */ - COMMON_VOYAGE(n_("echobase.common.importType.commonDataVoyage"), - n_("echobase.common.importType.commonDataVoyage.short")), + COMMON_VOYAGE(n("echobase.common.importType.commonDataVoyage"), + n("echobase.common.importType.commonDataVoyage.short")), /** Import Transit. */ - COMMON_TRANSIT(n_("echobase.common.importType.commonDataTransit"), - n_("echobase.common.importType.commonDataTransit.short")), + COMMON_TRANSIT(n("echobase.common.importType.commonDataTransit"), + n("echobase.common.importType.commonDataTransit.short")), /** Import Transect. */ - COMMON_TRANSECT(n_("echobase.common.importType.commonDataTransect"), - n_("echobase.common.importType.commonDataTransect.short")), + COMMON_TRANSECT(n("echobase.common.importType.commonDataTransect"), + n("echobase.common.importType.commonDataTransect.short")), /** Import Operations. */ - OPERATION(n_("echobase.common.importType.operation"), - n_("echobase.common.importType.operation.short")), + OPERATION(n("echobase.common.importType.operation"), + n("echobase.common.importType.operation.short")), /** Import Catches (unsorted, total, but no individual ones). */ - CATCHES(n_("echobase.common.importType.catches"), - n_("echobase.common.importType.catches.short")), + CATCHES(n("echobase.common.importType.catches"), + n("echobase.common.importType.catches.short")), /** Import accoustic data (Cells ESDU and Elementary). */ - ACOUSTIC(n_("echobase.common.importType.acoustic"), - n_("echobase.common.importType.acoustic.short")), + ACOUSTIC(n("echobase.common.importType.acoustic"), + n("echobase.common.importType.acoustic.short")), /** Import results at voyage level. */ - RESULT_VOYAGE(n_("echobase.common.importType.resultsVoyage"), - n_("echobase.common.importType.resultsVoyage.short")), + RESULT_VOYAGE(n("echobase.common.importType.resultsVoyage"), + n("echobase.common.importType.resultsVoyage.short")), /** Import esdu results by echotype. */ - RESULT_ESDU(n_("echobase.common.importType.resultsEsdu"), - n_("echobase.common.importType.resultsEsdu.short")), + RESULT_ESDU(n("echobase.common.importType.resultsEsdu"), + n("echobase.common.importType.resultsEsdu.short")), /** Import cells Region. */ - RESULT_REGION(n_("echobase.common.importType.resultsRegion"), - n_("echobase.common.importType.resultsRegion.short")), + RESULT_REGION(n("echobase.common.importType.resultsRegion"), + n("echobase.common.importType.resultsRegion.short")), /** Import cells Map Fish. */ - RESULT_MAP_FISH(n_("echobase.common.importType.resultsMapFish"), - n_("echobase.common.importType.resultsMapFish.short")), + RESULT_MAP_FISH(n("echobase.common.importType.resultsMapFish"), + n("echobase.common.importType.resultsMapFish.short")), /** Import cells Map Other. */ - RESULT_MAP_OTHER(n_("echobase.common.importType.resultsMapOther"), - n_("echobase.common.importType.resultsMapOther.short")); + RESULT_MAP_OTHER(n("echobase.common.importType.resultsMapOther"), + n("echobase.common.importType.resultsMapOther.short")); /** * All common import types. Modified: trunk/echobase-services/LICENSE.txt =================================================================== --- trunk/echobase-services/LICENSE.txt 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/LICENSE.txt 2014-02-12 13:40:05 UTC (rev 930) @@ -658,4 +658,4 @@ 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 +<http://www.gnu.org/licenses/>. Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/pom.xml 2014-02-12 13:40:05 UTC (rev 930) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-02-12 13:40:05 UTC (rev 930) @@ -68,7 +68,7 @@ import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Service to edit the database. @@ -450,7 +450,7 @@ if (monitor == null) { // no monitor, means this is a creation of an object - buffer.append(l_(l, "echobase.info.newEntityCreated", topiaId)); + buffer.append(l(l, "echobase.info.newEntityCreated", topiaId)); } else { PropertyDiff[] propertyDiffs = monitor.getPropertyDiffs(); @@ -464,10 +464,10 @@ } if (length == 1) { - buffer.append(l_(l, "echobase.info.onePropertyModified")); + buffer.append(l(l, "echobase.info.onePropertyModified")); } else { buffer.append( - l_(l, "echobase.info.somePropertiesModified", length)); + l(l, "echobase.info.somePropertiesModified", length)); } for (PropertyDiff diff : propertyDiffs) { @@ -490,7 +490,7 @@ } buffer.append("\n "); buffer.append( - l_(l, "echobase.info.modifiedProperty", propertyName, + l(l, "echobase.info.modifiedProperty", propertyName, sourceValue, targetValue)); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-02-12 13:40:05 UTC (rev 930) @@ -99,7 +99,7 @@ import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Service to decorate entities. @@ -139,7 +139,7 @@ public final <E extends Enum<E> & I18nAble> Map<String, String> decorateEnums(E... enumValues) { Map<String, String> result = Maps.newLinkedHashMap(); for (E enumValue : enumValues) { - result.put(enumValue.name(), _(enumValue.getI18nKey())); + result.put(enumValue.name(), t(enumValue.getI18nKey())); } return result; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportDbMode.java 2014-02-12 13:40:05 UTC (rev 930) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.I18nAble; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Db export mode. @@ -36,13 +36,13 @@ public enum ExportDbMode implements I18nAble { /** Export only referential. */ - REFERENTIAL(n_("echobase.common.exportDbMode.referential"), true, false), + REFERENTIAL(n("echobase.common.exportDbMode.referential"), true, false), /** Export selected data + referential. */ - REFERENTIAL_AND_DATA(n_("echobase.common.exportDbMode.referentialAndData"), true, true), + REFERENTIAL_AND_DATA(n("echobase.common.exportDbMode.referentialAndData"), true, true), /** Export all the db. */ - ALL(n_("echobase.common.exportDbMode.all"), true, true); + ALL(n("echobase.common.exportDbMode.all"), true, true); private final String i18nKey; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java 2014-02-12 13:40:05 UTC (rev 930) @@ -68,7 +68,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Abstract data import service. @@ -209,7 +209,7 @@ protected final String getImportLabel(M configuration) { Locale locale = getLocale(); - String result = l_(locale, configuration.getImportType().getI18nKey()); + String result = l(locale, configuration.getImportType().getI18nKey()); return result; } @@ -238,7 +238,7 @@ } protected String getImportMessage(M configuration, InputFile inputFile) { - String message = l_(getLocale(), "echobase.importLabel.withFile", + String message = l(getLocale(), "echobase.importLabel.withFile", getImportLabel(configuration), inputFile.getFileName()); return message; } @@ -382,7 +382,7 @@ DataMetadata dataMetadata = dataMetadataMap.get(metadataName); if (dataMetadata == null) { throw new ImportRuntimeException( - l_(locale, "echobase.importError.dataMetadata.notFound", + l(locale, "echobase.importError.dataMetadata.notFound", metadataName, dataMetadataMap.keySet())); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportConfiguration.java 2014-02-12 13:40:05 UTC (rev 930) @@ -28,7 +28,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Configuration of a "accoustic datas" import. @@ -96,7 +96,7 @@ public AcousticImportConfiguration(Locale locale) { - moviesFile = InputFile.newFile(l_(locale, "echobase.common.moviesFile")); + moviesFile = InputFile.newFile(l(locale, "echobase.common.moviesFile")); importType = ImportType.ACOUSTIC; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java 2014-02-12 13:40:05 UTC (rev 930) @@ -60,7 +60,7 @@ import java.util.Map; import java.util.Set; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Service to launch a "acoustic data" import. @@ -200,7 +200,7 @@ // can not find correct transit throw new ImportException( - l_(locale, "echobase.importError.transit.notfound", + l(locale, "echobase.importError.transit.notfound", voyage.getName(), startDate, rowNumber)); @@ -211,7 +211,7 @@ // can not find correct transect throw new ImportException( - l_(locale, "echobase.importError.transect.notfound", + l(locale, "echobase.importError.transect.notfound", voyage.getName(), startDate, vessel.getName(), @@ -238,7 +238,7 @@ // means miss a esdu cell // can not find correct transect throw new ImportException( - l_(locale, "echobase.importError.esduCell.notfound", + l(locale, "echobase.importError.esduCell.notfound", voyage.getName(), vessel.getName(), instrument.getId(), Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportConfiguration.java 2014-02-12 13:40:05 UTC (rev 930) @@ -28,7 +28,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Configuration of a "catches data import". @@ -51,11 +51,11 @@ public CatchesImportConfiguration(Locale locale) { totalSampleFile = InputFile.newFile( - l_(locale, "echobase.common.totalSampleFile")); + l(locale, "echobase.common.totalSampleFile")); subSampleFile = InputFile.newFile( - l_(locale, "echobase.common.subSampleFile")); + l(locale, "echobase.common.subSampleFile")); biometrySampleFile = InputFile.newFile( - l_(locale, "echobase.common.biometrySampleFile")); + l(locale, "echobase.common.biometrySampleFile")); importType = ImportType.CATCHES; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java 2014-02-12 13:40:05 UTC (rev 930) @@ -59,7 +59,7 @@ import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Service to launch a "catches sample data" import. @@ -215,7 +215,7 @@ // can not have twice same sample throw new ImportException( - l_(locale, "echobase.importError.duplicate.sample", + l(locale, "echobase.importError.duplicate.sample", operation.getId(), sampleType.getName(), species.getBaracoudaCode(), Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CellPositionReference.java 2014-02-12 13:40:05 UTC (rev 930) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.I18nAble; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * To define cell position reference in acoustic import. @@ -36,7 +36,7 @@ public enum CellPositionReference implements I18nAble { /** Begin. */ - START(n_("echobase.common.cellPositionReference.start")) { + START(n("echobase.common.cellPositionReference.start")) { @Override public String getMetadataNameSuffix() { return "Start"; @@ -44,7 +44,7 @@ }, /** Mid. */ - MID(n_("echobase.common.cellPositionReference.mid")) { + MID(n("echobase.common.cellPositionReference.mid")) { @Override public String getMetadataNameSuffix() { return "Bary"; @@ -52,7 +52,7 @@ }, /** End. */ - END(n_("echobase.common.cellPositionReference.end")) { + END(n("echobase.common.cellPositionReference.end")) { @Override public String getMetadataNameSuffix() { return "End"; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportConfiguration.java 2014-02-12 13:40:05 UTC (rev 930) @@ -27,7 +27,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Configuration of a "common data complete" import. @@ -74,11 +74,11 @@ public CommonImportConfiguration(Locale locale) { voyageFile = InputFile.newFile( - l_(locale, "echobase.common.voyageFile")); + l(locale, "echobase.common.voyageFile")); transitFile = InputFile.newFile( - l_(locale, "echobase.common.transitFile")); + l(locale, "echobase.common.transitFile")); transectFile = InputFile.newFile( - l_(locale, "echobase.common.transectFile")); + l(locale, "echobase.common.transectFile")); } public String getMissionId() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java 2014-02-12 13:40:05 UTC (rev 930) @@ -44,7 +44,7 @@ import java.util.Date; import java.util.Map; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Service to launch a "common transect data" import. @@ -124,7 +124,7 @@ timeCoverageEnd); if (transit == null) { throw new ImportException( - l_(getLocale(), "echobase.importError.no.transit.between.date", + l(getLocale(), "echobase.importError.no.transit.between.date", voyage.getName(), timeCoverageStart, timeCoverageEnd)); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java 2014-02-12 13:40:05 UTC (rev 930) @@ -39,7 +39,7 @@ import java.io.Reader; import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Service to launch a "common voyage data" import. @@ -110,7 +110,7 @@ // this means a voyage file with more than one row not possible... throw new ImportException( - l_(locale, "echobase.importError.can.only.import.one.voyage.atime")); + l(locale, "echobase.importError.can.only.import.one.voyage.atime")); } // collect id of the import @@ -119,7 +119,7 @@ if (newVoyage == null) { throw new ImportException( - l_(locale, "echobase.importError.no.voyage.imported")); + l(locale, "echobase.importError.no.voyage.imported")); } // push back to id of the voyage in configuration for next imports Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportException.java 2014-02-12 13:40:05 UTC (rev 930) @@ -27,7 +27,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Exception when a import new data failed. @@ -48,7 +48,7 @@ } public ImportException(Locale locale, InputFile inputfile, Exception importError) { - this(l_(locale, "echobase.importError.fromFile", + this(l(locale, "echobase.importError.fromFile", inputfile.getFile().getName(), importError.getMessage()), importError); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportConfiguration.java 2014-02-12 13:40:05 UTC (rev 930) @@ -28,7 +28,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Configuration of a "operation" import. @@ -51,11 +51,11 @@ public OperationImportConfiguration(Locale locale) { operationFile = InputFile.newFile( - l_(locale, "echobase.common.operationFile")); + l(locale, "echobase.common.operationFile")); operationMetadataFile = InputFile.newFile( - l_(locale, "echobase.common.operationMetadataFile")); + l(locale, "echobase.common.operationMetadataFile")); gearMetadataFile = InputFile.newFile( - l_(locale, "echobase.common.gearMetadataFile")); + l(locale, "echobase.common.gearMetadataFile")); importType = ImportType.OPERATION; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportConfiguration.java 2014-02-12 13:40:05 UTC (rev 930) @@ -27,7 +27,7 @@ import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Configuration of a "results" import. @@ -83,27 +83,27 @@ public ResultsImportConfiguration(Locale locale) { regionsFile = InputFile.newFile( - l_(locale, "echobase.common.cellRegionsFile")); + l(locale, "echobase.common.cellRegionsFile")); regionAssociationFile = InputFile.newFile( - l_(locale, "echobase.common.cellRegionAssociationFile")); + l(locale, "echobase.common.cellRegionAssociationFile")); regionResultFile = InputFile.newFile( - l_(locale, "echobase.common.cellRegionResultFile")); + l(locale, "echobase.common.cellRegionResultFile")); mapsFile = InputFile.newFile( - l_(locale, "echobase.common.cellMapsFile")); + l(locale, "echobase.common.cellMapsFile")); echotypeFile = InputFile.newFile( - l_(locale, "echobase.common.echotypeFile")); + l(locale, "echobase.common.echotypeFile")); lengthAgeKeyFile = InputFile.newFile( - l_(locale, "echobase.common.lengthAgeKeyFile")); + l(locale, "echobase.common.lengthAgeKeyFile")); lengthWeightKeyFile = InputFile.newFile( - l_(locale, "echobase.common.lengthWeightKeyFile")); + l(locale, "echobase.common.lengthWeightKeyFile")); esduByEchotypeFile = InputFile.newFile( - l_(locale, "echobase.common.esduByEchotypeFile")); + l(locale, "echobase.common.esduByEchotypeFile")); esduByEchotypeAndSpeciesCategoryFile = InputFile.newFile( - l_(locale, "echobase.common.esduByEchotypeAndSpeciesCategoryFile")); + l(locale, "echobase.common.esduByEchotypeAndSpeciesCategoryFile")); esduBySpeciesAndSizeCategoryFile = InputFile.newFile( - l_(locale, "echobase.common.esduBySpeciesAndSizeCategoryFile")); + l(locale, "echobase.common.esduBySpeciesAndSizeCategoryFile")); esduBySpeciesAndAgeCategoryFile = InputFile.newFile( - l_(locale, "echobase.common.esduBySpeciesAndAgeCategoryFile")); + l(locale, "echobase.common.esduBySpeciesAndAgeCategoryFile")); } public String getVesselId() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbConfiguration.java 2014-02-12 13:40:05 UTC (rev 930) @@ -32,7 +32,7 @@ import java.io.IOException; import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Configuration of a import db operation. @@ -57,11 +57,11 @@ public ImportDbConfiguration(ProgressModel progressModel, Locale locale) { super(progressModel); - input = InputFile.newFile(l_(locale, "echobase.common.importDbFile")); + input = InputFile.newFile(l(locale, "echobase.common.importDbFile")); } public ImportDbConfiguration(Locale locale) { - input = InputFile.newFile(l_(locale, "echobase.common.importDbFile")); + input = InputFile.newFile(l(locale, "echobase.common.importDbFile")); } public File getWorkingDirectory() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbMode.java 2014-02-12 13:40:05 UTC (rev 930) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.I18nAble; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Select import db mode. @@ -36,10 +36,10 @@ public enum ImportDbMode implements I18nAble { /** Import only referential. */ - REFERENTIAL(n_("echobase.common.importDbMode.referential")), + REFERENTIAL(n("echobase.common.importDbMode.referential")), /** Import what you want. */ - FREE(n_("echobase.common.importDbMode.free")); + FREE(n("echobase.common.importDbMode.free")); private final String i18nKey; Modified: trunk/echobase-ui/LICENSE.txt =================================================================== --- trunk/echobase-ui/LICENSE.txt 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-ui/LICENSE.txt 2014-02-12 13:40:05 UTC (rev 930) @@ -658,4 +658,4 @@ 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 +<http://www.gnu.org/licenses/>. Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-ui/pom.xml 2014-02-12 13:40:05 UTC (rev 930) @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2014-02-12 13:40:05 UTC (rev 930) @@ -29,6 +29,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import static org.nuiton.i18n.I18n.t; + /** * Launch the complete db export. * @@ -58,23 +60,23 @@ @Override protected String getSuccesMessage() { - return _("echobase.info.exportDb.succeded"); + return t("echobase.info.exportDb.succeded"); } @Override protected String getErrorMessage() { - return _("echobase.info.exportDb.failed"); + return t("echobase.info.exportDb.failed"); } @Override public String getActionResumeTitle() { - return _("echobase.legend.exportDb.resume"); + return t("echobase.legend.exportDb.resume"); } @Override protected String getResultMessage(ExportDbConfiguration model) { - String exportType = _(model.getExportDbMode().getI18nKey()); - String result = _("echobase.message.exportDb.result", + String exportType = t(model.getExportDbMode().getI18nKey()); + String result = t("echobase.message.exportDb.result", exportType, model.getFileName(), model.getActionTime()); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ImportMode.java 2014-02-12 13:40:05 UTC (rev 930) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.I18nAble; import fr.ifremer.echobase.entities.ImportType; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * To define the mode of import data (says files to be imported). @@ -37,7 +37,7 @@ public enum ImportMode implements I18nAble { /** Import Voyage / Transit / Transect. */ - Common(n_("echobase.common.importType.common")), + Common(n("echobase.common.importType.common")), /** Import operations common data. */ Operation(ImportType.OPERATION.getI18nKey()), @@ -49,7 +49,7 @@ Acoustic(ImportType.ACOUSTIC.getI18nKey()), /** Import results. */ - Results(n_("echobase.common.importType.results")); + Results(n("echobase.common.importType.results")); private final String i18nKey; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DashBoard.java 2014-02-12 13:40:05 UTC (rev 930) @@ -30,6 +30,8 @@ import java.io.Serializable; import java.util.List; +import static org.nuiton.i18n.I18n.t; + /** * DashBoard of existing voyages. * @@ -53,8 +55,8 @@ for (ImportType importType : ImportType.values()) { ImportTypeEntry entry = new ImportTypeEntry( importType.name(), - _(importType.getShortI18nKey()), - _(importType.getI18nKey()) + t(importType.getShortI18nKey()), + t(importType.getI18nKey()) ); importTypes.add(entry); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2014-02-12 13:40:05 UTC (rev 930) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Checks that a working db was selected, otherwise redirect to home. @@ -54,7 +54,7 @@ invocation.getInvocationContext()); boolean dbSelected = echoBaseSession.isWorkingDbSelected(); if (!dbSelected) { - action.addFlashMessage(l_(action.getLocale(), + action.addFlashMessage(l(action.getLocale(), "echobase.info.no.workingDb.selected")); if (log.isDebugEnabled()) { log.debug("No working db selected, will redirect to home"); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-22 21:32:46 UTC (rev 929) +++ trunk/pom.xml 2014-02-12 13:40:05 UTC (rev 930) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.5.2-SNAPSHOT</version> + <version>2.6-SNAPSHOT</version> <modules> <module>echobase-domain</module> @@ -139,9 +139,9 @@ <!-- libraries version --> <topiaVersion>3.0-SNAPSHOT</topiaVersion> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonWebVersion>1.15-SNAPSHOT</nuitonWebVersion> - <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonI18nVersion>3.0</nuitonI18nVersion> + <nuitonWebVersion>1.15-alpha-3</nuitonWebVersion> <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <h2Version>1.3.174</h2Version> @@ -204,26 +204,26 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-decorator</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-alpha-3</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-alpha-3</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>3.0-alpha-1</version> + <version>3.0-alpha-2</version> </dependency> <dependency> @@ -277,7 +277,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.2.5.Final</version> + <version>4.3.1.Final</version> </dependency> <!-- base postgres --> @@ -414,7 +414,26 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>2.7.3</version> + <version>2.7.4</version> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-templates</artifactId> + <version>${topiaVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + </dependencies> </plugin> <plugin>