[jboss-cvs] JBossAS SVN: r73608 - trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2008-05-22 22:19:25 -0400 (Thu, 22 May 2008)
New Revision: 73608

Modified:
   trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow/MailActivationSpec.java
   trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow/MailFolder.java
Log:
[JBAS-4810] mail-ra.rar make ssl configurable, apply Kurt Stam's patch

Modified: trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow/MailActivationSpec.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow/MailActivationSpec.java	2008-05-23 02:06:15 UTC (rev 73607)
+++ trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow/MailActivationSpec.java	2008-05-23 02:19:25 UTC (rev 73608)
@@ -60,6 +60,8 @@
    private boolean debug;
    /** flush - for pop3 flush the mailbox after checking */
    private boolean flush = true;
+   /** starttls - ssl */
+   private boolean starttls;
    private int port;
 
    public String getMailServer()
@@ -154,16 +156,26 @@
 	this.port = port;
    }
    
+   public void setStarttls(boolean starttls) 
+   {
+	  this.starttls = starttls;
+   }
+   
+   public boolean isStarttls() 
+   {
+	  return starttls;
+   }
+
    public void setFlush(boolean flush) 
    {
-	this.flush = flush;
+    this.flush = flush;
    }
    
    public boolean isFlush() 
    {
-	return flush;
+    return flush;
    }
-
+   
    public ResourceAdapter getResourceAdapter()
    {
       return ra;
@@ -198,6 +210,8 @@
       tmp.append(maxMessages);
       tmp.append(", debug=");
       tmp.append(debug);
+      tmp.append(", starttls=");
+      tmp.append(starttls);
       tmp.append(")");
       return tmp.toString();
    }

Modified: trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow/MailFolder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow/MailFolder.java	2008-05-23 02:06:15 UTC (rev 73607)
+++ trunk/connector/src/main/org/jboss/resource/adapter/mail/inflow/MailFolder.java	2008-05-23 02:19:25 UTC (rev 73608)
@@ -48,6 +48,7 @@
    private String password;
    private int port;
    private boolean debug;
+   private boolean starttls;
    private Properties sessionProps;
    
    private Message[] msgs = {};
@@ -60,15 +61,16 @@
       userName = spec.getUserName();
       password = spec.getPassword();
       debug = spec.isDebug();
+      starttls = spec.isStarttls();
       port = spec.getPort();
 
       sessionProps = new Properties();
       sessionProps.setProperty("mail.transport.protocol", "smtp");
       sessionProps.setProperty("mail.smtp.host", mailServer);
-      sessionProps.setProperty("mail.debug", spec.isDebug() + "");
+      sessionProps.setProperty("mail.debug", debug + "");
       
       // JavaMail doesn't implement POP3 STARTTLS
-      sessionProps.setProperty("mail.imap.starttls.enable", "true");
+      sessionProps.setProperty("mail.imap.starttls.enable", starttls + "");
    }      
 
    public void open()