You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/01 14:21:38 UTC

[40/50] [abbrv] incubator-freemarker git commit: Changing copyright header format to be identical to IntelliJ generated copyright headers

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java b/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java
index a1f51fd..e715a6f 100644
--- a/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java
+++ b/src/test/java/freemarker/test/utility/AssertationFailedInTemplateException.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/BadParameterTypeException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/BadParameterTypeException.java b/src/test/java/freemarker/test/utility/BadParameterTypeException.java
index 4f78e90..c67221b 100644
--- a/src/test/java/freemarker/test/utility/BadParameterTypeException.java
+++ b/src/test/java/freemarker/test/utility/BadParameterTypeException.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/FileTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/FileTestCase.java b/src/test/java/freemarker/test/utility/FileTestCase.java
index c85496c..c8ad159 100644
--- a/src/test/java/freemarker/test/utility/FileTestCase.java
+++ b/src/test/java/freemarker/test/utility/FileTestCase.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java b/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java
index f8fa167..28e5f3a 100644
--- a/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java
+++ b/src/test/java/freemarker/test/utility/MissingRequiredParameterException.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/NoOutputDirective.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/NoOutputDirective.java b/src/test/java/freemarker/test/utility/NoOutputDirective.java
index 029bcf7..c16a034 100644
--- a/src/test/java/freemarker/test/utility/NoOutputDirective.java
+++ b/src/test/java/freemarker/test/utility/NoOutputDirective.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/ParameterException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/ParameterException.java b/src/test/java/freemarker/test/utility/ParameterException.java
index 909a16c..cd79078 100644
--- a/src/test/java/freemarker/test/utility/ParameterException.java
+++ b/src/test/java/freemarker/test/utility/ParameterException.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/TestUtil.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/TestUtil.java b/src/test/java/freemarker/test/utility/TestUtil.java
index e12a9fa..3714163 100644
--- a/src/test/java/freemarker/test/utility/TestUtil.java
+++ b/src/test/java/freemarker/test/utility/TestUtil.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/java/freemarker/test/utility/UnsupportedParameterException.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/utility/UnsupportedParameterException.java b/src/test/java/freemarker/test/utility/UnsupportedParameterException.java
index a16bdf0..1825a85 100644
--- a/src/test/java/freemarker/test/utility/UnsupportedParameterException.java
+++ b/src/test/java/freemarker/test/utility/UnsupportedParameterException.java
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/META-INF/malformed.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/META-INF/malformed.tld b/src/test/resources/META-INF/malformed.tld
index f30dac5..3ac9758 100644
--- a/src/test/resources/META-INF/malformed.tld
+++ b/src/test/resources/META-INF/malformed.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld b/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
index 86c1682..c1dc603 100644
--- a/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld	
+++ b/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld	
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/cache/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/cache/test.ftl b/src/test/resources/freemarker/cache/test.ftl
index 3a1f6b5..fb3f45d 100644
--- a/src/test/resources/freemarker/cache/test.ftl
+++ b/src/test/resources/freemarker/cache/test.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-1.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-1.ast b/src/test/resources/freemarker/core/ast-1.ast
index 2956157..853feb5 100644
--- a/src/test/resources/freemarker/core/ast-1.ast
+++ b/src/test/resources/freemarker/core/ast-1.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-1.ftl b/src/test/resources/freemarker/core/ast-1.ftl
index 3f45dda..8c8953a 100644
--- a/src/test/resources/freemarker/core/ast-1.ftl
+++ b/src/test/resources/freemarker/core/ast-1.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-assignments.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-assignments.ast b/src/test/resources/freemarker/core/ast-assignments.ast
index 2191544..bbc0659 100644
--- a/src/test/resources/freemarker/core/ast-assignments.ast
+++ b/src/test/resources/freemarker/core/ast-assignments.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-assignments.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-assignments.ftl b/src/test/resources/freemarker/core/ast-assignments.ftl
index fc5aaa5..c070635 100644
--- a/src/test/resources/freemarker/core/ast-assignments.ftl
+++ b/src/test/resources/freemarker/core/ast-assignments.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-builtins.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-builtins.ast b/src/test/resources/freemarker/core/ast-builtins.ast
index 53ce0ec..27be467 100644
--- a/src/test/resources/freemarker/core/ast-builtins.ast
+++ b/src/test/resources/freemarker/core/ast-builtins.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-builtins.ftl b/src/test/resources/freemarker/core/ast-builtins.ftl
index 06f65ad..74aee52 100644
--- a/src/test/resources/freemarker/core/ast-builtins.ftl
+++ b/src/test/resources/freemarker/core/ast-builtins.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-locations.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-locations.ast b/src/test/resources/freemarker/core/ast-locations.ast
index f3d240e..a7feb3b 100644
--- a/src/test/resources/freemarker/core/ast-locations.ast
+++ b/src/test/resources/freemarker/core/ast-locations.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-locations.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-locations.ftl b/src/test/resources/freemarker/core/ast-locations.ftl
index a8fdcd7..99fa244 100644
--- a/src/test/resources/freemarker/core/ast-locations.ftl
+++ b/src/test/resources/freemarker/core/ast-locations.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
index 32a3f17..9d0cc38 100644
--- a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
+++ b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
index a11ffe7..53716e4 100644
--- a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
+++ b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
index 979a93a..3e3cd1e 100644
--- a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
+++ b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl
index 009962a..501802a 100644
--- a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl
+++ b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
index cbc6970..4cc514f 100644
--- a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
+++ b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl
index 9d2ed7a..fbdb342 100644
--- a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl
+++ b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-range.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-range.ast b/src/test/resources/freemarker/core/ast-range.ast
index 9c553e1..58af73c 100644
--- a/src/test/resources/freemarker/core/ast-range.ast
+++ b/src/test/resources/freemarker/core/ast-range.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-range.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-range.ftl b/src/test/resources/freemarker/core/ast-range.ftl
index f6c837b..cb55c8a 100644
--- a/src/test/resources/freemarker/core/ast-range.ftl
+++ b/src/test/resources/freemarker/core/ast-range.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-strlitinterpolation.ast b/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
index cb74d74..7d14e80 100644
--- a/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
+++ b/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl b/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
index 641f39c..cd86f2f 100644
--- a/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
+++ b/src/test/resources/freemarker/core/ast-strlitinterpolation.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-whitespacestripping.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitespacestripping.ast b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
index 4e4689e..23f06eb 100644
--- a/src/test/resources/freemarker/core/ast-whitespacestripping.ast
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitespacestripping.ftl b/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
index af801fa..cba7289 100644
--- a/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-assignments.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-assignments.ftl b/src/test/resources/freemarker/core/cano-assignments.ftl
index 1719dd5..24c8984 100644
--- a/src/test/resources/freemarker/core/cano-assignments.ftl
+++ b/src/test/resources/freemarker/core/cano-assignments.ftl
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-assignments.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-assignments.ftl.out b/src/test/resources/freemarker/core/cano-assignments.ftl.out
index 5990288..3dd2307 100644
--- a/src/test/resources/freemarker/core/cano-assignments.ftl.out
+++ b/src/test/resources/freemarker/core/cano-assignments.ftl.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-builtins.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-builtins.ftl b/src/test/resources/freemarker/core/cano-builtins.ftl
index 06f65ad..74aee52 100644
--- a/src/test/resources/freemarker/core/cano-builtins.ftl
+++ b/src/test/resources/freemarker/core/cano-builtins.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-builtins.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-builtins.ftl.out b/src/test/resources/freemarker/core/cano-builtins.ftl.out
index 231d6d2..3c62974 100644
--- a/src/test/resources/freemarker/core/cano-builtins.ftl.out
+++ b/src/test/resources/freemarker/core/cano-builtins.ftl.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-identifier-escaping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-identifier-escaping.ftl b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl
index 01f1d3c..75d52f1 100644
--- a/src/test/resources/freemarker/core/cano-identifier-escaping.ftl
+++ b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out
index 3f875be..17e2b4e 100644
--- a/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out
+++ b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-macros.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-macros.ftl b/src/test/resources/freemarker/core/cano-macros.ftl
index bd6a780..9288e63 100644
--- a/src/test/resources/freemarker/core/cano-macros.ftl
+++ b/src/test/resources/freemarker/core/cano-macros.ftl
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-macros.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-macros.ftl.out b/src/test/resources/freemarker/core/cano-macros.ftl.out
index ea846cd..ad49cae 100644
--- a/src/test/resources/freemarker/core/cano-macros.ftl.out
+++ b/src/test/resources/freemarker/core/cano-macros.ftl.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
index 718aeec..85189a4 100644
--- a/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
+++ b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out
index ecd31be..754c225 100644
--- a/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out
+++ b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl b/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl
index 99f336b..e0382c7 100644
--- a/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl
+++ b/src/test/resources/freemarker/core/encodingOverride-ISO-8859-1.ftl
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl b/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl
index 0c5401e..5948e30 100644
--- a/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl
+++ b/src/test/resources/freemarker/core/encodingOverride-UTF-8.ftl
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml b/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml
index bdb3e45..d1fe3dc 100644
--- a/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml
+++ b/src/test/resources/freemarker/ext/dom/DOMSiblingTest.xml
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld b/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
index 34bbde2..1f7e049 100644
--- a/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
+++ b/src/test/resources/freemarker/ext/jsp/TLDParsingTest.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl b/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
index 0180281..e05c1b3 100644
--- a/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/templates/classpath-test.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
index 4b30fd6..6854189 100644
--- a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
+++ b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
index 553d924..5079298 100644
--- a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
+++ b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
index 19127ec..fa1f3ff 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/CONTENTS.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
index c0eb104..81d9ed4 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-function-tag-name-clash.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
index 5fc4ec2..a8c2702 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
index fd77dd6..d1f664c 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.0.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
index ef5d921..6e3ccee 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes-2.3.22-future.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
index b6a06d8..2d0738c 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/attributes.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
index 6c859a4..54e6650 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/expected/customTags1.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
index 034ccdc..01e20f2 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
index 40a63ce..1d8451a 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
index dd05b27..8d2f8af 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/attributes.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
index 6e071a3..7e44c32 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
index 59c9cee..1148782 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
index 62ae7c7..9334853 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/customTags1.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
index dbac123..8968f26 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp b/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
index d6abe6f..412d08f 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/elFunctionsTagNameClash.jsp
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl
index b81f7c4..c37e72a 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial-jstl-@Ignore.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
index ec2710d..b86e023 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
index 1f2a237..d8b4a3c 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
index 3157059..7eca473 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/CONTENTS.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
index ae05634..96a022a 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/sub/test.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
index 57186a2..c0a0444 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/classes/test.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
index 71b1d86..67feac0 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar/sub/test2.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
index 0f06309..a46f12a 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/templates/test.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
index 8818368..5148907 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
index 49a80f2..1852b69 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/test.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
index 62d711e..fe48ca4 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/CONTENTS.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
index 38f72ca..eb31ac7 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
index f0d8a76..af1e261 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
index 04bc8aa..a65d9be 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
index 52ed45b..6899bd3 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl b/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
index be33775..06ebbcc 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/not-failing.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
index 5453db8..27016ef 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/CONTENTS.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
index 5eb7864..3dda3db 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
+++ b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/templates/test.ftl
@@ -6,9 +6,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
index 006e13e..0781c2b 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
index d38119e..13f1923 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/CONTENTS.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
index db19a3c..23414b5 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/subdir/test-rel.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
index d18ab0a..131a716 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test-noClasspath.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
index 06d516f..21cd7c9 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/expected/test1.txt
@@ -6,9 +6,9 @@
  * 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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
index 62d5504..111a4e0 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld	
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld	
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
index 62d5504..111a4e0 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld
index 3f2e096..4254437 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld	
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar/META-INF/foo bar.tld	
@@ -7,9 +7,9 @@
   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

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/83eac154/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
index a108fa5..487923e 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
@@ -7,9 +7,9 @@
   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