From f3f21bbf73618a21b8976c7d953f400effcb50e9 Mon Sep 17 00:00:00 2001
From: Benjamin Gamard <b.gamard@sismics.com>
Date: Sun, 4 Mar 2018 16:43:40 +0100
Subject: [PATCH] inbox service: fix javax.mail duplicate jar with jetty

---
 Dockerfile                                                     | 3 +++
 .../main/java/com/sismics/docs/core/service/InboxService.java  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 988f63a3..6006c6d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,5 +8,8 @@ RUN apt-get update && apt-get -y -q install ffmpeg mediainfo tesseract-ocr tesse
 ENV TESSDATA_PREFIX /usr/share/tesseract-ocr
 ENV LC_NUMERIC C
 
+# Remove the embedded javax.mail jar from Jetty
+RUN rm -f /opt/jetty/lib/jndi/javax.mail.glassfish-*.jar
+
 ADD docs.xml /opt/jetty/webapps/docs.xml
 ADD docs-web/target/docs-web-*.war /opt/jetty/webapps/docs.war
diff --git a/docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java b/docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java
index 2f2ed03c..8005494b 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/service/InboxService.java
@@ -46,10 +46,12 @@ public class InboxService extends AbstractScheduledService {
 
     @Override
     protected void startUp() {
+        log.info("Inbox service starting up");
     }
 
     @Override
     protected void shutDown() {
+        log.info("Inbox service shutting down");
     }
     
     @Override