Author: norman
Date: Sat Jan 8 18:41:52 2011
New Revision: 1056754
URL: http://svn.apache.org/viewvc?rev=1056754&view=rev
Log:
inject protocolhandlerchains via jsr250 annotations
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
Modified:
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml?rev=1056754&r1=1056753&r2=1056754&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/james/context/james-server-context.xml
Sat Jan 8 18:41:52 2011
@@ -236,10 +236,9 @@
<!--
SMTP Server
-->
- <bean id="smtpserver" class="org.apache.james.smtpserver.netty.SMTPServer">
- <property name="protocolHandlerChain" ref="smtpProtocolHandlerChain"/>
- </bean>
- <bean id="smtpProtocolHandlerChain"
class="org.apache.james.container.spring.bean.postprocessor.ProtocolHandlerChainPostProcessor">
+ <bean id="smtpserver"
class="org.apache.james.smtpserver.netty.SMTPServer"/>
+
+ <bean id="smtphandlerchain"
class="org.apache.james.container.spring.bean.postprocessor.ProtocolHandlerChainPostProcessor">
<property name="coreHandlersPackage"
value="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
<property name="jmxHandlersPackage"
value="org.apache.james.smtpserver.jmx.JMXHandlersLoader"/>
<property name="beanName" value="smtpserver"/>
@@ -248,10 +247,9 @@
<!--
LMTP Server
-->
- <bean id="lmtpserver" class="org.apache.james.lmtpserver.netty.LMTPServer">
- <property name="protocolHandlerChain" ref="lmtpProtocolHandlerChain"/>
- </bean>
- <bean id="lmtpProtocolHandlerChain"
class="org.apache.james.container.spring.bean.postprocessor.ProtocolHandlerChainPostProcessor">
+ <bean id="lmtpserver"
class="org.apache.james.lmtpserver.netty.LMTPServer"/>
+
+ <bean id="lmtphandlerchain"
class="org.apache.james.container.spring.bean.postprocessor.ProtocolHandlerChainPostProcessor">
<property name="coreHandlersPackage"
value="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
<property name="jmxHandlersPackage"
value="org.apache.james.lmtpserver.jmx.JMXHandlersLoader"/>
<property name="beanName" value="lmtpserver"/>
@@ -260,10 +258,8 @@
<!--
POP3 Server
-->
- <bean id="pop3server"
class="org.apache.james.pop3server.netty.POP3Server" >
- <property name="protocolHandlerChain" ref="pop3ProtocolHandlerChain"/>
- </bean>
- <bean id="pop3ProtocolHandlerChain"
class="org.apache.james.container.spring.bean.postprocessor.ProtocolHandlerChainPostProcessor">
+ <bean id="pop3server"
class="org.apache.james.pop3server.netty.POP3Server"/>
+ <bean id="pop3handlerchain"
class="org.apache.james.container.spring.bean.postprocessor.ProtocolHandlerChainPostProcessor">
<property name="coreHandlersPackage"
value="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
<property name="jmxHandlersPackage"
value="org.apache.james.pop3server.jmx.JMXHandlersLoader"/>
<property name="beanName" value="pop3server"/>
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java?rev=1056754&r1=1056753&r2=1056754&view=diff
==============================================================================
---
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
(original)
+++
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
Sat Jan 8 18:41:52 2011
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.james.lmtpserver.netty;
+import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import org.apache.commons.configuration.ConfigurationException;
@@ -49,6 +50,7 @@ public class LMTPServer extends Abstract
+ @Resource(name="lmtphandlerchain")
public void setProtocolHandlerChain(ProtocolHandlerChain handlerChain) {
this.handlerChain = handlerChain;
}
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java?rev=1056754&r1=1056753&r2=1056754&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
Sat Jan 8 18:41:52 2011
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.james.pop3server.netty;
+import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import org.apache.james.pop3server.POP3HandlerConfigurationData;
@@ -48,6 +49,7 @@ public class POP3Server extends Abstract
private ProtocolHandlerChain handlerChain;
+ @Resource(name="pop3handlerchain")
public void setProtocolHandlerChain(ProtocolHandlerChain handlerChain) {
this.handlerChain = handlerChain;
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1056754&r1=1056753&r2=1056754&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
Sat Jan 8 18:41:52 2011
@@ -19,6 +19,7 @@
package org.apache.james.smtpserver.netty;
+import javax.annotation.Resource;
import javax.net.ssl.SSLContext;
import org.apache.commons.configuration.ConfigurationException;
@@ -100,6 +101,7 @@ public class SMTPServer extends Abstract
private final ConnectionCountHandler countHandler = new
ConnectionCountHandler();
+ @Resource(name="smtphandlerchain")
public void setProtocolHandlerChain(ProtocolHandlerChain handlerChain) {
this.handlerChain = handlerChain;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
