Merge pull request #7539 from matthiasblaesing/jakarta_fixes2

Further JavaEE -> JakartaEE fixes for Jakarta Faces
apache · Jul 16, 2024 · 0d9ea57 · 0d9ea57
2 parents 2027c7d + bc70903
commit 0d9ea57
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 4 deletions.
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CdiUtil.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CdiUtil.java
@@ -156,7 +156,8 @@ public boolean isCdiEnabled(){
      * @return 
      */
     public static boolean isCdi11OrLater(Project p) {
-        if(! hasResource(p, "javax/enterprise/inject/spi/AfterTypeDiscovery.class") ) {
+        if(! (hasResource(p, "javax/enterprise/inject/spi/AfterTypeDiscovery.class")
+                || hasResource(p, "jakarta/enterprise/inject/spi/AfterTypeDiscovery.class"))) {
             return false;
         } else {
             FileObject beans = getBeansXmlExists(p);
@@ -177,7 +178,8 @@ public static boolean isCdi11OrLater(Project p) {
     }
 
     public boolean isCdi11OrLater() {
-        if(! hasResource(getProject(), "javax/enterprise/inject/spi/AfterTypeDiscovery.class") ) {
+        if (!(hasResource(getProject(), "javax/enterprise/inject/spi/AfterTypeDiscovery.class")
+                || hasResource(getProject(), "jakarta/enterprise/inject/spi/AfterTypeDiscovery.class"))) {
             return false;
         } else {
             FileObject beans = getBeansXmlExists();

diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/create.ftl b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/create.ftl
@@ -50,11 +50,17 @@
 </#if>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<#if nsLocation?starts_with("http://")>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="${nsLocation}/jsf/facelets"
       xmlns:h="${nsLocation}/jsf/html"
       xmlns:f="${nsLocation}/jsf/core">
-
+<#else>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="${nsLocation}.facelets"
+      xmlns:h="${nsLocation}.html"
+      xmlns:f="${nsLocation}.core">
+</#if>
     <ui:composition template="/template.xhtml">
         <ui:define name="title">
             <h:outputText value="${r"#{"}${bundle}.Create${entityName}Title${r"}"}"></h:outputText>

diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/crudtemplate.ftl b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/crudtemplate.ftl
@@ -50,10 +50,15 @@
 <#setting number_format="0">
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<#if nsLocation?starts_with("http://")>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="${nsLocation}/jsf/facelets"
       xmlns:h="${nsLocation}/jsf/html">
-
+<#else>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="${nsLocation}.facelets"
+      xmlns:h="${nsLocation}.html">
+</#if>
     <h:head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <title><ui:insert name="title">Default Title</ui:insert></title>

diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/edit.ftl b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/edit.ftl
@@ -50,10 +50,17 @@
 </#if>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<#if nsLocation?starts_with("http://")>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="${nsLocation}/jsf/facelets"
       xmlns:h="${nsLocation}/jsf/html"
       xmlns:f="${nsLocation}/jsf/core">
+<#else>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="${nsLocation}.facelets"
+      xmlns:h="${nsLocation}.html"
+      xmlns:f="${nsLocation}.core">
+</#if>
 
     <ui:composition template="/template.xhtml">
         <ui:define name="title">

diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/list.ftl b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/list.ftl
@@ -50,10 +50,17 @@
 </#if>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<#if nsLocation?starts_with("http://")>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="${nsLocation}/jsf/facelets"
       xmlns:h="${nsLocation}/jsf/html"
       xmlns:f="${nsLocation}/jsf/core">
+<#else>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="${nsLocation}.facelets"
+      xmlns:h="${nsLocation}.html"
+      xmlns:f="${nsLocation}.core">
+</#if>
 
     <ui:composition template="/template.xhtml">
         <ui:define name="title">

diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/view.ftl b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/templates/view.ftl
@@ -50,10 +50,17 @@
 </#if>
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<#if nsLocation?starts_with("http://")>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:ui="${nsLocation}/jsf/facelets"
       xmlns:h="${nsLocation}/jsf/html"
       xmlns:f="${nsLocation}/jsf/core">
+<#else>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="${nsLocation}.facelets"
+      xmlns:h="${nsLocation}.html"
+      xmlns:f="${nsLocation}.core">
+</#if>
 
     <ui:composition template="/template.xhtml">
         <ui:define name="title">