You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2021/02/09 17:04:06 UTC

[myfaces] branch master updated: Replace CRLF with LF

This is an automated email from the ASF dual-hosted git repository.

bommel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new 11036ac  Replace CRLF with LF
     new 11fec79  Merge pull request #175 from volosied/update-line-endings
11036ac is described below

commit 11036ac50b2a0cfce300190d94853efe27fce746
Author: Volodymyr Siedlecki <vo...@gmail.com>
AuthorDate: Tue Feb 9 11:06:27 2021 -0500

    Replace CRLF with LF
---
 .../main/resources/META-INF/resources/index.xhtml  | 163 ++++++++++-----------
 .../main/resources/META-INF/resources/issue4.xhtml |  83 ++++++-----
 .../resources/methodHandleELResolver.xhtml         | 115 +++++++--------
 .../main/resources/META-INF/resources/val.xhtml    |  97 ++++++------
 .../META-INF/licenses/omnifaces-LICENSE.txt        |  18 +--
 .../jakarta.enterprise.inject.spi.Extension        |  26 ++--
 .../org.apache.myfaces.spi.InjectionProvider       |   2 +-
 .../myfaces/application/flow/flow5/content.xhtml   |  78 +++++-----
 .../myfaces/application/flow/flow5/flow5.xhtml     |  84 +++++------
 .../myfaces/application/flow/flowA/content.xhtml   |  78 +++++-----
 .../myfaces/application/flow/flowA/flowA.xhtml     |  88 +++++------
 .../myfaces/application/flow/flowB/content.xhtml   |  78 +++++-----
 .../myfaces/application/flow/flowB/flowB.xhtml     |  88 +++++------
 .../facelets/compiler/testSkipNamespaceUnit.xhtml  |  90 ++++++------
 .../resources/templates/basicTemplate.xhtml        |  74 +++++-----
 .../view/facelets/stateless/stateless.xhtml        |  74 +++++-----
 .../myfaces/view/facelets/stateless/template.xhtml |  58 ++++----
 .../view/facelets/tag/jstl/core/forEach1.xhtml     |  54 +++----
 .../view/facelets/tag/jstl/core/forEach2.xhtml     |  58 ++++----
 .../view/facelets/tag/jstl/core/forEach3.xhtml     |  58 ++++----
 .../view/facelets/tag/jstl/core/forEach4.xhtml     |  60 ++++----
 .../view/facelets/tag/jstl/core/forEach4_1.xhtml   |  56 +++----
 .../view/facelets/tag/ui/testUIRepeatEmpty.xhtml   |  62 ++++----
 .../facelets/tag/ui/ui_repeat_model_step.xhtml     |  64 ++++----
 .../view/facelets/templateInResourcesDir.xhtml     |  70 ++++-----
 25 files changed, 886 insertions(+), 890 deletions(-)

diff --git a/extensions/quarkus/showcase/src/main/resources/META-INF/resources/index.xhtml b/extensions/quarkus/showcase/src/main/resources/META-INF/resources/index.xhtml
index a7f3d9f..674b41e 100644
--- a/extensions/quarkus/showcase/src/main/resources/META-INF/resources/index.xhtml
+++ b/extensions/quarkus/showcase/src/main/resources/META-INF/resources/index.xhtml
@@ -1,82 +1,81 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:p="http://primefaces.org/ui">
-
-    <f:view contentType="text/html">
-        <h:head>
-        </h:head>
-
-        <h:body>
-            <p:growl>
-                <p:autoUpdate />
-            </p:growl>
-
-            <h:form id="form">
-                <p:dataTable var="car" value="#{dtLazyView.lazyModel}" paginator="true" rows="10"
-                             paginatorTemplate="{RowsPerPageDropdown} {FirstPageLink} {PreviousPageLink} {CurrentPageReport} {NextPageLink} {LastPageLink}"
-                             rowsPerPageTemplate="5,10,15" selectionMode="single" selection="#{dtLazyView.selectedCar}" id="carTable" lazy="true">
-                    <p:ajax event="rowSelect" listener="#{dtLazyView.onRowSelect}" update=":form:carDetail" oncomplete="PF('carDialog').show()" />
-                    <p:column headerText="Id" sortBy="#{car.id}" filterBy="#{car.id}">
-                        <h:outputText value="#{car.id}" />
-                    </p:column>
-                    <p:column headerText="Year" sortBy="#{car.year}" filterBy="#{car.year}">
-                        <h:outputText value="#{car.year}" />
-                    </p:column>
-                    <p:column headerText="Brand" sortBy="#{car.brand}" filterBy="#{car.brand}">
-                        <h:outputText value="#{car.brand}" />
-                    </p:column>
-                    <p:column headerText="Color" sortBy="#{car.color}" filterBy="#{car.color}">
-                        <h:outputText value="#{car.color}" />
-                    </p:column>
-                </p:dataTable>
-
-                <p:dialog header="Car Detail" widgetVar="carDialog" modal="true" showEffect="fade" hideEffect="fade" resizable="false">
-                    <p:outputPanel id="carDetail" style="text-align:center;">
-                        <p:panelGrid  columns="2" rendered="#{not empty dtLazyView.selectedCar}" columnClasses="label,value">
-                            <f:facet name="header">
-                                <p:graphicImage name="demo/images/car/#{dtLazyView.selectedCar.brand}-big.gif"/>
-                            </f:facet>
-
-                            <h:outputText value="Id:" />
-                            <h:outputText value="#{dtLazyView.selectedCar.id}" />
-
-                            <h:outputText value="Year" />
-                            <h:outputText value="#{dtLazyView.selectedCar.year}" />
-
-                            <h:outputText value="Color:" />
-                            <h:outputText value="#{dtLazyView.selectedCar.color}" style="color:#{dtLazyView.selectedCar.color}"/>
-
-                            <h:outputText value="Price:" />
-                            <h:outputText value="#{dtLazyView.selectedCar.price}">
-                                <f:convertNumber type="currency" currencySymbol="$" />
-                            </h:outputText>
-                        </p:panelGrid>
-                    </p:outputPanel>
-                </p:dialog>
-            </h:form>
-        </h:body>
-
-    </f:view>
-</html>
-
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui">
+
+    <f:view contentType="text/html">
+        <h:head>
+        </h:head>
+
+        <h:body>
+            <p:growl>
+                <p:autoUpdate />
+            </p:growl>
+
+            <h:form id="form">
+                <p:dataTable var="car" value="#{dtLazyView.lazyModel}" paginator="true" rows="10"
+                             paginatorTemplate="{RowsPerPageDropdown} {FirstPageLink} {PreviousPageLink} {CurrentPageReport} {NextPageLink} {LastPageLink}"
+                             rowsPerPageTemplate="5,10,15" selectionMode="single" selection="#{dtLazyView.selectedCar}" id="carTable" lazy="true">
+                    <p:ajax event="rowSelect" listener="#{dtLazyView.onRowSelect}" update=":form:carDetail" oncomplete="PF('carDialog').show()" />
+                    <p:column headerText="Id" sortBy="#{car.id}" filterBy="#{car.id}">
+                        <h:outputText value="#{car.id}" />
+                    </p:column>
+                    <p:column headerText="Year" sortBy="#{car.year}" filterBy="#{car.year}">
+                        <h:outputText value="#{car.year}" />
+                    </p:column>
+                    <p:column headerText="Brand" sortBy="#{car.brand}" filterBy="#{car.brand}">
+                        <h:outputText value="#{car.brand}" />
+                    </p:column>
+                    <p:column headerText="Color" sortBy="#{car.color}" filterBy="#{car.color}">
+                        <h:outputText value="#{car.color}" />
+                    </p:column>
+                </p:dataTable>
+
+                <p:dialog header="Car Detail" widgetVar="carDialog" modal="true" showEffect="fade" hideEffect="fade" resizable="false">
+                    <p:outputPanel id="carDetail" style="text-align:center;">
+                        <p:panelGrid  columns="2" rendered="#{not empty dtLazyView.selectedCar}" columnClasses="label,value">
+                            <f:facet name="header">
+                                <p:graphicImage name="demo/images/car/#{dtLazyView.selectedCar.brand}-big.gif"/>
+                            </f:facet>
+
+                            <h:outputText value="Id:" />
+                            <h:outputText value="#{dtLazyView.selectedCar.id}" />
+
+                            <h:outputText value="Year" />
+                            <h:outputText value="#{dtLazyView.selectedCar.year}" />
+
+                            <h:outputText value="Color:" />
+                            <h:outputText value="#{dtLazyView.selectedCar.color}" style="color:#{dtLazyView.selectedCar.color}"/>
+
+                            <h:outputText value="Price:" />
+                            <h:outputText value="#{dtLazyView.selectedCar.price}">
+                                <f:convertNumber type="currency" currencySymbol="$" />
+                            </h:outputText>
+                        </p:panelGrid>
+                    </p:outputPanel>
+                </p:dialog>
+            </h:form>
+        </h:body>
+
+    </f:view>
+</html>
\ No newline at end of file
diff --git a/extensions/quarkus/showcase/src/main/resources/META-INF/resources/issue4.xhtml b/extensions/quarkus/showcase/src/main/resources/META-INF/resources/issue4.xhtml
index 60629c1..a3f86fc 100644
--- a/extensions/quarkus/showcase/src/main/resources/META-INF/resources/issue4.xhtml
+++ b/extensions/quarkus/showcase/src/main/resources/META-INF/resources/issue4.xhtml
@@ -1,42 +1,41 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:p="http://primefaces.org/ui">
-
-    <f:view contentType="text/html">
-        <h:head>
-        </h:head>
-
-        <h:body>
-            <h:form id="form">
-                <p:inputText style="width:100%;" value="#{dtLazyView.inputVal}" />
-                <p:commandButton value="property action listener" actionListener="#{dtLazyView.saveInput()}">
-                    <f:setPropertyActionListener value="true"
-                                                 target="#{facesContext.externalContext.flash.keepMessages}"/>
-                </p:commandButton>
-            </h:form>
-        </h:body>
-
-    </f:view>
-</html>
-
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui">
+
+    <f:view contentType="text/html">
+        <h:head>
+        </h:head>
+
+        <h:body>
+            <h:form id="form">
+                <p:inputText style="width:100%;" value="#{dtLazyView.inputVal}" />
+                <p:commandButton value="property action listener" actionListener="#{dtLazyView.saveInput()}">
+                    <f:setPropertyActionListener value="true"
+                                                 target="#{facesContext.externalContext.flash.keepMessages}"/>
+                </p:commandButton>
+            </h:form>
+        </h:body>
+
+    </f:view>
+</html>
\ No newline at end of file
diff --git a/extensions/quarkus/showcase/src/main/resources/META-INF/resources/methodHandleELResolver.xhtml b/extensions/quarkus/showcase/src/main/resources/META-INF/resources/methodHandleELResolver.xhtml
index c38d784..8ef9b0e 100644
--- a/extensions/quarkus/showcase/src/main/resources/META-INF/resources/methodHandleELResolver.xhtml
+++ b/extensions/quarkus/showcase/src/main/resources/META-INF/resources/methodHandleELResolver.xhtml
@@ -1,58 +1,57 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:p="http://primefaces.org/ui">
-
-    <f:view contentType="text/html">
-
-        <f:metadata>
-            <f:phaseListener binding="#{methodHandleELResolverBean}" />
-        </f:metadata>
-
-        <h:head>
-        </h:head>
-
-        <h:body>
-            <h:form id="form">
-
-                Setter &amp; Getter test:
-                <h:inputText value="#{methodHandleELResolverBean.test}" />
-                <h:inputText value="#{methodHandleELResolverBean.test2}" />
-                <p:commandButton process="@form" update="@form" value="Process and Update" />
-                <p:commandButton process="@this" update="@form" value="Update only" />
-
-            </h:form>
-
-                <br />
-
-                <ui:repeat var="car" value="#{methodHandleELResolverBean.cars}">
-                    <h:outputText value="#{car.id}" />
-                    <h:outputText value="#{car.year}" />
-                    <h:outputText value="#{car.brand}" />
-                    <h:outputText value="#{car.color}" />
-                </ui:repeat>
-        </h:body>
-
-    </f:view>
-</html>
-
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui">
+
+    <f:view contentType="text/html">
+
+        <f:metadata>
+            <f:phaseListener binding="#{methodHandleELResolverBean}" />
+        </f:metadata>
+
+        <h:head>
+        </h:head>
+
+        <h:body>
+            <h:form id="form">
+
+                Setter &amp; Getter test:
+                <h:inputText value="#{methodHandleELResolverBean.test}" />
+                <h:inputText value="#{methodHandleELResolverBean.test2}" />
+                <p:commandButton process="@form" update="@form" value="Process and Update" />
+                <p:commandButton process="@this" update="@form" value="Update only" />
+
+            </h:form>
+
+                <br />
+
+                <ui:repeat var="car" value="#{methodHandleELResolverBean.cars}">
+                    <h:outputText value="#{car.id}" />
+                    <h:outputText value="#{car.year}" />
+                    <h:outputText value="#{car.brand}" />
+                    <h:outputText value="#{car.color}" />
+                </ui:repeat>
+        </h:body>
+
+    </f:view>
+</html>
\ No newline at end of file
diff --git a/extensions/quarkus/showcase/src/main/resources/META-INF/resources/val.xhtml b/extensions/quarkus/showcase/src/main/resources/META-INF/resources/val.xhtml
index 56f0f4f..5f2ab2c 100644
--- a/extensions/quarkus/showcase/src/main/resources/META-INF/resources/val.xhtml
+++ b/extensions/quarkus/showcase/src/main/resources/META-INF/resources/val.xhtml
@@ -1,49 +1,48 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:p="http://primefaces.org/ui">
-
-    <f:view contentType="text/html">
-        <h:head>
-        </h:head>
-
-        <h:body>
-            <p:growl>
-                <p:autoUpdate />
-            </p:growl>
-
-            <h:form id="form">
-                <h:inputText value="#{inputController.val}" validator="myVal" />
-                <p:commandButton process="@form" update="@form" value="Submit" />
-
-
-                <h:dataTable value="#{myBacking.cars}" var="car">
-                    <h:column>#{car.id}</h:column>
-                </h:dataTable>
-
-            </h:form>
-        </h:body>
-
-    </f:view>
-</html>
-
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui">
+
+    <f:view contentType="text/html">
+        <h:head>
+        </h:head>
+
+        <h:body>
+            <p:growl>
+                <p:autoUpdate />
+            </p:growl>
+
+            <h:form id="form">
+                <h:inputText value="#{inputController.val}" validator="myVal" />
+                <p:commandButton process="@form" update="@form" value="Submit" />
+
+
+                <h:dataTable value="#{myBacking.cars}" var="car">
+                    <h:column>#{car.id}</h:column>
+                </h:dataTable>
+
+            </h:form>
+        </h:body>
+
+    </f:view>
+</html>
\ No newline at end of file
diff --git a/impl/src/main/resources/META-INF/licenses/omnifaces-LICENSE.txt b/impl/src/main/resources/META-INF/licenses/omnifaces-LICENSE.txt
index 5a95148..65c4dd2 100644
--- a/impl/src/main/resources/META-INF/licenses/omnifaces-LICENSE.txt
+++ b/impl/src/main/resources/META-INF/licenses/omnifaces-LICENSE.txt
@@ -1,10 +1,10 @@
-Copyright 2016 OmniFaces
- 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
-an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+Copyright 2016 OmniFaces
+ 
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
index 76c09f6..5ba850d 100644
--- a/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
+++ b/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -1,13 +1,13 @@
-org.apache.myfaces.cdi.FacesScopeExtension
-org.apache.myfaces.cdi.JsfArtifactProducerExtension
-org.apache.myfaces.cdi.JsfApplicationArtifactHolderExtension
-org.apache.myfaces.cdi.config.FacesConfigExtension
-org.apache.myfaces.cdi.managedproperty.ManagedPropertyExtension
-org.apache.myfaces.cdi.model.FacesDataModelExtension
-org.apache.myfaces.cdi.view.ViewScopeExtension
-org.apache.myfaces.cdi.view.ViewTransientScopeExtension
-org.apache.myfaces.config.annotation.CdiAnnotationProviderExtension
-org.apache.myfaces.push.cdi.PushContextCDIExtension
-org.apache.myfaces.flow.cdi.FlowBuilderExtension
-org.apache.myfaces.flow.cdi.FlowScopeExtension
-org.apache.myfaces.cdi.clientwindow.ClientWindowScopeExtension
+org.apache.myfaces.cdi.FacesScopeExtension
+org.apache.myfaces.cdi.JsfArtifactProducerExtension
+org.apache.myfaces.cdi.JsfApplicationArtifactHolderExtension
+org.apache.myfaces.cdi.config.FacesConfigExtension
+org.apache.myfaces.cdi.managedproperty.ManagedPropertyExtension
+org.apache.myfaces.cdi.model.FacesDataModelExtension
+org.apache.myfaces.cdi.view.ViewScopeExtension
+org.apache.myfaces.cdi.view.ViewTransientScopeExtension
+org.apache.myfaces.config.annotation.CdiAnnotationProviderExtension
+org.apache.myfaces.push.cdi.PushContextCDIExtension
+org.apache.myfaces.flow.cdi.FlowBuilderExtension
+org.apache.myfaces.flow.cdi.FlowScopeExtension
+org.apache.myfaces.cdi.clientwindow.ClientWindowScopeExtension
\ No newline at end of file
diff --git a/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider b/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider
index f840744..ab516dd 100644
--- a/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider
+++ b/impl/src/main/resources/META-INF/services/org.apache.myfaces.spi.InjectionProvider
@@ -1,2 +1,2 @@
-org.apache.myfaces.spi.impl.CDIAnnotationDelegateInjectionProvider
+org.apache.myfaces.spi.impl.CDIAnnotationDelegateInjectionProvider
 org.apache.myfaces.spi.impl.Tomcat7AnnotationInjectionProvider
\ No newline at end of file
diff --git a/impl/src/test/resources/org/apache/myfaces/application/flow/flow5/content.xhtml b/impl/src/test/resources/org/apache/myfaces/application/flow/flow5/content.xhtml
index c9ca198..f8b8292 100644
--- a/impl/src/test/resources/org/apache/myfaces/application/flow/flow5/content.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/application/flow/flow5/content.xhtml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- >
-<body>
-<ui:composition>
-    <h1>Myfaces Flow Examples</h1>
-    <h2>begin.xhtml</h2>
-    <h:form id="mainForm">
-        <h:commandButton value="End" action="end"/>
-    </h:form>
-    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
-    <h:link outcome="end" value="End Outcome Link"/>
-</ui:composition>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+    <h1>Myfaces Flow Examples</h1>
+    <h2>begin.xhtml</h2>
+    <h:form id="mainForm">
+        <h:commandButton value="End" action="end"/>
+    </h:form>
+    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+    <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/application/flow/flow5/flow5.xhtml b/impl/src/test/resources/org/apache/myfaces/application/flow/flow5/flow5.xhtml
index 3814ebb..ec5acf4 100644
--- a/impl/src/test/resources/org/apache/myfaces/application/flow/flow5/flow5.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/application/flow/flow5/flow5.xhtml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- >
-<body>
-<ui:composition>
-    <h1>Myfaces Flow Examples</h1>
-    <h2>begin.xhtml</h2>
-    <h:form id="mainForm">
-        <h:commandButton value="End" action="content"/>
-        <h:commandButton id="end_flow" value="End" action="end"/>
-        <h:commandButton id="back_flow" value="Back" action="back"/>
-        <h:commandButton id="go_flow_base" value="Go to base" action="flow_base"/>
-    </h:form>
-    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
-    <h:link outcome="end" value="End Outcome Link"/>
-</ui:composition>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+    <h1>Myfaces Flow Examples</h1>
+    <h2>begin.xhtml</h2>
+    <h:form id="mainForm">
+        <h:commandButton value="End" action="content"/>
+        <h:commandButton id="end_flow" value="End" action="end"/>
+        <h:commandButton id="back_flow" value="Back" action="back"/>
+        <h:commandButton id="go_flow_base" value="Go to base" action="flow_base"/>
+    </h:form>
+    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+    <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/application/flow/flowA/content.xhtml b/impl/src/test/resources/org/apache/myfaces/application/flow/flowA/content.xhtml
index c9ca198..f8b8292 100644
--- a/impl/src/test/resources/org/apache/myfaces/application/flow/flowA/content.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/application/flow/flowA/content.xhtml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- >
-<body>
-<ui:composition>
-    <h1>Myfaces Flow Examples</h1>
-    <h2>begin.xhtml</h2>
-    <h:form id="mainForm">
-        <h:commandButton value="End" action="end"/>
-    </h:form>
-    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
-    <h:link outcome="end" value="End Outcome Link"/>
-</ui:composition>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+    <h1>Myfaces Flow Examples</h1>
+    <h2>begin.xhtml</h2>
+    <h:form id="mainForm">
+        <h:commandButton value="End" action="end"/>
+    </h:form>
+    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+    <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/application/flow/flowA/flowA.xhtml b/impl/src/test/resources/org/apache/myfaces/application/flow/flowA/flowA.xhtml
index 440aa3e..9c65543 100644
--- a/impl/src/test/resources/org/apache/myfaces/application/flow/flowA/flowA.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/application/flow/flowA/flowA.xhtml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- >
-<body>
-<ui:composition>
-    <h1>Myfaces Flow Examples</h1>
-    <h2>begin.xhtml</h2>
-    <h:form id="mainForm">
-        <h:commandButton value="End" action="content"/>
-        <h:commandButton id="end_flow" value="End" action="end"/>
-        <h:commandButton id="back_flow" value="Back" action="back"/>
-        <h:commandButton id="go_flow_B" value="Go to base" action="flowB"/>
-        <h:commandButton id="call_flow_B" value="Call Flow B" action="call_flow_B"/>
-        <h:commandButton id="go_flow_base" value="Go to base" action="flow_base"/>
-    </h:form>
-    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
-    <h:link outcome="end" value="End Outcome Link"/>
-</ui:composition>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+    <h1>Myfaces Flow Examples</h1>
+    <h2>begin.xhtml</h2>
+    <h:form id="mainForm">
+        <h:commandButton value="End" action="content"/>
+        <h:commandButton id="end_flow" value="End" action="end"/>
+        <h:commandButton id="back_flow" value="Back" action="back"/>
+        <h:commandButton id="go_flow_B" value="Go to base" action="flowB"/>
+        <h:commandButton id="call_flow_B" value="Call Flow B" action="call_flow_B"/>
+        <h:commandButton id="go_flow_base" value="Go to base" action="flow_base"/>
+    </h:form>
+    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+    <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/application/flow/flowB/content.xhtml b/impl/src/test/resources/org/apache/myfaces/application/flow/flowB/content.xhtml
index c9ca198..f8b8292 100644
--- a/impl/src/test/resources/org/apache/myfaces/application/flow/flowB/content.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/application/flow/flowB/content.xhtml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- >
-<body>
-<ui:composition>
-    <h1>Myfaces Flow Examples</h1>
-    <h2>begin.xhtml</h2>
-    <h:form id="mainForm">
-        <h:commandButton value="End" action="end"/>
-    </h:form>
-    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
-    <h:link outcome="end" value="End Outcome Link"/>
-</ui:composition>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+    <h1>Myfaces Flow Examples</h1>
+    <h2>begin.xhtml</h2>
+    <h:form id="mainForm">
+        <h:commandButton value="End" action="end"/>
+    </h:form>
+    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+    <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/application/flow/flowB/flowB.xhtml b/impl/src/test/resources/org/apache/myfaces/application/flow/flowB/flowB.xhtml
index 097f4fd..2bf4e09 100644
--- a/impl/src/test/resources/org/apache/myfaces/application/flow/flowB/flowB.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/application/flow/flowB/flowB.xhtml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- >
-<body>
-<ui:composition>
-    <h1>Myfaces Flow Examples</h1>
-    <h2>begin.xhtml</h2>
-    <h:form id="mainForm">
-        <h:commandButton value="End" action="content"/>
-        <h:commandButton id="end_flow" value="End" action="end"/>
-        <h:commandButton id="back_flow" value="Back" action="back"/>
-        <h:commandButton id="go_flow_A" value="Go to base" action="flowA"/>
-        <h:commandButton id="call_flow_A" value="Call Flow A" action="call_flow_A"/>
-        <h:commandButton id="go_flow_base" value="Go to base" action="flow_base"/>
-    </h:form>
-    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
-    <h:link outcome="end" value="End Outcome Link"/>
-</ui:composition>
-</body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ >
+<body>
+<ui:composition>
+    <h1>Myfaces Flow Examples</h1>
+    <h2>begin.xhtml</h2>
+    <h:form id="mainForm">
+        <h:commandButton value="End" action="content"/>
+        <h:commandButton id="end_flow" value="End" action="end"/>
+        <h:commandButton id="back_flow" value="Back" action="back"/>
+        <h:commandButton id="go_flow_A" value="Go to base" action="flowA"/>
+        <h:commandButton id="call_flow_A" value="Call Flow A" action="call_flow_A"/>
+        <h:commandButton id="go_flow_base" value="Go to base" action="flow_base"/>
+    </h:form>
+    <!-- resolve outcome is quite useful to check how the flow target is resolved -->
+    <h:link outcome="end" value="End Outcome Link"/>
+</ui:composition>
+</body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/compiler/testSkipNamespaceUnit.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/compiler/testSkipNamespaceUnit.xhtml
index 4ad2b01..c237d2e 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/compiler/testSkipNamespaceUnit.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/compiler/testSkipNamespaceUnit.xhtml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<html xmlns="http://www.w3.org/1999/xhtml"
-xmlns:ui="http://java.sun.com/jsf/facelets"
-xmlns:h="http://java.sun.com/jsf/html">
-<h:body>
-<dl>
-<dt>
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-<msup><mi>N</mi><mn>2</mn></msup>
-</math>
-</dt>
-<dd></dd>
-<dt>
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-<mi>C</mi>
-</math>
-</dt>
-<dd></dd>
-<dt>
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-<mi>d</mi>
-</math>
-</dt>
-<dd></dd>
-</dl>
-</h:body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml"
+xmlns:ui="http://java.sun.com/jsf/facelets"
+xmlns:h="http://java.sun.com/jsf/html">
+<h:body>
+<dl>
+<dt>
+<math xmlns="http://www.w3.org/1998/Math/MathML">
+<msup><mi>N</mi><mn>2</mn></msup>
+</math>
+</dt>
+<dd></dd>
+<dt>
+<math xmlns="http://www.w3.org/1998/Math/MathML">
+<mi>C</mi>
+</math>
+</dt>
+<dd></dd>
+<dt>
+<math xmlns="http://www.w3.org/1998/Math/MathML">
+<mi>d</mi>
+</math>
+</dt>
+<dd></dd>
+</dl>
+</h:body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/resources/templates/basicTemplate.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/resources/templates/basicTemplate.xhtml
index 5348b2a..d791211 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/resources/templates/basicTemplate.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/resources/templates/basicTemplate.xhtml
@@ -1,37 +1,37 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- $Id: basicTemplate.xhtml
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-    
-<h:head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Facelets Template</title>
-</h:head>
-<h:body>
-    <div id="title" class="title">
-        <ui:insert name="title">Title</ui:insert>
-    </div>
-    <div id="content" class="center_content">
-        <ui:insert name="content">Content</ui:insert>
-    </div>
-    <div id="info" class="info">
-        <ui:insert name="info">Content</ui:insert>
-    </div>
-</h:body>
-</html>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: basicTemplate.xhtml
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+    
+<h:head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Facelets Template</title>
+</h:head>
+<h:body>
+    <div id="title" class="title">
+        <ui:insert name="title">Title</ui:insert>
+    </div>
+    <div id="content" class="center_content">
+        <ui:insert name="content">Content</ui:insert>
+    </div>
+    <div id="info" class="info">
+        <ui:insert name="info">Content</ui:insert>
+    </div>
+</h:body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/stateless/stateless.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/stateless/stateless.xhtml
index c8f5b33..33f8373 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/stateless/stateless.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/stateless/stateless.xhtml
@@ -1,37 +1,37 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:c="http://java.sun.com/jsp/jstl/core"
-                xmlns:h="http://xmlns.jcp.org/jsf/html"
-                xmlns:f="http://xmlns.jcp.org/jsf/core"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                template="template.xhtml">
-
-    <ui:define name="body">
-        success!
-        <h:form id="form1" prependId="false">
-            <h:commandButton id="smt" value="Submit" />
-            <h:commandButton id="smtAjax" value="Submit">
-                <f:ajax render="@form" execute="@this" />
-            </h:commandButton>
-        </h:form>
-
-        <h:form id="form2">
-            <h:commandButton id="smt" value="Submit" />
-            <h:commandButton id="smtAjax" value="Submit">
-                <f:ajax render="@form" execute="@this" />
-            </h:commandButton>
-        </h:form>
-    </ui:define>
-</ui:composition>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:c="http://java.sun.com/jsp/jstl/core"
+                xmlns:h="http://xmlns.jcp.org/jsf/html"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                template="template.xhtml">
+
+    <ui:define name="body">
+        success!
+        <h:form id="form1" prependId="false">
+            <h:commandButton id="smt" value="Submit" />
+            <h:commandButton id="smtAjax" value="Submit">
+                <f:ajax render="@form" execute="@this" />
+            </h:commandButton>
+        </h:form>
+
+        <h:form id="form2">
+            <h:commandButton id="smt" value="Submit" />
+            <h:commandButton id="smtAjax" value="Submit">
+                <f:ajax render="@form" execute="@this" />
+            </h:commandButton>
+        </h:form>
+    </ui:define>
+</ui:composition>
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/stateless/template.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/stateless/template.xhtml
index e822564..f7a8ea7 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/stateless/template.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/stateless/template.xhtml
@@ -1,29 +1,29 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:c="http://java.sun.com/jsp/jstl/core"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:f="http://xmlns.jcp.org/jsf/core"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-    <f:view transient="true">
-        <h:head>
-            
-        </h:head>
-        <h:body>
-            <ui:insert name="body" />
-        </h:body>
-    </f:view>
-</html>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:c="http://java.sun.com/jsp/jstl/core"
+      xmlns:h="http://xmlns.jcp.org/jsf/html"
+      xmlns:f="http://xmlns.jcp.org/jsf/core"
+      xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <f:view transient="true">
+        <h:head>
+            
+        </h:head>
+        <h:body>
+            <ui:insert name="body" />
+        </h:body>
+    </f:view>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach1.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach1.xhtml
index 3daa2f9..583f094 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach1.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach1.xhtml
@@ -1,28 +1,28 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:c="http://java.sun.com/jsp/jstl/core">
-<body>
-
-<ui:composition>
-<c:forEach items="#{list}" var="i" varStatus="s" begin="0" end="10">
-#{i} = #{s.first}/#{s.last}</c:forEach>
-</ui:composition>
-</body>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:c="http://java.sun.com/jsp/jstl/core">
+<body>
+
+<ui:composition>
+<c:forEach items="#{list}" var="i" varStatus="s" begin="0" end="10">
+#{i} = #{s.first}/#{s.last}</c:forEach>
+</ui:composition>
+</body>
 </html>
\ No newline at end of file
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach2.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach2.xhtml
index e7fb271..2ba4ef6 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach2.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach2.xhtml
@@ -1,30 +1,30 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:c="http://java.sun.com/jsp/jstl/core">
-<body>
-
-<ui:composition>
-<c:set var="i" value="value1"/>
-<c:forEach items="#{list}" var="i" varStatus="s" begin="0" end="10">
-</c:forEach>
-<h:outputText value="#{i} = #{s.first}/#{s.last}"/>
-</ui:composition>
-</body>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:c="http://java.sun.com/jsp/jstl/core">
+<body>
+
+<ui:composition>
+<c:set var="i" value="value1"/>
+<c:forEach items="#{list}" var="i" varStatus="s" begin="0" end="10">
+</c:forEach>
+<h:outputText value="#{i} = #{s.first}/#{s.last}"/>
+</ui:composition>
+</body>
 </html>
\ No newline at end of file
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach3.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach3.xhtml
index 512a963..cc0d323 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach3.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach3.xhtml
@@ -1,30 +1,30 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:c="http://java.sun.com/jsp/jstl/core">
-<body>
-
-<ui:composition>
-<c:set var="i" value="value1"/>
-<c:forEach items="#{list}" var="i" varStatus="s" begin="0" end="10">
-    <h:outputText value="#{i} = #{s.first}/#{s.last}"/>
-</c:forEach>
-</ui:composition>
-</body>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:c="http://java.sun.com/jsp/jstl/core">
+<body>
+
+<ui:composition>
+<c:set var="i" value="value1"/>
+<c:forEach items="#{list}" var="i" varStatus="s" begin="0" end="10">
+    <h:outputText value="#{i} = #{s.first}/#{s.last}"/>
+</c:forEach>
+</ui:composition>
+</body>
 </html>
\ No newline at end of file
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach4.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach4.xhtml
index 4598c76..5764716 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach4.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach4.xhtml
@@ -1,31 +1,31 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:c="http://java.sun.com/jsp/jstl/core">
-<body>
-<ui:composition>
-    <ui:decorate template="forEach4_1.xhtml">
-       <ui:param name="i" value="value"/>
-       <ui:define name="header">
-         <h:outputText value="#{i}"/>
-       </ui:define>
-    </ui:decorate>
-</ui:composition>
-</body>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:c="http://java.sun.com/jsp/jstl/core">
+<body>
+<ui:composition>
+    <ui:decorate template="forEach4_1.xhtml">
+       <ui:param name="i" value="value"/>
+       <ui:define name="header">
+         <h:outputText value="#{i}"/>
+       </ui:define>
+    </ui:decorate>
+</ui:composition>
+</body>
 </html>
\ No newline at end of file
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach4_1.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach4_1.xhtml
index a290161..3a1dda2 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach4_1.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/jstl/core/forEach4_1.xhtml
@@ -1,29 +1,29 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:c="http://java.sun.com/jsp/jstl/core">
-<body>
-
-<ui:composition>
-  <c:forEach items="#{list}" var="i" varStatus="s" begin="0" end="10">
-      <ui:insert name="header"/> = #{i}
-  </c:forEach>
-</ui:composition>
-</body>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: forEach.xml 884721 2009-11-26 23:31:11Z lu4242 $
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:c="http://java.sun.com/jsp/jstl/core">
+<body>
+
+<ui:composition>
+  <c:forEach items="#{list}" var="i" varStatus="s" begin="0" end="10">
+      <ui:insert name="header"/> = #{i}
+  </c:forEach>
+</ui:composition>
+</body>
 </html>
\ No newline at end of file
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/ui/testUIRepeatEmpty.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/ui/testUIRepeatEmpty.xhtml
index 2a0bf2d..845ed52 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/ui/testUIRepeatEmpty.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/ui/testUIRepeatEmpty.xhtml
@@ -1,31 +1,31 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-<head>
-</head>
-<body>
-    <h:form id="form">
-        <ui:repeat id="repeat" var="i" value="#{modelValues}">
-            <h:outputText id="outputText" value="Hello #{i}" />
-        </ui:repeat>
-        <ui:repeat id="good" var="i" value="#{loadedModelValues}">
-            <h:outputText id="outputText" value="Hallo #{i}" />
-        </ui:repeat>
-    </h:form>
-</body>
-</html>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+<head>
+</head>
+<body>
+    <h:form id="form">
+        <ui:repeat id="repeat" var="i" value="#{modelValues}">
+            <h:outputText id="outputText" value="Hello #{i}" />
+        </ui:repeat>
+        <ui:repeat id="good" var="i" value="#{loadedModelValues}">
+            <h:outputText id="outputText" value="Hallo #{i}" />
+        </ui:repeat>
+    </h:form>
+</body>
+</html>
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/ui/ui_repeat_model_step.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/ui/ui_repeat_model_step.xhtml
index 5af96f2..a9deb5f 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/ui/ui_repeat_model_step.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/tag/ui/ui_repeat_model_step.xhtml
@@ -1,33 +1,33 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:ui="http://java.sun.com/jsf/facelets">
-<head>
-</head>
-<body>
-    <h:form id="form">
-        <ui:repeat id="repeat" 
-            value="#{iterationBean.values}"
-            var="x"
-            begin="#{iterationBean.begin}"
-            end="#{iterationBean.end}"
-            step="#{iterationBean.step}">
-            #{x}
-        </ui:repeat>
-    </h:form>
-</body>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:ui="http://java.sun.com/jsf/facelets">
+<head>
+</head>
+<body>
+    <h:form id="form">
+        <ui:repeat id="repeat" 
+            value="#{iterationBean.values}"
+            var="x"
+            begin="#{iterationBean.begin}"
+            end="#{iterationBean.end}"
+            step="#{iterationBean.step}">
+            #{x}
+        </ui:repeat>
+    </h:form>
+</body>
 </html>
\ No newline at end of file
diff --git a/impl/src/test/resources/org/apache/myfaces/view/facelets/templateInResourcesDir.xhtml b/impl/src/test/resources/org/apache/myfaces/view/facelets/templateInResourcesDir.xhtml
index 9b6c1d0..d44a247 100644
--- a/impl/src/test/resources/org/apache/myfaces/view/facelets/templateInResourcesDir.xhtml
+++ b/impl/src/test/resources/org/apache/myfaces/view/facelets/templateInResourcesDir.xhtml
@@ -1,36 +1,36 @@
-<!--
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- $Id: templateInResourcesDir.xhtml
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-    xmlns:h="http://xmlns.jcp.org/jsf/html"
-    xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-      
-<h:head>
-    <title>MyFaces test for using a template in the resources directory</title>
-</h:head>
-<h:body>
-    <!-- Testing that a template file cannot be located in the resources dir -->
-    <ui:composition template="/resources/templates/basicTemplate.xhtml">
-        <ui:define name="title">
-            Using a template inside /resources/templates
-        </ui:define>
-        <ui:define name="content">
-            This template is working as expected!
-        </ui:define>
-     </ui:composition>
-</h:body>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ $Id: templateInResourcesDir.xhtml
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:h="http://xmlns.jcp.org/jsf/html"
+    xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+      
+<h:head>
+    <title>MyFaces test for using a template in the resources directory</title>
+</h:head>
+<h:body>
+    <!-- Testing that a template file cannot be located in the resources dir -->
+    <ui:composition template="/resources/templates/basicTemplate.xhtml">
+        <ui:define name="title">
+            Using a template inside /resources/templates
+        </ui:define>
+        <ui:define name="content">
+            This template is working as expected!
+        </ui:define>
+     </ui:composition>
+</h:body>
 </html>
\ No newline at end of file