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

ops4j · Jun 21, 2023 · 918c2fb · 918c2fb
1 parent 0f5d4da
commit 918c2fb
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/samples/samples-internal/initializers-fragment1/pom.xml b/samples/samples-internal/initializers-fragment1/pom.xml
@@ -42,7 +42,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							org.osgi.framework;version="[1.8,2)",
+							org.osgi.framework;version="[1.10,2)",
 							*
 						</Import-Package>
 						<Private-Package>
@@ -71,7 +71,7 @@
 			<artifactId>osgi.core</artifactId>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/...ializers-fragment1/src/main/java/org/ops4j/pax/web/samples/initializers/Initializer1.java b/...ializers-fragment1/src/main/java/org/ops4j/pax/web/samples/initializers/Initializer1.java
@@ -16,9 +16,9 @@
 package org.ops4j.pax.web.samples.initializers;
 
 import java.util.Set;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 
 public class Initializer1 implements ServletContainerInitializer {
 

diff --git a/...javax.servlet.ServletContainerInitializer → ...karta.servlet.ServletContainerInitializer b/...javax.servlet.ServletContainerInitializer → ...karta.servlet.ServletContainerInitializer
diff --git a/samples/samples-internal/initializers-fragment2/pom.xml b/samples/samples-internal/initializers-fragment2/pom.xml
@@ -42,7 +42,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							org.osgi.framework;version="[1.8,2)",
+							org.osgi.framework;version="[1.10,2)",
 							*
 						</Import-Package>
 						<Private-Package>
@@ -71,7 +71,7 @@
 			<artifactId>osgi.core</artifactId>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/...ializers-fragment2/src/main/java/org/ops4j/pax/web/samples/initializers/Initializer2.java b/...ializers-fragment2/src/main/java/org/ops4j/pax/web/samples/initializers/Initializer2.java
@@ -16,9 +16,9 @@
 package org.ops4j.pax.web.samples.initializers;
 
 import java.util.Set;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 
 public class Initializer2 implements ServletContainerInitializer {
 

diff --git a/...javax.servlet.ServletContainerInitializer → ...karta.servlet.ServletContainerInitializer b/...javax.servlet.ServletContainerInitializer → ...karta.servlet.ServletContainerInitializer
diff --git a/samples/samples-internal/initializers/pom.xml b/samples/samples-internal/initializers/pom.xml
@@ -46,7 +46,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							org.osgi.framework;version="[1.8,2)",
+							org.osgi.framework;version="[1.10,2)",
 							*
 						</Import-Package>
 						<Private-Package>
@@ -67,7 +67,7 @@
 			<artifactId>osgi.core</artifactId>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/...ternal/initializers/src/main/java/org/ops4j/pax/web/samples/initializers/Initializer.java b/...ternal/initializers/src/main/java/org/ops4j/pax/web/samples/initializers/Initializer.java
@@ -16,9 +16,9 @@
 package org.ops4j.pax.web.samples.initializers;
 
 import java.util.Set;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
 
 public class Initializer implements ServletContainerInitializer {
 

diff --git a/...javax.servlet.ServletContainerInitializer → ...karta.servlet.ServletContainerInitializer b/...javax.servlet.ServletContainerInitializer → ...karta.servlet.ServletContainerInitializer
diff --git a/samples/samples-internal/pax-web-spi-fragment/pom.xml b/samples/samples-internal/pax-web-spi-fragment/pom.xml
@@ -42,7 +42,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>
-							org.osgi.framework;version="[1.8,2)",
+							org.osgi.framework;version="[1.10,2)",
 							*
 						</Import-Package>
 						<Export-Package>
@@ -77,7 +77,7 @@
 			<artifactId>osgi.core</artifactId>
 		</dependency>
 
-		<!-- JavaEE -->
+		<!-- JakartaEE -->
 
 		<dependency>
 			<groupId>jakarta.servlet</groupId>

diff --git a/...ax-web-spi-fragment/src/main/java/org/ops4j/pax/web/samples/tests/SneakIntoPaxWebSpi.java b/...ax-web-spi-fragment/src/main/java/org/ops4j/pax/web/samples/tests/SneakIntoPaxWebSpi.java
@@ -27,7 +27,7 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
-import javax.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContainerInitializer;
 
 import org.apache.xbean.osgi.bundle.util.BundleResourceHelper;
 import org.ops4j.pax.web.utils.ClassPathUtil;
@@ -53,7 +53,7 @@ public static void useXBeanFinder() throws IOException {
 		Set<Bundle> wiredBundles = ClassPathUtil.getBundlesInClassSpace(bundle, new LinkedHashSet<>(), false);
 		// should be:
 		// wiredBundles: java.util.Set  = {java.util.LinkedHashSet@4061}  size = 8
-		//  0 = {org.apache.felix.framework.BundleImpl@4064} "javax.servlet-api [17]"
+		//  0 = {org.apache.felix.framework.BundleImpl@4064} "jakarta.servlet-api [17]"
 		//  1 = {org.apache.felix.framework.BundleImpl@4065} "org.ops4j.pax.web.pax-web-api [18]"
 		//  2 = {org.apache.felix.framework.BundleImpl@4066} "org.apache.xbean.bundleutils [21]"
 		//  3 = {org.apache.felix.framework.BundleImpl@4067} "org.ops4j.pax.logging.pax-logging-api [15]"
@@ -95,7 +95,7 @@ public static List<Class<? extends ServletContainerInitializer>> findInitializer
 		List<Class<? extends ServletContainerInitializer>> initializers = new LinkedList<>();
 
 		BundleWiring wiring = b.adapt(BundleWiring.class);
-		List<URL> urls = wiring.findEntries("/META-INF/services", "javax.servlet.ServletContainerInitializer", 0);
+		List<URL> urls = wiring.findEntries("/META-INF/services", "jakarta.servlet.ServletContainerInitializer", 0);
 		for (URL url : urls) {
 			LOG.info("Wiring entry: {}", url);
 			String className = readService(url);
@@ -113,7 +113,7 @@ public static List<Class<? extends ServletContainerInitializer>> findInitializer
 	public static List<Class<? extends ServletContainerInitializer>> findInitializersUsingBundle(Bundle b) throws Exception {
 		List<Class<? extends ServletContainerInitializer>> initializers = new LinkedList<>();
 
-		Enumeration<URL> urls = b.findEntries("/META-INF/services", "javax.servlet.ServletContainerInitializer", false);
+		Enumeration<URL> urls = b.findEntries("/META-INF/services", "jakarta.servlet.ServletContainerInitializer", false);
 		if (urls != null) {
 			while (urls.hasMoreElements()) {
 				URL url = urls.nextElement();