Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions client/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
<classpathentry kind="lib" path="lib/javaparser-1.0.8.jar"/>
<classpathentry kind="lib" path="lib/quartz-2.3.2.jar"/>
<classpathentry kind="lib" path="lib/jai_imageio.jar"/>
<classpathentry kind="lib" path="lib/istack-commons-runtime-3.0.6.jar"/>
<classpathentry kind="lib" path="lib/javax.ws.rs-api-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jersey-client-2.22.1.jar"/>
<classpathentry kind="lib" path="lib/jersey-proxy-client-2.22.1.jar"/>
Expand All @@ -162,7 +163,7 @@
<classpathentry kind="lib" path="lib/hk2-locator-2.4.0-b31.jar"/>
<classpathentry kind="lib" path="lib/hk2-utils-2.4.0-b31.jar"/>
<classpathentry kind="lib" path="lib/jersey-guava-2.22.1.jar"/>
<classpathentry kind="lib" path="lib/guava-28.2-jre.jar"/>
<classpathentry kind="lib" path="lib/guava-32.0.1-jre.jar"/>
<classpathentry kind="lib" path="lib/javassist-3.26.0-GA.jar"/>
<classpathentry kind="lib" path="lib/javax.inject-2.4.0-b31.jar"/>
<classpathentry kind="lib" path="lib/jersey-media-multipart-2.22.1.jar"/>
Expand All @@ -172,9 +173,9 @@
<classpathentry kind="lib" path="lib/bcpkix-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/bcutil-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/commons-vfs2-2.9.0.jar"/>
<classpathentry kind="lib" path="lib/commons-vfs2-2.10.0.jar"/>
<classpathentry kind="lib" path="lib/staxon-1.3.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/commons-compress-1.24.0.jar"/>
<classpathentry kind="lib" path="lib/javax.activation-1.2.0.jar"/>
<classpathentry kind="lib" path="lib/javax.activation-api-1.2.0.jar"/>
Expand All @@ -194,8 +195,8 @@
<classpathentry kind="lib" path="lib/jackson-databind-2.14.3.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.13.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.13.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/slf4j-log4j12-1.7.30.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.30.jar"/>
<classpathentry kind="lib" path="lib/hapi-base-2.3.jar"/>
<classpathentry kind="lib" path="lib/hapi-structures-v21-2.3.jar"/>
<classpathentry kind="lib" path="lib/hapi-structures-v22-2.3.jar"/>
Expand Down
4 changes: 2 additions & 2 deletions command/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
<classpathentry kind="lib" path="lib/bcpkix-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/bcutil-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/commons-vfs2-2.9.0.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/commons-vfs2-2.10.0.jar"/>
<classpathentry kind="lib" path="lib/jetty-util-9.4.57.v20241219.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/commons-codec-1.16.0.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.13.jar"/>
Expand Down
10 changes: 5 additions & 5 deletions donkey/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
<classpathentry kind="lib" path="lib/database/ojdbc8-12.2.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-beanutils-1.9.4.jar"/>
<classpathentry kind="lib" path="lib/database/jtds-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/database/mysql-connector-j-8.2.0.jar"/>
<classpathentry kind="lib" path="lib/database/mysql-connector-j-8.4.0.jar"/>
<classpathentry kind="lib" path="lib/HikariCP-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/javassist-3.26.0-GA.jar"/>
<classpathentry kind="lib" path="lib/quartz-2.3.2.jar"/>
<classpathentry kind="lib" path="testlib/junit-4.8.1.jar"/>
<classpathentry kind="lib" path="testlib/mockito-core-2.7.9.jar"/>
<classpathentry kind="lib" path="testlib/byte-buddy-1.8.8.jar"/>
<classpathentry kind="lib" path="testlib/byte-buddy-agent-1.8.8.jar"/>
<classpathentry kind="lib" path="testlib/mockito-core-5.1.1.jar"/>
<classpathentry kind="lib" path="testlib/byte-buddy-1.14.13.jar"/>
<classpathentry kind="lib" path="testlib/byte-buddy-agent-1.14.13.jar"/>
<classpathentry kind="lib" path="testlib/objenesis-2.5.1.jar"/>
<classpathentry kind="lib" path="testlib/javax.inject-2.4.0-b31.jar"/>
<classpathentry kind="lib" path="testlib/aopalliance-repackaged-2.4.0-b31.jar"/>
Expand All @@ -70,7 +70,7 @@
<classpathentry kind="lib" path="lib/guava/checker-qual-2.10.0.jar"/>
<classpathentry kind="lib" path="lib/guava/error_prone_annotations-2.3.4.jar"/>
<classpathentry kind="lib" path="lib/guava/failureaccess-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/guava/guava-28.2-jre.jar"/>
<classpathentry kind="lib" path="lib/guava/guava-32.0.1-jre.jar"/>
<classpathentry kind="lib" path="lib/guava/j2objc-annotations-1.3.jar"/>
<classpathentry kind="lib" path="lib/guava/jsr305-3.0.2.jar"/>
<classpathentry kind="lib" path="lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
Expand Down
88 changes: 46 additions & 42 deletions server/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<classpathentry kind="lib" path="lib/commons/commons-digester3-3.2.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-jxpath-1.3.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-logging-1.2.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-net-3.3.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-net-3.9.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-pool2-2.3.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-el-1.0.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-httpclient-3.0.1.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-email-1.3.1.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-email-1.6.0.jar"/>
<classpathentry kind="lib" path="lib/not-going-to-be-commons-ssl-0.3.18.jar"/>
<classpathentry kind="lib" path="lib/velocity-engine-core-2.3.jar"/>
<classpathentry kind="lib" path="lib/velocity-tools-generic-3.1.jar">
Expand Down Expand Up @@ -76,7 +76,7 @@
<attribute name="javadoc_location" value="http://quartz-scheduler.org/api/2.3.0/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/database/mysql-connector-j-8.2.0.jar"/>
<classpathentry kind="lib" path="lib/database/mysql-connector-j-8.4.0.jar"/>
<classpathentry kind="lib" path="lib/jersey/jersey-common-2.22.1.jar"/>
<classpathentry kind="lib" path="lib/jersey/jersey-container-servlet-2.22.1.jar"/>
<classpathentry kind="lib" path="lib/jersey/jersey-container-servlet-core-2.22.1.jar"/>
Expand All @@ -97,7 +97,7 @@
<classpathentry kind="lib" path="lib/swagger/swagger-models-2.0.10.jar"/>
<classpathentry kind="lib" path="lib/swagger/swagger-integration-2.0.10.jar"/>
<classpathentry kind="lib" path="lib/swagger/swagger-jaxrs2-servlet-initializer-2.0.10.jar"/>
<classpathentry kind="lib" path="lib/classgraph-4.8.53.jar"/>
<classpathentry kind="lib" path="lib/classgraph-4.8.179.jar"/>
<classpathentry kind="lib" path="lib/jersey/jersey-container-jetty-http-2.22.1.jar"/>
<classpathentry kind="lib" path="lib/jersey/jersey-container-jetty-servlet-2.22.1.jar"/>
<classpathentry kind="lib" path="lib/jersey/jersey-media-multipart-2.22.1.jar"/>
Expand All @@ -114,30 +114,32 @@
<classpathentry kind="lib" path="lib/javax/javax.json-api-1.0.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.mail-1.5.0.jar"/>
<classpathentry kind="lib" path="lib/javax/javax.ws.rs-api-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-annotations-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-continuation-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-http-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-io-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-plus-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-jndi-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-rewrite-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-security-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-server-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-servlet-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-util-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-util-ajax-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-webapp-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-xml-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jsp/apache-jsp-9.4.53.v20231009.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-annotations-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-continuation-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-http-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-io-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-plus-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-jndi-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-rewrite-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-security-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-server-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-servlet-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-util-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-util-ajax-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-webapp-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jetty-xml-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jsp/apache-jsp-9.4.57.v20241219.jar"/>
<classpathentry kind="lib" path="lib/jetty/jsp/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar"/>
<classpathentry kind="lib" path="lib/jetty/jsp/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar"/>
<classpathentry kind="lib" path="lib/jetty/jsp/org.mortbay.jasper.apache-el-8.5.70.jar"/>
<classpathentry kind="lib" path="lib/jetty/jsp/org.mortbay.jasper.apache-jsp-8.5.70.jar"/>
<classpathentry kind="lib" path="lib/jetty/jsp/org.eclipse.jdt.ecj-3.19.0.jar"/>
<classpathentry kind="lib" path="testlib/byte-buddy-1.8.8.jar"/>
<classpathentry kind="lib" path="testlib/byte-buddy-agent-1.8.8.jar"/>
<classpathentry kind="lib" path="testlib/junit-4.8.1.jar"/>
<classpathentry kind="lib" path="testlib/mockito-core-2.7.9.jar"/>
<classpathentry kind="lib" path="testlib/byte-buddy-1.14.13.jar"/>
<classpathentry kind="lib" path="testlib/byte-buddy-agent-1.14.13.jar"/>
<classpathentry kind="lib" path="testlib/junit-4.13.1.jar"/>
<classpathentry kind="lib" path="testlib/hamcrest-2.2.jar"/>
<classpathentry kind="lib" path="testlib/mockito-core-5.1.1.jar"/>
<classpathentry kind="lib" path="testlib/mockito-inline-5.1.1.jar"/>
<classpathentry kind="lib" path="testlib/objenesis-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/guice-4.1.0.jar"/>
<classpathentry kind="lib" path="lib/staxon-1.3.jar"/>
Expand Down Expand Up @@ -184,17 +186,17 @@
<classpathentry kind="lib" path="lib/joda-time-2.9.9.jar"/>
<classpathentry kind="lib" path="lib/HikariCP-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/zip4j_1.3.3.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/guava/guava-28.2-jre.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/guava/checker-qual-2.10.0.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/guava/error_prone_annotations-2.3.4.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/guava/failureaccess-1.0.1.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/guava/j2objc-annotations-1.3.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/guava/jsr305-3.0.2.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
<classpathentry kind="lib" path="lib/donkey/guava/guava-32.0.1-jre.jar"/>
<classpathentry kind="lib" path="lib/donkey/guava/checker-qual-2.10.0.jar"/>
<classpathentry kind="lib" path="lib/donkey/guava/error_prone_annotations-2.3.4.jar"/>
<classpathentry kind="lib" path="lib/donkey/guava/failureaccess-1.0.1.jar"/>
<classpathentry kind="lib" path="lib/donkey/guava/j2objc-annotations-1.3.jar"/>
<classpathentry kind="lib" path="lib/donkey/guava/jsr305-3.0.2.jar"/>
<classpathentry kind="lib" path="lib/donkey/guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
<classpathentry kind="lib" path="lib/bcpkix-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/bcutil-jdk18on-1.78.1.jar"/>
<classpathentry kind="lib" path="lib/commons/commons-vfs2-2.9.0.jar">
<classpathentry kind="lib" path="lib/commons/commons-vfs2-2.10.0.jar">
<attributes>
<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-vfs/apidocs"/>
</attributes>
Expand All @@ -219,19 +221,19 @@
<classpathentry kind="lib" path="lib/aws/sdk-core-2.15.28.jar"/>
<classpathentry kind="lib" path="lib/aws/sts-2.15.28.jar"/>
<classpathentry kind="lib" path="lib/aws/utils-2.15.28.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-buffer-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-codec-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-codec-http2-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-codec-http-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-common-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-handler-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-buffer-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-codec-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-codec-http2-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-codec-http-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-common-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-handler-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-nio-client-2.20.140.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-reactive-streams-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-reactive-streams-http-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-resolver-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-transport-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-transport-native-unix-common-4.1.97.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-resolver-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-transport-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-transport-native-epoll-4.1.119.Final-linux-x86_64.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/netty/netty-transport-native-unix-common-4.1.119.Final.jar"/>
<classpathentry kind="lib" path="lib/aws/ext/reactive-streams-1.0.3.jar"/>
<classpathentry kind="lib" path="lib/commons/httpclient-4.5.13.jar"/>
<classpathentry kind="lib" path="lib/commons/httpmime-4.5.13.jar"/>
Expand All @@ -241,7 +243,8 @@
<classpathentry kind="lib" path="lib/jackson/jackson-dataformat-cbor-2.14.3.jar"/>
<classpathentry kind="lib" path="lib/jackson/jackson-dataformat-yaml-2.14.3.jar"/>
<classpathentry kind="lib" path="lib/jackson/jackson-datatype-jsr310-2.14.3.jar"/>
<classpathentry kind="lib" path="/Donkey/lib/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="lib/donkey/slf4j-api-1.7.30.jar"/>
<classpathentry kind="lib" path="lib/donkey/slf4j-log4j12-1.7.30.jar"/>
<classpathentry kind="lib" path="lib/aws/metrics-spi-2.15.28.jar"/>
<classpathentry kind="lib" path="lib/database/postgresql-42.6.0.jar"/>
<classpathentry kind="lib" path="lib/extensions/doc/openhtmltopdf-core-1.0.9.jar"/>
Expand All @@ -250,6 +253,7 @@
<classpathentry kind="lib" path="lib/extensions/doc/fontbox-2.0.24.jar"/>
<classpathentry kind="lib" path="lib/extensions/doc/pdfbox-2.0.24.jar"/>
<classpathentry kind="lib" path="lib/extensions/doc/graphics2d-0.32.jar"/>
<classpathentry kind="lib" path="lib/extensions/pdfviewer/PDFRenderer.jar"/>
<classpathentry kind="lib" path="lib/hapi/hapi-base-2.3.jar"/>
<classpathentry kind="lib" path="lib/hapi/hapi-structures-v21-2.3.jar"/>
<classpathentry kind="lib" path="lib/hapi/hapi-structures-v22-2.3.jar"/>
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions server/src/com/mirth/connect/server/MirthWebServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public boolean accept(File file) {

logger.debug("webApp Context Path: " + webapp.getContextPath());

webapp.setWar(file.getPath());
webapp.setWar(file.getAbsolutePath());
handlers.addHandler(webapp);
webapps.add(webapp);
}
Expand Down Expand Up @@ -852,4 +852,4 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
baseRequest.setHandled(true);
}
}
}
}