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

Jump to bottom

Tomcat 10 / Jakarta #93

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Tomcat 10 / Jakarta #93

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
d659385
Jakarta namespace changes
ryanrdoherty May 3, 2024
ca905d8
Add change made for tomcat 8; may need more
ryanrdoherty May 4, 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
2 changes: 1 addition & 1 deletion Model/lib/conifer/roles/conifer/templates/WDK/tomcat_context.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ site_vars file: {{ site_vars }}
docBase="{{ contextxml_docBase }}"
privileged="{{ contextxml_privileged|default("false") }}"
swallowOutput="{{ contextxml_swallowOutput|default("true") }}"
allowLinking="{{ contextxml_allowLinking|default("true") }}"
>
<Resources allowLinking="{{ contextxml_allowLinking|default("true") }}" />
<Parameter name="model" value="{{ contextxml_model }}"/>
</Context>
8 changes: 4 additions & 4 deletions Model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<artifactId>wsf-client</artifactId>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -146,8 +146,8 @@
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions Model/src/main/java/org/gusdb/wdk/controller/ApplicationInitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.gusdb.wdk.controller;

import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;

import org.gusdb.fgputil.web.servlet.HttpServletApplicationContext;

Expand Down
6 changes: 3 additions & 3 deletions Model/src/main/java/org/gusdb/wdk/controller/ContextLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.gusdb.wdk.controller;

import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;

import org.glassfish.grizzly.http.server.Request;
import org.glassfish.grizzly.http.server.Session;
Expand Down
16 changes: 8 additions & 8 deletions Model/src/main/java/org/gusdb/wdk/controller/filter/HttpHeaderLoggerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
import java.util.List;
import java.util.Map;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;

import org.apache.log4j.Logger;

Expand Down
23 changes: 9 additions & 14 deletions Model/src/main/java/org/gusdb/wdk/controller/filter/HttpResponseHeaderLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
import java.util.HashMap;
import java.util.Map;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper;

import org.apache.log4j.Logger;
import org.gusdb.fgputil.FormatUtil;
Expand Down Expand Up @@ -139,11 +139,6 @@ public void setStatus(int sc) {
super.setStatus(sc);
}

@Override
public void setStatus(int sc, String sm) {
_responseStatus = sc;
super.setStatus(sc, sm);
}
}

@Override
Expand Down
16 changes: 8 additions & 8 deletions Model/src/main/java/org/gusdb/wdk/controller/filter/MDCServletFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;

import org.gusdb.fgputil.logging.ThreadLocalLoggingVars;

Expand Down
2 changes: 1 addition & 1 deletion Model/src/main/java/org/gusdb/wdk/controller/wizard/MapActionFormIfc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.Map;

import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;

public interface MapActionFormIfc {

Expand Down
4 changes: 2 additions & 2 deletions Model/src/main/java/org/gusdb/wdk/controller/wizard/StageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.Map;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.gusdb.wdk.model.WdkModel;

Expand Down
6 changes: 3 additions & 3 deletions Model/src/main/java/org/gusdb/wdk/errors/ValueMaps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import java.util.HashMap;
import java.util.Map;

import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;

public class ValueMaps {

Expand Down
2 changes: 1 addition & 1 deletion Model/src/main/java/org/gusdb/wdk/jmx/BeanBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.gusdb.wdk.jmx;

import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;

import org.gusdb.wdk.model.Utilities;
import org.gusdb.wdk.model.WdkModel;
Expand Down
2 changes: 1 addition & 1 deletion Model/src/main/java/org/gusdb/wdk/jmx/ContextThreadLocal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.gusdb.wdk.jmx;

import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;

/**
* A ThreadLocal to store the ServletContext for the webapp. The
Expand Down
6 changes: 3 additions & 3 deletions Model/src/main/java/org/gusdb/wdk/jmx/JmxInitListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.gusdb.wdk.jmx;

import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;

import org.apache.log4j.Logger;
import org.gusdb.fgputil.logging.ThreadLocalLoggingVars;
Expand Down
4 changes: 2 additions & 2 deletions Model/src/main/java/org/gusdb/wdk/jmx/MBeanRegistration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;

import org.apache.log4j.Logger;
import org.gusdb.fgputil.MapBuilder;
Expand Down Expand Up @@ -230,7 +230,7 @@ private String getContextPath() throws ContextResolutionException {
}
else {
// hack for old servlet API: use the name of the tempdir
String tmpdir = ((java.io.File) sc.getAttribute("javax.servlet.context.tempdir")).getName();
String tmpdir = ((java.io.File) sc.getAttribute("jakarta.servlet.context.tempdir")).getName();
contextName = "/" + tmpdir;
}

Expand Down
10 changes: 5 additions & 5 deletions Model/src/main/java/org/gusdb/wdk/model/fix/QuestionComparison.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;

import org.gusdb.fgputil.IoUtil;
import org.gusdb.fgputil.Tuples.ThreeTuple;
Expand Down
Empty file modified Model/src/main/java/org/gusdb/wdk/model/query/param/FilterParamNewStableValue.java
100755 → 100644
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions Model/src/main/java/org/gusdb/wdk/model/report/reporter/AnswerDetailsReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import java.io.OutputStream;
import java.util.Map;

import javax.ws.rs.BadRequestException;
import javax.ws.rs.core.MediaType;
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.core.MediaType;

import org.gusdb.fgputil.SortDirectionSpec;
import org.gusdb.fgputil.functional.FunctionalInterfaces.Procedure;
Expand Down
12 changes: 6 additions & 6 deletions Service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<artifactId>wdk-model</artifactId>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -71,8 +71,8 @@
<artifactId>jersey-container-servlet</artifactId>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down Expand Up @@ -112,8 +112,8 @@
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion Service/src/main/java/org/gusdb/wdk/server/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.net.URI;

import javax.ws.rs.core.UriBuilder;
import jakarta.ws.rs.core.UriBuilder;

import org.glassfish.jersey.server.ResourceConfig;
import org.gusdb.fgputil.FormatUtil;
Expand Down
8 changes: 4 additions & 4 deletions Service/src/main/java/org/gusdb/wdk/service/FileRanges.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
import java.io.IOException;
import java.nio.file.Path;

import javax.ws.rs.BadRequestException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;

import org.apache.log4j.Logger;
import org.gusdb.fgputil.FileChunkInputStream;
Expand Down
2 changes: 1 addition & 1 deletion Service/src/main/java/org/gusdb/wdk/service/WdkServiceApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Set;
import java.util.function.Predicate;

import javax.ws.rs.core.Application;
import jakarta.ws.rs.core.Application;

import org.glassfish.jersey.client.filter.EncodingFeature;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
Expand Down
2 changes: 1 addition & 1 deletion Service/src/main/java/org/gusdb/wdk/service/annotation/PATCH.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import javax.ws.rs.HttpMethod;
import jakarta.ws.rs.HttpMethod;

/**
* Indicates that the annotated method responds to HTTP PATCH requests. Needed
Expand Down
34 changes: 17 additions & 17 deletions Service/src/main/java/org/gusdb/wdk/service/filter/CheckLoginFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@

import java.io.IOException;

import javax.annotation.Priority;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.NotAuthorizedException;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.container.ContainerResponseContext;
import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.inject.Provider;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.ws.rs.NotAuthorizedException;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.container.ContainerResponseContext;
import jakarta.ws.rs.container.ContainerResponseFilter;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.Cookie;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.NewCookie;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;

import org.apache.log4j.Logger;
import org.glassfish.grizzly.http.server.Request;
Expand Down
16 changes: 8 additions & 8 deletions Service/src/main/java/org/gusdb/wdk/service/filter/ClientCacheExpirationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import java.util.List;
import java.util.Map;

import javax.annotation.Priority;
import javax.servlet.ServletContext;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import jakarta.annotation.Priority;
import jakarta.servlet.ServletContext;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;

import org.gusdb.wdk.controller.ContextLookup;

Expand Down
Loading
Loading