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 2010/02/01 14:27:04 UTC
svn commit: r905276 [1/3] - in /james/server/trunk: ./ imapserver/ mailets/ mailets/src/main/java/org/apache/james/transport/mailets/ mina-socket/ mina-socket/src/main/java/org/apache/james/socket/ mina-socket/src/main/java/org/apache/james/socket/mina...

Author: norman
Date: Mon Feb  1 13:26:59 2010
New Revision: 905276

URL: http://svn.apache.org/viewvc?rev=905276&view=rev
Log:
just use the factored out protocols-* libraries

Removed:
    james/server/trunk/smtp-protocol/
    james/server/trunk/socket-api/
Modified:
    james/server/trunk/imapserver/pom.xml
    james/server/trunk/mailets/pom.xml
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
    james/server/trunk/mina-socket/pom.xml
    james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java
    james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractIoHandler.java
    james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractMINASession.java
    james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/AbstractResponseFilter.java
    james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java
    james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/ResponseValidationFilter.java
    james/server/trunk/pom.xml
    james/server/trunk/pop3server/pom.xml
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/POP3IoHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/filter/POP3ResponseFilter.java
    james/server/trunk/remotemanager/pom.xml
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/CommandHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerRequest.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerResponse.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/MemStatCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/MoveMailsCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/QuitCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoteManagerCommandDispatcherLineHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveDomainCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/RemoveMappingCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ResetBayesianDataCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/SetPasswordCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowAliasCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowForwardingCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowMailetInfoCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShowMatcherInfoCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ShutdownCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnknownCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetAliasCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UnsetForwardingCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/UserCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/VerifyCmdHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/mina/RemoteManagerIoHandler.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/mina/RemoteManagerSessionImpl.java
    james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/mina/filter/RemoteManagerResponseFilter.java
    james/server/trunk/smtpserver/pom.xml
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AddDefaultAttributesMessageHook.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/AuthRequiredToRelayRcptHook.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/CoreCmdHandlerLoader.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/DataLineJamesMessageHookHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesDataCmdHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMailCmdHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesMessageHook.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesRcptCmdHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/JamesWelcomeMessageHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/POP3BeforeSMTPHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SMTPServerDNSServiceAdapter.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SendMailHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SenderAuthIdentifyVerificationRcptHook.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/SetMimeHeaderHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/UsersRepositoryAuthHook.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/DNSRBLHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/JDBCGreylistHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/MaxRcptHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/ResolvableEhloHeloHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/ReverseEqualsEhloHeloHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/SPFHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/SpamAssassinHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/SpamTrapHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/TarpitHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/URIRBLHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/ValidRcptHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/ValidRcptMX.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/integration/fastfail/ValidSenderDomainHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPIoHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/mina/filter/SMTPResponseFilter.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
    james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
    james/server/trunk/spring-deployment/pom.xml

Modified: james/server/trunk/imapserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Mon Feb  1 13:26:59 2010
@@ -114,10 +114,6 @@
       <artifactId>mina-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-socket-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.db.torque</groupId>
       <artifactId>runtime</artifactId>
     </dependency>

Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Mon Feb  1 13:26:59 2010
@@ -71,8 +71,8 @@
       <artifactId>james-server-core-library</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-smtp-protocol</artifactId>
+      <groupId>org.apache.james.protocols</groupId>
+      <artifactId>protocols-smtp</artifactId>
     </dependency>
 
     <dependency>

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java (original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/DSNBounce.java Mon Feb  1 13:26:59 2010
@@ -23,7 +23,7 @@
 
 import org.apache.james.Constants;
 import org.apache.james.core.MailImpl;
-import org.apache.james.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
 import org.apache.mailet.base.mail.MimeMultipartReport;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;

Modified: james/server/trunk/mina-socket/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket/pom.xml?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mina-socket/pom.xml (original)
+++ james/server/trunk/mina-socket/pom.xml Mon Feb  1 13:26:59 2010
@@ -37,8 +37,8 @@
       <artifactId>james-server-domain-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-socket-api</artifactId>
+      <groupId>org.apache.james.protocols</groupId>
+      <artifactId>protocols-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java (original)
+++ james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/ProtocolHandlerChainImpl.java Mon Feb  1 13:26:59 2010
@@ -33,12 +33,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.james.api.kernel.LoaderService;
-import org.apache.james.api.protocol.ExtensibleHandler;
-import org.apache.james.api.protocol.HandlersPackage;
-import org.apache.james.api.protocol.ProtocolHandlerChain;
-import org.apache.james.api.protocol.WiringException;
+
 import org.apache.james.lifecycle.Configurable;
 import org.apache.james.lifecycle.LogEnabled;
+import org.apache.james.protocols.api.ExtensibleHandler;
+import org.apache.james.protocols.api.HandlersPackage;
+import org.apache.james.protocols.api.ProtocolHandlerChain;
+import org.apache.james.protocols.api.WiringException;
 
 /**
  * Abstract class which HandlerChains should extend

Modified: james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractIoHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractIoHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractIoHandler.java (original)
+++ james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractIoHandler.java Mon Feb  1 13:26:59 2010
@@ -22,10 +22,10 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.james.api.protocol.ConnectHandler;
-import org.apache.james.api.protocol.LineHandler;
-import org.apache.james.api.protocol.ProtocolSession;
-import org.apache.james.api.protocol.ProtocolHandlerChain;
+import org.apache.james.protocols.api.ConnectHandler;
+import org.apache.james.protocols.api.LineHandler;
+import org.apache.james.protocols.api.ProtocolHandlerChain;
+import org.apache.james.protocols.api.ProtocolSession;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.service.IoHandlerAdapter;
 import org.apache.mina.core.session.IdleStatus;

Modified: james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractMINASession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractMINASession.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractMINASession.java (original)
+++ james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/AbstractMINASession.java Mon Feb  1 13:26:59 2010
@@ -25,8 +25,8 @@
 import javax.net.ssl.SSLContext;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.api.protocol.Response;
-import org.apache.james.api.protocol.TLSSupportedSession;
+import org.apache.james.protocols.api.Response;
+import org.apache.james.protocols.api.TLSSupportedSession;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.ssl.SslFilter;
 

Modified: james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/AbstractResponseFilter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/AbstractResponseFilter.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/AbstractResponseFilter.java (original)
+++ james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/AbstractResponseFilter.java Mon Feb  1 13:26:59 2010
@@ -19,7 +19,7 @@
 
 package org.apache.james.socket.mina.filter;
 
-import org.apache.james.api.protocol.Response;
+import org.apache.james.protocols.api.Response;
 import org.apache.mina.core.filterchain.IoFilterAdapter;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.core.write.DefaultWriteRequest;

Modified: james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java (original)
+++ james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/FilterLineHandlerAdapter.java Mon Feb  1 13:26:59 2010
@@ -18,8 +18,8 @@
  ****************************************************************/
 package org.apache.james.socket.mina.filter;
 
-import org.apache.james.api.protocol.LineHandler;
-import org.apache.james.api.protocol.ProtocolSession;
+import org.apache.james.protocols.api.LineHandler;
+import org.apache.james.protocols.api.ProtocolSession;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.filterchain.IoFilterAdapter;
 import org.apache.mina.core.session.IoSession;

Modified: james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/ResponseValidationFilter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/ResponseValidationFilter.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/ResponseValidationFilter.java (original)
+++ james/server/trunk/mina-socket/src/main/java/org/apache/james/socket/mina/filter/ResponseValidationFilter.java Mon Feb  1 13:26:59 2010
@@ -19,7 +19,7 @@
 package org.apache.james.socket.mina.filter;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.api.protocol.Response;
+import org.apache.james.protocols.api.Response;
 import org.apache.mina.core.filterchain.IoFilterAdapter;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.core.write.WriteRequest;

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Feb  1 13:26:59 2010
@@ -36,7 +36,6 @@
     <module>javamail-util</module>
     <module>common-util</module>
     <module>core-api</module>
-    <module>socket-api</module>
     <module>user-api</module>
     <module>user-function</module>
     <module>user-library</module>
@@ -44,7 +43,6 @@
     <module>domain-api</module>
     <module>core-library</module>
     <module>management</module>
-    <module>smtp-protocol</module>
     <module>core-function</module>
     <module>imapserver</module>
     <module>smtpserver</module>
@@ -333,9 +331,9 @@
       <version>3.0-M1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-socket-api</artifactId>
-      <version>3.0-M1</version>
+      <groupId>org.apache.james.protocols</groupId>
+      <artifactId>protocols-api</artifactId>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -372,14 +370,14 @@
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-smtp-protocol</artifactId>
-      <version>3.0-M1</version>
+      <groupId>org.apache.james.protocols</groupId>
+      <artifactId>protocols-smtp</artifactId>
+      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-smtp-protocol</artifactId>
-      <version>3.0-M1</version>
+      <groupId>org.apache.james.protocols</groupId>
+      <artifactId>protocols-smtp</artifactId>
+      <version>1.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: james/server/trunk/pop3server/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Mon Feb  1 13:26:59 2010
@@ -49,8 +49,8 @@
       <artifactId>james-server-core-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-socket-api</artifactId>
+      <groupId>org.apache.james.protocols</groupId>
+      <artifactId>protocols-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -75,8 +75,8 @@
       <artifactId>james-server-core-library</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-socket-api</artifactId>
+      <groupId>org.apache.james.protocols</groupId>
+      <artifactId>protocols-api</artifactId>
     </dependency>
     
     <dependency>

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Request.java Mon Feb  1 13:26:59 2010
@@ -19,7 +19,7 @@
 
 package org.apache.james.pop3server;
 
-import org.apache.james.api.protocol.BaseRequest;
+import org.apache.james.protocols.api.BaseRequest;
 
 /**
  * POP3Request object 

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Response.java Mon Feb  1 13:26:59 2010
@@ -22,7 +22,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.james.api.protocol.RetCodeResponse;
+import org.apache.james.protocols.api.RetCodeResponse;
+
 
 /**
  * Contains an SMTP result

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Session.java Mon Feb  1 13:26:59 2010
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import org.apache.james.api.protocol.TLSSupportedSession;
+import org.apache.james.protocols.api.TLSSupportedSession;
 import org.apache.james.services.MailRepository;
 import org.apache.mailet.Mail;
 

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CapaCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -24,13 +24,13 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.ExtensibleHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
-import org.apache.james.api.protocol.WiringException;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+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.WiringException;
 
 /**
  * This handler is used to handle CAPA commands
@@ -42,9 +42,11 @@
 
 
 
+
+	
 	/*
 	 * (non-Javadoc)
-	 * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+	 * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
 	 */
     public Response onCommand(POP3Session session, Request request) {
 	    POP3Response response = new POP3Response(POP3Response.OK_RESPONSE,"Capability list follows");

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Mon Feb  1 13:26:59 2010
@@ -22,7 +22,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.james.api.protocol.HandlersPackage;
+import org.apache.james.protocols.api.HandlersPackage;
 
 public class CoreCmdHandlerLoader implements HandlersPackage{
 
@@ -63,8 +63,10 @@
         commands.add(UNKOWNCMDHANDLER);
 
     }
-    /**
-     * @see org.apache.james.api.protocol.HandlersPackage#getHandlers()
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.HandlersPackage#getHandlers()
      */
     public List<String> getHandlers() {
         return commands;

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/DeleCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,12 +25,13 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
+
 import org.apache.james.lifecycle.LifecycleUtil;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/ListCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -27,11 +27,11 @@
 
 import javax.mail.MessagingException;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/NoopCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,11 +25,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 
 /**
   * Handles NOOP command

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/POP3CommandDispatcherLineHandler.java Mon Feb  1 13:26:59 2010
@@ -22,9 +22,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.james.api.protocol.AbstractCommandDispatcher;
-import org.apache.james.api.protocol.CommandHandler;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.AbstractCommandDispatcher;
+import org.apache.james.protocols.api.CommandHandler;
 
 /**
  * Dispatch 

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -27,11 +27,11 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.services.MailRepository;
 import org.apache.james.services.MailServer;
 import org.apache.james.util.POP3BeforeSMTPHelper;

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/QuitCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -26,11 +26,11 @@
 import java.util.List;
 
 import org.apache.commons.collections.ListUtils;
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -21,11 +21,11 @@
 
 package org.apache.james.pop3server.core;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -28,11 +28,11 @@
 
 import javax.mail.MessagingException;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.mailet.Mail;
 
 

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StatCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -27,11 +27,11 @@
 
 import javax.mail.MessagingException;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/StlsCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -24,11 +24,12 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
+
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 
 /**
  * Handler which offer STARTTLS implementation for POP3. STARTTLS is started

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -29,10 +29,10 @@
 
 import javax.mail.MessagingException;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UidlCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,11 +25,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.mailet.Mail;
 
 /**

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UnknownCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,11 +25,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 
 
 /**

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/UserCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,11 +25,11 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.CommandHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.CommandHandler;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 
 /**
   * Handles NOOP command

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java Mon Feb  1 13:26:59 2010
@@ -21,9 +21,9 @@
 package org.apache.james.pop3server.core;
 
 import org.apache.james.Constants;
-import org.apache.james.api.protocol.ConnectHandler;
 import org.apache.james.pop3server.POP3Response;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.ConnectHandler;
 
 public class WelcomeMessageHandler implements ConnectHandler<POP3Session>{
     /** POP3 Server identification string used in POP3 headers */

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/POP3IoHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/POP3IoHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/POP3IoHandler.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/POP3IoHandler.java Mon Feb  1 13:26:59 2010
@@ -20,10 +20,10 @@
 package org.apache.james.pop3server.mina;
 
 import org.apache.commons.logging.Log;
-import org.apache.james.api.protocol.ProtocolSession;
-import org.apache.james.api.protocol.ProtocolHandlerChain;
 import org.apache.james.pop3server.POP3HandlerConfigurationData;
 import org.apache.james.pop3server.POP3Session;
+import org.apache.james.protocols.api.ProtocolHandlerChain;
+import org.apache.james.protocols.api.ProtocolSession;
 import org.apache.james.socket.mina.AbstractIoHandler;
 import org.apache.mina.core.session.IdleStatus;
 import org.apache.mina.core.session.IoSession;

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/filter/POP3ResponseFilter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/filter/POP3ResponseFilter.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/filter/POP3ResponseFilter.java (original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/mina/filter/POP3ResponseFilter.java Mon Feb  1 13:26:59 2010
@@ -19,8 +19,8 @@
 
 package org.apache.james.pop3server.mina.filter;
 
-import org.apache.james.api.protocol.Response;
 import org.apache.james.pop3server.POP3Response;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.socket.mina.filter.AbstractResponseFilter;
 import org.apache.mina.core.session.IoSession;
 

Modified: james/server/trunk/remotemanager/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/pom.xml (original)
+++ james/server/trunk/remotemanager/pom.xml Mon Feb  1 13:26:59 2010
@@ -73,9 +73,9 @@
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-mina-socket</artifactId>
     </dependency>
-       <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-socket-api</artifactId>
+    <dependency>
+      <groupId>org.apache.james.protocols</groupId>
+      <artifactId>protocols-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.mina</groupId>

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/CommandHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/CommandHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/CommandHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/CommandHandler.java Mon Feb  1 13:26:59 2010
@@ -19,7 +19,7 @@
 
 package org.apache.james.remotemanager;
 
-public interface CommandHandler extends org.apache.james.api.protocol.CommandHandler<RemoteManagerSession>{
+public interface CommandHandler extends org.apache.james.protocols.api.CommandHandler<RemoteManagerSession>{
 	
 	public CommandHelp getHelp();
 }

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerRequest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerRequest.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerRequest.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerRequest.java Mon Feb  1 13:26:59 2010
@@ -19,7 +19,7 @@
 
 package org.apache.james.remotemanager;
 
-import org.apache.james.api.protocol.BaseRequest;
+import org.apache.james.protocols.api.BaseRequest;
 
 public class RemoteManagerRequest extends BaseRequest{
 

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerResponse.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerResponse.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerResponse.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerResponse.java Mon Feb  1 13:26:59 2010
@@ -22,7 +22,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.james.api.protocol.Response;
+import org.apache.james.protocols.api.Response;
 
 /**
  */

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/RemoteManagerSession.java Mon Feb  1 13:26:59 2010
@@ -21,8 +21,9 @@
 
 import java.util.Map;
 
-import org.apache.james.api.protocol.LineHandler;
-import org.apache.james.api.protocol.ProtocolSession;
+import org.apache.james.protocols.api.LineHandler;
+import org.apache.james.protocols.api.ProtocolSession;
+
 
 public interface RemoteManagerSession extends ProtocolSession{
 

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddDomainCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,10 +25,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.DomainListManagementException;
 import org.apache.james.management.DomainListManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -57,9 +57,10 @@
         return help;
     }
 
+
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response = null;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddHamCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,10 +25,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.BayesianAnalyzerManagementException;
 import org.apache.james.management.BayesianAnalyzerManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -61,9 +61,10 @@
         return help;
     }
 
+
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddMappingCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -23,9 +23,9 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.api.vut.management.VirtualUserTableManagementException;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddSpamCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,10 +25,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.BayesianAnalyzerManagementException;
 import org.apache.james.management.BayesianAnalyzerManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -63,7 +63,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AddUserCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -26,11 +26,11 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.user.UsersStore;
 import org.apache.james.management.DomainListManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -81,7 +81,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response = null;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/AuthorizationHandler.java Mon Feb  1 13:26:59 2010
@@ -21,8 +21,8 @@
 
 import java.io.UnsupportedEncodingException;
 
-import org.apache.james.api.protocol.ConnectHandler;
-import org.apache.james.api.protocol.LineHandler;
+import org.apache.james.protocols.api.ConnectHandler;
+import org.apache.james.protocols.api.LineHandler;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;
 

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CoreCmdHandlerLoader.java Mon Feb  1 13:26:59 2010
@@ -22,7 +22,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.james.api.protocol.HandlersPackage;
+import org.apache.james.protocols.api.HandlersPackage;
 
 public class CoreCmdHandlerLoader implements HandlersPackage{
     private final List<String> commands = new LinkedList<String>();

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/CountUsersCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -23,9 +23,9 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.api.user.UsersRepository;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DelUserCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -26,10 +26,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.user.UsersStore;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -66,7 +66,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/DeleteSpoolCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -26,10 +26,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.SpoolFilter;
 import org.apache.james.management.SpoolManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -65,9 +65,10 @@
     }
 
 
+
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response = null;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ExportBayesianDataCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,10 +25,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.BayesianAnalyzerManagementException;
 import org.apache.james.management.BayesianAnalyzerManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -59,7 +59,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/FlushSpoolCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,10 +25,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.SpoolFilter;
 import org.apache.james.management.SpoolManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -64,7 +64,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/HelpCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -23,10 +23,10 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.ExtensibleHandler;
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
-import org.apache.james.api.protocol.WiringException;
+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.WiringException;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -48,7 +48,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response = null;
@@ -85,8 +85,9 @@
         return mList;
     }
 
-    /**
-     * @see org.apache.james.api.protocol.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
+    /*
+     * (non-Javadoc)
+     * @see org.apache.james.protocols.api.ExtensibleHandler#wireExtensions(java.lang.Class, java.util.List)
      */
     public void wireExtensions(Class interfaceName, List extension) throws WiringException {
         if (interfaceName.equals(CommandHandler.class)) {

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ImportBayesianDataCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -25,10 +25,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.BayesianAnalyzerManagementException;
 import org.apache.james.management.BayesianAnalyzerManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -59,7 +59,7 @@
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListAllMappingsCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -27,10 +27,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.api.vut.management.VirtualUserTableManagementException;
 import org.apache.james.api.vut.management.VirtualUserTableManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -50,7 +50,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListDomainsCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -26,9 +26,9 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.DomainListManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -58,7 +58,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response = null;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMailetsCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -23,8 +23,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMappingCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -24,9 +24,9 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.api.vut.management.VirtualUserTableManagementException;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;
@@ -38,7 +38,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListMatchersCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -23,8 +23,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
 import org.apache.james.remotemanager.RemoteManagerSession;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListProcessorsCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -6,9 +6,9 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.ProcessorManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -41,7 +41,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response = null;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListSpoolCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -26,10 +26,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.management.SpoolFilter;
 import org.apache.james.management.SpoolManagementService;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -66,7 +66,7 @@
 
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;

Modified: james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java?rev=905276&r1=905275&r2=905276&view=diff
==============================================================================
--- james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java (original)
+++ james/server/trunk/remotemanager/src/main/java/org/apache/james/remotemanager/core/ListUsersCmdHandler.java Mon Feb  1 13:26:59 2010
@@ -26,10 +26,10 @@
 
 import javax.annotation.Resource;
 
-import org.apache.james.api.protocol.Request;
-import org.apache.james.api.protocol.Response;
 import org.apache.james.api.user.UsersRepository;
 import org.apache.james.api.user.UsersStore;
+import org.apache.james.protocols.api.Request;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.remotemanager.CommandHandler;
 import org.apache.james.remotemanager.CommandHelp;
 import org.apache.james.remotemanager.RemoteManagerResponse;
@@ -74,7 +74,7 @@
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.api.protocol.CommandHandler#onCommand(org.apache.james.api.protocol.LogEnabledSession, org.apache.james.api.protocol.Request)
+     * @see org.apache.james.protocols.api.CommandHandler#onCommand(org.apache.james.protocols.api.ProtocolSession, org.apache.james.protocols.api.Request)
      */
     public Response onCommand(RemoteManagerSession session, Request request) {
         RemoteManagerResponse response;



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org