This is an automated email from the ASF dual-hosted git repository. deepak pushed a commit to branch OFBIZ-13286-rest-api-not-working in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit dff44fb4bc6113e3ef7fe270a778c32013c98a9e Author: Deepak Dixit <[email protected]> AuthorDate: Thu Aug 21 00:32:25 2025 +0530 Migrate rest-api plugin to Jakarta EE 9+ for Tomcat 10 compatibility - Updated imports from javax.ws.* to jakarta.ws.rs.* for Jersey 3.x/Jakarta EE 9+ - Changed web.xml to use jakarta.ws.rs.Application instead of javax.ws.rs.Application - Ensured compatibility with Tomcat 10 by aligning with jakarta.servlet.* APIs - Fixed rest-api plugin to work with Jersey 3.1.3 and Tomcat 10.1.x --- rest-api/build.gradle | 10 +++--- .../org/apache/ofbiz/ws/rs/ConflictException.java | 4 +-- .../ofbiz/ws/rs/MethodNotAllowedException.java | 4 +-- .../ofbiz/ws/rs/ServiceNotFoundException.java | 2 +- .../apache/ofbiz/ws/rs/ServiceRequestFilter.java | 22 ++++++------ .../ofbiz/ws/rs/ServiceRequestProcessor.java | 4 +-- .../ws/rs/annotation/ServiceRequestValidator.java | 2 +- .../apache/ofbiz/ws/rs/core/OFBizApiConfig.java | 6 ++-- .../apache/ofbiz/ws/rs/core/ResponseStatus.java | 4 +-- .../ofbiz/ws/rs/openapi/OFBizOpenApiReader.java | 18 +++++----- .../ofbiz/ws/rs/process/RestRequestHandler.java | 20 +++++------ .../ofbiz/ws/rs/process/ServiceRequestHandler.java | 8 ++--- .../ofbiz/ws/rs/resources/ApiRootResource.java | 14 ++++---- .../ws/rs/resources/AuthenticationResource.java | 18 +++++----- .../ofbiz/ws/rs/resources/IOFBizResource.java | 2 +- .../ofbiz/ws/rs/resources/OFBizResource.java | 4 +-- .../ws/rs/resources/OFBizServiceResource.java | 34 +++++++++--------- .../ofbiz/ws/rs/resources/OpenApiResource.java | 20 +++++------ .../org/apache/ofbiz/ws/rs/security/AuthToken.java | 2 +- .../org/apache/ofbiz/ws/rs/security/Secured.java | 2 +- .../ofbiz/ws/rs/security/auth/APIAuthFilter.java | 20 +++++------ .../ofbiz/ws/rs/security/auth/APICorsFilter.java | 18 +++++----- .../ws/rs/security/auth/HttpBasicAuthFilter.java | 16 ++++----- .../ofbiz/ws/rs/spi/AbstractExceptionMapper.java | 6 ++-- .../rs/spi/impl/GenericServiceExceptionMapper.java | 12 +++---- .../ws/rs/spi/impl/GlobalExceptionMapper.java | 6 ++-- .../apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java | 6 ++-- .../spi/impl/JsonifiedParamConverterProvider.java | 10 +++--- .../ofbiz/ws/rs/spi/impl/LinkSerializer.java | 4 +-- .../org/apache/ofbiz/ws/rs/util/ErrorUtil.java | 4 +-- .../org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 18 +++++----- .../org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 8 ++--- rest-api/webapp/rest-api/WEB-INF/web.xml | 42 +++++++++++----------- 33 files changed, 185 insertions(+), 185 deletions(-) diff --git a/rest-api/build.gradle b/rest-api/build.gradle index c17932769..70c3550d9 100644 --- a/rest-api/build.gradle +++ b/rest-api/build.gradle @@ -18,15 +18,15 @@ */ project.rootProject.configurations.all { - exclude module: 'jsr311-api' + //exclude module: 'jsr311-api' // exclude module: 'cxf-rt-frontend-jaxrs' } dependencies { - pluginLibsCompile 'org.glassfish.jersey.containers:jersey-container-servlet:2.40' // Compilation issues with 3.0.2: package javax.ws.rs does not exist - pluginLibsCompile 'org.glassfish.jersey.media:jersey-media-multipart:2.40' - pluginLibsCompile 'org.glassfish.jersey.media:jersey-media-json-jackson:2.40' - pluginLibsCompile 'org.glassfish.jersey.inject:jersey-hk2:2.40' + pluginLibsCompile 'org.glassfish.jersey.containers:jersey-container-servlet:3.1.3' + pluginLibsCompile 'org.glassfish.jersey.inject:jersey-hk2:3.1.3' + pluginLibsCompile 'org.glassfish.jersey.media:jersey-media-multipart:3.1.3' + pluginLibsCompile 'org.glassfish.jersey.media:jersey-media-json-jackson:3.1.3' pluginLibsCompile 'io.swagger.core.v3:swagger-jaxrs2:2.2.20' pluginLibsCompile 'io.swagger.core.v3:swagger-jaxrs2-servlet-initializer:2.2.20' pluginLibsCompile 'io.swagger.core.v3:swagger-annotations:2.2.20' diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java index 4d3c6f75f..830172867 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ConflictException.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.ws.rs; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; /** * A HTTP 409 (Conflict) exception diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java index 9c10be0d4..5c7469b63 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/MethodNotAllowedException.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.ws.rs; -import javax.ws.rs.ClientErrorException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; /** * diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java index 31275138c..29977f0f1 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceNotFoundException.java @@ -18,7 +18,7 @@ *******************************************************************************/ package org.apache.ofbiz.ws.rs; -import javax.ws.rs.NotFoundException; +import jakarta.ws.rs.NotFoundException; public class ServiceNotFoundException extends NotFoundException { diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java index d62bb3101..ea3640448 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java @@ -20,19 +20,19 @@ package org.apache.ofbiz.ws.rs; import java.io.IOException; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java index 6320a01b1..946f34fb9 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Set; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.GenericValue; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java index 61a4655b5..7500bf817 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/annotation/ServiceRequestValidator.java @@ -23,7 +23,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding @Retention(RetentionPolicy.RUNTIME) diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java index d85d87f65..7ba34991f 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java @@ -26,8 +26,9 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.HttpMethod; +import org.glassfish.jersey.server.ServerProperties; +import jakarta.ws.rs.core.MediaType; import org.apache.ofbiz.base.component.ComponentConfig; import org.apache.ofbiz.base.component.ComponentException; @@ -60,6 +61,7 @@ public class OFBizApiConfig extends ResourceConfig { register(JacksonFeature.class); register(ServiceRequestFilter.class); register(MultiPartFeature.class); + //property(ServerProperties.TRACING, "ALL"); if (Debug.verboseOn()) { register(new LoggingFeature(Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME), Level.INFO, LoggingFeature.Verbosity.PAYLOAD_ANY, 10000)); diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java index 63c9b68d9..807a51ed0 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.ws.rs.core; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; public final class ResponseStatus { diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java index cc502b43e..bc585ce9a 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java @@ -24,9 +24,9 @@ import java.util.Map; import java.util.Set; import jakarta.servlet.ServletContext; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; @@ -75,9 +75,9 @@ public final class OFBizOpenApiReader extends Reader implements OpenApiReader { private OpenAPI openApi; private DispatchContext context; private static final Parameter HEADER_CONTENT_TYPE_JSON = new HeaderParameter().name(HttpHeaders.CONTENT_TYPE) - .schema(new StringSchema()).example(javax.ws.rs.core.MediaType.APPLICATION_JSON).required(true); + .schema(new StringSchema()).example(jakarta.ws.rs.core.MediaType.APPLICATION_JSON).required(true); private static final Parameter HEADER_ACCEPT_JSON = new HeaderParameter().name(HttpHeaders.ACCEPT) - .schema(new StringSchema()).example(javax.ws.rs.core.MediaType.APPLICATION_JSON).required(true); + .schema(new StringSchema()).example(jakarta.ws.rs.core.MediaType.APPLICATION_JSON).required(true); @Override public void setConfiguration(OpenAPIConfiguration openApiConfiguration) { @@ -138,13 +138,13 @@ public final class OFBizOpenApiReader extends Reader implements OpenApiReader { .description("Operation Input Parameters in JSON").name("input"); Schema<?> refSchema = new Schema<>(); refSchema.$ref("#/components/schemas/" + "api.request." + service.getName()); - serviceInParam.content(new Content().addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, + serviceInParam.content(new Content().addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType().schema(refSchema))); operation.addParametersItem(serviceInParam); } else if (verb.matches(HttpMethod.POST + "|" + HttpMethod.PUT + "|" + HttpMethod.PATCH)) { RequestBody request = new RequestBody() .description("Request Body for operation " + op.getDescription()) - .content(new Content().addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, + .content(new Content().addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType().schema(new Schema<>() .$ref("#/components/schemas/" + "api.request." + service.getName())))); operation.setRequestBody(request); @@ -198,14 +198,14 @@ public final class OFBizOpenApiReader extends Reader implements OpenApiReader { .description("Service In Parameters in JSON").name("inParams"); Schema<?> refSchema = new Schema<>(); refSchema.$ref("#/components/schemas/" + "api.request." + service.getName()); - serviceInParam.content(new Content().addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, + serviceInParam.content(new Content().addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType().schema(refSchema))); operation.addParametersItem(serviceInParam); } operation.addParametersItem(HEADER_ACCEPT_JSON); } else if (action.matches(HttpMethod.POST + "|" + HttpMethod.PUT + "|" + HttpMethod.PATCH)) { RequestBody request = new RequestBody().description("Request Body for service " + service.getName()) - .content(new Content().addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, + .content(new Content().addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType().schema(new Schema<>().$ref("#/components/schemas/" + "api.request." + service.getName())))); operation.setRequestBody(request); operation.addParametersItem(HEADER_CONTENT_TYPE_JSON); diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java index 71382b769..c07530e58 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/RestRequestHandler.java @@ -22,18 +22,18 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Provider; +import jakarta.inject.Inject; +import jakarta.inject.Provider; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.ofbiz.base.util.UtilValidate; import org.glassfish.jersey.message.internal.MediaTypes; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java index 1f3567012..6e129a2c6 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/process/ServiceRequestHandler.java @@ -22,10 +22,10 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java index 567433417..1ba1b6df1 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/ApiRootResource.java @@ -27,13 +27,13 @@ import org.glassfish.jersey.server.model.Resource; import org.glassfish.jersey.server.model.ResourceMethod; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; @Path("/") @SuppressWarnings({"unchecked", "rawtypes"}) diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java index 623d7339d..ed5f314af 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/AuthenticationResource.java @@ -22,15 +22,15 @@ import java.util.Map; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.entity.GenericValue; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java index feff6853a..51625388d 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/IOFBizResource.java @@ -18,7 +18,7 @@ *******************************************************************************/ package org.apache.ofbiz.ws.rs.resources; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.service.LocalDispatcher; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java index 04e2392f4..c4f70c563 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizResource.java @@ -19,8 +19,8 @@ package org.apache.ofbiz.ws.rs.resources; import jakarta.servlet.ServletContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.service.LocalDispatcher; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java index 328f74362..50bfe1399 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OFBizServiceResource.java @@ -27,23 +27,23 @@ import java.util.Map; import java.util.Set; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java index f4ed0535d..8ef062d6b 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/resources/OpenApiResource.java @@ -24,16 +24,16 @@ import java.util.stream.Stream; import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Application; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Application; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.ws.rs.openapi.OFBizOpenApiReader; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java index 070d7007a..2493bb5fb 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/AuthToken.java @@ -22,7 +22,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java index 728d80544..e7edf4d52 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/Secured.java @@ -22,7 +22,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @NameBinding diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java index ec16ada2c..f5c64c47f 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java @@ -21,18 +21,18 @@ package org.apache.ofbiz.ws.rs.security.auth; import java.io.IOException; import java.util.Map; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java index 1348f3b7c..77f1acb17 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/APICorsFilter.java @@ -21,15 +21,15 @@ package org.apache.ofbiz.ws.rs.security.auth; import java.io.IOException; import java.util.List; -import javax.annotation.Priority; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.Priorities; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import org.apache.catalina.filters.CorsFilter; import org.apache.ofbiz.base.util.UtilMisc; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java index 160c0fb98..498cf76e5 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java @@ -24,14 +24,14 @@ import java.util.Map; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.ForbiddenException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilHttp; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java index 35daf4d60..c88bc901e 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java @@ -18,9 +18,9 @@ *******************************************************************************/ package org.apache.ofbiz.ws.rs.spi; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.ofbiz.ws.rs.response.Error; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java index bfa989157..2e324fe49 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java @@ -19,11 +19,11 @@ package org.apache.ofbiz.ws.rs.spi.impl; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.ofbiz.base.util.Debug; @@ -44,7 +44,7 @@ import org.codehaus.groovy.runtime.InvokerInvocationException; * */ @Provider -public class GenericServiceExceptionMapper extends AbstractExceptionMapper implements javax.ws.rs.ext.ExceptionMapper<GenericServiceException> { +public class GenericServiceExceptionMapper extends AbstractExceptionMapper implements jakarta.ws.rs.ext.ExceptionMapper<GenericServiceException> { /** * Module Name Used for debugging diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java index 68d15c9da..f2ec0dd7f 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java @@ -18,15 +18,15 @@ *******************************************************************************/ package org.apache.ofbiz.ws.rs.spi.impl; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.ws.rs.response.Error; import org.apache.ofbiz.ws.rs.spi.AbstractExceptionMapper; @Provider -public class GlobalExceptionMapper extends AbstractExceptionMapper implements javax.ws.rs.ext.ExceptionMapper<Throwable> { +public class GlobalExceptionMapper extends AbstractExceptionMapper implements jakarta.ws.rs.ext.ExceptionMapper<Throwable> { /** * Module Name Used for debugging diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java index 50b860b4f..ccd5515c4 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java @@ -18,9 +18,9 @@ *******************************************************************************/ package org.apache.ofbiz.ws.rs.spi.impl; -import javax.ws.rs.core.Link; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java index 291e65be6..0990002f0 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/JsonifiedParamConverterProvider.java @@ -24,11 +24,11 @@ import java.util.HashMap; import java.util.Map; import jakarta.servlet.http.HttpServletRequest; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.ParamConverter; -import javax.ws.rs.ext.ParamConverterProvider; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.ParamConverter; +import jakarta.ws.rs.ext.ParamConverterProvider; +import jakarta.ws.rs.ext.Provider; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java index 590d5a517..9c4b2768d 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java @@ -21,13 +21,13 @@ package org.apache.ofbiz.ws.rs.spi.impl; import java.io.IOException; import java.util.Map.Entry; -import javax.ws.rs.core.Link; +import jakarta.ws.rs.core.Link; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -public class LinkSerializer extends JsonSerializer<javax.ws.rs.core.Link> { +public class LinkSerializer extends JsonSerializer<jakarta.ws.rs.core.Link> { static final String HREF_PROPERTY = "href"; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java index 1842175f5..3740944d0 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java index a9e49ec3f..23a1d8c13 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilMisc; @@ -210,7 +210,7 @@ public final class OpenApiUtil { + AuthenticationScheme.BEARER.getScheme() + " realm=\"" + AuthenticationScheme.REALM + "\"")) .description("Unauthorized: Access is denied due to invalid or absent Authorization header.") .content(new Content() - .addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() + .addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() .schema(new Schema<>() .$ref("#/components/schemas/" + "api.response.unauthorized.noheader")) .example(unauthorizedNoHeaderExample))); @@ -218,7 +218,7 @@ public final class OpenApiUtil { final ApiResponse unauthorizedInvalidToken = new ApiResponse() .description("Unauthorized: Access is denied due to invalid or absent Authorization header.") .content(new Content() - .addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() + .addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() .schema(new Schema<>() .$ref("#/components/schemas/" + "api.response.unauthorized.invalidtoken")) .example(unauthorizedInvalidTokenExample))); @@ -229,14 +229,14 @@ public final class OpenApiUtil { + AuthenticationScheme.BEARER.getScheme() + " realm=\"" + AuthenticationScheme.REALM + "\"")) .description("Forbidden: Insufficient rights to perform this API call.") .content(new Content() - .addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() + .addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() .schema(new Schema<>().$ref("#/components/schemas/" + "api.response.forbidden")) .example(forbiddenExample))); final ApiResponse badRequest = new ApiResponse() .description("Bad Request: Due to malformed request syntax or invalid request message framing or incorrect request parameters.") .content(new Content() - .addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() + .addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() .schema(new Schema<>() .$ref("#/components/schemas/" + "api.response.service.badrequest")) .example(badRequestExample))); @@ -244,7 +244,7 @@ public final class OpenApiUtil { final ApiResponse unprocessableEntity = new ApiResponse() .description("Unprocessable Entity: Error indicating semantical errors. Request is syntactically correct though.") .content(new Content() - .addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() + .addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() .schema(new Schema<>() .$ref("#/components/schemas/" + "api.response.service.unprocessableentity")) .example(unprocessableEntExample))); @@ -252,7 +252,7 @@ public final class OpenApiUtil { final ApiResponse methodNotAllowed = new ApiResponse() .description("Method Not Allowed: Service called with HTTP method other than the declared one.") .content(new Content() - .addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() + .addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() .schema(new Schema<>() .$ref("#/components/schemas/" + "api.response.service.methodnotallowed")) .example(methodNotAllowedExample))); @@ -397,7 +397,7 @@ public final class OpenApiUtil { final ApiResponse success = new ApiResponse() .description("Success response for the API call.") .content(new Content() - .addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() + .addMediaType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON, new MediaType() .schema(new Schema<>().$ref("#/components/schemas/" + "api.response." + service.getName() + ".success")))); return success; } diff --git a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java index fb7edbae1..70109a55a 100644 --- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java +++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java @@ -23,10 +23,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.ws.rs.response.Error; diff --git a/rest-api/webapp/rest-api/WEB-INF/web.xml b/rest-api/webapp/rest-api/WEB-INF/web.xml index f4038fdd7..28a09a2d1 100644 --- a/rest-api/webapp/rest-api/WEB-INF/web.xml +++ b/rest-api/webapp/rest-api/WEB-INF/web.xml @@ -31,26 +31,24 @@ under the License. <param-name>entityDelegatorName</param-name><param-value>default</param-value> </context-param> <filter> - <filter-name>Jersey REST Filter</filter-name> - <filter-class>org.glassfish.jersey.servlet.ServletContainer - </filter-class> - <init-param> - <param-name>javax.ws.rs.Application</param-name> - <param-value>org.apache.ofbiz.ws.rs.core.OFBizApiConfig - </param-value> - </init-param> - <init-param> - <param-name>jersey.config.servlet.filter.staticContentRegex</param-name> - <param-value>/swagger/.*</param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>Jersey REST Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <listener> - <listener-class> - org.apache.ofbiz.ws.rs.listener.ApiContextListener - </listener-class> - </listener> + <filter-name>Jersey REST Filter</filter-name> + <filter-class>org.glassfish.jersey.servlet.ServletContainer</filter-class> + <init-param> + <param-name>jakarta.ws.rs.Application</param-name> + <param-value>org.apache.ofbiz.ws.rs.core.OFBizApiConfig</param-value> + </init-param> + <init-param> + <param-name>jersey.config.servlet.filter.staticContentRegex</param-name> + <param-value>/swagger/.*</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>Jersey REST Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <listener> + <listener-class> + org.apache.ofbiz.ws.rs.listener.ApiContextListener + </listener-class> + </listener> </web-app>
