From f4e4479785813bc05b3ddb41bcc652d275dc7d23 Mon Sep 17 00:00:00 2001 From: Tara Drwenski Date: Thu, 15 Aug 2024 16:10:27 -0600 Subject: [PATCH] Use jakarta namespace (since jakarta servlet was updated in the tds) --- .../metadata/controller/AbstractMetadataController.java | 8 ++++---- .../server/metadata/controller/IMetadataContoller.java | 6 +++--- .../thredds/server/metadata/controller/IsoController.java | 6 +++--- .../server/metadata/controller/NcmlController.java | 6 +++--- .../server/metadata/controller/UddcController.java | 6 +++--- .../server/metadata/util/DatasetHandlerAdapter.java | 4 ++-- .../src/test/java/thredds/server/metadata/NcIsoIT.java | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/AbstractMetadataController.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/AbstractMetadataController.java index 2e4a3fa..0c11d61 100644 --- a/tds-plugin/src/main/java/thredds/server/metadata/controller/AbstractMetadataController.java +++ b/tds-plugin/src/main/java/thredds/server/metadata/controller/AbstractMetadataController.java @@ -5,10 +5,10 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.context.ServletContextAware; diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/IMetadataContoller.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/IMetadataContoller.java index 57d7060..22d91e5 100644 --- a/tds-plugin/src/main/java/thredds/server/metadata/controller/IMetadataContoller.java +++ b/tds-plugin/src/main/java/thredds/server/metadata/controller/IMetadataContoller.java @@ -30,9 +30,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * IMetadataContoller diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/IsoController.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/IsoController.java index 6891633..1f694a8 100644 --- a/tds-plugin/src/main/java/thredds/server/metadata/controller/IsoController.java +++ b/tds-plugin/src/main/java/thredds/server/metadata/controller/IsoController.java @@ -35,9 +35,9 @@ import java.io.StringWriter; import java.io.Writer; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/NcmlController.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/NcmlController.java index 650fe0f..7714215 100644 --- a/tds-plugin/src/main/java/thredds/server/metadata/controller/NcmlController.java +++ b/tds-plugin/src/main/java/thredds/server/metadata/controller/NcmlController.java @@ -31,9 +31,9 @@ import java.io.IOException; import java.io.Writer; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tds-plugin/src/main/java/thredds/server/metadata/controller/UddcController.java b/tds-plugin/src/main/java/thredds/server/metadata/controller/UddcController.java index 415cf7d..6e861ca 100644 --- a/tds-plugin/src/main/java/thredds/server/metadata/controller/UddcController.java +++ b/tds-plugin/src/main/java/thredds/server/metadata/controller/UddcController.java @@ -34,9 +34,9 @@ import java.io.StringWriter; import java.io.Writer; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/tds-plugin/src/main/java/thredds/server/metadata/util/DatasetHandlerAdapter.java b/tds-plugin/src/main/java/thredds/server/metadata/util/DatasetHandlerAdapter.java index ec25545..0dcc434 100644 --- a/tds-plugin/src/main/java/thredds/server/metadata/util/DatasetHandlerAdapter.java +++ b/tds-plugin/src/main/java/thredds/server/metadata/util/DatasetHandlerAdapter.java @@ -31,8 +31,8 @@ import java.io.FileNotFoundException; import java.io.IOException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import thredds.core.TdsRequestedDataset; import thredds.servlet.ServletUtil; diff --git a/tds-plugin/src/test/java/thredds/server/metadata/NcIsoIT.java b/tds-plugin/src/test/java/thredds/server/metadata/NcIsoIT.java index 857d5c7..542d0d0 100644 --- a/tds-plugin/src/test/java/thredds/server/metadata/NcIsoIT.java +++ b/tds-plugin/src/test/java/thredds/server/metadata/NcIsoIT.java @@ -9,7 +9,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test;