Author: rdonkin
Date: Wed Mar 18 11:26:11 2009
New Revision: 755556
URL: http://svn.apache.org/viewvc?rev=755556&view=rev
Log:
Replace remains of old approach. IMAP-63
https://issues.apache.org/jira/browse/IMAP-63
Removed:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/imap4rev1/status/
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/base/
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/imap4rev1/status/UntaggedNoResponse.java
Modified:
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java
Modified:
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java?rev=755556&r1=755555&r2=755556&view=diff
==============================================================================
---
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java
(original)
+++
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/display/HumanReadableTextKey.java
Wed Mar 18 11:26:11 2009
@@ -57,6 +57,12 @@
public static final HumanReadableTextKey ILLEGAL_TAG = new
HumanReadableTextKey(
"org.apache.james.imap.ILLEGAL_TAG", "Illegal tag.");
+ public static final HumanReadableTextKey FAILURE_EXISTS_COUNT = new
HumanReadableTextKey(
+ "org.apache.james.imap.FAILURE_EXISTS_COUNT", "Cannot count number
of existing records.");
+
+ public static final HumanReadableTextKey FAILURE_TO_LOAD_FLAGS= new
HumanReadableTextKey(
+ "org.apache.james.imap.FAILURE_TO_LOAD_FLAGS", "Failed to retrieve
flags data.");
+
public static final HumanReadableTextKey ILLEGAL_ARGUMENTS = new
HumanReadableTextKey(
"org.apache.james.imap.ILLEGAL_ARGUMENTS",
"failed. Illegal arguments.");
Modified:
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java?rev=755556&r1=755555&r2=755556&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
(original)
+++
james/protocols/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
Wed Mar 18 11:26:11 2009
@@ -33,7 +33,6 @@
import org.apache.james.imap.encode.imap4rev1.server.ListResponseEncoder;
import org.apache.james.imap.encode.imap4rev1.server.STATUSResponseEncoder;
import org.apache.james.imap.encode.imap4rev1.server.SearchResponseEncoder;
-import org.apache.james.imap.encode.imap4rev1.status.UntaggedNoResponseEncoder;
/**
* TODO: perhaps a POJO would be better
@@ -44,10 +43,8 @@
final EndImapEncoder endImapEncoder = new EndImapEncoder();
final StatusResponseEncoder statusResponseEncoder = new
StatusResponseEncoder(
endImapEncoder);
- final UntaggedNoResponseEncoder untaggedNoResponseEncoder = new
UntaggedNoResponseEncoder(
- statusResponseEncoder);
final RecentResponseEncoder recentResponseEncoder = new
RecentResponseEncoder(
- untaggedNoResponseEncoder);
+ statusResponseEncoder);
final FetchResponseEncoder fetchResponseEncoder = new
FetchResponseEncoder(
recentResponseEncoder);
final ExpungeResponseEncoder expungeResponseEncoder = new
ExpungeResponseEncoder(
Modified:
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java?rev=755556&r1=755555&r2=755556&view=diff
==============================================================================
---
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java
(original)
+++
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/AbstractMailboxProcessor.java
Wed Mar 18 11:26:11 2009
@@ -52,7 +52,6 @@
import org.apache.james.imap.message.response.imap4rev1.ExpungeResponse;
import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
import org.apache.james.imap.message.response.imap4rev1.RecentResponse;
-import
org.apache.james.imap.message.response.imap4rev1.status.UntaggedNoResponse;
import org.apache.james.imap.processor.base.AbstractChainedProcessor;
import org.apache.james.imap.processor.base.ImapSessionUtils;
@@ -186,8 +185,7 @@
}
}
} catch (MessagingException e) {
- final String message = "Failed to retrieve flags data";
- handleResponseException(responder, e, message);
+ handleResponseException(responder, e,
HumanReadableTextKey.FAILURE_TO_LOAD_FLAGS);
}
}
@@ -241,17 +239,16 @@
final ExistsResponse response = new ExistsResponse(messageCount);
responder.respond(response);
} catch (MailboxException e) {
- final String message = "Failed to retrieve exists count data";
- handleResponseException(responder, e, message);
+ handleResponseException(responder, e,
HumanReadableTextKey.FAILURE_EXISTS_COUNT);
}
}
private void handleResponseException(final ImapProcessor.Responder
responder,
- MessagingException e, final String message) {
+ MessagingException e, final HumanReadableTextKey message) {
getLog().info(message);
getLog().debug(message, e);
// TODO: consider whether error message should be passed to the user
- final UntaggedNoResponse response = new UntaggedNoResponse(message,
null);
+ final StatusResponse response = factory.untaggedNo(message);;
responder.respond(response);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
