freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [02/19] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)
Date Sat, 02 Jan 2016 00:47:21 GMT
Added copyright comment to expected result files (txt or out)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/701b339a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/701b339a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/701b339a

Branch: refs/heads/2.3
Commit: 701b339a5f519c1ead0e6892fdc212e6bd9ae035
Parents: 7d355e7
Author: ddekany <ddekany@apache.org>
Authored: Fri Jan 1 11:21:29 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Fri Jan 1 11:21:29 2016 +0100

----------------------------------------------------------------------
 src/test/java/freemarker/core/ASTTest.java       |   2 +-
 .../java/freemarker/core/CanonicalFormTest.java  |   6 +++++-
 .../CopyrightCommentRemoverTemplateLoader.java   |   2 +-
 src/test/java/freemarker/test/TemplateTest.java  |   2 +-
 src/test/java/freemarker/test/TestUtil.java      |   2 +-
 .../freemarker/test/servlet/WebAppTestCase.java  |   3 ++-
 .../freemarker/test/utility/FileTestCase.java    |   3 ++-
 .../basic/WEB-INF/expected/attributes-2.3.0.txt  |  18 ++++++++++++++++++
 .../expected/attributes-2.3.22-future.txt        |  18 ++++++++++++++++++
 .../basic/WEB-INF/expected/attributes.txt        |  18 ++++++++++++++++++
 .../basic/WEB-INF/expected/customTags1.txt       |  18 ++++++++++++++++++
 .../WEB-INF/expected/subdir/test-rel.txt         |  18 ++++++++++++++++++
 .../WEB-INF/expected/test-noClasspath.txt        |  18 ++++++++++++++++++
 .../tldDiscovery/WEB-INF/expected/test1.txt      |  18 ++++++++++++++++++
 .../manual/AutoEscapingExample-capture.ftlh.out  |  18 ++++++++++++++++++
 .../manual/AutoEscapingExample-convert.ftlh.out  |  18 ++++++++++++++++++
 .../manual/AutoEscapingExample-convert2.ftl.out  |  18 ++++++++++++++++++
 .../manual/AutoEscapingExample-infoBox.ftlh.out  |  18 ++++++++++++++++++
 .../manual/AutoEscapingExample-markup.ftlh.out   |  18 ++++++++++++++++++
 .../AutoEscapingExample-stringConcat.ftlh.out    |  18 ++++++++++++++++++
 .../AutoEscapingExample-stringLiteral.ftlh.out   |  18 ++++++++++++++++++
 .../AutoEscapingExample-stringLiteral2.ftlh.out  |  18 ++++++++++++++++++
 .../manual/CustomFormatsExample-alias1.ftlh.out  |  18 ++++++++++++++++++
 .../manual/CustomFormatsExample-alias2.ftlh.out  |  18 ++++++++++++++++++
 .../CustomFormatsExample-modelAware.ftlh.out     |  18 ++++++++++++++++++
 .../test/templatesuite/expected/arithmetic.txt   |  18 ++++++++++++++++++
 .../test/templatesuite/expected/bean-maps.txt    |  18 ++++++++++++++++++
 .../test/templatesuite/expected/beans.txt        |  18 ++++++++++++++++++
 .../expected/boolean-formatting.txt              |  18 ++++++++++++++++++
 .../test/templatesuite/expected/boolean.txt      |  18 ++++++++++++++++++
 .../templatesuite/expected/charset-in-header.txt |  18 ++++++++++++++++++
 .../expected/classic-compatible.txt              |  18 ++++++++++++++++++
 .../test/templatesuite/expected/comment.txt      |  18 ++++++++++++++++++
 .../test/templatesuite/expected/comparisons.txt  |  18 ++++++++++++++++++
 .../test/templatesuite/expected/compress.txt     |  18 ++++++++++++++++++
 .../templatesuite/expected/dateformat-java.txt   |  18 ++++++++++++++++++
 .../templatesuite/expected/default-xmlns.txt     |  18 ++++++++++++++++++
 .../test/templatesuite/expected/default.txt      |  18 ++++++++++++++++++
 .../expected/encoding-builtins-ici-2.3.20.txt    |  18 ++++++++++++++++++
 .../templatesuite/expected/encoding-builtins.txt |  18 ++++++++++++++++++
 .../test/templatesuite/expected/escapes.txt      |  18 ++++++++++++++++++
 .../test/templatesuite/expected/exception.txt    |  18 ++++++++++++++++++
 .../test/templatesuite/expected/exception2.txt   |  18 ++++++++++++++++++
 .../test/templatesuite/expected/exception3.txt   |  18 ++++++++++++++++++
 .../test/templatesuite/expected/exthash.txt      |  18 ++++++++++++++++++
 .../test/templatesuite/expected/hashconcat.txt   |  18 ++++++++++++++++++
 .../test/templatesuite/expected/hashliteral.txt  |  18 ++++++++++++++++++
 .../test/templatesuite/expected/helloworld.txt   |  18 ++++++++++++++++++
 .../expected/identifier-escaping.txt             |  18 ++++++++++++++++++
 .../expected/identifier-non-ascii.txt            |  18 ++++++++++++++++++
 .../test/templatesuite/expected/if.txt           |  18 ++++++++++++++++++
 .../test/templatesuite/expected/import.txt       |  18 ++++++++++++++++++
 .../test/templatesuite/expected/include.txt      |  18 ++++++++++++++++++
 .../test/templatesuite/expected/include2.txt     |  18 ++++++++++++++++++
 .../test/templatesuite/expected/interpret.txt    |  18 ++++++++++++++++++
 .../test/templatesuite/expected/iterators.txt    |  18 ++++++++++++++++++
 .../templatesuite/expected/lastcharacter.txt     |  18 ++++++++++++++++++
 .../test/templatesuite/expected/list-bis.txt     |  18 ++++++++++++++++++
 .../test/templatesuite/expected/list.txt         |  18 ++++++++++++++++++
 .../test/templatesuite/expected/list2.txt        |  18 ++++++++++++++++++
 .../test/templatesuite/expected/list3.txt        |  18 ++++++++++++++++++
 .../test/templatesuite/expected/listliteral.txt  |  18 ++++++++++++++++++
 .../test/templatesuite/expected/localization.txt |  18 ++++++++++++++++++
 .../test/templatesuite/expected/logging.txt      |  18 ++++++++++++++++++
 .../test/templatesuite/expected/loopvariable.txt |  18 ++++++++++++++++++
 .../templatesuite/expected/macros-return.txt     |  18 ++++++++++++++++++
 .../test/templatesuite/expected/macros.txt       |  18 ++++++++++++++++++
 .../test/templatesuite/expected/macros2.txt      |  18 ++++++++++++++++++
 .../test/templatesuite/expected/multimodels.txt  |  18 ++++++++++++++++++
 .../test/templatesuite/expected/nested.txt       |  18 ++++++++++++++++++
 .../templatesuite/expected/new-allowsnothing.txt |  18 ++++++++++++++++++
 .../expected/new-defaultresolver.txt             |  18 ++++++++++++++++++
 .../test/templatesuite/expected/new-optin.txt    |  18 ++++++++++++++++++
 .../test/templatesuite/expected/new-safer.txt    |  18 ++++++++++++++++++
 .../templatesuite/expected/new-unrestricted.txt  |  18 ++++++++++++++++++
 .../test/templatesuite/expected/newlines1.txt    |  18 ++++++++++++++++++
 .../test/templatesuite/expected/newlines2.txt    |  18 ++++++++++++++++++
 .../templatesuite/expected/non-strict-syntax.txt |  18 ++++++++++++++++++
 .../test/templatesuite/expected/noparse.txt      |  18 ++++++++++++++++++
 .../templatesuite/expected/number-format.txt     |  18 ++++++++++++++++++
 .../templatesuite/expected/number-literal.txt    |  18 ++++++++++++++++++
 .../templatesuite/expected/number-to-date.txt    |  18 ++++++++++++++++++
 .../templatesuite/expected/numerical-cast.txt    |  18 ++++++++++++++++++
 .../templatesuite/expected/output-encoding1.txt  |  18 ++++++++++++++++++
 .../templatesuite/expected/output-encoding2.txt  | Bin 356 -> 1948 bytes
 .../templatesuite/expected/output-encoding3.txt  |  18 ++++++++++++++++++
 .../test/templatesuite/expected/precedence.txt   |  18 ++++++++++++++++++
 .../test/templatesuite/expected/recover.txt      |  18 ++++++++++++++++++
 .../test/templatesuite/expected/root.txt         |  18 ++++++++++++++++++
 .../templatesuite/expected/sequence-builtins.txt |  18 ++++++++++++++++++
 .../test/templatesuite/expected/specialvars.txt  |  18 ++++++++++++++++++
 .../templatesuite/expected/strictinheader.txt    |  18 ++++++++++++++++++
 .../expected/string-builtins-regexps-matches.txt |  18 ++++++++++++++++++
 .../expected/string-builtins-regexps.txt         |  18 ++++++++++++++++++
 .../templatesuite/expected/string-builtins1.txt  |  18 ++++++++++++++++++
 .../templatesuite/expected/string-builtins2.txt  |  18 ++++++++++++++++++
 .../templatesuite/expected/stringbimethods.txt   |  18 ++++++++++++++++++
 .../templatesuite/expected/stringliteral.txt     | Bin 740 -> 1538 bytes
 .../test/templatesuite/expected/switch.txt       |  18 ++++++++++++++++++
 .../test/templatesuite/expected/transforms.txt   |  18 ++++++++++++++++++
 .../expected/type-builtins-ici-2.3.21.txt        |  18 ++++++++++++++++++
 .../expected/type-builtins-ici-2.3.24.txt        |  18 ++++++++++++++++++
 .../templatesuite/expected/type-builtins.txt     |  18 ++++++++++++++++++
 .../test/templatesuite/expected/var-layers.txt   |  18 ++++++++++++++++++
 .../test/templatesuite/expected/varargs.txt      |  18 ++++++++++++++++++
 .../test/templatesuite/expected/variables.txt    |  18 ++++++++++++++++++
 .../templatesuite/expected/whitespace-trim.txt   |  18 ++++++++++++++++++
 .../templatesuite/expected/wstrip-in-header.txt  |  18 ++++++++++++++++++
 .../test/templatesuite/expected/wstripping.txt   |  18 ++++++++++++++++++
 .../test/templatesuite/expected/xml-fragment.txt |  18 ++++++++++++++++++
 .../expected/xml-ns_prefix-scope.txt             |  18 ++++++++++++++++++
 .../test/templatesuite/expected/xml.txt          |  18 ++++++++++++++++++
 .../test/templatesuite/expected/xmlns1.txt       |  18 ++++++++++++++++++
 .../test/templatesuite/expected/xmlns3.txt       |  18 ++++++++++++++++++
 .../test/templatesuite/expected/xmlns4.txt       |  18 ++++++++++++++++++
 .../test/templatesuite/expected/xmlns5.txt       |  18 ++++++++++++++++++
 116 files changed, 1939 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/java/freemarker/core/ASTTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ASTTest.java b/src/test/java/freemarker/core/ASTTest.java
index 1f2160a..881308c 100644
--- a/src/test/java/freemarker/core/ASTTest.java
+++ b/src/test/java/freemarker/core/ASTTest.java
@@ -88,7 +88,7 @@ public class ASTTest extends FileTestCase {
         assertExpectedFileEqualsString(
                 testName + ".ast",
                 ASTPrinter.getASTAsString(templateName,
-                        TestUtil.removeCopyrightCommentFromFTL(normalizeLineBreaks(templateName)), ops));
+                        TestUtil.removeFTLCopyrightComment(normalizeLineBreaks(templateName)), ops));
     }
     
     private String normalizeLineBreaks(final String templateName) throws FileNotFoundException, IOException {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/java/freemarker/core/CanonicalFormTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/CanonicalFormTest.java b/src/test/java/freemarker/core/CanonicalFormTest.java
index 87ef1eb..a254a51 100644
--- a/src/test/java/freemarker/core/CanonicalFormTest.java
+++ b/src/test/java/freemarker/core/CanonicalFormTest.java
@@ -22,9 +22,11 @@ package freemarker.core;
 import java.io.IOException;
 import java.io.StringWriter;
 
+import freemarker.cache.ClassTemplateLoader;
 import freemarker.template.Configuration;
 import freemarker.template.MalformedTemplateNameException;
 import freemarker.template.TemplateNotFoundException;
+import freemarker.test.CopyrightCommentRemoverTemplateLoader;
 import freemarker.test.utility.FileTestCase;
 
 public class CanonicalFormTest extends FileTestCase {
@@ -56,7 +58,9 @@ public class CanonicalFormTest extends FileTestCase {
     private void assertCanonicalFormOf(String ftlFileName)
             throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_22);
-        cfg.setClassForTemplateLoading(CanonicalFormTest.class, "");
+        cfg.setTemplateLoader(
+                new CopyrightCommentRemoverTemplateLoader(
+                        new ClassTemplateLoader(CanonicalFormTest.class, "")));
         StringWriter sw = new StringWriter();
         cfg.getTemplate(ftlFileName).dump(sw);
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java b/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
index 5d336a4..8099e03 100644
--- a/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
+++ b/src/test/java/freemarker/test/CopyrightCommentRemoverTemplateLoader.java
@@ -49,7 +49,7 @@ public class CopyrightCommentRemoverTemplateLoader implements TemplateLoader {
         Reader reader = innerTemplateLoader.getReader(templateSource, encoding);
         try {
             String content = IOUtils.toString(reader);
-            return new StringReader(TestUtil.removeCopyrightCommentFromFTL(content));
+            return new StringReader(TestUtil.removeFTLCopyrightComment(content));
         } finally {
             reader.close();
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/java/freemarker/test/TemplateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/TemplateTest.java b/src/test/java/freemarker/test/TemplateTest.java
index 719ca7c..4729544 100644
--- a/src/test/java/freemarker/test/TemplateTest.java
+++ b/src/test/java/freemarker/test/TemplateTest.java
@@ -91,7 +91,7 @@ public abstract class TemplateTest {
                 throw new IOException("Reference output resource not found: " + this.getClass() + ", " + resName);
             }
             try {
-                expectedOut = IOUtils.toString(in, "utf-8");
+                expectedOut = TestUtil.removeFTLCopyrightComment(IOUtils.toString(in, "utf-8"));
             } finally {
                 in.close();
             }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/java/freemarker/test/TestUtil.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/TestUtil.java b/src/test/java/freemarker/test/TestUtil.java
index a8e9244..d90fb47 100644
--- a/src/test/java/freemarker/test/TestUtil.java
+++ b/src/test/java/freemarker/test/TestUtil.java
@@ -24,7 +24,7 @@ public final class TestUtil {
         // Not meant to be instantiated
     }
 
-    public static String removeCopyrightCommentFromFTL(String ftl) {
+    public static String removeFTLCopyrightComment(String ftl) {
         if (ftl.contains("<#ftl ns_prefixes = {\"D\" : \"http://example.com/eBook\"}>")) {
             System.out.println();
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/java/freemarker/test/servlet/WebAppTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/WebAppTestCase.java b/src/test/java/freemarker/test/servlet/WebAppTestCase.java
index b4b2498..8e43624 100644
--- a/src/test/java/freemarker/test/servlet/WebAppTestCase.java
+++ b/src/test/java/freemarker/test/servlet/WebAppTestCase.java
@@ -42,6 +42,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import freemarker.test.TestUtil;
 
 public class WebAppTestCase {
     
@@ -178,7 +179,7 @@ public class WebAppTestCase {
         {
             final InputStream in = new URL(getWebAppDirURL(webAppName) + EXPECTED_DIR + expectedFileName).openStream();
             try {
-                expected = normalizeWS(IOUtils.toString(in, "utf-8"), compressWS);
+                expected = TestUtil.removeFTLCopyrightComment(normalizeWS(IOUtils.toString(in, "utf-8"), compressWS));
             } finally {
                 in.close();
             }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/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 66e9565..7b6888f 100644
--- a/src/test/java/freemarker/test/utility/FileTestCase.java
+++ b/src/test/java/freemarker/test/utility/FileTestCase.java
@@ -33,6 +33,7 @@ import java.net.URL;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import freemarker.template.utility.StringUtil;
+import freemarker.test.TestUtil;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
@@ -144,7 +145,7 @@ public abstract class FileTestCase extends TestCase {
     }
 
     protected String loadFile(File f) throws FileNotFoundException, IOException {
-        return loadFile(f, getDefaultCharset());
+        return TestUtil.removeFTLCopyrightComment(loadFile(f, getDefaultCharset()));
     }
     
     protected String loadFile(File f, String charset) throws FileNotFoundException, IOException {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/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 2a4c160..0829213 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
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 a1: -
 any:a1 was null, set to 0
 a1: 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/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 e1fa40b..ebb729a 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
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 a1: -
 any:a1 was null, set to 0
 a1: 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/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 47c17af..b2be90e 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
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 a1: -
 any:a1 was null, set to 0
 a1: 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/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 e3495a2..3695bfb 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
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 
 <!-- Test repeated execution -->
 doStartTag() called here

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/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 b2240a0..aaf945e 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
@@ -1,2 +1,20 @@
+<#--
+  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.
+-->
 Executed TestSimpleTag2
 Executed TestSimpleTag2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/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 6be1eff..3298cb6 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
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 <!-- Test loading from web.xml-mapped JAR -->
 TestTag2.doStartTag() called here
 TestTag2.doEndTag() called here

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/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 d19134c..a517a0e 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
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 <!-- Test loading from web.xml-mapped JAR -->
 enter TestSimpleTag simpletag1
 invoking body i=0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
index 9a02975..7e25852 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out
@@ -1,2 +1,20 @@
+<#--
+  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.
+-->
 Just a string: &lt;b&gt;Test&lt;/b&gt;
 Captured output: <b>Test</b>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
index 95108b6..25d475e 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 HTLM: Foo&#39;s bar {}
 XML:  Foo&apos;s bar {}
 RTF:  Foo's bar \{\}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
index a3b4cc7..9e75f66 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out
@@ -1,3 +1,21 @@
+<#--
+  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: <p>Test
 XML:  <p>Test</p>
 RTF:  \par Test
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
index 640f8a9..0cae28f 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
   <div class="infoBox">
     Foo &amp; bar
   </div>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
index 15bc1a5..7fa61b1 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 
 As expected:
 <b>Test</b>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
index b163938..714fdbd 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out
@@ -1 +1,19 @@
+<#--
+  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.
+-->
 <h1>Foo &amp; bar</h1>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
index 42c0167..c820e6b 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
@@ -1,2 +1,20 @@
+<#--
+  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.
+-->
 Foo &amp; bar
 Foo &amp; bar &amp; baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
index b8e929b..10dd4d0 100644
--- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
+++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 
 Foo &amp; bar baz
 <p>Foo baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
index a15bd01..9f02fb9 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 10,000.00
 10.31
 23/Dec/15 10:09 PM

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
index 3cacc0b..fbba998 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-alias2.ftlh.out
@@ -1 +1,19 @@
+<#--
+  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.
+-->
 12
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
index 22e0890..dabd088 100644
--- a/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
+++ b/src/test/resources/freemarker/manual/CustomFormatsExample-modelAware.ftlh.out
@@ -1,2 +1,20 @@
+<#--
+  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.
+-->
 10.1236
 1.5 kg
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt b/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
index 341e8c0..a289ed4 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/arithmetic.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Arithmetic Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt b/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
index d03065e..94f4067 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/bean-maps.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 properties only, shadow (6):
   age              : 27
   class            : class freemarker.test.templatesuite.TemplateTestCase$TestMapBean

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/beans.txt b/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
index 8c1e487..1d91e2a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/beans.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 array-0
 array-1
 2

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt b/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
index 65c362f..78d186a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/boolean-formatting.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 Y Y Y
 N N N
 y y y

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt b/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
index 9fdf239..9ccd8fa 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/boolean.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Boolean Values Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt b/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
index 8bf8e6e..3114c7e 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/charset-in-header.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 <head>
   <meta http-equiv="Content-type" content="text/html; charset=UTF-8">
 </head>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt b/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
index f8f0061..c0909ba 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/classic-compatible.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 [] [null]
 [] [null]
 [] [null]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/comment.txt b/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
index a59b1f5..9ef0525 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/comment.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Comment Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt b/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
index 63af540..1f6afba 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/comparisons.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Numeric Operations Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/compress.txt b/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
index 6de5156..c576cac 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/compress.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Compress Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt b/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
index 5ed5c2a..c88129e 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/dateformat-java.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 Nov 15, 2002 2:54:13 PM
 Nov 15, 2002 2:54:13 PM
 Nov 15, 2002 2:54:13 PM

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt b/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
index 630470e..682000f 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/default-xmlns.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 No NS = No NS
 x NS = x NS
 y NS = y NS

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/default.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/default.txt b/src/test/resources/freemarker/test/templatesuite/expected/default.txt
index 274266b..2b3e272 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/default.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/default.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 foo
 
 luck

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
index 7468fa7..6e35b68 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins-ici-2.3.20.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 FreeMarker: Encoding built-in tests
 
 html: [&amp;&lt;&gt;&quot;&#39;{}\a/]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
index e637c6e..3f2ad7d 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/encoding-builtins.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 FreeMarker: Encoding built-in tests
 
 html: [&amp;&lt;&gt;&quot;'{}\a/]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt b/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
index c75b868..5298c23 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/escapes.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 a
 b
 c

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/exception.txt b/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
index 76ec96d..9cfc75c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Exception Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt b/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
index 9a3aa90..4c910dc 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception2.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Exception Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt b/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
index b7fd53c..859d6ad 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exception3.txt
@@ -1,3 +1,21 @@
+<#--
+  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><head></head><body bgcolor="#ffffff">
 Template Compilation Error: Identifier expected at line 10.
 </body></html>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt b/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
index d3eadcf..2a11e2b 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/exthash.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Extended Hash Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt b/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
index 8c8f003..0c0fe26 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/hashconcat.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 
 a:
   a = 1

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt b/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
index b9cbd01..5a2c1ab 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/hashliteral.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Hash Literal Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt b/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
index a914f80..21d39c5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/helloworld.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Exec Model Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt b/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
index 20c18bd..11c9a26 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/identifier-escaping.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 
 <a-b>red123</a-b>
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt b/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
index 74892a3..2fd3ecb 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/identifier-non-ascii.txt
@@ -1 +1,19 @@
+<#--
+  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.
+-->
 Korean Keyboard

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/if.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/if.txt b/src/test/resources/freemarker/test/templatesuite/expected/if.txt
index 579e91d..b198f9b 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/if.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/if.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 
 - good
 - good

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/import.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/import.txt b/src/test/resources/freemarker/test/templatesuite/expected/import.txt
index daa3714..93e44e2 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/import.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/import.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 --
 --
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/include.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/include.txt b/src/test/resources/freemarker/test/templatesuite/expected/include.txt
index e8ac889..340ca47 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/include.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/include.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: Include Instruction Test</title>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/include2.txt b/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
index f9b71b6..933e4eb 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/include2.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 A próba
 A próba
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt b/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
index 4b93e22..43c007a 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/interpret.txt
@@ -1,3 +1,21 @@
+<#--
+  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.
+-->
 abcdef
 abcdef
 abcdef

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt b/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
index 1bc8d05..ffc0e71 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/iterators.txt
@@ -1,3 +1,21 @@
+<#--
+  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>
 <head>
 <title>FreeMarker: List Iterator Test</title>



Mime
View raw message