Author: norman
Date: Fri Dec 31 14:25:39 2010
New Revision: 1054116
URL: http://svn.apache.org/viewvc?rev=1054116&view=rev
Log:
Adjust lmtpserver,pop3server and smtpserver config to make more sense. See
JAMES-1167
Modified:
james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml
james/server/trunk/container-spring/src/main/config/james/pop3server.xml
james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/nio-netty/src/test/java/org/apache/james/server/mock/MockProtocolHandlerChain.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
Modified:
james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml?rev=1054116&r1=1054115&r2=1054116&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml
(original)
+++ james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml
Fri Dec 31 14:25:39 2010
@@ -24,13 +24,11 @@
<port>24</port>
<bind>127.0.0.1</bind>
<connectionBacklog>200</connectionBacklog>
- <handler>
- <connectiontimeout>1200</connectiontimeout>
- <connectionLimit> 0 </connectionLimit>
- <connectionLimitPerIP> 0 </connectionLimitPerIP>
- <maxmessagesize>0</maxmessagesize>
- <handlerchain enableJmx="true">
- <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </handler>
+ <connectiontimeout>1200</connectiontimeout>
+ <connectionLimit> 0 </connectionLimit>
+ <connectionLimitPerIP> 0 </connectionLimitPerIP>
+ <maxmessagesize>0</maxmessagesize>
+ <handlerchain enableJmx="true">
+ <handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
+ </handlerchain>
</lmtpserver>
Modified:
james/server/trunk/container-spring/src/main/config/james/pop3server.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/pop3server.xml?rev=1054116&r1=1054115&r2=1054116&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/pop3server.xml
(original)
+++ james/server/trunk/container-spring/src/main/config/james/pop3server.xml
Fri Dec 31 14:25:39 2010
@@ -28,12 +28,10 @@
<secret>yoursecret</secret>
<provider>org.bouncycastle.jce.provider.BouncyCastleProvider</provider>
</tls>
- <handler>
- <connectiontimeout>1200</connectiontimeout>
- <connectionLimit> 0 </connectionLimit>
- <connectionLimitPerIP> 0 </connectionLimitPerIP>
- <handlerchain enableJmx="true">
- <handler
class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
- </handlerchain>
- </handler>
+ <connectiontimeout>1200</connectiontimeout>
+ <connectionLimit> 0 </connectionLimit>
+ <connectionLimitPerIP> 0 </connectionLimitPerIP>
+ <handlerchain enableJmx="true">
+ <handler class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
+ </handlerchain>
</pop3server>
Modified:
james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/smtpserver.xml?rev=1054116&r1=1054115&r2=1054116&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
(original)
+++ james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
Fri Dec 31 14:25:39 2010
@@ -24,17 +24,15 @@
<connectionBacklog>200</connectionBacklog>
<tls socketTLS="false" startTLS="false">
</tls>
- <handler>
- <connectiontimeout>360</connectiontimeout>
- <connectionLimit> 0 </connectionLimit>
- <connectionLimitPerIP> 0 </connectionLimitPerIP>
- <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
- <authRequired>true</authRequired>
- <maxmessagesize>0</maxmessagesize>
- <addressBracketsEnforcement>true</addressBracketsEnforcement>
- <handlerchain enableJmx="true">
- <handler
class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
- <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
- </handlerchain>
- </handler>
+ <connectiontimeout>360</connectiontimeout>
+ <connectionLimit> 0 </connectionLimit>
+ <connectionLimitPerIP> 0 </connectionLimitPerIP>
+ <authorizedAddresses>127.0.0.0/8</authorizedAddresses>
+ <authRequired>true</authRequired>
+ <maxmessagesize>0</maxmessagesize>
+ <addressBracketsEnforcement>true</addressBracketsEnforcement>
+ <handlerchain enableJmx="true">
+ <handler class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
+ <handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
+ </handlerchain>
</smtpserver>
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java?rev=1054116&r1=1054115&r2=1054116&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java
Fri Dec 31 14:25:39 2010
@@ -84,7 +84,7 @@ public abstract class ProtocolHandlerCha
HierarchicalConfiguration config =
confProvider.getConfiguration(beanname);
- HierarchicalConfiguration handlerchainConfig =
config.configurationAt("handler.handlerchain");
+ HierarchicalConfiguration handlerchainConfig =
config.configurationAt("handlerchain");
List<org.apache.commons.configuration.HierarchicalConfiguration>
children = handlerchainConfig.configurationsAt("handler");
// check if the coreHandlersPackage was specified inte hconfig if
not add the default
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=1054116&r1=1054115&r2=1054116&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
Fri Dec 31 14:25:39 2010
@@ -69,12 +69,10 @@ public class LMTPServer extends Abstract
public void doConfigure(final HierarchicalConfiguration configuration)
throws ConfigurationException {
if (isEnabled()) {
- HierarchicalConfiguration handlerConfiguration =
configuration.configurationAt("handler");
-
// get the message size limit from the conf file and multiply
// by 1024, to put it in bytes
- maxMessageSize = handlerConfiguration.getLong(
"maxmessagesize",maxMessageSize ) * 1024;
+ maxMessageSize = configuration.getLong(
"maxmessagesize",maxMessageSize ) * 1024;
if (maxMessageSize > 0) {
getLogger().info("The maximum allowed message size is " +
maxMessageSize + " bytes.");
} else {
@@ -82,7 +80,7 @@ public class LMTPServer extends Abstract
}
// get the lmtpGreeting
- lmtpGreeting = handlerConfiguration.getString("lmtpGreeting",null);
+ lmtpGreeting = configuration.getString("lmtpGreeting",null);
}
Modified:
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java?rev=1054116&r1=1054115&r2=1054116&view=diff
==============================================================================
---
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/netty/AbstractConfigurableAsyncServer.java
Fri Dec 31 14:25:39 2010
@@ -132,8 +132,6 @@ public abstract class AbstractConfigurab
*/
public final void configure(HierarchicalConfiguration config) throws
ConfigurationException{
- Configuration handlerConfiguration =
((HierarchicalConfiguration)config).configurationAt("handler");
-
enabled = config.getBoolean("[...@enabled]", true);
final Log logger = getLogger();
@@ -169,9 +167,9 @@ public abstract class AbstractConfigurab
int ioWorker = config.getInt("ioWorkerCount", DEFAULT_IO_WORKER_COUNT);
setIoWorkerCount(ioWorker);
- configureHelloName(handlerConfiguration);
+ configureHelloName(config);
- setTimeout(handlerConfiguration.getInt(TIMEOUT_NAME,DEFAULT_TIMEOUT));
+ setTimeout(config.getInt(TIMEOUT_NAME,DEFAULT_TIMEOUT));
infoBuffer =
new StringBuilder(64)
@@ -210,7 +208,7 @@ public abstract class AbstractConfigurab
}
}
- String connectionLimitPerIP =
handlerConfiguration.getString("connectionLimitPerIP",null);
+ String connectionLimitPerIP =
config.getString("connectionLimitPerIP",null);
if (connectionLimitPerIP != null) {
try {
connPerIP = new Integer(connectionLimitPerIP).intValue();
Modified:
james/server/trunk/nio-netty/src/test/java/org/apache/james/server/mock/MockProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/test/java/org/apache/james/server/mock/MockProtocolHandlerChain.java?rev=1054116&r1=1054115&r2=1054116&view=diff
==============================================================================
---
james/server/trunk/nio-netty/src/test/java/org/apache/james/server/mock/MockProtocolHandlerChain.java
(original)
+++
james/server/trunk/nio-netty/src/test/java/org/apache/james/server/mock/MockProtocolHandlerChain.java
Fri Dec 31 14:25:39 2010
@@ -64,7 +64,7 @@ public class MockProtocolHandlerChain im
@PostConstruct
public void init() throws Exception {
- HierarchicalConfiguration handlerchainConfig =
config.configurationAt("handler.handlerchain");
+ HierarchicalConfiguration handlerchainConfig =
config.configurationAt("handlerchain");
if (handlerchainConfig.getString("[...@corehandlerspackage]") == null)
handlerchainConfig.addProperty("[...@corehandlerspackage]",
coreHandlersPackage);
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=1054116&r1=1054115&r2=1054116&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
Fri Dec 31 14:25:39 2010
@@ -20,8 +20,6 @@ package org.apache.james.pop3server.nett
import javax.net.ssl.SSLContext;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.pop3server.POP3HandlerConfigurationData;
import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
@@ -39,11 +37,6 @@ import org.jboss.netty.handler.codec.one
*
*/
public class POP3Server extends AbstractConfigurableAsyncServer implements
POP3ServerMBean{
- /**
- * The number of bytes to read before resetting the connection timeout
- * timer. Defaults to 20 KB.
- */
- private int lengthReset = 20 * 1024;
/**
* The configuration data to be passed to the handler
@@ -72,17 +65,6 @@ public class POP3Server extends Abstract
return "POP3 Service";
}
- @Override
- protected void doConfigure(final HierarchicalConfiguration configuration)
throws ConfigurationException {
- super.doConfigure(configuration);
- HierarchicalConfiguration handlerConfiguration =
configuration.configurationAt("handler");
- lengthReset = handlerConfiguration.getInteger("lengthReset",
lengthReset);
- if (getLogger().isInfoEnabled()) {
- getLogger().info("The idle timeout will be reset every " +
lengthReset + " bytes.");
- }
- }
-
-
/**
* A class to provide POP3 handler configuration to the handlers
@@ -100,7 +82,7 @@ public class POP3Server extends Abstract
* @see
org.apache.james.pop3server.POP3HandlerConfigurationData#getResetLength()
*/
public int getResetLength() {
- return POP3Server.this.lengthReset;
+ return -1;
}
/**
Modified:
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java?rev=1054116&r1=1054115&r2=1054116&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
(original)
+++
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3TestConfiguration.java
Fri Dec 31 14:25:39 2010
@@ -34,8 +34,8 @@ public class POP3TestConfiguration exten
public void init() {
addProperty("[...@enabled]", true);
addProperty("port", m_pop3ListenerPort);
- addProperty("handler.helloName", "myMailServer");
- addProperty("handler.connectiontimeout", "360000");
- addProperty("handler.handlerchai...@corehandlerspackage]",
CoreCmdHandlerLoader.class.getName());
+ addProperty("helloName", "myMailServer");
+ addProperty("connectiontimeout", "360000");
+ addProperty("handlerchai...@corehandlerspackage]",
CoreCmdHandlerLoader.class.getName());
}
}
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=1054116&r1=1054115&r2=1054116&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
Fri Dec 31 14:25:39 2010
@@ -107,8 +107,7 @@ public class SMTPServer extends Abstract
public void doConfigure(final HierarchicalConfiguration configuration)
throws ConfigurationException {
if (isEnabled()) {
- HierarchicalConfiguration handlerConfiguration =
configuration.configurationAt("handler");
- String authRequiredString =
handlerConfiguration.getString("authRequired","false").trim().toLowerCase();
+ String authRequiredString =
configuration.getString("authRequired","false").trim().toLowerCase();
if (authRequiredString.equals("true")) authRequired =
AUTH_REQUIRED;
else if (authRequiredString.equals("announce")) authRequired =
AUTH_ANNOUNCE;
else authRequired = AUTH_DISABLED;
@@ -118,7 +117,7 @@ public class SMTPServer extends Abstract
getLogger().info("This SMTP server does not require
authentication.");
}
- String authorizedAddresses =
handlerConfiguration.getString("authorizedAddresses",null);
+ String authorizedAddresses =
configuration.getString("authorizedAddresses",null);
if (authRequired == AUTH_DISABLED && authorizedAddresses == null) {
/* if SMTP AUTH is not requred then we will use
* authorizedAddresses to determine whether or not to
@@ -153,7 +152,7 @@ public class SMTPServer extends Abstract
// get the message size limit from the conf file and multiply
// by 1024, to put it in bytes
- maxMessageSize = handlerConfiguration.getLong(
"maxmessagesize",maxMessageSize ) * 1024;
+ maxMessageSize = configuration.getLong(
"maxmessagesize",maxMessageSize ) * 1024;
if (maxMessageSize > 0) {
getLogger().info("The maximum allowed message size is " +
maxMessageSize + " bytes.");
} else {
@@ -168,16 +167,16 @@ public class SMTPServer extends Abstract
getLogger().info("The idle timeout will be reset every " +
lengthReset + " bytes.");
}
- heloEhloEnforcement =
handlerConfiguration.getBoolean("heloEhloEnforcement",true);
+ heloEhloEnforcement =
configuration.getBoolean("heloEhloEnforcement",true);
if (authRequiredString.equals("true")) authRequired =
AUTH_REQUIRED;
// get the smtpGreeting
- smtpGreeting = handlerConfiguration.getString("smtpGreeting",null);
+ smtpGreeting = configuration.getString("smtpGreeting",null);
- addressBracketsEnforcement =
handlerConfiguration.getBoolean("addressBracketsEnforcement",true);
+ addressBracketsEnforcement =
configuration.getBoolean("addressBracketsEnforcement",true);
- verifyIdentity =
handlerConfiguration.getBoolean("verifyIdentity",true);
+ verifyIdentity = configuration.getBoolean("verifyIdentity",true);
}
}
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=1054116&r1=1054115&r2=1054116&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
Fri Dec 31 14:25:39 2010
@@ -151,42 +151,42 @@ public class SMTPTestConfiguration exten
if (m_connectionLimit != null) addProperty("connectionLimit",
""+m_connectionLimit.intValue());
if (m_connectionBacklog != null) addProperty("connectionBacklog", ""+
m_connectionBacklog.intValue());
- addProperty("handler.helloName", "myMailServer");
- addProperty("handler.connectiontimeout", 360000);
- addProperty("handler.authorizedAddresses", m_authorizedAddresses);
- addProperty("handler.maxmessagesize", m_maxMessageSizeKB);
- addProperty("handler.authRequired", m_authorizingMode);
- addProperty("handler.heloEhloEnforcement", m_heloEhloEnforcement);
- addProperty("handler.addressBracketsEnforcement",
m_addressBracketsEnforcement);
+ addProperty("helloName", "myMailServer");
+ addProperty("connectiontimeout", 360000);
+ addProperty("authorizedAddresses", m_authorizedAddresses);
+ addProperty("maxmessagesize", m_maxMessageSizeKB);
+ addProperty("authRequired", m_authorizingMode);
+ addProperty("heloEhloEnforcement", m_heloEhloEnforcement);
+ addProperty("addressBracketsEnforcement",
m_addressBracketsEnforcement);
addProperty("tl...@starttls]", m_startTLS);
addProperty("tls.keystore","file://conf/test_keystore");
addProperty("tls.secret", "jamestest");
- if (m_verifyIdentity) addProperty("handler.verifyIdentity",
m_verifyIdentity);
+ if (m_verifyIdentity) addProperty("verifyIdentity", m_verifyIdentity);
// add the rbl handler
if (m_useRBL) {
- addProperty("handler.handlerchain.handle...@class]",
DNSRBLHandler.class.getName());
-
addProperty("handler.handlerchain.handler.rblservers.blacklist","bl.spamcop.net.");
+ addProperty("handlerchain.handle...@class]",
DNSRBLHandler.class.getName());
+
addProperty("handlerchain.handler.rblservers.blacklist","bl.spamcop.net.");
}
if (m_heloResolv || m_ehloResolv) {
- addProperty("handler.handlerchain.handle...@class]",
ResolvableEhloHeloHandler.class.getName());
- addProperty("handler.handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
+ addProperty("handlerchain.handle...@class]",
ResolvableEhloHeloHandler.class.getName());
+ addProperty("handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
}
if (m_reverseEqualsHelo || m_reverseEqualsEhlo) {
- addProperty("handler.handlerchain.handle...@class]",
ReverseEqualsEhloHeloHandler.class.getName());
- addProperty("handler.handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
+ addProperty("handlerchain.handle...@class]",
ReverseEqualsEhloHeloHandler.class.getName());
+ addProperty("handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
}
if (m_senderDomainResolv) {
- addProperty("handler.handlerchain.handle...@class]",
ValidSenderDomainHandler.class.getName());
- addProperty("handler.handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
+ addProperty("handlerchain.handle...@class]",
ValidSenderDomainHandler.class.getName());
+ addProperty("handlerchain.handler.checkAuthNetworks",
m_checkAuthNetworks);
}
if (m_maxRcpt > 0) {
- addProperty("handler.handlerchain.handle...@class]",
MaxRcptHandler.class.getName());
- addProperty("handler.handlerchain.handler.maxRcpt", m_maxRcpt);
+ addProperty("handlerchain.handle...@class]",
MaxRcptHandler.class.getName());
+ addProperty("handlerchain.handler.maxRcpt", m_maxRcpt);
}
- addProperty("handler.handlerchai...@corehandlerspackage]",
CoreCmdHandlerLoader.class.getName());
+ addProperty("handlerchai...@corehandlerspackage]",
CoreCmdHandlerLoader.class.getName());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
