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 2011/09/19 08:49:44 UTC
svn commit: r1172486 - in /james/protocols/trunk:
api/src/main/java/org/apache/james/protocols/api/
api/src/main/java/org/apache/james/protocols/api/handler/
impl/src/main/java/org/apache/james/protocols/impl/
impl/src/main/java/org/apache/james/protoc...
Author: norman
Date: Mon Sep 19 06:49:42 2011
New Revision: 1172486
URL: http://svn.apache.org/viewvc?rev=1172486&view=rev
Log:
Move Handler stuff to extra package
Added:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractCommandDispatcher.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolHandlerChain.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandlerResultHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandlerResultHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandlerResultHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/DisconnectHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ExtensibleHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ExtensibleHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/HandlersPackage.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/HandlersPackage.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LifecycleAwareProtocolHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LifecycleAwareProtocolHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandlerResultHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandlerResultHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerChain.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerLoader.java
- copied, changed from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerLoader.java
Removed:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractCommandDispatcher.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolHandlerChain.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandlerResultHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandlerResultHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/DisconnectHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ExtensibleHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/HandlersPackage.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LifecycleAwareProtocolHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandlerResultHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandler.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerChain.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerLoader.java
Modified:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/ConnectHandlerResultLogger.java
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/LineHandlerResultLogger.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPCommandDispatcherLineHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/Hook.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java Mon Sep 19 06:49:42 2011
@@ -19,6 +19,8 @@
package org.apache.james.protocols.api;
+import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
+
/**
* Define a protocol
*/
Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java Mon Sep 19 06:49:42 2011
@@ -21,6 +21,8 @@ package org.apache.james.protocols.api;
import java.net.InetSocketAddress;
+import org.apache.james.protocols.api.handler.LineHandler;
+
/**
* ProtocolTransport is used by each ProtocolSession to communicate with the underlying transport.
* Transport implementations will provide their own implementation of the transport.
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractCommandDispatcher.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractCommandDispatcher.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractCommandDispatcher.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractCommandDispatcher.java Mon Sep 19 06:49:42 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
@@ -28,6 +28,11 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import org.apache.james.protocols.api.BaseRequest;
+import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.WiringException;
+
/**
@@ -82,7 +87,7 @@ public abstract class AbstractCommandDis
/**
* @throws WiringException
- * @see org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
@SuppressWarnings("unchecked")
public void wireExtensions(Class interfaceName, List extension) throws WiringException {
@@ -178,7 +183,7 @@ public abstract class AbstractCommandDis
}
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
*/
@SuppressWarnings("unchecked")
public List<Class<?>> getMarkerInterfaces() {
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolHandlerChain.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolHandlerChain.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolHandlerChain.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/AbstractProtocolHandlerChain.java Mon Sep 19 06:49:42 2011
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import org.apache.james.protocols.api.WiringException;
+
/**
* Abstract base class for {@link ProtocolHandlerChain} implementations
*
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandler.java Mon Sep 19 06:49:42 2011
@@ -19,11 +19,15 @@
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
import java.util.Collection;
+import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
+
/**
* Custom command handlers must implement this interface
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandlerResultHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandlerResultHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/CommandHandlerResultHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/CommandHandlerResultHandler.java Mon Sep 19 06:49:42 2011
@@ -17,7 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
+
+import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.Response;
public interface CommandHandlerResultHandler<R extends Response, S extends ProtocolSession> extends ProtocolHandler{
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandler.java Mon Sep 19 06:49:42 2011
@@ -19,7 +19,9 @@
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
+
+import org.apache.james.protocols.api.ProtocolSession;
/**
* Custom connect handlers must implement this interface
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandlerResultHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandlerResultHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandlerResultHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandlerResultHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandlerResultHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ConnectHandlerResultHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ConnectHandlerResultHandler.java Mon Sep 19 06:49:42 2011
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
+
+import org.apache.james.protocols.api.ProtocolSession;
/**
* Handler which can be used to gather statistics for {@link ConnectHandler} or
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/DisconnectHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/DisconnectHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/DisconnectHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/DisconnectHandler.java Mon Sep 19 06:49:42 2011
@@ -19,7 +19,9 @@
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
+
+import org.apache.james.protocols.api.ProtocolSession;
public interface DisconnectHandler<Session extends ProtocolSession> extends ProtocolHandler{
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ExtensibleHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ExtensibleHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ExtensibleHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ExtensibleHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ExtensibleHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ExtensibleHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ExtensibleHandler.java Mon Sep 19 06:49:42 2011
@@ -17,10 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
import java.util.List;
+import org.apache.james.protocols.api.WiringException;
+
/**
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/HandlersPackage.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/HandlersPackage.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/HandlersPackage.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/HandlersPackage.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/HandlersPackage.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/HandlersPackage.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/HandlersPackage.java Mon Sep 19 06:49:42 2011
@@ -19,7 +19,7 @@
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
import java.util.List;
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LifecycleAwareProtocolHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LifecycleAwareProtocolHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LifecycleAwareProtocolHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LifecycleAwareProtocolHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LifecycleAwareProtocolHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LifecycleAwareProtocolHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LifecycleAwareProtocolHandler.java Mon Sep 19 06:49:42 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandler.java Mon Sep 19 06:49:42 2011
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
+
+import org.apache.james.protocols.api.ProtocolSession;
/**
* Implementations of this Interface will get called after a full line (terminated with \r\n) was received.
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandlerResultHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandlerResultHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandlerResultHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandlerResultHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandlerResultHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/LineHandlerResultHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/LineHandlerResultHandler.java Mon Sep 19 06:49:42 2011
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
+
+import org.apache.james.protocols.api.ProtocolSession;
/**
* Handler which can be used to gather statistics for {@link LineHandler} or
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandler.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandler.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandler.java Mon Sep 19 06:49:42 2011
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
/**
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerChain.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerChain.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerChain.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerChain.java Mon Sep 19 06:49:42 2011
@@ -19,7 +19,7 @@
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
import java.util.LinkedList;
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerLoader.java (from r1172468, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerLoader.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerLoader.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerLoader.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerLoader.java&r1=1172468&r2=1172486&rev=1172486&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolHandlerLoader.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/handler/ProtocolHandlerLoader.java Mon Sep 19 06:49:42 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.protocols.api;
+package org.apache.james.protocols.api.handler;
import org.apache.commons.configuration.Configuration;
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java Mon Sep 19 06:49:42 2011
@@ -24,15 +24,15 @@ import java.util.List;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
-import org.apache.james.protocols.api.ConnectHandler;
-import org.apache.james.protocols.api.ConnectHandlerResultHandler;
-import org.apache.james.protocols.api.DisconnectHandler;
-import org.apache.james.protocols.api.LineHandler;
-import org.apache.james.protocols.api.LineHandlerResultHandler;
-import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.ProtocolSessionFactory;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.ConnectHandler;
+import org.apache.james.protocols.api.handler.ConnectHandlerResultHandler;
+import org.apache.james.protocols.api.handler.DisconnectHandler;
+import org.apache.james.protocols.api.handler.LineHandler;
+import org.apache.james.protocols.api.handler.LineHandlerResultHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.impl.NettyProtocolTransport;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java Mon Sep 19 06:49:42 2011
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.protocols.impl;
-import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.ChannelFutureListener;
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java Mon Sep 19 06:49:42 2011
@@ -23,11 +23,11 @@ import java.net.InetSocketAddress;
import javax.net.ssl.SSLEngine;
-import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.StartTlsResponse;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/AbstractCommandHandlerResultLogger.java Mon Sep 19 06:49:42 2011
@@ -18,10 +18,10 @@
****************************************************************/
package org.apache.james.protocols.impl.log;
-import org.apache.james.protocols.api.CommandHandler;
-import org.apache.james.protocols.api.CommandHandlerResultHandler;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
+import org.apache.james.protocols.api.handler.CommandHandlerResultHandler;
/**
*
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/ConnectHandlerResultLogger.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/ConnectHandlerResultLogger.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/ConnectHandlerResultLogger.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/ConnectHandlerResultLogger.java Mon Sep 19 06:49:42 2011
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.james.protocols.impl.log;
-import org.apache.james.protocols.api.ConnectHandler;
-import org.apache.james.protocols.api.ConnectHandlerResultHandler;
import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.handler.ConnectHandler;
+import org.apache.james.protocols.api.handler.ConnectHandlerResultHandler;
/**
* Log disconnects caused by {@link ConnectHandler} vi INFO. The rest is logged via DEBUG
Modified: james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/LineHandlerResultLogger.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/LineHandlerResultLogger.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/LineHandlerResultLogger.java (original)
+++ james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/log/LineHandlerResultLogger.java Mon Sep 19 06:49:42 2011
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.james.protocols.impl.log;
-import org.apache.james.protocols.api.LineHandler;
-import org.apache.james.protocols.api.LineHandlerResultHandler;
import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.handler.LineHandler;
+import org.apache.james.protocols.api.handler.LineHandlerResultHandler;
/**
* Log disconnects caused by {@link LineHandler} via INFO. The rest via DEBUG
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java Mon Sep 19 06:49:42 2011
@@ -20,11 +20,11 @@
package org.apache.james.protocols.smtp;
import org.apache.james.protocols.api.Protocol;
-import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.ProtocolSessionFactory;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPSessionImpl;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java Mon Sep 19 06:49:42 2011
@@ -22,9 +22,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.james.protocols.api.AbstractProtocolHandlerChain;
-import org.apache.james.protocols.api.ProtocolHandlerChain;
import org.apache.james.protocols.api.WiringException;
+import org.apache.james.protocols.api.handler.AbstractProtocolHandlerChain;
+import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.smtp.core.DataCmdHandler;
import org.apache.james.protocols.smtp.core.DataLineMessageHookHandler;
import org.apache.james.protocols.smtp.core.ExpnCmdHandler;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSession.java Mon Sep 19 06:49:42 2011
@@ -21,8 +21,8 @@ package org.apache.james.protocols.smtp;
import java.util.Map;
-import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.handler.LineHandler;
/**
* All the handlers access this interface to communicate with
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java Mon Sep 19 06:49:42 2011
@@ -22,10 +22,10 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.AbstractSession;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
import org.slf4j.Logger;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/AbstractHookableCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -22,10 +22,10 @@ package org.apache.james.protocols.smtp.
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.protocols.api.CommandHandler;
-import org.apache.james.protocols.api.ExtensibleHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
+import org.apache.james.protocols.api.handler.ExtensibleHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -211,7 +211,7 @@ public abstract class AbstractHookableCm
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
*/
public List<Class<?>> getMarkerInterfaces() {
List<Class<?>> classes = new ArrayList<Class<?>>(2);
@@ -228,7 +228,7 @@ public abstract class AbstractHookableCm
protected abstract Class<Hook> getHookInterface();
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.lang.Class,
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
* java.util.List)
*/
@SuppressWarnings("unchecked")
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -23,12 +23,12 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.protocols.api.CommandHandler;
-import org.apache.james.protocols.api.ExtensibleHandler;
-import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.WiringException;
+import org.apache.james.protocols.api.handler.CommandHandler;
+import org.apache.james.protocols.api.handler.ExtensibleHandler;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.MailEnvelopeImpl;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
@@ -130,7 +130,7 @@ public class DataCmdHandler implements C
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
*/
@SuppressWarnings("unchecked")
public List getMarkerInterfaces() {
@@ -141,7 +141,7 @@ public class DataCmdHandler implements C
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
@SuppressWarnings("unchecked")
public void wireExtensions(Class interfaceName, List extension) throws WiringException {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineFilter.java Mon Sep 19 06:49:42 2011
@@ -21,8 +21,8 @@
package org.apache.james.protocols.smtp.core;
-import org.apache.james.protocols.api.LineHandler;
-import org.apache.james.protocols.api.ProtocolHandler;
+import org.apache.james.protocols.api.handler.LineHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.smtp.SMTPSession;
/**
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/DataLineMessageHookHandler.java Mon Sep 19 06:49:42 2011
@@ -26,9 +26,9 @@ import java.io.OutputStream;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.protocols.api.ExtensibleHandler;
-import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.WiringException;
+import org.apache.james.protocols.api.handler.ExtensibleHandler;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.MailEnvelopeImpl;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
@@ -142,7 +142,7 @@ public final class DataLineMessageHookHa
}
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
@SuppressWarnings("unchecked")
public void wireExtensions(Class interfaceName, List extension) throws WiringException {
@@ -157,7 +157,7 @@ public final class DataLineMessageHookHa
}
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
*/
public List<Class<?>> getMarkerInterfaces() {
List<Class<?>> classes = new LinkedList<Class<?>>();
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ExpnCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -24,9 +24,9 @@ package org.apache.james.protocols.smtp.
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/HelpCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -24,9 +24,9 @@ package org.apache.james.protocols.smtp.
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/NoopCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -24,9 +24,9 @@ package org.apache.james.protocols.smtp.
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RcptCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -24,7 +24,7 @@ import java.util.Collection;
import java.util.Locale;
import java.util.StringTokenizer;
-import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/ReceivedDataLineFilter.java Mon Sep 19 06:49:42 2011
@@ -23,7 +23,7 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
-import org.apache.james.protocols.api.LineHandler;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.mailet.base.RFC2822Headers;
import org.apache.mailet.base.RFC822DateFormat;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/RsetCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -24,9 +24,9 @@ package org.apache.james.protocols.smtp.
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPCommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPCommandDispatcherLineHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPCommandDispatcherLineHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPCommandDispatcherLineHandler.java Mon Sep 19 06:49:42 2011
@@ -22,8 +22,8 @@ package org.apache.james.protocols.smtp.
import java.util.Arrays;
import java.util.List;
-import org.apache.james.protocols.api.AbstractCommandDispatcher;
-import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.handler.AbstractCommandDispatcher;
+import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -42,21 +42,21 @@ public class SMTPCommandDispatcherLineHa
/**
- * @see org.apache.james.protocols.api.AbstractCommandDispatcher#getUnknownCommandHandlerIdentifier()
+ * @see org.apache.james.protocols.api.handler.AbstractCommandDispatcher#getUnknownCommandHandlerIdentifier()
*/
protected String getUnknownCommandHandlerIdentifier() {
return UnknownCmdHandler.UNKNOWN_COMMAND;
}
/**
- * @see org.apache.james.protocols.api.AbstractCommandDispatcher#getMandatoryCommands()
+ * @see org.apache.james.protocols.api.handler.AbstractCommandDispatcher#getMandatoryCommands()
*/
protected List<String> getMandatoryCommands() {
return Arrays.asList(mandatoryCommands);
}
/**
- * @see org.apache.james.protocols.api.AbstractCommandDispatcher#getUnknownCommandHandler()
+ * @see org.apache.james.protocols.api.handler.AbstractCommandDispatcher#getUnknownCommandHandler()
*/
protected CommandHandler<SMTPSession> getUnknownCommandHandler() {
return unknownHandler;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/VrfyCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -24,9 +24,9 @@ package org.apache.james.protocols.smtp.
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/WelcomeMessageHandler.java Mon Sep 19 06:49:42 2011
@@ -22,7 +22,7 @@ package org.apache.james.protocols.smtp.
import java.util.Date;
-import org.apache.james.protocols.api.ConnectHandler;
+import org.apache.james.protocols.api.handler.ConnectHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/AuthCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -30,12 +30,12 @@ import java.util.Locale;
import java.util.StringTokenizer;
import org.apache.commons.codec.binary.Base64;
-import org.apache.james.protocols.api.CommandHandler;
-import org.apache.james.protocols.api.ExtensibleHandler;
-import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.api.WiringException;
+import org.apache.james.protocols.api.handler.CommandHandler;
+import org.apache.james.protocols.api.handler.ExtensibleHandler;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -472,7 +472,7 @@ public class AuthCmdHandler
}
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
*/
public List<Class<?>> getMarkerInterfaces() {
List<Class<?>> classes = new ArrayList<Class<?>>(1);
@@ -482,7 +482,7 @@ public class AuthCmdHandler
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
*/
public void wireExtensions(Class interfaceName, List extension) throws WiringException {
if (AuthHook.class.equals(interfaceName)) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -83,7 +83,7 @@ public class EhloCmdHandler extends Abst
}
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#getMarkerInterfaces()
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#getMarkerInterfaces()
*/
public List<Class<?>> getMarkerInterfaces() {
List<Class<?>> classes = super.getMarkerInterfaces();
@@ -92,7 +92,7 @@ public class EhloCmdHandler extends Abst
}
/**
- * @see org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.lang.Class,
+ * @see org.apache.james.protocols.api.handler.ExtensibleHandler#wireExtensions(java.lang.Class,
* java.util.List)
*/
public void wireExtensions(Class interfaceName, List extension) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java Mon Sep 19 06:49:42 2011
@@ -22,7 +22,7 @@ package org.apache.james.protocols.smtp.
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.protocols.api.LineHandler;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.MailEnvelope;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java Mon Sep 19 06:49:42 2011
@@ -23,9 +23,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.CommandHandler;
import org.apache.james.protocols.smtp.SMTPResponse;
import org.apache.james.protocols.smtp.SMTPRetCode;
import org.apache.james.protocols.smtp.SMTPSession;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java Mon Sep 19 06:49:42 2011
@@ -24,7 +24,7 @@ package org.apache.james.protocols.smtp.
import java.util.Collection;
import java.util.StringTokenizer;
-import org.apache.james.protocols.api.ConnectHandler;
+import org.apache.james.protocols.api.handler.ConnectHandler;
import org.apache.james.protocols.smtp.DNSService;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.dsn.DSNStatus;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/Hook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/Hook.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/Hook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/Hook.java Mon Sep 19 06:49:42 2011
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.protocols.smtp.hook;
-import org.apache.james.protocols.api.ProtocolHandler;
+import org.apache.james.protocols.api.handler.ProtocolHandler;
/**
* Just and marker interface for the different Hooks
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java?rev=1172486&r1=1172485&r2=1172486&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java Mon Sep 19 06:49:42 2011
@@ -24,8 +24,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
-import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.handler.LineHandler;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
import org.slf4j.Logger;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org