From 81bbd575c8f1d6e0943cc8963f31699ec481647e Mon Sep 17 00:00:00 2001 From: Sasha Date: Mon, 29 Jul 2013 10:50:35 +0100 Subject: [PATCH 1/1] re-configure log4j location in order to allow log4j using both in Eclipse and ant --- .settings/org.eclipse.wst.common.component | 11 ++--- conf/log4j.properties.full | 62 ---------------------------- dundee-conf/log4j.properties | 51 ----------------------- {conf => log}/log4j.properties | 13 +++--- 4 files changed, 12 insertions(+), 125 deletions(-) delete mode 100644 conf/log4j.properties.full delete mode 100644 dundee-conf/log4j.properties rename {conf => log}/log4j.properties (88%) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index d25fa4e..f33c768 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -2,13 +2,14 @@ - - - - - + + + + + + diff --git a/conf/log4j.properties.full b/conf/log4j.properties.full deleted file mode 100644 index 9c2d2fe..0000000 --- a/conf/log4j.properties.full +++ /dev/null @@ -1,62 +0,0 @@ - -## CHANGE THIS (The root directory where to store all the log files) -#logDir = . - -## Uncomment to enable JWS2 activity logging to standard out (to the console if available) -## for possible log levels please refer to Log4j documentation http://logging.apache.org/log4j/1.2/manual.html -## Valid log levels are: -## TRACE - log everything from below including very detailed messages (useful for debugging only) -## DEBUG - log everything from below including some minor events (useful for debugging only) -## INFO - log everything from below including some information messages -## WARN - log error and warnings -## ERROR - log errors and fatal events only -## FATAL - log fatal events only - -#log4j.rootLogger=ERROR, stdout -#log4j.appender.stdout=org.apache.log4j.ConsoleAppender -#log4j.appender.stdout.Target=System.out -#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%m%n - -## Uncomment to enable JWS2 activity logging to the file -#log4j.logger.compbio=ERROR, ACTIVITY -#log4j.appender.ACTIVITY=org.apache.log4j.RollingFileAppender -#log4j.appender.ACTIVITY.File=${logDir}/activity.log -#log4j.appender.ACTIVITY.MaxFileSize=10MB -#log4j.appender.ACTIVITY.MaxBackupIndex=10000 -#log4j.appender.ACTIVITY.layout=org.apache.log4j.PatternLayout -#log4j.appender.ACTIVITY.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p %3x - %m%n - -## Uncomment for web access logging. Please do not change the log level! -#log4j.logger.ClustalWS-stats=INFO, STAT -#log4j.logger.MuscleWS-stats=INFO, STAT -#log4j.logger.TcoffeeWS-stats=INFO, STAT -#log4j.logger.MafftWS-stats=INFO, STAT -#log4j.logger.ProbconsWS-stats=INFO, STAT -#log4j.appender.STAT=org.apache.log4j.RollingFileAppender -#log4j.appender.STAT.File=${logDir}/wsaccess.log -#log4j.appender.STAT.MaxFileSize=10MB -#log4j.appender.STAT.MaxBackupIndex=10000 -#log4j.appender.STAT.layout=org.apache.log4j.PatternLayout -#log4j.appender.STAT.layout.ConversionPattern=%t %d %m%n - -## Uncomment for separate local engine execution log (debugging only) -#log4j.logger.compbio.engine.local.LocalExecutorService=INFO, C -#log4j.appender.C=org.apache.log4j.FileAppender -#log4j.appender.C.File=LocalExecutorService.log -#log4j.appender.C.layout=org.apache.log4j.PatternLayout -#log4j.appender.C.layout.ConversionPattern=%m%n - -## Parameter combinator logger (testing only) -#log4j.logger.RunnerLogger=ERROR, RUNNER -#log4j.appender.RUNNER=org.apache.log4j.FileAppender -#log4j.appender.RUNNER.File=RunnerParam.log -#log4j.appender.RUNNER.layout=org.apache.log4j.PatternLayout -#log4j.appender.RUNNER.layout.ConversionPattern=%r [%t] %p %c %x - %m%n - - -## NOT IN USE - collection of patterns choose the one that suits you -# %d{ABSOLUTE} %5p %c{1}:%L - -#log4j.appender.C.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n -# %d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - -#log4j.appender.ClustalWS-stats.layout.ConversionPattern=%p %d %t %C{4} %m%n diff --git a/dundee-conf/log4j.properties b/dundee-conf/log4j.properties deleted file mode 100644 index afcc70b..0000000 --- a/dundee-conf/log4j.properties +++ /dev/null @@ -1,51 +0,0 @@ - -# change this -logDir =/homes/www-jws2/logs - -log4j.rootLogger=ERROR, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%m%n - -log4j.logger.compbio=TRACE, ACTIVITY -log4j.appender.ACTIVITY=org.apache.log4j.RollingFileAppender -log4j.appender.ACTIVITY.File=${logDir}/activity.log -log4j.appender.ACTIVITY.MaxFileSize=10MB -log4j.appender.ACTIVITY.MaxBackupIndex=10000 -log4j.appender.ACTIVITY.layout=org.apache.log4j.PatternLayout -log4j.appender.ACTIVITY.layout.ConversionPattern=%d{MM-dd@HH:mm:ss} %-5p %3x - %m%n - -log4j.logger.ClustalWS-stats=INFO, STAT -log4j.logger.MuscleWS-stats=INFO, STAT -log4j.logger.TcoffeeWS-stats=INFO, STAT -log4j.logger.MafftWS-stats=INFO, STAT -log4j.logger.ProbconsWS-stats=INFO, STAT -log4j.appender.STAT=org.apache.log4j.RollingFileAppender -log4j.appender.STAT.File=${logDir}/wsaccess.log -log4j.appender.STAT.MaxFileSize=10MB -log4j.appender.STAT.MaxBackupIndex=10000 -log4j.appender.STAT.layout=org.apache.log4j.PatternLayout -log4j.appender.STAT.layout.ConversionPattern=%t %d %m%n - - -# Uncomment for separate local engine execution log -#log4j.logger.compbio.engine.local.LocalExecutorService=INFO, C -#log4j.appender.C=org.apache.log4j.FileAppender -#log4j.appender.C.File=LocalExecutorService.log -#log4j.appender.C.layout=org.apache.log4j.PatternLayout -#log4j.appender.C.layout.ConversionPattern=%m%n - -#Parameter combinator logger (testing only) -#log4j.logger.RunnerLogger=ERROR, RUNNER -#log4j.appender.RUNNER=org.apache.log4j.FileAppender -#log4j.appender.RUNNER.File=RunnerParam.log -#log4j.appender.RUNNER.layout=org.apache.log4j.PatternLayout -#log4j.appender.RUNNER.layout.ConversionPattern=%r [%t] %p %c %x - %m%n - - -#Not used - collection of patterns -# %d{ABSOLUTE} %5p %c{1}:%L - -#log4j.appender.C.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n -# %d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - -#log4j.appender.ClustalWS-stats.layout.ConversionPattern=%p %d %t %C{4} %m%n diff --git a/conf/log4j.properties b/log/log4j.properties similarity index 88% rename from conf/log4j.properties rename to log/log4j.properties index f1567cc..fc6e3a9 100644 --- a/conf/log4j.properties +++ b/log/log4j.properties @@ -46,17 +46,16 @@ #log4j.appender.stdout.layout.ConversionPattern=%m%n #log4j.rootLogger=info, stdout -log4j.rootLogger=TRACE, rootfile -log4j.appender.rootfile=org.apache.log4j.FileAppender -log4j.appender.rootfile.File=${catalina.base}/logs/JABAWSLogFilename.log1 -log4j.appender.rootfile.Target=System.out -log4j.appender.rootfile.layout=org.apache.log4j.PatternLayout -log4j.appender.rootfile.layout.ConversionPattern=%t %d %m%n +log4j.rootLogger=ERROR, errorfile +log4j.appender.errorfile=org.apache.log4j.FileAppender +log4j.appender.errorfile.File=${catalina.base}/logs/JABAWSErrorFile.log +log4j.appender.errorfile.Target=System.out +log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout +log4j.appender.errorfile.layout.ConversionPattern=%t %d %m%n # %d{ABSOLUTE} %5p %c{1}:%L - log4j.logger.compbio=TRACE, B log4j.appender.B=org.apache.log4j.FileAppender -#log4j.appender.B.File=engine.log log4j.appender.B.File=${catalina.base}/logs/engine.log log4j.appender.B.layout=org.apache.log4j.PatternLayout log4j.appender.B.layout.ConversionPattern=%m%n %d{MM-dd@HH:mm:ss} %-5p (%13F:%L) %3x - -- 1.7.10.2