Author: norman
Date: Thu Jan 20 11:48:46 2011
New Revision: 1061242
URL: http://svn.apache.org/viewvc?rev=1061242&view=rev
Log:
Move Pop3BeforeSMTPHelper to protocols-library as its specific to pop3/smtp
Added:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java
- copied, changed from r1061130,
james/server/trunk/util/src/main/java/org/apache/james/util/POP3BeforeSMTPHelper.java
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/PassCmdHandler.java
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
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=1061242&r1=1061241&r2=1061242&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
Thu Jan 20 11:48:46 2011
@@ -35,7 +35,7 @@ import org.apache.james.pop3server.POP3R
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
-import org.apache.james.util.POP3BeforeSMTPHelper;
+import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
/**
* Handles PASS command
Modified:
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1061242&r1=1061241&r2=1061242&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/server/trunk/pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Thu Jan 20 11:48:46 2011
@@ -49,12 +49,12 @@ import org.apache.james.mailbox.inmemory
import org.apache.james.mailbox.inmemory.mail.InMemoryCachingUidProvider;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.pop3server.netty.POP3Server;
+import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
import org.apache.james.protocols.lib.PortUtil;
import org.apache.james.protocols.lib.mock.MockJSR250Loader;
import org.apache.james.protocols.lib.mock.MockProtocolHandlerChain;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.mock.MockUsersRepository;
-import org.apache.james.util.POP3BeforeSMTPHelper;
public class POP3ServerTest extends TestCase {
Copied:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java
(from r1061130,
james/server/trunk/util/src/main/java/org/apache/james/util/POP3BeforeSMTPHelper.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java?p2=james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java&p1=james/server/trunk/util/src/main/java/org/apache/james/util/POP3BeforeSMTPHelper.java&r1=1061130&r2=1061242&rev=1061242&view=diff
==============================================================================
---
james/server/trunk/util/src/main/java/org/apache/james/util/POP3BeforeSMTPHelper.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/POP3BeforeSMTPHelper.java
Thu Jan 20 11:48:46 2011
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.util;
+package org.apache.james.protocols.lib;
import java.util.Collections;
import java.util.HashMap;
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java?rev=1061242&r1=1061241&r2=1061242&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/POP3BeforeSMTPHandler.java
Thu Jan 20 11:48:46 2011
@@ -24,8 +24,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.protocols.api.ConnectHandler;
+import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.util.POP3BeforeSMTPHelper;
import org.apache.james.util.TimeConverter;
/**
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java?rev=1061242&r1=1061241&r2=1061242&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
Thu Jan 20 11:48:46 2011
@@ -20,10 +20,10 @@
package org.apache.james.smtpserver;
+import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.smtpserver.POP3BeforeSMTPHandler;
-import org.apache.james.util.POP3BeforeSMTPHelper;
import junit.framework.TestCase;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
