Skip to content

Commit

Permalink
catch up XML namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
BalusC committed May 12, 2024
1 parent e2534af commit 4a81ae2
Show file tree
Hide file tree
Showing 51 changed files with 148 additions and 196 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
* <?xml version="1.0" encoding="UTF-8"?>
* <urlset
* xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
* xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
* xmlns:h="jakarta.faces.facelets"
* xmlns:o="http://omnifaces.org/ui"
* >
* <ui:repeat value="#{sitemapBean.products}" var="product">
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/omnifaces/util/Components.java
Original file line number Diff line number Diff line change
Expand Up @@ -710,11 +710,11 @@ public static void includeFacelet(UIComponent parent, String path) throws IOExce
/**
* Create and include the composite component of the given library and resource name as child of the given UI
* component parent and return the created composite component.
* This has the same effect as using <code>xmlns:my="http://xmlns.jcp.org/jsf/composite/libraryName</code> and
* This has the same effect as using <code>xmlns:my="jakarta.faces.composite/libraryName</code> and
* <code>&lt;my:tagName&gt;</code>. The given component ID must be unique relative to the current naming
* container parent and is mandatory for functioning of input components inside the composite, if any.
* @param parent The parent component to include the composite component in.
* @param libraryName The library name of the composite component (path after "http://xmlns.jcp.org/jsf/composite/").
* @param libraryName The library name of the composite component (path after "jakarta.faces.composite/").
* @param tagName The tag name of the composite component.
* @param id The component ID of the composite component.
* @return The created composite component, which can if necessary be used to set more custom attributes on it.
Expand All @@ -727,7 +727,7 @@ public static UIComponent includeCompositeComponent(UIComponent parent, String l
/**
* Create and include the composite component of the given library and resource name as child of the given UI
* component parent, set the given attributes on it and return the created composite component.
* This has the same effect as using <code>xmlns:my="http://xmlns.jcp.org/jsf/composite/libraryName</code> and
* This has the same effect as using <code>xmlns:my="jakarta.faces.composite/libraryName</code> and
* <code>&lt;my:tagName&gt;</code>. The given component ID must be unique relative to the current naming
* container parent and is mandatory for functioning of input components inside the composite, if any.
* <p>
Expand All @@ -739,15 +739,15 @@ public static UIComponent includeCompositeComponent(UIComponent parent, String l
* attributes.put("baz", "#{bean.baz(" + someId + ")}");
* </pre>
* @param parent The parent component to include the composite component in.
* @param libraryName The library name of the composite component (path after "http://xmlns.jcp.org/jsf/composite/").
* @param libraryName The library name of the composite component (path after "jakarta.faces.composite/").
* @param tagName The tag name of the composite component.
* @param id The component ID of the composite component.
* @param attributes The attributes to be set on the composite component.
* @return The created composite component, which can if necessary be used to set more custom attributes on it.
* @since 2.2
*/
public static UIComponent includeCompositeComponent(UIComponent parent, String libraryName, String tagName, String id, Map<String, String> attributes) {
String taglibURI = "http://xmlns.jcp.org/jsf/composite/" + libraryName;
String taglibURI = "jakarta.faces.composite/" + libraryName;
Map<String, Object> attrs = (attributes == null) ? null : new HashMap<>(attributes);

FacesContext context = FacesContext.getCurrentInstance();
Expand Down
7 changes: 3 additions & 4 deletions src/test/resources/WEB-INF/404.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
7 changes: 3 additions & 4 deletions src/test/resources/WEB-INF/500.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
xmlns:p="http://primefaces.org/ui"
Expand Down
7 changes: 3 additions & 4 deletions src/test/resources/org.omnifaces.test.cdi.eager/EagerIT.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
7 changes: 3 additions & 4 deletions src/test/resources/org.omnifaces.test.cdi.param/ParamIT.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:a="jakarta.faces.passthrough"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:a="jakarta.faces.passthrough"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:a="jakarta.faces.passthrough"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
xmlns:p="http://primefaces.org/ui"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
-->
<!DOCTYPE html>
<html lang="en"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="jakarta.faces.core"
xmlns:h="jakarta.faces.html"
xmlns:h="jakarta.faces.facelets"
xmlns:o="http://omnifaces.org/ui"
xmlns:of="http://omnifaces.org/functions"
>
Expand Down

0 comments on commit 4a81ae2

Please sign in to comment.