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 er...@apache.org on 2013/03/11 08:20:54 UTC
svn commit: r1455023 - in /james/mpt/trunk:
antlib/src/main/java/org/apache/james/mpt/ant/
app/src/main/java/org/apache/james/mpt/app/
core/src/main/java/org/apache/james/mpt/
core/src/main/java/org/apache/james/mpt/api/
core/src/main/java/org/apache/j...
Author: eric
Date: Mon Mar 11 07:20:52 2013
New Revision: 1455023
URL: http://svn.apache.org/r1455023
Log:
More packaging in the core module (MPT-4)
Added:
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Continuation.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Continuation.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/HostSystem.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Monitor.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Monitor.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolInteractor.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Session.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Session.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SessionFactory.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/UserAdder.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/UserAdder.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/exception/
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/exception/InvalidServerResponseException.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/InvalidServerResponseException.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/host/
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalHostSystem.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/NullMonitor.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SystemLoggingMonitor.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/FileProtocolSessionBuilder.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSession.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSessionBuilder.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractProtocolTestFramework.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractSimpleScriptedTestProtocol.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractSimpleScriptedTestProtocol.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSession.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSessionFactory.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/user/
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java
- copied, changed from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ScriptedUserAdder.java
Removed:
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractProtocolTestFramework.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractSimpleScriptedTestProtocol.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Continuation.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalHostSystem.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSession.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSessionFactory.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/FileProtocolSessionBuilder.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/InvalidServerResponseException.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Monitor.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/NullMonitor.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolInteractor.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSession.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSessionBuilder.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ScriptedUserAdder.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Session.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SessionFactory.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SystemLoggingMonitor.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/UserAdder.java
Modified:
james/mpt/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
james/mpt/trunk/app/src/main/java/org/apache/james/mpt/app/RunScript.java
james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Runner.java
james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/ImapHostSystem.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java
james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
Modified: james/mpt/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java (original)
+++ james/mpt/trunk/antlib/src/main/java/org/apache/james/mpt/ant/MailProtocolTestTask.java Mon Mar 11 07:20:52 2013
@@ -29,11 +29,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import org.apache.james.mpt.ExternalHostSystem;
-import org.apache.james.mpt.Monitor;
-import org.apache.james.mpt.ProtocolSessionBuilder;
import org.apache.james.mpt.Runner;
-import org.apache.james.mpt.ScriptedUserAdder;
+import org.apache.james.mpt.api.Monitor;
+import org.apache.james.mpt.host.ExternalHostSystem;
+import org.apache.james.mpt.protocol.ProtocolSessionBuilder;
+import org.apache.james.mpt.user.ScriptedUserAdder;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
Modified: james/mpt/trunk/app/src/main/java/org/apache/james/mpt/app/RunScript.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/app/src/main/java/org/apache/james/mpt/app/RunScript.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/app/src/main/java/org/apache/james/mpt/app/RunScript.java (original)
+++ james/mpt/trunk/app/src/main/java/org/apache/james/mpt/app/RunScript.java Mon Mar 11 07:20:52 2013
@@ -22,10 +22,10 @@ package org.apache.james.mpt.app;
import java.io.File;
import java.io.FileInputStream;
-import org.apache.james.mpt.ExternalHostSystem;
-import org.apache.james.mpt.ProtocolSessionBuilder;
import org.apache.james.mpt.Runner;
-import org.apache.james.mpt.SystemLoggingMonitor;
+import org.apache.james.mpt.host.ExternalHostSystem;
+import org.apache.james.mpt.monitor.SystemLoggingMonitor;
+import org.apache.james.mpt.protocol.ProtocolSessionBuilder;
/**
* Runs a single script.
Modified: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Runner.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Runner.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Runner.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Runner.java Mon Mar 11 07:20:52 2013
@@ -19,6 +19,13 @@
package org.apache.james.mpt;
+import org.apache.james.mpt.api.Continuation;
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.api.ProtocolInteractor;
+import org.apache.james.mpt.api.Session;
+import org.apache.james.mpt.api.SessionFactory;
+import org.apache.james.mpt.protocol.ProtocolSession;
+
/**
* Runs protocol scripts.
*/
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Continuation.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Continuation.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Continuation.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Continuation.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Continuation.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Continuation.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Continuation.java Mon Mar 11 07:20:52 2013
@@ -1,4 +1,4 @@
-package org.apache.james.mpt;
+package org.apache.james.mpt.api;
public interface Continuation {
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/HostSystem.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/HostSystem.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/HostSystem.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/HostSystem.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.api;
+
+import org.apache.james.mpt.host.ExternalHostSystem;
/**
* <p>Host system under test.</p>
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Monitor.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Monitor.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Monitor.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Monitor.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Monitor.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Monitor.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Monitor.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.api;
/**
* Monitors the conduct of a process.
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolInteractor.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolInteractor.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolInteractor.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/ProtocolInteractor.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.api;
import java.util.List;
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Session.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Session.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Session.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Session.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Session.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Session.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/Session.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.api;
/**
* A connection to the host.
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SessionFactory.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SessionFactory.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SessionFactory.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/SessionFactory.java Mon Mar 11 07:20:52 2013
@@ -17,9 +17,8 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.api;
-import org.apache.james.mpt.Continuation;
/**
* Builds sessions for protocol testing.
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/UserAdder.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/UserAdder.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/UserAdder.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/UserAdder.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/UserAdder.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/UserAdder.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/api/UserAdder.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.api;
/**
* Adds users on demand.
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/exception/InvalidServerResponseException.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/InvalidServerResponseException.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/exception/InvalidServerResponseException.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/exception/InvalidServerResponseException.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/InvalidServerResponseException.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/InvalidServerResponseException.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/exception/InvalidServerResponseException.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.exception;
/**
* An exception which is thrown when the actual response from a server is
@@ -30,4 +30,5 @@ public class InvalidServerResponseExcept
public InvalidServerResponseException(String message) {
super(message);
}
-}
\ No newline at end of file
+
+}
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalHostSystem.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalHostSystem.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalHostSystem.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/host/ExternalHostSystem.java Mon Mar 11 07:20:52 2013
@@ -17,57 +17,68 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.host;
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.api.Monitor;
+import org.apache.james.mpt.api.UserAdder;
+import org.apache.james.mpt.session.ExternalSessionFactory;
/**
- * <p>Connects to a host system serving on an open port.</p>
+ * <p>
+ * Connects to a host system serving on an open port.
+ * </p>
* <p>
* This is typically used for functional integration testing of a complete
- * server system (including sockets). Apache James MPT AntLib provides an
- * <a href='http://ant.apache.org' rel='tag'>Ant</a> task suitable for this
- * use case.
+ * server system (including sockets). Apache James MPT AntLib provides an <a
+ * href='http://ant.apache.org' rel='tag'>Ant</a> task suitable for this use
+ * case.
* </p>
*/
public class ExternalHostSystem extends ExternalSessionFactory implements HostSystem {
-
+
private final UserAdder userAdder;
/**
* Constructs a host system suitable for connection to an open port.
- * @param host host name that will be connected to, not null
- * @param port port on host that will be connected to, not null
- * @param monitor monitors the conduct of the connection
- * @param shabang protocol shabang will be sent to the script test in the place of the
- * first line received from the server. Many protocols pass server specific information
- * in the first line. When not null, this line will be replaced.
- * Or null when the first line should be passed without replacement
- * @param userAdder null when test system has appropriate users already set
+ *
+ * @param host
+ * host name that will be connected to, not null
+ * @param port
+ * port on host that will be connected to, not null
+ * @param monitor
+ * monitors the conduct of the connection
+ * @param shabang
+ * protocol shabang will be sent to the script test in the place
+ * of the first line received from the server. Many protocols
+ * pass server specific information in the first line. When not
+ * null, this line will be replaced. Or null when the first line
+ * should be passed without replacement
+ * @param userAdder
+ * null when test system has appropriate users already set
*/
- public ExternalHostSystem(final String host, final int port,
- final Monitor monitor, final String shabang, final UserAdder userAdder) {
+ public ExternalHostSystem(final String host, final int port, final Monitor monitor, final String shabang,
+ final UserAdder userAdder) {
super(host, port, monitor, shabang);
this.userAdder = userAdder;
}
public boolean addUser(String user, String password) throws Exception {
if (userAdder == null) {
- monitor.note("Please ensure user '" + user + "' with password '"
- + password + "' exists.");
+ monitor.note("Please ensure user '" + user + "' with password '" + password + "' exists.");
return false;
- } else {
+ }
+ else {
userAdder.addUser(user, password);
}
return true;
}
public void beforeTests() throws Exception {
- // TODO Auto-generated method stub
-
+
}
public void afterTests() throws Exception {
- // TODO Auto-generated method stub
-
+
}
}
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/NullMonitor.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/NullMonitor.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/NullMonitor.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/NullMonitor.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.monitor;
+
+import org.apache.james.mpt.api.Monitor;
/**
* Discards all monitored messages.
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SystemLoggingMonitor.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SystemLoggingMonitor.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SystemLoggingMonitor.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/monitor/SystemLoggingMonitor.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.monitor;
+
+import org.apache.james.mpt.api.Monitor;
/**
* Feeds monitored information to {@link System#out}.
@@ -25,15 +27,15 @@ package org.apache.james.mpt;
public final class SystemLoggingMonitor implements Monitor {
private boolean verbose = false;
-
+
public SystemLoggingMonitor() {
this(false);
}
-
+
public SystemLoggingMonitor(final boolean verbose) {
this.verbose = verbose;
}
-
+
public boolean isVerbose() {
return verbose;
}
@@ -58,5 +60,4 @@ public final class SystemLoggingMonitor
}
}
-
-}
\ No newline at end of file
+}
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/FileProtocolSessionBuilder.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/FileProtocolSessionBuilder.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/FileProtocolSessionBuilder.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/FileProtocolSessionBuilder.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.protocol;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -35,6 +35,7 @@ import org.apache.commons.io.IOUtils;
* @version $Revision$
*/
public class FileProtocolSessionBuilder {
+
private static final String SERVER_CONTINUATION_TAG = "S: \\+";
private static final String CLIENT_TAG = "C:";
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSession.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSession.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSession.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSession.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.protocol;
import java.io.IOException;
import java.util.ArrayList;
@@ -25,6 +25,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
+import org.apache.james.mpt.api.ProtocolInteractor;
+import org.apache.james.mpt.api.Session;
+
/**
* A protocol session which can be run against a reader and writer, which checks
* the server response against the expected values. TODO make ProtocolSession
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSessionBuilder.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSessionBuilder.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ProtocolSessionBuilder.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/protocol/ProtocolSessionBuilder.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.protocol;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -27,6 +27,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import org.apache.james.mpt.api.ProtocolInteractor;
+
/**
* A builder which generates scripts from textual input.
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractProtocolTestFramework.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractProtocolTestFramework.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractProtocolTestFramework.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java Mon Mar 11 07:20:52 2013
@@ -17,7 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.script;
+
+import org.apache.james.mpt.Runner;
+import org.apache.james.mpt.api.Continuation;
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.api.Session;
+import org.apache.james.mpt.protocol.ProtocolSession;
import junit.framework.TestCase;
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractSimpleScriptedTestProtocol.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractSimpleScriptedTestProtocol.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractSimpleScriptedTestProtocol.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractSimpleScriptedTestProtocol.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractSimpleScriptedTestProtocol.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/AbstractSimpleScriptedTestProtocol.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractSimpleScriptedTestProtocol.java Mon Mar 11 07:20:52 2013
@@ -17,12 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.script;
import java.io.InputStream;
import java.util.Locale;
import org.apache.commons.io.IOUtils;
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.protocol.FileProtocolSessionBuilder;
+import org.apache.james.mpt.protocol.ProtocolSession;
import org.junit.After;
/**
@@ -33,10 +36,10 @@ import org.junit.After;
* session file.
*/
public abstract class AbstractSimpleScriptedTestProtocol extends AbstractProtocolTestFramework {
- private FileProtocolSessionBuilder builder = new FileProtocolSessionBuilder();
-
+
private static final Locale BASE_DEFAULT_LOCALE = Locale.getDefault();
+ private FileProtocolSessionBuilder builder = new FileProtocolSessionBuilder();
private final String scriptDirectory;
/**
@@ -86,7 +89,9 @@ public abstract class AbstractSimpleScri
* The ProtocolSession to add elements to.
*/
protected void addTestFile(String fileName, ProtocolSession session) throws Exception {
+
fileName = scriptDirectory + fileName;
+
// Need to find local resource.
InputStream is = this.getClass().getResourceAsStream(fileName);
@@ -100,6 +105,7 @@ public abstract class AbstractSimpleScri
finally {
IOUtils.closeQuietly(is);
}
+
}
}
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSession.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSession.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSession.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSession.java Mon Mar 11 07:20:52 2013
@@ -17,13 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.session;
import java.nio.ByteBuffer;
import java.nio.channels.SocketChannel;
import java.nio.charset.Charset;
-final class ExternalSession implements Session {
+import org.apache.james.mpt.api.Monitor;
+import org.apache.james.mpt.api.Session;
+
+public final class ExternalSession implements Session {
/** Number of milliseconds to sleep after empty read */
private static final int SHORT_WAIT_FOR_INPUT = 10;
@@ -43,7 +46,7 @@ final class ExternalSession implements S
private boolean first = true;
private final String shabang;
-
+
public ExternalSession(final SocketChannel socket, final Monitor monitor, String shabang) {
this(socket, monitor, shabang, false);
}
@@ -67,7 +70,8 @@ final class ExternalSession implements S
monitor.note("<-" + buffer.toString());
result = shabang;
first = false;
- } else {
+ }
+ else {
result = buffer.toString();
monitor.note("<-" + result);
}
@@ -79,7 +83,7 @@ final class ExternalSession implements S
readBuffer.flip();
while (oneFromLine(buffer))
;
-// May have partial read
+ // May have partial read
readBuffer.compact();
monitor.debug("[Done]");
}
@@ -90,27 +94,30 @@ final class ExternalSession implements S
char next = (char) readBuffer.get();
if (next == '\n') {
monitor.debug("[LF]");
-// Reached end of the line
+ // Reached end of the line
result = false;
- } else if (next == '\r') {
-// CRLF line endings so drop
+ }
+ else if (next == '\r') {
+ // CRLF line endings so drop
monitor.debug("[CR]");
result = true;
- } else {
-// Load buffer
+ }
+ else {
+ // Load buffer
monitor.debug(next);
buffer.append(next);
result = true;
}
- } else {
+ }
+ else {
monitor.debug("[Reading into buffer]");
readBuffer.clear();
while (socket.read(readBuffer) == 0) {
-// No response yet
-// Wait a little while
+ // No response yet
+ // Wait a little while
Thread.sleep(SHORT_WAIT_FOR_INPUT);
}
-// Reset for transfer into string buffer
+ // Reset for transfer into string buffer
readBuffer.flip();
monitor.debug("[Done]");
result = true;
@@ -145,28 +152,19 @@ final class ExternalSession implements S
}
/**
- * Constructs a <code>String</code> with all attributes
- * in name = value format.
- *
- * @return a <code>String</code> representation
- * of this object.
+ * Constructs a <code>String</code> with all attributes in name = value
+ * format.
+ *
+ * @return a <code>String</code> representation of this object.
*/
- public String toString()
- {
+ public String toString() {
final String TAB = " ";
-
- String result = "External ( "
- + "socket = " + this.socket + TAB
- + "monitor = " + this.monitor + TAB
- + "readBuffer = " + this.readBuffer + TAB
- + "ascii = " + this.ascii + TAB
- + "lineEndBuffer = " + this.lineEndBuffer + TAB
- + "first = " + this.first + TAB
- + "shabang = " + this.shabang + TAB
- + " )";
-
+
+ String result = "External ( " + "socket = " + this.socket + TAB + "monitor = " + this.monitor + TAB
+ + "readBuffer = " + this.readBuffer + TAB + "ascii = " + this.ascii + TAB + "lineEndBuffer = "
+ + this.lineEndBuffer + TAB + "first = " + this.first + TAB + "shabang = " + this.shabang + TAB + " )";
+
return result;
}
-
-
-}
\ No newline at end of file
+
+}
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSessionFactory.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSessionFactory.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ExternalSessionFactory.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/session/ExternalSessionFactory.java Mon Mar 11 07:20:52 2013
@@ -17,12 +17,15 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.session;
import java.net.InetSocketAddress;
import java.nio.channels.SocketChannel;
-import org.apache.james.mpt.Continuation;
+import org.apache.james.mpt.api.Continuation;
+import org.apache.james.mpt.api.Monitor;
+import org.apache.james.mpt.api.Session;
+import org.apache.james.mpt.api.SessionFactory;
/**
* Session factory creates session which connection to a server port.
@@ -60,8 +63,7 @@ public class ExternalSessionFactory impl
* @return a <code>String</code> representation
* of this object.
*/
- public String toString()
- {
+ public String toString() {
final String TAB = " ";
String retValue = "ExternalSessionFactory ( "
Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java (from r1455022, james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ScriptedUserAdder.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ScriptedUserAdder.java&r1=1455022&r2=1455023&rev=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/ScriptedUserAdder.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/user/ScriptedUserAdder.java Mon Mar 11 07:20:52 2013
@@ -17,11 +17,18 @@
* under the License. *
****************************************************************/
-package org.apache.james.mpt;
+package org.apache.james.mpt.user;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.james.mpt.Runner;
+import org.apache.james.mpt.api.Monitor;
+import org.apache.james.mpt.api.UserAdder;
+import org.apache.james.mpt.monitor.NullMonitor;
+import org.apache.james.mpt.protocol.ProtocolSessionBuilder;
+import org.apache.james.mpt.session.ExternalSessionFactory;
+
/**
* Adds a user by executing a script at a port.
* The user name and password supplied will be substituted
Modified: james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java (original)
+++ james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java Mon Mar 11 07:20:52 2013
@@ -19,7 +19,12 @@
package org.apache.james.mpt;
-import org.apache.james.mpt.Continuation;
+import org.apache.james.mpt.api.Continuation;
+import org.apache.james.mpt.api.Session;
+import org.apache.james.mpt.api.UserAdder;
+import org.apache.james.mpt.host.ExternalHostSystem;
+import org.apache.james.mpt.monitor.NullMonitor;
+import org.apache.james.mpt.session.ExternalSessionFactory;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java (original)
+++ james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestFileProtocolSessionBuilder.java Mon Mar 11 07:20:52 2013
@@ -21,6 +21,8 @@ package org.apache.james.mpt;
import java.io.StringReader;
+import org.apache.james.mpt.api.ProtocolInteractor;
+import org.apache.james.mpt.protocol.ProtocolSessionBuilder;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
Modified: james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java (original)
+++ james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestScriptedUserAdder.java Mon Mar 11 07:20:52 2013
@@ -19,6 +19,8 @@
package org.apache.james.mpt;
+import org.apache.james.mpt.user.ScriptedUserAdder;
+
import junit.framework.TestCase;
public class TestScriptedUserAdder extends TestCase {
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/ImapHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/ImapHostSystem.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/ImapHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/ImapHostSystem.java Mon Mar 11 07:20:52 2013
@@ -34,8 +34,8 @@ import org.apache.james.imap.decode.Imap
import org.apache.james.imap.decode.main.ImapRequestStreamHandler;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.mailbox.MailboxSession.User;
-import org.apache.james.mpt.Continuation;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.Continuation;
+import org.apache.james.mpt.api.HostSystem;
import org.slf4j.LoggerFactory;
public abstract class ImapHostSystem implements HostSystem {
@@ -101,7 +101,7 @@ public abstract class ImapHostSystem imp
return name;
}
- class Session implements org.apache.james.mpt.Session {
+ class Session implements org.apache.james.mpt.api.Session {
ByteBufferOutputStream out;
ByteBufferInputStream in;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/host/HBaseHostSystem.java Mon Mar 11 07:20:52 2013
@@ -41,7 +41,7 @@ import org.apache.james.mailbox.hbase.ma
import org.apache.james.mailbox.hbase.mail.HBaseUidProvider;
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.ImapHostSystem;
import org.slf4j.LoggerFactory;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/host/InMemoryHostSystem.java Mon Mar 11 07:20:52 2013
@@ -32,7 +32,7 @@ import org.apache.james.mailbox.inmemory
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.ImapHostSystem;
public class InMemoryHostSystem extends ImapHostSystem {
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/host/JCRHostSystem.java Mon Mar 11 07:20:52 2013
@@ -41,7 +41,7 @@ import org.apache.james.mailbox.jcr.mail
import org.apache.james.mailbox.jcr.mail.JCRUidProvider;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MockAuthenticator;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.ImapHostSystem;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/host/JPAHostSystem.java Mon Mar 11 07:20:52 2013
@@ -48,7 +48,7 @@ import org.apache.james.mailbox.jpa.open
import org.apache.james.mailbox.jpa.user.model.JPASubscription;
import org.apache.james.mailbox.store.JVMMailboxPathLocker;
import org.apache.james.mailbox.store.MockAuthenticator;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.ImapHostSystem;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.slf4j.LoggerFactory;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/host/MaildirHostSystem.java Mon Mar 11 07:20:52 2013
@@ -36,7 +36,7 @@ import org.apache.james.mailbox.store.JV
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
import org.apache.james.mailbox.store.StoreSubscriptionManager;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.ImapHostSystem;
public class MaildirHostSystem extends ImapHostSystem {
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseNonAuthenticatedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseImapProtocol;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedInbox;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java Mon Mar 11 07:20:52 2013
@@ -21,7 +21,7 @@ package org.apache.james.mpt.imapmailbox
import java.util.Locale;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
import org.junit.Test;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java Mon Mar 11 07:20:52 2013
@@ -19,7 +19,7 @@
package org.apache.james.mpt.imapmailbox.suite.base;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.ImapTestConstants;
import org.junit.Before;
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java Mon Mar 11 07:20:52 2013
@@ -18,9 +18,9 @@
****************************************************************/
package org.apache.james.mpt.imapmailbox.suite.base;
-import org.apache.james.mpt.AbstractSimpleScriptedTestProtocol;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.apache.james.mpt.imapmailbox.ImapTestConstants;
+import org.apache.james.mpt.script.AbstractSimpleScriptedTestProtocol;
/**
* Specialise the protocol test framework for IMAP.
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java Mon Mar 11 07:20:52 2013
@@ -19,7 +19,7 @@
package org.apache.james.mpt.imapmailbox.suite.base;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.junit.Before;
/**
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java Mon Mar 11 07:20:52 2013
@@ -19,7 +19,7 @@
package org.apache.james.mpt.imapmailbox.suite.base;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
/**
* <p>
Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java Mon Mar 11 07:20:52 2013
@@ -19,7 +19,7 @@
package org.apache.james.mpt.imapmailbox.suite.base;
-import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.api.HostSystem;
import org.junit.Before;
/**
Modified: james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java?rev=1455023&r1=1455022&r2=1455023&view=diff
==============================================================================
--- james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java (original)
+++ james/mpt/trunk/mavenplugin/src/main/java/org/apache/james/mpt/maven/MailProtocolTest.java Mon Mar 11 07:20:52 2013
@@ -27,11 +27,11 @@ import java.io.InputStream;
import java.io.Reader;
import java.io.StringReader;
-import org.apache.james.mpt.ExternalHostSystem;
-import org.apache.james.mpt.Monitor;
-import org.apache.james.mpt.ProtocolSessionBuilder;
import org.apache.james.mpt.Runner;
-import org.apache.james.mpt.ScriptedUserAdder;
+import org.apache.james.mpt.api.Monitor;
+import org.apache.james.mpt.host.ExternalHostSystem;
+import org.apache.james.mpt.protocol.ProtocolSessionBuilder;
+import org.apache.james.mpt.user.ScriptedUserAdder;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org