[#1802] Switch samples-jsf from javax to jakarta

ops4j · Jun 21, 2023 · b69a627 · b69a627
1 parent 103c058
commit b69a627
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/samples/samples-jsf/jsf-resourcehandler/jsf-resourcehandler-myfaces/pom.xml b/samples/samples-jsf/jsf-resourcehandler/jsf-resourcehandler-myfaces/pom.xml
@@ -76,11 +76,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
-			<artifactId>osgi.cmpn</artifactId>
+			<artifactId>org.osgi.service.servlet</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/samples/samples-jsf/war-jsf23-cdi/pom.xml b/samples/samples-jsf/war-jsf23-cdi/pom.xml
@@ -49,7 +49,7 @@
 						<Import-Package>
 							javax.enterprise.context,
 							javax.inject,
-							javax.servlet.*;version="[3.1,5)",
+							jakarta.servlet.*;version="[3.1,5)",
 							javax.faces.annotation,
 							javax.faces.bean,
 							javax.faces.view,
@@ -92,8 +92,8 @@
 								org.apache.aries.cdi.extension.el.jsp.ELJSPExtension CDI extension
 								which registers anonymous ServletContextListener
 								which calls:
-								 - javax.servlet.jsp.JspApplicationContext.addELResolver(javax.enterprise.inject.spi.BeanManager.getELResolver())
-								 - javax.servlet.jsp.JspApplicationContext.addELContextListener(new org.jboss.weld.module.web.el.WeldELContextListener())
+								 - jakarta.servlet.jsp.JspApplicationContext.addELResolver(javax.enterprise.inject.spi.BeanManager.getELResolver())
+								 - jakarta.servlet.jsp.JspApplicationContext.addELContextListener(new org.jboss.weld.module.web.el.WeldELContextListener())
 							-->
 							osgi.cdi.extension;filter:="(osgi.cdi.extension=aries.cdi.el.jsp)"
 						</Require-Capability>
@@ -136,7 +136,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/...jsf/war-jsf23-cdi/src/main/java/org/ops4j/pax/web/samples/warjsf23cdi/EncodingFilter.java b/...jsf/war-jsf23-cdi/src/main/java/org/ops4j/pax/web/samples/warjsf23cdi/EncodingFilter.java
@@ -19,12 +19,12 @@
 package org.ops4j.pax.web.samples.warjsf23cdi;
 
 import java.io.IOException;
-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;
 
 public class EncodingFilter implements Filter {
 

diff --git a/samples/samples-jsf/war-jsf23-embedded/pom.xml b/samples/samples-jsf/war-jsf23-embedded/pom.xml
@@ -55,11 +55,11 @@
 					</supportedProjectTypes>
 					<instructions>
 						<Import-Package>
-							javax.el,
+							jakarta.el,
 							javax.websocket.*,
-							javax.servlet.jsp.jstl.*;version="1.2",
-							javax.servlet.jsp.*;version="2.3",
-							javax.servlet.*;version="[3.1,5)",
+							jakarta.servlet.jsp.jstl.*;version="1.2",
+							jakarta.servlet.jsp.*;version="2.3",
+							jakarta.servlet.*;version="[3.1,5)",
 							javax.naming,
 
 							<!-- for InstanceManager needed by MyFaces' Tomcat7AnnotationInjectionProvider -->
@@ -109,7 +109,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/...f/war-jsf23-embedded/src/main/java/org/ops4j/pax/web/samples/warjsf23/EncodingFilter.java b/...f/war-jsf23-embedded/src/main/java/org/ops4j/pax/web/samples/warjsf23/EncodingFilter.java
@@ -19,12 +19,12 @@
 package org.ops4j.pax.web.samples.warjsf23;
 
 import java.io.IOException;
-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;
 
 public class EncodingFilter implements Filter {
 

diff --git a/samples/samples-jsf/war-jsf23-wired/pom.xml b/samples/samples-jsf/war-jsf23-wired/pom.xml
@@ -88,7 +88,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/samples/samples-jsf/war-primefaces-embedded/pom.xml b/samples/samples-jsf/war-primefaces-embedded/pom.xml
@@ -55,11 +55,11 @@
 					</supportedProjectTypes>
 					<instructions>
 						<Import-Package>
-							javax.el,
+							jakarta.el,
 							javax.websocket.*,
-							javax.servlet.jsp.jstl.*;version="1.2",
-							javax.servlet.jsp.*;version="2.3",
-							javax.servlet.*;version="[3.1,5)",
+							jakarta.servlet.jsp.jstl.*;version="1.2",
+							jakarta.servlet.jsp.*;version="2.3",
+							jakarta.servlet.*;version="[3.1,5)",
 							javax.naming,
 
 							<!-- for InstanceManager needed by MyFaces' Tomcat7AnnotationInjectionProvider -->
@@ -110,7 +110,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/samples/samples-jsf/war-primefaces-wired/pom.xml b/samples/samples-jsf/war-primefaces-wired/pom.xml
@@ -90,7 +90,7 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>