Author: eric
Date: Fri Jan 7 14:00:07 2011
New Revision: 1056322
URL: http://svn.apache.org/viewvc?rev=1056322&view=rev
Log:
MailboxException MessageRangeException extend java.lang.Exception (MAILBOX-29)
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MessageRangeException.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=1056322&r1=1056321&r2=1056322&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Fri Jan 7 14:00:07 2011
@@ -22,7 +22,6 @@ import java.util.Collection;
import java.util.Iterator;
import javax.mail.Flags;
-import javax.mail.MessagingException;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
@@ -166,7 +165,7 @@ abstract public class AbstractMailboxPro
addFlagsResponses(session, selected, responder, useUid,
messageSet, mailbox, mailboxSession);
}
}
- } catch (MessagingException e) {
+ } catch (MailboxException e) {
handleResponseException(responder, e,
HumanReadableText.FAILURE_TO_LOAD_FLAGS, session);
}
}
@@ -227,7 +226,7 @@ abstract public class AbstractMailboxPro
}
private void handleResponseException(final ImapProcessor.Responder
responder,
- MessagingException e, final HumanReadableText message, ImapSession
session) {
+ MailboxException e, final HumanReadableText message, ImapSession
session) {
session.getLog().info(message);
session.getLog().debug(message, e);
// TODO: consider whether error message should be passed to the user
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MessageRangeException.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MessageRangeException.java?rev=1056322&r1=1056321&r2=1056322&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MessageRangeException.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/MessageRangeException.java
Fri Jan 7 14:00:07 2011
@@ -19,14 +19,13 @@
package org.apache.james.imap.processor.base;
-import javax.mail.MessagingException;
/**
* Exception which should get thrown if an invalid message set was specified
* via an IMAP command
*
*/
-public class MessageRangeException extends MessagingException{
+public class MessageRangeException extends Exception {
/**
*
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java?rev=1056322&r1=1056321&r2=1056322&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/EnvelopeBuilder.java
Fri Jan 7 14:00:07 2011
@@ -25,8 +25,6 @@ package org.apache.james.imap.processor.
import java.util.ArrayList;
import java.util.List;
-import javax.mail.MessagingException;
-
import org.apache.commons.logging.Log;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.message.response.FetchResponse;
@@ -50,7 +48,7 @@ final class EnvelopeBuilder {
}
public FetchResponse.Envelope buildEnvelope(final Headers headers)
- throws MessagingException, ParseException {
+ throws MailboxException, ParseException {
final String date = headerValue(headers, ImapConstants.RFC822_DATE);
final String subject = headerValue(headers,
ImapConstants.RFC822_SUBJECT);
@@ -77,7 +75,7 @@ final class EnvelopeBuilder {
}
private String headerValue(final Headers message, final String headerName)
- throws MessagingException, MailboxException {
+ throws MailboxException {
final MessageResult.Header header = MessageResultUtils.getMatching(
headerName, message.headers());
final String result;
@@ -97,7 +95,7 @@ final class EnvelopeBuilder {
private FetchResponse.Envelope.Address[] buildAddresses(
final Headers message, final String headerName,
final FetchResponse.Envelope.Address[] defaults)
- throws ParseException, MessagingException {
+ throws ParseException, MailboxException {
final FetchResponse.Envelope.Address[] results;
final FetchResponse.Envelope.Address[] addresses = buildAddresses(
message, headerName);
@@ -111,7 +109,7 @@ final class EnvelopeBuilder {
private FetchResponse.Envelope.Address[] buildAddresses(
final Headers message, final String headerName)
- throws ParseException, MessagingException {
+ throws ParseException, MailboxException {
final MessageResult.Header header = MessageResultUtils.getMatching(
headerName, message.headers());
final FetchResponse.Envelope.Address[] results;
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java?rev=1056322&r1=1056321&r2=1056322&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
Fri Jan 7 14:00:07 2011
@@ -43,15 +43,16 @@ import org.apache.james.imap.message.res
import org.apache.james.imap.processor.AbstractMailboxProcessor;
import org.apache.james.imap.processor.base.ImapSessionUtils;
import org.apache.james.imap.processor.base.MessageRangeException;
+import org.apache.james.mailbox.MailboxException;
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.UnsupportedCriteriaException;
import org.apache.james.mailbox.MessageRange.Type;
+import org.apache.james.mailbox.MessageResult;
import org.apache.james.mailbox.MessageResult.FetchGroup;
import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.UnsupportedCriteriaException;
import org.apache.james.mailbox.util.FetchGroupImpl;
import org.apache.james.mime4j.field.address.parser.ParseException;
@@ -88,7 +89,7 @@ public class FetchProcessor extends Abst
final MessageManager mailbox = getSelectedMailbox(session);
if (mailbox == null) {
- throw new MessagingException("Session not in SELECTED state");
+ throw new MailboxException("Session not in SELECTED state");
}
for (int i = 0; i < idSet.length; i++) {
@@ -124,7 +125,7 @@ public class FetchProcessor extends Abst
HumanReadableText.UNSUPPORTED_SEARCH_CRITERIA);
} catch (MessageRangeException e) {
taggedBad(command, tag, responder,
HumanReadableText.INVALID_MESSAGESET);
- } catch (MessagingException e) {
+ } catch (MailboxException e) {
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
} catch (ParseException e) {
no(command, tag, responder, HumanReadableText.FAILURE_MAIL_PARSE);
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java?rev=1056322&r1=1056321&r2=1056322&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchResponseBuilder.java
Fri Jan 7 14:00:07 2011
@@ -29,7 +29,6 @@ import java.util.Iterator;
import java.util.List;
import javax.mail.Flags;
-import javax.mail.MessagingException;
import org.apache.james.imap.api.message.BodyFetchElement;
import org.apache.james.imap.api.message.FetchData;
@@ -100,8 +99,8 @@ final class FetchResponseBuilder {
}
public FetchResponse build(FetchData fetch, MessageResult result,
MessageManager mailbox,
- ImapSession session, boolean useUids) throws MessagingException,
- ParseException {
+ ImapSession session, boolean useUids) throws MessageRangeException,
+ ParseException, MailboxException {
final SelectedMailbox selected = session.getSelected();
final long resultUid = result.getUid();
final int resultMsn = selected.msn(resultUid);
@@ -184,7 +183,7 @@ final class FetchResponseBuilder {
}
private FetchResponse.Envelope buildEnvelope(final MessageResult result)
- throws MessagingException, ParseException {
+ throws MailboxException, ParseException {
return envelopeBuilder.buildEnvelope(result);
}
@@ -202,7 +201,7 @@ final class FetchResponseBuilder {
private FetchResponse.BodyElement bodyFetch(
final MessageResult messageResult, BodyFetchElement fetchElement)
- throws MessagingException {
+ throws MailboxException {
final Long firstOctet = fetchElement.getFirstOctet();
final Long numberOfOctets = fetchElement.getNumberOfOctets();
@@ -222,7 +221,7 @@ final class FetchResponseBuilder {
private FetchResponse.BodyElement bodyContent(
final MessageResult messageResult, final String name,
final int specifier, final int[] path, final Collection<String>
names,
- final boolean isBase) throws MessagingException {
+ final boolean isBase) throws MailboxException {
final FetchResponse.BodyElement fullResult;
switch (specifier) {
case BodyFetchElement.CONTENT:
@@ -292,7 +291,7 @@ final class FetchResponseBuilder {
private FetchResponse.BodyElement mimeHeaders(
final MessageResult messageResult, String name, final int[] path,
- final boolean isBase) throws MessagingException {
+ final boolean isBase) throws MailboxException {
final FetchResponse.BodyElement result;
final Iterator<MessageResult.Header> headers =
getMimeHeaders(messageResult, path, isBase);
List<MessageResult.Header> lines = MessageResultUtils.getAll(headers);
@@ -302,8 +301,7 @@ final class FetchResponseBuilder {
private FetchResponse.BodyElement headers(
final MessageResult messageResult, String name, final int[] path,
- final boolean isBase) throws MailboxException,
- MessagingException {
+ final boolean isBase) throws MailboxException {
final FetchResponse.BodyElement result;
final Iterator<MessageResult.Header> headers =
getHeaders(messageResult, path, isBase);
List<MessageResult.Header> lines = MessageResultUtils.getAll(headers);
@@ -313,12 +311,9 @@ final class FetchResponseBuilder {
private FetchResponse.BodyElement fieldsNot(
final MessageResult messageResult, String name, final int[] path,
- Collection<String> names, final boolean isBase)
- throws MailboxException, MessagingException {
+ Collection<String> names, final boolean isBase) throws
MailboxException {
final FetchResponse.BodyElement result;
-
final Iterator<MessageResult.Header> headers =
getHeaders(messageResult, path, isBase);
-
List<MessageResult.Header> lines =
MessageResultUtils.getNotMatching(names, headers);
result = new HeaderBodyElement(name, lines);
return result;
@@ -326,8 +321,7 @@ final class FetchResponseBuilder {
private FetchResponse.BodyElement fields(final MessageResult messageResult,
String name, final int[] path, Collection<String> names,
- final boolean isBase) throws MailboxException,
- MessagingException {
+ final boolean isBase) throws MailboxException {
final FetchResponse.BodyElement result;
final Iterator<MessageResult.Header> headers =
getHeaders(messageResult, path, isBase);
List<MessageResult.Header> lines =
MessageResultUtils.getMatching(names, headers);
@@ -349,7 +343,7 @@ final class FetchResponseBuilder {
}
private Iterator<MessageResult.Header> getMimeHeaders(final MessageResult
messageResult,
- final int[] path, final boolean isBase) throws MessagingException {
+ final int[] path, final boolean isBase) throws MailboxException {
MessageResult.MimePath mimePath = new MimePathImpl(path);
final Iterator<MessageResult.Header> headers =
messageResult.iterateMimeHeaders(mimePath);
return headers;
@@ -357,7 +351,7 @@ final class FetchResponseBuilder {
private FetchResponse.BodyElement content(
final MessageResult messageResult, String name, final int[] path,
- final boolean isBase) throws MessagingException {
+ final boolean isBase) throws MailboxException {
final FetchResponse.BodyElement result;
final Content full;
if (isBase) {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java?rev=1056322&r1=1056321&r2=1056322&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MessageResultUtils.java
Fri Jan 7 14:00:07 2011
@@ -64,7 +64,7 @@ public class MessageResultUtils {
* @throws MessagingException
*/
public static List<MessageResult.Header> getMatching(final String[] names,
final Iterator<MessageResult.Header> iterator)
- throws MessagingException {
+ throws MailboxException {
final List<MessageResult.Header> results = new
ArrayList<MessageResult.Header>(20);
if (iterator != null) {
while (iterator.hasNext()) {
@@ -98,7 +98,7 @@ public class MessageResultUtils {
* @throws MessagingException
*/
public static List<MessageResult.Header> getMatching(final
Collection<String> names,
- final Iterator<MessageResult.Header> iterator) throws
MessagingException {
+ final Iterator<MessageResult.Header> iterator) throws
MailboxException {
final List<MessageResult.Header> result = matching(names, iterator,
false);
return result;
}
@@ -149,7 +149,7 @@ public class MessageResultUtils {
* @throws MessagingException
*/
public static List<MessageResult.Header> getNotMatching(final
Collection<String> names,
- final Iterator<MessageResult.Header> iterator) throws
MessagingException {
+ final Iterator<MessageResult.Header> iterator) throws
MailboxException {
final List<MessageResult.Header> result = matching(names, iterator,
true);
return result;
}
@@ -167,7 +167,7 @@ public class MessageResultUtils {
* @throws MessagingException
*/
public static MessageResult.Header getMatching(final String name,
- final Iterator<MessageResult.Header> iterator) throws
MessagingException {
+ final Iterator<MessageResult.Header> iterator) throws
MailboxException {
MessageResult.Header result = null;
if (name != null) {
while (iterator.hasNext()) {
@@ -194,7 +194,7 @@ public class MessageResultUtils {
* @throws MessagingException
*/
public static List<MessageResult.Header> getNotMatching(final String[]
names,
- final Iterator<MessageResult.Header> iterator) throws
MessagingException {
+ final Iterator<MessageResult.Header> iterator) throws
MailboxException {
final List<MessageResult.Header> results = new
ArrayList<MessageResult.Header>(20);
if (iterator != null) {
while (iterator.hasNext()) {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java?rev=1056322&r1=1056321&r2=1056322&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/MimeDescriptorStructure.java
Fri Jan 7 14:00:07 2011
@@ -27,8 +27,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.mail.MessagingException;
-
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.message.response.FetchResponse.Envelope;
import org.apache.james.imap.message.response.FetchResponse.Structure;
@@ -60,7 +58,7 @@ final class MimeDescriptorStructure impl
public MimeDescriptorStructure(final boolean allowExtensions,
MimeDescriptor descriptor, EnvelopeBuilder builder)
- throws MessagingException, ParseException {
+ throws MailboxException, ParseException {
super();
this.descriptor = descriptor;
parameters = createParameters(descriptor);
@@ -86,7 +84,7 @@ final class MimeDescriptorStructure impl
private static List<Structure> createParts(final boolean allowExtensions,
final MimeDescriptor descriptor, final EnvelopeBuilder builder)
- throws MessagingException, ParseException {
+ throws MailboxException, ParseException {
final List<Structure> results = new ArrayList<Structure>();
for (Iterator<MimeDescriptor> it = descriptor.parts(); it.hasNext();) {
final MimeDescriptor partDescriptor = it.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
