svn commit: r398879 - in /geronimo/trunk/modules/mail/src/java/org/apache/geronimo/mail: NNTPGBeanConstants.java NNTPStoreGBean.java

[ri...@apache.org]

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 {