Author: norman
Date: Fri Jan 8 21:33:11 2010
New Revision: 897326
URL: http://svn.apache.org/viewvc?rev=897326&view=rev
Log:
Let torque module reuse classes of store module (IMAP-102)
Removed:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/imap4rev1/
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/ByteContent.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/CRLFOutputStream.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/FullContent.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/Header.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearcher.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/PartContentBuilder.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/StringBuilderChannel.java
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
james/imap/trunk/parent/pom.xml
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearcher.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
james/imap/trunk/torque/pom.xml
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
Modified:
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
(original)
+++
james/imap/trunk/deployment/src/test/java/org/apache/james/mailboxmanager/torque/SimpleUserManager.java
Fri Jan 8 21:33:11 2010
@@ -32,18 +32,7 @@
public SimpleUserManager() {
this.users = new HashMap<String, UserDetails>();
}
-
- 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);
@@ -82,4 +71,15 @@
user.setPassword(password);
}
+ public boolean isAuthentic(String userid, CharSequence passwd) {
+ UserDetails user = (UserDetails) users.get(userid);
+ final boolean result;
+ if (user == null) {
+ result = false;
+ } else {
+ result = (passwd.toString().equals(user.getPassword()));
+ }
+ return result;
+ }
+
}
Modified: james/imap/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Fri Jan 8 21:33:11 2010
@@ -290,6 +290,13 @@
<version>${pom.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-store</artifactId>
+ <version>${pom.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<!--
END Modules
-->
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ByteContent.java
Fri Jan 8 21:33:11 2010
@@ -28,7 +28,7 @@
import org.apache.james.imap.mailbox.Content;
-final class ByteContent implements Content {
+public final class ByteContent implements Content {
private final ByteBuffer contents;
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/FullContent.java
Fri Jan 8 21:33:11 2010
@@ -31,7 +31,7 @@
import org.apache.james.imap.mailbox.Content;
import org.apache.james.imap.mailbox.MessageResult;
-final class FullContent implements Content {
+public final class FullContent implements Content {
private final ByteBuffer contents;
private final List headers;
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearcher.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearcher.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearcher.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearcher.java
Fri Jan 8 21:33:11 2010
@@ -36,7 +36,7 @@
* Searches an email for content. This class should be safe for use by
* concurrent threads.
*/
-class MessageSearcher {
+public class MessageSearcher {
private Log logger;
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/MessageSearches.java
Fri Jan 8 21:33:11 2010
@@ -49,7 +49,7 @@
/**
* Uility methods to help perform search operations.
*/
-class MessageSearches {
+public class MessageSearches {
private Log log;
Modified:
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
(original)
+++
james/imap/trunk/store/src/main/java/org/apache/james/imap/store/ResultHeader.java
Fri Jan 8 21:33:11 2010
@@ -33,7 +33,7 @@
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.store.mail.model.Header;
-final class ResultHeader implements MessageResult.Header, Content {
+public final class ResultHeader implements MessageResult.Header, Content {
private final String name;
private final String value;
Modified: james/imap/trunk/torque/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/pom.xml?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
--- james/imap/trunk/torque/pom.xml (original)
+++ james/imap/trunk/torque/pom.xml Fri Jan 8 21:33:11 2010
@@ -41,7 +41,11 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-mailbox</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-store</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
@@ -75,5 +79,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-store</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
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/mailboxmanager/torque/MessageRowUtils.java?rev=897326&r1=897325&r2=897326&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/mailboxmanager/torque/MessageRowUtils.java
Fri Jan 8 21:33:11 2010
@@ -39,6 +39,10 @@
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
import org.apache.james.imap.mailbox.MessageResult.MimePath;
import org.apache.james.imap.mailbox.util.MessageResultImpl;
+import org.apache.james.imap.store.ByteContent;
+import org.apache.james.imap.store.FullContent;
+import org.apache.james.imap.store.PartContentBuilder;
+import org.apache.james.imap.store.ResultHeader;
import org.apache.james.mailboxmanager.torque.om.MessageBody;
import org.apache.james.mailboxmanager.torque.om.MessageHeader;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
@@ -81,7 +85,7 @@
final List results = new ArrayList(headers.size());
for (Iterator it = headers.iterator(); it.hasNext();) {
final MessageHeader messageHeader = (MessageHeader) it.next();
- final Header header = new Header(messageHeader);
+ final ResultHeader header = new ResultHeader(messageHeader);
results.add(header);
}
return results;
@@ -106,7 +110,7 @@
final MessageBody body = (MessageBody) messageRow.getMessageBodys()
.get(0);
final byte[] bytes = body.getBody();
- final ByteContent result = new ByteContent(bytes);
+ final ByteContent result = new ByteContent(ByteBuffer.wrap(bytes));
return result;
}
@@ -118,7 +122,7 @@
final MessageBody body = (MessageBody) messageRow.getMessageBodys()
.get(0);
final byte[] bytes = body.getBody();
- final FullContent results = new FullContent(bytes, headers);
+ final FullContent results = new FullContent(ByteBuffer.wrap(bytes),
headers);
return results;
}
Modified:
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/mailboxmanager/torque/MessageSearches.java?rev=897326&r1=897325&r2=897326&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/mailboxmanager/torque/MessageSearches.java
Fri Jan 8 21:33:11 2010
@@ -36,6 +36,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.james.imap.mailbox.SearchQuery;
import org.apache.james.imap.mailbox.SearchQuery.NumericRange;
+import org.apache.james.imap.store.MessageSearcher;
import org.apache.james.mailboxmanager.torque.om.MessageFlags;
import org.apache.james.mailboxmanager.torque.om.MessageHeader;
import org.apache.james.mailboxmanager.torque.om.MessageRow;
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
Fri Jan 8 21:33:11 2010
@@ -30,6 +30,8 @@
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.mailbox.MimeDescriptor;
+import org.apache.james.imap.mailbox.MessageResult.Header;
+import org.apache.james.imap.store.ResultHeader;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.descriptor.MaximalBodyDescriptor;
import org.apache.james.mime4j.parser.MimeTokenStream;
@@ -54,7 +56,7 @@
&& next != MimeTokenStream.T_END_OF_STREAM
&& next != MimeTokenStream.T_START_MULTIPART) {
if (next == MimeTokenStream.T_FIELD) {
- headers.add(new Header(parser.getField().getName(), parser
+ headers.add(new ResultHeader(parser.getField().getName(),
parser
.getField().getBody().trim()));
}
next = parser.next();
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
Fri Jan 8 21:33:11 2010
@@ -57,6 +57,7 @@
import org.apache.james.imap.mailbox.util.FetchGroupImpl;
import org.apache.james.imap.mailbox.util.UidChangeTracker;
import org.apache.james.imap.mailbox.util.UidRange;
+import org.apache.james.imap.store.CRLFOutputStream;
import org.apache.james.mailboxmanager.torque.om.MailboxRow;
import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.james.mailboxmanager.torque.om.MessageBody;
Modified:
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
(original)
+++
james/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
Fri Jan 8 21:33:11 2010
@@ -22,10 +22,9 @@
import java.util.Collection;
import org.apache.james.imap.mailbox.SubscriptionException;
+import org.apache.james.imap.store.Authenticator;
-public interface UserManager {
-
- public boolean isAuthentic(String userid, String passwd);
+public interface UserManager extends Authenticator {
public void subscribe(String user, String mailbox)
throws SubscriptionException;
Modified:
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/mailboxmanager/torque/om/MessageHeader.java?rev=897326&r1=897325&r2=897326&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/mailboxmanager/torque/om/MessageHeader.java
Fri Jan 8 21:33:11 2010
@@ -19,6 +19,7 @@
package org.apache.james.mailboxmanager.torque.om;
+import org.apache.james.imap.store.mail.model.Header;
import org.apache.torque.om.Persistent;
/**
@@ -32,7 +33,7 @@
*/
public class MessageHeader extends
org.apache.james.mailboxmanager.torque.om.BaseMessageHeader implements
- Persistent {
+ Persistent,Header {
private static final long serialVersionUID = -9191792349506771474L;
public MessageHeader() {
@@ -51,4 +52,21 @@
setValue(value);
setLineNumber(position);
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.apache.james.imap.store.mail.model.Header#getFieldName()
+ */
+ public String getFieldName() {
+ return getField();
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see java.lang.Comparable#compareTo(java.lang.Object)
+ */
+ public int compareTo(Header header) {
+ final int result = getLineNumber() - header.getLineNumber();
+ return result;
+ }
}
Modified:
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
(original)
+++
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
Fri Jan 8 21:33:11 2010
@@ -26,7 +26,10 @@
import junit.framework.TestCase;
-import
org.apache.james.mailboxmanager.torque.PartContentBuilder.PartNotFoundException;
+import org.apache.james.imap.mailbox.MessageResult.Header;
+import org.apache.james.imap.store.PartContentBuilder;
+import org.apache.james.imap.store.StringBuilderChannel;
+import org.apache.james.imap.store.PartContentBuilder.PartNotFoundException;
public class PartContentBuilderComplexMultipartTest extends TestCase {
Modified:
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java?rev=897326&r1=897325&r2=897326&view=diff
==============================================================================
---
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
(original)
+++
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
Fri Jan 8 21:33:11 2010
@@ -24,6 +24,10 @@
import java.nio.charset.Charset;
import java.util.List;
+import org.apache.james.imap.mailbox.MessageResult.Header;
+import org.apache.james.imap.store.PartContentBuilder;
+import org.apache.james.imap.store.StringBuilderChannel;
+
import junit.framework.TestCase;
public class PartContentBuilderMultipartAlternativeTest extends TestCase {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
