Author: norman
Date: Fri Jan 8 18:10:41 2010
New Revision: 897281
URL: http://svn.apache.org/viewvc?rev=897281&view=rev
Log:
more dependency injection for imap
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified:
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java?rev=897281&r1=897280&r2=897281&view=diff
==============================================================================
---
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
(original)
+++
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/ImapServerProtocolHandlerFactory.java
Fri Jan 8 18:10:41 2010
@@ -34,11 +34,9 @@
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
import org.apache.james.imap.mailbox.Mailbox;
import org.apache.james.imap.mailbox.MailboxManager;
import org.apache.james.imap.mailbox.MailboxSession;
-import org.apache.james.imap.main.DefaultImapDecoderFactory;
import org.apache.james.imap.main.ImapRequestHandler;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.services.MailServer;
@@ -78,11 +76,16 @@
this.mailboxManager = mailboxManager;
}
+ public void setImapDecoder(ImapDecoder decoder) {
+ this.decoder = decoder;
+ }
+
+ public void setImapEncoder(ImapEncoder encoder) {
+ this.encoder = encoder;
+ }
+
public void onInit() {
- decoder = new DefaultImapDecoderFactory().buildImapDecoder();
- encoder = new DefaultImapEncoderFactory().buildImapEncoder();
processor =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager);
-
}
@Override
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=897281&r1=897280&r2=897281&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
Fri Jan 8 18:10:41 2010
@@ -310,12 +310,21 @@
<!-- IMAP server Beans -->
<bean id="imapserver.protocolhandlerfactory"
name="org.apache.jsieve.mailet.Poster"
-
class="org.apache.james.imapserver.ImapServerProtocolHandlerFactory" />
+
class="org.apache.james.imapserver.ImapServerProtocolHandlerFactory">
+ <property name="imapDecoder" ref="imapDecoder"/>
+ <property name="imapEncoder" ref="imapEncoder"/>
+ </bean>
<bean id="imapserver.protocolserver"
class="org.apache.james.socket.AvalonProtocolServer">
<property name="protocolHandlerFactory"
ref="imapserver.protocolhandlerfactory" />
</bean>
+ <bean id="imapDecoderFactory"
class="org.apache.james.imap.main.DefaultImapDecoderFactory"/>
+ <bean id="imapDecoder" factory-bean="imapDecoderFactory"
factory-method="buildImapDecoder"/>
+
+ <bean id="imapEncoderFactory"
class="org.apache.james.imap.encode.main.DefaultImapEncoderFactory"/>
+ <bean id="imapEncoder" factory-bean="imapEncoderFactory"
factory-method="buildImapEncoder"/>
+
<bean id="mailboxmanager"
class="org.apache.james.mailboxmanager.torque.DefaultMailboxManager">
<constructor-arg index="0" ref="userManager"/>
</bean>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
