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 ba...@apache.org on 2009/10/18 15:17:52 UTC
svn commit: r826430 - in /james/server/trunk/smtpserver-function/src:
main/java/org/apache/james/smtpserver/
main/java/org/apache/james/smtpserver/integration/
main/java/org/apache/james/smtpserver/mina/
main/java/org/apache/james/smtpserver/protocol/c...
Author: bago
Date: Sun Oct 18 13:17:51 2009
New Revision: 826430
URL: http://svn.apache.org/viewvc?rev=826430&view=rev
Log:
move non generic smtp hooks/handlers to an "integration" package
Added:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java (contents, props changed)
- copied, changed from r826427, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataCmdHandler.java (contents, props changed)
- copied, changed from r826427, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineMessageHookHandler.java
- copied, changed from r826427, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java
Removed:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java
Modified:
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=826430&r1=826429&r2=826430&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java Sun Oct 18 13:17:51 2009
@@ -32,9 +32,9 @@
import org.apache.james.api.dnsservice.util.NetMatcher;
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.services.MailServer;
+import org.apache.james.smtpserver.integration.CoreCmdHandlerLoader;
import org.apache.james.smtpserver.protocol.SMTPConfiguration;
import org.apache.james.smtpserver.protocol.SMTPServerMBean;
-import org.apache.james.smtpserver.protocol.core.CoreCmdHandlerLoader;
import org.apache.james.socket.AbstractProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.configuration.JamesConfiguration;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java?rev=826430&r1=826429&r2=826430&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServerComposed.java Sun Oct 18 13:17:51 2009
@@ -38,8 +38,8 @@
import org.apache.james.api.dnsservice.util.NetMatcher;
import org.apache.james.api.kernel.LoaderService;
import org.apache.james.services.MailServer;
+import org.apache.james.smtpserver.integration.CoreCmdHandlerLoader;
import org.apache.james.smtpserver.protocol.SMTPConfiguration;
-import org.apache.james.smtpserver.protocol.core.CoreCmdHandlerLoader;
import org.apache.james.socket.AvalonProtocolServer;
import org.apache.james.socket.api.ProtocolHandler;
import org.apache.james.socket.api.ProtocolHandlerFactory;
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java (from r826427, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java&r1=826427&r2=826430&rev=826430&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java Sun Oct 18 13:17:51 2009
@@ -19,9 +19,26 @@
-package org.apache.james.smtpserver.protocol.core;
+package org.apache.james.smtpserver.integration;
import org.apache.james.api.protocol.HandlersPackage;
+import org.apache.james.smtpserver.protocol.core.AddDefaultAttributesMessageHook;
+import org.apache.james.smtpserver.protocol.core.AuthRequiredToRelayRcptHook;
+import org.apache.james.smtpserver.protocol.core.ExpnCmdHandler;
+import org.apache.james.smtpserver.protocol.core.HeloCmdHandler;
+import org.apache.james.smtpserver.protocol.core.HelpCmdHandler;
+import org.apache.james.smtpserver.protocol.core.MailCmdHandler;
+import org.apache.james.smtpserver.protocol.core.NoopCmdHandler;
+import org.apache.james.smtpserver.protocol.core.PostmasterAbuseRcptHook;
+import org.apache.james.smtpserver.protocol.core.QuitCmdHandler;
+import org.apache.james.smtpserver.protocol.core.RcptCmdHandler;
+import org.apache.james.smtpserver.protocol.core.RsetCmdHandler;
+import org.apache.james.smtpserver.protocol.core.SMTPCommandDispatcherLineHandler;
+import org.apache.james.smtpserver.protocol.core.SendMailHandler;
+import org.apache.james.smtpserver.protocol.core.SenderAuthIdentifyVerificationRcptHook;
+import org.apache.james.smtpserver.protocol.core.UsersRepositoryAuthHook;
+import org.apache.james.smtpserver.protocol.core.VrfyCmdHandler;
+import org.apache.james.smtpserver.protocol.core.WelcomeMessageHandler;
import org.apache.james.smtpserver.protocol.core.esmtp.AuthCmdHandler;
import org.apache.james.smtpserver.protocol.core.esmtp.EhloCmdHandler;
import org.apache.james.smtpserver.protocol.core.esmtp.MailSizeEsmtpExtension;
Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataCmdHandler.java (from r826427, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataCmdHandler.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataCmdHandler.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java&r1=826427&r2=826430&rev=826430&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataCmdHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataCmdHandler.java Sun Oct 18 13:17:51 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core;
+package org.apache.james.smtpserver.integration;
import java.io.IOException;
import java.io.OutputStream;
@@ -43,6 +43,7 @@
import org.apache.james.smtpserver.protocol.SMTPResponse;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.smtpserver.protocol.core.DataLineFilter;
import org.apache.mailet.base.RFC2822Headers;
import org.apache.mailet.base.RFC822DateFormat;
Propchange: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataCmdHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineMessageHookHandler.java (from r826427, james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java)
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineMessageHookHandler.java?p2=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineMessageHookHandler.java&p1=james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java&r1=826427&r2=826430&rev=826430&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/DataLineMessageHookHandler.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/integration/DataLineMessageHookHandler.java Sun Oct 18 13:17:51 2009
@@ -19,7 +19,7 @@
-package org.apache.james.smtpserver.protocol.core;
+package org.apache.james.smtpserver.integration;
import java.io.IOException;
import java.io.OutputStream;
@@ -44,6 +44,8 @@
import org.apache.james.smtpserver.protocol.SMTPResponse;
import org.apache.james.smtpserver.protocol.SMTPRetCode;
import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.smtpserver.protocol.core.AbstractHookableCmdHandler;
+import org.apache.james.smtpserver.protocol.core.DataLineFilter;
import org.apache.james.smtpserver.protocol.hook.HookResult;
import org.apache.james.smtpserver.protocol.hook.HookResultHook;
import org.apache.james.smtpserver.protocol.hook.MessageHook;
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java?rev=826430&r1=826429&r2=826430&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java (original)
+++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java Sun Oct 18 13:17:51 2009
@@ -26,11 +26,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.AvalonLogger;
import org.apache.james.api.dnsservice.util.NetMatcher;
+import org.apache.james.smtpserver.integration.CoreCmdHandlerLoader;
import org.apache.james.smtpserver.mina.filter.SMTPResponseFilter;
import org.apache.james.smtpserver.mina.filter.SMTPValidationFilter;
import org.apache.james.smtpserver.protocol.SMTPConfiguration;
import org.apache.james.smtpserver.protocol.SMTPServerMBean;
-import org.apache.james.smtpserver.protocol.core.CoreCmdHandlerLoader;
import org.apache.james.socket.configuration.JamesConfiguration;
import org.apache.james.socket.mina.AbstractAsyncServer;
import org.apache.james.socket.shared.ProtocolHandlerChainImpl;
Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=826430&r1=826429&r2=826430&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java (original)
+++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java Sun Oct 18 13:17:51 2009
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.james.smtpserver.protocol.core.CoreCmdHandlerLoader;
+import org.apache.james.smtpserver.integration.CoreCmdHandlerLoader;
import org.apache.james.smtpserver.protocol.core.filter.fastfail.DNSRBLHandler;
import org.apache.james.smtpserver.protocol.core.filter.fastfail.MaxRcptHandler;
import org.apache.james.smtpserver.protocol.core.filter.fastfail.ResolvableEhloHeloHandler;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org