Author: norman
Date: Wed Jan 19 14:01:45 2011
New Revision: 1060816
URL: http://svn.apache.org/viewvc?rev=1060816&view=rev
Log:
Expose some more stuff via JMX
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java
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=1060816&r1=1060815&r2=1060816&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
Wed Jan 19 14:01:45 2011
@@ -53,7 +53,10 @@ public class LMTPServer extends Abstract
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultPort()
+ */
public int getDefaultPort() {
return 24;
}
@@ -198,45 +201,46 @@ public class LMTPServer extends Abstract
/*
* (non-Javadoc)
*
- * @see
- *
org.apache.james.smtpserver.SMTPServerMBean#getAddressBracketsEnforcement
- * ()
+ * @see org.apache.james.smtpserver.SMTPServerMBean#getMaximalMessageSize()
*/
- public boolean getAddressBracketsEnforcement() {
- return lmtpConfig.useAddressBracketsEnforcement();
+ public long getMaximalMessageSize() {
+ return lmtpConfig.getMaxMessageSize();
}
/*
* (non-Javadoc)
*
- * @see
org.apache.james.smtpserver.SMTPServerMBean#getHeloEhloEnforcement()
+ * @see
+ * org.apache.james.protocols.smtp.SMTPServerMBean#getNetworkInterface()
*/
- public boolean getHeloEhloEnforcement() {
- return lmtpConfig.useHeloEhloEnforcement();
+ public String getNetworkInterface() {
+ return "unknown";
}
/*
* (non-Javadoc)
- *
- * @see org.apache.james.smtpserver.SMTPServerMBean#getMaximalMessageSize()
+ * @see
org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultJMXName()
*/
- public long getMaximalMessageSize() {
- return lmtpConfig.getMaxMessageSize();
+ protected String getDefaultJMXName() {
+ return "lmtpserver";
}
+
/*
* (non-Javadoc)
- *
- * @see
- * org.apache.james.protocols.smtp.SMTPServerMBean#getNetworkInterface()
+ * @see
org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize(long)
*/
- public String getNetworkInterface() {
- return "unknown";
+ public void setMaximalMessageSize(long maxSize) {
+ maxMessageSize = maxSize;
}
- @Override
- protected String getDefaultJMXName() {
- return "lmtpserver";
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.lmtpserver.netty.LMTPServerMBean#getHeloName()
+ */
+ public String getHeloName() {
+ return lmtpConfig.getHelloName();
}
}
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java?rev=1060816&r1=1060815&r2=1060816&view=diff
==============================================================================
---
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java
(original)
+++
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServerMBean.java
Wed Jan 19 14:01:45 2011
@@ -18,8 +18,31 @@
****************************************************************/
package org.apache.james.lmtpserver.netty;
-import org.apache.james.smtpserver.netty.SMTPServerMBean;
+import org.apache.james.protocols.lib.jmx.ServerMBean;
+import org.apache.james.protocols.smtp.SMTPServerMBean;
-public interface LMTPServerMBean extends SMTPServerMBean{
+public interface LMTPServerMBean extends ServerMBean, SMTPServerMBean{
+ /**
+ * Return the maximum allowed size of the message
+ *
+ * @return maxMessageSize
+ */
+ public long getMaximalMessageSize();
+
+ /**
+ * Set the maximum allowed size of messages. Set this to 0 to accept every
message
+ *
+ * @param maxSize
+ */
+ public void setMaximalMessageSize(long maxSize);
+
+
+ /**
+ * Return the hello name
+ *
+ * @return helo
+ */
+ public String getHeloName();
+
}
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=1060816&r1=1060815&r2=1060816&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
Wed Jan 19 14:01:45 2011
@@ -157,14 +157,6 @@ public class SMTPServer extends Abstract
} else {
getLogger().info("No maximum message size is enforced for this
server.");
}
- // How many bytes to read before updating the timer that data is
being transfered
- lengthReset = configuration.getInt("lengthReset", lengthReset);
- if (lengthReset <= 0) {
- throw new ConfigurationException("The configured value for the
idle timeout reset, " + lengthReset + ", is not valid.");
- }
- if (getLogger().isInfoEnabled()) {
- getLogger().info("The idle timeout will be reset every " +
lengthReset + " bytes.");
- }
heloEhloEnforcement =
configuration.getBoolean("heloEhloEnforcement",true);
@@ -298,17 +290,15 @@ public class SMTPServer extends Abstract
super(timeout, maxConnections, maxConnectsPerIp, group,
enabledCipherSuites);
}
-
@Override
- public ChannelPipeline getPipeline() throws Exception {
- ChannelPipeline pipeline = super.getPipeline();
- pipeline.addBefore("coreHandler", "connectionCount",
getConnectionCountHandler());
-
- return pipeline;
- }
+ public ChannelPipeline getPipeline() throws Exception {
+ ChannelPipeline pipeline = super.getPipeline();
+ pipeline.addBefore("coreHandler", "connectionCount",
getConnectionCountHandler());
+ return pipeline;
+ }
- @Override
+ @Override
protected SSLContext getSSLContext() {
return SMTPServer.this.getSSLContext();
}
@@ -369,10 +359,49 @@ public class SMTPServer extends Abstract
return "unknown";
}
- @Override
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.protocols.lib.netty.AbstractConfigurableAsyncServer#getDefaultJMXName()
+ */
protected String getDefaultJMXName() {
return "smtpserver";
}
+
+
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.smtpserver.netty.SMTPServerMBean#setMaximalMessageSize(long)
+ */
+ public void setMaximalMessageSize(long maxSize) {
+ this.maxMessageSize = maxSize;
+ }
+
+
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.smtpserver.netty.SMTPServerMBean#setAddressBracketsEnforcement(boolean)
+ */
+ public void setAddressBracketsEnforcement(boolean enforceAddressBrackets) {
+ this.addressBracketsEnforcement = enforceAddressBrackets;
+ }
+
+
+ /*
+ * (non-Javadoc)
+ * @see
org.apache.james.smtpserver.netty.SMTPServerMBean#setHeloEhloEnforcement(boolean)
+ */
+ public void setHeloEhloEnforcement(boolean enforceHeloEHlo) {
+ this.heloEhloEnforcement = enforceHeloEHlo;
+ }
+
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.smtpserver.netty.SMTPServerMBean#getHeloName()
+ */
+ public String getHeloName() {
+ return theConfigData.getHelloName();
+ }
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java?rev=1060816&r1=1060815&r2=1060816&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServerMBean.java
Wed Jan 19 14:01:45 2011
@@ -35,6 +35,14 @@ public interface SMTPServerMBean extends
public long getMaximalMessageSize();
/**
+ * Set the maximum allowed size of messages. Set this to 0 to accept
every message
+ *
+ * @param maxSize
+ */
+ public void setMaximalMessageSize(long maxSize);
+
+
+ /**
* Return true if brackets around addresses in the MAIL and RCPT are
required
*
* @return bracketsEnforcement
@@ -42,9 +50,31 @@ public interface SMTPServerMBean extends
public boolean getAddressBracketsEnforcement();
/**
+ * Enable or disable brackets enforcement around addressed in the MAIL
and RCPT command
+ *
+ * @param enforceAddressBrackets
+ */
+ public void setAddressBracketsEnforcement(boolean
enforceAddressBrackets);
+
+ /**
* Return true if a HELO/EHLO is required when connecting to this server
*
* @return heloEhloEnforcement
*/
public boolean getHeloEhloEnforcement();
+
+
+ /**
+ * Enable or disable the need of the HELO/EHLO
+ *
+ * @param enforceHeloEHlo
+ */
+ public void setHeloEhloEnforcement(boolean enforceHeloEHlo);
+
+ /**
+ * Return the hello name
+ *
+ * @return helo
+ */
+ public String getHeloName();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
