james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1454808 - in /james/mpt/trunk: core/src/main/java/org/apache/james/imap/tester/ core/src/main/java/org/apache/james/imap/tester/base/ core/src/main/java/org/apache/james/imap/tester/external/ core/src/main/java/org/apache/james/imap/tester...
Date Sun, 10 Mar 2013 09:43:43 GMT
Author: eric
Date: Sun Mar 10 09:43:42 2013
New Revision: 1454808

URL: http://svn.apache.org/r1454808
Log:
Merge the HostSystem and Session used in MPT and imap-mailbox, first step of infrastructure reconciliation (MPT-4)

Added:
    james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Continuation.java
    james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java
      - copied, changed from r1454807, james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/HostSystem.java
    james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/
    james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/SilentLog.java
      - copied, changed from r1454807, james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/SilentLog.java
    james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java
      - copied, changed from r1454807, james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/VerboseConsoleLog.java
Removed:
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/SilentLog.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/VerboseConsoleLog.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/HostSystem.java
    james/mpt/trunk/impl/imap-mailbox/src/main/java/org/apache/james/
Modified:
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForAuthenticatedState.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForNonAuthenticatedState.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedInbox.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedStateBase.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapHostSystem.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapProtocolFramework.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractProtocolTestFramework.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractSimpleScriptedTestProtocol.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/ProtocolSession.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/external/ExternalHostSystem.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/AuthenticatedState.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/ConcurrentSessions.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Events.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Expunge.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Fetch.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodySection.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodyStructure.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchHeaders.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Listing.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/NonAuthenticatedState.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/PartialFetch.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Rename.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Search.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Security.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Select.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedInbox.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedState.java
    james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/UidSearch.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/ExternalSessionFactory.java
    james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Runner.java
    james/mpt/trunk/core/src/main/java/org/apache/james/mpt/SessionFactory.java
    james/mpt/trunk/core/src/test/java/org/apache/james/mpt/TestExternalHostSystem.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForAuthenticatedState.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForAuthenticatedState.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForAuthenticatedState.java Sun Mar 10 09:43:42 2013
@@ -19,7 +19,7 @@
 
 package org.apache.james.imap.tester;
 
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Before;
 
 /**

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForNonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForNonAuthenticatedState.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForNonAuthenticatedState.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForNonAuthenticatedState.java Sun Mar 10 09:43:42 2013
@@ -19,7 +19,7 @@
 
 package org.apache.james.imap.tester;
 
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Before;
 
 /**

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedInbox.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedInbox.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedInbox.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedInbox.java Sun Mar 10 09:43:42 2013
@@ -19,7 +19,7 @@
 
 package org.apache.james.imap.tester;
 
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 
 /**
  * <p>

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedStateBase.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedStateBase.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedStateBase.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/FrameworkForSelectedStateBase.java Sun Mar 10 09:43:42 2013
@@ -19,7 +19,7 @@
 
 package org.apache.james.imap.tester;
 
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Before;
 
 /**

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapHostSystem.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapHostSystem.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapHostSystem.java Sun Mar 10 09:43:42 2013
@@ -33,8 +33,9 @@ import org.apache.james.imap.api.process
 import org.apache.james.imap.decode.ImapDecoder;
 import org.apache.james.imap.decode.main.ImapRequestStreamHandler;
 import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.imap.tester.base.HostSystem;
 import org.apache.james.mailbox.MailboxSession.User;
+import org.apache.james.mpt.Continuation;
+import org.apache.james.mpt.HostSystem;
 import org.slf4j.LoggerFactory;
 
 public abstract class ImapHostSystem implements HostSystem {
@@ -59,7 +60,7 @@ public abstract class ImapHostSystem imp
         this.processor = processor;
     }
 
-    public HostSystem.Session newSession(Continuation continuation)
+    public Session newSession(Continuation continuation)
             throws Exception {
         return new Session(continuation);
     }
@@ -100,7 +101,7 @@ public abstract class ImapHostSystem imp
         return name;
     }
 
-    class Session implements HostSystem.Session {
+    class Session implements org.apache.james.mpt.Session {
         ByteBufferOutputStream out;
 
         ByteBufferInputStream in;

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapProtocolFramework.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapProtocolFramework.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapProtocolFramework.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/ImapProtocolFramework.java Sun Mar 10 09:43:42 2013
@@ -19,7 +19,7 @@
 package org.apache.james.imap.tester;
 
 import org.apache.james.imap.tester.base.AbstractSimpleScriptedTestProtocol;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 
 /**
  * Specialise the protocol test framework for IMAP.

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractProtocolTestFramework.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractProtocolTestFramework.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractProtocolTestFramework.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractProtocolTestFramework.java Sun Mar 10 09:43:42 2013
@@ -19,6 +19,9 @@
 
 package org.apache.james.imap.tester.base;
 
+import org.apache.james.mpt.Continuation;
+import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.Session;
 import org.junit.After;
 import org.junit.Before;
 
@@ -82,7 +85,7 @@ public abstract class AbstractProtocolTe
      * {@link MockImapServer#getImapSession()} works.
      */
     protected void runSessions() throws Exception {
-        class SessionContinuation implements HostSystem.Continuation {
+        class SessionContinuation implements Continuation {
 
             public ProtocolSession session;
 
@@ -95,7 +98,7 @@ public abstract class AbstractProtocolTe
         }
         SessionContinuation continuation = new SessionContinuation();
 
-        HostSystem.Session[] sessions = new HostSystem.Session[testElements
+        Session[] sessions = new Session[testElements
                 .getSessionCount()];
 
         for (int i = 0; i < sessions.length; i++) {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractSimpleScriptedTestProtocol.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractSimpleScriptedTestProtocol.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractSimpleScriptedTestProtocol.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/AbstractSimpleScriptedTestProtocol.java Sun Mar 10 09:43:42 2013
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.util.Locale;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.james.mpt.HostSystem;
 import org.junit.After;
 
 

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/ProtocolSession.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/ProtocolSession.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/ProtocolSession.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/ProtocolSession.java Sun Mar 10 09:43:42 2013
@@ -25,6 +25,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.apache.james.mpt.Session;
 
 /**
  * A protocol session which can be run against a reader and writer, which checks
@@ -33,8 +34,6 @@ import java.util.regex.Pattern;
  * sessions.
  * 
  * @author Darrell DeBoer <darrell@apache.org>
- * 
- * @version $Revision$
  */
 public class ProtocolSession {
     private boolean continued = false;
@@ -47,7 +46,7 @@ public class ProtocolSession {
 
     private Iterator<ProtocolElement> elementsIterator;
 
-    private HostSystem.Session[] sessions;
+    private Session[] sessions;
 
     private ProtocolElement nextTest;
 
@@ -82,7 +81,7 @@ public class ProtocolSession {
      * @param in
      *            The server responses are read from here.
      */
-    public void runSessions(HostSystem.Session[] sessions) throws Exception {
+    public void runSessions(Session[] sessions) throws Exception {
         this.sessions = sessions;
         elementsIterator = testElements.iterator();
         while (elementsIterator.hasNext()) {
@@ -213,20 +212,20 @@ public class ProtocolSession {
          * 
          * @throws Exception
          */
-        public void testProtocol(HostSystem.Session[] sessions,
+        public void testProtocol(Session[] sessions,
                 boolean continueAfterFailure) throws Exception {
             if (sessionNumber < 0) {
                 for (int i = 0; i < sessions.length; i++) {
-                    HostSystem.Session session = sessions[i];
+                    Session session = sessions[i];
                     writeMessage(session);
                 }
             } else {
-                HostSystem.Session session = sessions[sessionNumber];
+                Session session = sessions[sessionNumber];
                 writeMessage(session);
             }
         }
 
-        private void writeMessage(HostSystem.Session session) throws Exception {
+        private void writeMessage(Session session) throws Exception {
             session.writeLine(message);
         }
 
@@ -295,20 +294,20 @@ public class ProtocolSession {
          *             If the actual server response didn't match the regular
          *             expression expected.
          */
-        public void testProtocol(HostSystem.Session[] sessions,
+        public void testProtocol(Session[] sessions,
                 boolean continueAfterFailure) throws Exception {
             if (sessionNumber < 0) {
                 for (int i = 0; i < sessions.length; i++) {
-                    HostSystem.Session session = sessions[i];
+                    Session session = sessions[i];
                     checkResponse(session, continueAfterFailure);
                 }
             } else {
-                HostSystem.Session session = sessions[sessionNumber];
+                Session session = sessions[sessionNumber];
                 checkResponse(session, continueAfterFailure);
             }
         }
 
-        protected void checkResponse(HostSystem.Session session,
+        protected void checkResponse(Session session,
                 boolean continueAfterFailure) throws Exception {
             String testLine = readLine(session);
             if (!match(expectedLine, testLine)) {
@@ -344,7 +343,7 @@ public class ProtocolSession {
          * 
          * @return String of the line from the server
          */
-        protected String readLine(HostSystem.Session session) throws Exception {
+        protected String readLine(Session session) throws Exception {
             try {
                 return session.readLine();
             } catch (IOException e) {
@@ -411,7 +410,7 @@ public class ProtocolSession {
          *             If a line is encountered which doesn't match one of the
          *             expected lines.
          */
-        protected void checkResponse(HostSystem.Session session,
+        protected void checkResponse(Session session,
                 boolean continueAfterFailure) throws Exception {
             List<String> testLines = new ArrayList<String>(expectedLines);
             while (testLines.size() > 0) {
@@ -456,9 +455,9 @@ public class ProtocolSession {
             this.sessionNumber = sessionNumber < 0 ? 0 : sessionNumber;
         }
 
-        public void testProtocol(HostSystem.Session[] sessions,
+        public void testProtocol(Session[] sessions,
                 boolean continueAfterFailure) throws Exception {
-            HostSystem.Session session = sessions[sessionNumber];
+            Session session = sessions[sessionNumber];
             continuationExpected = true;
             continued = false;
             String testLine = session.readLine();
@@ -497,7 +496,7 @@ public class ProtocolSession {
          *            TODO
          * @throws Exception
          */
-        void testProtocol(HostSystem.Session[] sessions,
+        void testProtocol(Session[] sessions,
                 boolean continueAfterFailure) throws Exception;
 
         boolean isClient();

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/external/ExternalHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/external/ExternalHostSystem.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/external/ExternalHostSystem.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/external/ExternalHostSystem.java Sun Mar 10 09:43:42 2013
@@ -24,7 +24,9 @@ import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.Charset;
 
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.Continuation;
+import org.apache.james.mpt.HostSystem;
+import org.apache.james.mpt.Session;
 
 public class ExternalHostSystem implements HostSystem {
 

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/AuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/AuthenticatedState.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/AuthenticatedState.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/AuthenticatedState.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForAuthenticatedState;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class AuthenticatedState extends FrameworkForAuthenticatedState {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/ConcurrentSessions.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/ConcurrentSessions.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/ConcurrentSessions.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/ConcurrentSessions.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForAuthenticatedState;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class ConcurrentSessions extends FrameworkForAuthenticatedState {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Events.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Events.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Events.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Events.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class Events extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Expunge.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Expunge.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Expunge.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Expunge.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class Expunge extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Fetch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Fetch.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Fetch.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Fetch.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class Fetch extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodySection.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodySection.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodySection.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodySection.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class FetchBodySection extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodyStructure.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodyStructure.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodyStructure.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchBodyStructure.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class FetchBodyStructure extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchHeaders.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchHeaders.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchHeaders.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/FetchHeaders.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class FetchHeaders extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Listing.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Listing.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Listing.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Listing.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForAuthenticatedState;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class Listing extends FrameworkForAuthenticatedState {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/NonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/NonAuthenticatedState.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/NonAuthenticatedState.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/NonAuthenticatedState.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForNonAuthenticatedState;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class NonAuthenticatedState extends FrameworkForNonAuthenticatedState {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/PartialFetch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/PartialFetch.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/PartialFetch.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/PartialFetch.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class PartialFetch extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Rename.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Rename.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Rename.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Rename.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class Rename extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Search.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Search.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Search.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Search.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForAuthenticatedState;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class Search extends FrameworkForAuthenticatedState {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Security.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Security.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Security.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Security.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.ImapProtocolFramework;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class Security extends ImapProtocolFramework {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Select.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Select.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Select.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/Select.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForAuthenticatedState;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class Select extends FrameworkForAuthenticatedState {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedInbox.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedInbox.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedInbox.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedInbox.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedInbox;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class SelectedInbox extends FrameworkForSelectedInbox {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedState.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedState.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/SelectedState.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForSelectedStateBase;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class SelectedState extends FrameworkForSelectedStateBase {

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/UidSearch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/UidSearch.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/UidSearch.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/suite/UidSearch.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.imap.tester.sui
 import java.util.Locale;
 
 import org.apache.james.imap.tester.FrameworkForAuthenticatedState;
-import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mpt.HostSystem;
 import org.junit.Test;
 
 public abstract class UidSearch extends

Added: 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/Continuation.java?rev=1454808&view=auto
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Continuation.java (added)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/Continuation.java Sun Mar 10 09:43:42 2013
@@ -0,0 +1,7 @@
+package org.apache.james.mpt;
+
+public interface Continuation {
+
+    public void doContinue();
+
+}

Modified: 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/ExternalHostSystem.java?rev=1454808&r1=1454807&r2=1454808&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/ExternalHostSystem.java Sun Mar 10 09:43:42 2013
@@ -50,12 +50,24 @@ public class ExternalHostSystem extends 
         this.userAdder = userAdder;
     }
 
-    public void addUser(String user, String password) throws Exception {
+    public boolean addUser(String user, String password) throws Exception {
         if (userAdder == null) {
             monitor.note("Please ensure user '" + user + "' with password '"
                 + password + "' exists.");
+            return false;
         } 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
+        
     }
 }

Modified: 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/ExternalSessionFactory.java?rev=1454808&r1=1454807&r2=1454808&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/ExternalSessionFactory.java Sun Mar 10 09:43:42 2013
@@ -22,7 +22,7 @@ package org.apache.james.mpt;
 import java.net.InetSocketAddress;
 import java.nio.channels.SocketChannel;
 
-import org.apache.james.mpt.HostSystem.Continuation;
+import org.apache.james.mpt.Continuation;
 
 /**
  * Session factory creates session which connection to a server port.

Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java (from r1454807, james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/HostSystem.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/HostSystem.java&r1=1454807&r2=1454808&rev=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/base/HostSystem.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/HostSystem.java Sun Mar 10 09:43:42 2013
@@ -17,13 +17,21 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.tester.base;
+package org.apache.james.mpt;
 
 /**
- * Host system under test.
- * 
+ * <p>Host system under test.</p>
+ * <p>
+ * This interface encapsulates the interaction between the server
+ * under test and the test framework. MPT can be used to test components
+ * without the need to serve the protocol though a socket by creating a 
+ * suitable implementation of this interface.
+ * </p>
+ * @see ExternalHostSystem  ExternalHostSystem (a <code>HostSystem</code> for servers
+ * running independently)
+ * @see Session Session (supports multiple connection to the host system)
  */
-public interface HostSystem {
+public interface HostSystem extends SessionFactory {
 
     /**
      * Resets host system to initial state.
@@ -51,32 +59,8 @@ public interface HostSystem {
      */
     public Session newSession(Continuation continuation) throws Exception;
 
-    public interface Session {
-        public String readLine() throws Exception;
-
-        public void writeLine(String line) throws Exception;
-
-        /**
-         * Opens the session.
-         * 
-         * @throws Exception
-         */
-        public void start() throws Exception;
-
-        /**
-         * Closes the session.
-         * 
-         * @throws Exception
-         */
-        public void stop() throws Exception;
-    }
-
-    public interface Continuation {
-        public void doContinue();
-    }
-    
     public void beforeTests() throws Exception;
 
-    
     public void afterTests() throws Exception;
+
 }

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=1454808&r1=1454807&r2=1454808&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 Sun Mar 10 09:43:42 2013
@@ -74,7 +74,7 @@ public class Runner {
      * testing. One mock instance is required per protocol session/connection.
      */
     public void runSessions(final SessionFactory factory) throws Exception {
-        class SessionContinuation implements HostSystem.Continuation {
+        class SessionContinuation implements Continuation {
 
             public ProtocolSession session;
 

Modified: 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/SessionFactory.java?rev=1454808&r1=1454807&r2=1454808&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/SessionFactory.java Sun Mar 10 09:43:42 2013
@@ -19,7 +19,7 @@
 
 package org.apache.james.mpt;
 
-import org.apache.james.mpt.HostSystem.Continuation;
+import org.apache.james.mpt.Continuation;
 
 /**
  * Builds sessions for protocol testing.

Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/SilentLog.java (from r1454807, james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/SilentLog.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/SilentLog.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/SilentLog.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/SilentLog.java&r1=1454807&r2=1454808&rev=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/SilentLog.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/SilentLog.java Sun Mar 10 09:43:42 2013
@@ -17,7 +17,7 @@
  * under the License.                                           *
  ****************************************************************/
 
-package org.apache.james.imap.tester;
+package org.apache.james.mpt.log;
 
 import org.slf4j.Logger;
 import org.slf4j.Marker;

Copied: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java (from r1454807, james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/VerboseConsoleLog.java)
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java?p2=james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java&p1=james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/VerboseConsoleLog.java&r1=1454807&r2=1454808&rev=1454808&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/imap/tester/VerboseConsoleLog.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/log/VerboseConsoleLog.java Sun Mar 10 09:43:42 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations      *
  * under the License.                                           *
  ****************************************************************/
-package org.apache.james.imap.tester;
+package org.apache.james.mpt.log;
 
 import org.slf4j.Logger;
 import org.slf4j.Marker;

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=1454808&r1=1454807&r2=1454808&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 Sun Mar 10 09:43:42 2013
@@ -19,7 +19,7 @@
 
 package org.apache.james.mpt;
 
-import org.apache.james.mpt.HostSystem.Continuation;
+import org.apache.james.mpt.Continuation;
 import org.jmock.Mock;
 import org.jmock.MockObjectTestCase;
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java Sun Mar 10 09:43:42 2013
@@ -30,7 +30,6 @@ import org.apache.james.imap.encode.main
 import org.apache.james.imap.main.DefaultImapDecoderFactory;
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
-import org.apache.james.imap.tester.base.HostSystem;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.SubscriptionManager;
 import org.apache.james.mailbox.acl.GroupMembershipResolver;
@@ -43,6 +42,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.slf4j.LoggerFactory;
 
 public class HBaseHostSystem extends ImapHostSystem {

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java Sun Mar 10 09:43:42 2013
@@ -24,7 +24,6 @@ import org.apache.james.imap.encode.main
 import org.apache.james.imap.main.DefaultImapDecoderFactory;
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
-import org.apache.james.imap.tester.base.HostSystem;
 import org.apache.james.mailbox.acl.GroupMembershipResolver;
 import org.apache.james.mailbox.acl.MailboxACLResolver;
 import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
@@ -34,6 +33,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;
 
 public class InMemoryHostSystem extends ImapHostSystem {
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java Sun Mar 10 09:43:42 2013
@@ -28,7 +28,6 @@ import org.apache.james.imap.encode.main
 import org.apache.james.imap.main.DefaultImapDecoderFactory;
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
-import org.apache.james.imap.tester.base.HostSystem;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.acl.GroupMembershipResolver;
 import org.apache.james.mailbox.acl.MailboxACLResolver;
@@ -43,6 +42,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.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java Sun Mar 10 09:43:42 2013
@@ -30,7 +30,6 @@ import org.apache.james.imap.encode.main
 import org.apache.james.imap.main.DefaultImapDecoderFactory;
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
-import org.apache.james.imap.tester.base.HostSystem;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.SubscriptionManager;
 import org.apache.james.mailbox.acl.GroupMembershipResolver;
@@ -50,6 +49,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.openjpa.persistence.OpenJPAPersistence;
 import org.slf4j.LoggerFactory;
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java?rev=1454808&r1=1454807&r2=1454808&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java Sun Mar 10 09:43:42 2013
@@ -26,7 +26,6 @@ import org.apache.james.imap.encode.main
 import org.apache.james.imap.main.DefaultImapDecoderFactory;
 import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
 import org.apache.james.imap.tester.ImapHostSystem;
-import org.apache.james.imap.tester.base.HostSystem;
 import org.apache.james.mailbox.acl.GroupMembershipResolver;
 import org.apache.james.mailbox.acl.MailboxACLResolver;
 import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
@@ -38,6 +37,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;
 
 public class MaildirHostSystem extends ImapHostSystem {
 



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


Mime
View raw message