Branch v1.2

.gitignore

@@ -11,6 +11,7 @@
 
 # Target
 target/
+target-eclipse/
 
 # Unused web-app files
 web-app/WEB-INF/
@@ -27,3 +28,5 @@ plugin.xml
 # Unused grails files
 grails-app/i18n/
 grails-app/conf/UrlMappings.groovy
+.classpath
+.project

AsynchronousMailGrailsPlugin.groovy

@@ -2,13 +2,18 @@ import grails.plugin.asyncmail.AsynchronousMailJob
 import grails.plugin.asyncmail.AsynchronousMailMessageBuilderFactory
 import grails.plugin.asyncmail.ExpiredMessagesCollectorJob
 import grails.plugin.mail.MailService
+import grails.plugins.quartz.*
 import grails.util.Environment
 import org.codehaus.groovy.grails.commons.spring.GrailsApplicationContext
+import org.quartz.Scheduler
+import org.quartz.TriggerKey
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 class AsynchronousMailGrailsPlugin {
-    def version = "1.0"
-    def grailsVersion = "2.0.0 > *"
-    def loadAfter = ['mail', 'quartz', 'hibernate']
+    def version = "1.2"
+    def grailsVersion = "2.3.1 > *"
+    def loadAfter = ['mail', 'quartz', 'hibernate', 'hibernate4', 'mongodb']
     def pluginExcludes = [
             "grails-app/conf/DataSource.groovy",
             "grails-app/i18n/**",
@@ -22,7 +27,7 @@ class AsynchronousMailGrailsPlugin {
     ]
 
     def author = "Vitalii Samolovskikh aka Kefir"
-    def authorEmail = "kefir@perm.ru"
+    def authorEmail = "kefirfromperm@gmail.com"
     def title = "Asynchronous Mail Plugin"
     def description = 'The plugin realises asynchronous mail sending. ' +
             'It stores messages in the DB and sends them asynchronously by the quartz job.'
@@ -32,6 +37,9 @@ class AsynchronousMailGrailsPlugin {
     def issueManagement = [system: 'JIRA', url: 'http://jira.grails.org/browse/GPASYNCHRONOUSMAIL']
     def scm = [url: 'https://github.com/kefirfromperm/grails-asynchronous-mail']
 
+    // The logger for the plugin class
+    private Logger log = LoggerFactory.getLogger('grails.plugin.asyncmail.AsynchronousMailJob')
+
     def doWithSpring = {
         loadAsyncMailConfig(application.config)
 
@@ -54,7 +62,7 @@ class AsynchronousMailGrailsPlugin {
         configureSendMail(application, applicationContext)
 
         // Starts jobs
-        startJobs(application)
+        startJobs(application, applicationContext)
     }
 
     def onChange = { event ->
@@ -63,13 +71,48 @@ class AsynchronousMailGrailsPlugin {
     }
 
     /**
-     * Start send job and messages collector
+     * Start the send job and the messages collector.
+     *
+     * If the plugin is used in cluster we have to remove old triggers.
      */
-    static startJobs(application) {
+    def startJobs(application, applicationContext) {
         def asyncMailConfig = application.config.asynchronous.mail
         if (!asyncMailConfig.disable) {
-            AsynchronousMailJob.schedule((Long) asyncMailConfig.send.repeat.interval)
-            ExpiredMessagesCollectorJob.schedule((Long) asyncMailConfig.expired.collector.repeat.interval)
+            JobManagerService jobManagerService = applicationContext.jobManagerService
+            Scheduler quartzScheduler = applicationContext.quartzScheduler
+
+            // Get our jobs
+            List<JobDescriptor> jobDescriptors = jobManagerService.getJobs("AsynchronousMail")
+
+            // Remove old triggers for the send job
+            log.debug("Removing old triggers for the AsynchronousMailJob")
+            JobDescriptor sjd = jobDescriptors.find { it.name == 'grails.plugin.asyncmail.AsynchronousMailJob' }
+            sjd?.triggerDescriptors?.each {TriggerDescriptor td ->
+                def triggerKey = new TriggerKey(td.name, td.group)
+                quartzScheduler.unscheduleJob(triggerKey)
+                log.debug("Removed the trigger ${triggerKey} for the AsynchronousMailJob")
+            }
+
+            // Schedule the send job
+            def sendInterval = (Long) asyncMailConfig.send.repeat.interval
+            log.debug("Scheduling the AsynchronousMailJob with repeat interval ${sendInterval}ms")
+            AsynchronousMailJob.schedule(sendInterval)
+            log.debug("Scheduled the AsynchronousMailJob with repeat interval ${sendInterval}ms")
+
+            // Remove old triggers for the collector job
+            log.debug("Removing old triggers for the ExpiredMessagesCollectorJob")
+            JobDescriptor cjd = jobDescriptors.find { it.name == 'grails.plugin.asyncmail.ExpiredMessagesCollectorJob' }
+            cjd?.triggerDescriptors?.each {TriggerDescriptor td ->
+                def triggerKey = new TriggerKey(td.name, td.group)
+                quartzScheduler.unscheduleJob(triggerKey)
+                log.debug("Removed the trigger ${triggerKey} for the ExpiredMessagesCollectorJob")
+            }
+
+            // Schedule the collector job
+            def collectInterval = (Long) asyncMailConfig.expired.collector.repeat.interval
+            log.debug("Scheduling the ExpiredMessagesCollectorJob with repeat interval ${collectInterval}ms")
+            ExpiredMessagesCollectorJob.schedule(collectInterval)
+            log.debug("Scheduled the ExpiredMessagesCollectorJob with repeat interval ${collectInterval}ms")
         }
     }
 

README.md

@@ -1,70 +1,78 @@
-The Grails Asynchronous Mail plug-in
+The Grails Asynchronous Mail plugin
 ====================================
 
 Description
 -----------
 
-The Grails Asynchronous Mail is a plugin for asynchronous sending of email messages. It stores email messages in the DB
-using Grails domain classes and sends them by a scheduled job. It allows to react to user's actions faster. If the SMTP
-server isn't available in time then the plugin can sends message after, when the server will be available.
+Grails Asynchronous Mail is a plugin for sending email messages asynchronously. It persists email messages to the database
+with Grails domain classes and sends them by a scheduled Quartz job. Mail is sent on a different thread, with the
+`sendAsynchronousMail` (or `sendMail`) method returning instantly, not waiting for the mail to be actually sent. If the SMTP
+server isn't available, or other errors occur, the plugin can be set to retry later.
 
-The plugin depends on [hibernate](http://www.grails.org/plugin/hibernate),
-[quartz](http://www.grails.org/plugin/quartz) and [mail](http://www.grails.org/plugin/mail) plugins.
+The plugin depends on the [quartz](http://www.grails.org/plugin/quartz) and [mail](http://www.grails.org/plugin/mail)
+plugins. You also need a persistence provider plugin: [hibernate](http://www.grails.org/plugin/hibernate),
+[hibernate4](http://www.grails.org/plugin/hibernate4) and [mongodb](http://www.grails.org/plugin/mongodb) are supported.
 
 Links
 -----
 
-The plugin page: <http://grails.org/plugin/asynchronous-mail>
-Repository (GitHub): <https://github.com/kefirfromperm/grails-asynchronous-mail>
-Issue tracker (Jira): <http://jira.grails.org/browse/GPASYNCHRONOUSMAIL>
+* The plugin main page: <http://grails.org/plugin/asynchronous-mail>
+* The VCS repository (GitHub): <https://github.com/kefirfromperm/grails-asynchronous-mail>
+* The issue tracker (Jira): <http://jira.grails.org/browse/GPASYNCHRONOUSMAIL>
+* The page at OpenHUB: <https://www.openhub.net/p/grails-asynchronous-mail>
 
 Installation
 ------------
 
-For start to use the plugin just add a dependency in the `BuildConfig.groovy`.
-
-    compile ":asynchronous-mail:1.0-RC6"
+To install, add the plugin to the plugins block of `BuildConfig.groovy`:
+```groovy
+compile ":asynchronous-mail:1.2"
+```
 
 Documentation
 -------------
 
-Full documentation is available on [the plugin page](http://grails.org/plugin/asynchronous-mail).
+Full documentation is available at [the plugin page](http://grails.org/plugin/asynchronous-mail).
+
+Also see the sample application at <https://github.com/kefirfromperm/grails-asynchronous-mail-sample>.
 
 Contribution
 ------------
 
-If you want to contribute the plugin just open a pull request to repository
+If you want to contribute to the plugin, open a pull request to the repository
 <https://github.com/kefirfromperm/grails-asynchronous-mail>.
 
-Unit tests are very very sweet things. They help us find bugs, modify code without new bugs. It's very interesting to
+Unit tests are very very sweet things. They help us find bugs, and modify code without adding new bugs. It's very interesting to
 see how they work. I like to see how they work. What is the better than unit tests? More unit tests!
 Unit tests are good!
 
-And comments... Comments are good also. They are not better than unit tests, but they are good, definitely. If you known
-Chinese or Arabic it is good. Seriously. It's awesome! But I don't known them. So write comments in English.
+And comments... Comments are good also. They are not better than unit tests, but they are definitely good. If you known
+Chinese or Arabic, that is good. Seriously. It's awesome! But I don't known them. So write comments in English.
 
 Logging
 -------
 
-For enable full plugin log add following lines to the configuration (`/grails-app/conf/Config.grovy`).
-
-    log4j = {
-        …
-        // Enable the Asynchronous Mail plugin logging
-        trace 'grails.app.jobs.grails.plugin.asyncmail', 'grails.app.services.grails.plugin.asyncmail'
-
-        // Enable the Quartz plugin logging
-        debug 'grails.plugins.quartz'
-        …
-    }
+To enable full logging for the plugin, add the following lines to `/grails-app/conf/Config.grovy`.
+```groovy
+log4j = {
+    ...
+    // Enable Asynchronous Mail plugin logging
+    trace 'grails.app.jobs.grails.plugin.asyncmail',
+          'grails.app.services.grails.plugin.asyncmail',
+          'grails.plugin.asyncmail'
+
+    // Enable Quartz plugin logging
+    debug 'grails.plugins.quartz'
+    ...
+}
+```
 
 Issue tracking
 --------------
 
-You can report about bugs on the [JIRA](http://jira.grails.org/browse/GPASYNCHRONOUSMAIL) or
+You can report bugs on [JIRA](http://jira.grails.org/browse/GPASYNCHRONOUSMAIL) or
 [GitHub](https://github.com/kefirfromperm/grails-asynchronous-mail/issues?state=open).
-You also can ask me by email [kefir@perm.ru](mailto:kefir@perm.ru).
-
-Please, enable logs and attach it to your issue.
+You also can ask me questions by email [kefirfromperm@gmail.com](mailto:kefirfromperm@gmail.com).
+Please, enable logs and attach them to your issue.
 
-Please, review this project on [Ohloh](https://www.ohloh.net/p/grails-asynchronous-mail).
+Please, review this project at [OpenHUB](https://www.openhub.net/p/grails-asynchronous-mail).

application.properties

@@ -1,4 +1,5 @@
-#Grails Metadata file
-#Sat Sep 28 14:29:26 YEKT 2013
-app.grails.version=2.0.0
-app.name=grails-asynchronous-mail
+#Grails Metadata file
+#Tue Nov 04 00:00:08 YEKT 2014
+app.grails.version=2.3.11
+app.name=grails-asynchronous-mail
+app.servlet.version=2.5

grails-app/conf/BuildConfig.groovy

@@ -23,21 +23,20 @@ grails.project.dependency.resolution = {
     }
 
     dependencies {
-        compile "org.codehaus.gpars:gpars:1.0.0"
-        compile "org.codehaus.jsr166-mirror:jsr166y:1.7.0"
+        compile "org.codehaus.gpars:gpars:1.2.1"
     }
 
     plugins {
-        runtime(":hibernate:2.0.0") {
+        test(":hibernate:3.6.10.16") {
             export = false
         }
 
-        compile(':mail:1.0.1'){
+        compile(':mail:1.0.7'){
             excludes 'spring-test'
         }
-        compile ':quartz:1.0.1'
+        compile ':quartz:1.0.2'
 
-        build(':release:2.1.0', ':rest-client-builder:1.0.3') {
+        build(':release:3.0.1', ':rest-client-builder:2.0.3') {
             export = false
         }
     }

grails-app/conf/DefaultAsynchronousMailConfig.groovy

@@ -8,4 +8,6 @@ asynchronous.mail.override=false
 asynchronous.mail.clear.after.sent=false
 asynchronous.mail.disable=false
 asynchronous.mail.useFlushOnSave=true
+asynchronous.mail.persistence.provider='hibernate'      // Possible values are 'hibernate', 'hibernate4', 'mongodb'
 asynchronous.mail.gparsPoolSize=1
+asynchronous.mail.newSessionOnImmediateSend=false