Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 81218 invoked from network); 2 May 2006 09:35:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 May 2006 09:35:19 -0000 Received: (qmail 214 invoked by uid 500); 2 May 2006 09:35:03 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 150 invoked by uid 500); 2 May 2006 09:35:03 -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 139 invoked by uid 99); 2 May 2006 09:35:02 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 May 2006 02:35:02 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 02 May 2006 02:35:02 -0700 Received: (qmail 80333 invoked by uid 65534); 2 May 2006 09:34:33 -0000 Message-ID: <20060502093433.80219.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r398879 - in /geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail: NNTPGBeanConstants.java NNTPStoreGBean.java Date: Tue, 02 May 2006 09:34:13 -0000 To: scm@geronimo.apache.org From: rickmcguire@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: rickmcguire Date: Tue May 2 02:33:47 2006 New Revision: 398879 URL: http://svn.apache.org/viewcvs?rev=398879&view=rev Log: GERONIMO-1965 Fix GBean to configure proper protocol mail properties. Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPGBeanConstants.java geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPStoreGBean.java Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPGBeanConstants.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPGBeanConstants.java?rev=398879&r1=398878&r2=398879&view=diff ============================================================================== --- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPGBeanConstants.java (original) +++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPGBeanConstants.java Tue May 2 02:33:47 2006 @@ -35,5 +35,16 @@ static public final String NNTP_FACTORY_CLASS = "mail.nntp.socketFactory.class"; static public final String NNTP_FACTORY_FALLBACK = "mail.nntp.socketFactory.fallback"; static public final String NNTP_FACTORY_PORT = "mail.nntp.socketFactory.port"; + + static public final String NNTPS_PORT = "mail.nntp.port"; + static public final String NNTPS_CONNECTION_TIMEOUT = "mail.nntp.connectiontimeout"; + static public final String NNTPS_TIMEOUT = "mail.nntp.timeout"; + static public final String NNTPS_FROM = "mail.nntp.from"; + static public final String NNTPS_AUTH = "mail.nntp.auth"; + static public final String NNTPS_REALM = "mail.nntp.sasl.realm"; + static public final String NNTPS_QUITWAIT = "mail.nntp.quitwait"; + static public final String NNTPS_FACTORY_CLASS = "mail.nntp.socketFactory.class"; + static public final String NNTPS_FACTORY_FALLBACK = "mail.nntp.socketFactory.fallback"; + static public final String NNTPS_FACTORY_PORT = "mail.nntp.socketFactory.port"; } Modified: geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPStoreGBean.java URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPStoreGBean.java?rev=398879&r1=398878&r2=398879&view=diff ============================================================================== --- geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPStoreGBean.java (original) +++ geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail/NNTPStoreGBean.java Tue May 2 02:33:47 2006 @@ -319,15 +319,15 @@ public void addOverrides(Properties props) { super.addOverrides(props); - if (port != null) props.put(NNTP_PORT, port); - if (connectionTimeout != null) props.put(NNTP_CONNECTION_TIMEOUT, connectionTimeout); - if (timeout != null) props.put(NNTP_TIMEOUT, timeout); - if (auth != null) props.put(NNTP_AUTH, auth); - if (saslRealm != null) props.put(NNTP_REALM, saslRealm); - if (quitWait != null) props.put(NNTP_QUITWAIT, quitWait); - if (socketFactoryClass != null) props.put(NNTP_FACTORY_CLASS, socketFactoryClass); - if (socketFactoryFallback != null) props.put(NNTP_FACTORY_FALLBACK, socketFactoryFallback); - if (socketFactoryPort != null) props.put(NNTP_FACTORY_PORT, socketFactoryPort); + if (port != null) props.put(NNTPS_PORT, port); + if (connectionTimeout != null) props.put(NNTPS_CONNECTION_TIMEOUT, connectionTimeout); + if (timeout != null) props.put(NNTPS_TIMEOUT, timeout); + if (auth != null) props.put(NNTPS_AUTH, auth); + if (saslRealm != null) props.put(NNTPS_REALM, saslRealm); + if (quitWait != null) props.put(NNTPS_QUITWAIT, quitWait); + if (socketFactoryClass != null) props.put(NNTPS_FACTORY_CLASS, socketFactoryClass); + if (socketFactoryFallback != null) props.put(NNTPS_FACTORY_FALLBACK, socketFactoryFallback); + if (socketFactoryPort != null) props.put(NNTPS_FACTORY_PORT, socketFactoryPort); } public void doStart() throws Exception {