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/18 23:45:03 UTC
svn commit: r696828 [7/32] - in /james/protocols/imap/trunk:
api/src/main/java/org/apache/james/api/imap/
api/src/main/java/org/apache/james/api/imap/display/
api/src/main/java/org/apache/james/api/imap/imap4rev1/
api/src/main/java/org/apache/james/api...
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java Thu Sep 18 14:44:56 2008
@@ -30,35 +30,36 @@
import org.apache.james.test.functional.imap.HostSystem;
public class HostSystemFactory {
-
+
public static final String META_DATA_DIRECTORY = "target/user-meta-data";
-
+
public static void resetUserMetaData() throws Exception {
-
+
File dir = new File(META_DATA_DIRECTORY);
if (dir.exists()) {
FileUtils.deleteDirectory(dir);
}
dir.mkdirs();
}
-
+
public static HostSystem createStandardImap() throws Exception {
-
+
ExperimentalHostSystem host = TorqueMailboxManagerProviderSingleton.host;
final DefaultImapProcessorFactory defaultImapProcessorFactory = new DefaultImapProcessorFactory();
resetUserMetaData();
- defaultImapProcessorFactory.configure(
- MailboxManagerProviderSingleton.getMailboxManagerProviderInstance());
- host.configure(new DefaultImapDecoderFactory().buildImapDecoder(),
- new DefaultImapEncoderFactory().buildImapEncoder(),
- defaultImapProcessorFactory.buildImapProcessor(), new ExperimentalHostSystem.Resetable() {
+ defaultImapProcessorFactory.configure(MailboxManagerProviderSingleton
+ .getMailboxManagerProviderInstance());
+ host.configure(new DefaultImapDecoderFactory().buildImapDecoder(),
+ new DefaultImapEncoderFactory().buildImapEncoder(),
+ defaultImapProcessorFactory.buildImapProcessor(),
+ new ExperimentalHostSystem.Resetable() {
public void reset() throws Exception {
MailboxManagerProviderSingleton.reset();
resetUserMetaData();
}
-
- });
+
+ });
return host;
}
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/MockLogger.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/MockLogger.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/MockLogger.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/MockLogger.java Thu Sep 18 14:44:56 2008
@@ -67,30 +67,30 @@
}
public void warn(Object arg0) {
-
+
}
public void warn(Object arg0, Throwable arg1) {
-
+
}
- public void fatal(Object arg0) {
- }
+ public void fatal(Object arg0) {
+ }
- public void fatal(Object arg0, Throwable arg1) {
- }
+ public void fatal(Object arg0, Throwable arg1) {
+ }
- public boolean isFatalEnabled() {
- return false;
- }
+ public boolean isFatalEnabled() {
+ return false;
+ }
- public boolean isTraceEnabled() {
- return false;
- }
+ public boolean isTraceEnabled() {
+ return false;
+ }
- public void trace(Object arg0) {
- }
+ public void trace(Object arg0) {
+ }
- public void trace(Object arg0, Throwable arg1) {
- }
+ public void trace(Object arg0, Throwable arg1) {
+ }
}
\ No newline at end of file
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imapserver/TestConstants.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imapserver/TestConstants.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imapserver/TestConstants.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imapserver/TestConstants.java Thu Sep 18 14:44:56 2008
@@ -19,19 +19,21 @@
package org.apache.james.imapserver;
-public interface TestConstants
-{
- final static String USER_NAME="tuser";
- //final static String USER_MAILBOX_ROOT=ImapConstants.USER_NAMESPACE+"."+USER_NAME;
-// final static String USER_INBOX=USER_MAILBOX_ROOT+".INBOX";
-
- final static String USER_PASSWORD="abc";
- final static String USER_REALNAME="Test User";
-
- final static String HOST_NAME="localhost";
- final static String HOST_ADDRESS="127.0.0.1";
- final static int HOST_PORT=10143;
-
+public interface TestConstants {
+ final static String USER_NAME = "tuser";
+
+ // final static String
+ // USER_MAILBOX_ROOT=ImapConstants.USER_NAMESPACE+"."+USER_NAME;
+ // final static String USER_INBOX=USER_MAILBOX_ROOT+".INBOX";
+
+ final static String USER_PASSWORD = "abc";
+
+ final static String USER_REALNAME = "Test User";
+
+ final static String HOST_NAME = "localhost";
+
+ final static String HOST_ADDRESS = "127.0.0.1";
+
+ final static int HOST_PORT = 10143;
-
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imapserver/mock/MailboxManagerProviderSingleton.java Thu Sep 18 14:44:56 2008
@@ -23,9 +23,11 @@
import org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
public class MailboxManagerProviderSingleton {
-
- public synchronized static MailboxManagerProvider getMailboxManagerProviderInstance() throws Exception {
- return TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
+
+ public synchronized static MailboxManagerProvider getMailboxManagerProviderInstance()
+ throws Exception {
+ return TorqueMailboxManagerProviderSingleton
+ .getTorqueMailboxManagerProviderInstance();
}
public synchronized static void reset() throws Exception {
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/AbstractMailboxManagerSelfTestCase.java Thu Sep 18 14:44:56 2008
@@ -32,36 +32,41 @@
import junit.framework.TestCase;
public abstract class AbstractMailboxManagerSelfTestCase extends TestCase {
-
+
protected MailboxManager mailboxManager;
+
protected MailboxManagerProvider mailboxManagerProvider;
-
+
public void testCreateList() throws MailboxManagerException {
ListResult[] listResult;
- listResult=mailboxManager.list(new MailboxExpression("","*", '*', '%'));
+ listResult = mailboxManager.list(new MailboxExpression("", "*", '*',
+ '%'));
assertNotNull(listResult);
- assertEquals(0,mailboxManager.list(new MailboxExpression("","*", '*', '%')).length);
- List boxes=new ArrayList();
+ assertEquals(0, mailboxManager.list(new MailboxExpression("", "*", '*',
+ '%')).length);
+ List boxes = new ArrayList();
boxes.add("#users.joachim.INBOX");
boxes.add("#users.joachim.INBOX.Drafts");
boxes.add("#users.joachim2.INBOX");
for (Iterator iter = boxes.iterator(); iter.hasNext();) {
String box = (String) iter.next();
- mailboxManager.createMailbox(box);
+ mailboxManager.createMailbox(box);
}
- listResult=mailboxManager.list(new MailboxExpression("","*", '*', '%'));
- assertEquals(3,listResult.length);
+ listResult = mailboxManager.list(new MailboxExpression("", "*", '*',
+ '%'));
+ assertEquals(3, listResult.length);
for (int i = 0; i < listResult.length; i++) {
assertTrue(boxes.contains(listResult[i].getName()));
}
}
-
+
public void testListOne() throws MailboxManagerException {
- mailboxManager.createMailbox("test1");
+ mailboxManager.createMailbox("test1");
mailboxManager.createMailbox("INBOX");
mailboxManager.createMailbox("INBOX2");
-
- ListResult[] listResult=mailboxManager.list(new MailboxExpression("","*", '*', '%'));
+
+ ListResult[] listResult = mailboxManager.list(new MailboxExpression("",
+ "*", '*', '%'));
assertNotNull(listResult);
assertEquals(3, listResult.length);
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/AbstractMailboxSelfTestCase.java Thu Sep 18 14:44:56 2008
@@ -37,78 +37,91 @@
import org.apache.james.mailboxmanager.manager.MailboxManager;
public abstract class AbstractMailboxSelfTestCase extends TestCase {
-
+
protected MailboxManager mailboxManager;
-
+
public MailboxSession mailboxSession;
-
+
protected Mailbox mailbox;
-
+
protected MailboxListenerCollector collector;
-
- public static final String INBOX="#users.tuser.INBOX";
-
+
+ public static final String INBOX = "#users.tuser.INBOX";
+
public void setUp() throws Exception {
super.setUp();
mailboxManager.createMailbox(INBOX);
- mailbox=mailboxManager.getMailbox(INBOX, false);
+ mailbox = mailboxManager.getMailbox(INBOX, false);
mailboxSession = mailboxManager.createSession();
- collector=new MailboxListenerCollector();
+ collector = new MailboxListenerCollector();
mailbox.addListener(collector);
assertNotNull(mailbox);
}
-
- public void testGetFirstUnseen() throws MailboxManagerException, MessagingException {
+
+ public void testGetFirstUnseen() throws MailboxManagerException,
+ MessagingException {
assertNotNull(mailbox);
for (int i = 0; i < 5; i++) {
- MimeMessage mm=TestUtil.createMessage();
+ MimeMessage mm = TestUtil.createMessage();
mm.setFlags(new Flags(Flags.Flag.SEEN), true);
- MessageResult mr=mailbox.appendMessage(mm, new Date(), FetchGroupImpl.MINIMAL, mailboxSession);
- assertEquals(i+1, mr.getUid());
+ MessageResult mr = mailbox.appendMessage(mm, new Date(),
+ FetchGroupImpl.MINIMAL, mailboxSession);
+ assertEquals(i + 1, mr.getUid());
}
for (int i = 0; i < 3; i++) {
- MessageResult mr=mailbox.appendMessage(TestUtil.createMessage(), new Date(), FetchGroupImpl.MINIMAL, mailboxSession);
- assertEquals(i+6, mr.getUid());
+ MessageResult mr = mailbox.appendMessage(TestUtil.createMessage(),
+ new Date(), FetchGroupImpl.MINIMAL, mailboxSession);
+ assertEquals(i + 6, mr.getUid());
}
for (int i = 0; i < 3; i++) {
- MimeMessage mm=TestUtil.createMessage();
+ MimeMessage mm = TestUtil.createMessage();
mm.setFlags(new Flags(Flags.Flag.SEEN), true);
- MessageResult mr=mailbox.appendMessage(mm, new Date(), FetchGroupImpl.MINIMAL, mailboxSession);
- assertEquals(i+9, mr.getUid());
+ MessageResult mr = mailbox.appendMessage(mm, new Date(),
+ FetchGroupImpl.MINIMAL, mailboxSession);
+ assertEquals(i + 9, mr.getUid());
}
MessageResult mr;
- mr=mailbox.getFirstUnseen(FetchGroupImpl.MINIMAL, mailboxSession);
+ mr = mailbox.getFirstUnseen(FetchGroupImpl.MINIMAL, mailboxSession);
assertNotNull(mr);
assertEquals(6, mr.getUid());
- mailbox.setFlags(new Flags(Flags.Flag.DELETED), true, false, MessageRangeImpl.uidRange(1,3), FetchGroupImpl.MINIMAL, mailboxSession);
- mailbox.expunge(MessageRangeImpl.all(), FetchGroupImpl.MINIMAL, mailboxSession);
- mr=mailbox.getFirstUnseen(FetchGroupImpl.MINIMAL, mailboxSession);
+ mailbox.setFlags(new Flags(Flags.Flag.DELETED), true, false,
+ MessageRangeImpl.uidRange(1, 3), FetchGroupImpl.MINIMAL,
+ mailboxSession);
+ mailbox.expunge(MessageRangeImpl.all(), FetchGroupImpl.MINIMAL,
+ mailboxSession);
+ mr = mailbox.getFirstUnseen(FetchGroupImpl.MINIMAL, mailboxSession);
assertNotNull(mr);
assertEquals(6, mr.getUid());
}
-
-
+
public void testGetUidNext() throws MessagingException {
assertEquals(1, mailbox.getUidNext(mailboxSession));
- MessageResult mr=mailbox.appendMessage(TestUtil.createMessage(), new Date(), FetchGroupImpl.MINIMAL, mailboxSession);
- assertEquals(1,mr.getUid());
+ MessageResult mr = mailbox.appendMessage(TestUtil.createMessage(),
+ new Date(), FetchGroupImpl.MINIMAL, mailboxSession);
+ assertEquals(1, mr.getUid());
assertEquals(2, mailbox.getUidNext(mailboxSession));
}
-
- protected void assertEventCount(MailboxListenerCollector collector,long[] added, long[] flags, long[] expunged) {
- assertEquals("added size", added.length, collector.getAddedList(true).size());
- assertEquals("flags size", added.length, collector.getFlaggedList(true).size());
- assertEquals("deleted size", added.length, collector.getExpungedList(true).size());
-
+
+ protected void assertEventCount(MailboxListenerCollector collector,
+ long[] added, long[] flags, long[] expunged) {
+ assertEquals("added size", added.length, collector.getAddedList(true)
+ .size());
+ assertEquals("flags size", added.length, collector.getFlaggedList(true)
+ .size());
+ assertEquals("deleted size", added.length, collector.getExpungedList(
+ true).size());
+
}
-
- protected void checkMessageResults(long[] uids,int[] msns, Iterator messages) {
+
+ protected void checkMessageResults(long[] uids, int[] msns,
+ Iterator messages) {
List messageResults = IteratorUtils.toList(messages);
assertEquals(uids.length, msns.length);
assertEquals(uids.length, messageResults.size());
- int i=0;
- for (Iterator it=messageResults.iterator(); it.hasNext();i++) {
- assertEquals("Uid at pos "+i,uids[i], ((MessageResult)it.next()).getUid());
+ int i = 0;
+ for (Iterator it = messageResults.iterator(); it.hasNext(); i++) {
+ assertEquals("Uid at pos " + i, uids[i],
+ ((MessageResult) it.next()).getUid());
}
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/TestUtil.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/TestUtil.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/TestUtil.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/TestUtil.java Thu Sep 18 14:44:56 2008
@@ -38,37 +38,40 @@
import javax.mail.internet.MimeMessage;
public class TestUtil {
-
+
private static Random random;
-
- public static boolean contentEquals(MimeMessage m1, MimeMessage m2, boolean verbose)
- throws IOException, MessagingException {
+ public static boolean contentEquals(MimeMessage m1, MimeMessage m2,
+ boolean verbose) throws IOException, MessagingException {
ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
m1.writeTo(new CRLFOutputStream(baos1));
ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
m2.writeTo(new CRLFOutputStream(baos2));
if (verbose) {
- byte[] b1=baos1.toByteArray();
- byte[] b2=baos2.toByteArray();
- int size=b1.length;
- if (b2.length<b1.length) size=b2.length;
- for (int i=0; i< size; i++) {
- if (b1[i]!=b2[i]) {
- System.out.println("I: "+i+" B1: "+b1[i]+" B2 "+b2[i]);
- System.out.println("B1:"+new String(b1,0,i+1)+"\u00C2\u00B0");
- System.out.println("B2:"+new String(b2,0,i+1)+"\u00C2\u00B0");
+ byte[] b1 = baos1.toByteArray();
+ byte[] b2 = baos2.toByteArray();
+ int size = b1.length;
+ if (b2.length < b1.length)
+ size = b2.length;
+ for (int i = 0; i < size; i++) {
+ if (b1[i] != b2[i]) {
+ System.out.println("I: " + i + " B1: " + b1[i] + " B2 "
+ + b2[i]);
+ System.out.println("B1:" + new String(b1, 0, i + 1)
+ + "\u00C2\u00B0");
+ System.out.println("B2:" + new String(b2, 0, i + 1)
+ + "\u00C2\u00B0");
break;
}
}
-
+
}
-
+
return Arrays.equals(baos1.toByteArray(), baos2.toByteArray());
}
- public static byte[] messageToByteArray(MimeMessage mm)
- throws IOException, MessagingException {
+ public static byte[] messageToByteArray(MimeMessage mm) throws IOException,
+ MessagingException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
mm.writeTo(new CRLFOutputStream(baos));
return baos.toByteArray();
@@ -94,8 +97,7 @@
}
return s1.equals(s2);
}
-
-
+
public static MimeMessage createMessage() throws MessagingException {
MimeMessage mm = new MimeMessage((Session) null);
int r = getRandom().nextInt() % 100000;
@@ -121,5 +123,4 @@
}
-
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/impl/UidChangeTrackerTest.java Thu Sep 18 14:44:56 2008
@@ -28,84 +28,83 @@
import org.apache.james.mailboxmanager.util.UidRange;
public class UidChangeTrackerTest extends TestCase {
-
+
protected UidChangeTracker tracker;
-
+
protected MailboxListenerCollector collector;
-
+
public void setUp() {
- tracker=new UidChangeTracker(1000);
- collector=new MailboxListenerCollector();
+ tracker = new UidChangeTracker(1000);
+ collector = new MailboxListenerCollector();
tracker.addMailboxListener(collector);
}
-
-
-
+
protected void assertCollectorSizes(int added, int expunged, int flags) {
- assertEquals(added,collector.getAddedList(false).size());
- assertEquals(expunged,collector.getExpungedList(false).size());
- assertEquals(flags,collector.getFlaggedList(false).size());
+ assertEquals(added, collector.getAddedList(false).size());
+ assertEquals(expunged, collector.getExpungedList(false).size());
+ assertEquals(flags, collector.getFlaggedList(false).size());
}
-
-
+
public void testFound() throws Exception {
MessageResultImpl[] results;
-
- results=new MessageResultImpl[1];
-
- results[0]=new MessageResultImpl(1000l);
- tracker.found(new UidRange(1000,1000),Arrays.asList(results));
- assertCollectorSizes(0,0,0);
-
- results[0]=new MessageResultImpl(1001l);
- tracker.found(new UidRange(1001,1001),Arrays.asList(results));
- assertCollectorSizes(1,0,0);
- assertEquals(1001,((Long) collector.getAddedList(true).get(0)).longValue());
- assertCollectorSizes(0,0,0);
-
- results[0]=new MessageResultImpl(1001l,new Flags(Flags.Flag.FLAGGED));
- tracker.found(new UidRange(1001,1001),Arrays.asList(results));
-
+
+ results = new MessageResultImpl[1];
+
+ results[0] = new MessageResultImpl(1000l);
+ tracker.found(new UidRange(1000, 1000), Arrays.asList(results));
+ assertCollectorSizes(0, 0, 0);
+
+ results[0] = new MessageResultImpl(1001l);
+ tracker.found(new UidRange(1001, 1001), Arrays.asList(results));
+ assertCollectorSizes(1, 0, 0);
+ assertEquals(1001, ((Long) collector.getAddedList(true).get(0))
+ .longValue());
+ assertCollectorSizes(0, 0, 0);
+
+ results[0] = new MessageResultImpl(1001l, new Flags(Flags.Flag.FLAGGED));
+ tracker.found(new UidRange(1001, 1001), Arrays.asList(results));
+
// nothing changed
- tracker.found(new UidRange(1001,1001),Arrays.asList(results));
- assertCollectorSizes(0,0,0);
-
+ tracker.found(new UidRange(1001, 1001), Arrays.asList(results));
+ assertCollectorSizes(0, 0, 0);
+
// 1000 got expunged
- tracker.found(new UidRange(1000,1001),Arrays.asList(results));
- assertCollectorSizes(0,1,0);
- assertEquals(new Long(1000),collector.getExpungedList(true).get(0));
-
-
+ tracker.found(new UidRange(1000, 1001), Arrays.asList(results));
+ assertCollectorSizes(0, 1, 0);
+ assertEquals(new Long(1000), collector.getExpungedList(true).get(0));
+
}
- public void testShouldNotIssueFlagsUpdateEventWhenFlagsNotIncluded() throws Exception {
+ public void testShouldNotIssueFlagsUpdateEventWhenFlagsNotIncluded()
+ throws Exception {
MessageResultImpl[] results = new MessageResultImpl[1];
-
- results[0]=new MessageResultImpl(1000l,new Flags(Flags.Flag.FLAGGED));
- tracker.found(new UidRange(1000,1000),Arrays.asList(results));
- assertCollectorSizes(0,0,0);
-
- results[0]=new MessageResultImpl(1000l);
- tracker.found(new UidRange(1000,1000),Arrays.asList(results));
- assertCollectorSizes(0,0,0);
-
- results[0]=new MessageResultImpl(1000l,new Flags(Flags.Flag.FLAGGED));
- tracker.found(new UidRange(1000,1000),Arrays.asList(results));
-
- results[0]=new MessageResultImpl(1000l,new Flags(Flags.Flag.SEEN));
- tracker.found(new UidRange(1000,1000),Arrays.asList(results));
- assertCollectorSizes(0,0,1);
- MessageFlags messageFlags =(MessageFlags) collector.getFlaggedList(true).get(0);
- assertEquals(1000,messageFlags.getUid());
- assertEquals(new Flags(Flags.Flag.SEEN),messageFlags.getFlags());
-
- results[0]=new MessageResultImpl(1000l);
- tracker.found(new UidRange(1000,1000),Arrays.asList(results));
- assertCollectorSizes(0,0,0);
-
- results[0]=new MessageResultImpl(1000l,new Flags(Flags.Flag.DRAFT));
- tracker.found(new UidRange(1000,1000),Arrays.asList(results));
- assertCollectorSizes(0,0,1);
-
+
+ results[0] = new MessageResultImpl(1000l, new Flags(Flags.Flag.FLAGGED));
+ tracker.found(new UidRange(1000, 1000), Arrays.asList(results));
+ assertCollectorSizes(0, 0, 0);
+
+ results[0] = new MessageResultImpl(1000l);
+ tracker.found(new UidRange(1000, 1000), Arrays.asList(results));
+ assertCollectorSizes(0, 0, 0);
+
+ results[0] = new MessageResultImpl(1000l, new Flags(Flags.Flag.FLAGGED));
+ tracker.found(new UidRange(1000, 1000), Arrays.asList(results));
+
+ results[0] = new MessageResultImpl(1000l, new Flags(Flags.Flag.SEEN));
+ tracker.found(new UidRange(1000, 1000), Arrays.asList(results));
+ assertCollectorSizes(0, 0, 1);
+ MessageFlags messageFlags = (MessageFlags) collector.getFlaggedList(
+ true).get(0);
+ assertEquals(1000, messageFlags.getUid());
+ assertEquals(new Flags(Flags.Flag.SEEN), messageFlags.getFlags());
+
+ results[0] = new MessageResultImpl(1000l);
+ tracker.found(new UidRange(1000, 1000), Arrays.asList(results));
+ assertCollectorSizes(0, 0, 0);
+
+ results[0] = new MessageResultImpl(1000l, new Flags(Flags.Flag.DRAFT));
+ tracker.found(new UidRange(1000, 1000), Arrays.asList(results));
+ assertCollectorSizes(0, 0, 1);
+
}
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleMailboxManagerProvider.java Thu Sep 18 14:44:56 2008
@@ -25,15 +25,14 @@
public class SimpleMailboxManagerProvider implements MailboxManagerProvider {
- private MailboxManager manager;
-
- public void setMailboxManager(MailboxManager manager) {
- this.manager = manager;
- }
+ private MailboxManager manager;
+ public void setMailboxManager(MailboxManager manager) {
+ this.manager = manager;
+ }
- public MailboxManager getMailboxManager() throws MailboxManagerException {
- return manager;
- }
+ public MailboxManager getMailboxManager() throws MailboxManagerException {
+ return manager;
+ }
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleUserManager.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleUserManager.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleUserManager.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/SimpleUserManager.java Thu Sep 18 14:44:56 2008
@@ -27,60 +27,60 @@
import org.apache.james.mailboxmanager.torque.UserManager;
public class SimpleUserManager implements UserManager {
-
- private final Map users;
-
- public SimpleUserManager() {
- this.users = new HashMap();
- }
-
- public boolean isAuthentic(String userid, String passwd) {
- UserDetails user = (UserDetails) users.get(userid);
- final boolean result;
- if (user == null) {
- result = false;
- } else {
- result = (passwd.equals(user.getPassword()));
- }
- return result;
- }
-
- public void subscribe(String userid, String mailbox)
- throws SubscriptionException {
- UserDetails user = (UserDetails) users.get(userid);
- if (user == null) {
- user = new UserDetails(userid);
- users.put(userid, user);
- }
- user.addSubscription(mailbox);
- }
-
- public Collection subscriptions(String userid) throws SubscriptionException {
- UserDetails user = (UserDetails) users.get(userid);
- if (user == null) {
- user = new UserDetails(userid);
- users.put(userid, user);
- }
- return user.getSubscriptions();
- }
-
- public void unsubscribe(String userid, String mailbox)
- throws SubscriptionException {
- UserDetails user = (UserDetails) users.get(userid);
- if (user == null) {
- user = new UserDetails(userid);
- users.put(userid, user);
- }
- user.removeSubscription(mailbox);
- }
-
- public void addUser(String userid, String password) {
- UserDetails user = (UserDetails) users.get(userid);
- if (user == null) {
- user = new UserDetails(userid);
- users.put(userid, user);
- }
- user.setPassword(password);
- }
+
+ private final Map users;
+
+ public SimpleUserManager() {
+ this.users = new HashMap();
+ }
+
+ public boolean isAuthentic(String userid, String passwd) {
+ UserDetails user = (UserDetails) users.get(userid);
+ final boolean result;
+ if (user == null) {
+ result = false;
+ } else {
+ result = (passwd.equals(user.getPassword()));
+ }
+ return result;
+ }
+
+ public void subscribe(String userid, String mailbox)
+ throws SubscriptionException {
+ UserDetails user = (UserDetails) users.get(userid);
+ if (user == null) {
+ user = new UserDetails(userid);
+ users.put(userid, user);
+ }
+ user.addSubscription(mailbox);
+ }
+
+ public Collection subscriptions(String userid) throws SubscriptionException {
+ UserDetails user = (UserDetails) users.get(userid);
+ if (user == null) {
+ user = new UserDetails(userid);
+ users.put(userid, user);
+ }
+ return user.getSubscriptions();
+ }
+
+ public void unsubscribe(String userid, String mailbox)
+ throws SubscriptionException {
+ UserDetails user = (UserDetails) users.get(userid);
+ if (user == null) {
+ user = new UserDetails(userid);
+ users.put(userid, user);
+ }
+ user.removeSubscription(mailbox);
+ }
+
+ public void addUser(String userid, String password) {
+ UserDetails user = (UserDetails) users.get(userid);
+ if (user == null) {
+ user = new UserDetails(userid);
+ users.put(userid, user);
+ }
+ user.setPassword(password);
+ }
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/TorqueMailboxManagerProviderSingleton.java Thu Sep 18 14:44:56 2008
@@ -39,169 +39,168 @@
import org.apache.torque.util.Transaction;
public class TorqueMailboxManagerProviderSingleton {
-
- //TODO: replicates code in server
+
+ // TODO: replicates code in server
private static final String[] tableNames = new String[] {
- MailboxRowPeer.TABLE_NAME,
- MessageRowPeer.TABLE_NAME,
- MessageFlagsPeer.TABLE_NAME,
- MessageHeaderPeer.TABLE_NAME,
- MessageBodyPeer.TABLE_NAME
- };
- //TODO: replicates code in server
+ MailboxRowPeer.TABLE_NAME, MessageRowPeer.TABLE_NAME,
+ MessageFlagsPeer.TABLE_NAME, MessageHeaderPeer.TABLE_NAME,
+ MessageBodyPeer.TABLE_NAME };
+
+ // TODO: replicates code in server
private static final String[] CREATE_STATEMENTS = {
- "CREATE TABLE mailbox" +
- "(" +
- " mailbox_id BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY," +
- " name VARCHAR(255) NOT NULL," +
- " uid_validity BIGINT NOT NULL," +
- " last_uid BIGINT NOT NULL," +
- " message_count INTEGER default 0," +
- " size BIGINT default 0," +
- " PRIMARY KEY(mailbox_id)," +
- " UNIQUE (name))",
- " CREATE TABLE message" +
- " (" +
- " mailbox_id BIGINT NOT NULL," +
- " uid BIGINT NOT NULL," +
- " internal_date TIMESTAMP," +
- " size INTEGER," +
- " PRIMARY KEY(mailbox_id,uid)," +
- " FOREIGN KEY (mailbox_id) REFERENCES mailbox (mailbox_id)" +
- " ON DELETE CASCADE" +
- " )",
- "CREATE TABLE message_flags" +
- " (" +
- " mailbox_id BIGINT NOT NULL," +
- " uid BIGINT NOT NULL," +
- " answered INTEGER default 0 NOT NULL," +
- " deleted INTEGER default 0 NOT NULL," +
- " draft INTEGER default 0 NOT NULL," +
- " flagged INTEGER default 0 NOT NULL," +
- " recent INTEGER default 0 NOT NULL," +
- " seen INTEGER default 0 NOT NULL," +
- " PRIMARY KEY(mailbox_id,uid)," +
- " FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)" +
- " ON DELETE CASCADE" +
- " )",
- "CREATE TABLE message_header" +
- " (" +
- " mailbox_id BIGINT NOT NULL," +
- " uid BIGINT NOT NULL," +
- " line_number INTEGER NOT NULL," +
- " field VARCHAR(256) NOT NULL," +
- " value VARCHAR(1024) NOT NULL," +
- " PRIMARY KEY(mailbox_id,uid,line_number)," +
- " FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)" +
- " ON DELETE CASCADE" +
- " )",
- "CREATE TABLE message_body" +
- " (" +
- " mailbox_id BIGINT NOT NULL," +
- " uid BIGINT NOT NULL," +
- " body BLOB NOT NULL," +
- " PRIMARY KEY(mailbox_id,uid)," +
- " FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)" +
- " ON DELETE CASCADE" +
- " )"};
- //TODO: replicates code in server
+ "CREATE TABLE mailbox"
+ + "("
+ + " mailbox_id BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,"
+ + " name VARCHAR(255) NOT NULL,"
+ + " uid_validity BIGINT NOT NULL,"
+ + " last_uid BIGINT NOT NULL,"
+ + " message_count INTEGER default 0,"
+ + " size BIGINT default 0,"
+ + " PRIMARY KEY(mailbox_id),"
+ + " UNIQUE (name))",
+ " CREATE TABLE message"
+ + " ("
+ + " mailbox_id BIGINT NOT NULL,"
+ + " uid BIGINT NOT NULL,"
+ + " internal_date TIMESTAMP,"
+ + " size INTEGER,"
+ + " PRIMARY KEY(mailbox_id,uid),"
+ + " FOREIGN KEY (mailbox_id) REFERENCES mailbox (mailbox_id)"
+ + " ON DELETE CASCADE" + " )",
+ "CREATE TABLE message_flags"
+ + " ("
+ + " mailbox_id BIGINT NOT NULL,"
+ + " uid BIGINT NOT NULL,"
+ + " answered INTEGER default 0 NOT NULL,"
+ + " deleted INTEGER default 0 NOT NULL,"
+ + " draft INTEGER default 0 NOT NULL,"
+ + " flagged INTEGER default 0 NOT NULL,"
+ + " recent INTEGER default 0 NOT NULL,"
+ + " seen INTEGER default 0 NOT NULL,"
+ + " PRIMARY KEY(mailbox_id,uid),"
+ + " FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)"
+ + " ON DELETE CASCADE" + " )",
+ "CREATE TABLE message_header"
+ + " ("
+ + " mailbox_id BIGINT NOT NULL,"
+ + " uid BIGINT NOT NULL,"
+ + " line_number INTEGER NOT NULL,"
+ + " field VARCHAR(256) NOT NULL,"
+ + " value VARCHAR(1024) NOT NULL,"
+ + " PRIMARY KEY(mailbox_id,uid,line_number),"
+ + " FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)"
+ + " ON DELETE CASCADE" + " )",
+ "CREATE TABLE message_body"
+ + " ("
+ + " mailbox_id BIGINT NOT NULL,"
+ + " uid BIGINT NOT NULL,"
+ + " body BLOB NOT NULL,"
+ + " PRIMARY KEY(mailbox_id,uid),"
+ + " FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)"
+ + " ON DELETE CASCADE" + " )" };
+
+ // TODO: replicates code in server
public static void initialize() throws Exception {
- BaseConfiguration torqueConf = configureDefaults();
- Connection conn = null;
- Torque.init(torqueConf);
- conn = Transaction.begin(MailboxRowPeer.DATABASE_NAME);
-
- DatabaseMetaData dbMetaData = conn.getMetaData();
-
- for (int i = 0; i < tableNames.length; i++) {
- if (!tableExists(dbMetaData, tableNames[i])) {
- BasePeer.executeStatement(CREATE_STATEMENTS[i],
- conn);
- System.out.println("Created table " + tableNames[i]);
- System.out.println(CREATE_STATEMENTS[i]);
- }
- }
-
- Transaction.commit(conn);
- System.out.println("MailboxManager has been initialized");
- }
- //TODO: replicates code in server
- private static boolean tableExists(DatabaseMetaData dbMetaData, String tableName)
- throws SQLException {
- return (tableExistsCaseSensitive(dbMetaData, tableName)
- || tableExistsCaseSensitive(dbMetaData, tableName
- .toUpperCase(Locale.US)) || tableExistsCaseSensitive(
- dbMetaData, tableName.toLowerCase(Locale.US)));
- }
- //TODO: replicates code in server
- private static boolean tableExistsCaseSensitive(DatabaseMetaData dbMetaData,
- String tableName) throws SQLException {
- ResultSet rsTables = dbMetaData.getTables(null, null, tableName, null);
- try {
- boolean found = rsTables.next();
- return found;
- } finally {
- if (rsTables != null) {
- rsTables.close();
- }
- }
+ BaseConfiguration torqueConf = configureDefaults();
+ Connection conn = null;
+ Torque.init(torqueConf);
+ conn = Transaction.begin(MailboxRowPeer.DATABASE_NAME);
+
+ DatabaseMetaData dbMetaData = conn.getMetaData();
+
+ for (int i = 0; i < tableNames.length; i++) {
+ if (!tableExists(dbMetaData, tableNames[i])) {
+ BasePeer.executeStatement(CREATE_STATEMENTS[i], conn);
+ System.out.println("Created table " + tableNames[i]);
+ System.out.println(CREATE_STATEMENTS[i]);
+ }
+ }
+
+ Transaction.commit(conn);
+ System.out.println("MailboxManager has been initialized");
+ }
+
+ // TODO: replicates code in server
+ private static boolean tableExists(DatabaseMetaData dbMetaData,
+ String tableName) throws SQLException {
+ return (tableExistsCaseSensitive(dbMetaData, tableName)
+ || tableExistsCaseSensitive(dbMetaData, tableName
+ .toUpperCase(Locale.US)) || tableExistsCaseSensitive(
+ dbMetaData, tableName.toLowerCase(Locale.US)));
+ }
+
+ // TODO: replicates code in server
+ private static boolean tableExistsCaseSensitive(
+ DatabaseMetaData dbMetaData, String tableName) throws SQLException {
+ ResultSet rsTables = dbMetaData.getTables(null, null, tableName, null);
+ try {
+ boolean found = rsTables.next();
+ return found;
+ } finally {
+ if (rsTables != null) {
+ rsTables.close();
+ }
+ }
}
- //TODO: replicates code in server
+
+ // TODO: replicates code in server
public static BaseConfiguration configureDefaults()
throws org.apache.commons.configuration.ConfigurationException {
- BaseConfiguration torqueConf = new BaseConfiguration();
- torqueConf.addProperty("torque.database.default", "mailboxmanager");
- torqueConf.addProperty("torque.database.mailboxmanager.adapter",
- "derby");
- torqueConf.addProperty("torque.dsfactory.mailboxmanager.factory",
- "org.apache.torque.dsfactory.SharedPoolDataSourceFactory");
- torqueConf.addProperty(
- "torque.dsfactory.mailboxmanager.connection.driver",
- "org.apache.derby.jdbc.EmbeddedDriver");
- torqueConf.addProperty(
- "torque.dsfactory.mailboxmanager.connection.url",
- "jdbc:derby:target/testdb;create=true");
- torqueConf.addProperty(
- "torque.dsfactory.mailboxmanager.connection.user", "app");
- torqueConf.addProperty(
- "torque.dsfactory.mailboxmanager.connection.password",
- "app");
- torqueConf.addProperty(
- "torque.dsfactory.mailboxmanager.pool.maxActive", "100");
+ BaseConfiguration torqueConf = new BaseConfiguration();
+ torqueConf.addProperty("torque.database.default", "mailboxmanager");
+ torqueConf.addProperty("torque.database.mailboxmanager.adapter",
+ "derby");
+ torqueConf.addProperty("torque.dsfactory.mailboxmanager.factory",
+ "org.apache.torque.dsfactory.SharedPoolDataSourceFactory");
+ torqueConf.addProperty(
+ "torque.dsfactory.mailboxmanager.connection.driver",
+ "org.apache.derby.jdbc.EmbeddedDriver");
+ torqueConf.addProperty(
+ "torque.dsfactory.mailboxmanager.connection.url",
+ "jdbc:derby:target/testdb;create=true");
+ torqueConf.addProperty(
+ "torque.dsfactory.mailboxmanager.connection.user", "app");
+ torqueConf.addProperty(
+ "torque.dsfactory.mailboxmanager.connection.password", "app");
+ torqueConf.addProperty(
+ "torque.dsfactory.mailboxmanager.pool.maxActive", "100");
return torqueConf;
}
-
-
+
private static TorqueMailboxManager torqueMailboxManager;
+
private static SimpleUserManager userManager;
+
private static SimpleMailboxManagerProvider provider;
+
public static final ExperimentalHostSystem host = new ExperimentalHostSystem();
- public synchronized static MailboxManagerProvider getTorqueMailboxManagerProviderInstance() throws Exception {
- if (provider==null) {
- getMailboxManager();
- provider=new SimpleMailboxManagerProvider();
+ public synchronized static MailboxManagerProvider getTorqueMailboxManagerProviderInstance()
+ throws Exception {
+ if (provider == null) {
+ getMailboxManager();
+ provider = new SimpleMailboxManagerProvider();
provider.setMailboxManager(torqueMailboxManager);
}
return provider;
-
+
}
public static void addUser(String user, String password) {
- userManager.addUser(user, password);
+ userManager.addUser(user, password);
}
-
+
private static TorqueMailboxManager getMailboxManager() throws Exception {
if (torqueMailboxManager == null) {
- userManager = new SimpleUserManager();
- initialize();
- torqueMailboxManager=new TorqueMailboxManager(userManager);
+ userManager = new SimpleUserManager();
+ initialize();
+ torqueMailboxManager = new TorqueMailboxManager(userManager);
}
return torqueMailboxManager;
}
public static void reset() throws Exception {
- getMailboxManager().deleteEverything();
+ getMailboxManager().deleteEverything();
}
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/UserDetails.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/UserDetails.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/UserDetails.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/mock/UserDetails.java Thu Sep 18 14:44:56 2008
@@ -23,32 +23,34 @@
import java.util.HashSet;
public class UserDetails {
- private final String userName;
- private String password;
- private final Collection subscriptions;
-
- public UserDetails(final String userName) {
- this.userName = userName;
- this.subscriptions = new HashSet();
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public Collection getSubscriptions() {
- return subscriptions;
- }
-
- public void addSubscription(String subscription) {
- this.subscriptions.add(subscription);
- }
-
- public void removeSubscription(String mailbox) {
- this.subscriptions.remove(mailbox);
- }
+ private final String userName;
+
+ private String password;
+
+ private final Collection subscriptions;
+
+ public UserDetails(final String userName) {
+ this.userName = userName;
+ this.subscriptions = new HashSet();
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public Collection getSubscriptions() {
+ return subscriptions;
+ }
+
+ public void addSubscription(String subscription) {
+ this.subscriptions.add(subscription);
+ }
+
+ public void removeSubscription(String mailbox) {
+ this.subscriptions.remove(mailbox);
+ }
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractMailboxRowTestCase.java Thu Sep 18 14:44:56 2008
@@ -28,17 +28,20 @@
public abstract class AbstractMailboxRowTestCase extends AbstractTorqueTestCase {
MailboxManager mm;
-
+
public AbstractMailboxRowTestCase() throws TorqueException {
super();
}
+
public void setUp() throws Exception {
super.setUp();
- assertEquals(0,MailboxRowPeer.doSelect(new Criteria()).size());
- mm=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance().getMailboxManager();
+ assertEquals(0, MailboxRowPeer.doSelect(new Criteria()).size());
+ mm = TorqueMailboxManagerProviderSingleton
+ .getTorqueMailboxManagerProviderInstance().getMailboxManager();
}
+
public void tearDown() {
-
+
}
-
+
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/AbstractTorqueTestCase.java Thu Sep 18 14:44:56 2008
@@ -25,9 +25,9 @@
import org.apache.torque.TorqueException;
public abstract class AbstractTorqueTestCase extends TestCase {
-
+
public TorqueMailboxSession session;
-
+
public AbstractTorqueTestCase() throws TorqueException {
super();
session = new TorqueMailboxSession(10);
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerSelfTest.java Thu Sep 18 14:44:56 2008
@@ -31,7 +31,8 @@
}
public void setUp() throws Exception {
- mailboxManagerProvider=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
+ mailboxManagerProvider = TorqueMailboxManagerProviderSingleton
+ .getTorqueMailboxManagerProviderInstance();
TorqueMailboxManagerProviderSingleton.reset();
mailboxManager = mailboxManagerProvider.getMailboxManager();
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerTest.java Thu Sep 18 14:44:56 2008
@@ -27,26 +27,25 @@
import org.apache.torque.util.Criteria;
public class TorqueMailboxManagerTest extends AbstractMailboxRowTestCase {
-
-
public TorqueMailboxManagerTest() throws TorqueException {
super();
}
- public void testCreateRenameDeleteMailbox() throws TorqueException, MailboxManagerException {
+ public void testCreateRenameDeleteMailbox() throws TorqueException,
+ MailboxManagerException {
mm.createMailbox("#users.tuser.INBOX");
- List l=MailboxRowPeer.doSelect(new Criteria());
- assertEquals(1,l.size());
- assertEquals("#users.tuser.INBOX",((MailboxRow)l.get(0)).getName());
-
- mm.renameMailbox("#users.tuser.INBOX","#users.tuser2.INBOX");
- l=MailboxRowPeer.doSelect(new Criteria());
- assertEquals(1,l.size());
- assertEquals("#users.tuser2.INBOX",((MailboxRow)l.get(0)).getName());
-
+ List l = MailboxRowPeer.doSelect(new Criteria());
+ assertEquals(1, l.size());
+ assertEquals("#users.tuser.INBOX", ((MailboxRow) l.get(0)).getName());
+
+ mm.renameMailbox("#users.tuser.INBOX", "#users.tuser2.INBOX");
+ l = MailboxRowPeer.doSelect(new Criteria());
+ assertEquals(1, l.size());
+ assertEquals("#users.tuser2.INBOX", ((MailboxRow) l.get(0)).getName());
+
mm.deleteMailbox("#users.tuser2.INBOX", null);
- l=MailboxRowPeer.doSelect(new Criteria());
- assertEquals(0,l.size());
+ l = MailboxRowPeer.doSelect(new Criteria());
+ assertEquals(0, l.size());
}
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSelfTest.java Thu Sep 18 14:44:56 2008
@@ -24,18 +24,18 @@
import org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
import org.apache.torque.TorqueException;
-public class TorqueMailboxSelfTest extends
- AbstractMailboxSelfTestCase {
-
+public class TorqueMailboxSelfTest extends AbstractMailboxSelfTestCase {
+
public TorqueMailboxSelfTest() throws TorqueException {
super();
}
public void setUp() throws Exception {
TorqueMailboxManagerProviderSingleton.reset();
- MailboxManagerProvider mailboxManagerProvider=TorqueMailboxManagerProviderSingleton.getTorqueMailboxManagerProviderInstance();
+ MailboxManagerProvider mailboxManagerProvider = TorqueMailboxManagerProviderSingleton
+ .getTorqueMailboxManagerProviderInstance();
mailboxManager = mailboxManagerProvider.getMailboxManager();
-
+
super.setUp();
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTest.java Thu Sep 18 14:44:56 2008
@@ -50,22 +50,23 @@
public void testAppendGetDeleteMessage() throws Exception {
MailboxRow mr = new MailboxRow("#users.tuser.INBOX", 100);
mr.save();
- mr=MailboxRowPeer.retrieveByName("#users.tuser.INBOX");
- Mailbox torqueMailbox = new TorqueMailbox(mr, new WriterPreferenceReadWriteLock(),null);
+ mr = MailboxRowPeer.retrieveByName("#users.tuser.INBOX");
+ Mailbox torqueMailbox = new TorqueMailbox(mr,
+ new WriterPreferenceReadWriteLock(), null);
torqueMailbox.addListener(new MailboxListenerCollector());
- assertEquals(0,torqueMailbox.getMessageCount(session));
-
+ assertEquals(0, torqueMailbox.getMessageCount(session));
+
long time = System.currentTimeMillis();
time = time - (time % 1000);
Date date = new Date(time);
- MimeMessage mm=TestUtil.createMessage();
- Flags flags=new Flags();
+ MimeMessage mm = TestUtil.createMessage();
+ Flags flags = new Flags();
flags.add(Flags.Flag.ANSWERED);
flags.add(Flags.Flag.SEEN);
- mm.setFlags(flags,true);
+ mm.setFlags(flags, true);
mm.writeTo(System.out);
torqueMailbox.appendMessage(mm, date, FetchGroupImpl.MINIMAL, session);
- assertEquals(1,torqueMailbox.getMessageCount(session));
+ assertEquals(1, torqueMailbox.getMessageCount(session));
List l = MessageRowPeer.doSelect(new Criteria());
assertEquals(1, l.size());
MessageRow msg = (MessageRow) l.get(0);
@@ -77,13 +78,15 @@
mr = MailboxRowPeer.retrieveByPK(mr.getMailboxId());
assertEquals(1, mr.getLastUid());
-
- Flags f=new Flags();
+
+ Flags f = new Flags();
f.add(Flags.Flag.DELETED);
- torqueMailbox.setFlags(f,true,false, MessageRangeImpl.oneUid(1l), FetchGroupImpl.MINIMAL, session);
- List messageResults=IteratorUtils.toList(torqueMailbox.expunge(MessageRangeImpl.all(),FetchGroupImpl.MINIMAL, session));
- assertEquals(1,messageResults.size());
- assertEquals(1l,((MessageResult)messageResults.get(0)).getUid());
+ torqueMailbox.setFlags(f, true, false, MessageRangeImpl.oneUid(1l),
+ FetchGroupImpl.MINIMAL, session);
+ List messageResults = IteratorUtils.toList(torqueMailbox.expunge(
+ MessageRangeImpl.all(), FetchGroupImpl.MINIMAL, session));
+ assertEquals(1, messageResults.size());
+ assertEquals(1l, ((MessageResult) messageResults.get(0)).getUid());
}
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueMailboxTestCase.java Thu Sep 18 14:44:56 2008
@@ -50,22 +50,23 @@
public void testAppendGetDeleteMessage() throws Exception {
MailboxRow mr = new MailboxRow("#users.tuser.INBOX", 100);
mr.save();
- mr=MailboxRowPeer.retrieveByName("#users.tuser.INBOX");
- Mailbox torqueMailbox = new TorqueMailbox(mr, new WriterPreferenceReadWriteLock(),null);
+ mr = MailboxRowPeer.retrieveByName("#users.tuser.INBOX");
+ Mailbox torqueMailbox = new TorqueMailbox(mr,
+ new WriterPreferenceReadWriteLock(), null);
torqueMailbox.addListener(new MailboxListenerCollector());
- assertEquals(0,torqueMailbox.getMessageCount(session));
-
+ assertEquals(0, torqueMailbox.getMessageCount(session));
+
long time = System.currentTimeMillis();
time = time - (time % 1000);
Date date = new Date(time);
- MimeMessage mm=TestUtil.createMessage();
- Flags flags=new Flags();
+ MimeMessage mm = TestUtil.createMessage();
+ Flags flags = new Flags();
flags.add(Flags.Flag.ANSWERED);
flags.add(Flags.Flag.SEEN);
- mm.setFlags(flags,true);
+ mm.setFlags(flags, true);
mm.writeTo(System.out);
torqueMailbox.appendMessage(mm, date, FetchGroupImpl.MINIMAL, session);
- assertEquals(1,torqueMailbox.getMessageCount(session));
+ assertEquals(1, torqueMailbox.getMessageCount(session));
List l = MessageRowPeer.doSelect(new Criteria());
assertEquals(1, l.size());
MessageRow msg = (MessageRow) l.get(0);
@@ -77,13 +78,15 @@
mr = MailboxRowPeer.retrieveByPK(mr.getMailboxId());
assertEquals(1, mr.getLastUid());
-
- Flags f=new Flags();
+
+ Flags f = new Flags();
f.add(Flags.Flag.DELETED);
- torqueMailbox.setFlags(f,true,false, MessageRangeImpl.oneUid(1l), FetchGroupImpl.MINIMAL, session);
- List messageResults=IteratorUtils.toList(torqueMailbox.expunge(MessageRangeImpl.all(),FetchGroupImpl.MINIMAL, session));
- assertEquals(1,messageResults.size());
- assertEquals(1l,((MessageResult)messageResults.get(0)).getUid());
+ torqueMailbox.setFlags(f, true, false, MessageRangeImpl.oneUid(1l),
+ FetchGroupImpl.MINIMAL, session);
+ List messageResults = IteratorUtils.toList(torqueMailbox.expunge(
+ MessageRangeImpl.all(), FetchGroupImpl.MINIMAL, session));
+ assertEquals(1, messageResults.size());
+ assertEquals(1l, ((MessageResult) messageResults.get(0)).getUid());
}
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueTestUtil.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueTestUtil.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueTestUtil.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/TorqueTestUtil.java Thu Sep 18 14:44:56 2008
@@ -26,17 +26,18 @@
public class TorqueTestUtil extends TestUtil {
-
-
public static void clearTables() throws TorqueException {
-// MessageBodyPeer.doDelete(new Criteria().and(MessageBodyPeer.MAILBOX_ID,
-// new Integer(-1), Criteria.GREATER_THAN));
-// MessageHeaderPeer.doDelete(new Criteria().and(MessageHeaderPeer.MAILBOX_ID,
-// new Integer(-1), Criteria.GREATER_THAN));
-// MessageFlagsPeer.doDelete(new Criteria().and(MessageFlagsPeer.MAILBOX_ID,
-// new Integer(-1), Criteria.GREATER_THAN));
-// MessageRowPeer.doDelete(new Criteria().and(MessageRowPeer.MAILBOX_ID,
-// new Integer(-1), Criteria.GREATER_THAN));
+ // MessageBodyPeer.doDelete(new
+ // Criteria().and(MessageBodyPeer.MAILBOX_ID,
+ // new Integer(-1), Criteria.GREATER_THAN));
+ // MessageHeaderPeer.doDelete(new
+ // Criteria().and(MessageHeaderPeer.MAILBOX_ID,
+ // new Integer(-1), Criteria.GREATER_THAN));
+ // MessageFlagsPeer.doDelete(new
+ // Criteria().and(MessageFlagsPeer.MAILBOX_ID,
+ // new Integer(-1), Criteria.GREATER_THAN));
+ // MessageRowPeer.doDelete(new Criteria().and(MessageRowPeer.MAILBOX_ID,
+ // new Integer(-1), Criteria.GREATER_THAN));
MailboxRowPeer.doDelete(new Criteria().and(MailboxRowPeer.MAILBOX_ID,
new Integer(-1), Criteria.GREATER_THAN));
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeerTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeerTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeerTest.java Thu Sep 18 14:44:56 2008
@@ -25,7 +25,7 @@
import org.apache.torque.TorqueException;
import org.apache.torque.util.Transaction;
-public class MailboxRowPeerTest extends AbstractMailboxRowTestCase {
+public class MailboxRowPeerTest extends AbstractMailboxRowTestCase {
public MailboxRowPeerTest() throws TorqueException {
super();
@@ -41,7 +41,8 @@
retry = false;
try {
c = Transaction.begin("mailboxmanager");
- c.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+ c
+ .setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
c.setAutoCommit(false);
MailboxRow m = MailboxRowPeer.retrieveByPK(id, c);
System.out.println("Thread " + no + " sleeps.");
@@ -54,22 +55,24 @@
} catch (TorqueException e) {
int errorCode = -1;
- String state ="";
+ String state = "";
Transaction.safeRollback(c);
Throwable t = e.getCause();
if (t instanceof SQLException) {
- errorCode=((SQLException) t).getErrorCode();
- if (errorCode==1213) retry=true;
+ errorCode = ((SQLException) t).getErrorCode();
+ if (errorCode == 1213)
+ retry = true;
state = ((SQLException) t).getSQLState();
}
- System.out.println("Thread " + no + " State: "+state+ " SQLERROR"+errorCode + " " + e);
+ System.out.println("Thread " + no + " State: " + state
+ + " SQLERROR" + errorCode + " " + e);
} catch (SQLException e) {
System.out.println("SQLException!");
e.printStackTrace();
- }
-// catch (InterruptedException e) {
-// e.printStackTrace();
-// }
+ }
+ // catch (InterruptedException e) {
+ // e.printStackTrace();
+ // }
} while (retry);
}
@@ -79,12 +82,13 @@
return t;
}
- public void testConcurrentSerializableMailboxRowUidUpdate() throws Exception {
- MailboxRow m=new MailboxRow();
- m.setName("#users.joachim.INBOX");
- m.save();
- m=MailboxRowPeer.retrieveByName("#users.joachim.INBOX");
- long id=m.getMailboxId();
+ public void testConcurrentSerializableMailboxRowUidUpdate()
+ throws Exception {
+ MailboxRow m = new MailboxRow();
+ m.setName("#users.joachim.INBOX");
+ m.save();
+ m = MailboxRowPeer.retrieveByName("#users.joachim.INBOX");
+ long id = m.getMailboxId();
Thread t[] = new Thread[16];
for (int i = 0; i < t.length; i++) {
@@ -98,7 +102,8 @@
}
public void runBare() throws Throwable {
- // This avoid unittest to be ran because it doesn't work with derby, don't know why.
+ // This avoid unittest to be ran because it doesn't work with derby,
+ // don't know why.
// TODO fix and enable (removing this empty method)
}
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/om/MailboxRowTest.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/om/MailboxRowTest.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/om/MailboxRowTest.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/om/MailboxRowTest.java Thu Sep 18 14:44:56 2008
@@ -32,54 +32,54 @@
super();
}
-
public void testConcurrentConsumeUid() throws Exception {
- MailboxRow mr=new MailboxRow("#users.tuser.INBOX",100);
+ MailboxRow mr = new MailboxRow("#users.tuser.INBOX", 100);
mr.save();
- mr=MailboxRowPeer.retrieveByName("#users.tuser.INBOX");
- ConsumeUidThread[] t=new ConsumeUidThread[10];
+ mr = MailboxRowPeer.retrieveByName("#users.tuser.INBOX");
+ ConsumeUidThread[] t = new ConsumeUidThread[10];
for (int i = 0; i < t.length; i++) {
- t[i]=new ConsumeUidThread(mr);
+ t[i] = new ConsumeUidThread(mr);
t[i].start();
}
- SortedSet set=new TreeSet();
+ SortedSet set = new TreeSet();
for (int i = 0; i < t.length; i++) {
t[i].join();
set.add(new Long(t[i].mr.getLastUid()));
}
- assertEquals(t.length,set.size());
-
+ assertEquals(t.length, set.size());
+
}
-
+
class ConsumeUidThread extends Thread {
MailboxRow mr;
-
- ConsumeUidThread( MailboxRow mr) {
- this.mr=mr;
+
+ ConsumeUidThread(MailboxRow mr) {
+ this.mr = mr;
}
+
public void run() {
try {
- mr=mr.consumeNextUid();
+ mr = mr.consumeNextUid();
} catch (TorqueException e) {
e.printStackTrace();
} catch (SQLException e) {
e.printStackTrace();
}
}
-
+
}
-
+
public void testConsumeUid() throws Exception {
- MailboxRow mr=new MailboxRow("#users.tuser2.INBOX",100);
+ MailboxRow mr = new MailboxRow("#users.tuser2.INBOX", 100);
mr.save();
- mr=MailboxRowPeer.retrieveByName("#users.tuser2.INBOX");
- assertEquals(0,mr.getLastUid());
- mr=mr.consumeNextUid();
- assertEquals(1,mr.getLastUid());
- mr=mr.consumeNextUid();
- assertEquals(2,mr.getLastUid());
- mr=mr.consumeNextUid();
- assertEquals(3,mr.getLastUid());
+ mr = MailboxRowPeer.retrieveByName("#users.tuser2.INBOX");
+ assertEquals(0, mr.getLastUid());
+ mr = mr.consumeNextUid();
+ assertEquals(1, mr.getLastUid());
+ mr = mr.consumeNextUid();
+ assertEquals(2, mr.getLastUid());
+ mr = mr.consumeNextUid();
+ assertEquals(3, mr.getLastUid());
}
-
+
}
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Constants.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Constants.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Constants.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Constants.java Thu Sep 18 14:44:56 2008
@@ -20,9 +20,9 @@
package org.apache.james.mailboxmanager;
public interface Constants {
-
- public final long UID_INFINITY=-1;
-
- public final int MSN_INFINITY=-1;
+
+ public final long UID_INFINITY = -1;
+
+ public final int MSN_INFINITY = -1;
}
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Headers.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Headers.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Headers.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/Headers.java Thu Sep 18 14:44:56 2008
@@ -29,8 +29,9 @@
public interface Headers {
/**
* Gets headers for the message.
- * @return <code>Header</code> <code>Iterator</code>,
- * or null if {@link FetchGroup#HEADERS} was not fetched
+ *
+ * @return <code>Header</code> <code>Iterator</code>, or null if
+ * {@link FetchGroup#HEADERS} was not fetched
*/
Iterator headers() throws MailboxManagerException;
}
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/ListResult.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/ListResult.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/ListResult.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/ListResult.java Thu Sep 18 14:44:56 2008
@@ -23,35 +23,40 @@
* Returned by the list method of MailboxRepository and others
*/
public interface ListResult {
-
+
/** Indicates that no RFC3501 Selectability flag is set */
public static final int SELECTABILITY_FLAG_NONE = 0;
+
/** Indicates that RFC3501 Selectability is set to \Marked */
public static final int SELECTABILITY_FLAG_MARKED = 1;
+
/** Indicates that RFC3501 Selectability is set to \Unmarked */
public static final int SELECTABILITY_FLAG_UNMARKED = 2;
+
/** Indicates that RFC3501 Selectability is set to \Noselect */
public static final int SELECTABILITY_FLAG_NOSELECT = 3;
-
+
public static final ListResult[] EMPTY_ARRAY = {};
-
+
/**
* Is this mailbox <code>\Noinferiors</code> as per RFC3501.
+ *
* @return true if marked, false otherwise
*/
public boolean isNoInferiors();
/**
* Gets the RFC3501 Selectability flag setting.
+ *
* @return {@link #SELECTABILITY_FLAG_NONE},
- * {@link #SELECTABILITY_FLAG_MARKED},
- * {@link #SELECTABILITY_FLAG_NOSELECT},
- * or {@link #SELECTABILITY_FLAG_UNMARKED}
+ * {@link #SELECTABILITY_FLAG_MARKED},
+ * {@link #SELECTABILITY_FLAG_NOSELECT}, or
+ * {@link #SELECTABILITY_FLAG_UNMARKED}
*/
public int getSelectability();
-
+
String getHierarchyDelimiter();
-
+
/**
* @return full namespace-name
*/
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxExistsException.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxExistsException.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxExistsException.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxExistsException.java Thu Sep 18 14:44:56 2008
@@ -20,15 +20,14 @@
package org.apache.james.mailboxmanager;
/**
- * Indicates that the operation failed
- * since the mailbox already exists.
+ * Indicates that the operation failed since the mailbox already exists.
*/
public class MailboxExistsException extends MailboxManagerException {
private static final long serialVersionUID = -486951759505030166L;
private final String mailboxName;
-
+
public MailboxExistsException(String mailboxName) {
super("Mailbox '" + mailboxName + "' already exists.");
this.mailboxName = mailboxName;
@@ -36,6 +35,7 @@
/**
* Gets the name of the mailbox which alredy exists.
+ *
* @return the mailboxName, not null
*/
public final String getMailboxName() {
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxListener.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxListener.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxListener.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxListener.java Thu Sep 18 14:44:56 2008
@@ -23,61 +23,63 @@
import javax.mail.Flags;
-
/**
* Listens to <code>Mailbox</code> events.
*/
public interface MailboxListener {
-
+
void event(final Event event);
-
+
/**
* A mailbox event.
*/
public interface Event {
/**
- * Gets the id of the session which the event.
+ * Gets the id of the session which the event.
+ *
* @return session id
*/
public long getSessionId();
}
-
+
/**
* Indicates that mailbox has been deleted.
*/
- public interface MailboxDeletionEvent extends Event {}
-
+ public interface MailboxDeletionEvent extends Event {
+ }
+
/**
* A mailbox event related to a message.
*/
public interface MessageEvent extends Event {
-
+
/**
- * Gets the message UID for the subject
- * of this event.
+ * Gets the message UID for the subject of this event.
*
* @return message uid
*/
public long getSubjectUid();
}
-
- public abstract class Expunged implements MessageEvent {}
-
+
+ public abstract class Expunged implements MessageEvent {
+ }
+
public abstract class FlagsUpdated implements MessageEvent {
-
+
/**
* Gets new flags for this message.
*/
public abstract Flags getNewFlags();
-
+
/**
* Gets an iterator for the system flags changed.
- * @return <code>Flags.Flag</code> <code>Iterator</code>,
- * not null
+ *
+ * @return <code>Flags.Flag</code> <code>Iterator</code>, not null
*/
public abstract Iterator flagsIterator();
}
-
- public abstract class Added implements MessageEvent {}
+
+ public abstract class Added implements MessageEvent {
+ }
}
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxManagerException.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxManagerException.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxManagerException.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxManagerException.java Thu Sep 18 14:44:56 2008
@@ -26,16 +26,16 @@
private static final long serialVersionUID = -7034955921835169361L;
private Exception cause;
-
+
private String message;
-
+
public MailboxManagerException(Exception e) {
- cause=e;
- message="MailboxException caused by "+cause;
+ cause = e;
+ message = "MailboxException caused by " + cause;
}
public MailboxManagerException(String string) {
- message=string;
+ message = string;
}
public Throwable getCause() {
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxNotFoundException.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxNotFoundException.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxNotFoundException.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxNotFoundException.java Thu Sep 18 14:44:56 2008
@@ -20,8 +20,8 @@
package org.apache.james.mailboxmanager;
/**
- * Indicates that the failure is caused by a reference
- * to a mailbox which does not exist.
+ * Indicates that the failure is caused by a reference to a mailbox which does
+ * not exist.
*/
public class MailboxNotFoundException extends MailboxManagerException {
@@ -36,12 +36,13 @@
}
return result;
}
-
+
private final String mailboxName;
-
+
/**
*
- * @param mailboxName name of the mailbox, not null
+ * @param mailboxName
+ * name of the mailbox, not null
*/
public MailboxNotFoundException(String mailboxName) {
super(message(mailboxName));
@@ -50,6 +51,7 @@
/**
* Gets the name of the mailbox which cannot be found.
+ *
* @return name
*/
public final String getMailboxName() {
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxSession.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxSession.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxSession.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MailboxSession.java Thu Sep 18 14:44:56 2008
@@ -26,17 +26,18 @@
/**
* Gets the session ID.
+ *
* @return session id
*/
public long getSessionId();
-
+
/**
* Is this session open?
- * @return true if the session is open,
- * false otherwise
+ *
+ * @return true if the session is open, false otherwise
*/
public boolean isOpen();
-
+
/**
* Closes this session.
*/
Modified: james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageRange.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageRange.java?rev=696828&r1=696827&r2=696828&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageRange.java (original)
+++ james/protocols/imap/trunk/mailbox/src/main/java/org/apache/james/mailboxmanager/MessageRange.java Thu Sep 18 14:44:56 2008
@@ -19,21 +19,22 @@
package org.apache.james.mailboxmanager;
-
/**
- * Used to define a range of messages by uid or msn, or a individual message by key or message object.<br />
- * The type of the set should be defined by using an appropriate constructor.
+ * Used to define a range of messages by uid or msn, or a individual message by
+ * key or message object.<br />
+ * The type of the set should be defined by using an appropriate constructor.
*
*/
public interface MessageRange {
-
- public static int TYPE_UID=2;
- public static int TYPE_ALL=16;
-
+
+ public static int TYPE_UID = 2;
+
+ public static int TYPE_ALL = 16;
+
int getType();
-
+
long getUidFrom();
-
+
long getUidTo();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org