Author: norman
Date: Wed Jan 6 21:01:22 2010
New Revision: 896666
URL: http://svn.apache.org/viewvc?rev=896666&view=rev
Log:
inject mailet logger
fix scope of log4j
Removed:
james/server/trunk/spring-deployment/src/main/bin/
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
james/server/trunk/spring-deployment/pom.xml
james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified:
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java?rev=896666&r1=896665&r2=896666&view=diff
==============================================================================
---
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
(original)
+++
james/server/trunk/spoolmanager-function/src/main/java/org/apache/james/James.java
Wed Jan 6 21:01:22 2010
@@ -182,6 +182,8 @@
private DNSService dns;
+ private Log mailetLog;
+
/**
* Sets the fileSystem service
@@ -212,6 +214,14 @@
}
+ /**
+ * This only needed till MailetContext get factored out of this class
+ *
+ * @param mailetLog
+ */
+ public void setMailetLog(Log mailetLog) {
+ this.mailetLog = mailetLog;
+ }
@PostConstruct
public void init() throws Exception {
@@ -862,7 +872,10 @@
* @return the logger for the Mailet API
*/
private Log getMailetLogger() {
- return logger;
+ if (mailetLog == null) {
+ return logger;
+ }
+ return mailetLog;
}
/**
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=896666&r1=896665&r2=896666&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Wed Jan 6 21:01:22 2010
@@ -164,7 +164,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>runtime</scope>
</dependency>
<dependency>
Modified:
james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/log4j.properties?rev=896666&r1=896665&r2=896666&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/log4j.properties
Wed Jan 6 21:01:22 2010
@@ -46,6 +46,12 @@
log4j.appender.JAMES.layout=org.apache.log4j.PatternLayout
log4j.appender.JAMES.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c | %m%n
+log4j.appender.MAILET=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.MAILET.File=../log/mailet.log
+log4j.appender.MAILET.DatePattern='.'yyyy-MM-dd
+log4j.appender.MAILET.layout=org.apache.log4j.PatternLayout
+log4j.appender.MAILET.layout.ConversionPattern=%-5p %d{HH:mm:ss,SSS} | %c |
%m%n
+
log4j.appender.SPOOLMANAGER=org.apache.log4j.DailyRollingFileAppender
log4j.appender.SPOOLMANAGER.File=../log/spoolmanager.log
@@ -144,6 +150,7 @@
log4j.logger.james.mailboxmanager=INFO, MAILBOXMANAGER
log4j.logger.james.imapserver=INFO, IMAPSERVER
log4j.logger.james.James=INFO, JAMES
+log4j.logger.james.mailet=INFO, MAILET
log4j.logger.james.spoolmanager=INFO, SPOOLMANAGER
log4j.logger.james.dnsserver=INFO, DNSSERVER
log4j.logger.james.remotemanager=INFO, REMOTEMANAGER
Modified:
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=896666&r1=896665&r2=896666&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Wed Jan 6 21:01:22 2010
@@ -146,7 +146,14 @@
<property name="order" value="3" />
</bean>
- <bean id="James" class="org.apache.james.James" />
+ <bean id="mailetLog"
class="org.apache.commons.logging.impl.Log4JLogger">
+ <constructor-arg index="0" value="MAILET"/>
+ </bean>
+
+ <bean id="James" class="org.apache.james.James">
+ <!-- just a workaround atm -->
+ <property name="mailetLog" ref="mailetLog"/>
+ </bean>
<!-- The James Spool Manager block -->
<bean id="spoolmanager"
class="org.apache.james.transport.JamesSpoolManager" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
