Skip to content

Commit 42a184d

Browse files
grgrzybekgrgrzybek
committed
[#1802] Switch samples-war from javax to jakarta
1 parent fda9cd0 commit 42a184d

File tree

103 files changed

+369
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+369
-364
lines changed

‎samples/samples-war/helloworld-servlet3/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<scope>provided</scope>
5353
</dependency>
5454

55-
<!-- JavaEE -->
55+
<!-- JakartaEE -->
5656

5757
<dependency>
5858
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/helloworld-servlet3/src/main/java/org/ops4j/web/samples/helloworld/servlet3/internal/DuplicateDefinitionServlet.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import java.io.IOException;
1919
import java.io.PrintWriter;
2020

21-
import javax.servlet.ServletException;
22-
import javax.servlet.annotation.WebServlet;
23-
import javax.servlet.http.HttpServlet;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
21+
import jakarta.servlet.ServletException;
22+
import jakarta.servlet.annotation.WebServlet;
23+
import jakarta.servlet.http.HttpServlet;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
@WebServlet(urlPatterns = {"/duplicate"})
2828
public class DuplicateDefinitionServlet extends HttpServlet {

‎samples/samples-war/helloworld-servlet3/src/main/java/org/ops4j/web/samples/helloworld/servlet3/internal/HelloWorld.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import java.io.IOException;
1919
import java.io.PrintWriter;
2020

21-
import javax.servlet.ServletException;
22-
import javax.servlet.annotation.WebServlet;
23-
import javax.servlet.http.HttpServlet;
24-
import javax.servlet.http.HttpServletRequest;
25-
import javax.servlet.http.HttpServletResponse;
21+
import jakarta.servlet.ServletException;
22+
import jakarta.servlet.annotation.WebServlet;
23+
import jakarta.servlet.http.HttpServlet;
24+
import jakarta.servlet.http.HttpServletRequest;
25+
import jakarta.servlet.http.HttpServletResponse;
2626

2727
@WebServlet(name = "helloWorld", urlPatterns = {"/hello", "/hello/filter"})
2828
public class HelloWorld extends HttpServlet {

‎samples/samples-war/helloworld-servlet3/src/main/java/org/ops4j/web/samples/helloworld/servlet3/internal/HelloWorldFilter.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818

1919
import java.io.IOException;
2020
import java.io.PrintWriter;
21-
import javax.servlet.Filter;
22-
import javax.servlet.FilterChain;
23-
import javax.servlet.FilterConfig;
24-
import javax.servlet.ServletException;
25-
import javax.servlet.ServletRequest;
26-
import javax.servlet.ServletResponse;
27-
import javax.servlet.annotation.WebFilter;
28-
import javax.servlet.annotation.WebInitParam;
21+
import jakarta.servlet.Filter;
22+
import jakarta.servlet.FilterChain;
23+
import jakarta.servlet.FilterConfig;
24+
import jakarta.servlet.ServletException;
25+
import jakarta.servlet.ServletRequest;
26+
import jakarta.servlet.ServletResponse;
27+
import jakarta.servlet.annotation.WebFilter;
28+
import jakarta.servlet.annotation.WebInitParam;
2929

3030
/**
3131
* Hello World Filter. Sets content type, page title and html tag.

‎samples/samples-war/jsp-filter/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</supportedProjectTypes>
4848
<instructions>
4949
<Import-Package>
50-
org.osgi.framework;version="[1.8,2)",
51-
javax.servlet.*;version="[3.1,5)",
50+
org.osgi.framework;version="[1.10,2)",
51+
jakarta.servlet.*;version="[6,7)",
5252
*
5353
</Import-Package>
5454
<Export-Package />
@@ -63,7 +63,7 @@
6363

6464
<dependencies>
6565

66-
<!-- JavaEE -->
66+
<!-- JakartaEE -->
6767

6868
<dependency>
6969
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/jsp-filter/src/main/java/org/ops4j/pax/web/jsp/filter/test/TestFilter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package org.ops4j.pax.web.jsp.filter.test;
1717

1818
import java.io.IOException;
19-
import javax.servlet.Filter;
20-
import javax.servlet.FilterChain;
21-
import javax.servlet.FilterConfig;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.ServletRequest;
24-
import javax.servlet.ServletResponse;
19+
import jakarta.servlet.Filter;
20+
import jakarta.servlet.FilterChain;
21+
import jakarta.servlet.FilterConfig;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.ServletRequest;
24+
import jakarta.servlet.ServletResponse;
2525

2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;

‎samples/samples-war/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
<module>war-required</module>
5252
<module>simple-filter</module>
5353
<module>war-authentication</module>
54-
<module>war-vaadin08</module>
55-
<module>war-vaadin08-spring</module>
54+
<!-- <module>war-vaadin08</module>-->
55+
<!-- <module>war-vaadin08-spring</module>-->
5656
<!-- <module>war-vaadin20-spring</module>-->
5757
<module>war-formauth</module>
5858
<module>wab-container-context-config</module>

‎samples/samples-war/simple-filter/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</supportedProjectTypes>
4848
<instructions>
4949
<Import-Package>
50-
org.osgi.framework;version="[1.8,2)",
51-
javax.servlet.*;version="[3.1,5)",
50+
org.osgi.framework;version="[1.10,2)",
51+
jakarta.servlet.*;version="[6,7)",
5252
*
5353
</Import-Package>
5454
<Private-Package>
@@ -72,7 +72,7 @@
7272
<scope>provided</scope>
7373
</dependency>
7474

75-
<!-- JavaEE -->
75+
<!-- JakartaEE -->
7676

7777
<dependency>
7878
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/simple-filter/src/main/java/org/ops4j/pax/web/simple/filter/test/TestFilter.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package org.ops4j.pax.web.simple.filter.test;
1717

1818
import java.io.IOException;
19-
import javax.servlet.Filter;
20-
import javax.servlet.FilterChain;
21-
import javax.servlet.FilterConfig;
22-
import javax.servlet.ServletException;
23-
import javax.servlet.ServletRequest;
24-
import javax.servlet.ServletResponse;
19+
import jakarta.servlet.Filter;
20+
import jakarta.servlet.FilterChain;
21+
import jakarta.servlet.FilterConfig;
22+
import jakarta.servlet.ServletException;
23+
import jakarta.servlet.ServletRequest;
24+
import jakarta.servlet.ServletResponse;
2525

2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;

‎samples/samples-war/wab-container-context-config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
org.apache.catalina;resolution:=optional,
4646
org.apache.catalina.connector;resolution:=optional,
4747
org.apache.catalina.valves;resolution:=optional,
48-
javax.servlet.http
48+
jakarta.servlet.http
4949
</Import-Package>
5050
<Web-ContextPath>/wab-container-context-config</Web-ContextPath>
5151
<_wab>src/main/webapp</_wab>

‎samples/samples-war/wab-container-context-config/src/main/java/org/ops4j/pax/web/tomcat/valves/TestValve.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.ops4j.pax.web.tomcat.valves;
1717

1818
import java.io.IOException;
19-
import javax.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.http.HttpServletResponse;
2020

2121
import org.apache.catalina.connector.Request;
2222
import org.apache.catalina.connector.Response;

‎samples/samples-war/war-authentication/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<artifactId>wc-helloworld</artifactId>
4343
</dependency>
4444

45-
<!-- JavaEE -->
45+
<!-- JakartaEE -->
4646

4747
<dependency>
4848
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/war-authentication/src/main/java/org/ops4j/pax/web/extender/samples/war/authenticate/ExampleServlet.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
import java.io.IOException;
1919
import java.io.PrintWriter;
20-
import javax.servlet.http.HttpServlet;
21-
import javax.servlet.http.HttpServletRequest;
22-
import javax.servlet.http.HttpServletResponse;
20+
import jakarta.servlet.http.HttpServlet;
21+
import jakarta.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletResponse;
2323

2424
public class ExampleServlet extends HttpServlet {
2525

‎samples/samples-war/war-default/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</supportedProjectTypes>
4848
<instructions>
4949
<Import-Package>
50-
org.osgi.framework;version="[1.8,2)",
50+
org.osgi.framework;version="[1.10,2)",
5151
org.ops4j.pax.web.samples.helloworld,
5252
*
5353
</Import-Package>
@@ -63,7 +63,7 @@
6363

6464
<dependencies>
6565

66-
<!-- JavaEE -->
66+
<!-- JakartaEE -->
6767

6868
<dependency>
6969
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/war-dispatch-jsp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<dependencies>
3737

38-
<!-- JavaEE -->
38+
<!-- JakartaEE -->
3939

4040
<dependency>
4141
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/war-dispatch-jsp/src/main/java/org/ops4j/pax/web/extender/samples/war/dispatch/jsp/ExampleServlet.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package org.ops4j.pax.web.extender.samples.war.dispatch.jsp;
1717

1818
import java.io.IOException;
19-
import javax.servlet.RequestDispatcher;
20-
import javax.servlet.ServletException;
21-
import javax.servlet.http.HttpServlet;
22-
import javax.servlet.http.HttpServletRequest;
23-
import javax.servlet.http.HttpServletRequestWrapper;
24-
import javax.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.RequestDispatcher;
20+
import jakarta.servlet.ServletException;
21+
import jakarta.servlet.http.HttpServlet;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletRequestWrapper;
24+
import jakarta.servlet.http.HttpServletResponse;
2525

2626
public class ExampleServlet extends HttpServlet {
2727

‎samples/samples-war/war-dispatcher/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</supportedProjectTypes>
4848
<instructions>
4949
<Import-Package>
50-
org.osgi.framework;version="[1.8,2)",
51-
javax.servlet.*;version="[3.1,5)",
50+
org.osgi.framework;version="[1.10,2)",
51+
jakarta.servlet.*;version="[6,7)",
5252
*
5353
</Import-Package>
5454
<Private-Package>
@@ -66,7 +66,7 @@
6666

6767
<dependencies>
6868

69-
<!-- JavaEE -->
69+
<!-- JakartaEE -->
7070

7171
<dependency>
7272
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/war-dispatcher/src/main/java/org/ops4j/pax/web/samples/war/osgi/JustDispatchServlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
package org.ops4j.pax.web.samples.war.osgi;
1717

1818
import java.io.IOException;
19-
import javax.servlet.ServletException;
20-
import javax.servlet.http.HttpServlet;
21-
import javax.servlet.http.HttpServletRequest;
22-
import javax.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.ServletException;
20+
import jakarta.servlet.http.HttpServlet;
21+
import jakarta.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletResponse;
2323

2424
public class JustDispatchServlet extends HttpServlet {
2525

‎samples/samples-war/war-formauth/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<artifactId>wc-helloworld</artifactId>
4343
</dependency>
4444

45-
<!-- JavaEE -->
45+
<!-- JakartaEE -->
4646

4747
<dependency>
4848
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/war-formauth/src/main/java/org/ops4j/pax/web/extender/samples/war/formauth/ExampleServlet.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
import java.io.IOException;
1919
import java.io.PrintWriter;
20-
import javax.servlet.http.HttpServlet;
21-
import javax.servlet.http.HttpServletRequest;
22-
import javax.servlet.http.HttpServletResponse;
20+
import jakarta.servlet.http.HttpServlet;
21+
import jakarta.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletResponse;
2323

2424
public class ExampleServlet extends HttpServlet {
2525

‎samples/samples-war/war-formauth/src/main/java/org/ops4j/pax/web/extender/samples/war/formauth/LogoutServlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
package org.ops4j.pax.web.extender.samples.war.formauth;
1717

1818
import java.io.IOException;
19-
import javax.servlet.ServletException;
20-
import javax.servlet.http.HttpServlet;
21-
import javax.servlet.http.HttpServletRequest;
22-
import javax.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.ServletException;
20+
import jakarta.servlet.http.HttpServlet;
21+
import jakarta.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletResponse;
2323

2424
public class LogoutServlet extends HttpServlet {
2525

‎samples/samples-war/war-http-methods/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<dependencies>
3737

38-
<!-- JavaEE -->
38+
<!-- JakartaEE -->
3939

4040
<dependency>
4141
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/war-http-methods/src/main/java/org/ops4j/pax/web/samples/war/methods/SimplestServlet.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package org.ops4j.pax.web.samples.war.methods;
1717

18-
import javax.servlet.http.HttpServlet;
19-
import javax.servlet.http.HttpServletRequest;
20-
import javax.servlet.http.HttpServletResponse;
18+
import jakarta.servlet.http.HttpServlet;
19+
import jakarta.servlet.http.HttpServletRequest;
20+
import jakarta.servlet.http.HttpServletResponse;
2121

2222
public class SimplestServlet extends HttpServlet {
2323

24-
// javax.servlet.http.HttpServlet.doOptions() checks which methods are overriden and constructs relevant
24+
// jakarta.servlet.http.HttpServlet.doOptions() checks which methods are overriden and constructs relevant
2525
// response with all methods supported
2626

2727
@Override

‎samples/samples-war/war-http2/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</supportedProjectTypes>
4848
<instructions>
4949
<Import-Package>
50-
org.osgi.framework;version="[1.8,2)",
51-
javax.servlet.*;version="[3.1,5)",
50+
org.osgi.framework;version="[1.10,2)",
51+
jakarta.servlet.*;version="[6,7)",
5252
sun.nio.ch;resolution:=optional,
5353
*
5454
</Import-Package>
@@ -67,7 +67,7 @@
6767

6868
<dependencies>
6969

70-
<!-- JavaEE -->
70+
<!-- JakartaEE -->
7171

7272
<dependency>
7373
<groupId>jakarta.servlet</groupId>

‎samples/samples-war/war-http2/src/main/java/org/ops4j/pax/web/samples/war/http2/PushAwareServlet.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717

1818
import java.io.IOException;
1919
import java.nio.charset.StandardCharsets;
20-
import javax.servlet.ServletException;
21-
import javax.servlet.http.HttpServlet;
22-
import javax.servlet.http.HttpServletRequest;
23-
import javax.servlet.http.HttpServletResponse;
24-
import javax.servlet.http.PushBuilder;
20+
import jakarta.servlet.ServletException;
21+
import jakarta.servlet.http.HttpServlet;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletResponse;
24+
import jakarta.servlet.http.PushBuilder;
2525

2626
public class PushAwareServlet extends HttpServlet {
2727

‎samples/samples-war/war-introspection-bundle/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<configuration>
7171
<instructions>
7272
<Import-Package>
73-
javax.servlet;version="[3.1,5)",
74-
javax.servlet.http;version="[3.1,5)"
73+
jakarta.servlet;version="[6,7)",
74+
jakarta.servlet.http;version="[6,7)"
7575
</Import-Package>
7676
<_wab>${project.build.directory}/war-introspection-bundle-${project.version}</_wab>
7777
<Web-ContextPath>/war-bundle</Web-ContextPath>
@@ -103,7 +103,7 @@
103103
<classifier>classes</classifier>
104104
</dependency>
105105

106-
<!-- JavaEE -->
106+
<!-- JakartaEE -->
107107

108108
<dependency>
109109
<groupId>jakarta.servlet</groupId>

0 commit comments

Comments
 (0)