Author: norman
Date: Thu Apr 28 10:46:36 2011
New Revision: 1097409

URL: http://svn.apache.org/viewvc?rev=1097409&view=rev
Log:
Merge MailboxMembership and Message interfaces and implementation. See 
MAILBOX-61

Modified:
    
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java

Modified: 
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
URL: 
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java?rev=1097409&r1=1097408&r2=1097409&view=diff
==============================================================================
--- 
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
 (original)
+++ 
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/mail/model/openjpa/AbstractJPAMessage.java
 Thu Apr 28 10:46:36 2011
@@ -56,7 +56,7 @@ import org.apache.openjpa.persistence.jd
 @IdClass(AbstractJPAMessage.MailboxIdUidKey.class)
 @NamedQueries({
     @NamedQuery(name="findRecentMessagesInMailbox",
-            query="SELECT message FROM Message message WHERE 
membership.mailbox.mailboxId = :idParam AND message.recent = TRUE"),
+            query="SELECT message FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.recent = TRUE"),
     @NamedQuery(name="findUnseenMessagesInMailboxOrderByUid",
             query="SELECT message FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.seen = FALSE ORDER BY 
message.uid ASC"),
     @NamedQuery(name="findMessagesInMailbox",
@@ -64,7 +64,7 @@ import org.apache.openjpa.persistence.jd
     @NamedQuery(name="findMessagesInMailboxBetweenUIDs",
             query="SELECT message FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND 
:toParam"),        
     @NamedQuery(name="findMessagesInMailboxWithUID",
-            query="SELECT membership FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.uid=:uidParam"),               
     
+            query="SELECT message FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.uid=:uidParam"),               
     
     @NamedQuery(name="findMessagesInMailboxAfterUID",
             query="SELECT message FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam"),              
      
     @NamedQuery(name="findDeletedMessagesInMailbox",
@@ -72,7 +72,7 @@ import org.apache.openjpa.persistence.jd
     @NamedQuery(name="findDeletedMessagesInMailboxBetweenUIDs",
             query="SELECT message.uid FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.uid BETWEEN :fromParam AND 
:toParam AND message.deleted=TRUE"),        
     @NamedQuery(name="findDeletedMessagesInMailboxWithUID",
-            query="SELECT message.uid FROM Message message WHERE 
membership.mailbox.mailboxId = :idParam AND message.uid=:uidParam AND 
message.deleted=TRUE"),                    
+            query="SELECT message.uid FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.uid=:uidParam AND 
message.deleted=TRUE"),                    
     @NamedQuery(name="findDeletedMessagesInMailboxAfterUID",
             query="SELECT message.uid FROM Message message WHERE 
message.mailbox.mailboxId = :idParam AND message.uid>=:uidParam AND 
message.deleted=TRUE"),          
             



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to