diff --git a/samples/samples-httpservice/authentication/pom.xml b/samples/samples-httpservice/authentication/pom.xml index b462a65698..8b1554c25e 100644 --- a/samples/samples-httpservice/authentication/pom.xml +++ b/samples/samples-httpservice/authentication/pom.xml @@ -43,16 +43,16 @@ org.ops4j.pax.web.samples.authentication.internal.Activator - - javax.servlet;version="[3.1,5)", - javax.servlet.http;version="[3.1,5)", + + jakarta.servlet;version="[6,7)", + jakarta.servlet.http;version="[6,7)", - - org.osgi.framework;version="[1.8,2)", + + org.osgi.framework;version="[1.10,2)", org.osgi.util.tracker;version="[1.5,2)", - - org.osgi.service.http;version="[1.2,2)" + + org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}" org.ops4j.pax.web.samples.authentication.* @@ -64,6 +64,14 @@ + + + + org.ops4j.pax.web + pax-web-api + provided + + @@ -73,11 +81,11 @@ org.osgi - osgi.cmpn + org.osgi.service.servlet provided - + jakarta.servlet diff --git a/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/AuthHttpContext.java b/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/AuthHttpContext.java index 56210d84d3..ab14816a19 100644 --- a/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/AuthHttpContext.java +++ b/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/AuthHttpContext.java @@ -18,10 +18,10 @@ import java.io.IOException; import java.net.URL; import java.util.Base64; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.osgi.service.http.HttpContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.ops4j.pax.web.service.http.HttpContext; /** * Created by IntelliJ IDEA. User: alin.dreghiciu Date: Dec 10, 2007 Time: diff --git a/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/StatusServlet.java b/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/StatusServlet.java index 8726ad4ee9..103f55fb8d 100644 --- a/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/StatusServlet.java +++ b/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/StatusServlet.java @@ -17,12 +17,11 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.osgi.service.http.HttpContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.ops4j.pax.web.service.http.HttpContext; public class StatusServlet extends HttpServlet { diff --git a/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/internal/Activator.java b/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/internal/Activator.java index f4f009fa46..f481904fed 100644 --- a/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/internal/Activator.java +++ b/samples/samples-httpservice/authentication/src/main/java/org/ops4j/pax/web/samples/authentication/internal/Activator.java @@ -20,9 +20,9 @@ import org.ops4j.pax.web.samples.authentication.AuthHttpContext; import org.ops4j.pax.web.samples.authentication.StatusServlet; +import org.ops4j.pax.web.service.http.HttpService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; -import org.osgi.service.http.HttpService; import org.osgi.util.tracker.ServiceTracker; /** diff --git a/samples/samples-httpservice/hs-1/pom.xml b/samples/samples-httpservice/hs-1/pom.xml index 93afad706a..a9a2fba1c9 100644 --- a/samples/samples-httpservice/hs-1/pom.xml +++ b/samples/samples-httpservice/hs-1/pom.xml @@ -43,16 +43,16 @@ org.ops4j.pax.web.samples.helloworld.hs1.internal.Activator - - javax.servlet;version="[3.1,5)", - javax.servlet.http;version="[3.1,5)", + + jakarta.servlet;version="[6,7)", + jakarta.servlet.http;version="[6,7)", - - org.osgi.framework;version="[1.8,2)", + + org.osgi.framework;version="[1.10,2)", org.osgi.util.tracker;version="[1.5,2)", - - org.osgi.service.http;version="[1.2,2)" + + org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}" org.ops4j.pax.web.samples.helloworld.hs1.internal @@ -64,6 +64,14 @@ + + + + org.ops4j.pax.web + pax-web-api + provided + + @@ -73,11 +81,11 @@ org.osgi - osgi.cmpn + org.osgi.service.servlet provided - + jakarta.servlet diff --git a/samples/samples-httpservice/hs-1/src/main/java/org/ops4j/pax/web/samples/helloworld/hs1/internal/Activator.java b/samples/samples-httpservice/hs-1/src/main/java/org/ops4j/pax/web/samples/helloworld/hs1/internal/Activator.java index fa7fc9470e..cd604a568b 100644 --- a/samples/samples-httpservice/hs-1/src/main/java/org/ops4j/pax/web/samples/helloworld/hs1/internal/Activator.java +++ b/samples/samples-httpservice/hs-1/src/main/java/org/ops4j/pax/web/samples/helloworld/hs1/internal/Activator.java @@ -15,10 +15,10 @@ */ package org.ops4j.pax.web.samples.helloworld.hs1.internal; +import org.ops4j.pax.web.service.http.HttpService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.osgi.service.http.HttpService; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; diff --git a/samples/samples-httpservice/hs-1/src/main/java/org/ops4j/pax/web/samples/helloworld/hs1/internal/HelloWorldServlet.java b/samples/samples-httpservice/hs-1/src/main/java/org/ops4j/pax/web/samples/helloworld/hs1/internal/HelloWorldServlet.java index a06087dd29..60b9e46dd9 100644 --- a/samples/samples-httpservice/hs-1/src/main/java/org/ops4j/pax/web/samples/helloworld/hs1/internal/HelloWorldServlet.java +++ b/samples/samples-httpservice/hs-1/src/main/java/org/ops4j/pax/web/samples/helloworld/hs1/internal/HelloWorldServlet.java @@ -17,9 +17,9 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class HelloWorldServlet extends HttpServlet { diff --git a/samples/samples-httpservice/hs-2/pom.xml b/samples/samples-httpservice/hs-2/pom.xml index c7a317ab1d..5d20ae1c5b 100644 --- a/samples/samples-httpservice/hs-2/pom.xml +++ b/samples/samples-httpservice/hs-2/pom.xml @@ -43,16 +43,16 @@ org.ops4j.pax.web.samples.helloworld.hs2.internal.Activator - - javax.servlet;version="[3.1,5)", - javax.servlet.http;version="[3.1,5)", + + jakarta.servlet;version="[6,7)", + jakarta.servlet.http;version="[6,7)", - - org.osgi.framework;version="[1.8,2)", + + org.osgi.framework;version="[1.10,2)", org.osgi.util.tracker;version="[1.5,2)", - - org.osgi.service.http;version="[1.2,2)" + + org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}" org.ops4j.pax.web.samples.helloworld.hs2.internal @@ -64,6 +64,14 @@ + + + + org.ops4j.pax.web + pax-web-api + provided + + @@ -73,11 +81,11 @@ org.osgi - osgi.cmpn + org.osgi.service.servlet provided - + jakarta.servlet diff --git a/samples/samples-httpservice/hs-2/src/main/java/org/ops4j/pax/web/samples/helloworld/hs2/internal/Activator.java b/samples/samples-httpservice/hs-2/src/main/java/org/ops4j/pax/web/samples/helloworld/hs2/internal/Activator.java index 339b458118..873f0b9e18 100644 --- a/samples/samples-httpservice/hs-2/src/main/java/org/ops4j/pax/web/samples/helloworld/hs2/internal/Activator.java +++ b/samples/samples-httpservice/hs-2/src/main/java/org/ops4j/pax/web/samples/helloworld/hs2/internal/Activator.java @@ -15,10 +15,10 @@ */ package org.ops4j.pax.web.samples.helloworld.hs2.internal; +import org.ops4j.pax.web.service.http.HttpService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.osgi.service.http.HttpService; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; diff --git a/samples/samples-httpservice/hs-2/src/main/java/org/ops4j/pax/web/samples/helloworld/hs2/internal/HelloWorldServlet.java b/samples/samples-httpservice/hs-2/src/main/java/org/ops4j/pax/web/samples/helloworld/hs2/internal/HelloWorldServlet.java index 22eea1c934..9686f6a212 100644 --- a/samples/samples-httpservice/hs-2/src/main/java/org/ops4j/pax/web/samples/helloworld/hs2/internal/HelloWorldServlet.java +++ b/samples/samples-httpservice/hs-2/src/main/java/org/ops4j/pax/web/samples/helloworld/hs2/internal/HelloWorldServlet.java @@ -17,9 +17,9 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class HelloWorldServlet extends HttpServlet { diff --git a/samples/samples-httpservice/hs-for-war-default/pom.xml b/samples/samples-httpservice/hs-for-war-default/pom.xml index 3808374f20..f68ecce757 100644 --- a/samples/samples-httpservice/hs-for-war-default/pom.xml +++ b/samples/samples-httpservice/hs-for-war-default/pom.xml @@ -43,16 +43,16 @@ org.ops4j.pax.web.samples.helloworld.Activator - - javax.servlet;version="[3.1,5)", - javax.servlet.http;version="[3.1,5)", + + jakarta.servlet;version="[6,7)", + jakarta.servlet.http;version="[6,7)", - - org.osgi.framework;version="[1.8,2)", + + org.osgi.framework;version="[1.10,2)", org.osgi.util.tracker;version="[1.5,2)", - - org.osgi.service.http;version="[1.2,2)" + + org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}" org.ops4j.pax.web.samples.helloworld @@ -63,6 +63,14 @@ + + + + org.ops4j.pax.web + pax-web-api + provided + + @@ -72,11 +80,11 @@ org.osgi - osgi.cmpn + org.osgi.service.servlet provided - + jakarta.servlet diff --git a/samples/samples-httpservice/hs-for-war-default/src/main/java/org/ops4j/pax/web/samples/helloworld/Activator.java b/samples/samples-httpservice/hs-for-war-default/src/main/java/org/ops4j/pax/web/samples/helloworld/Activator.java index 03c0b024d4..8fb49602b8 100644 --- a/samples/samples-httpservice/hs-for-war-default/src/main/java/org/ops4j/pax/web/samples/helloworld/Activator.java +++ b/samples/samples-httpservice/hs-for-war-default/src/main/java/org/ops4j/pax/web/samples/helloworld/Activator.java @@ -15,10 +15,10 @@ */ package org.ops4j.pax.web.samples.helloworld; +import org.ops4j.pax.web.service.http.HttpService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.osgi.service.http.HttpService; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; diff --git a/samples/samples-httpservice/hs-for-war-default/src/main/java/org/ops4j/pax/web/samples/helloworld/HelloWorldServlet.java b/samples/samples-httpservice/hs-for-war-default/src/main/java/org/ops4j/pax/web/samples/helloworld/HelloWorldServlet.java index a8294ed7b1..ab8eee4456 100644 --- a/samples/samples-httpservice/hs-for-war-default/src/main/java/org/ops4j/pax/web/samples/helloworld/HelloWorldServlet.java +++ b/samples/samples-httpservice/hs-for-war-default/src/main/java/org/ops4j/pax/web/samples/helloworld/HelloWorldServlet.java @@ -17,9 +17,9 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public class HelloWorldServlet extends HttpServlet { diff --git a/samples/samples-httpservice/hs-helloworld/pom.xml b/samples/samples-httpservice/hs-helloworld/pom.xml index daf21152b0..55f8324785 100644 --- a/samples/samples-httpservice/hs-helloworld/pom.xml +++ b/samples/samples-httpservice/hs-helloworld/pom.xml @@ -43,16 +43,16 @@ org.ops4j.pax.web.samples.helloworld.hs.internal.Activator - - javax.servlet;version="[3.1,5)", - javax.servlet.http;version="[3.1,5)", + + jakarta.servlet;version="[6,7)", + jakarta.servlet.http;version="[6,7)", - - org.osgi.framework;version="[1.8,2)", + + org.osgi.framework;version="[1.10,2)", org.osgi.util.tracker;version="[1.5,2)", - - org.osgi.service.http;version="[1.2,2)" + + org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}" org.ops4j.pax.web.samples.helloworld.hs.internal @@ -64,6 +64,14 @@ + + + + org.ops4j.pax.web + pax-web-api + provided + + @@ -73,11 +81,11 @@ org.osgi - osgi.cmpn + org.osgi.service.servlet provided - + jakarta.servlet diff --git a/samples/samples-httpservice/hs-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/hs/internal/Activator.java b/samples/samples-httpservice/hs-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/hs/internal/Activator.java index b6a7623b99..621fcf2688 100644 --- a/samples/samples-httpservice/hs-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/hs/internal/Activator.java +++ b/samples/samples-httpservice/hs-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/hs/internal/Activator.java @@ -18,11 +18,11 @@ import java.util.Dictionary; import java.util.Hashtable; +import org.ops4j.pax.web.service.http.HttpContext; +import org.ops4j.pax.web.service.http.HttpService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.osgi.service.http.HttpContext; -import org.osgi.service.http.HttpService; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; diff --git a/samples/samples-httpservice/hs-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/hs/internal/HelloWorldServlet.java b/samples/samples-httpservice/hs-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/hs/internal/HelloWorldServlet.java index 8dc34ab799..6e9bb47e7c 100644 --- a/samples/samples-httpservice/hs-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/hs/internal/HelloWorldServlet.java +++ b/samples/samples-httpservice/hs-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/hs/internal/HelloWorldServlet.java @@ -17,9 +17,9 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Hello World Servlet. diff --git a/samples/samples-httpservice/hs-jersey/pom.xml b/samples/samples-httpservice/hs-jersey/pom.xml index ac16d5a635..3e94e2df3a 100644 --- a/samples/samples-httpservice/hs-jersey/pom.xml +++ b/samples/samples-httpservice/hs-jersey/pom.xml @@ -43,10 +43,10 @@ org.ops4j.pax.web.samples.jersey.TestActivator - javax.servlet.*;version="[3.1,5)", + jakarta.servlet.*;version="[6,7)", - - org.osgi.framework;version="[1.8,2)", + + org.osgi.framework;version="[1.10,2)", org.osgi.util.tracker;version="[1.5,2)", * @@ -78,11 +78,11 @@ org.osgi - osgi.cmpn + org.osgi.service.servlet provided - + jakarta.servlet diff --git a/samples/samples-httpservice/hs-jersey/src/main/java/org/ops4j/pax/web/samples/jersey/CustomHttpContext.java b/samples/samples-httpservice/hs-jersey/src/main/java/org/ops4j/pax/web/samples/jersey/CustomHttpContext.java index dc557d9dc6..be6cfa215b 100644 --- a/samples/samples-httpservice/hs-jersey/src/main/java/org/ops4j/pax/web/samples/jersey/CustomHttpContext.java +++ b/samples/samples-httpservice/hs-jersey/src/main/java/org/ops4j/pax/web/samples/jersey/CustomHttpContext.java @@ -18,10 +18,10 @@ import java.io.IOException; import java.net.URL; import java.util.logging.Logger; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.osgi.framework.Bundle; import org.osgi.service.http.HttpContext; diff --git a/samples/samples-httpservice/hs-jersey/src/main/java/org/ops4j/pax/web/samples/jersey/RootResource.java b/samples/samples-httpservice/hs-jersey/src/main/java/org/ops4j/pax/web/samples/jersey/RootResource.java index 1bcbffbe90..9db8866c18 100644 --- a/samples/samples-httpservice/hs-jersey/src/main/java/org/ops4j/pax/web/samples/jersey/RootResource.java +++ b/samples/samples-httpservice/hs-jersey/src/main/java/org/ops4j/pax/web/samples/jersey/RootResource.java @@ -15,8 +15,8 @@ */ package org.ops4j.pax.web.samples.jersey; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/samples/samples-httpservice/http-custom-context/pom.xml b/samples/samples-httpservice/http-custom-context/pom.xml index 93e45dce14..b2fda31fbb 100644 --- a/samples/samples-httpservice/http-custom-context/pom.xml +++ b/samples/samples-httpservice/http-custom-context/pom.xml @@ -45,16 +45,16 @@ - - javax.servlet;version="[3.1,5)", - javax.servlet.http;version="[3.1,5)", + + jakarta.servlet;version="[6,7)", + jakarta.servlet.http;version="[6,7)", - - org.osgi.framework;version="[1.8,2)", + + org.osgi.framework;version="[1.10,2)", org.osgi.util.tracker;version="[1.5,2)", - - org.osgi.service.http;version="[1.2,2)" + + org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}" org.ops4j.pax.web.samples.custom.context @@ -83,11 +83,11 @@ org.osgi - osgi.cmpn + org.osgi.service.servlet provided - + jakarta.servlet diff --git a/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/Activator.java b/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/Activator.java index ae16151806..d17c016ad6 100644 --- a/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/Activator.java +++ b/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/Activator.java @@ -21,12 +21,12 @@ import java.util.logging.Logger; import org.ops4j.pax.web.service.PaxWebConstants; +import org.ops4j.pax.web.service.http.HttpContext; +import org.ops4j.pax.web.service.http.HttpService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; -import org.osgi.service.http.HttpContext; -import org.osgi.service.http.HttpService; import org.osgi.util.tracker.ServiceTracker; public class Activator implements BundleActivator { diff --git a/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/CustomHttpContext.java b/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/CustomHttpContext.java index 22d4663ee3..a33c1f9d34 100644 --- a/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/CustomHttpContext.java +++ b/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/CustomHttpContext.java @@ -18,13 +18,13 @@ import java.io.IOException; import java.net.URL; import java.util.logging.Logger; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import org.ops4j.pax.web.service.http.HttpContext; import org.osgi.framework.Bundle; -import org.osgi.service.http.HttpContext; class CustomHttpContext implements HttpContext { diff --git a/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/HelloServlet.java b/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/HelloServlet.java index 675529b03a..451f07d208 100644 --- a/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/HelloServlet.java +++ b/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/HelloServlet.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Hello World Servlet. diff --git a/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/HelloSessionListener.java b/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/HelloSessionListener.java index 02d17e6736..31e4a50ef1 100644 --- a/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/HelloSessionListener.java +++ b/samples/samples-httpservice/http-custom-context/src/main/java/org/ops4j/pax/web/samples/custom/context/HelloSessionListener.java @@ -21,9 +21,9 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; /** * User Session Listener. diff --git a/samples/samples-httpservice/pom.xml b/samples/samples-httpservice/pom.xml index 77b402f3bf..d082166500 100644 --- a/samples/samples-httpservice/pom.xml +++ b/samples/samples-httpservice/pom.xml @@ -39,7 +39,7 @@ wc-helloworld authentication http-custom-context - hs-jersey + hs-1 hs-2 hs-for-war-default diff --git a/samples/samples-httpservice/wc-helloworld/pom.xml b/samples/samples-httpservice/wc-helloworld/pom.xml index cb6a027cc7..b659ccb2e0 100644 --- a/samples/samples-httpservice/wc-helloworld/pom.xml +++ b/samples/samples-httpservice/wc-helloworld/pom.xml @@ -43,16 +43,16 @@ org.ops4j.pax.web.samples.helloworld.wc.internal.Activator - - javax.servlet;version="[3.1,5)", - javax.servlet.http;version="[3.1,5)", + + jakarta.servlet;version="[6,7)", + jakarta.servlet.http;version="[6,7)", - - org.osgi.framework;version="[1.8,2)", + + org.osgi.framework;version="[1.10,2)", org.osgi.util.tracker;version="[1.5,2)", - - org.osgi.service.http;version="[1.2,2)", + + org.ops4j.pax.web.service.http;version="${pax-web.osgi.version}" org.ops4j.pax.web.service;version="${pax-web.osgi.version}" @@ -84,11 +84,11 @@ org.osgi - osgi.cmpn + org.osgi.service.servlet provided - + jakarta.servlet diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/Activator.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/Activator.java index e88f57ee98..d06afdc58b 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/Activator.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/Activator.java @@ -20,10 +20,10 @@ import java.util.Hashtable; import org.ops4j.pax.web.service.WebContainer; +import org.ops4j.pax.web.service.http.HttpContext; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.osgi.service.http.HttpContext; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldErrorMakerServlet.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldErrorMakerServlet.java index aa0beb2b70..b74be2d681 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldErrorMakerServlet.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldErrorMakerServlet.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Hello World Error Maker Servlet. Creates exceptions based on a request diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldErrorServlet.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldErrorServlet.java index d8c6041f74..dc0b959bbf 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldErrorServlet.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldErrorServlet.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Hello World Error Page Servlet. @@ -58,12 +58,12 @@ protected void doGet(final HttpServletRequest request, final HttpServletResponse writer.println("

Error attributes:

"); writer.println(""); writer.println(""); - printAttribute(writer, request, "javax.servlet.error.exception"); - printAttribute(writer, request, "javax.servlet.error.exception_type"); - printAttribute(writer, request, "javax.servlet.error.message"); - printAttribute(writer, request, "javax.servlet.error.request_uri"); - printAttribute(writer, request, "javax.servlet.error.servlet_name"); - printAttribute(writer, request, "javax.servlet.error.status_code"); + printAttribute(writer, request, "jakarta.servlet.error.exception"); + printAttribute(writer, request, "jakarta.servlet.error.exception_type"); + printAttribute(writer, request, "jakarta.servlet.error.message"); + printAttribute(writer, request, "jakarta.servlet.error.request_uri"); + printAttribute(writer, request, "jakarta.servlet.error.servlet_name"); + printAttribute(writer, request, "jakarta.servlet.error.status_code"); writer.println("
Request attribute nameValue
"); writer.println(""); } diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldFilter.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldFilter.java index 3cc15d7043..26ef96bf0c 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldFilter.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldFilter.java @@ -18,12 +18,12 @@ import java.io.IOException; import java.io.PrintWriter; -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 jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * Hello World Filter. Sets content type, page title and html tag. diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldListener.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldListener.java index 497357bf76..586a1e73e1 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldListener.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldListener.java @@ -16,9 +16,9 @@ */ package org.ops4j.pax.web.samples.helloworld.wc.internal; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequestEvent; -import javax.servlet.ServletRequestListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequestEvent; +import jakarta.servlet.ServletRequestListener; /** * Hello World Request Listener. Counts each request and stores the value in diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldServlet.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldServlet.java index acbed24431..face00c899 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldServlet.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldServlet.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; /** * Hello World Servlet. diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldSessionListener.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldSessionListener.java index de6b0f94ca..b751c95cf9 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldSessionListener.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldSessionListener.java @@ -20,9 +20,9 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; /** * User Session Listener. diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldStartupSilentServlet.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldStartupSilentServlet.java index 9c57638581..f57830dfc5 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldStartupSilentServlet.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldStartupSilentServlet.java @@ -16,8 +16,8 @@ */ package org.ops4j.pax.web.samples.helloworld.wc.internal; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; /** * Hello World Servlet. diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldStartupTalkativeServlet.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldStartupTalkativeServlet.java index eeacb258a7..e8f5fc816b 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldStartupTalkativeServlet.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/HelloWorldStartupTalkativeServlet.java @@ -18,10 +18,10 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Hello World Servlet. diff --git a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/UserSessionListener.java b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/UserSessionListener.java index be023a4492..9491a5cbde 100644 --- a/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/UserSessionListener.java +++ b/samples/samples-httpservice/wc-helloworld/src/main/java/org/ops4j/pax/web/samples/helloworld/wc/internal/UserSessionListener.java @@ -20,9 +20,9 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; /** * User Session Listener.