Author: bago
Date: Tue Dec 26 10:41:19 2006
New Revision: 490348
URL: http://svn.apache.org/viewvc?view=rev&rev=490348
Log:
Moved SendMailHandler to CoreCommandsHanlder
Removed heloEnforcement from SMTPSession (it was already in the
configurationData)
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/test/util/Util.java
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java?view=diff&rev=490348&r1=490347&r2=490348
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandler.java
Tue Dec 26 10:41:19 2006
@@ -93,11 +93,6 @@
* whether or not this connection can relay without authentication
*/
private boolean relayingAllowed;
-
- /**
- * Whether the remote Server must send HELO/EHLO
- */
- private boolean heloEhloEnforcement;
/**
* The id associated with this particular SMTP interaction.
@@ -148,7 +143,6 @@
smtpID = random.nextInt(1024) + "";
relayingAllowed = theConfigData.isRelayingAllowed(remoteIP);
authRequired = theConfigData.isAuthRequired(remoteIP);
- heloEhloEnforcement = theConfigData.useHeloEhloEnforcement();
// Both called in resetHandler, we don't need to call them again here.
// sessionEnded = false;
// resetState();
@@ -446,12 +440,6 @@
return authRequired;
}
- /**
- * @see org.apache.james.smtpserver.SMTPSession#useHeloEhloEnforcement()
- */
- public boolean useHeloEhloEnforcement() {
- return heloEhloEnforcement;
- }
/**
* @see org.apache.james.smtpserver.SMTPSession#getUser()
*/
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java?view=diff&rev=490348&r1=490347&r2=490348
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
Tue Dec 26 10:41:19 2006
@@ -32,7 +32,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.james.smtpserver.core.CoreCmdHandlerLoader;
-import org.apache.james.smtpserver.core.SendMailHandler;
import org.apache.james.smtpserver.core.UnknownCmdHandler;
import org.apache.james.smtpserver.core.filter.CoreFilterCmdHandlerLoader;
@@ -83,8 +82,6 @@
CoreFilterCmdHandlerLoader.class.getName());
cmds.setProperty("Default CoreCmdHandlerLoader",
CoreCmdHandlerLoader.class
.getName());
- cmds.setProperty("Default SendMailHandler", SendMailHandler.class
- .getName());
Enumeration e = cmds.keys();
while (e.hasMoreElements()) {
String cmdName = (String) e.nextElement();
@@ -111,8 +108,6 @@
if (!className.equals(CoreFilterCmdHandlerLoader.class
.getName())
&& !className.equals(CoreCmdHandlerLoader.class
- .getName())
- && !className.equals(SendMailHandler.class
.getName())) {
// load the handler
@@ -124,8 +119,6 @@
// load the BaseCmdHandler and SendMailHandler
loadClass(classLoader, CoreCmdHandlerLoader.class.getName(),
addHandler(null,
CoreCmdHandlerLoader.class.getName()));
- loadClass(classLoader, SendMailHandler.class.getName(),
- addHandler(null, SendMailHandler.class.getName()));
}
}
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java?view=diff&rev=490348&r1=490347&r2=490348
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/SMTPSession.java
Tue Dec 26 10:41:19 2006
@@ -110,13 +110,6 @@
* @return authentication required or not
*/
boolean isAuthRequired();
-
- /**
- * Returns whether remote server needs to send HELO/EHLO
- *
- * @return HELO/EHLO required or not
- */
- boolean useHeloEhloEnforcement();
/**
* Returns the user name associated with this SMTP interaction.
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java?view=diff&rev=490348&r1=490347&r2=490348
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/CoreCmdHandlerLoader.java
Tue Dec 26 10:41:19 2006
@@ -44,6 +44,7 @@
private final Object RSETCMDHANDLER = RsetCmdHandler.class.getName();
private final Object VRFYCMDHANDLER = VrfyCmdHandler.class.getName();
private final Object WELCOMEMESSAGEHANDLER =
WelcomeMessageHandler.class.getName();
+ private final Object SENDMAILHANDLER = SendMailHandler.class.getName();
/**
* @see org.apache.james.smtpserver.CommandsHandler#getCommands()
@@ -52,7 +53,8 @@
Map commands = new HashMap();
// Insert the basecommands in the Map
- commands.put("", WELCOMEMESSAGEHANDLER);
+ commands.put("WelcomeMessageHandler", WELCOMEMESSAGEHANDLER);
+ commands.put("SendMailHandler", SENDMAILHANDLER);
commands.put("AUTH", AUTHCMDHANDLER);
commands.put("DATA", DATACMDHANDLER);
commands.put("EHLO", EHLOCMDHANDLER);
Modified:
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java?view=diff&rev=490348&r1=490347&r2=490348
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/java/org/apache/james/smtpserver/core/filter/MailFilterCmdHandler.java
Tue Dec 26 10:41:19 2006
@@ -68,7 +68,7 @@
}
if (session.getState().containsKey(SMTPSession.SENDER)) {
return new SMTPResponse("503",
DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER)+" Sender
already specified");
- } else if
(!session.getConnectionState().containsKey(SMTPSession.CURRENT_HELO_MODE) &&
session.useHeloEhloEnforcement()) {
+ } else if
(!session.getConnectionState().containsKey(SMTPSession.CURRENT_HELO_MODE) &&
session.getConfigurationData().useHeloEhloEnforcement()) {
return new SMTPResponse("503",
DSNStatus.getStatus(DSNStatus.PERMANENT,DSNStatus.DELIVERY_OTHER)+" Need HELO
or EHLO before MAIL");
} else if (argument == null ||
!argument.toUpperCase(Locale.US).equals("FROM")
|| sender == null) {
Modified:
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java?view=diff&rev=490348&r1=490347&r2=490348
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/smtpserver/SMTPTestConfiguration.java
Tue Dec 26 10:41:19 2006
@@ -214,9 +214,6 @@
}
config.addChild(createHandler(CoreCmdHandlerLoader.class.getName(),
null));
- config.addChild(createHandler(
- org.apache.james.smtpserver.core.SendMailHandler.class
- .getName(), null));
handlerConfig.addChild(config);
addChild(handlerConfig);
}
Modified:
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/test/util/Util.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/test/util/Util.java?view=diff&rev=490348&r1=490347&r2=490348
==============================================================================
---
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/test/util/Util.java
(original)
+++
james/server/sandbox/handlerapi-experiment/src/test/org/apache/james/test/util/Util.java
Tue Dec 26 10:41:19 2006
@@ -34,6 +34,7 @@
import org.apache.james.smtpserver.core.RsetCmdHandler;
import org.apache.james.smtpserver.core.SendMailHandler;
import org.apache.james.smtpserver.core.VrfyCmdHandler;
+import org.apache.james.smtpserver.core.WelcomeMessageHandler;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.james.MockMailServer;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
@@ -128,6 +129,8 @@
handlerChainConfig.addChild(createCommandHandlerConfiguration("QUIT",
QuitCmdHandler.class));
// mail sender
handlerChainConfig.addChild(createCommandHandlerConfiguration(null,
SendMailHandler.class));
+ // welcome message handler
+ handlerChainConfig.addChild(createCommandHandlerConfiguration(null,
WelcomeMessageHandler.class));
return handlerChainConfig;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
