Author: rdonkin
Date: Fri Nov 9 14:02:45 2007
New Revision: 593667
URL: http://svn.apache.org/viewvc?rev=593667&view=rev
Log:
Remove deprecated classes
Removed:
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/CloseResponse.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/FetchResponse.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imap/message/response/imap4rev1/legacy/StoreResponse.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/CloseResponseEncoder.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/LegacyFetchResponseEncoder.java
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/StoreResponseEncoder.java
Modified:
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
Modified:
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java?rev=593667&r1=593666&r2=593667&view=diff
==============================================================================
---
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java
(original)
+++
james/server/trunk/imap-codec-library/src/main/java/org/apache/james/imapserver/codec/encode/main/DefaultImapEncoderFactory.java
Fri Nov 9 14:02:45 2007
@@ -29,16 +29,13 @@
import
org.apache.james.imapserver.codec.encode.imap4rev1.StatusResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.BadResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.CapabilityResponseEncoder;
-import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.CloseResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.CommandCompleteResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.CommandFailedResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.ErrorResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.ExamineAndSelectResponseEncoder;
-import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.LegacyFetchResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.LogoutResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.SearchResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.StatusCommandResponseEncoder;
-import
org.apache.james.imapserver.codec.encode.imap4rev1.legacy.StoreResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.server.LSubResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.server.ListResponseEncoder;
import
org.apache.james.imapserver.codec.encode.imap4rev1.status.UntaggedNoResponseEncoder;
@@ -56,19 +53,16 @@
final FetchResponseEncoder fetchResponseEncoder = new
FetchResponseEncoder(recentResponseEncoder);
final ExpungeResponseEncoder expungeResponseEncoder = new
ExpungeResponseEncoder(fetchResponseEncoder);
final ExistsResponseEncoder existsResponseEncoder = new
ExistsResponseEncoder(expungeResponseEncoder);
- final StoreResponseEncoder storeResponseEncoder = new
StoreResponseEncoder(existsResponseEncoder);
- final StatusCommandResponseEncoder statusCommandResponseEncoder = new
StatusCommandResponseEncoder(storeResponseEncoder);
+ final StatusCommandResponseEncoder statusCommandResponseEncoder = new
StatusCommandResponseEncoder(existsResponseEncoder);
final SearchResponseEncoder searchResponseEncoder = new
SearchResponseEncoder(statusCommandResponseEncoder);
final LogoutResponseEncoder logoutResponseEncoder = new
LogoutResponseEncoder(searchResponseEncoder);
final LSubResponseEncoder lsubResponseEncoder = new
LSubResponseEncoder(logoutResponseEncoder);
final ListResponseEncoder listResponseEncoder = new
ListResponseEncoder(lsubResponseEncoder);
- final LegacyFetchResponseEncoder legacyFetchResponseEncoder = new
LegacyFetchResponseEncoder(listResponseEncoder);
- final ExamineAndSelectResponseEncoder examineAndSelectResponseEncoder
= new ExamineAndSelectResponseEncoder(legacyFetchResponseEncoder);
+ final ExamineAndSelectResponseEncoder examineAndSelectResponseEncoder
= new ExamineAndSelectResponseEncoder(listResponseEncoder);
final ErrorResponseEncoder errorResponseEncoder = new
ErrorResponseEncoder(examineAndSelectResponseEncoder);
final CommandFailedResponseEncoder commandFailedResponseEncoder = new
CommandFailedResponseEncoder(errorResponseEncoder);
final CommandCompleteResponseEncoder commandCompleteResponseEncoder =
new CommandCompleteResponseEncoder(commandFailedResponseEncoder);
- final CloseResponseEncoder closeResponseEncoder = new
CloseResponseEncoder(commandCompleteResponseEncoder);
- final CapabilityResponseEncoder capabilityResponseEncoder = new
CapabilityResponseEncoder(closeResponseEncoder);
+ final CapabilityResponseEncoder capabilityResponseEncoder = new
CapabilityResponseEncoder(commandCompleteResponseEncoder);
final BadResponseEncoder result = new
BadResponseEncoder(capabilityResponseEncoder);
return result;
}
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java?rev=593667&r1=593666&r2=593667&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/base/AbstractImapRequestProcessor.java
Fri Nov 9 14:02:45 2007
@@ -101,8 +101,18 @@
}
protected void unsolicitedResponses(final ImapSession session,
+ final ImapProcessor.Responder responder, boolean omitExpunged,
boolean useUids) {
+ final List responses = session.unsolicitedResponses(omitExpunged,
useUids);
+ respond(responder, responses);
+ }
+
+ protected void unsolicitedResponses(final ImapSession session,
final ImapProcessor.Responder responder, boolean useUids) {
final List responses = session.unsolicitedResponses(useUids);
+ respond(responder, responses);
+ }
+
+ private void respond(final ImapProcessor.Responder responder, final List
responses) {
for (final Iterator it=responses.iterator(); it.hasNext();) {
ImapResponseMessage message = (ImapResponseMessage) it.next();
responder.respond(message);
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java?rev=593667&r1=593666&r2=593667&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/CloseProcessor.java
Fri Nov 9 14:02:45 2007
@@ -23,13 +23,10 @@
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.ProtocolException;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import
org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.CloseRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.CloseResponse;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
@@ -52,22 +49,6 @@
protected void doProcess(ImapRequest message,
ImapSession session, String tag, ImapCommand command, Responder
responder)
throws MailboxException, AuthorizationException, ProtocolException
{
- final CloseRequest request = (CloseRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(CloseRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException
{
- final ImapResponseMessage result = doProcess(session, tag, command);
- return result;
- }
-
- private ImapResponseMessage doProcess(ImapSession session, String tag,
- ImapCommand command) throws MailboxException,
- AuthorizationException, ProtocolException {
ImapMailboxSession mailbox = ImapSessionUtils.getMailbox(session);
if (mailbox.isWriteable()) {
try {
@@ -78,13 +59,12 @@
}
}
session.deselect();
- final CloseResponse result = new CloseResponse(command, tag);
// TODO: the following comment was present in the code before
// refactoring
// TODO: doesn't seem to match the implementation
// TODO: check that implementation is correct
// Don't send unsolicited responses on close.
- ImapSessionUtils.addUnsolicitedResponses(result, session, false);
- return result;
+ unsolicitedResponses(session, responder, false);
+ okComplete(command, tag, responder);
}
}
Modified:
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java?rev=593667&r1=593666&r2=593667&view=diff
==============================================================================
---
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
(original)
+++
james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/StoreProcessor.java
Fri Nov 9 14:02:45 2007
@@ -19,8 +19,6 @@
package org.apache.james.imapserver.processor.imap4rev1;
-import java.util.List;
-
import javax.mail.Flags;
import org.apache.james.api.imap.ImapCommand;
@@ -29,13 +27,10 @@
import org.apache.james.api.imap.message.IdRange;
import org.apache.james.api.imap.message.StoreDirective;
import org.apache.james.api.imap.message.request.ImapRequest;
-import org.apache.james.api.imap.message.response.ImapResponseMessage;
import
org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.api.imap.process.ImapProcessor;
import org.apache.james.api.imap.process.ImapSession;
-import org.apache.james.api.imap.process.ImapProcessor.Responder;
import org.apache.james.imap.message.request.imap4rev1.StoreRequest;
-import org.apache.james.imap.message.response.imap4rev1.legacy.StoreResponse;
import org.apache.james.imapserver.processor.base.AbstractImapRequestProcessor;
import org.apache.james.imapserver.processor.base.AuthorizationException;
import org.apache.james.imapserver.processor.base.ImapSessionUtils;
@@ -60,27 +55,17 @@
ImapSession session, String tag, ImapCommand command, Responder
responder)
throws MailboxException, AuthorizationException, ProtocolException
{
final StoreRequest request = (StoreRequest) message;
- final ImapResponseMessage result = doProcess(request, session, tag,
- command);
- responder.respond(result);
- }
-
- private ImapResponseMessage doProcess(StoreRequest request,
- ImapSession session, String tag, ImapCommand command)
- throws MailboxException, AuthorizationException, ProtocolException
{
final IdRange[] idSet = request.getIdSet();
final StoreDirective directive = request.getDirective();
final Flags flags = request.getFlags();
final boolean useUids = request.isUseUids();
- final ImapResponseMessage result = doProcess(idSet, directive, flags,
- useUids, session, tag, command);
- return result;
+ doProcess(idSet, directive, flags, useUids, session, tag, command,
responder);
}
- private ImapResponseMessage doProcess(final IdRange[] idSet,
+ private void doProcess(final IdRange[] idSet,
final StoreDirective directive, final Flags flags,
final boolean useUids, ImapSession session, String tag,
- ImapCommand command) throws MailboxException,
+ ImapCommand command, Responder responder) throws MailboxException,
AuthorizationException, ProtocolException {
ImapMailboxSession mailbox = ImapSessionUtils.getMailbox(session);
@@ -114,11 +99,8 @@
throw new MailboxException(e);
}
- final StoreResponse result = new StoreResponse(command, tag);
- boolean omitExpunged = (!useUids);
- List unsolicitedResponses = session.unsolicitedResponses(omitExpunged,
- useUids);
- result.addUnsolicitedResponses(unsolicitedResponses);
- return result;
+ final boolean omitExpunged = (!useUids);
+ unsolicitedResponses(session, responder, omitExpunged, useUids);
+ okComplete(command, tag, responder);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
