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/04/08 20:57:39 UTC
svn commit: r932064 - in
/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model:
AbstractJPAMailboxMembership.java AbstractJPAMessage.java JPAMessage.java
openjpa/JPAStreamingMailboxMembership.java openjpa/JPAStreamingMessage.java
Author: norman
Date: Thu Apr 8 18:57:39 2010
New Revision: 932064
URL: http://svn.apache.org/viewvc?rev=932064&view=rev
Log:
Don't be to strict..
Modified:
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMailboxMembership.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMessage.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMessage.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMessage.java
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMailboxMembership.java?rev=932064&r1=932063&r2=932064&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMailboxMembership.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMailboxMembership.java Thu Apr 8 18:57:39 2010
@@ -33,6 +33,7 @@ import javax.persistence.NamedQuery;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.mail.model.AbstractMailboxMembership;
+import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
@MappedSuperclass
@@ -158,7 +159,7 @@ public abstract class AbstractJPAMailbox
* @param original message to be copied, not null
* @throws IOException
*/
- public AbstractJPAMailboxMembership(long mailboxId, long uid, AbstractJPAMailboxMembership original) throws MailboxException {
+ public AbstractJPAMailboxMembership(long mailboxId, long uid, MailboxMembership<?> original) throws MailboxException {
super();
this.mailboxId = mailboxId;
this.uid = uid;
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMessage.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMessage.java?rev=932064&r1=932063&r2=932064&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMessage.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/AbstractJPAMessage.java Thu Apr 8 18:57:39 2010
@@ -31,6 +31,7 @@ import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
import org.apache.james.imap.store.mail.model.AbstractDocument;
+import org.apache.james.imap.store.mail.model.Document;
import org.apache.james.imap.store.mail.model.Header;
import org.apache.james.imap.store.mail.model.Property;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
@@ -85,7 +86,7 @@ public abstract class AbstractJPAMessage
*
* @param message
*/
- public AbstractJPAMessage(AbstractJPAMessage message) {
+ public AbstractJPAMessage(Document message) {
this.contentOctets = message.getFullContentOctets();
this.bodyStartOctet = (int) (message.getFullContentOctets() - message.getBodyOctets());
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMessage.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMessage.java?rev=932064&r1=932063&r2=932064&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMessage.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/JPAMessage.java Thu Apr 8 18:57:39 2010
@@ -30,6 +30,7 @@ import javax.persistence.FetchType;
import javax.persistence.Lob;
import org.apache.james.imap.store.StreamUtils;
+import org.apache.james.imap.store.mail.model.Document;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
@Entity(name="Message")
@@ -53,7 +54,7 @@ public class JPAMessage extends Abstract
*
* @param message
*/
- public JPAMessage(JPAMessage message) throws IOException{
+ public JPAMessage(Document message) throws IOException{
super(message);
this.content = StreamUtils.out(message.getFullContent()).toByteArray();
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java?rev=932064&r1=932063&r2=932064&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMailboxMembership.java Thu Apr 8 18:57:39 2010
@@ -34,6 +34,7 @@ import org.apache.james.imap.jpa.mail.mo
import org.apache.james.imap.jpa.mail.model.JPAHeader;
import org.apache.james.imap.mailbox.MailboxException;
import org.apache.james.imap.store.mail.model.Document;
+import org.apache.james.imap.store.mail.model.MailboxMembership;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
@Entity(name="Membership")
@@ -58,10 +59,10 @@ public class JPAStreamingMailboxMembersh
}
- public JPAStreamingMailboxMembership(long mailboxId, long uid, AbstractJPAMailboxMembership original) throws MailboxException {
+ public JPAStreamingMailboxMembership(long mailboxId, long uid, MailboxMembership<?> original) throws MailboxException {
super(mailboxId, uid, original);
try {
- this.message = new JPAStreamingMessage((JPAStreamingMessage) original.getDocument());
+ this.message = new JPAStreamingMessage(original.getDocument());
} catch (IOException e) {
throw new MailboxException(HumanReadableText.FAILURE_MAILBOX_EXISTS,e);
}
Modified: james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMessage.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMessage.java?rev=932064&r1=932063&r2=932064&view=diff
==============================================================================
--- james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMessage.java (original)
+++ james/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/mail/model/openjpa/JPAStreamingMessage.java Thu Apr 8 18:57:39 2010
@@ -32,6 +32,7 @@ import org.apache.james.imap.jpa.mail.mo
import org.apache.james.imap.jpa.mail.model.JPAHeader;
import org.apache.james.imap.jpa.mail.model.JPAMessage;
import org.apache.james.imap.store.StreamUtils;
+import org.apache.james.imap.store.mail.model.Document;
import org.apache.james.imap.store.mail.model.PropertyBuilder;
import org.apache.openjpa.persistence.Persistent;
@@ -65,7 +66,7 @@ public class JPAStreamingMessage extends
* @param message
* @throws IOException
*/
- public JPAStreamingMessage(JPAStreamingMessage message) throws IOException {
+ public JPAStreamingMessage(Document message) throws IOException {
super(message);
this.content = new ByteArrayInputStream(StreamUtils.toByteArray(message.getFullContent()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org