Fix Loading of taglibs, replace myfaces with component local mojarra

cuioss · Jun 14, 2024 · 0a7c294 · 0a7c294
1 parent 51a2eb4
commit 0a7c294
Show file tree

Hide file tree

Showing 6 changed files with 14,843 additions and 16 deletions.
diff --git a/modules/cui-jsf-dev/pom.xml b/modules/cui-jsf-dev/pom.xml
@@ -37,8 +37,8 @@
             <artifactId>jaxen</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
+            <groupId>de.cuioss.jsf</groupId>
+            <artifactId>cui-jsf-bootstrap</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/modules/cui-jsf-dev/src/main/java/de/cuioss/jsf/dev/metadata/LibraryTagLib.java b/modules/cui-jsf-dev/src/main/java/de/cuioss/jsf/dev/metadata/LibraryTagLib.java
@@ -4,7 +4,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import static de.cuioss.jsf.dev.metadata.TagLib.JSF_2_2_FACELET_TAGLIB_NAMESPACE;
+import static de.cuioss.jsf.dev.metadata.TagLib.JSF_2_FACELET_TAGLIB_NAMESPACE;
 import static de.cuioss.jsf.dev.metadata.TagLib.JSF_4_0_FACELET_TAGLIB_NAMESPACE;
 
 /**
@@ -14,10 +14,11 @@
 public enum LibraryTagLib {
 
     CUI_CORE("/META-INF/cui-core.taglib.xml", JSF_4_0_FACELET_TAGLIB_NAMESPACE),
-    CUI_BOOTSTRAP("/META-INF/cui-core.taglib.xml", JSF_4_0_FACELET_TAGLIB_NAMESPACE),
-    PRIME_FACES("/META-INF/primefaces-p.taglib.xml", JSF_2_2_FACELET_TAGLIB_NAMESPACE),
+    CUI_BOOTSTRAP("/META-INF/cui-bootstrap.taglib.xml", JSF_4_0_FACELET_TAGLIB_NAMESPACE),
+    PRIME_FACES("/META-INF/primefaces-p.taglib.xml", JSF_2_FACELET_TAGLIB_NAMESPACE),
     OMNI_FACES("/META-INF/omnifaces-ui.taglib.xml", JSF_4_0_FACELET_TAGLIB_NAMESPACE),
-    MY_FACES("/META-INF/standard-faces-config.xml", JSF_4_0_FACELET_TAGLIB_NAMESPACE);
+    FACES_CORE("/META-INF/resources/mojarra-4.0.7-tlds/faces.core_taglib.xml", JSF_4_0_FACELET_TAGLIB_NAMESPACE),
+    FACES_HTML("/META-INF/resources/mojarra-4.0.7-tlds/faces.html_taglib.xml", JSF_4_0_FACELET_TAGLIB_NAMESPACE);
 
     @Getter
     private final String path;

diff --git a/...ui-jsf-dev/src/main/resources/META-INF/resources/mojarra-4.0.7-tlds/ReadMe.adoc b/...ui-jsf-dev/src/main/resources/META-INF/resources/mojarra-4.0.7-tlds/ReadMe.adoc
@@ -0,0 +1,3 @@
+This is a temporary workaround:
+Starting with myfaces-4, there are no tld-files delivered.
+Therefore, we fall back to mojarra 4.0.7 until we implement the parsing of the "META-INF/standard-faces-config.xml"