Update Jetty to 9.4

- from 9.0.3.v20130506 to 9.4.52.v20230823
- rearrange and reorganize servlets and handlers
  so that the server provides everything
- remove server session attribute
   - we already handle user sessions separately at the moment
- mark services known to be unused as deprecated
- add plugin controller check
  to skip JettyPluginInterface resource if it is null

Author: Enet4

dicoogle/src/main/java/pt/ua/dicoogle/plugins/PluginController.java

@@ -256,6 +256,9 @@ private void initJettyInterface(Collection<PluginSet> plugins) {
 
         DicoogleWeb jettyServer = ControlServices.getInstance().getWebServicePlatform();
         for (JettyPluginInterface resource : jettyInterfaces) {
+            if (resource == null) {
+                continue;
+            }
             jettyServer.addContextHandlers(resource.getJettyHandlers());
         }
     }

dicoogle/src/main/java/pt/ua/dicoogle/server/web/DicoogleWeb.java

@@ -235,9 +235,6 @@ public static LoggedInStatus webappLogin(HttpServletRequest request, HttpServlet
                 return new LoggedInStatus(null, LoggedInStatus.S_UNAUTHORIZEDACCESS);
             }
 
-            // add the login information to the session
-            HttpSession session = request.getSession(true); // force the creation of a new session if there is none
-            session.setAttribute("login", login);
             return new LoggedInStatus(login, LoggedInStatus.S_VALIDLOGIN);
         }
 

dicoogle/src/main/java/pt/ua/dicoogle/server/web/auth/Session.java

@@ -43,7 +43,9 @@
  * 
  * @author Tiago Godinho.
  *
+ * @deprecated See {@link pt.ua.dicoogle.server.web.servlets.search.SearchServlet} instead
  */
+@Deprecated
 public class SearchHolderServlet extends HttpServlet {
     private static final long serialVersionUID = 1L;
 

dicoogle/src/main/java/pt/ua/dicoogle/server/web/servlets/SearchHolderServlet.java

@@ -35,6 +35,10 @@
 import pt.ua.dicoogle.plugins.PluginController;
 import pt.ua.dicoogle.sdk.utils.DictionaryAccess;
 
+/**
+ * @deprecated Use {@link pt.ua.dicoogle.server.web.servlets.ExportCSVToFILEServlet} instead.
+ */
+@Deprecated
 public class ExportServlet extends HttpServlet {
     private static final Logger logger = LoggerFactory.getLogger(ExportServlet.class);
 

dicoogle/src/main/java/pt/ua/dicoogle/server/web/servlets/search/ExportServlet.java

@@ -38,7 +38,9 @@
 /**
  * @author Frederico Silva <[email protected]>
  * @todo
+ * @deprecated Incomplete implementation, to be removed in Dicoogle 4
  */
+@Deprecated
 public class WadoServlet extends HttpServlet {
 
     @Override

dicoogle/src/main/java/pt/ua/dicoogle/server/web/servlets/search/WadoServlet.java

@@ -8,7 +8,7 @@
     <name>dicoogle-all</name>
 
     <properties>
-        <jetty.version>9.0.3.v20130506</jetty.version>
+        <jetty.version>9.4.52.v20230823</jetty.version>
         <restlet.version>2.1.2</restlet.version>
         <dcm4che.version>2.0.29</dcm4che.version>
         <slf4j.version>1.7.36</slf4j.version>