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/13 15:52:50 UTC
svn commit: r421631 - in /james/server/sandbox/handlerapi/src:
java/org/apache/james/smtpserver/SMTPHandlerChain.java
java/org/apache/james/smtpserver/core/VrfyCmdHandler.java
test/org/apache/james/test/util/Util.java
Author: norman
Date: Thu Jul 13 06:52:49 2006
New Revision: 421631
URL: http://svn.apache.org/viewvc?rev=421631&view=rev
Log:
Reorganize handlers
Added:
james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java
- copied, changed from r420985, james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/VrfyCmdHandler.java
Modified:
james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
james/server/sandbox/handlerapi/src/test/org/apache/james/test/util/Util.java
Modified: james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java?rev=421631&r1=421630&r2=421631&view=diff
==============================================================================
--- james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java (original)
+++ james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/SMTPHandlerChain.java Thu Jul 13 06:52:49 2006
@@ -30,8 +30,8 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.james.smtpserver.core.CoreCmdHandler;
-import org.apache.james.smtpserver.core.CoreFilterCmdHandler;
+import org.apache.james.smtpserver.core.CoreCmdHandlerLoader;
+import org.apache.james.smtpserver.core.CoreFilterCmdHandlerLoader;
import org.apache.james.smtpserver.core.SendMailHandler;
import org.apache.james.smtpserver.core.UnknownCmdHandler;
@@ -85,9 +85,9 @@
|| configuration.getChildren("handler").length == 0) {
configuration = new DefaultConfiguration("handlerchain");
Properties cmds = new Properties();
- cmds.setProperty("Default BaseFilterHandler",
- CoreFilterCmdHandler.class.getName());
- cmds.setProperty("Default BaseHandler", CoreCmdHandler.class
+ cmds.setProperty("Default CoreCmdFilterHandlerLoader",
+ CoreFilterCmdHandlerLoader.class.getName());
+ cmds.setProperty("Default CoreCmdHandlerLoader", CoreCmdHandlerLoader.class
.getName());
cmds.setProperty("Default SendMailHandler", SendMailHandler.class
.getName());
@@ -104,8 +104,8 @@
ClassLoader classLoader = getClass().getClassLoader();
// load the BaseFilterCmdHandler
- loadClass(classLoader, CoreFilterCmdHandler.class.getName(),
- addHandler(null, CoreFilterCmdHandler.class.getName()));
+ loadClass(classLoader, CoreFilterCmdHandlerLoader.class.getName(),
+ addHandler(null, CoreFilterCmdHandlerLoader.class.getName()));
// load the configured handlers
if (children != null) {
@@ -114,9 +114,9 @@
if (className != null) {
// ignore base handlers.
- if (!className.equals(CoreFilterCmdHandler.class
+ if (!className.equals(CoreFilterCmdHandlerLoader.class
.getName())
- && !className.equals(CoreCmdHandler.class
+ && !className.equals(CoreCmdHandlerLoader.class
.getName())
&& !className.equals(SendMailHandler.class
.getName())) {
@@ -128,8 +128,8 @@
}
// load the BaseCmdHandler and SendMailHandler
- loadClass(classLoader, CoreCmdHandler.class.getName(),
- addHandler(null, CoreCmdHandler.class.getName()));
+ loadClass(classLoader, CoreCmdHandlerLoader.class.getName(),
+ addHandler(null, CoreCmdHandlerLoader.class.getName()));
loadClass(classLoader, SendMailHandler.class.getName(),
addHandler(null, SendMailHandler.class.getName()));
}
Copied: james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java (from r420985, james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/VrfyCmdHandler.java)
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java?p2=james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java&p1=james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/VrfyCmdHandler.java&r1=420985&r2=421631&rev=421631&view=diff
==============================================================================
--- james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/VrfyCmdHandler.java (original)
+++ james/server/sandbox/handlerapi/src/java/org/apache/james/smtpserver/core/VrfyCmdHandler.java Thu Jul 13 06:52:49 2006
@@ -15,11 +15,13 @@
* permissions and limitations under the License. *
***********************************************************************/
-package org.apache.james.smtpserver;
+package org.apache.james.smtpserver.core;
import java.util.ArrayList;
import java.util.Collection;
+import org.apache.james.smtpserver.CommandHandler;
+import org.apache.james.smtpserver.SMTPSession;
import org.apache.james.util.mail.dsn.DSNStatus;
/**
Modified: james/server/sandbox/handlerapi/src/test/org/apache/james/test/util/Util.java
URL: http://svn.apache.org/viewvc/james/server/sandbox/handlerapi/src/test/org/apache/james/test/util/Util.java?rev=421631&r1=421630&r2=421631&view=diff
==============================================================================
--- james/server/sandbox/handlerapi/src/test/org/apache/james/test/util/Util.java (original)
+++ james/server/sandbox/handlerapi/src/test/org/apache/james/test/util/Util.java Thu Jul 13 06:52:49 2006
@@ -19,6 +19,18 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.james.smtpserver.*;
+import org.apache.james.smtpserver.core.AuthCmdHandler;
+import org.apache.james.smtpserver.core.DataCmdHandler;
+import org.apache.james.smtpserver.core.EhloCmdHandler;
+import org.apache.james.smtpserver.core.ExpnCmdHandler;
+import org.apache.james.smtpserver.core.HeloCmdHandler;
+import org.apache.james.smtpserver.core.HelpCmdHandler;
+import org.apache.james.smtpserver.core.MailCmdHandler;
+import org.apache.james.smtpserver.core.QuitCmdHandler;
+import org.apache.james.smtpserver.core.RcptCmdHandler;
+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.test.mock.mailet.MockMail;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
import org.apache.mailet.MailAddress;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org