Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Jetty to v9.4 #671

Draft
wants to merge 2 commits into
base: dev
Choose a base branch
from
+159 −128
Draft

Update Jetty to v9.4 #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf3735d
Update Jetty to 9.4
Enet4 Sep 30, 2023
2cc87a9
Update jetty to 9.4.56.v20240826
Enet4 Nov 20, 2024
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
3 changes: 3 additions & 0 deletions dicoogle/src/main/java/pt/ua/dicoogle/plugins/PluginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ private void initJettyInterface(Collection<PluginSet> plugins) {

DicoogleWeb jettyServer = ControlServices.getInstance().getWebServicePlatform();
for (JettyPluginInterface resource : jettyInterfaces) {
if (resource == null) {
continue;
}
jettyServer.addContextHandlers(resource.getJettyHandlers());
}
}
Expand Down
271 changes: 147 additions & 124 deletions dicoogle/src/main/java/pt/ua/dicoogle/server/web/DicoogleWeb.java
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions dicoogle/src/main/java/pt/ua/dicoogle/server/web/auth/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 2 additions & 0 deletions dicoogle/src/main/java/pt/ua/dicoogle/server/web/servlets/SearchHolderServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 4 additions & 0 deletions dicoogle/src/main/java/pt/ua/dicoogle/server/web/servlets/search/ExportServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 2 additions & 0 deletions dicoogle/src/main/java/pt/ua/dicoogle/server/web/servlets/search/WadoServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
/**
* @author Frederico Silva <fredericosilva@ua.pt>
* @todo
* @deprecated Incomplete implementation, to be removed in Dicoogle 4
*/
@Deprecated
public class WadoServlet extends HttpServlet {

@Override
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<name>dicoogle-all</name>

<properties>
<jetty.version>9.0.3.v20130506</jetty.version>
<jetty.version>9.4.56.v20240826</jetty.version>
<restlet.version>2.1.2</restlet.version>
<dcm4che.version>2.0.29</dcm4che.version>
<slf4j.version>1.7.36</slf4j.version>
Expand Down
Loading