Author: rdonkin
Date: Sun May 10 21:00:00 2009
New Revision: 773403
URL: http://svn.apache.org/viewvc?rev=773403&view=rev
Log:
Insist that MailboxExceptions are i18nable. IMAP-72
https://issues.apache.org/jira/browse/IMAP-72
Added:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java
(with props)
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableTextKey.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StorageException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableTextKey.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableTextKey.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableTextKey.java
(original)
+++
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/display/HumanReadableTextKey.java
Sun May 10 21:00:00 2009
@@ -91,10 +91,46 @@
"org.apache.james.imap.SEARCH_FAILED",
"failed. Search failed.");
+ public static final HumanReadableTextKey COUNT_FAILED = new
HumanReadableTextKey(
+ "org.apache.james.imap.COUNT_FAILED",
+ "failed. Count failed.");
+
public static final HumanReadableTextKey SAVE_FAILED = new
HumanReadableTextKey(
"org.apache.james.imap.SAVE_FAILED",
"failed. Save failed.");
+ public static final HumanReadableTextKey UNSUPPORTED_SEARCH = new
HumanReadableTextKey(
+ "org.apache.james.imap.UNSUPPORTED_SEARCH",
+ "failed. Unsupported search.");
+
+ public static final HumanReadableTextKey LOCK_FAILED = new
HumanReadableTextKey(
+ "org.apache.james.imap.LOCK_FAILED",
+ "failed. Failed to lock mailbox.");
+
+ public static final HumanReadableTextKey UNSUPPORTED = new
HumanReadableTextKey(
+ "org.apache.james.imap.UNSUPPORTED",
+ "failed. Unsupported operation.");
+
+ public static final HumanReadableTextKey DUPLICATE_MAILBOXES = new
HumanReadableTextKey(
+ "org.apache.james.imap.DUPLICATE_MAILBOXES",
+ "failed. Expected unique mailbox but duplicate exists.");
+
+ public static final HumanReadableTextKey MAILBOX_EXISTS = new
HumanReadableTextKey(
+ "org.apache.james.imap.MAILBOX_EXISTS",
+ "failed. Mailbox already exists.");
+
+ public static final HumanReadableTextKey MAILBOX_NOT_FOUND = new
HumanReadableTextKey(
+ "org.apache.james.imap.MAILBOX_NOT_FOUND",
+ "failed. Mailbox not found.");
+
+ public static final HumanReadableTextKey MAILBOX_DELETED = new
HumanReadableTextKey(
+ "org.apache.james.imap.MAILBOX_DELETED",
+ "failed. Mailbox has been deleted.");
+
+ public static final HumanReadableTextKey COMSUME_UID_FAILED = new
HumanReadableTextKey(
+ "org.apache.james.imap.COMSUME_UID_FAILED",
+ "failed. Failed to acquire UID.");
+
public static final HumanReadableTextKey GENERIC_FAILURE_DURING_PROCESSING
= new HumanReadableTextKey(
"org.apache.james.imap.GENERIC_FAILURE_DURING_PROCESSING",
"processing failed.");
Modified:
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
(original)
+++
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMailboxMapper.java
Sun May 10 21:00:00 2009
@@ -25,6 +25,7 @@
import javax.persistence.NoResultException;
import javax.persistence.PersistenceException;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.jpa.mail.model.JPAMailbox;
import org.apache.james.imap.mailbox.MailboxNotFoundException;
import org.apache.james.imap.mailbox.StorageException;
@@ -61,7 +62,7 @@
try {
entityManager.persist(mailbox);
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SAVE_FAILED, e);
}
}
@@ -75,7 +76,7 @@
throw new MailboxNotFoundException(name);
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -86,7 +87,7 @@
try {
entityManager.remove(mailbox);
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.DELETED_FAILED, e);
}
}
@@ -98,7 +99,7 @@
try {
return
entityManager.createNamedQuery("findMailboxWithNameLike").setParameter("nameParam",
name).getResultList();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -109,7 +110,7 @@
try {
entityManager.createNamedQuery("deleteAll").executeUpdate();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.DELETED_FAILED, e);
}
}
@@ -120,7 +121,7 @@
try {
return (Long)
entityManager.createNamedQuery("countMailboxesWithName").setParameter("nameParam",
name).getSingleResult();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.COUNT_FAILED, e);
}
}
@@ -133,7 +134,7 @@
} catch (NoResultException e) {
throw new MailboxNotFoundException(mailboxId);
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -146,7 +147,7 @@
} catch (NoResultException e) {
throw new MailboxNotFoundException(mailboxId);
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new
StorageException(HumanReadableTextKey.COMSUME_UID_FAILED, e);
}
}
Modified:
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
(original)
+++
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/JPAMessageMapper.java
Sun May 10 21:00:00 2009
@@ -23,6 +23,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceException;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.MessageRange;
import org.apache.james.imap.mailbox.SearchQuery;
import org.apache.james.imap.mailbox.StorageException;
@@ -63,7 +64,7 @@
}
return results;
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -120,7 +121,7 @@
}
return results;
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -158,7 +159,7 @@
try {
return (Long)
entityManager.createNamedQuery("countMessagesInMailbox").setParameter("idParam",
mailboxId).getSingleResult();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.COUNT_FAILED, e);
}
}
@@ -169,7 +170,7 @@
try {
return (Long)
entityManager.createNamedQuery("countUnseenMessagesInMailbox").setParameter("idParam",
mailboxId).getSingleResult();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.COUNT_FAILED, e);
}
}
@@ -182,7 +183,7 @@
final String jql = formulateJQL(mailboxId, query);
return entityManager.createQuery(jql).getResultList();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -220,7 +221,7 @@
try {
entityManager.remove(message);
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.DELETED_FAILED, e);
}
}
@@ -232,7 +233,7 @@
try {
return
entityManager.createNamedQuery("findUnseenMessagesInMailboxOrderByUid").setParameter("idParam",
mailboxId).getResultList();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -244,7 +245,7 @@
try {
return
entityManager.createNamedQuery("findRecentMessagesInMailbox").setParameter("idParam",
mailboxId).getResultList();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -255,7 +256,7 @@
try {
entityManager.persist(message);
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new StorageException(HumanReadableTextKey.SAVE_FAILED, e);
}
}
}
Modified:
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java
(original)
+++
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/Mapper.java
Sun May 10 21:00:00 2009
@@ -21,6 +21,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceException;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.StorageException;
abstract class Mapper {
@@ -36,7 +37,7 @@
try {
entityManager.getTransaction().begin();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new
StorageException(HumanReadableTextKey.START_TRANSACTION_FAILED, e);
}
}
@@ -44,7 +45,7 @@
try {
entityManager.getTransaction().commit();
} catch (PersistenceException e) {
- throw new StorageException(e);
+ throw new
StorageException(HumanReadableTextKey.COMMIT_TRANSACTION_FAILED, e);
}
}
}
Modified:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxException.java
Sun May 10 21:00:00 2009
@@ -29,29 +29,11 @@
private final HumanReadableTextKey key;
- public MailboxException(final Exception cause) {
- this(cause.getMessage(), cause);
- }
-
- public MailboxException(final Throwable cause) {
- this(cause.getMessage(), cause);
- }
-
- public MailboxException(final String message, final Throwable cause) {
+ public MailboxException(final HumanReadableTextKey key, final String
message) {
super(message);
- initCause(cause);
- key = null;
- }
-
- public MailboxException(final String message, final Exception cause) {
- super(message, cause);
- key = null;
+ this.key = key;
}
- public MailboxException(String message) {
- super(message);
- key = null;
- }
public MailboxException(final HumanReadableTextKey key) {
super(key.toString());
Modified:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxExistsException.java
Sun May 10 21:00:00 2009
@@ -19,6 +19,8 @@
package org.apache.james.imap.mailbox;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
+
/**
* Indicates that the operation failed since the mailbox already exists.
*/
@@ -29,7 +31,7 @@
private final String mailboxName;
public MailboxExistsException(String mailboxName) {
- super("Mailbox '" + mailboxName + "' already exists.");
+ super(HumanReadableTextKey.MAILBOX_EXISTS);
this.mailboxName = mailboxName;
}
Modified:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/MailboxNotFoundException.java
Sun May 10 21:00:00 2009
@@ -19,6 +19,8 @@
package org.apache.james.imap.mailbox;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
+
/**
* Indicates that the failure is caused by a reference to a mailbox which does
* not exist.
@@ -42,7 +44,7 @@
private final long id;
public MailboxNotFoundException(long id) {
- super(message(Long.toString(id)));
+ super(HumanReadableTextKey.MAILBOX_NOT_FOUND,
message(Long.toString(id)));
this.id = id;
mailboxName = null;
}
@@ -53,7 +55,7 @@
* name of the mailbox, not null
*/
public MailboxNotFoundException(String mailboxName) {
- super(message(mailboxName));
+ super(HumanReadableTextKey.MAILBOX_NOT_FOUND, message(mailboxName));
this.mailboxName = mailboxName;
this.id = 0;
}
Modified:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StorageException.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StorageException.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StorageException.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/StorageException.java
Sun May 10 21:00:00 2009
@@ -18,19 +18,17 @@
****************************************************************/
package org.apache.james.imap.mailbox;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
+
/**
* Indicates a general problem in the underlying storage layer.
* Used to wrap undiagnosed storage exceptions.
*/
public class StorageException extends MailboxException {
- private static final long serialVersionUID = -2645843238080782034L;
-
- public StorageException(Exception cause) {
- super(cause);
- }
+ private static final long serialVersionUID = 2708951014093934093L;
- public StorageException(Throwable cause) {
- super(cause);
+ public StorageException(HumanReadableTextKey key, Throwable cause) {
+ super(key, cause);
}
}
Modified:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedCriteriaException.java
Sun May 10 21:00:00 2009
@@ -19,6 +19,8 @@
package org.apache.james.imap.mailbox;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
+
/**
* Indicates that a search criteria is not supported.
*/
@@ -26,8 +28,8 @@
private static final long serialVersionUID = 3791907285083231285L;
- public UnsupportedCriteriaException(String string) {
- super(string);
+ public UnsupportedCriteriaException(final HumanReadableTextKey key) {
+ super(key);
}
}
Added:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java?rev=773403&view=auto
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java
(added)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java
Sun May 10 21:00:00 2009
@@ -0,0 +1,36 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.imap.mailbox;
+
+import org.apache.james.imap.api.display.HumanReadableTextKey;
+
+/**
+ * Indicates that an operation required is not supported
+ * by this mailbox.
+ */
+public class UnsupportedOperationException extends MailboxException {
+
+ private static final long serialVersionUID = 1943118588115772317L;
+
+ public UnsupportedOperationException(String message) {
+ super(HumanReadableTextKey.UNSUPPORTED, message);
+ }
+
+}
Propchange:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedOperationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java
(original)
+++
james/imap/trunk/mailbox/src/main/java/org/apache/james/imap/mailbox/UnsupportedSearchException.java
Sun May 10 21:00:00 2009
@@ -19,6 +19,8 @@
package org.apache.james.imap.mailbox;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
+
/**
* Indicates that the requested search is not supported by this implementation.
@@ -28,6 +30,6 @@
private static final long serialVersionUID = -7442949630563672557L;
public UnsupportedSearchException() {
- super("Unsupported search.");
+ super(HumanReadableTextKey.UNSUPPORTED_SEARCH);
}
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
Sun May 10 21:00:00 2009
@@ -34,6 +34,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.SearchQuery;
import org.apache.james.imap.mailbox.UnsupportedSearchException;
@@ -145,9 +146,9 @@
throw new UnsupportedSearchException();
}
} catch (IOException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
} catch (MimeException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultUtils.java
Sun May 10 21:00:00 2009
@@ -31,6 +31,7 @@
import javax.swing.text.Document;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.Content;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MessageResult;
@@ -113,14 +114,14 @@
content -= FetchGroup.MIME_DESCRIPTOR;
}
if (content != 0) {
- throw new MailboxException("Unsupported result: " +
content);
+ throw new UnsupportedOperationException("Unsupported
result: " + content);
}
addPartContent(fetchGroup, message, messageResult);
} catch (IOException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
} catch (MimeException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
}
return messageResult;
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailbox.java
Sun May 10 21:00:00 2009
@@ -37,6 +37,7 @@
import javax.mail.Flags;
import javax.mail.MessagingException;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxListener;
import org.apache.james.imap.mailbox.MailboxNotFoundException;
@@ -202,11 +203,11 @@
tracker.found(uid, message.createFlags());
return uid;
} catch (IOException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
} catch (MessagingException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
} catch (MimeException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
}
}
@@ -270,8 +271,7 @@
} else if (set.getType() == MessageRange.TYPE_ALL) {
return new UidRange(1, -1);
} else {
- throw new MailboxException("unsupported MessageSet: "
- + set.getType());
+ throw new UnsupportedOperationException("unsupported MessageSet: "
+ set.getType());
}
}
@@ -323,7 +323,7 @@
}
return result;
} catch (MessagingException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
}
@@ -458,7 +458,7 @@
}
} catch (MessagingException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
}
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/StoreMailboxManager.java
Sun May 10 21:00:00 2009
@@ -29,6 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.james.imap.api.AbstractLogEnabled;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxExistsException;
import org.apache.james.imap.mailbox.MailboxListener;
@@ -283,7 +284,8 @@
if (count == 1) {
return true;
} else {
- throw new MailboxException("Expected one mailbox but found
" + count + " mailboxes");
+ throw new
MailboxException(HumanReadableTextKey.DUPLICATE_MAILBOXES,
+ "Expected one mailbox but found " + count + "
mailboxes");
}
}
}
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Sun May 10 21:00:00 2009
@@ -41,6 +41,7 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.Mailbox;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxListener;
@@ -48,6 +49,7 @@
import org.apache.james.imap.mailbox.MessageRange;
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.mailbox.SearchQuery;
+import org.apache.james.imap.mailbox.UnsupportedOperationException;
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
import org.apache.james.imap.mailbox.SearchQuery.Criterion;
import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
@@ -105,13 +107,13 @@
try {
return getMailboxRow().countMessages();
} catch (Exception e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.COUNT_FAILED, e);
}
} finally {
lock.readLock().release();
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -160,14 +162,14 @@
getUidChangeTracker().found(messageResult.getUid(),
messageResult.getFlags());
return messageResult.getUid();
} catch (Exception e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
} else {
// mailboxRow==null
- throw new MailboxException("Mailbox has been deleted");
+ throw new
MailboxException(HumanReadableTextKey.MAILBOX_DELETED);
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -241,9 +243,9 @@
lock.writeLock().acquire();
myMailboxRow = getMailboxRow().consumeNextUid();
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.COMSUME_UID_FAILED, e);
} catch (SQLException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.COMSUME_UID_FAILED, e);
} finally {
lock.writeLock().release();
}
@@ -273,8 +275,7 @@
criteria.add(criterion1);
}
} else {
- throw new MailboxException("Unsupported MessageSet: "
- + set.getType());
+ throw new UnsupportedOperationException("Unsupported MessageSet: "
+ set.getType());
}
return criteria;
}
@@ -292,15 +293,15 @@
.getMailboxId());
return getMessages(fetchGroup, range, c);
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.SEARCH_FAILED, e);
} catch (MessagingException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
} finally {
lock.readLock().release();
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -333,8 +334,7 @@
} else if (set.getType() == MessageRange.TYPE_ALL) {
return new UidRange(1, -1);
} else {
- throw new MailboxException("unsupported MessageSet: "
- + set.getType());
+ throw new UnsupportedOperationException("unsupported MessageSet: "
+ set.getType());
}
}
@@ -375,12 +375,12 @@
}
return results;
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.SEARCH_FAILED,
e);
} finally {
lock.readLock().release();
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -427,17 +427,17 @@
return null;
}
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.SEARCH_FAILED, e);
} catch (MessagingException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
} catch (MimeException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
} finally {
lock.readLock().release();
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -452,15 +452,15 @@
new Flags(Flags.Flag.SEEN), false);
return count;
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.COUNT_FAILED, e);
} catch (DataSetException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.COUNT_FAILED, e);
}
} finally {
lock.readLock().release();
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -474,7 +474,7 @@
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -504,8 +504,8 @@
}
getUidChangeTracker().expunged(uids);
return uids.iterator();
- } catch (Exception e) {
- throw new MailboxException(e);
+ } catch (TorqueException e) {
+ throw new MailboxException(HumanReadableTextKey.DELETED_FAILED, e);
}
}
@@ -520,7 +520,7 @@
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -554,8 +554,8 @@
}
tracker.flagsUpdated(newFlagsByUid, originalFlagsByUid,
mailboxSession.getSessionId());
return newFlagsByUid;
- } catch (Exception e) {
- throw new MailboxException(e);
+ } catch (TorqueException e) {
+ throw new MailboxException(HumanReadableTextKey.SAVE_FAILED, e);
}
}
@@ -578,7 +578,7 @@
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -597,22 +597,21 @@
final long lastUid = mailboxRow.getLastUid();
return lastUid + 1;
} else {
- throw new MailboxException(
- "Mailbox has been deleted");
+ throw new
MailboxException(HumanReadableTextKey.MAILBOX_DELETED);
}
} catch (NoRowsException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.COMSUME_UID_FAILED, e);
} catch (TooManyRowsException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.COMSUME_UID_FAILED, e);
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.COMSUME_UID_FAILED, e);
}
} finally {
lock.readLock().release();
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -662,14 +661,14 @@
return uids.iterator();
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.SEARCH_FAILED,
e);
} catch (MimeException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
} finally {
lock.readLock().release();
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -729,15 +728,15 @@
List rows = MessageRowPeer.doSelectJoinMessageFlags(c);
toMailbox.copy(rows, session);
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.SAVE_FAILED, e);
} catch (MessagingException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
} finally {
lock.readLock().release();
}
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
}
}
@@ -789,13 +788,13 @@
}
}
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.SAVE_FAILED, e);
} catch (InterruptedException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.LOCK_FAILED, e);
} catch (MessagingException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
} catch (MimeException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e);
}
}
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
Sun May 10 21:00:00 2009
@@ -31,6 +31,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.Mailbox;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MailboxExistsException;
@@ -112,7 +113,7 @@
}
}
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -161,8 +162,8 @@
mr.setUidValidity(Math.abs(random.nextInt()));
try {
mr.save();
- } catch (Exception e) {
- throw new MailboxException(e);
+ } catch (TorqueException e) {
+ throw new MailboxException(HumanReadableTextKey.SAVE_FAILED, e);
}
}
@@ -183,7 +184,7 @@
mailbox.deleted(session);
}
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new
MailboxException(HumanReadableTextKey.DELETED_FAILED, e);
}
}
}
@@ -228,7 +229,7 @@
}
}
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.SAVE_FAILED, e);
}
}
@@ -287,7 +288,7 @@
Collections.sort(results, new StandardMailboxMetaDataComparator());
return results;
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -321,13 +322,13 @@
if (count == 1) {
return true;
} else {
- throw new MailboxException("found " + count
- + " mailboxes");
+ throw new
MailboxException(HumanReadableTextKey.DUPLICATE_MAILBOXES,
+ "found " + count + " mailboxes");
}
}
}
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.SEARCH_FAILED, e);
}
}
@@ -338,7 +339,7 @@
Criteria.GREATER_THAN));
mailboxes.clear();
} catch (TorqueException e) {
- throw new MailboxException(e);
+ throw new MailboxException(HumanReadableTextKey.DELETED_FAILED, e);
}
}
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
Sun May 10 21:00:00 2009
@@ -30,6 +30,7 @@
import org.apache.commons.collections.Buffer;
import org.apache.commons.collections.BufferUtils;
import org.apache.commons.collections.buffer.BoundedFifoBuffer;
+import org.apache.james.imap.api.display.HumanReadableTextKey;
import org.apache.james.imap.mailbox.Content;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.mailbox.MessageResult;
@@ -88,11 +89,11 @@
this.fetchGroup);
} catch (TorqueException e) {
result = new UnloadedMessageResult(messageRow,
- new MailboxException(e));
+ new MailboxException(HumanReadableTextKey.SEARCH_FAILED,
e));
} catch (MailboxException e) {
result = new UnloadedMessageResult(messageRow, e);
} catch (MimeException e) {
- result = new UnloadedMessageResult(messageRow, new
MailboxException(e));
+ result = new UnloadedMessageResult(messageRow, new
MailboxException(HumanReadableTextKey.FAILURE_MAIL_PARSE, e));
}
return result;
}
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java?rev=773403&r1=773402&r2=773403&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java
Sun May 10 21:00:00 2009
@@ -632,7 +632,7 @@
*
* @throws Exception
*/
- public void save() throws Exception {
+ public void save() throws TorqueException {
save(MessageFlagsPeer.DATABASE_NAME);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
