Reimplement the WebDAV file connector on Sardine

gradle/libs.versions.toml

@@ -240,6 +240,7 @@ reactive-streams = { module = "org.reactivestreams:reactive-streams", version =
 reflections = { module = "org.reflections:reflections", version = "0.9.10" }
 rhino = { module = "org.mozilla:rhino", version = "1.7.13" }
 saaj-impl = { module = "com.sun.xml.messaging.saaj:saaj-impl", version = "1.4.0" }
+sardine = { module = "com.github.lookfirst:sardine", version = "5.10" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-log4j12 = { module = "org.slf4j:slf4j-log4j12", version.ref = "slf4j" }
 snakeyaml = { module = "org.yaml:snakeyaml", version = "2.5" }

gradle/vendored-layout.json

@@ -378,6 +378,7 @@
   "xpp3:xpp3": ""
  },
  "server-extensions": {
+  "com.github.lookfirst:sardine": "extensions/file",
   "com.lowagie:itext": "extensions/doc",
   "com.lowagie:itext-rtf": "extensions/doc",
   "com.openhtmltopdf:openhtmltopdf-core": "extensions/doc",

gradle/verification-metadata.xml

@@ -256,6 +256,14 @@
             <sha256 value="0358ce75bca1a54c141e16b7f1621e973fa177ddf64fe02b0f38df23ad400543" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.lookfirst" name="sardine" version="5.10">
+         <artifact name="sardine-5.10.jar">
+            <sha256 value="d958ae956832c3379d5a3fa8a4793c83cc79a896baac2434b876d70d86c27dbf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="sardine-5.10.pom">
+            <sha256 value="da34f4f5c33869f65a118a33e5cbb19beb9705b8b5c0092d18fe731988f5113a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.mwiede" name="jsch" version="2.27.7">
          <artifact name="jsch-2.27.7.jar">
             <sha256 value="dc9c937a9f56eb9e4028c56ff70a879eeb745de4d879e242e6a4d3cc386532be" origin="Generated by Gradle"/>

server/build.gradle

@@ -9,6 +9,8 @@ import java.text.SimpleDateFormat
 dependencies {
     implementation libs.bundles.server.main
     implementation libs.bundles.server.extensions
+    // the engine already ships httpclient and JAXB, so leave out Sardine's copies
+    implementation(libs.sardine) { transitive = false }
     // classified artifact: the catalog entry carries the version, the
     // classifier is selected here
     implementation(variantOf(libs.netty.transport.native.epoll) { classifier('linux-x86_64') })

server/docs/thirdparty/THIRD-PARTY-README.txt

@@ -38,11 +38,11 @@ The following are distributed under the terms of the Apache License version 2.0
 	Netty 4.1.137
 	Not-Going-To-Be-Commons-SSL 0.3.18
 	Quartz Scheduler 2.3.2
+	Sardine 5.10 (https://github.com/lookfirst/sardine)
 	SQLite JDBC Driver 3.43.2.1 (https://github.com/xerial/sqlite-jdbc)
 	StAXON 1.3 [incl. CLI] (https://github.com/beckchr/staxon)
 	Swagger Core 2.0.10 [incl. CLI] (https://github.com/swagger-api/swagger-core)
 	Swagger UI 2.2.10 (http://swagger.io/swagger-ui/)
-	webdavclient4j 0.92 (http://sourceforge.net/projects/webdavclient4j/)
 	Zip4j 1.3.3 (http://www.lingala.net/zip4j/)
 
 

server/src/main/java/com/mirth/connect/connectors/file/filesystems/FileSystemConnectionFactory.java

@@ -179,7 +179,7 @@ public PooledObject<FileSystemConnection> makeObject() throws Exception {
         } else if (scheme.equals(FileScheme.SMB)) {
             return new DefaultPooledObject<FileSystemConnection>(new SmbFileConnection(host, fileSystemOptions, timeout));
         } else if (scheme.equals(FileScheme.WEBDAV)) {
-            return new DefaultPooledObject<FileSystemConnection>(new WebDavConnection(host, secure, fileSystemOptions));
+            return new DefaultPooledObject<FileSystemConnection>(new WebDavConnection(host, port, secure, fileSystemOptions, timeout));
         } else {
             logger.error("makeObject doesn't handle scheme " + scheme);
             throw new IOException("Unimplemented or unrecognized scheme");