JAMES-2368 JPA should allow registration of optional SpamAssassin listener

Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fdc3795e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fdc3795e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fdc3795e

Branch: refs/heads/master
Commit: fdc3795e82ef7c408a0a0f1c41df84eb2b2024d4
Parents: 1094bf9
Author: benwa <btell...@linagora.com>
Authored: Wed May 2 12:27:34 2018 +0700
Committer: benwa <btell...@linagora.com>
Committed: Fri May 4 13:39:07 2018 +0700

----------------------------------------------------------------------
 server/container/guice/jpa-guice/pom.xml                         | 4 ++++
 .../src/main/java/org/apache/james/JPAJamesServerMain.java       | 4 +++-
 src/site/xdoc/server/config-listeners.xml                        | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc3795e/server/container/guice/jpa-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/pom.xml 
b/server/container/guice/jpa-guice/pom.xml
index 82fbebf..6e1f5f5 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -89,6 +89,10 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            
<artifactId>james-server-guice-mailbox-plugin-spamassassin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>james-server-guice-managedsieve</artifactId>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc3795e/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
----------------------------------------------------------------------
diff --git 
a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
 
b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
index fbf4d13..5709c52 100644
--- 
a/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
+++ 
b/server/container/guice/jpa-guice/src/main/java/org/apache/james/JPAJamesServerMain.java
@@ -43,6 +43,7 @@ import org.apache.james.modules.server.NoJwtModule;
 import org.apache.james.modules.server.RawPostDequeueDecoratorModule;
 import org.apache.james.modules.server.SwaggerRoutesModule;
 import org.apache.james.modules.server.WebAdminServerModule;
+import org.apache.james.modules.spamassassin.SpamAssassinListenerModule;
 
 import com.google.inject.Module;
 import com.google.inject.util.Modules;
@@ -76,7 +77,8 @@ public class JPAJamesServerMain {
         new NoJwtModule(),
         new RawPostDequeueDecoratorModule(),
         new SieveFileRepositoryModule(),
-        new DefaultEventModule());
+        new DefaultEventModule(),
+        new SpamAssassinListenerModule());
 
     public static void main(String[] args) throws Exception {
         GuiceJamesServer server = new GuiceJamesServer()

http://git-wip-us.apache.org/repos/asf/james-project/blob/fdc3795e/src/site/xdoc/server/config-listeners.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/config-listeners.xml 
b/src/site/xdoc/server/config-listeners.xml
index 41bfece..9ecea73 100644
--- a/src/site/xdoc/server/config-listeners.xml
+++ b/src/site/xdoc/server/config-listeners.xml
@@ -42,11 +42,11 @@
                part of James source code, or provided as an extension and thus 
should be located in the<code>extensions-jars</code> folder.</p>
 
             <ul>
-                Already provided listeners includes:
+                Already provided additional listeners includes:
 
                  
<li><code>org.apache.james.mailbox.spamassassin.SpamAssassinListener</code>:
                      Provides per user real-time HAM/SPAM feedback to a 
SpamAssassin server depending on user actions.
-                     For now it is only available on top of Cassandra-Guice 
wiring.</li>
+                     Please note that a <code>spamassassin.properties</code> 
file is needed.</li>
                  
<li><code>org.apache.james.mailbox.cassandra.MailboxOperationLoggingListener</code>:
                      For Cassandra guice wiring. Provides more insights on 
mailbox operations</li>
             </ul>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to