myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch 3.0.x updated: javax -> jakarta
Date Wed, 29 Apr 2020 11:26:15 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/3.0.x by this push:
     new b16c493  javax -> jakarta
b16c493 is described below

commit b16c4931ff9aa545e0b75fa31459a6b992c4b7c2
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Wed Apr 29 13:26:08 2020 +0200

    javax -> jakarta
---
 api/pom.xml                                        | 16 ++++++-------
 .../jakarta/faces/application/ViewHandler.java     |  2 +-
 .../java/jakarta/faces/component/UIViewRoot.java   | 20 ++++++++---------
 .../META-INF/resources/myfaces/_impl/core/Impl.js  |  4 ++--
 .../org/apache/myfaces/ajax/AjaxTests.js           |  2 +-
 .../org/apache/myfaces/mockups/BrowserMockups.js   |  6 ++---
 bundle/pom.xml                                     | 14 ++++++------
 impl/pom.xml                                       | 26 +++++++++++-----------
 .../application/DefaultResourceHandlerSupport.java |  2 +-
 .../myfaces/cdi/util/ContextualInstanceInfo.java   |  3 ++-
 .../myfaces/cdi/view/ViewScopeBeanHolder.java      |  4 ++--
 .../annotation/AllAnnotationLifecycleProvider.java |  2 +-
 .../DefaultLifecycleProviderFactory.java           |  2 +-
 .../NoInjectionAnnotationLifecycleProvider.java    |  4 ++--
 .../ResourceAnnotationLifecycleProvider.java       |  2 +-
 .../apache/myfaces/context/RequestViewContext.java |  2 +-
 .../unified/resolver/FacesCompositeELResolver.java |  2 +-
 .../myfaces/flow/cdi/FlowScopeBeanHolder.java      |  4 ++--
 .../lifecycle/DefaultRestoreViewSupport.java       | 12 +++++-----
 .../myfaces/lifecycle/RestoreViewExecutor.java     |  4 ++--
 .../myfaces/lifecycle/RestoreViewSupport.java      |  4 ++--
 .../java/org/apache/myfaces/push/EndpointImpl.java |  2 +-
 .../push/cdi/WebsocketChannelTokenBuilderBean.java |  2 +-
 .../myfaces/push/cdi/WebsocketSessionBean.java     |  2 +-
 .../apache/myfaces/push/cdi/WebsocketViewBean.java |  2 +-
 .../apache/myfaces/renderkit/ErrorPageWriter.java  |  2 +-
 .../InternalClassLoaderResourceLoader.java         |  8 +++----
 .../TempDirFileCacheContractResourceLoader.java    |  2 +-
 .../resource/TempDirFileCacheResourceLoader.java   |  4 ++--
 .../shared_impl/webapp/webxml/WebXmlParser.java    |  4 ++--
 .../spi/impl/AllAnnotationInjectionProvider.java   |  2 +-
 .../spi/impl/DefaultInjectionProviderFactory.java  |  2 +-
 .../NoInjectionAnnotationInjectionProvider.java    |  4 ++--
 .../impl/ResourceAnnotationInjectionProvider.java  |  2 +-
 .../org/apache/myfaces/util/ContainerUtils.java    |  2 +-
 .../myfaces/view/facelets/FaceletFactory.java      |  2 +-
 .../myfaces/view/facelets/ViewPoolProcessor.java   |  4 ++--
 .../impl/FaceletCompositionContextImpl.java        |  6 ++---
 .../myfaces/webapp/AbstractFacesInitializer.java   |  4 ++--
 .../application/NavigationHandlerImplTest.java     |  6 ++---
 .../apache/myfaces/application/flow/Flow1Bean.java |  2 +-
 .../myfaces/application/flow/Flow21Bean.java       |  2 +-
 .../apache/myfaces/application/flow/Flow2Bean.java |  2 +-
 .../myfaces/component/search/SearchBean.java       |  2 +-
 .../config/annotation/AnnotatedManagedBean.java    |  4 ++--
 .../config/annotation/AnnotatedManagedBean2.java   |  4 ++--
 .../lifecycle/DefaultRestoreViewSupportTest.java   |  8 +++----
 .../myfaces/view/facelets/pool/DynamicBean.java    |  2 +-
 .../pss/acid/managed/CheckActionEventBean.java     |  2 +-
 .../pss/acid/managed/CustomSessionBean.java        |  2 +-
 .../view/facelets/pss/acid/managed/TestBean.java   |  2 +-
 .../myfaces/webapp/Jsp21FacesInitializerTest.java  |  2 +-
 52 files changed, 117 insertions(+), 116 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 852a2bb..52ae83e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -408,14 +408,14 @@
                                     *;version="${project.version}"
                                 </Export-Package>
                                 <Import-Package>
-                                    javax.el;version="[1.0.0, 3.1.0)",
+                                    jakarta.el;version="[1.0.0, 3.1.0)",
                                     javax.validation*;version="[1.0.0, 2.0.0)",
-                                    javax.servlet;version="[3, 5)",
-                                    javax.servlet.http;version="[3, 5)",
-                                    javax.servlet.jsp;version="[2.1.0, 3.1)",
-                                    javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
-                                    javax.servlet.jsp.jstl.sql;version="[1.1.2, 2.0.0)",
-                                    javax.servlet.jsp.tagext;version="[2.1.0, 3.2)",
+                                    jakarta.servlet;version="[3, 5)",
+                                    jakarta.servlet.http;version="[3, 5)",
+                                    jakarta.servlet.jsp;version="[2.1.0, 3.1)",
+                                    jakarta.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
+                                    jakarta.servlet.jsp.jstl.sql;version="[1.1.2, 2.0.0)",
+                                    jakarta.servlet.jsp.tagext;version="[2.1.0, 3.2)",
                                     org.apache.commons.logging;version="[1.1.1, 2.0.0)",
                                     jakarta.faces.*;version="${project.version}"
                                 </Import-Package>
@@ -624,7 +624,7 @@
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
         </dependency>
 
-        <!-- bean-validation 1.0 (javax.validation.*) -->
+        <!-- bean-validation 1.0 -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-validation_1.0_spec</artifactId>
diff --git a/api/src/main/java/jakarta/faces/application/ViewHandler.java b/api/src/main/java/jakarta/faces/application/ViewHandler.java
index 8735a3f..9cf5fac 100644
--- a/api/src/main/java/jakarta/faces/application/ViewHandler.java
+++ b/api/src/main/java/jakarta/faces/application/ViewHandler.java
@@ -49,7 +49,7 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConf
  * rendering methods on components; see method "renderView".
  * <p>
  * This class also isolates callers from the underlying request/response system. In particular, this class does not
- * explicitly depend upon the javax.servlet apis. This allows JSF to be used on servers that do not implement the
+ * explicitly depend upon the jakarta.servlet apis. This allows JSF to be used on servers that do not implement the
  * servlet API (for example, plain CGI).
  * <p>
  * Examples:
diff --git a/api/src/main/java/jakarta/faces/component/UIViewRoot.java b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
index bf06013..2c7cab7 100644
--- a/api/src/main/java/jakarta/faces/component/UIViewRoot.java
+++ b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
@@ -82,7 +82,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
 {
     public static final String COMPONENT_FAMILY = "jakarta.faces.ViewRoot";
     public static final String COMPONENT_TYPE = "jakarta.faces.ViewRoot";
-    public static final String METADATA_FACET_NAME = "javax_faces_metadata";
+    public static final String METADATA_FACET_NAME = "UIViewRoot_faces_metadata";
     public static final String UNIQUE_ID_PREFIX = "j_id";
     public static final String VIEW_PARAMETERS_KEY = "jakarta.faces.component.VIEW_PARAMETERS_KEY";
     
@@ -166,10 +166,10 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
     // an exception, should not have their afterPhase method called
     private transient Map<PhaseId, boolean[]> listenerSuccessMap;
     
-    private static final String JAVAX_FACES_LOCATION_PREFIX = "javax_faces_location_";
-    private static final String JAVAX_FACES_LOCATION_HEAD = "javax_faces_location_head";
-    private static final String JAVAX_FACES_LOCATION_BODY = "javax_faces_location_body";
-    private static final String JAVAX_FACES_LOCATION_FORM = "javax_faces_location_form";
+    private static final String JAKARTA_FACES_LOCATION_PREFIX = "jakarta_faces_location_";
+    private static final String JAKARTA_FACES_LOCATION_HEAD = "jakarta_faces_location_head";
+    private static final String JAKARTA_FACES_LOCATION_BODY = "jakarta_faces_location_body";
+    private static final String JAKARTA_FACES_LOCATION_FORM = "jakarta_faces_location_form";
     
     private static final String SKIP_VIEW_MAP_SAVE_STATE = "oam.viewPool.SKIP_VIEW_MAP_SAVE_STATE";
     
@@ -241,7 +241,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
         {
             if (componentResource.getParent() != null &&
                 componentResource.getParent().getId() != null &&
-                componentResource.getParent().getId().equals(JAVAX_FACES_LOCATION_PREFIX + target))
+                componentResource.getParent().getId().equals(JAKARTA_FACES_LOCATION_PREFIX + target))
             {
                 // We can assume safely that the component is in place, because there is no way to 
                 // put a component resource on a component resource container without call addComponentResource
@@ -737,19 +737,19 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
             // Set the id of the facet to be target
             if (target.equals("head"))
             {
-                facet.setId(JAVAX_FACES_LOCATION_HEAD);
+                facet.setId(JAKARTA_FACES_LOCATION_HEAD);
             }
             else if (target.equals("body"))
             {
-                facet.setId(JAVAX_FACES_LOCATION_BODY);
+                facet.setId(JAKARTA_FACES_LOCATION_BODY);
             }
             else if (target.equals("form"))
             {
-                facet.setId(JAVAX_FACES_LOCATION_FORM);
+                facet.setId(JAKARTA_FACES_LOCATION_FORM);
             }
             else
             {
-                facet.setId(JAVAX_FACES_LOCATION_PREFIX + target);
+                facet.setId(JAKARTA_FACES_LOCATION_PREFIX + target);
             }
             
             // From jsr-314-open list it was made clear this facet is transient,
diff --git a/api/src/main/javascript/META-INF/resources/myfaces/_impl/core/Impl.js b/api/src/main/javascript/META-INF/resources/myfaces/_impl/core/Impl.js
index 190daf9..7c4a038 100644
--- a/api/src/main/javascript/META-INF/resources/myfaces/_impl/core/Impl.js
+++ b/api/src/main/javascript/META-INF/resources/myfaces/_impl/core/Impl.js
@@ -627,7 +627,7 @@ _MF_SINGLTN(_PFX_CORE + "Impl", _MF_OBJECT, /**  @lends myfaces._impl.core.Impl.
                 getConfig = myfaces._impl.core._Runtime.getGlobalConfig,
                 scriptTags = document.getElementsByTagName("script");
         for (var i = 0; i < scriptTags.length && !found; i++) {
-            if (scriptTags[i].src.search(/\/javax\.faces\.resource.*\/jsf\.js.*separator/) != -1) {
+            if (scriptTags[i].src.search(/\/jakarta\.faces\.resource.*\/jsf\.js.*separator/) != -1) {
                 found = true;
                 var result = scriptTags[i].src.match(/separator=([^&;]*)/);
                 this._separator = decodeURIComponent(result[1]);
@@ -657,7 +657,7 @@ _MF_SINGLTN(_PFX_CORE + "Impl", _MF_OBJECT, /**  @lends myfaces._impl.core.Impl.
 
             /* run through all script tags and try to find the one that includes jsf.js */
             for (var i = 0; i < scriptTags.length && !found; i++) {
-                if (scriptTags[i].src.search(/\/javax\.faces\.resource\/jsf\.js.*ln=javax\.faces/) != -1) {
+                if (scriptTags[i].src.search(/\/jakarta\.faces\.resource\/jsf\.js.*ln=jakarta\.faces/) != -1) {
                     var result = scriptTags[i].src.match(/stage=([^&;]*)/);
                     found = true;
                     if (result) {
diff --git a/api/src/test/javascript/org/apache/myfaces/ajax/AjaxTests.js b/api/src/test/javascript/org/apache/myfaces/ajax/AjaxTests.js
index e168390..5d4c667 100644
--- a/api/src/test/javascript/org/apache/myfaces/ajax/AjaxTests.js
+++ b/api/src/test/javascript/org/apache/myfaces/ajax/AjaxTests.js
@@ -29,7 +29,7 @@ function AjaxTest(name)
  * test the basic namespacing being active!
  */
 function AjaxTest_testNameSpacing() {
-    this.assertTrue( "namespacing javax exists" , 'undefined' != typeof javax && null != typeof(javax) );
+    this.assertTrue( "namespacing jakarta exists" , 'undefined' != typeof jakarta && null != typeof(jakarta) );
     this.assertTrue( "namespacing jakarta.faces.Ajax exists" , 'undefined' != typeof jakarta.faces && null != typeof(jakarta.faces) );
     this.assertTrue( "namespacing jakarta.faces.Ajax exists" , 'undefined' != typeof jakarta.faces.Ajax && null != typeof(jakarta.faces.Ajax) );
 }
diff --git a/api/src/test/javascript/org/apache/myfaces/mockups/BrowserMockups.js b/api/src/test/javascript/org/apache/myfaces/mockups/BrowserMockups.js
index 3fdd44b..23dab53 100644
--- a/api/src/test/javascript/org/apache/myfaces/mockups/BrowserMockups.js
+++ b/api/src/test/javascript/org/apache/myfaces/mockups/BrowserMockups.js
@@ -233,9 +233,9 @@ if('undefined' == typeof document  || null == document) {
 
 
 
-if('undefined' == typeof javax  || null == javax) {
-    var javax = new Object();
-    document.javax = javax;
+if('undefined' == typeof jakarta  || null == jakarta) {
+    var jakarta = new Object();
+    document.jakarta = jakarta;
 }
 
 if('undefined' == typeof org  || null == org) {
diff --git a/bundle/pom.xml b/bundle/pom.xml
index 4f9bd95..3a06701 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -80,7 +80,7 @@
                         <Import-Package>
                             !org.apache.myfaces.*,
                             com.google.inject;version="[1.0.0, 2.0.0)";resolution:=optional,
-                            javax.annotation,
+                            jakarta.annotation,
                             javax.crypto,
                             javax.crypto.spec,
                             javax.ejb;resolution:=optional,
@@ -88,12 +88,12 @@
                             javax.naming,
                             javax.persistence;version="[1.0.0, 3.0)";resolution:=optional,
                             javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
-                            javax.servlet;version="[3, 5)",
-                            javax.servlet.http;version="[3, 5)",
-                            javax.servlet.jsp;version="[2.1.0, 3.1)",
-                            javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
-                            javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
-                            javax.servlet.annotation;version="[3, 5)";resolution:=optional,
+                            jakarta.servlet;version="[3, 5)",
+                            jakarta.servlet.http;version="[3, 5)",
+                            jakarta.servlet.jsp;version="[2.1.0, 3.1)",
+                            jakarta.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
+                            jakarta.servlet.jsp.tagext;version="[2.1.0, 3.1)",
+                            jakarta.servlet.annotation;version="[3, 5)";resolution:=optional,
                             javax.validation.*;version="[1.0.0, 2.0.0)";resolution:=optional,
                             javax.xml.parsers,
                             org.apache;resolution:=optional,
diff --git a/impl/pom.xml b/impl/pom.xml
index 97f5a2d..cf19ac7 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -97,8 +97,8 @@
                         <exclude>src/test/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider</exclude>
                         <exclude>src/main/resources/META-INF/services/org.apache.myfaces.config.annotation.LifecycleProvider</exclude>
                         <exclude>src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider</exclude>
-                        <exclude>src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension</exclude>
-                        <exclude>src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer</exclude>
+                        <exclude>src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension</exclude>
+                        <exclude>src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer</exclude>
 
                         <!-- This file probably needs a license, but I don't know if it's safe to put it in there -->
                         <exclude>src/test/resources/org/apache/myfaces/context/nestedScriptCDATA.xml</exclude>
@@ -741,20 +741,20 @@
                                 <Import-Package>
                                     !org.apache.myfaces.*,
                                     com.google.inject;version="[1.0.0, 2.0.0)";resolution:=optional,
-                                    javax.annotation,
+                                    jakarta.annotation,
                                     javax.crypto,
                                     javax.crypto.spec,
                                     javax.ejb;resolution:=optional,
-                                    javax.el;version="[1.0.0, 3.1.0)",
+                                    jakarta.el;version="[1.0.0, 3.1.0)",
                                     javax.naming,
-                                    javax.persistence;version="[1.0.0, 2.1)";resolution:=optional,
+                                    jakarta.persistence;version="[1.0.0, 2.1)";resolution:=optional,
                                     javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
-                                    javax.servlet;version="[3, 5)",
-                                    javax.servlet.http;version="[3, 5)",
-                                    javax.servlet.jsp;version="[2.2.0, 3.1)",
-                                    javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
-                                    javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
-                                    javax.servlet.annotation;version="[3, 5)";resolution:=optional,
+                                    jakarta.servlet;version="[3, 5)",
+                                    jakarta.servlet.http;version="[3, 5)",
+                                    jakarta.servlet.jsp;version="[2.2.0, 3.1)",
+                                    jakarta.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
+                                    jakarta.servlet.jsp.tagext;version="[2.1.0, 3.1)",
+                                    jakarta.servlet.annotation;version="[3, 5)";resolution:=optional,
                                     javax.xml.parsers,
                                     org.apache;resolution:=optional,
                                     org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",
@@ -1161,14 +1161,14 @@
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
         </dependency>
 
-        <!-- bean-validation 1.0 (javax.validation.*) -->
+        <!-- bean-validation 1.0 -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-validation_1.0_spec</artifactId>
             <optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
         </dependency>
 
-        <!-- annotations 1.2 (javax.annotation.*) -->
+        <!-- annotations 1.2 -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-annotation_1.3_spec</artifactId>
diff --git a/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java b/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
index 49b4fc1..1ce64f9 100644
--- a/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/application/DefaultResourceHandlerSupport.java
@@ -39,7 +39,7 @@ import org.apache.myfaces.shared.util.WebConfigParamUtils;
 
 /**
  * A ResourceHandlerSupport implementation for use with standard Java Servlet engines,
- * ie an engine that supports javax.servlet, and uses a standard web.xml file.
+ * ie an engine that supports jakarta.servlet, and uses a standard web.xml file.
  * 
  * @author Leonardo Uribe (latest modification by $Author$)
  * @version $Revision$ $Date$
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualInstanceInfo.java b/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualInstanceInfo.java
index cb89867..8a87247 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualInstanceInfo.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/util/ContextualInstanceInfo.java
@@ -38,7 +38,8 @@ public class ContextualInstanceInfo<T> implements Serializable
     /**
      * We need to store the CreationalContext as we need it for
      * properly destroying the contextual instance via
-     * {@link jakarta.enterprise.context.spi.Contextual#destroy(Object, jakarta.enterprise.context.spi.CreationalContext)}
+     * {@link jakarta.enterprise.context.spi.Contextual#destroy(Object,
+     *      jakarta.enterprise.context.spi.CreationalContext)}
      */
     private CreationalContext<T> creationalContext;
 
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
index 67c64a0..1b67786 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/view/ViewScopeBeanHolder.java
@@ -23,8 +23,8 @@ import java.io.Serializable;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import jakarta.enterprise.context.SessionScoped;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.faces.context.ExceptionHandler;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
index 80f5499..7e95e72 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.config.annotation;
 
 import javax.naming.NamingException;
 import javax.naming.Context;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import javax.ejb.EJB;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnit;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
index 1de4745..6d49f46 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
@@ -262,7 +262,7 @@ public class DefaultLifecycleProviderFactory extends LifecycleProviderFactory
     {
         try
         {
-                ClassUtils.classForName("javax.annotation.PreDestroy");
+                ClassUtils.classForName("jakarta.annotation.PreDestroy");
         }
         catch (ClassNotFoundException e)
         {
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
index 4b5b2ac..1420db4 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
@@ -25,8 +25,8 @@ import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.naming.NamingException;
 
 import org.apache.myfaces.shared.util.ClassUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java b/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java
index 80a0ad5..df97bbd 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.config.annotation;
 
 import javax.naming.NamingException;
 import javax.naming.Context;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Field;
diff --git a/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java b/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java
index e11264f..74bd89e 100644
--- a/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java
+++ b/impl/src/main/java/org/apache/myfaces/context/RequestViewContext.java
@@ -218,7 +218,7 @@ public class RequestViewContext
         for (Map.Entry<String, UIComponent> entry : root.getFacets().entrySet())
         {
             UIComponent facet = entry.getValue();
-            if (facet.getId() != null && facet.getId().startsWith("javax_faces_location_"))
+            if (facet.getId() != null && facet.getId().startsWith("jakarta_faces_location_"))
             {
                 try
                 {
diff --git a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
index 5ed78e0..019c2ae 100644
--- a/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
@@ -29,7 +29,7 @@ import java.util.Arrays;
  * <p>
  * This composite el resolver will be used at the top level resolver for faces
  * ({@link jakarta.faces.application.Application#getELResolver()})
- * and jsp (the one we add with {@link javax.servlet.jsp.JspApplicationContext#addELResolver(jakarta.el.ELResolver)}.
+ * and jsp (the one we add with {@link jakarta.servlet.jsp.JspApplicationContext#addELResolver(jakarta.el.ELResolver)}.
  * It keeps track of its scope to let the variable resolver {@link org.apache.myfaces.el.VariableResolverImpl}
  * know in which scope it is executed. This is
  * necessarry to call either the faces or the jsp resolver head.
diff --git a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
index 6ff8284..b529c92 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/cdi/FlowScopeBeanHolder.java
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import jakarta.enterprise.context.SessionScoped;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.faces.context.ExceptionHandler;
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java b/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
index 686de32..d0a36af 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupport.java
@@ -55,9 +55,9 @@ import org.apache.myfaces.shared.application.CheckedViewIdsCache;
  */
 public class DefaultRestoreViewSupport implements RestoreViewSupport
 {
-    private static final String JAVAX_SERVLET_INCLUDE_SERVLET_PATH = "javax.servlet.include.servlet_path";
+    private static final String JAKARTA_SERVLET_INCLUDE_SERVLET_PATH = "jakarta.servlet.include.servlet_path";
 
-    private static final String JAVAX_SERVLET_INCLUDE_PATH_INFO = "javax.servlet.include.path_info";
+    private static final String JAKARTA_SERVLET_INCLUDE_PATH_INFO = "jakarta.servlet.include.path_info";
     
     /**
      * Constant defined on javax.portlet.faces.Bridge class that helps to 
@@ -163,13 +163,13 @@ public class DefaultRestoreViewSupport implements RestoreViewSupport
         }
         else
         {
-            viewId = (String) requestMap.get(JAVAX_SERVLET_INCLUDE_PATH_INFO);
+            viewId = (String) requestMap.get(JAKARTA_SERVLET_INCLUDE_PATH_INFO);
             if (viewId != null)
             {
                 if (traceEnabled)
                 {
                     log.finest("Calculated viewId '" + viewId + "' from request param '"
-                               + JAVAX_SERVLET_INCLUDE_PATH_INFO + "'");
+                               + JAKARTA_SERVLET_INCLUDE_PATH_INFO + "'");
                 }
             }
             else
@@ -183,11 +183,11 @@ public class DefaultRestoreViewSupport implements RestoreViewSupport
     
             if (viewId == null)
             {
-                viewId = (String) requestMap.get(JAVAX_SERVLET_INCLUDE_SERVLET_PATH);
+                viewId = (String) requestMap.get(JAKARTA_SERVLET_INCLUDE_SERVLET_PATH);
                 if (viewId != null && traceEnabled)
                 {
                     log.finest("Calculated viewId '" + viewId + "' from request param '"
-                            + JAVAX_SERVLET_INCLUDE_SERVLET_PATH + "'");
+                            + JAKARTA_SERVLET_INCLUDE_SERVLET_PATH + "'");
                 }
             }
         }
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
index 8011b82..adb09ba 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
@@ -121,9 +121,9 @@ class RestoreViewExecutor extends PhaseExecutor
         // Determine if the current request is an attempt by the 
         // servlet container to display an error page.
         // If the request is an error page request, the servlet container
-        // is required to set the request parameter "javax.servlet.error.message".
+        // is required to set the request parameter "jakarta.servlet.error.message".
         final boolean errorPageRequest = facesContext.getExternalContext().getRequestMap()
-                                                 .get("javax.servlet.error.message") != null;
+                                                 .get("jakarta.servlet.error.message") != null;
         
         // Determine if this request is a postback or an initial request.
         // But if it is an error page request, do not treat it as a postback (since 2.0)
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
index c79d5d0..33fd09d 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
@@ -34,9 +34,9 @@ public interface RestoreViewSupport
      * Calculates the view id from the given faces context by the following algorithm
      * </p>
      * <ul>
-     * <li>lookup the viewid from the request attribute "javax.servlet.include.path_info"
+     * <li>lookup the viewid from the request attribute "jakarta.servlet.include.path_info"
      * <li>if null lookup the value for viewid by {@link jakarta.faces.context.ExternalContext#getRequestPathInfo()}
-     * <li>if null lookup the value for viewid from the request attribute "javax.servlet.include.servlet_path"
+     * <li>if null lookup the value for viewid from the request attribute "jakarta.servlet.include.servlet_path"
      * <li>if null lookup the value for viewid by {@link jakarta.faces.context.ExternalContext#getRequestServletPath()}
      * <li>if null throw a {@link jakarta.faces.FacesException}
      * </ul>
diff --git a/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java b/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
index 34fd475..59a70ea 100644
--- a/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/push/EndpointImpl.java
@@ -39,7 +39,7 @@ import jakarta.websocket.Session;
 public class EndpointImpl extends Endpoint
 {
 
-    public static final String JAVAX_FACES_PUSH_PATH = "/jakarta.faces.push/{channel}";
+    public static final String JAKARTA_FACES_PUSH_PATH = "/jakarta.faces.push/{channel}";
 
     public static final String PUSH_CHANNEL_PARAMETER = "channel";
     
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java
index 25dfe82..0ce1a28 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketChannelTokenBuilderBean.java
@@ -19,7 +19,7 @@
 
 package org.apache.myfaces.push.cdi;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.faces.context.FacesContext;
 import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionBean.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionBean.java
index bd69543..23e2a51 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionBean.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketSessionBean.java
@@ -26,7 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import jakarta.enterprise.context.SessionScoped;
 
 /**
diff --git a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketViewBean.java b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketViewBean.java
index a91f991..2e3289a 100644
--- a/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketViewBean.java
+++ b/impl/src/main/java/org/apache/myfaces/push/cdi/WebsocketViewBean.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 import jakarta.enterprise.inject.spi.CDI;
 import jakarta.faces.view.ViewScoped;
 import org.apache.myfaces.cdi.util.CDIUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
index 9c75f59..a80480e 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
@@ -188,7 +188,7 @@ public final class ErrorPageWriter
      */
     public static final String ERROR_PAGE_BEAN_KEY = "__myFacesErrorPageBean";
 
-    private static final String EXCEPTION_KEY = "javax.servlet.error.exception";
+    private static final String EXCEPTION_KEY = "jakarta.servlet.error.exception";
     public static final String VIEW_KEY = "org.apache.myfaces.error.UIViewRoot";
 
     private static final Logger log = Logger.getLogger(ErrorPageWriter.class.getName());
diff --git a/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java b/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
index d98e7db..fff6616 100644
--- a/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
+++ b/impl/src/main/java/org/apache/myfaces/resource/InternalClassLoaderResourceLoader.java
@@ -156,12 +156,12 @@ public class InternalClassLoaderResourceLoader extends ResourceLoader
                                            String resourceName, String resourceVersion)
     {
         //handle jsf.js
-        final boolean javaxFacesLib = libraryName != null &&
+        final boolean jakartaFacesLib = libraryName != null &&
                 ResourceHandler.JSF_SCRIPT_LIBRARY_NAME.equals(libraryName);
-        final boolean javaxFaces = javaxFacesLib &&
+        final boolean jakartaFaces = jakartaFacesLib &&
                 ResourceHandler.JSF_SCRIPT_RESOURCE_NAME.equals(resourceName);
 
-        if (javaxFaces)
+        if (jakartaFaces)
         {
             if (_developmentStage)
             {
@@ -195,7 +195,7 @@ public class InternalClassLoaderResourceLoader extends ResourceLoader
                 return null;
             }
         }
-        else if (javaxFacesLib && !_developmentStage && !_jsfMode.equals(ResourceUtils.JSF_MYFACES_JSFJS_NORMAL) &&
+        else if (jakartaFacesLib && !_developmentStage && !_jsfMode.equals(ResourceUtils.JSF_MYFACES_JSFJS_NORMAL) &&
                                    (ResourceUtils.JSF_MYFACES_JSFJS_I18N.equals(resourceName) ||
                                    ResourceUtils.JSF_MYFACES_JSFJS_EXPERIMENTAL.equals(resourceName) ||
                                    ResourceUtils.JSF_MYFACES_JSFJS_LEGACY.equals(resourceName)) )
diff --git a/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheContractResourceLoader.java b/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheContractResourceLoader.java
index 44af544..99e3227 100644
--- a/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheContractResourceLoader.java
+++ b/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheContractResourceLoader.java
@@ -80,7 +80,7 @@ public class TempDirFileCacheContractResourceLoader extends ContractResourceLoad
     
         //1. Create temporal directory for temporal resources
         Map<String, Object> applicationMap = facesContext.getExternalContext().getApplicationMap();
-        File tempdir = (File) applicationMap.get("javax.servlet.context.tempdir");
+        File tempdir = (File) applicationMap.get("jakarta.servlet.context.tempdir");
         File imagesDir = new File(tempdir, TEMP_FOLDER_BASE_DIR);
         if (!imagesDir.exists())
         {
diff --git a/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheResourceLoader.java b/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheResourceLoader.java
index dd24195..5747910 100644
--- a/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheResourceLoader.java
+++ b/impl/src/main/java/org/apache/myfaces/resource/TempDirFileCacheResourceLoader.java
@@ -94,7 +94,7 @@ public class TempDirFileCacheResourceLoader extends ResourceLoaderWrapper
             try
             {
                 Map<String, Object> applicationMap = facesContext.getExternalContext().getApplicationMap();
-                File tempdir = (File) applicationMap.get("javax.servlet.context.tempdir");
+                File tempdir = (File) applicationMap.get("jakarta.servlet.context.tempdir");
                 File imagesDir = new File(tempdir, TEMP_FOLDER_BASE_DIR);
                 if (!imagesDir.exists())
                 {
@@ -120,7 +120,7 @@ public class TempDirFileCacheResourceLoader extends ResourceLoaderWrapper
     
         //1. Create temporal directory for temporal resources
         Map<String, Object> applicationMap = facesContext.getExternalContext().getApplicationMap();
-        File tempdir = (File) applicationMap.get("javax.servlet.context.tempdir");
+        File tempdir = (File) applicationMap.get("jakarta.servlet.context.tempdir");
         File imagesDir = new File(tempdir, TEMP_FOLDER_BASE_DIR);
         if (!imagesDir.exists())
         {
diff --git a/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
index 12f6a81..8823361 100644
--- a/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
+++ b/impl/src/main/java/org/apache/myfaces/shared_impl/webapp/webxml/WebXmlParser.java
@@ -58,10 +58,10 @@ public class WebXmlParser
 
     private static final String WEB_APP_2_2_J2EE_SYSTEM_ID = "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";
     private static final String WEB_APP_2_2_SYSTEM_ID = "http://java.sun.com/dtd/web-app_2_2.dtd";
-    private static final String WEB_APP_2_2_RESOURCE  = "javax/servlet/resources/web-app_2_2.dtd";
+    private static final String WEB_APP_2_2_RESOURCE  = "jakarta/servlet/resources/web-app_2_2.dtd";
 
     private static final String WEB_APP_2_3_SYSTEM_ID = "http://java.sun.com/dtd/web-app_2_3.dtd";
-    private static final String WEB_APP_2_3_RESOURCE  = "javax/servlet/resources/web-app_2_3.dtd";
+    private static final String WEB_APP_2_3_RESOURCE  = "jakarta/servlet/resources/web-app_2_3.dtd";
     
     private ExternalContext _context;
     private org.apache.myfaces.shared_impl.webapp.webxml.WebXml _webXml;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java b/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
index edeade4..a25d784 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/AllAnnotationInjectionProvider.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.spi.impl;
 
 import javax.naming.NamingException;
 import javax.naming.Context;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import javax.ejb.EJB;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnit;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
index cef7d05..711bc38 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultInjectionProviderFactory.java
@@ -288,7 +288,7 @@ public class DefaultInjectionProviderFactory extends InjectionProviderFactory
         
         try
         {
-            ClassUtils.classForName("javax.annotation.PreDestroy");
+            ClassUtils.classForName("jakarta.annotation.PreDestroy");
         }
         catch (ClassNotFoundException e)
         {
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/NoInjectionAnnotationInjectionProvider.java b/impl/src/main/java/org/apache/myfaces/spi/impl/NoInjectionAnnotationInjectionProvider.java
index 9ffad46..5694fc2 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/NoInjectionAnnotationInjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/NoInjectionAnnotationInjectionProvider.java
@@ -25,8 +25,8 @@ import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.naming.NamingException;
 
 import org.apache.myfaces.shared.util.ClassUtils;
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/ResourceAnnotationInjectionProvider.java b/impl/src/main/java/org/apache/myfaces/spi/impl/ResourceAnnotationInjectionProvider.java
index 7526337..33868e1 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/ResourceAnnotationInjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/ResourceAnnotationInjectionProvider.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.spi.impl;
 
 import javax.naming.NamingException;
 import javax.naming.Context;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Field;
diff --git a/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java b/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
index 8ba1dcc..649cdb9 100644
--- a/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/ContainerUtils.java
@@ -52,7 +52,7 @@ public class ContainerUtils
         try 
         {
             // simply check if the class JspApplicationContext is available
-            Class.forName("javax.servlet.jsp.JspApplicationContext");
+            Class.forName("jakarta.servlet.jsp.JspApplicationContext");
             return true;
         } 
         catch (ClassNotFoundException ex) 
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java
index da54190..c465a0a 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletFactory.java
@@ -88,7 +88,7 @@ public abstract class FaceletFactory
      * Return a Facelet instance as specified by the file at the passed URI. The returned facelet is used
      * to create view metadata in this form: 
      * <p>
-     * UIViewRoot(in facet javax_faces_metadata(one or many UIViewParameter instances))
+     * UIViewRoot(in facet jakarta_faces_metadata(one or many UIViewParameter instances))
      * </p>
      * <p>
      * This method should be called from FaceletViewMetadata.createMetadataView(FacesContext context)  
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/ViewPoolProcessor.java b/impl/src/main/java/org/apache/myfaces/view/facelets/ViewPoolProcessor.java
index 73679a9..49b7e31 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/ViewPoolProcessor.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/ViewPoolProcessor.java
@@ -598,9 +598,9 @@ public class ViewPoolProcessor
                     // we need to check these two cases:
                     // 1. Resources relocated by facelets
                     // 2. Resources created by effect of a @ResourceDependency annotation
-                    if (fc.getId() != null && fc.getId().startsWith("javax_faces_location_"))
+                    if (fc.getId() != null && fc.getId().startsWith("jakarta_faces_location_"))
                     {
-                        String target = fc.getId().substring("javax_faces_location_".length());
+                        String target = fc.getId().substring("jakarta_faces_location_".length());
                         Map<String, List<ResourceDependency>> addedResources = 
                             viewStructureMetadata.getRequestViewMetadata().
                                 getResourceDependencyAnnotations(context);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
index e05b4ed..4a72b10 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/FaceletCompositionContextImpl.java
@@ -87,7 +87,7 @@ public class FaceletCompositionContextImpl extends FaceletCompositionContext
     public static final String INIT_PARAM_WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE
             = "org.apache.myfaces.WRAP_TAG_EXCEPTIONS_AS_CONTEXT_AWARE";
     
-    private static final String JAVAX_FACES_LOCATION_PREFIX = "javax_faces_location_";
+    private static final String JAKARTA_FACES_LOCATION_PREFIX = "jakarta_faces_location_";
     
     private FacesContext _facesContext;
     
@@ -986,8 +986,8 @@ public class FaceletCompositionContextImpl extends FaceletCompositionContext
                 UIComponent fc = itr.next();
                 // It is necessary to check only the facets that are used as holder for
                 // component resources. To do that, the best way is check the ones that
-                // has id starting with "javax_faces_location_"
-                if (fc.getId() != null && fc.getId().startsWith(JAVAX_FACES_LOCATION_PREFIX))
+                // has id starting with "jakarta_faces_location_"
+                if (fc.getId() != null && fc.getId().startsWith(JAKARTA_FACES_LOCATION_PREFIX))
                 {
                     // Check all children with MARK_CREATED and if one is found, check if it was
                     // refreshed by the algorithm.
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
index 9b2b7b5..fe5470e 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
@@ -781,14 +781,14 @@ public abstract class AbstractFacesInitializer implements FacesInitializer
             // According to https://tyrus.java.net/documentation/1.13/index/deployment.html section 3.2
             // we can create a websocket programmatically, getting ServerContainer instance from this location
             final ServerContainer serverContainer = (ServerContainer) 
-                    servletContext.getAttribute("javax.websocket.server.ServerContainer");
+                    servletContext.getAttribute("jakarta.websocket.server.ServerContainer");
 
             if (serverContainer != null)
             {
                 try 
                 {
                     serverContainer.addEndpoint(ServerEndpointConfig.Builder
-                            .create(EndpointImpl.class, EndpointImpl.JAVAX_FACES_PUSH_PATH)
+                            .create(EndpointImpl.class, EndpointImpl.JAKARTA_FACES_PUSH_PATH)
                             .configurator(new WebsocketConfigurator(externalContext)).build());
                     
                     //Init LRU cache
diff --git a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
index 37eedad..8f55b05 100644
--- a/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/NavigationHandlerImplTest.java
@@ -614,7 +614,7 @@ public class NavigationHandlerImplTest extends AbstractJsfTestCase
         // simulate no available ViewRoot (in case of VEE)
         facesContext.setViewRoot(null);
         
-        facesContext.getExternalContext().getRequestMap().put("javax.servlet.include.servlet_path", "/faces/home.xhtml");
+        facesContext.getExternalContext().getRequestMap().put("jakarta.servlet.include.servlet_path", "/faces/home.xhtml");
         // test is based on:
         // http://www.nfjsone.com/blog/ed_burns/2009/09/dealing_gracefully_with_viewexpiredexception_in_jsf2
         underTest.handleNavigation(facesContext, null, "viewExpired");
@@ -629,7 +629,7 @@ public class NavigationHandlerImplTest extends AbstractJsfTestCase
         // simulate no available ViewRoot (in case of VEE)
         facesContext.setViewRoot(null);
         
-        facesContext.getExternalContext().getRequestMap().put("javax.servlet.include.servlet_path", "/home.jsf");
+        facesContext.getExternalContext().getRequestMap().put("jakarta.servlet.include.servlet_path", "/home.jsf");
         // test is based on:
         // http://www.nfjsone.com/blog/ed_burns/2009/09/dealing_gracefully_with_viewexpiredexception_in_jsf2
         underTest.handleNavigation(facesContext, null, "viewExpired.xhtml");
@@ -645,7 +645,7 @@ public class NavigationHandlerImplTest extends AbstractJsfTestCase
         // simulate no available ViewRoot (in case of VEE)
         facesContext.setViewRoot(null);
         
-        facesContext.getExternalContext().getRequestMap().put("javax.servlet.include.servlet_path", "/home.jsf");
+        facesContext.getExternalContext().getRequestMap().put("jakarta.servlet.include.servlet_path", "/home.jsf");
         // test is based on:
         // http://www.nfjsone.com/blog/ed_burns/2009/09/dealing_gracefully_with_viewexpiredexception_in_jsf2
         underTest.handleNavigation(facesContext, null, "viewExpired");
diff --git a/impl/src/test/java/org/apache/myfaces/application/flow/Flow1Bean.java b/impl/src/test/java/org/apache/myfaces/application/flow/Flow1Bean.java
index 7800ab7..d626b9d 100644
--- a/impl/src/test/java/org/apache/myfaces/application/flow/Flow1Bean.java
+++ b/impl/src/test/java/org/apache/myfaces/application/flow/Flow1Bean.java
@@ -19,7 +19,7 @@
 package org.apache.myfaces.application.flow;
 
 import java.io.Serializable;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.faces.flow.FlowScoped;
 import jakarta.inject.Named;
 
diff --git a/impl/src/test/java/org/apache/myfaces/application/flow/Flow21Bean.java b/impl/src/test/java/org/apache/myfaces/application/flow/Flow21Bean.java
index b292663..fb96d98 100644
--- a/impl/src/test/java/org/apache/myfaces/application/flow/Flow21Bean.java
+++ b/impl/src/test/java/org/apache/myfaces/application/flow/Flow21Bean.java
@@ -19,7 +19,7 @@
 package org.apache.myfaces.application.flow;
 
 import java.io.Serializable;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.faces.flow.FlowScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
diff --git a/impl/src/test/java/org/apache/myfaces/application/flow/Flow2Bean.java b/impl/src/test/java/org/apache/myfaces/application/flow/Flow2Bean.java
index 2833dc6..dd83526 100644
--- a/impl/src/test/java/org/apache/myfaces/application/flow/Flow2Bean.java
+++ b/impl/src/test/java/org/apache/myfaces/application/flow/Flow2Bean.java
@@ -19,7 +19,7 @@
 package org.apache.myfaces.application.flow;
 
 import java.io.Serializable;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.faces.flow.FlowScoped;
 import jakarta.inject.Named;
 
diff --git a/impl/src/test/java/org/apache/myfaces/component/search/SearchBean.java b/impl/src/test/java/org/apache/myfaces/component/search/SearchBean.java
index cc77d14..3329fce 100644
--- a/impl/src/test/java/org/apache/myfaces/component/search/SearchBean.java
+++ b/impl/src/test/java/org/apache/myfaces/component/search/SearchBean.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.component.search;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.faces.bean.ManagedBean;
 import jakarta.faces.bean.RequestScoped;
 
diff --git a/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java b/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java
index fe3ba34..295990b 100644
--- a/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java
+++ b/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean.java
@@ -19,8 +19,8 @@
 
 package org.apache.myfaces.config.annotation;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 /**
  * @author Dennis Byrne
diff --git a/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean2.java b/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean2.java
index 2d8c56c..4066360 100644
--- a/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean2.java
+++ b/impl/src/test/java/org/apache/myfaces/config/annotation/AnnotatedManagedBean2.java
@@ -17,8 +17,8 @@
 
 package org.apache.myfaces.config.annotation;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 /**
  * @author Leonardo Uribe
diff --git a/impl/src/test/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupportTest.java b/impl/src/test/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupportTest.java
index 23465f3..ecb8632 100644
--- a/impl/src/test/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupportTest.java
+++ b/impl/src/test/java/org/apache/myfaces/lifecycle/DefaultRestoreViewSupportTest.java
@@ -86,8 +86,8 @@ public class DefaultRestoreViewSupportTest extends FacesTestCase
         _mocksControl.checkOrder(true);
         expect(_facesContext.getExternalContext()).andReturn(_externalContext);
         Map<String, Object> map = new HashMap<String, Object>();
-        String expectedValue = "javax.servlet.include.path_info_VIEWID";
-        map.put("javax.servlet.include.path_info", expectedValue);
+        String expectedValue = "jakarta.servlet.include.path_info_VIEWID";
+        map.put("jakarta.servlet.include.path_info", expectedValue);
         expect(_externalContext.getRequestMap()).andReturn(map);
         //expect(_facesContext.getApplication()).andReturn(_application);
         //ViewHandler viewHandler = _mocksControl.createMock(ViewHandler.class);
@@ -132,8 +132,8 @@ public class DefaultRestoreViewSupportTest extends FacesTestCase
         _mocksControl.checkOrder(true);
         expect(_facesContext.getExternalContext()).andReturn(_externalContext);
         Map<String, Object> map = new HashMap<String, Object>();
-        String expectedValue = "javax.servlet.include.servlet_path_VIEWID";
-        map.put("javax.servlet.include.servlet_path", expectedValue);
+        String expectedValue = "jakarta.servlet.include.servlet_path_VIEWID";
+        map.put("jakarta.servlet.include.servlet_path", expectedValue);
         expect(_externalContext.getRequestMap()).andReturn(map);
         expect(_externalContext.getRequestPathInfo()).andReturn(null);
         //expect(_facesContext.getApplication()).andReturn(_application);
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pool/DynamicBean.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pool/DynamicBean.java
index eee28cc..7ae33ee 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pool/DynamicBean.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pool/DynamicBean.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.pool;
 
 import java.io.Serializable;
 import java.util.Locale;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.faces.bean.ManagedBean;
 import jakarta.faces.bean.SessionScoped;
 
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/CheckActionEventBean.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/CheckActionEventBean.java
index 2fd29fd..1f611c4 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/CheckActionEventBean.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/CheckActionEventBean.java
@@ -19,7 +19,7 @@
 package org.apache.myfaces.view.facelets.pss.acid.managed;
 
 import java.io.Serializable;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.faces.bean.ManagedBean;
 import jakarta.faces.bean.SessionScoped;
 import jakarta.faces.event.ActionEvent;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/CustomSessionBean.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/CustomSessionBean.java
index d77d576..3b28f9e 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/CustomSessionBean.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/CustomSessionBean.java
@@ -16,7 +16,7 @@
 package org.apache.myfaces.view.facelets.pss.acid.managed;
 
 import java.io.Serializable;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.faces.bean.ManagedBean;
 import jakarta.faces.bean.SessionScoped;
 
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/TestBean.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/TestBean.java
index 67d175e..0e4f126 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/TestBean.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/TestBean.java
@@ -20,7 +20,7 @@ package org.apache.myfaces.view.facelets.pss.acid.managed;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import jakarta.faces.bean.ManagedBean;
 import jakarta.faces.bean.RequestScoped;
 
diff --git a/impl/src/test/java/org/apache/myfaces/webapp/Jsp21FacesInitializerTest.java b/impl/src/test/java/org/apache/myfaces/webapp/Jsp21FacesInitializerTest.java
index bea6d91..c70a39c 100644
--- a/impl/src/test/java/org/apache/myfaces/webapp/Jsp21FacesInitializerTest.java
+++ b/impl/src/test/java/org/apache/myfaces/webapp/Jsp21FacesInitializerTest.java
@@ -52,7 +52,7 @@ public class Jsp21FacesInitializerTest extends AbstractJsfTestCase
     }
 
     /**
-     * Test method for {@link org.apache.myfaces.webapp.DefaultFacesInitializer#initFaces(javax.servlet.ServletContext)}.
+     * Test method for {@link org.apache.myfaces.webapp.DefaultFacesInitializer#initFaces(jakarta.servlet.ServletContext)}.
      * @throws Exception 
      */
     public void testInitFaces() throws Exception


Mime
View raw message