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 no...@apache.org on 2010/09/06 21:00:12 UTC
svn commit: r993124 [6/7] - in /james/imap/trunk:
deployment/src/test/java/org/apache/james/imap/functional/
jcr/src/main/java/org/apache/james/imap/jcr/
jcr/src/main/java/org/apache/james/imap/jcr/mail/
jcr/src/main/java/org/apache/james/imap/jcr/mail...
Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/StreamUtils.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/StreamUtils.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/StreamUtils.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/streaming/StreamUtils.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.store.streaming;
+package org.apache.james.mailbox.store.streaming;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/Mapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/Mapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/Mapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.store.transaction;
+package org.apache.james.mailbox.store.transaction;
import org.apache.james.mailbox.MailboxException;
Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/NonTransactionalMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/NonTransactionalMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/NonTransactionalMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/NonTransactionalMapper.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.store.transaction;
+package org.apache.james.mailbox.store.transaction;
import org.apache.james.mailbox.MailboxException;
@@ -29,7 +29,7 @@ import org.apache.james.mailbox.MailboxE
public abstract class NonTransactionalMapper implements Mapper {
/* (non-Javadoc)
- * @see org.apache.james.imap.store.transaction.Mapper#execute(org.apache.james.imap.store.transaction.Mapper.Transaction)
+ * @see org.apache.james.mailbox.store.transaction.Mapper#execute(org.apache.james.mailbox.store.transaction.Mapper.Transaction)
*/
public final <T> T execute(Transaction<T> transaction) throws MailboxException {
return transaction.run();
Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/TransactionalMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/TransactionalMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/transaction/TransactionalMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/transaction/TransactionalMapper.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.store.transaction;
+package org.apache.james.mailbox.store.transaction;
import org.apache.james.mailbox.MailboxException;
@@ -30,7 +30,7 @@ public abstract class TransactionalMappe
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.transaction.TransactionalMapper#execute(org.apache.james.imap.store.transaction.TransactionalMapper.Transaction)
+ * @see org.apache.james.mailbox.store.transaction.TransactionalMapper#execute(org.apache.james.mailbox.store.transaction.TransactionalMapper.Transaction)
*/
public final <T> T execute(Transaction<T> transaction) throws MailboxException {
begin();
Copied: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java (from r993114, james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java?p2=james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java&p1=james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/imap/store/user/SubscriptionMapper.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/user/SubscriptionMapper.java Mon Sep 6 18:59:58 2010
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.store.user;
+package org.apache.james.mailbox.store.user;
import java.util.List;
-import org.apache.james.imap.store.transaction.Mapper;
-import org.apache.james.imap.store.user.model.Subscription;
import org.apache.james.mailbox.SubscriptionException;
+import org.apache.james.mailbox.store.transaction.Mapper;
+import org.apache.james.mailbox.store.user.model.Subscription;
/**
* Mapper for {@link Subscription}
Modified: james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/Subscription.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/Subscription.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/Subscription.java (original)
+++ james/imap/trunk/store/src/main/java/org/apache/james/mailbox/store/user/model/Subscription.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.store.user.model;
+package org.apache.james.mailbox.store.user.model;
/**
*
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageBuilder.java Mon Sep 6 18:59:58 2010
@@ -24,8 +24,8 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
public class MessageBuilder {
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java Mon Sep 6 18:59:58 2010
@@ -21,7 +21,8 @@ package org.apache.james.imap.store;
import static org.junit.Assert.*;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.ResultUtils;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
import org.junit.Test;
public class MessageRowUtilsTest {
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java Mon Sep 6 18:59:58 2010
@@ -27,9 +27,10 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.List;
-import org.apache.james.imap.store.streaming.PartContentBuilder;
-import org.apache.james.imap.store.streaming.PartContentBuilder.PartNotFoundException;
import org.apache.james.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.store.ResultHeader;
+import org.apache.james.mailbox.store.streaming.PartContentBuilder;
+import org.apache.james.mailbox.store.streaming.PartContentBuilder.PartNotFoundException;
import org.junit.Before;
import org.junit.Test;
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java Mon Sep 6 18:59:58 2010
@@ -26,8 +26,9 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.List;
-import org.apache.james.imap.store.streaming.PartContentBuilder;
import org.apache.james.mailbox.MessageResult.Header;
+import org.apache.james.mailbox.store.ResultHeader;
+import org.apache.james.mailbox.store.streaming.PartContentBuilder;
import org.junit.Before;
import org.junit.Test;
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java Mon Sep 6 18:59:58 2010
@@ -25,8 +25,9 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.store.MessageSearches;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
import org.junit.Before;
import org.junit.Test;
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java Mon Sep 6 18:59:58 2010
@@ -25,8 +25,9 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.store.MessageSearches;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
import org.junit.Before;
import org.junit.Test;
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java Mon Sep 6 18:59:58 2010
@@ -27,8 +27,9 @@ import java.util.Date;
import javax.mail.Flags;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.mailbox.SearchQuery;
+import org.apache.james.mailbox.store.MessageSearches;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
import org.junit.Before;
import org.junit.Test;
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleHeader.java Mon Sep 6 18:59:58 2010
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.store;
-import org.apache.james.imap.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.Header;
public class SimpleHeader implements Header {
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMailboxMembership.java Mon Sep 6 18:59:58 2010
@@ -24,8 +24,8 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.imap.store.mail.model.Message;
-import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.apache.james.mailbox.store.mail.model.Message;
public class SimpleMailboxMembership implements MailboxMembership<Long> {
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleMessage.java Mon Sep 6 18:59:58 2010
@@ -26,10 +26,10 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.List;
-import org.apache.james.imap.store.mail.model.Message;
-import org.apache.james.imap.store.mail.model.Header;
-import org.apache.james.imap.store.mail.model.Property;
-import org.apache.james.imap.store.streaming.RewindableInputStream;
+import org.apache.james.mailbox.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.Message;
+import org.apache.james.mailbox.store.mail.model.Property;
+import org.apache.james.mailbox.store.streaming.RewindableInputStream;
public class SimpleMessage implements Message {
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleProperty.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleProperty.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleProperty.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SimpleProperty.java Mon Sep 6 18:59:58 2010
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.imap.store;
-import org.apache.james.imap.store.mail.model.Property;
+import org.apache.james.mailbox.store.mail.model.Property;
/**
* Simple implementation suitable for testing.
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/LockException.java (from r993114, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/LockException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/LockException.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/LockException.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/LockException.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/LockException.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/LockException.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java (from r993114, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageFlags.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageFlags.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageFlags.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageFlags.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.util.Collection;
import java.util.Iterator;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageRowUtils.java (from r993114, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageRowUtils.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageRowUtils.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageRowUtils.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.io.IOException;
import java.io.InputStream;
@@ -32,21 +32,21 @@ import java.util.List;
import javax.mail.Flags;
-import org.apache.james.imap.store.MimeDescriptorImpl;
-import org.apache.james.imap.store.ResultHeader;
-import org.apache.james.imap.store.streaming.ByteContent;
-import org.apache.james.imap.store.streaming.FullByteContent;
-import org.apache.james.imap.store.streaming.PartContentBuilder;
import org.apache.james.mailbox.Content;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MessageResult;
import org.apache.james.mailbox.MimeDescriptor;
import org.apache.james.mailbox.MessageResult.FetchGroup;
import org.apache.james.mailbox.MessageResult.MimePath;
+import org.apache.james.mailbox.store.MimeDescriptorImpl;
+import org.apache.james.mailbox.store.ResultHeader;
+import org.apache.james.mailbox.store.streaming.ByteContent;
+import org.apache.james.mailbox.store.streaming.FullByteContent;
+import org.apache.james.mailbox.store.streaming.PartContentBuilder;
+import org.apache.james.mailbox.torque.om.MessageBody;
+import org.apache.james.mailbox.torque.om.MessageHeader;
+import org.apache.james.mailbox.torque.om.MessageRow;
import org.apache.james.mailbox.util.MessageResultImpl;
-import org.apache.james.mailboxmanager.torque.om.MessageBody;
-import org.apache.james.mailboxmanager.torque.om.MessageHeader;
-import org.apache.james.mailboxmanager.torque.om.MessageRow;
import org.apache.james.mime4j.MimeException;
import org.apache.torque.TorqueException;
@@ -143,7 +143,7 @@ public class MessageRowUtils {
messageResult.setUid(messageRow.getUid());
if (fetchGroup != null) {
int content = fetchGroup.content();
- org.apache.james.mailboxmanager.torque.om.MessageFlags messageFlags = messageRow
+ org.apache.james.mailbox.torque.om.MessageFlags messageFlags = messageRow
.getMessageFlags();
if (messageFlags != null) {
messageResult.setFlags(messageFlags.createFlags());
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageSearches.java (from r993114, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageSearches.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageSearches.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageSearches.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.io.IOException;
import java.io.InputStream;
@@ -34,12 +34,12 @@ import javax.mail.Flags;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.store.MessageSearcher;
import org.apache.james.mailbox.SearchQuery;
import org.apache.james.mailbox.SearchQuery.NumericRange;
-import org.apache.james.mailboxmanager.torque.om.MessageFlags;
-import org.apache.james.mailboxmanager.torque.om.MessageHeader;
-import org.apache.james.mailboxmanager.torque.om.MessageRow;
+import org.apache.james.mailbox.store.MessageSearcher;
+import org.apache.james.mailbox.torque.om.MessageFlags;
+import org.apache.james.mailbox.torque.om.MessageHeader;
+import org.apache.james.mailbox.torque.om.MessageRow;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.field.datetime.DateTime;
import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageUtils.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageUtils.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageUtils.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageUtils.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageUtils.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageUtils.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/MessageUtils.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueCriteriaBuilder.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueCriteriaBuilder.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueCriteriaBuilder.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueCriteriaBuilder.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueCriteriaBuilder.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueCriteriaBuilder.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueCriteriaBuilder.java Mon Sep 6 18:59:58 2010
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import javax.mail.Flags.Flag;
-import org.apache.james.mailboxmanager.torque.om.MessageFlagsPeer;
-import org.apache.james.mailboxmanager.torque.om.MessageHeaderPeer;
-import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
+import org.apache.james.mailbox.torque.om.MessageFlagsPeer;
+import org.apache.james.mailbox.torque.om.MessageHeaderPeer;
+import org.apache.james.mailbox.torque.om.MessageRowPeer;
import org.apache.torque.util.Criteria;
/**
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java (from r993114, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailbox.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -45,8 +45,6 @@ import javax.mail.Flags;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.james.imap.store.MailboxMetaData;
-import org.apache.james.imap.store.streaming.CRLFOutputStream;
import org.apache.james.mailbox.MailboxConstants;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxListener;
@@ -60,15 +58,17 @@ import org.apache.james.mailbox.SearchQu
import org.apache.james.mailbox.MessageResult.FetchGroup;
import org.apache.james.mailbox.SearchQuery.Criterion;
import org.apache.james.mailbox.SearchQuery.NumericRange;
+import org.apache.james.mailbox.store.MailboxMetaData;
+import org.apache.james.mailbox.store.streaming.CRLFOutputStream;
+import org.apache.james.mailbox.torque.om.MailboxRow;
+import org.apache.james.mailbox.torque.om.MailboxRowPeer;
+import org.apache.james.mailbox.torque.om.MessageBody;
+import org.apache.james.mailbox.torque.om.MessageFlags;
+import org.apache.james.mailbox.torque.om.MessageFlagsPeer;
+import org.apache.james.mailbox.torque.om.MessageHeader;
+import org.apache.james.mailbox.torque.om.MessageRow;
+import org.apache.james.mailbox.torque.om.MessageRowPeer;
import org.apache.james.mailbox.util.FetchGroupImpl;
-import org.apache.james.mailboxmanager.torque.om.MailboxRow;
-import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
-import org.apache.james.mailboxmanager.torque.om.MessageBody;
-import org.apache.james.mailboxmanager.torque.om.MessageFlags;
-import org.apache.james.mailboxmanager.torque.om.MessageFlagsPeer;
-import org.apache.james.mailboxmanager.torque.om.MessageHeader;
-import org.apache.james.mailboxmanager.torque.om.MessageRow;
-import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
import org.apache.james.mime4j.MimeException;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailboxManager.java (from r993114, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailboxManager.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailboxManager.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueMailboxManager.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.util.ArrayList;
import java.util.Collections;
@@ -31,8 +31,6 @@ import java.util.concurrent.locks.Reentr
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.imap.store.Authenticator;
-import org.apache.james.imap.store.SimpleMailboxSession;
import org.apache.james.mailbox.BadCredentialsException;
import org.apache.james.mailbox.MailboxConstants;
import org.apache.james.mailbox.MailboxException;
@@ -48,9 +46,11 @@ import org.apache.james.mailbox.MessageM
import org.apache.james.mailbox.MessageRange;
import org.apache.james.mailbox.StandardMailboxMetaDataComparator;
import org.apache.james.mailbox.MailboxMetaData.Selectability;
+import org.apache.james.mailbox.store.Authenticator;
+import org.apache.james.mailbox.store.SimpleMailboxSession;
+import org.apache.james.mailbox.torque.om.MailboxRow;
+import org.apache.james.mailbox.torque.om.MailboxRowPeer;
import org.apache.james.mailbox.util.SimpleMailboxMetaData;
-import org.apache.james.mailboxmanager.torque.om.MailboxRow;
-import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.torque.TorqueException;
import org.apache.torque.util.CountHelper;
import org.apache.torque.util.Criteria;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueResultIterator.java (from r993114, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueResultIterator.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueResultIterator.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/TorqueResultIterator.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.util.Collection;
import java.util.Date;
@@ -35,8 +35,8 @@ import org.apache.james.mailbox.MailboxE
import org.apache.james.mailbox.MessageResult;
import org.apache.james.mailbox.MimeDescriptor;
import org.apache.james.mailbox.MessageResult.FetchGroup;
+import org.apache.james.mailbox.torque.om.MessageRow;
import org.apache.james.mailbox.util.FetchGroupImpl;
-import org.apache.james.mailboxmanager.torque.om.MessageRow;
import org.apache.james.mime4j.MimeException;
import org.apache.torque.TorqueException;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/UidChangeTracker.java (from r993114, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/UidChangeTracker.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/UidChangeTracker.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java&r1=993114&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UidChangeTracker.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/UidChangeTracker.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import java.util.Collection;
import java.util.Iterator;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/UnsupportedSearchException.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UnsupportedSearchException.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/UnsupportedSearchException.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/UnsupportedSearchException.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UnsupportedSearchException.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UnsupportedSearchException.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/UnsupportedSearchException.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.mailbox.torque;
import org.apache.torque.TorqueException;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMailboxRow.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMailboxRow.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMailboxRow.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMailboxRow.java Mon Sep 6 18:59:58 2010
@@ -1,4 +1,4 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.util.ArrayList;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMailboxRowPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMailboxRowPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMailboxRowPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMailboxRowPeer.java Mon Sep 6 18:59:58 2010
@@ -1,4 +1,4 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.sql.SQLException;
@@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.mailboxmanager.torque.om.map.MailboxRowMapBuilder;
+import org.apache.james.mailbox.torque.om.map.MailboxRowMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
@@ -97,7 +97,7 @@ public abstract class BaseMailboxRowPeer
public static final int numColumns = 6;
/** A class that can be returned by this peer. */
- protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailboxmanager.torque.om.MailboxRow";
+ protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailbox.torque.om.MailboxRow";
/** A class that can be returned by this peer. */
protected static final Class CLASS_DEFAULT = initClass(CLASSNAME_DEFAULT);
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageBody.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageBody.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageBody.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageBody.java Mon Sep 6 18:59:58 2010
@@ -1,4 +1,4 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.util.ArrayList;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageBodyPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageBodyPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageBodyPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageBodyPeer.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.sql.SQLException;
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.mailboxmanager.torque.om.map.MessageBodyMapBuilder;
+import org.apache.james.mailbox.torque.om.map.MessageBodyMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
@@ -103,7 +103,7 @@ public abstract class BaseMessageBodyPee
public static final int numColumns = 3;
/** A class that can be returned by this peer. */
- protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailboxmanager.torque.om.MessageBody";
+ protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailbox.torque.om.MessageBody";
/** A class that can be returned by this peer. */
protected static final Class CLASS_DEFAULT = initClass(CLASSNAME_DEFAULT);
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageFlags.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageFlags.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageFlags.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageFlags.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.util.ArrayList;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageFlagsPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageFlagsPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageFlagsPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageFlagsPeer.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.sql.SQLException;
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.mailboxmanager.torque.om.map.MessageFlagsMapBuilder;
+import org.apache.james.mailbox.torque.om.map.MessageFlagsMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
@@ -124,7 +124,7 @@ public abstract class BaseMessageFlagsPe
public static final int numColumns = 8;
/** A class that can be returned by this peer. */
- protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailboxmanager.torque.om.MessageFlags";
+ protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailbox.torque.om.MessageFlags";
/** A class that can be returned by this peer. */
protected static final Class CLASS_DEFAULT = initClass(CLASSNAME_DEFAULT);
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageHeader.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageHeader.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageHeader.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageHeader.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.util.ArrayList;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageHeaderPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageHeaderPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageHeaderPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageHeaderPeer.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.sql.SQLException;
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.mailboxmanager.torque.om.map.MessageHeaderMapBuilder;
+import org.apache.james.mailbox.torque.om.map.MessageHeaderMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
@@ -111,7 +111,7 @@ public abstract class BaseMessageHeaderP
public static final int numColumns = 5;
/** A class that can be returned by this peer. */
- protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailboxmanager.torque.om.MessageHeader";
+ protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailbox.torque.om.MessageHeader";
/** A class that can be returned by this peer. */
protected static final Class CLASS_DEFAULT = initClass(CLASSNAME_DEFAULT);
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageRow.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageRow.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageRow.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageRow.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.util.ArrayList;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageRowPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageRowPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageRowPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/BaseMessageRowPeer.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.sql.SQLException;
@@ -25,7 +25,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.mailboxmanager.torque.om.map.MessageRowMapBuilder;
+import org.apache.james.mailbox.torque.om.map.MessageRowMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
@@ -108,7 +108,7 @@ public abstract class BaseMessageRowPeer
public static final int numColumns = 4;
/** A class that can be returned by this peer. */
- protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailboxmanager.torque.om.MessageRow";
+ protected static final String CLASSNAME_DEFAULT = "org.apache.james.mailbox.torque.om.MessageRow";
/** A class that can be returned by this peer. */
protected static final Class CLASS_DEFAULT = initClass(CLASSNAME_DEFAULT);
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MailboxRow.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MailboxRow.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MailboxRow.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MailboxRow.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.sql.SQLException;
@@ -45,7 +45,7 @@ import com.workingdogs.village.Record;
*/
@Deprecated()
public class MailboxRow extends
- org.apache.james.mailboxmanager.torque.om.BaseMailboxRow implements
+ org.apache.james.mailbox.torque.om.BaseMailboxRow implements
Persistent {
private static final long serialVersionUID = -8207690877715465485L;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MailboxRowPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MailboxRowPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MailboxRowPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MailboxRowPeer.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.sql.Connection;
import java.util.List;
@@ -37,7 +37,7 @@ import org.apache.torque.util.Criteria;
*/
@Deprecated()
public class MailboxRowPeer extends
- org.apache.james.mailboxmanager.torque.om.BaseMailboxRowPeer {
+ org.apache.james.mailbox.torque.om.BaseMailboxRowPeer {
private static final long serialVersionUID = -1906212927584890188L;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageBody.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageBody.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageBody.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageBody.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import org.apache.torque.om.Persistent;
@@ -36,7 +36,7 @@ import org.apache.torque.om.Persistent;
public class MessageBody extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageBody implements
+ org.apache.james.mailbox.torque.om.BaseMessageBody implements
Persistent {
private static final long serialVersionUID = -1304530949913525943L;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageBodyPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageBodyPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageBodyPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageBodyPeer.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
/**
* The skeleton for this class was autogenerated by Torque on:
@@ -31,7 +31,7 @@ package org.apache.james.mailboxmanager.
*/
@Deprecated()
public class MessageBodyPeer extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageBodyPeer {
+ org.apache.james.mailbox.torque.om.BaseMessageBodyPeer {
/**
*
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageFlags.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageFlags.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageFlags.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageFlags.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import javax.mail.Flags;
@@ -35,7 +35,7 @@ import org.apache.torque.om.Persistent;
*/
@Deprecated()
public class MessageFlags extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageFlags implements
+ org.apache.james.mailbox.torque.om.BaseMessageFlags implements
Persistent {
private static final long serialVersionUID = -7426028860085278304L;
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageFlagsPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageFlagsPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageFlagsPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageFlagsPeer.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import javax.mail.Flags;
@@ -35,7 +35,7 @@ import org.apache.torque.util.Criteria;
*/
@Deprecated()
public class MessageFlagsPeer extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageFlagsPeer {
+ org.apache.james.mailbox.torque.om.BaseMessageFlagsPeer {
/**
*
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageHeader.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageHeader.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageHeader.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageHeader.java Mon Sep 6 18:59:58 2010
@@ -17,9 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
-import org.apache.james.imap.store.mail.model.Header;
+import org.apache.james.mailbox.store.mail.model.Header;
import org.apache.torque.om.Persistent;
/**
@@ -35,7 +35,7 @@ import org.apache.torque.om.Persistent;
*/
@Deprecated()
public class MessageHeader extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageHeader implements
+ org.apache.james.mailbox.torque.om.BaseMessageHeader implements
Persistent,Header {
private static final long serialVersionUID = -9191792349506771474L;
@@ -58,7 +58,7 @@ public class MessageHeader extends
/*
* (non-Javadoc)
- * @see org.apache.james.imap.store.mail.model.Header#getFieldName()
+ * @see org.apache.james.mailbox.store.mail.model.Header#getFieldName()
*/
public String getFieldName() {
return getField();
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageHeaderPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeaderPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageHeaderPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageHeaderPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeaderPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeaderPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageHeaderPeer.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
/**
* The skeleton for this class was autogenerated by Torque on:
@@ -31,7 +31,7 @@ package org.apache.james.mailboxmanager.
*/
@Deprecated()
public class MessageHeaderPeer extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageHeaderPeer {
+ org.apache.james.mailbox.torque.om.BaseMessageHeaderPeer {
/**
*
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageRow.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRow.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageRow.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageRow.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRow.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRow.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageRow.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.util.ArrayList;
import java.util.List;
@@ -39,7 +39,7 @@ import org.apache.torque.om.Persistent;
*/
@Deprecated()
public class MessageRow extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageRow implements
+ org.apache.james.mailbox.torque.om.BaseMessageRow implements
Persistent {
/**
*
Copied: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageRowPeer.java (from r993085, james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRowPeer.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageRowPeer.java?p2=james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageRowPeer.java&p1=james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRowPeer.java&r1=993085&r2=993124&rev=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRowPeer.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/MessageRowPeer.java Mon Sep 6 18:59:58 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.mailbox.torque.om;
import java.util.ArrayList;
import java.util.List;
@@ -41,7 +41,7 @@ import com.workingdogs.village.Record;
*/
@Deprecated()
public class MessageRowPeer extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageRowPeer {
+ org.apache.james.mailbox.torque.om.BaseMessageRowPeer {
/**
*
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxMapBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxMapBuilder.java?rev=993124&r1=993085&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxMapBuilder.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxMapBuilder.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om.map;
+package org.apache.james.mailbox.torque.om.map;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
@@ -36,7 +36,7 @@ public class MailboxMapBuilder implement
/**
* The name of this class
*/
- public static final String CLASS_NAME = "org.apache.james.mailboxmanager.torque.om.map.MailboxMapBuilder";
+ public static final String CLASS_NAME = "org.apache.james.mailbox.torque.om.map.MailboxMapBuilder";
/**
* The database map.
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxRowMapBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxRowMapBuilder.java?rev=993124&r1=993085&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxRowMapBuilder.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxRowMapBuilder.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om.map;
+package org.apache.james.mailbox.torque.om.map;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
@@ -39,7 +39,7 @@ public class MailboxRowMapBuilder implem
/**
* The name of this class
*/
- public static final String CLASS_NAME = "org.apache.james.mailboxmanager.torque.om.map.MailboxRowMapBuilder";
+ public static final String CLASS_NAME = "org.apache.james.mailbox.torque.om.map.MailboxRowMapBuilder";
/**
* The database map.
@@ -80,9 +80,9 @@ public class MailboxRowMapBuilder implem
TableMap tMap = dbMap.getTable("mailbox");
tMap.setJavaName("MailboxRow");
tMap
- .setOMClass(org.apache.james.mailboxmanager.torque.om.MailboxRow.class);
+ .setOMClass(org.apache.james.mailbox.torque.om.MailboxRow.class);
tMap
- .setPeerClass(org.apache.james.mailboxmanager.torque.om.MailboxRowPeer.class);
+ .setPeerClass(org.apache.james.mailbox.torque.om.MailboxRowPeer.class);
tMap.setDescription("Mailbox Table");
tMap.setPrimaryKeyMethod(TableMap.NATIVE);
tMap.setPrimaryKeyMethodInfo("mailbox_SEQ");
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxmanagerMapInit.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxmanagerMapInit.java?rev=993124&r1=993085&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxmanagerMapInit.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MailboxmanagerMapInit.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om.map;
+package org.apache.james.mailbox.torque.om.map;
import org.apache.torque.TorqueException;
@@ -34,15 +34,15 @@ import org.apache.torque.TorqueException
@Deprecated()
public class MailboxmanagerMapInit {
public static final void init() throws TorqueException {
- org.apache.james.mailboxmanager.torque.om.MailboxRowPeer
+ org.apache.james.mailbox.torque.om.MailboxRowPeer
.getMapBuilder();
- org.apache.james.mailboxmanager.torque.om.MessageRowPeer
+ org.apache.james.mailbox.torque.om.MessageRowPeer
.getMapBuilder();
- org.apache.james.mailboxmanager.torque.om.MessageFlagsPeer
+ org.apache.james.mailbox.torque.om.MessageFlagsPeer
.getMapBuilder();
- org.apache.james.mailboxmanager.torque.om.MessageHeaderPeer
+ org.apache.james.mailbox.torque.om.MessageHeaderPeer
.getMapBuilder();
- org.apache.james.mailboxmanager.torque.om.MessageBodyPeer
+ org.apache.james.mailbox.torque.om.MessageBodyPeer
.getMapBuilder();
}
}
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageBodyMapBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageBodyMapBuilder.java?rev=993124&r1=993085&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageBodyMapBuilder.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageBodyMapBuilder.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om.map;
+package org.apache.james.mailbox.torque.om.map;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
@@ -37,7 +37,7 @@ public class MessageBodyMapBuilder imple
/**
* The name of this class
*/
- public static final String CLASS_NAME = "org.apache.james.mailboxmanager.torque.om.map.MessageBodyMapBuilder";
+ public static final String CLASS_NAME = "org.apache.james.mailbox.torque.om.map.MessageBodyMapBuilder";
/**
* The database map.
@@ -78,9 +78,9 @@ public class MessageBodyMapBuilder imple
TableMap tMap = dbMap.getTable("message_body");
tMap.setJavaName("MessageBody");
tMap
- .setOMClass(org.apache.james.mailboxmanager.torque.om.MessageBody.class);
+ .setOMClass(org.apache.james.mailbox.torque.om.MessageBody.class);
tMap
- .setPeerClass(org.apache.james.mailboxmanager.torque.om.MessageBodyPeer.class);
+ .setPeerClass(org.apache.james.mailbox.torque.om.MessageBodyPeer.class);
tMap.setPrimaryKeyMethod("none");
ColumnMap cMap = null;
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageFlagsMapBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageFlagsMapBuilder.java?rev=993124&r1=993085&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageFlagsMapBuilder.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageFlagsMapBuilder.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om.map;
+package org.apache.james.mailbox.torque.om.map;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
@@ -37,7 +37,7 @@ public class MessageFlagsMapBuilder impl
/**
* The name of this class
*/
- public static final String CLASS_NAME = "org.apache.james.mailboxmanager.torque.om.map.MessageFlagsMapBuilder";
+ public static final String CLASS_NAME = "org.apache.james.mailbox.torque.om.map.MessageFlagsMapBuilder";
/**
* The database map.
@@ -78,9 +78,9 @@ public class MessageFlagsMapBuilder impl
TableMap tMap = dbMap.getTable("message_flags");
tMap.setJavaName("MessageFlags");
tMap
- .setOMClass(org.apache.james.mailboxmanager.torque.om.MessageFlags.class);
+ .setOMClass(org.apache.james.mailbox.torque.om.MessageFlags.class);
tMap
- .setPeerClass(org.apache.james.mailboxmanager.torque.om.MessageFlagsPeer.class);
+ .setPeerClass(org.apache.james.mailbox.torque.om.MessageFlagsPeer.class);
tMap.setPrimaryKeyMethod("none");
ColumnMap cMap = null;
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageHeaderMapBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageHeaderMapBuilder.java?rev=993124&r1=993085&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageHeaderMapBuilder.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageHeaderMapBuilder.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om.map;
+package org.apache.james.mailbox.torque.om.map;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
@@ -37,7 +37,7 @@ public class MessageHeaderMapBuilder imp
/**
* The name of this class
*/
- public static final String CLASS_NAME = "org.apache.james.mailboxmanager.torque.om.map.MessageHeaderMapBuilder";
+ public static final String CLASS_NAME = "org.apache.james.mailbox.torque.om.map.MessageHeaderMapBuilder";
/**
* The database map.
@@ -78,9 +78,9 @@ public class MessageHeaderMapBuilder imp
TableMap tMap = dbMap.getTable("message_header");
tMap.setJavaName("MessageHeader");
tMap
- .setOMClass(org.apache.james.mailboxmanager.torque.om.MessageHeader.class);
+ .setOMClass(org.apache.james.mailbox.torque.om.MessageHeader.class);
tMap
- .setPeerClass(org.apache.james.mailboxmanager.torque.om.MessageHeaderPeer.class);
+ .setPeerClass(org.apache.james.mailbox.torque.om.MessageHeaderPeer.class);
tMap.setPrimaryKeyMethod("none");
ColumnMap cMap = null;
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageMapBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageMapBuilder.java?rev=993124&r1=993085&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageMapBuilder.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageMapBuilder.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om.map;
+package org.apache.james.mailbox.torque.om.map;
import java.util.Date;
@@ -38,7 +38,7 @@ public class MessageMapBuilder implement
/**
* The name of this class
*/
- public static final String CLASS_NAME = "org.apache.james.mailboxmanager.torque.om.map.MessageMapBuilder";
+ public static final String CLASS_NAME = "org.apache.james.mailbox.torque.om.map.MessageMapBuilder";
/**
* The database map.
Modified: james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageRowMapBuilder.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageRowMapBuilder.java?rev=993124&r1=993085&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageRowMapBuilder.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/james/mailbox/torque/om/map/MessageRowMapBuilder.java Mon Sep 6 18:59:58 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om.map;
+package org.apache.james.mailbox.torque.om.map;
import java.util.Date;
@@ -41,7 +41,7 @@ public class MessageRowMapBuilder implem
/**
* The name of this class
*/
- public static final String CLASS_NAME = "org.apache.james.mailboxmanager.torque.om.map.MessageRowMapBuilder";
+ public static final String CLASS_NAME = "org.apache.james.mailbox.torque.om.map.MessageRowMapBuilder";
/**
* The database map.
@@ -82,9 +82,9 @@ public class MessageRowMapBuilder implem
TableMap tMap = dbMap.getTable("message");
tMap.setJavaName("MessageRow");
tMap
- .setOMClass(org.apache.james.mailboxmanager.torque.om.MessageRow.class);
+ .setOMClass(org.apache.james.mailbox.torque.om.MessageRow.class);
tMap
- .setPeerClass(org.apache.james.mailboxmanager.torque.om.MessageRowPeer.class);
+ .setPeerClass(org.apache.james.mailbox.torque.om.MessageRowPeer.class);
tMap.setDescription("");
tMap.setPrimaryKeyMethod("none");
Modified: james/imap/trunk/torque/src/main/java/org/apache/torque/linkage/MailboxmanagerMapInit.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/torque/linkage/MailboxmanagerMapInit.java?rev=993124&r1=993123&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/main/java/org/apache/torque/linkage/MailboxmanagerMapInit.java (original)
+++ james/imap/trunk/torque/src/main/java/org/apache/torque/linkage/MailboxmanagerMapInit.java Mon Sep 6 18:59:58 2010
@@ -31,5 +31,5 @@ package org.apache.torque.linkage;
*/
@Deprecated()
public class MailboxmanagerMapInit extends
- org.apache.james.mailboxmanager.torque.om.map.MailboxmanagerMapInit {
+ org.apache.james.mailbox.torque.om.map.MailboxmanagerMapInit {
}
Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailbox/functional/torque/AuthenticatedStateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailbox/functional/torque/AuthenticatedStateTest.java?rev=993124&r1=991286&r2=993124&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailbox/functional/torque/AuthenticatedStateTest.java (original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailbox/functional/torque/AuthenticatedStateTest.java Mon Sep 6 18:59:58 2010
@@ -17,10 +17,10 @@
* under the License. *
****************************************************************/
-package org.apache.james.imap.functional.torque;
+package org.apache.james.mailbox.functional.torque;
import org.apache.james.imap.functional.suite.AuthenticatedState;
-import org.apache.james.mailboxmanager.torque.TorqueHostSystemFactory;
+import org.apache.james.mailbox.torque.TorqueHostSystemFactory;
public class AuthenticatedStateTest extends
AuthenticatedState {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org