You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2009/10/14 14:23:18 UTC
svn commit: r825109 - in
/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver:
AsyncSMTPServer.java SMTPServer.java
Author: norman
Date: Wed Oct 14 12:23:17 2009
New Revision: 825109
URL: http://svn.apache.org/viewvc?rev=825109&view=rev
Log:
Rename Async implementation to allow easier merge to trunk
Added:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/AsyncSMTPServer.java
- copied, changed from r825085, james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
Removed:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
Copied: james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/AsyncSMTPServer.java (from r825085, james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java)
URL: http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/AsyncSMTPServer.java?p2=james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/AsyncSMTPServer.java&p1=james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java&r1=825085&r2=825109&rev=825109&view=diff
==============================================================================
--- james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java (original)
+++ james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/AsyncSMTPServer.java Wed Oct 14 12:23:17 2009
@@ -70,7 +70,7 @@
* IMPORTANT: SMTPServer extends AbstractJamesService. If you implement ANY
* lifecycle methods, you MUST call super.<method> as well.
*/
-public class SMTPServer extends AbstractLogEnabled implements SMTPServerMBean, Serviceable, Initializable, Configurable {
+public class AsyncSMTPServer extends AbstractLogEnabled implements SMTPServerMBean, Serviceable, Initializable, Configurable {
/**
* The default value for the connection backlog.
*/
@@ -505,10 +505,10 @@
* @see org.apache.james.smtpserver.SMTPConfiguration#getHelloName()
*/
public String getHelloName() {
- if (SMTPServer.this.helloName == null) {
- return SMTPServer.this.mailServer.getHelloName();
+ if (AsyncSMTPServer.this.helloName == null) {
+ return AsyncSMTPServer.this.mailServer.getHelloName();
} else {
- return SMTPServer.this.helloName;
+ return AsyncSMTPServer.this.helloName;
}
}
@@ -516,14 +516,14 @@
* @see org.apache.james.smtpserver.SMTPConfiguration#getResetLength()
*/
public int getResetLength() {
- return SMTPServer.this.lengthReset;
+ return AsyncSMTPServer.this.lengthReset;
}
/**
* @see org.apache.james.smtpserver.SMTPConfiguration#getMaxMessageSize()
*/
public long getMaxMessageSize() {
- return SMTPServer.this.maxMessageSize;
+ return AsyncSMTPServer.this.maxMessageSize;
}
/**
@@ -532,7 +532,7 @@
public boolean isRelayingAllowed(String remoteIP) {
boolean relayingAllowed = false;
if (authorizedNetworks != null) {
- relayingAllowed = SMTPServer.this.authorizedNetworks.matchInetNetwork(remoteIP);
+ relayingAllowed = AsyncSMTPServer.this.authorizedNetworks.matchInetNetwork(remoteIP);
}
return relayingAllowed;
}
@@ -541,7 +541,7 @@
* @see org.apache.james.smtpserver.SMTPConfiguration#useHeloEhloEnforcement()
*/
public boolean useHeloEhloEnforcement() {
- return SMTPServer.this.heloEhloEnforcement;
+ return AsyncSMTPServer.this.heloEhloEnforcement;
}
@@ -549,21 +549,21 @@
* @see org.apache.james.smtpserver.SMTPConfiguration#getSMTPGreeting()
*/
public String getSMTPGreeting() {
- return SMTPServer.this.smtpGreeting;
+ return AsyncSMTPServer.this.smtpGreeting;
}
/**
* @see org.apache.james.smtpserver.SMTPConfiguration#useAddressBracketsEnforcement()
*/
public boolean useAddressBracketsEnforcement() {
- return SMTPServer.this.addressBracketsEnforcement;
+ return AsyncSMTPServer.this.addressBracketsEnforcement;
}
public boolean isAuthRequired(String remoteIP) {
- if (SMTPServer.this.authRequired == AUTH_ANNOUNCE) return true;
- boolean authRequired = SMTPServer.this.authRequired != AUTH_DISABLED;
+ if (AsyncSMTPServer.this.authRequired == AUTH_ANNOUNCE) return true;
+ boolean authRequired = AsyncSMTPServer.this.authRequired != AUTH_DISABLED;
if (authorizedNetworks != null) {
- authRequired = authRequired && !SMTPServer.this.authorizedNetworks.matchInetNetwork(remoteIP);
+ authRequired = authRequired && !AsyncSMTPServer.this.authorizedNetworks.matchInetNetwork(remoteIP);
}
return authRequired;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org