You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2008/09/07 14:26:59 UTC
svn commit: r692827 - in /james/protocols/imap/trunk:
api/src/main/java/org/apache/james/api/imap/
processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/
processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/
p...
Author: rdonkin
Date: Sun Sep 7 05:26:57 2008
New Revision: 692827
URL: http://svn.apache.org/viewvc?rev=692827&view=rev
Log:
Duplicated RFC822 constants in ImapConstants. Not worthwhile importing mailet libraries just for general constants fixed by specification.
Removed:
james/protocols/imap/trunk/stage/org.apache.james/jars/apache-james-mailet-base-1.0-SNAPSHOT-tests.jar
james/protocols/imap/trunk/stage/org.apache.james/jars/apache-james-mailet-base-1.0-SNAPSHOT.jar
james/protocols/imap/trunk/stage/org.apache.james/jars/mailet-2.4-SNAPSHOT.jar
james/protocols/imap/trunk/stage/org.apache.james/jars/maven-skin-1.1-SNAPSHOT.jar
Modified:
james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/ImapConstants.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java
james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java
james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessorTest.java
james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
Modified: james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/ImapConstants.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/ImapConstants.java?rev=692827&r1=692826&r2=692827&view=diff
==============================================================================
--- james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/ImapConstants.java (original)
+++ james/protocols/imap/trunk/api/src/main/java/org/apache/james/api/imap/ImapConstants.java Sun Sep 7 05:26:57 2008
@@ -85,6 +85,21 @@
public String MIME_TYPE_MESSAGE = "MESSAGE";
public String MIME_SUBTYPE_RFC822 = "RFC822";
+ // RFC822 CONSTANTS:
+ // TODO: Consider switching to standard case
+ public String RFC822_BCC = "Bcc";
+ public String RFC822_CC = "Cc";
+ public String RFC822_FROM = "From";
+ public String RFC822_DATE = "Date";
+ public String RFC822_SUBJECT = "Subject";
+ public String RFC822_TO = "To";
+ public String RFC822_SENDER = "Sender";
+ public String RFC822_REPLY_TO = "Reply-To";
+ public String RFC822_IN_REPLY_TO = "In-Reply-To";
+ public String RFC822_MESSAGE_ID = "Message-ID";
+
+
+
public static final char BACK_SLASH = '\\';
public static final String STATUS_UNSEEN = "UNSEEN";
public static final String STATUS_UIDVALIDITY = "UIDVALIDITY";
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java?rev=692827&r1=692826&r2=692827&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessor.java Sun Sep 7 05:26:57 2008
@@ -28,6 +28,7 @@
import javax.mail.Flags.Flag;
import org.apache.james.api.imap.ImapCommand;
+import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.ImapMessage;
import org.apache.james.api.imap.message.IdRange;
import org.apache.james.api.imap.message.request.DayMonthYear;
@@ -48,7 +49,6 @@
import org.apache.james.mailboxmanager.SearchQuery.Criterion;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.mailet.RFC2822Headers;
public class SearchProcessor extends AbstractImapRequestProcessor {
@@ -135,14 +135,14 @@
case SearchKey.TYPE_ALL: return SearchQuery.all();
case SearchKey.TYPE_AND: return and(key.getKeys(), session);
case SearchKey.TYPE_ANSWERED: return SearchQuery.flagIsSet(Flag.ANSWERED);
- case SearchKey.TYPE_BCC: return SearchQuery.headerContains(RFC2822Headers.BCC, key.getValue());
+ case SearchKey.TYPE_BCC: return SearchQuery.headerContains(ImapConstants.RFC822_BCC, key.getValue());
case SearchKey.TYPE_BEFORE: return SearchQuery.internalDateBefore(date.getDay(), date.getMonth(), date.getYear());
case SearchKey.TYPE_BODY: return SearchQuery.bodyContains(key.getValue());
- case SearchKey.TYPE_CC: return SearchQuery.headerContains(RFC2822Headers.CC, key.getValue());
+ case SearchKey.TYPE_CC: return SearchQuery.headerContains(ImapConstants.RFC822_CC, key.getValue());
case SearchKey.TYPE_DELETED: return SearchQuery.flagIsSet(Flag.DELETED);
case SearchKey.TYPE_DRAFT: return SearchQuery.flagIsSet(Flag.DRAFT);
case SearchKey.TYPE_FLAGGED: return SearchQuery.flagIsSet(Flag.FLAGGED);
- case SearchKey.TYPE_FROM: return SearchQuery.headerContains(RFC2822Headers.FROM, key.getValue());
+ case SearchKey.TYPE_FROM: return SearchQuery.headerContains(ImapConstants.RFC822_FROM, key.getValue());
case SearchKey.TYPE_HEADER: return SearchQuery.headerContains(key.getName(), key.getValue());
case SearchKey.TYPE_KEYWORD: return SearchQuery.flagIsSet(key.getValue());
case SearchKey.TYPE_LARGER: return SearchQuery.sizeGreaterThan(key.getSize());
@@ -153,15 +153,15 @@
case SearchKey.TYPE_OR: return or(key.getKeys(), session);
case SearchKey.TYPE_RECENT: return SearchQuery.flagIsSet(Flag.RECENT);
case SearchKey.TYPE_SEEN: return SearchQuery.flagIsSet(Flag.SEEN);
- case SearchKey.TYPE_SENTBEFORE: return SearchQuery.headerDateBefore(RFC2822Headers.DATE, date.getDay(), date.getMonth(), date.getYear());
- case SearchKey.TYPE_SENTON: return SearchQuery.headerDateOn(RFC2822Headers.DATE, date.getDay(), date.getMonth(), date.getYear());
- case SearchKey.TYPE_SENTSINCE: return SearchQuery.headerDateAfter(RFC2822Headers.DATE, date.getDay(), date.getMonth(), date.getYear());
+ case SearchKey.TYPE_SENTBEFORE: return SearchQuery.headerDateBefore(ImapConstants.RFC822_DATE, date.getDay(), date.getMonth(), date.getYear());
+ case SearchKey.TYPE_SENTON: return SearchQuery.headerDateOn(ImapConstants.RFC822_DATE, date.getDay(), date.getMonth(), date.getYear());
+ case SearchKey.TYPE_SENTSINCE: return SearchQuery.headerDateAfter(ImapConstants.RFC822_DATE, date.getDay(), date.getMonth(), date.getYear());
case SearchKey.TYPE_SEQUENCE_SET: return sequence(key.getSequenceNumbers(), session, true);
case SearchKey.TYPE_SINCE: return SearchQuery.internalDateAfter(date.getDay(), date.getMonth(), date.getYear());
case SearchKey.TYPE_SMALLER: return SearchQuery.sizeLessThan(key.getSize());
- case SearchKey.TYPE_SUBJECT: return SearchQuery.headerContains(RFC2822Headers.SUBJECT, key.getValue());
+ case SearchKey.TYPE_SUBJECT: return SearchQuery.headerContains(ImapConstants.RFC822_SUBJECT, key.getValue());
case SearchKey.TYPE_TEXT: return SearchQuery.mailContains(key.getValue());
- case SearchKey.TYPE_TO: return SearchQuery.headerContains(RFC2822Headers.TO, key.getValue());
+ case SearchKey.TYPE_TO: return SearchQuery.headerContains(ImapConstants.RFC822_TO, key.getValue());
case SearchKey.TYPE_UID: return sequence(key.getSequenceNumbers(), session, false);
case SearchKey.TYPE_UNANSWERED: return SearchQuery.flagIsUnSet(Flag.ANSWERED);
case SearchKey.TYPE_UNDELETED: return SearchQuery.flagIsUnSet(Flag.DELETED);
Modified: james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java?rev=692827&r1=692826&r2=692827&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java (original)
+++ james/protocols/imap/trunk/processor/src/main/java/org/apache/james/imapserver/processor/imap4rev1/fetch/EnvelopeBuilder.java Sun Sep 7 05:26:57 2008
@@ -28,6 +28,7 @@
import javax.mail.MessagingException;
import org.apache.avalon.framework.logger.Logger;
+import org.apache.james.api.imap.ImapConstants;
import org.apache.james.imap.message.response.imap4rev1.FetchResponse;
import org.apache.james.mailboxmanager.Headers;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -40,7 +41,6 @@
import org.apache.james.mime4j.field.address.MailboxList;
import org.apache.james.mime4j.field.address.NamedMailbox;
import org.apache.james.mime4j.field.address.parser.ParseException;
-import org.apache.mailet.RFC2822Headers;
final class EnvelopeBuilder {
private final Logger logger;
@@ -51,22 +51,22 @@
}
public FetchResponse.Envelope buildEnvelope(final Headers headers) throws MessagingException, ParseException {
- final String date = headerValue(headers, RFC2822Headers.DATE);
- final String subject = headerValue(headers, RFC2822Headers.SUBJECT);
+ final String date = headerValue(headers, ImapConstants.RFC822_DATE);
+ final String subject = headerValue(headers, ImapConstants.RFC822_SUBJECT);
final FetchResponse.Envelope.Address[] fromAddresses
- = buildAddresses(headers, RFC2822Headers.FROM);
+ = buildAddresses(headers, ImapConstants.RFC822_FROM);
final FetchResponse.Envelope.Address[] senderAddresses
- = buildAddresses(headers, RFC2822Headers.SENDER, fromAddresses);
+ = buildAddresses(headers, ImapConstants.RFC822_SENDER, fromAddresses);
final FetchResponse.Envelope.Address[] replyToAddresses
- = buildAddresses(headers, RFC2822Headers.REPLY_TO, fromAddresses);
+ = buildAddresses(headers, ImapConstants.RFC822_REPLY_TO, fromAddresses);
final FetchResponse.Envelope.Address[] toAddresses
- = buildAddresses(headers, RFC2822Headers.TO);
+ = buildAddresses(headers, ImapConstants.RFC822_TO);
final FetchResponse.Envelope.Address[] ccAddresses
- = buildAddresses(headers, RFC2822Headers.CC);
+ = buildAddresses(headers, ImapConstants.RFC822_CC);
final FetchResponse.Envelope.Address[] bccAddresses
- = buildAddresses(headers, RFC2822Headers.BCC);
- final String inReplyTo = headerValue(headers, RFC2822Headers.IN_REPLY_TO);
- final String messageId = headerValue(headers, RFC2822Headers.MESSAGE_ID);
+ = buildAddresses(headers, ImapConstants.RFC822_BCC);
+ final String inReplyTo = headerValue(headers, ImapConstants.RFC822_IN_REPLY_TO);
+ final String messageId = headerValue(headers, ImapConstants.RFC822_MESSAGE_ID);
final FetchResponse.Envelope envelope = new EnvelopeImpl(date, subject, fromAddresses, senderAddresses,
replyToAddresses, toAddresses, ccAddresses, bccAddresses, inReplyTo, messageId);
return envelope;
Modified: james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessorTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessorTest.java?rev=692827&r1=692826&r2=692827&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessorTest.java (original)
+++ james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imapserver/processor/imap4rev1/SearchProcessorTest.java Sun Sep 7 05:26:57 2008
@@ -25,6 +25,7 @@
import javax.mail.Flags.Flag;
import org.apache.james.api.imap.ImapCommand;
+import org.apache.james.api.imap.ImapConstants;
import org.apache.james.api.imap.display.HumanReadableTextKey;
import org.apache.james.api.imap.message.IdRange;
import org.apache.james.api.imap.message.request.DayMonthYear;
@@ -42,7 +43,6 @@
import org.apache.james.mailboxmanager.SearchQuery;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.mailet.RFC2822Headers;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
@@ -145,7 +145,7 @@
public void testBCC() throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildBcc(ADDRESS), SearchQuery.headerContains(RFC2822Headers.BCC, ADDRESS));
+ check(SearchKey.buildBcc(ADDRESS), SearchQuery.headerContains(ImapConstants.RFC822_BCC, ADDRESS));
}
public void testBEFORE() throws Exception {
@@ -160,7 +160,7 @@
public void testCC() throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildCc(ADDRESS), SearchQuery.headerContains(RFC2822Headers.CC, ADDRESS));
+ check(SearchKey.buildCc(ADDRESS), SearchQuery.headerContains(ImapConstants.RFC822_CC, ADDRESS));
}
public void testDELETED() throws Exception {
@@ -181,12 +181,12 @@
public void testFROM() throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildFrom(ADDRESS), SearchQuery.headerContains(RFC2822Headers.FROM, ADDRESS));
+ check(SearchKey.buildFrom(ADDRESS), SearchQuery.headerContains(ImapConstants.RFC822_FROM, ADDRESS));
}
public void testHEADER () throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildHeader(RFC2822Headers.IN_REPLY_TO, ADDRESS), SearchQuery.headerContains(RFC2822Headers.IN_REPLY_TO, ADDRESS));
+ check(SearchKey.buildHeader(ImapConstants.RFC822_IN_REPLY_TO, ADDRESS), SearchQuery.headerContains(ImapConstants.RFC822_IN_REPLY_TO, ADDRESS));
}
public void testKEYWORD() throws Exception {
@@ -252,17 +252,17 @@
public void testSENTBEFORE() throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildSentBefore(DAY_MONTH_YEAR), SearchQuery.headerDateBefore(RFC2822Headers.DATE, DAY, MONTH, YEAR));
+ check(SearchKey.buildSentBefore(DAY_MONTH_YEAR), SearchQuery.headerDateBefore(ImapConstants.RFC822_DATE, DAY, MONTH, YEAR));
}
public void testSENTON() throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildSentOn(DAY_MONTH_YEAR), SearchQuery.headerDateOn(RFC2822Headers.DATE, DAY, MONTH, YEAR));
+ check(SearchKey.buildSentOn(DAY_MONTH_YEAR), SearchQuery.headerDateOn(ImapConstants.RFC822_DATE, DAY, MONTH, YEAR));
}
public void testSENTSINCE() throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildSentSince(DAY_MONTH_YEAR), SearchQuery.headerDateAfter(RFC2822Headers.DATE, DAY, MONTH, YEAR));
+ check(SearchKey.buildSentSince(DAY_MONTH_YEAR), SearchQuery.headerDateAfter(ImapConstants.RFC822_DATE, DAY, MONTH, YEAR));
}
public void testSINCE() throws Exception {
@@ -277,7 +277,7 @@
public void testSUBJECT() throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildSubject(SUBJECT), SearchQuery.headerContains(RFC2822Headers.SUBJECT, SUBJECT));
+ check(SearchKey.buildSubject(SUBJECT), SearchQuery.headerContains(ImapConstants.RFC822_SUBJECT, SUBJECT));
}
public void testTEXT() throws Exception {
@@ -287,7 +287,7 @@
public void testTO () throws Exception {
session.expects(once()).method("getSelected").will(returnValue(null));
- check(SearchKey.buildTo(ADDRESS), SearchQuery.headerContains(RFC2822Headers.TO, ADDRESS));
+ check(SearchKey.buildTo(ADDRESS), SearchQuery.headerContains(ImapConstants.RFC822_TO, ADDRESS));
}
public void testUID() throws Exception {
Modified: james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java?rev=692827&r1=692826&r2=692827&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java (original)
+++ james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java Sun Sep 7 05:26:57 2008
@@ -25,11 +25,11 @@
import junit.framework.TestCase;
+import org.apache.james.api.imap.ImapConstants;
import org.apache.james.mailboxmanager.SearchQuery;
import org.apache.james.mailboxmanager.torque.om.MessageBody;
import org.apache.james.mailboxmanager.torque.om.MessageHeader;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
-import org.apache.mailet.RFC2822Headers;
public class SearchUtilsMultipartMixedTest extends TestCase {
@@ -114,10 +114,10 @@
protected void setUp() throws Exception {
super.setUp();
row = new MessageRow();
- row.addMessageHeader(new MessageHeader(RFC2822Headers.FROM, "Alex <alex@example.org"));
- row.addMessageHeader(new MessageHeader(RFC2822Headers.TO, "Harry <harry@example.org"));
- row.addMessageHeader(new MessageHeader(RFC2822Headers.SUBJECT, "A Mixed Multipart Mail"));
- row.addMessageHeader(new MessageHeader(RFC2822Headers.DATE, "Thu, 14 Feb 2008 12:00:00 +0000 (GMT)"));
+ row.addMessageHeader(new MessageHeader(ImapConstants.RFC822_FROM, "Alex <alex@example.org"));
+ row.addMessageHeader(new MessageHeader(ImapConstants.RFC822_TO, "Harry <harry@example.org"));
+ row.addMessageHeader(new MessageHeader(ImapConstants.RFC822_SUBJECT, "A Mixed Multipart Mail"));
+ row.addMessageHeader(new MessageHeader(ImapConstants.RFC822_DATE, "Thu, 14 Feb 2008 12:00:00 +0000 (GMT)"));
row.addMessageHeader(new MessageHeader("Content-Type", "multipart/mixed;boundary=1729"));
row.addMessageBody(new MessageBody(Charset.forName("us-ascii").encode(BODY).array()));
searches = new MessageSearches();
Modified: james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java?rev=692827&r1=692826&r2=692827&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java (original)
+++ james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java Sun Sep 7 05:26:57 2008
@@ -25,11 +25,11 @@
import junit.framework.TestCase;
+import org.apache.james.api.imap.ImapConstants;
import org.apache.james.mailboxmanager.SearchQuery;
import org.apache.james.mailboxmanager.torque.om.MessageBody;
import org.apache.james.mailboxmanager.torque.om.MessageHeader;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
-import org.apache.mailet.RFC2822Headers;
public class SearchUtilsRFC822Test extends TestCase {
@@ -50,10 +50,10 @@
super.setUp();
recent = new ArrayList();
row = new MessageRow();
- row.addMessageHeader(new MessageHeader(RFC2822Headers.FROM, "Alex <alex@example.org"));
- row.addMessageHeader(new MessageHeader(RFC2822Headers.TO, FROM_ADDRESS));
- row.addMessageHeader(new MessageHeader(RFC2822Headers.SUBJECT, "A " + SUBJECT_PART +" Multipart Mail"));
- row.addMessageHeader(new MessageHeader(RFC2822Headers.DATE, "Thu, 14 Feb 2008 12:00:00 +0000 (GMT)"));
+ row.addMessageHeader(new MessageHeader(ImapConstants.RFC822_FROM, "Alex <alex@example.org"));
+ row.addMessageHeader(new MessageHeader(ImapConstants.RFC822_TO, FROM_ADDRESS));
+ row.addMessageHeader(new MessageHeader(ImapConstants.RFC822_SUBJECT, "A " + SUBJECT_PART +" Multipart Mail"));
+ row.addMessageHeader(new MessageHeader(ImapConstants.RFC822_DATE, "Thu, 14 Feb 2008 12:00:00 +0000 (GMT)"));
row.addMessageBody(new MessageBody(Charset.forName("us-ascii").encode(BODY).array()));
searches = new MessageSearches();
}
Modified: james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java?rev=692827&r1=692826&r2=692827&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java (original)
+++ james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java Sun Sep 7 05:26:57 2008
@@ -25,11 +25,11 @@
import javax.mail.Flags;
+import org.apache.james.api.imap.ImapConstants;
import org.apache.james.mailboxmanager.SearchQuery;
import org.apache.james.mailboxmanager.torque.om.MessageFlags;
import org.apache.james.mailboxmanager.torque.om.MessageHeader;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
-import org.apache.mailet.RFC2822Headers;
import org.apache.torque.TorqueException;
import junit.framework.TestCase;
@@ -40,8 +40,8 @@
private static final String CUSTARD = "Custard";
private static final Date SUN_SEP_9TH_2001 = new Date(1000000000000L);
private static final int SIZE = 1729;
- private static final String DATE_FIELD = RFC2822Headers.DATE;
- private static final String SUBJECT_FIELD = RFC2822Headers.SUBJECT;
+ private static final String DATE_FIELD = ImapConstants.RFC822_DATE;
+ private static final String SUBJECT_FIELD = ImapConstants.RFC822_SUBJECT;
private static final String RFC822_SUN_SEP_9TH_2001 = "Sun, 9 Sep 2001 09:10:48 +0000 (GMT)";
private static final String TEXT = RHUBARD + RHUBARD + RHUBARD;
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org