Changeset 1667

Timestamp:

Mar 23, 2011, 1:11:48 PM (9 years ago)

Author:

work@…

Message:

• tried to resolve #342 but cannot fix the issue due to the mail plugin not using the configuration properly... perhaps we need to bugfix the plugin itself instead...

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/conf/BootStrap.groovy (modified) (4 diffs)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Wed Mar 23 11:23:21 CET 2011
+#Wed Mar 23 12:26:24 CET 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -18 +18 @@
 plugins.jquery=1.4.4.1
 plugins.jumpbar=0.1.4
-plugins.mail=0.9
+plugins.mail=1.0-SNAPSHOT
 plugins.oauth=0.10
 plugins.spring-security-core=1.1.1

trunk/grails-app/conf/BootStrap.groovy

@@ -7 +7 @@
 import dbnp.studycapturing.Sample
 import dbnp.rest.common.CommunicationManager
-import org.codehaus.groovy.grails.commons.*
 import dbnp.configuration.*
-
 
 /**
@@ -28 +26 @@
         def dataSource
 
+        // inject the grails application
+        def grailsApplication
+
         def init = { servletContext ->
                 // Grom a development message
@@ -33 +34 @@
 
                 // get configuration
-                def config = ConfigurationHolder.config
+                def config = grailsApplication.config
 
                 // set the mail configuration properties in runtime, as
@@ -39 +40 @@
                 // fact for the mail properties a map is used
                 if (config.grails.mail.username && config.grails.mail.password) {
-                        // use TLS
-                        config.grails.mail.port = 465
-                        config.grails.mail.props= [
-                                "mail.smtp.auth": "true",
-                                "mail.smtp.socketFactory.port": '465',
-                                "mail.smtp.socketFactory.class": "javax.net.ssl.SSLSocketFactory",
-                                "mail.smtp.socketFactory.fallback": "false"
-                        ]
+                        if (config.grails.mail.host =~ 'live.com') {
+                                // use microsoft hotmail
+                                config.grails.mail.port = 587
+                                config.grails.mail.props = [
+                                        "mail.smtp.starttls.enable"     : "true",
+                                        "mail.smtp.port"                        : "587"
+                                ]
+                        } else {
+                                // assume gmail
+                                config.grails.mail.port = 465
+                                config.grails.mail.props= [
+                                        "mail.smtp.auth"                                        : "true",
+                                        "mail.smtp.socketFactory.port"          : '465',
+                                        "mail.smtp.socketFactory.class"         : "javax.net.ssl.SSLSocketFactory",
+                                        "mail.smtp.socketFactory.fallback"      : "false"
+                                ]
+                        }
                 }