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 2006/07/29 15:44:28 UTC
svn commit: r426801 - in /james/server/trunk/src:
java/org/apache/james/smtpserver/
java/org/apache/james/smtpserver/core/filter/fastfail/
test/org/apache/james/smtpserver/
Author: norman
Date: Sat Jul 29 06:44:27 2006
New Revision: 426801
URL: http://svn.apache.org/viewvc?rev=426801&view=rev
Log:
Change getState() and getConnectionState() to return a Map. This is more generic
Modified:
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
james/server/trunk/src/java/org/apache/james/smtpserver/SMTPSession.java
james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
james/server/trunk/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java
james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
james/server/trunk/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
james/server/trunk/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
Modified: james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java (original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/SMTPHandler.java Sat Jul 29 06:44:27 2006
@@ -37,6 +37,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
+import java.util.Map;
import java.util.Random;
/**
@@ -425,7 +426,7 @@
/**
* @see org.apache.james.smtpserver.SMTPSession#getState()
*/
- public HashMap getState() {
+ public Map getState() {
return state;
}
@@ -570,7 +571,7 @@
connectionState.clear();
}
- public HashMap getConnectionState() {
+ public Map getConnectionState() {
return connectionState;
}
Modified: james/server/trunk/src/java/org/apache/james/smtpserver/SMTPSession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/SMTPSession.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/SMTPSession.java (original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/SMTPSession.java Sat Jul 29 06:44:27 2006
@@ -27,7 +27,7 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.HashMap;
+import java.util.Map;
/**
* All the handlers access this interface to communicate with
@@ -148,7 +148,7 @@
*
* @return map of the current SMTPSession state per mail
*/
- HashMap getState();
+ Map getState();
/**
* Resets message-specific, but not authenticated user, state.
@@ -251,7 +251,7 @@
*
* @return map of the current SMTPSession state per connection
*/
- HashMap getConnectionState();
+ Map getConnectionState();
}
Modified: james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/server/trunk/src/java/org/apache/james/smtpserver/core/filter/fastfail/ResolvableEhloHeloHandler.java Sat Jul 29 06:44:27 2006
@@ -138,6 +138,7 @@
try {
dnsServer.getByName(argument);
} catch (UnknownHostException e) {
+ session.setStopHandlerProcessing(false);
session.getState().put(BAD_EHLO_HELO, "true");
}
}
Modified: james/server/trunk/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/AbstractSMTPSession.java Sat Jul 29 06:44:27 2006
@@ -25,7 +25,7 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.HashMap;
+import java.util.Map;
/**
* Abstract class to simplify the mocks
@@ -77,7 +77,7 @@
/**
* @see org.apache.james.smtpserver.SMTPSession#getConnectionState()
*/
- public HashMap getConnectionState() {
+ public Map getConnectionState() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
@@ -133,7 +133,7 @@
/**
* @see org.apache.james.smtpserver.SMTPSession#getState()
*/
- public HashMap getState() {
+ public Map getState() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
Modified: james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/DNSRBLHandlerTest.java Sat Jul 29 06:44:27 2006
@@ -27,6 +27,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -135,7 +136,7 @@
return remoteIp;
}
- public HashMap getState() {
+ public Map getState() {
return state;
}
@@ -159,7 +160,7 @@
return stopHandler;
}
- public HashMap getConnectionState() {
+ public Map getConnectionState() {
return connectionState;
}
Modified: james/server/trunk/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java Sat Jul 29 06:44:27 2006
@@ -24,6 +24,7 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.HashMap;
+import java.util.Map;
import javax.mail.internet.ParseException;
@@ -88,7 +89,7 @@
return user;
}
- public HashMap getConnectionState() {
+ public Map getConnectionState() {
return connectionMap;
}
@@ -108,7 +109,7 @@
return stop;
}
- public HashMap getState() {
+ public Map getState() {
map.put(SMTPSession.CURRENT_RECIPIENT, recipient);
return map;
}
Modified: james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/SPFHandlerTest.java Sat Jul 29 06:44:27 2006
@@ -21,6 +21,7 @@
package org.apache.james.smtpserver;
import java.util.HashMap;
+import java.util.Map;
import java.util.List;
@@ -171,7 +172,7 @@
return ip;
}
- public HashMap getState() {
+ public Map getState() {
state.put(SMTPSession.CURRENT_HELO_NAME, helo);
state.put(SMTPSession.SENDER, sender);
state.put(SMTPSession.CURRENT_RECIPIENT, recipient);
@@ -198,7 +199,7 @@
return stopHandler;
}
- public HashMap getConnectionState() {
+ public Map getConnectionState() {
return connectionState;
}
Modified: james/server/trunk/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Sat Jul 29 06:44:27 2006
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.util.HashMap;
+import java.util.Map;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
@@ -76,7 +77,7 @@
return ipAddress;
}
- public HashMap getState() {
+ public Map getState() {
state.put(SMTPSession.SENDER, "sender@james.apache.org");
return state;
}
Modified: james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java?rev=426801&r1=426800&r2=426801&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java Sat Jul 29 06:44:27 2006
@@ -25,6 +25,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.services.DNSServer;
@@ -77,7 +78,7 @@
SMTPSession session = new AbstractSMTPSession() {
HashMap state = new HashMap();
- public HashMap getState() {
+ public Map getState() {
state.put(SMTPSession.SENDER, sender);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org