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: MYFACES-4364: Fix missing javax renames to jakarta
Date Wed, 21 Oct 2020 09:04:59 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 d241e89  MYFACES-4364: Fix missing javax renames to jakarta
     new 5950c14  Merge pull request #121 from isaacrivriv/MYFACES-4364
d241e89 is described below

commit d241e894a5243b5e9b755de63337e25c5bcc91a0
Author: Isaac Rivera-Rivas <Isaac.Rivera-Rivas@ibm.com>
AuthorDate: Tue Oct 20 14:39:04 2020 -0400

    MYFACES-4364: Fix missing javax renames to jakarta
---
 .../org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java   | 2 +-
 .../java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
b/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
index ec249d4..da5419b 100644
--- a/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
+++ b/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
@@ -2890,7 +2890,7 @@ public final class HtmlRendererUtils
         // create and configure HtmlMessages component
         HtmlMessages messages = (HtmlMessages) facesContext.getApplication()
                 .createComponent(HtmlMessages.COMPONENT_TYPE);
-        messages.setId("javax_faces_developmentstage_messages");
+        messages.setId("jakarta_faces_developmentstage_messages");
         messages.setTitle("Project Stage[Development]: Unhandled Messages");
         messages.setStyle("color:orange");
         messages.setRedisplay(false);
diff --git a/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
b/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
index 165f4ff..acde1a7 100755
--- a/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
+++ b/shared/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
@@ -55,10 +55,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.webapp.webxml.WebXml _webXml;


Mime
View raw message