[jbpm-commits] JBoss JBPM SVN: r4506 - in jbpm4/branches/email/modules/pvm/src: main/java/org/jbpm/pvm/internal/wire/binding and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Apr 9 01:28:08 EDT 2009


Author: alex.guizar at jboss.com
Date: 2009-04-09 01:28:08 -0400 (Thu, 09 Apr 2009)
New Revision: 4506

Added:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java
Removed:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/SyncMailSession.java
Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java
   jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java
Log:
rename SyncMailSession to MailSessionImpl as no other implementation seems to be necessary

Copied: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java (from rev 4505, jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/SyncMailSession.java)
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java	                        (rev 0)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailSessionImpl.java	2009-04-09 05:28:08 UTC (rev 4506)
@@ -0,0 +1,65 @@
+package org.jbpm.pvm.internal.email.impl;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.mail.Session;
+import javax.mail.internet.InternetAddress;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.mail.Email;
+import org.apache.commons.mail.EmailException;
+import org.jbpm.pvm.internal.email.spi.MailSession;
+
+public class MailSessionImpl implements MailSession {
+
+  private List<MailServer> mailServers;
+
+  private static final Log log = LogFactory.getLog(MailSessionImpl.class);
+
+  public void send(Collection<Email> emails) {
+    // Emails need to have the sessions populated.
+    for (Email email : emails) {
+      Collection<InternetAddress> to = email.getToAddresses();
+      Collection<InternetAddress> cc = email.getCcAddresses();
+      Collection<InternetAddress> bcc = email.getBccAddresses();
+
+      for (MailServer mailServer : mailServers) {
+        AddressFilter addressFilter = mailServer.getAddressFilter();
+        Session mailSession = mailServer.createMailSession();
+        email.setMailSession(mailSession);
+
+        // Need to apply filter.
+        try {
+          Collection<InternetAddress> toFiltered = addressFilter.filter(to);
+          Collection<InternetAddress> ccFiltered = addressFilter.filter(cc);
+          Collection<InternetAddress> bccFiltered = addressFilter.filter(bcc);
+
+          // Set the email with the new filtered addresses.
+          email.setTo(toFiltered);
+          email.setCc(ccFiltered);
+          email.setBcc(bccFiltered);
+
+          // If there is someone to send it to, then send it.
+          if (!(toFiltered.isEmpty() && ccFiltered.isEmpty() && bccFiltered.isEmpty())) {
+            email.send();
+          }
+        }
+        catch (EmailException e) {
+          log.error("An exception occurred while sending email.", e);
+          // TODO: Does anything else need to occur here?
+        }
+      }
+    }
+  }
+
+  public List<MailServer> getMailServers() {
+    return mailServers;
+  }
+
+  protected void setMailServers(List<MailServer> mailServers) {
+    this.mailServers = mailServers;
+  }
+
+}

Deleted: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/SyncMailSession.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/SyncMailSession.java	2009-04-09 05:23:54 UTC (rev 4505)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/SyncMailSession.java	2009-04-09 05:28:08 UTC (rev 4506)
@@ -1,65 +0,0 @@
-package org.jbpm.pvm.internal.email.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.mail.Email;
-import org.apache.commons.mail.EmailException;
-import org.jbpm.pvm.internal.email.spi.MailSession;
-
-public class SyncMailSession implements MailSession {
-
-  private List<MailServer> mailServers;
-
-  private static final Log log = LogFactory.getLog(SyncMailSession.class);
-
-  public void send(Collection<Email> emails) {
-    // Emails need to have the sessions populated.
-    for (Email email : emails) {
-      Collection<InternetAddress> to = email.getToAddresses();
-      Collection<InternetAddress> cc = email.getCcAddresses();
-      Collection<InternetAddress> bcc = email.getBccAddresses();
-
-      for (MailServer mailServer : mailServers) {
-        AddressFilter addressFilter = mailServer.getAddressFilter();
-        Session mailSession = mailServer.createMailSession();
-        email.setMailSession(mailSession);
-
-        // Need to apply filter.
-        try {
-          Collection<InternetAddress> toFiltered = addressFilter.filter(to);
-          Collection<InternetAddress> ccFiltered = addressFilter.filter(cc);
-          Collection<InternetAddress> bccFiltered = addressFilter.filter(bcc);
-
-          // Set the email with the new filtered addresses.
-          email.setTo(toFiltered);
-          email.setCc(ccFiltered);
-          email.setBcc(bccFiltered);
-
-          // If there is someone to send it to, then send it.
-          if (!(toFiltered.isEmpty() && ccFiltered.isEmpty() && bccFiltered.isEmpty())) {
-            email.send();
-          }
-        }
-        catch (EmailException e) {
-          log.error("An exception occurred while sending email.", e);
-          // TODO: Does anything else need to occur here?
-        }
-      }
-    }
-  }
-
-  public List<MailServer> getMailServers() {
-    return mailServers;
-  }
-
-  protected void setMailServers(List<MailServer> mailServers) {
-    this.mailServers = mailServers;
-  }
-
-}

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java	2009-04-09 05:23:54 UTC (rev 4505)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailSessionBinding.java	2009-04-09 05:28:08 UTC (rev 4506)
@@ -25,7 +25,7 @@
 import java.util.List;
 
 import org.jbpm.pvm.internal.email.impl.MailServer;
-import org.jbpm.pvm.internal.email.impl.SyncMailSession;
+import org.jbpm.pvm.internal.email.impl.MailSessionImpl;
 import org.jbpm.pvm.internal.email.impl.AddressFilter;
 import org.jbpm.pvm.internal.email.spi.MailSession;
 import org.jbpm.pvm.internal.util.XmlUtil;
@@ -111,7 +111,7 @@
     serversDescriptor.setValueDescriptors(serverDescriptors);
 
     // mail session
-    ObjectDescriptor sessionDescriptor = new ObjectDescriptor(SyncMailSession.class);
+    ObjectDescriptor sessionDescriptor = new ObjectDescriptor(MailSessionImpl.class);
     sessionDescriptor.addInjection("mailServers", serversDescriptor);
     return sessionDescriptor;
   }

Modified: jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java	2009-04-09 05:23:54 UTC (rev 4505)
+++ jbpm4/branches/email/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailSessionWireTest.java	2009-04-09 05:28:08 UTC (rev 4506)
@@ -30,9 +30,8 @@
 
 import org.jbpm.JbpmException;
 import org.jbpm.pvm.internal.email.impl.MailServer;
-import org.jbpm.pvm.internal.email.impl.SyncMailSession;
+import org.jbpm.pvm.internal.email.impl.MailSessionImpl;
 import org.jbpm.pvm.internal.email.impl.AddressFilter;
-import org.jbpm.pvm.internal.email.spi.MailSession;
 
 /**
  * @author Alejandro Guizar
@@ -53,11 +52,8 @@
           + "  </mail-session>"
           + "</objects>");
 
-    MailSession mailSession = wireContext.get(MailSession.class);
-    assertTrue("expected sync mail session", mailSession instanceof SyncMailSession);
-
-    SyncMailSession syncMailSession = (SyncMailSession) mailSession;
-    List<MailServer> mailServers = syncMailSession.getMailServers();
+    MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+    List<MailServer> mailServers = mailSession.getMailServers();
     assertEquals(1, mailServers.size());
 
     MailServer mailServer = mailServers.get(0);
@@ -68,6 +64,20 @@
     assertEquals("noreply at jbpm.org", properties.getProperty("mail.from"));
   }
 
+  public void testNoSessionProperties() {
+    try {
+      createWireContext("<objects>"
+        + "  <mail-session>"
+        + "    <mail-server />"
+        + "  </mail-session>"
+        + "</objects>");
+      fail("expected wire context creation to puke");
+    }
+    catch (JbpmException e) {
+      // session properties are mandatory
+    }
+  }
+
   public static class MyAuthenticator extends Authenticator {
     @Override
     protected PasswordAuthentication getPasswordAuthentication() {
@@ -87,31 +97,15 @@
           "    </mail-server>" +
           "  </mail-session>" +
           "</objects>");
-    MailSession mailSession = wireContext.get(MailSession.class);
-    assertTrue("expected sync mail session", mailSession instanceof SyncMailSession);
 
-    SyncMailSession syncMailSession = (SyncMailSession) mailSession;
-    List<MailServer> mailServers = syncMailSession.getMailServers();
+    MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+    List<MailServer> mailServers = mailSession.getMailServers();
     assertEquals(1, mailServers.size());
 
     MailServer mailServer = mailServers.get(0);
     assertSame(MyAuthenticator.class, mailServer.getAuthenticator().getClass());
   }
 
-  public void testNoSessionProperties() {
-    try {
-      createWireContext("<objects>"
-        + "  <mail-session>"
-        + "    <mail-server />"
-        + "  </mail-session>"
-        + "</objects>");
-      fail("expected wire context creation to puke");
-    }
-    catch (JbpmException e) {
-      // session properties are mandatory
-    }
-  }
-
   public void testAddressFilter() {
     WireContext wireContext =
         createWireContext("<objects>"
@@ -126,11 +120,9 @@
           + "    </mail-server>"
           + "  </mail-session>"
           + "</objects>");
-    MailSession mailSession = wireContext.get(MailSession.class);
-    assertTrue("expected sync mail session", mailSession instanceof SyncMailSession);
 
-    SyncMailSession syncMailSession = (SyncMailSession) mailSession;
-    List<MailServer> mailServers = syncMailSession.getMailServers();
+    MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+    List<MailServer> mailServers = mailSession.getMailServers();
     assertEquals(1, mailServers.size());
 
     MailServer mailServer = mailServers.get(0);
@@ -157,11 +149,9 @@
           + "    </mail-server>"
           + "  </mail-session>"
           + "</objects>");
-    MailSession mailSession = wireContext.get(MailSession.class);
-    assertTrue("expected sync mail session", mailSession instanceof SyncMailSession);
 
-    SyncMailSession syncMailSession = (SyncMailSession) mailSession;
-    List<MailServer> mailServers = syncMailSession.getMailServers();
+    MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+    List<MailServer> mailServers = mailSession.getMailServers();
     assertEquals(1, mailServers.size());
 
     MailServer mailServer = mailServers.get(0);
@@ -184,11 +174,9 @@
           + "    </mail-server>"
           + "  </mail-session>"
           + "</objects>");
-    MailSession mailSession = wireContext.get(MailSession.class);
-    assertTrue("expected sync mail session", mailSession instanceof SyncMailSession);
 
-    SyncMailSession syncMailSession = (SyncMailSession) mailSession;
-    List<MailServer> mailServers = syncMailSession.getMailServers();
+    MailSessionImpl mailSession = wireContext.get(MailSessionImpl.class);
+    List<MailServer> mailServers = mailSession.getMailServers();
     assertEquals(3, mailServers.size());
   }
 }




More information about the jbpm-commits mailing list