Author: eric
Date: Thu Jan 2 15:03:45 2014
New Revision: 1554819
URL: http://svn.apache.org/r1554819
Log:
Move imap spring definitions in its own context (JAMES-1536)
Modified:
james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml
Modified:
james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml?rev=1554819&r1=1554818&r2=1554819&view=diff
==============================================================================
---
james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
(original)
+++
james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
Thu Jan 2 15:03:45 2014
@@ -55,12 +55,13 @@
===========================================================================
-->
+
<!--
+ Default Mail Queue Factory is the ActiveMQMailQueueFactory.
Alternative queue is FileMailQueueFactory - Can be used instead of the
default one.
- <import resource="classpath:META-INF/spring/file-queue-context.xml"/>
+ To use FileMailQueueFactory, replace the import of
activemq-queue-context.xml with:
+ <import resource="classpath:META-INF/spring/file-queue-context.xml"/>
-->
-
- <!-- Default Mail Queue Factory is the ActiveMQMailQueueFactory -->
<import resource="classpath:META-INF/spring/activemq-queue-context.xml"/>
<!-- Mailet Container -->
@@ -95,31 +96,6 @@
<!-- IMAP4 Server -->
<import resource="classpath:META-INF/spring/imapserver-context.xml"/>
- <!-- The imapProcessor configuration will be reviewed when IMAP will be
integrated into Protocols project -->
- <!-- Temporary configuration - see IMAP-357 -->
- <bean id="imapProcessor"
class="org.apache.james.imap.processor.main.DefaultImapProcessorFactory"
- factory-method="createXListSupportingProcessor">
- <constructor-arg index="0" ref="mailboxmanager"/>
- <constructor-arg index="1" ref="subscriptionManager"/>
- <!-- The mailboxTyper -->
- <constructor-arg index="2" value="#{null}"/>
- <!-- The idleKeepAlive -->
- <constructor-arg index="3" value="120"/>
- <!-- The list of disabled capabilities -->
- <constructor-arg index="4">
- <set>
- <value>ACL</value>
- <value>MOVE</value>
- </set>
- </constructor-arg>
- </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"/>
-
<!--
===========================================================================
Mailbox
Modified:
james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml?rev=1554819&r1=1554818&r2=1554819&view=diff
==============================================================================
---
james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml
(original)
+++
james/server/trunk/protocols/protocols-imap4/src/main/resources/META-INF/spring/imapserver-context.xml
Thu Jan 2 15:03:45 2014
@@ -26,4 +26,29 @@
<property name="fileSystem" ref="filesystem"/>
</bean>
+ <!-- The imapProcessor configuration will be reviewed when IMAP will be
integrated into Protocols project -->
+ <!-- Temporary configuration - see IMAP-357 -->
+ <bean id="imapProcessor"
class="org.apache.james.imap.processor.main.DefaultImapProcessorFactory"
+ factory-method="createXListSupportingProcessor">
+ <constructor-arg index="0" ref="mailboxmanager"/>
+ <constructor-arg index="1" ref="subscriptionManager"/>
+ <!-- The mailboxTyper -->
+ <constructor-arg index="2" value="#{null}"/>
+ <!-- The idleKeepAlive -->
+ <constructor-arg index="3" value="120"/>
+ <!-- The list of disabled capabilities -->
+ <constructor-arg index="4">
+ <set>
+ <value>ACL</value>
+ <value>MOVE</value>
+ </set>
+ </constructor-arg>
+ </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"/>
+
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
