james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1158762 - in /james/server/trunk: ./ mailets/ mailets/src/main/java/org/apache/james/transport/matchers/ pop3server/src/main/java/org/apache/james/pop3server/core/
Date Wed, 17 Aug 2011 15:14:35 GMT
Author: eric
Date: Wed Aug 17 15:14:35 2011
New Revision: 1158762

URL: http://svn.apache.org/viewvc?rev=1158762&view=rev
Log:
Use mailbox 0.4-SNAPSHOT and imap 0.3-SNAPSHOT (JAMES-1296)

Modified:
    james/server/trunk/mailets/pom.xml
    james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
    james/server/trunk/pom.xml
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
    james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java

Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1158762&r1=1158761&r2=1158762&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Wed Aug 17 15:14:35 2011
@@ -155,6 +155,10 @@ Parent pom build failure prevents inheri
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-processor</artifactId>
+    </dependency>   
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>apache-james-mailbox-api</artifactId>
     </dependency>   
     <!-- Test dependencies -->

Modified: james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1158762&r1=1158761&r2=1158762&view=diff
==============================================================================
--- james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
(original)
+++ james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
Wed Aug 17 15:14:35 2011
@@ -26,21 +26,20 @@ import java.util.Locale;
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 
+import org.apache.james.imap.processor.base.FetchGroupImpl;
 import org.apache.james.mailbox.BadCredentialsException;
 import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxMetaData;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxQuery;
-import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.MessageManager;
 import org.apache.james.mailbox.MessageRange;
 import org.apache.james.mailbox.MessageResult;
-import org.apache.james.mailbox.MessageResult.FetchGroup;
-import org.apache.james.mailbox.util.FetchGroupImpl;
+import org.apache.james.transport.util.MailetContextLog;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.james.transport.util.MailetContextLog;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.MailetContext;
@@ -138,7 +137,7 @@ abstract public class AbstractStorageQuo
             List<MailboxMetaData> mList = manager.search(new MailboxQuery(MailboxPath.inbox(session),
"", session.getPathDelimiter()), session);
             for (int i = 0; i < mList.size(); i++) {
                 MessageManager mailbox = manager.getMailbox(mList.get(i).getPath(), session);
-                Iterator<MessageResult> results = mailbox.getMessages(MessageRange.all(),
new FetchGroupImpl(FetchGroup.MINIMAL), session);
+                Iterator<MessageResult> results = mailbox.getMessages(MessageRange.all(),
FetchGroupImpl.MINIMAL, -1, session);
                 while (results.hasNext()) {
                     size += results.next().getSize();
                 }

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1158762&r1=1158761&r2=1158762&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Aug 17 15:14:35 2011
@@ -738,6 +738,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-mailbox-spring</artifactId>
+      <version>${mailbox.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
       <artifactId>apache-james-imap-message</artifactId>
       <version>${imap.version}</version>
       <exclusions>
@@ -1376,8 +1381,8 @@
     <camel.version>2.5.0</camel.version>
     <activemq.version>5.4.2</activemq.version>
     <spring.version>3.0.5.RELEASE</spring.version>
-    <mailbox.version>0.3</mailbox.version>
-    <imap.version>0.2.1</imap.version>
+    <mailbox.version>0.4-SNAPSHOT</mailbox.version>
+    <imap.version>0.3-SNAPSHOT</imap.version>
     <protocols.version>1.5</protocols.version>
     <jsieve.version>0.4</jsieve.version>
     <jackrabbit.version>2.2.5</jackrabbit.version>

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java?rev=1158762&r1=1158761&r2=1158762&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
(original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RetrCmdHandler.java
Wed Aug 17 15:14:35 2011
@@ -86,7 +86,7 @@ public class RetrCmdHandler implements C
                 MailboxSession mailboxSession = (MailboxSession) session.getState().get(POP3Session.MAILBOX_SESSION);
                 Long uid = uidList.get(num - 1).getUid();
                 if (deletedUidList.contains(uid) == false) {
-                    Iterator<MessageResult> results = session.getUserMailbox().getMessages(MessageRange.one(uid),
GROUP, mailboxSession);
+                    Iterator<MessageResult> results = session.getUserMailbox().getMessages(MessageRange.one(uid),
GROUP, -1, mailboxSession);
 
                     if (results.hasNext()) {
                         MessageResult result = results.next();

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java?rev=1158762&r1=1158761&r2=1158762&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
(original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/RsetCmdHandler.java
Wed Aug 17 15:14:35 2011
@@ -82,7 +82,7 @@ public class RsetCmdHandler implements C
             MailboxSession mailboxSession = (MailboxSession) session.getState().get(POP3Session.MAILBOX_SESSION);
 
             List<MessageMetaData> uids = new ArrayList<MessageMetaData>();
-            Iterator<MessageResult> it = session.getUserMailbox().getMessages(MessageRange.all(),
GROUP, mailboxSession);
+            Iterator<MessageResult> it = session.getUserMailbox().getMessages(MessageRange.all(),
GROUP, -1, mailboxSession);
             while (it.hasNext()) {
                 MessageResult result = it.next();
                 uids.add(new MessageMetaData(result.getUid(), result.getSize()));

Modified: james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java?rev=1158762&r1=1158761&r2=1158762&view=diff
==============================================================================
--- james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
(original)
+++ james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/TopCmdHandler.java
Wed Aug 17 15:14:35 2011
@@ -109,7 +109,7 @@ public class TopCmdHandler extends RetrC
                 Long uid = uidList.get(num - 1).getUid();
                 if (deletedUidList.contains(uid) == false) {
 
-                    Iterator<MessageResult> results = session.getUserMailbox().getMessages(MessageRange.one(uid),
GROUP, mailboxSession);
+                    Iterator<MessageResult> results = session.getUserMailbox().getMessages(MessageRange.one(uid),
GROUP, -1, mailboxSession);
 
                     if (results.hasNext()) {
                         MessageResult result = results.next();



---------------------------------------------------------------------
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