Author: norman
Date: Sun Feb 14 16:22:20 2010
New Revision: 910031
URL: http://svn.apache.org/viewvc?rev=910031&view=rev
Log:
Fix MailetContext logging (JAMES-969). As part of this remove the not needed
MailetContextWrapper class
Removed:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/MailetContextWrapper.java
Modified:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMailetLoader.java
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
Modified:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMailetLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMailetLoader.java?rev=910031&r1=910030&r2=910031&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMailetLoader.java
(original)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMailetLoader.java
Sun Feb 14 16:22:20 2010
@@ -19,7 +19,6 @@
package org.apache.james.transport;
-import javax.annotation.PostConstruct;
import javax.mail.MessagingException;
import org.apache.commons.configuration.Configuration;
@@ -59,7 +58,7 @@
final MailetConfigImpl configImpl = new MailetConfigImpl();
configImpl.setMailetName(mailetName);
configImpl.setConfiguration(configuration);
- configImpl.setMailetContext(new
MailetContextWrapper(mailetContext, getLogger()));
+ configImpl.setMailetContext(mailetContext);
mailet.init(configImpl);
return mailet;
Modified:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMatcherLoader.java?rev=910031&r1=910030&r2=910031&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
(original)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
Sun Feb 14 16:22:20 2010
@@ -20,7 +20,6 @@
package org.apache.james.transport;
-import javax.annotation.PostConstruct;
import javax.mail.MessagingException;
import org.apache.commons.configuration.ConfigurationException;
@@ -62,7 +61,8 @@
final MatcherConfigImpl configImpl = new
MatcherConfigImpl();
configImpl.setMatcherName(matchName);
configImpl.setCondition(condition);
- configImpl.setMailetContext(new
MailetContextWrapper(mailetContext, getLogger()));
+ configImpl.setMailetContext(mailetContext);
+
matcher.init(configImpl);
return matcher;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
