[Suiviobsmer-commits] r392 - in trunk: . wao-business/src/main/filters wao-ui/src/main/resources
Author: fdesbois Date: 2010-03-25 18:18:36 +0000 (Thu, 25 Mar 2010) New Revision: 392 Modified: trunk/README.txt trunk/changelog.txt trunk/wao-business/src/main/filters/Wao.properties trunk/wao-ui/src/main/resources/log4j.properties Log: Evo #2229 : Add environment variable to change log home : use -Dwao.log.home=/path/to/log when starting server Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2010-03-25 16:48:56 UTC (rev 391) +++ trunk/README.txt 2010-03-25 18:18:36 UTC (rev 392) @@ -15,3 +15,9 @@ -------------------------- Encodage UTF-8 obligatoire. Préconisation d'OpenOffice pour la sauvegarde des fichiers. + +Configuration au lancement +-------------------------- + +-Dconfig.file=/path/to/Wao.properties +-Dwao.log.home=/path/to/log/folder Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-03-25 16:48:56 UTC (rev 391) +++ trunk/changelog.txt 2010-03-25 18:18:36 UTC (rev 392) @@ -9,6 +9,7 @@ Evolutions ++++++++++ +- [fdesbois] Evo #2229 : Gestion du chemin vers les logs de l'application - [fdesbois] Evo #2226 : Amélioration gestion interne des enumérations (ContactState) - [fdesbois] Evo #2063 : Créer un profil "coordinateur" pour les sociétés Modified: trunk/wao-business/src/main/filters/Wao.properties =================================================================== --- trunk/wao-business/src/main/filters/Wao.properties 2010-03-25 16:48:56 UTC (rev 391) +++ trunk/wao-business/src/main/filters/Wao.properties 2010-03-25 18:18:36 UTC (rev 392) @@ -8,9 +8,11 @@ ## Database location in user home hibernate.connection.url=jdbc:h2:file:~/.local/wao/h2data -## Logs for activityCalendar in user home -wao.log.activityCalendar.access=${user.home}/.local/wao/log/activity-access.log -wao.log.activityCalendar.import=${user.home}/.local/wao/log/activity.log +## Logs for activityCalendar in wao.log.home +## wao.log.home must be defined when starting server +## ex : -Dwao.log.home=/home/user/.local/wao +wao.log.activityCalendar.access=${wao.log.home}/activity-access.log +wao.log.activityCalendar.import=${wao.log.home}/activity.log ## Config for sending Email wao.email.host=smtp @@ -21,4 +23,4 @@ wao.server.path=localhost:8080/wao ## Version (not necessary to override it) -wao.version=1.0.3 \ No newline at end of file +wao.version=1.1 \ No newline at end of file Modified: trunk/wao-ui/src/main/resources/log4j.properties =================================================================== --- trunk/wao-ui/src/main/resources/log4j.properties 2010-03-25 16:48:56 UTC (rev 391) +++ trunk/wao-ui/src/main/resources/log4j.properties 2010-03-25 18:18:36 UTC (rev 392) @@ -8,7 +8,9 @@ log4j.appender.console.Threshold=INFO log4j.appender.globalfile=org.apache.log4j.RollingFileAppender -log4j.appender.globalfile.File=/var/log/wao/wao.log +# wao.log.home must be defined when starting server +# ex : -Dwao.log.home=/home/user/.local/wao +log4j.appender.globalfile.File=${wao.log.home}/wao.log log4j.appender.globalfile.MaxFileSize=500KB log4j.appender.globalfile.Append=true log4j.appender.globalfile.MaxBackupIndex=10
participants (1)
-
fdesbois@users.labs.libre-entreprise.org