Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop

This commit is contained in:
Jim Blake 2017-04-25 17:12:24 -04:00
commit d57dad3309
5 changed files with 5 additions and 5 deletions

View file

@ -14,7 +14,7 @@ import org.apache.log4j.spi.LoggingEvent;
*
* <pre>
* log4j.appender.RiotAppender=org.apache.log4j.RollingFileAppender
* log4j.appender.RiotAppender.File= $${catalina.home}/logs/${webapp.name}.riot.log
* log4j.appender.RiotAppender.File= $${catalina.base}/logs/${webapp.name}.riot.log
* log4j.appender.RiotAppender.MaxFileSize=10MB
* log4j.appender.RiotAppender.MaxBackupIndex=10
* log4j.appender.RiotAppender.layout=edu.cornell.mannlib.vitro.webapp.utils.logging.StackTraceLayout

View file

@ -1,5 +1,5 @@
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= ${catalina.home}/logs/${app-name}solr.log
log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}solr.log
log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout

View file

@ -24,7 +24,7 @@
# debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= ${catalina.home}/logs/${app-name}.all.log
log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}.all.log
log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout

View file

@ -24,7 +24,7 @@
# debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= $${catalina.home}/logs/${webapp.name}.all.log
log4j.appender.AllAppender.File= $${catalina.base}/logs/${webapp.name}.all.log
log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout

View file

@ -1,5 +1,5 @@
log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
log4j.appender.AllAppender.File= ${catalina.home}/logs/solr.log
log4j.appender.AllAppender.File= ${catalina.base}/logs/solr.log
log4j.appender.AllAppender.MaxFileSize=10MB
log4j.appender.AllAppender.MaxBackupIndex=10
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout