diff --git a/client/.classpath b/client/.classpath index ebaff9964..8ea7380e1 100644 --- a/client/.classpath +++ b/client/.classpath @@ -152,6 +152,7 @@ + @@ -162,7 +163,7 @@ - + @@ -172,9 +173,9 @@ - + - + @@ -194,8 +195,8 @@ - - + + diff --git a/command/.classpath b/command/.classpath index e3b787ac0..597d21a23 100644 --- a/command/.classpath +++ b/command/.classpath @@ -78,8 +78,8 @@ - - + + diff --git a/donkey/.classpath b/donkey/.classpath index 54b8cc997..cd4e56737 100644 --- a/donkey/.classpath +++ b/donkey/.classpath @@ -54,14 +54,14 @@ - + - - - + + + @@ -70,7 +70,7 @@ - + diff --git a/server/.classpath b/server/.classpath index 4c107334c..37a587c94 100644 --- a/server/.classpath +++ b/server/.classpath @@ -20,11 +20,11 @@ - + - + @@ -76,7 +76,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -114,30 +114,32 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + + + @@ -184,17 +186,17 @@ - - - - - - - + + + + + + + - + @@ -219,19 +221,19 @@ - - - - - - + + + + + + - - - - + + + + @@ -241,7 +243,8 @@ - + + @@ -250,6 +253,7 @@ + diff --git a/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219-sources.jar b/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219.jar similarity index 52% rename from server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219-sources.jar rename to server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219.jar index f64957721..6d77b3af3 100644 Binary files a/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219-sources.jar and b/server/lib/jetty/jsp/apache-jsp-9.4.57.v20241219.jar differ diff --git a/server/src/com/mirth/connect/server/MirthWebServer.java b/server/src/com/mirth/connect/server/MirthWebServer.java index b4ab2b3bb..d18f2f1ea 100644 --- a/server/src/com/mirth/connect/server/MirthWebServer.java +++ b/server/src/com/mirth/connect/server/MirthWebServer.java @@ -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); } @@ -852,4 +852,4 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques baseRequest.setHandled(true); } } -} \ No newline at end of file +}