Author: tchemit Date: 2013-02-16 08:17:12 +0100 (Sat, 16 Feb 2013) New Revision: 435 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/435 Log: fix i18n, fixes #2007: Gestion des logs dans dans le r?\195?\169pertoire de l'application Added: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties Removed: trunk/tutti-ui-swing/src/main/resources/log4j.properties Modified: trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh trunk/tutti-ui-swing/src/main/assembly/min/launch.bat trunk/tutti-ui-swing/src/main/assembly/min/launch.sh trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-02-15 21:01:33 UTC (rev 434) +++ trunk/tutti-ui-swing/pom.xml 2013-02-16 07:17:12 UTC (rev 435) @@ -76,6 +76,8 @@ target/${bundlePrefix}-full-linux-x64.zip </redmine.releaseFiles> + <tutti.log.file>\$\{java.io.tmpdir\}\tutti-${project.version}.log</tutti.log.file> + </properties> <build> @@ -86,6 +88,7 @@ <filtering>true</filtering> <includes> <include>*.config</include> + <include>*.properties</include> </includes> </resource> <resource> @@ -185,7 +188,7 @@ <goals> <goal>copy-dependencies</goal> </goals> - <phase>process-classes</phase> + <phase>prepare-package</phase> <configuration> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> @@ -358,7 +361,22 @@ <profiles> + <profile> + <id>add-release-properties</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <tutti.log.file>$\{tutti.log.file\}</tutti.log.file> + </properties> + + </profile> + + <profile> <id>default-bundle</id> <activation> <property> Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2013-02-15 21:01:33 UTC (rev 434) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.bat 2013-02-16 07:17:12 UTC (rev 435) @@ -3,20 +3,22 @@ set OLDDIR=%CD% cd /d %~dp0% -set REP=%CD% -set JAVA_HOME=%REP%\jre -set TUTTI_HOME=%REP%\tutti +set TUTTI_BASEDIR=%CD% +set JAVA_HOME=%TUTTI_BASEDIR%\jre +set TUTTI_HOME=%TUTTI_BASEDIR%\tutti set JAVA_COMMAND=%JAVA_HOME%\bin\java +set TUTTI_LOG_FILE=%TUTTI_BASEDIR%\data\tutti-${project.version}.log -echo "tutti basedir: %REP%" +echo "tutti basedir: %TUTTI_BASEDIR%" echo "tutti app home: %TUTTI_HOME%" echo "tutti jre home: %JAVA_HOME%" +echo "tutti log file: %TUTTI_LOG_FILE%" copy %TUTTI_HOME%\update.bat . call update.bat del update.bat copy tutti.config tutti -call %TUTTI_HOME%\launch.bat --option tutti.launch.mode full --option tutti.basedir %REP% +call %TUTTI_HOME%\launch.bat --option tutti.launch.mode full --option tutti.basedir %TUTTI_BASEDIR% if errorlevel 88 goto start cd %OLDDIR% Modified: trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2013-02-15 21:01:33 UTC (rev 434) +++ trunk/tutti-ui-swing/src/main/assembly/full/tutti.sh 2013-02-16 07:17:12 UTC (rev 435) @@ -1,23 +1,25 @@ #!/bin/bash -REP=$(pwd) -export TUTTI_HOME=$REP/tutti -export JAVA_HOME=$REP/jre +export TUTTI_BASEDIR=$(pwd) +export TUTTI_HOME=$TUTTI_BASEDIR/tutti +export JAVA_HOME=$TUTTI_BASEDIR/jre export JAVA_COMMAND=$JAVA_HOME/bin/java +export TUTTI_LOG_FILE=$TUTTI_BASEDIR/data/tutti-${project.version}.log -cd $REP +cd $TUTTI_BASEDIR -echo "tutti basedir: $REP" +echo "tutti basedir: $TUTTI_BASEDIR" echo "tutti app home: $TUTTI_HOME" echo "tutti jre home: $JAVA_HOME" +echo "tutti log file: $TUTTI_LOG_FILE" while true; do cp $TUTTI_HOME/update.sh . ./update.sh rm -fv update.sh - cp $REP/tutti.config $TUTTI_HOME - ./tutti/launch.sh --option tutti.launch.mode full --option tutti.basedir $REP + cp $TUTTI_BASEDIR/tutti.config $TUTTI_HOME + ./tutti/launch.sh --option tutti.launch.mode full --option tutti.basedir $TUTTI_BASEDIR exitcode=$? if [ ! "$exitcode" -eq "88" ]; then Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.bat =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-02-15 21:01:33 UTC (rev 434) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.bat 2013-02-16 07:17:12 UTC (rev 435) @@ -4,7 +4,7 @@ cd /d %~dp0% echo lauch java -%JAVA_COMMAND% -Xmx1024M -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 +%JAVA_COMMAND% -Xmx1024M -Dtutti.log.file=%TUTTI_LOG_FILE% -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 set exitcode=%ERRORLEVEL% echo Stop Tutti with exitcode: %exitcode% cd %OLDDIR% Modified: trunk/tutti-ui-swing/src/main/assembly/min/launch.sh =================================================================== --- trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-02-15 21:01:33 UTC (rev 434) +++ trunk/tutti-ui-swing/src/main/assembly/min/launch.sh 2013-02-16 07:17:12 UTC (rev 435) @@ -9,7 +9,7 @@ echo "java command: $JAVA_COMMAND" -$JAVA_COMMAND $MEMORY $TUTTI_JVM_OPTS -jar ${project.build.finalName}.${project.packaging} $* +$JAVA_COMMAND $MEMORY $TUTTI_JVM_OPTS -Dtutti.log.file=$TUTTI_LOG_FILE -jar ${project.build.finalName}.${project.packaging} $* exitcode=$? echo "Stop Tutti with exitcode: $exitcode" exit $exitcode Copied: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties (from rev 434, trunk/tutti-ui-swing/src/main/resources/log4j.properties) =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties (rev 0) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-02-16 07:17:12 UTC (rev 435) @@ -0,0 +1,45 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +# Global logging configuration +log4j.rootLogger=ERROR, stdout, file + +# Console output +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n + +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.file=${tutti.log.file} +log4j.appender.file.MaxFileSize=10MB +log4j.appender.file.MaxBackupIndex=4 +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%t] %c - %m%n + +# tutti levels +log4j.logger.fr.ifremer=INFO +log4j.logger.fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler=WARN +log4j.logger.fr.ifremer.tutti.ui.swing.util.table=WARN +log4j.logger.org.nuiton.util=WARN +log4j.logger.org.nuiton.util.ApplicationConfig=INFO +log4j.logger.org.nuiton.util.ApplicationConfigHelper=INFO Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-02-15 21:01:33 UTC (rev 434) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java 2013-02-16 07:17:12 UTC (rev 435) @@ -69,7 +69,7 @@ } else { // db does not exist - message = "tutti.information.no.db.exist"; + message = _("tutti.information.no.db.exist"); ui.getInformationLabel().setText(_(message)); } return message; Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-15 21:01:33 UTC (rev 434) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-16 07:17:12 UTC (rev 435) @@ -109,7 +109,7 @@ tutti.action.importTemporaryVessel.tip=Importer un référentiel temporaire de navires tutti.action.installDb=Installer tutti.action.installDb.tip=Télécharger puis installer la base de données -tutti.action.manageDb=Gestion base +tutti.action.manageDb=Gestionnaire de base tutti.action.manageDb.tip=Gérer la base de données utilisée par Tutti tutti.action.newCruise=Nouveau tutti.action.newCruise.tip=Créer une nouvelle campagne @@ -193,6 +193,7 @@ tutti.flash.information.species.remove.from.protocol=L'espèce %s a été retirée du protocole tutti.information.db.loaded=Tutti est connecté à une base de données tutti.information.no.db.loaded=Tutti a détecté une base mais elle n'est pas actuellement ouverte. +tutti.information.no.db.exist=Aucune base détecté, vous pouvez installer la dernière disponible sur le réseau. tutti.label.attachmentEditor.file=Fichier tutti.label.attachmentEditor.fileComment=Commentaire tutti.label.attachmentEditor.fileName=Nom @@ -467,7 +468,7 @@ tutti.title.noSelectedCruise=Pas de campagne sélectionné tutti.title.noSelectedProgram=Pas de série de campagne sélectionné tutti.title.noSelectedProtocol=Pas de protocol sélectionné -tutti.title.nodb=Pas de base chargé +tutti.title.nodb=Pas de base chargée tutti.title.selectSpecies=Choisissez une espèce tutti.title.selectedCruise=Campagne %s tutti.title.selectedProgram=Série de campagne %s Deleted: trunk/tutti-ui-swing/src/main/resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/log4j.properties 2013-02-15 21:01:33 UTC (rev 434) +++ trunk/tutti-ui-swing/src/main/resources/log4j.properties 2013-02-16 07:17:12 UTC (rev 435) @@ -1,45 +0,0 @@ -### -# #%L -# Tutti :: UI -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU 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 General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -# Global logging configuration -log4j.rootLogger=ERROR, stdout, file - -# Console output -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n - -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.file=\${user.home}/.tutti/tutti.log -log4j.appender.file.MaxFileSize=10MB -log4j.appender.file.MaxBackupIndex=4 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{ISO8601} %5p [%t] %c - %m%n - -# tutti levels -log4j.logger.fr.ifremer=INFO -log4j.logger.fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler=WARN -log4j.logger.fr.ifremer.tutti.ui.swing.util.table=WARN -log4j.logger.org.nuiton.util=WARN -log4j.logger.org.nuiton.util.ApplicationConfig=INFO -log4j.logger.org.nuiton.util.ApplicationConfigHelper=INFO