james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1229528 - in /james/server/trunk/queue-jms/src: main/java/org/apache/james/queue/jms/JMSMailQueue.java test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
Date Tue, 10 Jan 2012 13:25:49 GMT
Author: eric
Date: Tue Jan 10 13:25:49 2012
New Revision: 1229528

URL: http://svn.apache.org/viewvc?rev=1229528&view=rev
Log:
Fix latest bugs introduced by JAMES-1360

Modified:
    james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
    james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java

Modified: james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java?rev=1229528&r1=1229527&r2=1229528&view=diff
==============================================================================
--- james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
(original)
+++ james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java
Tue Jan 10 13:25:49 2012
@@ -305,7 +305,7 @@ public class JMSMailQueue implements Man
 
         StringBuilder recipientsBuilder = new StringBuilder();
 
-        Iterator<org.apache.james.protocols.smtp.MailAddress> recipients = mail.getRecipients().iterator();
+        Iterator<MailAddress> recipients = mail.getRecipients().iterator();
         while (recipients.hasNext()) {
             String recipient = recipients.next().toString();
             recipientsBuilder.append(recipient.trim());

Modified: james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java?rev=1229528&r1=1229527&r2=1229528&view=diff
==============================================================================
--- james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
(original)
+++ james/server/trunk/queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java
Tue Jan 10 13:25:49 2012
@@ -39,13 +39,12 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.james.core.MailImpl;
-import org.apache.james.protocols.smtp.MailAddress;
 import org.apache.james.protocols.smtp.MailAddressException;
 import org.apache.james.queue.api.MailQueue.MailQueueItem;
 import org.apache.james.queue.api.ManageableMailQueue;
 import org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator;
-import org.apache.james.smtpserver.model.MailetMailAddressAdapter;
 import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -245,10 +244,10 @@ public class JMSMailQueueTest extends Te
         assertEquals(0, queue.getSize());
 
         MailImpl mail = createMail();
-        mail.setSender(new MailetMailAddressAdapter(new MailAddress("remove@me1")));
+        mail.setSender(new MailAddress("remove@me1"));
 
         MailImpl mail2 = createMail();
-        mail2.setSender(new MailetMailAddressAdapter(new MailAddress("remove@me2")));
+        mail2.setSender(new MailAddress("remove@me2"));
 
         queue.enQueue(mail);
         queue.enQueue(mail2);
@@ -298,7 +297,7 @@ public class JMSMailQueueTest extends Te
         mail.setErrorMessage(UUID.randomUUID().toString());
         mail.setLastUpdated(new Date());
         mail.setRecipients(Arrays.asList(new MailAddress("test@test"), new MailAddress("test@test2")));
-        mail.setSender(new MailetMailAddressAdapter(new MailAddress("sender@senderdomain")));
+        mail.setSender(new MailAddress("sender@senderdomain"));
 
         MimeMessage message = new MimeMessage(Session.getInstance(new Properties()));
         message.setText("test");



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message