Author: norman
Date: Sat May 7 19:17:59 2011
New Revision: 1100599
URL: http://svn.apache.org/viewvc?rev=1100599&view=rev
Log:
Revert ProtocolHandlerChain changes.
Added:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java
- copied unchanged from r1100380,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/ProtocolHandlerChainPostProcessor.java
- copied unchanged from r1100380,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/postprocessor/ProtocolHandlerChainPostProcessor.java
Removed:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/ProtocolHandlerChainImpl.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/ConfigurableProtocolHandlerchain.java
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/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.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=1100599&r1=1100598&r2=1100599&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 May 7 19:17:59 2011
@@ -238,20 +238,32 @@
-->
<bean id="smtpserver"
class="org.apache.james.smtpserver.netty.SMTPServer"/>
- <bean id="smtphandlerchain"
class="org.apache.james.container.spring.bean.ProtocolHandlerChainImpl"/>
+ <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"/>
+ </bean>
<!--
LMTP Server
-->
<bean id="lmtpserver"
class="org.apache.james.lmtpserver.netty.LMTPServer"/>
- <bean id="lmtphandlerchain"
class="org.apache.james.container.spring.bean.ProtocolHandlerChainImpl"/>
+ <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"/>
+ </bean>
<!--
POP3 Server
-->
<bean id="pop3server"
class="org.apache.james.pop3server.netty.POP3Server"/>
- <bean id="pop3handlerchain"
class="org.apache.james.container.spring.bean.ProtocolHandlerChainImpl"/>
+ <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"/>
+ </bean>
<!--
IMAP Server
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=1100599&r1=1100598&r2=1100599&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 May 7 19:17:59 2011
@@ -23,7 +23,7 @@ import javax.net.ssl.SSLContext;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.protocols.lib.ConfigurableProtocolHandlerchain;
+import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.smtpserver.netty.SMTPChannelUpstreamHandler;
@@ -38,13 +38,12 @@ public class LMTPServer extends Abstract
* 0, means no limit.
*/
private long maxMessageSize = 0;
- private ConfigurableProtocolHandlerchain handlerChain;
+ private ProtocolHandlerChain handlerChain;
private LMTPConfiguration lmtpConfig = new LMTPConfiguration();
private String lmtpGreeting;
- private HierarchicalConfiguration config;
@Resource(name = "lmtphandlerchain")
- public void setProtocolHandlerChain(ConfigurableProtocolHandlerchain
handlerChain) {
+ public void setProtocolHandlerChain(ProtocolHandlerChain handlerChain) {
this.handlerChain = handlerChain;
}
@@ -68,20 +67,7 @@ public class LMTPServer extends Abstract
return "LMTP Service";
}
- @Override
- protected void preInit() throws Exception {
- super.preInit();
- HierarchicalConfiguration hconfig =
config.configurationAt("handlerchain");
- hconfig.addProperty("[@jmxName]", jmxName);
- hconfig.addProperty("[@jmxHandlersPackage]",
"org.apache.james.lmtpserver.jmx.JMXHandlersLoader");
- hconfig.addProperty("[@coreHandlersPackage]",
"org.apache.james.lmtpserver.CoreCmdHandlerLoader");
-
- handlerChain.init(hconfig);
- }
-
public void doConfigure(final HierarchicalConfiguration configuration)
throws ConfigurationException {
- this.config = configuration;
-
if (isEnabled()) {
// get the message size limit from the conf file and multiply
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=1100599&r1=1100598&r2=1100599&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 May 7 19:17:59 2011
@@ -20,10 +20,8 @@ package org.apache.james.pop3server.nett
import javax.annotation.Resource;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.pop3server.POP3HandlerConfigurationData;
-import org.apache.james.protocols.lib.ConfigurableProtocolHandlerchain;
+import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
@@ -38,34 +36,14 @@ public class POP3Server extends Abstract
*/
private POP3HandlerConfigurationData theConfigData = new
POP3HandlerConfigurationDataImpl();
- private ConfigurableProtocolHandlerchain handlerChain;
-
- private HierarchicalConfiguration config;
+ private ProtocolHandlerChain handlerChain;
@Resource(name = "pop3handlerchain")
- public void setProtocolHandlerChain(ConfigurableProtocolHandlerchain
handlerChain) {
+ public void setProtocolHandlerChain(ProtocolHandlerChain handlerChain) {
this.handlerChain = handlerChain;
}
@Override
- protected void preInit() throws Exception {
- super.preInit();
- HierarchicalConfiguration hconfig =
config.configurationAt("handlerchain");
- hconfig.addProperty("[@jmxName]", jmxName);
- hconfig.addProperty("[@jmxHandlersPackage]",
"org.apache.james.pop3server.jmx.JMXHandlersLoader");
- hconfig.addProperty("[@coreHandlersPackage]",
"org.apache.james.pop3server.core.CoreCmdHandlerLoader");
-
- handlerChain.init(hconfig);
- }
-
- public void doConfigure(final HierarchicalConfiguration configuration)
throws ConfigurationException {
- super.doConfigure(configuration);
- this.config = configuration;
-
-
- }
-
- @Override
protected int getDefaultPort() {
return 110;
}
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1100599&r1=1100598&r2=1100599&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Sat May 7 19:17:59 2011
@@ -103,7 +103,7 @@ public abstract class AbstractConfigurab
private SSLContext context;
- protected String jmxName;
+ private String jmxName;
private String[] enabledCipherSuites;
Modified:
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java?rev=1100599&r1=1100598&r2=1100599&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java
(original)
+++
james/server/trunk/protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java
Sat May 7 19:17:59 2011
@@ -33,7 +33,6 @@ import org.apache.james.protocols.api.Ex
import org.apache.james.protocols.api.HandlersPackage;
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.api.WiringException;
-import org.apache.james.protocols.lib.ConfigurableProtocolHandlerchain;
import org.slf4j.Logger;
/**
@@ -44,7 +43,7 @@ import org.slf4j.Logger;
* TODO: Move this to test package as it is the only place where it get used
*/
@SuppressWarnings("unchecked")
-public class MockProtocolHandlerChain implements
ConfigurableProtocolHandlerchain, Configurable, LogEnabled {
+public class MockProtocolHandlerChain implements ProtocolHandlerChain,
Configurable, LogEnabled {
private Logger log;
private String coreHandlersPackage;
@@ -224,9 +223,4 @@ public class MockProtocolHandlerChain im
public void setLog(Logger log) {
this.log = log;
}
-
- @Override
- public void init(HierarchicalConfiguration config) throws
ConfigurationException {
-
- }
}
\ No newline at end of file
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=1100599&r1=1100598&r2=1100599&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 May 7 19:17:59 2011
@@ -23,7 +23,7 @@ import javax.annotation.Resource;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
-import org.apache.james.protocols.lib.ConfigurableProtocolHandlerchain;
+import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.jboss.netty.channel.ChannelUpstreamHandler;
@@ -39,7 +39,7 @@ public class SMTPServer extends Abstract
* Command handlers , Message handlers and connection handlers Constructed
* during initialisation to allow dependency injection.
*/
- private ConfigurableProtocolHandlerchain handlerChain;
+ private ProtocolHandlerChain handlerChain;
/**
* Whether authentication is required to use this SMTP server.
@@ -86,27 +86,12 @@ public class SMTPServer extends Abstract
private boolean verifyIdentity;
- private HierarchicalConfiguration config;
-
@Resource(name = "smtphandlerchain")
- public void setProtocolHandlerChain(ConfigurableProtocolHandlerchain
handlerChain) {
+ public void setProtocolHandlerChain(ProtocolHandlerChain handlerChain) {
this.handlerChain = handlerChain;
}
- @Override
- protected void preInit() throws Exception {
- super.preInit();
- HierarchicalConfiguration hconfig =
config.configurationAt("handlerchain");
- hconfig.addProperty("[@jmxName]", jmxName);
-
- hconfig.addProperty("[@jmxHandlersPackage]",
"org.apache.james.smtpserver.jmx.JMXHandlersLoader");
- hconfig.addProperty("[@coreHandlersPackage]",
"org.apache.james.smtpserver.CoreCmdHandlerLoader");
- handlerChain.init(hconfig);
- }
-
public void doConfigure(final HierarchicalConfiguration configuration)
throws ConfigurationException {
- this.config = configuration;
-
if (isEnabled()) {
String authRequiredString =
configuration.getString("authRequired", "false").trim().toLowerCase();
if (authRequiredString.equals("true"))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
