From bf1c8b3fbf64a2b67b8f4e308741992ee4631b46 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 1 Mar 2019 12:22:17 +0100
Subject: [PATCH] Switch MifosX to Tomcat 8.5

---
 mifosx/install.sh                         |  4 +--
 mifosx/install/srv/mifosx/conf/server.xml | 41 ++++++++++++++++++-----
 mifosx/lxcfile                            |  6 ++--
 mifosx/meta                               |  2 +-
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/mifosx/install.sh b/mifosx/install.sh
index 54e902c..4914bb7 100755
--- a/mifosx/install.sh
+++ b/mifosx/install.sh
@@ -30,9 +30,9 @@ until grep -q 'org.apache.catalina.startup.Catalina.start Server startup' /var/l
     sleep 1
 done
 lxc-stop mifosx
+
 # Fix missing previous_run_status column
-# TODO: Remove?
-#echo 'ALTER TABLE `scheduled_email_campaign` ADD `previous_run_status` VARCHAR(10) NULL;' | lxc-attach mariadb -- mysql mifostenant-default
+echo 'ALTER TABLE `scheduled_email_campaign` ADD `previous_run_status` VARCHAR(10) NULL;' | lxc-attach mariadb -- mysql mifostenant-default
 
 # Update admin account
 export MIFOSX_ADMIN_USER=admin
diff --git a/mifosx/install/srv/mifosx/conf/server.xml b/mifosx/install/srv/mifosx/conf/server.xml
index 33e851e..9be45e6 100644
--- a/mifosx/install/srv/mifosx/conf/server.xml
+++ b/mifosx/install/srv/mifosx/conf/server.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -61,7 +61,7 @@
 
     <!-- A "Connector" represents an endpoint by which requests are received
          and responses are returned. Documentation at :
-         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java HTTP Connector: /docs/config/http.html
          Java AJP  Connector: /docs/config/ajp.html
          APR (HTTP/AJP) Connector: /docs/apr.html
          Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
@@ -80,14 +80,39 @@
                redirectPort="8443" />
     -->
     <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
-         This connector uses the NIO implementation that requires the JSSE
-         style configuration. When using the APR/native implementation, the
-         OpenSSL style configuration is required as described in the APR/native
-         documentation -->
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
     <!--
     <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
     -->
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
diff --git a/mifosx/lxcfile b/mifosx/lxcfile
index 11dbdb9..94542e7 100644
--- a/mifosx/lxcfile
+++ b/mifosx/lxcfile
@@ -1,7 +1,7 @@
 IMAGE mifosx
 LAYER shared/alpine3.9
 LAYER shared/alpine3.9-java8
-LAYER shared/alpine3.9-tomcat8
+LAYER shared/alpine3.9-tomcat8.5
 LAYER mifosx/mifosx
 
 RUN EOF
@@ -17,13 +17,13 @@ RUN EOF
     mv /tmp/fineractplatform-18.03.01.RELEASE/database/mifospltaform-tenants-first-time-install.sql /tmp/mifospltaform-tenants-first-time-install.sql
 
     # Download Java library dependencies
-    wget http://central.maven.org/maven2/org/drizzle/jdbc/drizzle-jdbc/1.3/drizzle-jdbc-1.3.jar -O /srv/tomcat/lib/drizzle-jdbc-1.3.jar
+    wget http://central.maven.org/maven2/org/drizzle/jdbc/drizzle-jdbc/1.4/drizzle-jdbc-1.4.jar -O /srv/tomcat/lib/drizzle-jdbc-1.4.jar
 
     # Create OS user
     addgroup -S -g 8012 mifosx
     adduser -S -u 8012 -h /srv/tomcat -s /bin/false -g mifosx -G mifosx mifosx
     chown -R mifosx:mifosx /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work
-    
+
     # Cleanup
     apk --no-cache del wget
     rm -rf /tmp/fineractplatform-18.03.01.RELEASE /tmp/mifosx.zip
diff --git a/mifosx/meta b/mifosx/meta
index b0600b7..897b25b 100644
--- a/mifosx/meta
+++ b/mifosx/meta
@@ -6,5 +6,5 @@
     "version": "0.0.1",
     "release": "0",
     "license": "GPL",
-    "depends": ["alpine3.9-tomcat8", "mariadb"]
+    "depends": ["alpine3.9-tomcat8.5", "mariadb"]
 }