Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 3738 invoked from network); 13 Nov 2007 15:29:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Nov 2007 15:29:35 -0000 Received: (qmail 55367 invoked by uid 500); 13 Nov 2007 15:29:18 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 55330 invoked by uid 500); 13 Nov 2007 15:29:18 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 55297 invoked by uid 99); 13 Nov 2007 15:29:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2007 07:29:17 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Nov 2007 15:29:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 838FF1A9832; Tue, 13 Nov 2007 07:28:53 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r594563 - in /geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail: IMAPStoreGBean.java SMTPSTransportGBean.java Date: Tue, 13 Nov 2007 15:28:53 -0000 To: scm@geronimo.apache.org From: rickmcguire@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071113152853.838FF1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickmcguire Date: Tue Nov 13 07:28:52 2007 New Revision: 594563 URL: http://svn.apache.org/viewvc?rev=594563&view=rev Log: GERONIMO-3601 - The SMTPS mail GBean is configuring the SMTP properties, not SMTPS Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java?rev=594563&r1=594562&r2=594563&view=diff ============================================================================== --- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java (original) +++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/IMAPStoreGBean.java Tue Nov 13 07:28:52 2007 @@ -55,7 +55,7 @@ static public final String IMAP_POOL_SIZE = "mail.imap.connectionpoolsize"; static public final String IMAP_POOL_TIMEOUT = "mail.imap.connectionpooltimeout"; static public final String IMAP_SEPARATE_STORE_CONNECTION = "mail.imap.separatestoreconnection"; - static public final String IMAP_READONLY_SELECT = "mail.imap.alloreadonlyselect"; + static public final String IMAP_READONLY_SELECT = "mail.imap.allreadonlyselect"; static public final String IMAP_LOGIN_DISABLE = "mail.imap.auth.login.disable"; static public final String IMAP_PLAIN_DISABLE = "mail.imap.auth.plain.disable"; static public final String IMAP_STARTTLS_ENABLE = "mail.imap.auth.starttls.enable"; Modified: geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java?rev=594563&r1=594562&r2=594563&view=diff ============================================================================== --- geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java (original) +++ geronimo/server/trunk/plugins/javamail/geronimo-mail/src/main/java/org/apache/geronimo/mail/SMTPSTransportGBean.java Tue Nov 13 07:28:52 2007 @@ -39,28 +39,28 @@ public class SMTPSTransportGBean extends ProtocolGBean { // the SMTPS configuration property names - static public final String SMTPS_PORT = "mail.smtp.port"; - static public final String SMTPS_CONNECTION_TIMEOUT = "mail.smtp.connectiontimeout"; - static public final String SMTPS_TIMEOUT = "mail.smtp.timeout"; - static public final String SMTPS_FROM = "mail.smtp.from"; - static public final String SMTPS_AUTH = "mail.smtp.auth"; - static public final String SMTPS_REALM = "mail.smtp.sasl.realm"; - static public final String SMTPS_QUITWAIT = "mail.smtp.quitwait"; - static public final String SMTPS_FACTORY_CLASS = "mail.smtp.socketFactory.class"; - static public final String SMTPS_FACTORY_FALLBACK = "mail.smtp.socketFactory.fallback"; - static public final String SMTPS_FACTORY_PORT = "mail.smtp.socketFactory.port"; - static public final String SMTPS_LOCALHOST = "mail.smtp.localhost"; - static public final String SMTPS_LOCALADDRESS = "mail.smtp.localaddress"; - static public final String SMTPS_LOCALPORT = "mail.smtp.localport"; - static public final String SMTPS_EHLO = "mail.smtp.ehlo"; - static public final String SMTPS_SUBMITTER = "mail.smtp.submitter"; - static public final String SMTPS_DSN_NOTIFY = "mail.smtp.dsn.notify"; - static public final String SMTPS_DSN_RET = "mail.smtp.dsn.ret"; - static public final String SMTPS_8BITMIME = "mail.smtp.allow8bitmime"; - static public final String SMTPS_SEND_PARTIAL = "mail.smtp.sendpartial"; - static public final String SMTPS_REPORT_SUCCESS = "mail.smtp.reportsuccess"; - static public final String SMTPS_MAIL_EXTENSION = "mail.smtp.mailextension"; - static public final String SMTPS_STARTTLS_ENABLE = "mail.smtp.starttls.enable"; + static public final String SMTPS_PORT = "mail.smtps.port"; + static public final String SMTPS_CONNECTION_TIMEOUT = "mail.smtps.connectiontimeout"; + static public final String SMTPS_TIMEOUT = "mail.smtps.timeout"; + static public final String SMTPS_FROM = "mail.smtps.from"; + static public final String SMTPS_AUTH = "mail.smtps.auth"; + static public final String SMTPS_REALM = "mail.smtps.sasl.realm"; + static public final String SMTPS_QUITWAIT = "mail.smtps.quitwait"; + static public final String SMTPS_FACTORY_CLASS = "mail.smtps.socketFactory.class"; + static public final String SMTPS_FACTORY_FALLBACK = "mail.smtps.socketFactory.fallback"; + static public final String SMTPS_FACTORY_PORT = "mail.smtps.socketFactory.port"; + static public final String SMTPS_LOCALHOST = "mail.smtps.localhost"; + static public final String SMTPS_LOCALADDRESS = "mail.smtps.localaddress"; + static public final String SMTPS_LOCALPORT = "mail.smtps.localport"; + static public final String SMTPS_EHLO = "mail.smtps.ehlo"; + static public final String SMTPS_SUBMITTER = "mail.smtps.submitter"; + static public final String SMTPS_DSN_NOTIFY = "mail.smtps.dsn.notify"; + static public final String SMTPS_DSN_RET = "mail.smtps.dsn.ret"; + static public final String SMTPS_8BITMIME = "mail.smtps.allow8bitmime"; + static public final String SMTPS_SEND_PARTIAL = "mail.smtps.sendpartial"; + static public final String SMTPS_REPORT_SUCCESS = "mail.smtps.reportsuccess"; + static public final String SMTPS_MAIL_EXTENSION = "mail.smtps.mailextension"; + static public final String SMTPS_STARTTLS_ENABLE = "mail.smtps.starttls.enable"; static public final String GBEAN_EHLO = "ehlo"; static public final String GBEAN_SUBMITTER = "submitter"; @@ -262,7 +262,7 @@ *

* Email address to use for SMTP MAIL command. This sets the envelope * return address. Defaults to msg.getFrom() or InternetAddress.getLocalAddress(). - * NOTE: mail.smtp.user was previously used for this. + * NOTE: mail.smtps.user was previously used for this. *

* Values that are set here will override any of the corresponding value * that has been set in the properties.