Author: norman Date: Wed Jun 1 03:47:58 2011 New Revision: 1129990 URL: http://svn.apache.org/viewvc?rev=1129990&view=rev Log: Move search related classes/interfaces to extra package
Added: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java - copied, changed from r1128993, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearchIndex.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java - copied, changed from r1128993, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java - copied, changed from r1128993, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchQueryIterator.java - copied, changed from r1128993, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/ImapSearchAnalyzer.java - copied, changed from r1129859, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/ImapSearchAnalyzer.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/LuceneMessageSearchIndex.java - copied, changed from r1129859, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndex.java Removed: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearchIndex.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/ImapSearchAnalyzer.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndex.java Modified: james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndexTest.java Modified: james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java (original) +++ james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java Wed Jun 1 03:47:58 2011 @@ -25,9 +25,9 @@ import org.apache.james.mailbox.jcr.mail import org.apache.james.mailbox.jcr.mail.JCRMessageMapper; import org.apache.james.mailbox.jcr.user.JCRSubscriptionMapper; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; -import org.apache.james.mailbox.store.MessageSearchIndex; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageMapper; +import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.james.mailbox.store.user.SubscriptionMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java (original) +++ james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java Wed Jun 1 03:47:58 2011 @@ -46,12 +46,12 @@ import org.apache.james.mailbox.jcr.JCRI import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository; import org.apache.james.mailbox.jcr.mail.model.JCRMailbox; import org.apache.james.mailbox.jcr.mail.model.JCRMessage; -import org.apache.james.mailbox.store.MessageSearchIndex; import org.apache.james.mailbox.store.mail.AbstractMessageMapper; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.SimpleMessageMetaData; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.Message; +import org.apache.james.mailbox.store.search.MessageSearchIndex; /** * JCR implementation of a {@link MessageMapper}. The implementation store each message as Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/JPAMailboxSessionMapperFactory.java Wed Jun 1 03:47:58 2011 @@ -26,9 +26,9 @@ import org.apache.james.mailbox.jpa.mail import org.apache.james.mailbox.jpa.mail.JPAMessageMapper; import org.apache.james.mailbox.jpa.user.JPASubscriptionMapper; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; -import org.apache.james.mailbox.store.MessageSearchIndex; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageMapper; +import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.james.mailbox.store.user.SubscriptionMapper; /** Modified: james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java (original) +++ james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/JPAMessageMapper.java Wed Jun 1 03:47:58 2011 @@ -38,12 +38,12 @@ import org.apache.james.mailbox.jpa.mail import org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage; import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage; import org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage; -import org.apache.james.mailbox.store.MessageSearchIndex; import org.apache.james.mailbox.store.mail.AbstractMessageMapper; import org.apache.james.mailbox.store.mail.MessageMapper; import org.apache.james.mailbox.store.mail.SimpleMessageMetaData; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.Message; +import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.openjpa.persistence.ArgumentException; /** Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java (original) +++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirMailboxSessionMapperFactory.java Wed Jun 1 03:47:58 2011 @@ -25,9 +25,9 @@ import org.apache.james.mailbox.maildir. import org.apache.james.mailbox.maildir.mail.MaildirMessageMapper; import org.apache.james.mailbox.maildir.user.MaildirSubscriptionMapper; import org.apache.james.mailbox.store.MailboxSessionMapperFactory; -import org.apache.james.mailbox.store.MessageSearchIndex; import org.apache.james.mailbox.store.mail.MailboxMapper; import org.apache.james.mailbox.store.mail.MessageMapper; +import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.james.mailbox.store.user.SubscriptionMapper; public class MaildirMailboxSessionMapperFactory extends Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java (original) +++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/MaildirMessageMapper.java Wed Jun 1 03:47:58 2011 @@ -47,11 +47,11 @@ import org.apache.james.mailbox.maildir. import org.apache.james.mailbox.maildir.mail.model.AbstractMaildirMessage; import org.apache.james.mailbox.maildir.mail.model.LazyLoadingMaildirMessage; import org.apache.james.mailbox.maildir.mail.model.MaildirMessage; -import org.apache.james.mailbox.store.MessageSearchIndex; import org.apache.james.mailbox.store.mail.AbstractMessageMapper; import org.apache.james.mailbox.store.mail.SimpleMessageMetaData; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.Message; +import org.apache.james.mailbox.store.search.MessageSearchIndex; public class MaildirMessageMapper extends AbstractMessageMapper<Integer> { Modified: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java (original) +++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/mail/AbstractMessageMapper.java Wed Jun 1 03:47:58 2011 @@ -40,12 +40,12 @@ import org.apache.james.mailbox.UpdatedF import org.apache.james.mailbox.SearchQuery.Criterion; import org.apache.james.mailbox.SearchQuery.NumericRange; import org.apache.james.mailbox.SearchQuery.UidCriterion; -import org.apache.james.mailbox.store.MessageSearchIndex; -import org.apache.james.mailbox.store.SearchQueryIterator; import org.apache.james.mailbox.store.mail.model.Header; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.Message; import org.apache.james.mailbox.store.mail.model.Property; +import org.apache.james.mailbox.store.search.MessageSearchIndex; +import org.apache.james.mailbox.store.search.SearchQueryIterator; import org.apache.james.mailbox.store.transaction.TransactionalMapper; /** Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java (from r1128993, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearchIndex.java) URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearchIndex.java&r1=1128993&r2=1129990&rev=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearchIndex.java (original) +++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearchIndex.java Wed Jun 1 03:47:58 2011 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mailbox.store; +package org.apache.james.mailbox.store.search; import java.util.Iterator; Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java (from r1128993, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java) URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java&r1=1128993&r2=1129990&rev=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java (original) +++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearcher.java Wed Jun 1 03:47:58 2011 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mailbox.store; +package org.apache.james.mailbox.store.search; import java.io.IOException; import java.io.InputStream; Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java (from r1128993, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java) URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java&r1=1128993&r2=1129990&rev=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java (original) +++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/MessageSearches.java Wed Jun 1 03:47:58 2011 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.mailbox.store; +package org.apache.james.mailbox.store.search; import java.io.IOException; import java.io.InputStream; @@ -39,6 +39,7 @@ import org.apache.james.mailbox.SearchQu import org.apache.james.mailbox.SearchQuery.DateResolution; import org.apache.james.mailbox.UnsupportedSearchException; import org.apache.james.mailbox.SearchQuery.NumericRange; +import org.apache.james.mailbox.store.ResultUtils; import org.apache.james.mailbox.store.mail.model.Header; import org.apache.james.mailbox.store.mail.model.Message; import org.apache.james.mime4j.MimeException; Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchQueryIterator.java (from r1128993, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java) URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchQueryIterator.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchQueryIterator.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java&r1=1128993&r2=1129990&rev=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java (original) +++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/SearchQueryIterator.java Wed Jun 1 03:47:58 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.mailbox.store; +package org.apache.james.mailbox.store.search; import java.util.Iterator; import java.util.NoSuchElementException; Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/ImapSearchAnalyzer.java (from r1129859, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/ImapSearchAnalyzer.java) URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/ImapSearchAnalyzer.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/ImapSearchAnalyzer.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/ImapSearchAnalyzer.java&r1=1129859&r2=1129990&rev=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/ImapSearchAnalyzer.java (original) +++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/ImapSearchAnalyzer.java Wed Jun 1 03:47:58 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.mailbox.store.lucene; +package org.apache.james.mailbox.store.search.lucene; import java.io.Reader; Copied: james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/LuceneMessageSearchIndex.java (from r1129859, james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndex.java) URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/LuceneMessageSearchIndex.java?p2=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/LuceneMessageSearchIndex.java&p1=james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndex.java&r1=1129859&r2=1129990&rev=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndex.java (original) +++ james/mailbox/trunk/store/src/main/java/org/apache/james/mailbox/store/search/lucene/LuceneMessageSearchIndex.java Wed Jun 1 03:47:58 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.mailbox.store.lucene; +package org.apache.james.mailbox.store.search.lucene; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -48,9 +48,9 @@ import org.apache.james.mailbox.SearchQu import org.apache.james.mailbox.SearchQuery.NumericRange; import org.apache.james.mailbox.SearchQuery.UidCriterion; import org.apache.james.mailbox.UnsupportedSearchException; -import org.apache.james.mailbox.store.MessageSearchIndex; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.Message; +import org.apache.james.mailbox.store.search.MessageSearchIndex; import org.apache.james.mime4j.MimeException; import org.apache.james.mime4j.descriptor.BodyDescriptor; import org.apache.james.mime4j.field.AddressListField; Modified: james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java (original) +++ james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsMultipartMixedTest.java Wed Jun 1 03:47:58 2011 @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.Collection; import org.apache.james.mailbox.SearchQuery; -import org.apache.james.mailbox.store.MessageSearches; import org.apache.james.mailbox.store.mail.model.Message; +import org.apache.james.mailbox.store.search.MessageSearches; import org.junit.Before; import org.junit.Test; Modified: james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java (original) +++ james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsRFC822Test.java Wed Jun 1 03:47:58 2011 @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.Collection; import org.apache.james.mailbox.SearchQuery; -import org.apache.james.mailbox.store.MessageSearches; import org.apache.james.mailbox.store.mail.model.Message; +import org.apache.james.mailbox.store.search.MessageSearches; import org.junit.Before; import org.junit.Test; Modified: james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java (original) +++ james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/SearchUtilsTest.java Wed Jun 1 03:47:58 2011 @@ -33,8 +33,8 @@ import javax.mail.Flags; import org.apache.james.mailbox.SearchQuery; import org.apache.james.mailbox.SearchQuery.AddressType; import org.apache.james.mailbox.SearchQuery.DateResolution; -import org.apache.james.mailbox.store.MessageSearches; import org.apache.james.mailbox.store.mail.model.Message; +import org.apache.james.mailbox.store.search.MessageSearches; import org.junit.Before; import org.junit.Test; Modified: james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndexTest.java URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndexTest.java?rev=1129990&r1=1129989&r2=1129990&view=diff ============================================================================== --- james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndexTest.java (original) +++ james/mailbox/trunk/store/src/test/java/org/apache/james/mailbox/store/lucene/LuceneMessageSearchIndexTest.java Wed Jun 1 03:47:58 2011 @@ -36,11 +36,12 @@ import javax.mail.Flags.Flag; import org.apache.james.mailbox.SearchQuery; import org.apache.james.mailbox.SearchQuery.DateResolution; import org.apache.james.mailbox.store.MessageBuilder; -import org.apache.james.mailbox.store.MessageSearchIndex; import org.apache.james.mailbox.store.SimpleHeader; import org.apache.james.mailbox.store.SimpleMailboxMembership; import org.apache.james.mailbox.store.mail.model.Mailbox; import org.apache.james.mailbox.store.mail.model.Message; +import org.apache.james.mailbox.store.search.MessageSearchIndex; +import org.apache.james.mailbox.store.search.lucene.LuceneMessageSearchIndex; import org.apache.lucene.store.RAMDirectory; import org.junit.Before; import org.junit.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org