makes the files closer to the svn original so easier to track changes

james/apache-james-mailbox/memory/pom.xml

@@ -66,16 +66,12 @@
     	</dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>apache-mailet</artifactId>
+            <artifactId>apache-james-mailbox-api</artifactId>
         </dependency>
         <dependency>
             <groupId>${javax.mail.groupId}</groupId>
             <artifactId>${javax.mail.artifactId}</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.james</groupId>
-            <artifactId>apache-james-mailbox-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
             <artifactId>apache-james-mailbox-store</artifactId>

james/apache-james-mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/InMemoryMailboxSessionMapperFactory.java

@@ -30,7 +30,6 @@ import org.apache.james.mailbox.store.MailboxSessionMapperFactory;
 import org.apache.james.mailbox.store.mail.MailboxMapper;
 import org.apache.james.mailbox.store.mail.MessageMapper;
 import org.apache.james.mailbox.store.user.SubscriptionMapper;
-import org.apache.mailet.MailetContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,7 +42,6 @@ import java.net.InetSocketAddress;
 
 public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFactory<Long> {
 
-	private MailetContext mailetContext;
     private MailboxMapper<Long> mailboxMapper;
     private MessageMapper<Long> messageMapper;
     private SubscriptionMapper subscriptionMapper;
@@ -59,8 +57,8 @@ public class InMemoryMailboxSessionMapperFactory extends MailboxSessionMapperFac
         proxySelector.install();
         log.info("Finished Installing proxy");
 	
-        mailboxMapper = new InMemoryMailboxMapper(mailetContext);
+        mailboxMapper = new InMemoryMailboxMapper();
-        messageMapper = new InMemoryMessageMapper(mailetContext, null, new InMemoryUidProvider(), new InMemoryModSeqProvider());
+        messageMapper = new InMemoryMessageMapper(null, new InMemoryUidProvider(), new InMemoryModSeqProvider());
         subscriptionMapper = new InMemorySubscriptionMapper();
     }
     

james/apache-james-mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxMapper.java

@@ -30,15 +30,10 @@ import org.apache.james.mailbox.model.MailboxPath;
 import org.apache.james.mailbox.store.mail.MailboxMapper;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.impl.SimpleMailbox;
-import org.apache.mailet.MailetContext;
 
 public class InMemoryMailboxMapper implements MailboxMapper<Long> {
 
-	MailetContext mailetContext;
+    public InMemoryMailboxMapper() {
-	
-    public InMemoryMailboxMapper(MailetContext mailetContext) 
-    {
-    	this.mailetContext = mailetContext;
     }
 
     /**

james/apache-james-mailbox/memory/src/main/java/org/apache/james/mailbox/inmemory/mail/InMemoryMessageMapper.java

@@ -44,7 +44,6 @@ import org.apache.james.mailbox.store.mail.UidProvider;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.Message;
 import org.apache.james.mailbox.store.mail.model.impl.SimpleMessage;
-import org.apache.mailet.MailetContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,39 +56,27 @@ public class InMemoryMessageMapper extends AbstractMessageMapper<Long>
 {
     private static final int INITIAL_SIZE = 8;
     Logger log = LoggerFactory.getLogger(InMemoryMessageMapper.class);
-	MailetContext mailetContext;
 
-	public InMemoryMessageMapper(
+    public InMemoryMessageMapper(MailboxSession session, UidProvider<Long> uidProvider,
-		MailetContext mailetContext,
+            ModSeqProvider<Long> modSeqProvider) {
-		MailboxSession session, UidProvider<Long> uidProvider,
-		ModSeqProvider<Long> modSeqProvider
-	)
-	{
         super(session, uidProvider, modSeqProvider);
-		this.mailetContext = mailetContext;
     }
 
-	private Map<Long, Message<Long>> getMembershipByUidForMailbox(
+    private Map<Long, Message<Long>> getMembershipByUidForMailbox(Mailbox<Long> mailbox) {
-			Mailbox<Long> mailbox)
-	{
         return new ConcurrentHashMap<Long, Message<Long>>(INITIAL_SIZE);
     }
 
     /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#countMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
-	public long countMessagesInMailbox(Mailbox<Long> mailbox)
+    public long countMessagesInMailbox(Mailbox<Long> mailbox) throws MailboxException {
-			throws MailboxException
-	{
         throw new MailboxException("not supported");
     }
 
     /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#countUnseenMessagesInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
-	public long countUnseenMessagesInMailbox(Mailbox<Long> mailbox)
+    public long countUnseenMessagesInMailbox(Mailbox<Long> mailbox) throws MailboxException {
-			throws MailboxException
-	{
         throw new MailboxException("not supported");
     }
 
@@ -97,9 +84,7 @@ public class InMemoryMessageMapper extends AbstractMessageMapper<Long>
      * @see org.apache.james.mailbox.store.mail.MessageMapper#delete(org.apache.james.mailbox.store.mail.model.Mailbox,
      *      org.apache.james.mailbox.store.mail.model.Message)
      */
-	public void delete(Mailbox<Long> mailbox, Message<Long> message)
+    public void delete(Mailbox<Long> mailbox, Message<Long> message) throws MailboxException {
-			throws MailboxException
-	{
         throw new MailboxException("not supported");
     }
 
@@ -108,8 +93,8 @@ public class InMemoryMessageMapper extends AbstractMessageMapper<Long>
      *      org.apache.james.mailbox.model.MessageRange,
      *      org.apache.james.mailbox.store.mail.MessageMapper.FetchType, int)
      */
-	public Iterator<Message<Long>> findInMailbox(Mailbox<Long> mailbox,
+    public Iterator<Message<Long>> findInMailbox(Mailbox<Long> mailbox, MessageRange set, FetchType ftype, int max) 
-			MessageRange set, FetchType ftype, int max) throws MailboxException
+            throws MailboxException
     {
         throw new MailboxException("not supported");
     }
@@ -117,39 +102,44 @@ public class InMemoryMessageMapper extends AbstractMessageMapper<Long>
     /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#findRecentMessageUidsInMailbox(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
-	public List<Long> findRecentMessageUidsInMailbox(Mailbox<Long> mailbox)
+    public List<Long> findRecentMessageUidsInMailbox(Mailbox<Long> mailbox) throws MailboxException {
-			throws MailboxException
-	{
         throw new MailboxException("not supported");
     }
 
     /**
      * @see org.apache.james.mailbox.store.mail.MessageMapper#findFirstUnseenMessageUid(org.apache.james.mailbox.store.mail.model.Mailbox)
      */
-	public Long findFirstUnseenMessageUid(Mailbox<Long> mailbox)
+    public Long findFirstUnseenMessageUid(Mailbox<Long> mailbox) throws MailboxException {
-			throws MailboxException
-	{
         throw new MailboxException("not supported");
     }
 
-	public void deleteAll()
+    public void deleteAll() {
-	{
     }
 
     /**
      * Do nothing
      */
-	public void endRequest()
+    public void endRequest() {
-	{
         // Do nothing
     }
 
+     /**
+     * (non-Javadoc)
+     * 
+     * @see org.apache.james.mailbox.store.mail.MessageMapper#move(org.apache.james.mailbox.store.mail.model.Mailbox,
+     *      org.apache.james.mailbox.store.mail.model.Message)
+     */
+    @Override
+    public MessageMetaData move(Mailbox<Long> mailbox, Message<Long> original) throws MailboxException {
+        throw new UnsupportedOperationException("Not implemented - see https://issues.apache.org/jira/browse/IMAP-370");
+    }
+
     /**
      * @see org.apache.james.mailbox.store.mail.AbstractMessageMapper#copy(org.apache.james.mailbox.store.mail.model.Mailbox,
      *      long, long, org.apache.james.mailbox.store.mail.model.Message)
      */
-	protected MessageMetaData copy(Mailbox<Long> mailbox, long uid,
+    protected MessageMetaData copy(Mailbox<Long> mailbox, long uid, long modSeq, Message<Long> original) 
-			long modSeq, Message<Long> original) throws MailboxException
+        throws MailboxException
     {
         throw new MailboxException("not supported");
     }
@@ -158,9 +148,7 @@ public class InMemoryMessageMapper extends AbstractMessageMapper<Long>
      * @see org.apache.james.mailbox.store.mail.AbstractMessageMapper#save(org.apache.james.mailbox.store.mail.model.Mailbox,
      *      org.apache.james.mailbox.store.mail.model.Message)
      */
-	protected MessageMetaData save(Mailbox<Long> mailbox, Message<Long> message)
+    protected MessageMetaData save(Mailbox<Long> mailbox, Message<Long> message) throws MailboxException {
-			throws MailboxException
-	{
 //		if (new Random().nextInt() % 3 == 0)
 //			throw new MailboxException("Artificially simulating save failure");
 			
@@ -212,29 +200,25 @@ public class InMemoryMessageMapper extends AbstractMessageMapper<Long>
     /**
      * Do nothing
      */
-	protected void begin() throws MailboxException
+    protected void begin() throws MailboxException {
-	{
     }
 
     /**
      * Do nothing
      */
-	protected void commit() throws MailboxException
+    protected void commit() throws MailboxException {
-	{
     }
 
     /**
      * Do nothing
      */
-	protected void rollback() throws MailboxException
+    protected void rollback() throws MailboxException {
-	{
     }
 
     @Override
     public Map<Long, MessageMetaData> expungeMarkedForDeletionInMailbox(
 			final Mailbox<Long> mailbox, MessageRange set)
-			throws MailboxException
+			throws MailboxException {
-	{
         throw new MailboxException("not supported");
     }
 }