Replaced txt/out/ast copyright comments with Java-style comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a64f1367 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a64f1367 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a64f1367 Branch: refs/heads/master Commit: a64f13674dd496a5175d6b8e1f134ae4fd55dd6d Parents: ef6b4d1 Author: ddekany <ddek...@apache.org> Authored: Fri Jan 1 12:34:37 2016 +0100 Committer: ddekany <ddek...@apache.org> Committed: Fri Jan 1 13:11:29 2016 +0100 ---------------------------------------------------------------------- src/test/java/freemarker/core/ASTTest.java | 6 +-- .../java/freemarker/core/CanonicalFormTest.java | 5 +-- src/test/java/freemarker/test/TemplateTest.java | 2 +- src/test/java/freemarker/test/TestUtil.java | 34 ++++++++++++++ .../freemarker/test/servlet/WebAppTestCase.java | 2 +- .../freemarker/test/utility/FileTestCase.java | 2 +- src/test/resources/freemarker/core/ast-1.ast | 36 +++++++-------- .../freemarker/core/ast-assignments.ast | 36 +++++++-------- .../resources/freemarker/core/ast-builtins.ast | 36 +++++++-------- .../resources/freemarker/core/ast-locations.ast | 36 +++++++-------- .../core/ast-mixedcontentsimplifications.ast | 36 +++++++-------- .../core/ast-multipleignoredchildren.ast | 36 +++++++-------- .../core/ast-nestedignoredchildren.ast | 36 +++++++-------- .../resources/freemarker/core/ast-range.ast | 36 +++++++-------- .../freemarker/core/ast-strlitinterpolation.ast | 36 +++++++-------- .../freemarker/core/ast-whitespacestripping.ast | 36 +++++++-------- .../core/cano-assignments-canonical.ftl | 34 -------------- .../freemarker/core/cano-assignments.ftl.out | 34 ++++++++++++++ .../freemarker/core/cano-builtins-canonical.ftl | 22 ---------- .../freemarker/core/cano-builtins.ftl.out | 23 ++++++++++ .../core/cano-identifier-escaping-canonical.ftl | 43 ------------------ .../core/cano-identifier-escaping.ftl.out | 44 +++++++++++++++++++ .../freemarker/core/cano-macros-canonical.ftl | 28 ------------ .../freemarker/core/cano-macros.ftl.out | 28 ++++++++++++ .../core/cano-strlitinterpolation-canonical.ftl | 18 -------- .../core/cano-strlitinterpolation.ftl.out | 19 ++++++++ .../basic/WEB-INF/expected/attributes-2.3.0.txt | 36 +++++++-------- .../expected/attributes-2.3.22-future.txt | 36 +++++++-------- .../basic/WEB-INF/expected/attributes.txt | 36 +++++++-------- .../basic/WEB-INF/expected/customTags1.txt | 36 +++++++-------- .../WEB-INF/expected/subdir/test-rel.txt | 36 +++++++-------- .../WEB-INF/expected/test-noClasspath.txt | 36 +++++++-------- .../tldDiscovery/WEB-INF/expected/test1.txt | 36 +++++++-------- .../manual/AutoEscapingExample-capture.ftlh.out | 36 +++++++-------- .../manual/AutoEscapingExample-convert.ftlh.out | 36 +++++++-------- .../manual/AutoEscapingExample-convert2.ftl.out | 36 +++++++-------- .../manual/AutoEscapingExample-infoBox.ftlh.out | 36 +++++++-------- .../manual/AutoEscapingExample-markup.ftlh.out | 36 +++++++-------- .../AutoEscapingExample-stringConcat.ftlh.out | 36 +++++++-------- .../AutoEscapingExample-stringLiteral.ftlh.out | 36 +++++++-------- .../AutoEscapingExample-stringLiteral2.ftlh.out | 36 +++++++-------- .../manual/CustomFormatsExample-alias1.ftlh.out | 36 +++++++-------- .../manual/CustomFormatsExample-alias2.ftlh.out | 36 +++++++-------- .../CustomFormatsExample-modelAware.ftlh.out | 36 +++++++-------- .../test/templatesuite/expected/arithmetic.txt | 36 +++++++-------- .../test/templatesuite/expected/bean-maps.txt | 36 +++++++-------- .../test/templatesuite/expected/beans.txt | 36 +++++++-------- .../expected/boolean-formatting.txt | 36 +++++++-------- .../test/templatesuite/expected/boolean.txt | 36 +++++++-------- .../expected/charset-in-header.txt | 36 +++++++-------- .../expected/classic-compatible.txt | 36 +++++++-------- .../test/templatesuite/expected/comment.txt | 36 +++++++-------- .../test/templatesuite/expected/comparisons.txt | 36 +++++++-------- .../test/templatesuite/expected/compress.txt | 36 +++++++-------- .../templatesuite/expected/dateformat-java.txt | 36 +++++++-------- .../templatesuite/expected/default-xmlns.txt | 36 +++++++-------- .../test/templatesuite/expected/default.txt | 36 +++++++-------- .../expected/encoding-builtins-ici-2.3.20.txt | 36 +++++++-------- .../expected/encoding-builtins.txt | 36 +++++++-------- .../test/templatesuite/expected/escapes.txt | 36 +++++++-------- .../test/templatesuite/expected/exception.txt | 36 +++++++-------- .../test/templatesuite/expected/exception2.txt | 36 +++++++-------- .../test/templatesuite/expected/exception3.txt | 36 +++++++-------- .../test/templatesuite/expected/exthash.txt | 36 +++++++-------- .../test/templatesuite/expected/hashconcat.txt | 36 +++++++-------- .../test/templatesuite/expected/hashliteral.txt | 36 +++++++-------- .../test/templatesuite/expected/helloworld.txt | 36 +++++++-------- .../expected/identifier-escaping.txt | 36 +++++++-------- .../expected/identifier-non-ascii.txt | 36 +++++++-------- .../test/templatesuite/expected/if.txt | 36 +++++++-------- .../test/templatesuite/expected/import.txt | 36 +++++++-------- .../test/templatesuite/expected/include.txt | 36 +++++++-------- .../test/templatesuite/expected/include2.txt | 36 +++++++-------- .../test/templatesuite/expected/interpret.txt | 36 +++++++-------- .../test/templatesuite/expected/iterators.txt | 36 +++++++-------- .../templatesuite/expected/lastcharacter.txt | 36 +++++++-------- .../test/templatesuite/expected/list-bis.txt | 36 +++++++-------- .../test/templatesuite/expected/list.txt | 36 +++++++-------- .../test/templatesuite/expected/list2.txt | 36 +++++++-------- .../test/templatesuite/expected/list3.txt | 36 +++++++-------- .../test/templatesuite/expected/listliteral.txt | 36 +++++++-------- .../templatesuite/expected/localization.txt | 36 +++++++-------- .../test/templatesuite/expected/logging.txt | 36 +++++++-------- .../templatesuite/expected/loopvariable.txt | 36 +++++++-------- .../templatesuite/expected/macros-return.txt | 36 +++++++-------- .../test/templatesuite/expected/macros.txt | 36 +++++++-------- .../test/templatesuite/expected/macros2.txt | 36 +++++++-------- .../test/templatesuite/expected/multimodels.txt | 36 +++++++-------- .../test/templatesuite/expected/nested.txt | 36 +++++++-------- .../expected/new-allowsnothing.txt | 36 +++++++-------- .../expected/new-defaultresolver.txt | 36 +++++++-------- .../test/templatesuite/expected/new-optin.txt | 36 +++++++-------- .../test/templatesuite/expected/new-safer.txt | 36 +++++++-------- .../templatesuite/expected/new-unrestricted.txt | 36 +++++++-------- .../test/templatesuite/expected/newlines1.txt | 36 +++++++-------- .../test/templatesuite/expected/newlines2.txt | 36 +++++++-------- .../expected/non-strict-syntax.txt | 36 +++++++-------- .../test/templatesuite/expected/noparse.txt | 36 +++++++-------- .../templatesuite/expected/number-format.txt | 36 +++++++-------- .../templatesuite/expected/number-literal.txt | 36 +++++++-------- .../templatesuite/expected/number-to-date.txt | 36 +++++++-------- .../templatesuite/expected/numerical-cast.txt | 36 +++++++-------- .../templatesuite/expected/output-encoding1.txt | 36 +++++++-------- .../templatesuite/expected/output-encoding2.txt | Bin 1948 -> 1976 bytes .../templatesuite/expected/output-encoding3.txt | 36 +++++++-------- .../test/templatesuite/expected/precedence.txt | 36 +++++++-------- .../test/templatesuite/expected/recover.txt | 36 +++++++-------- .../test/templatesuite/expected/root.txt | 36 +++++++-------- .../expected/sequence-builtins.txt | 36 +++++++-------- .../test/templatesuite/expected/specialvars.txt | 36 +++++++-------- .../templatesuite/expected/strictinheader.txt | 36 +++++++-------- .../string-builtins-regexps-matches.txt | 36 +++++++-------- .../expected/string-builtins-regexps.txt | 36 +++++++-------- .../templatesuite/expected/string-builtins1.txt | 36 +++++++-------- .../templatesuite/expected/string-builtins2.txt | 36 +++++++-------- .../templatesuite/expected/stringbimethods.txt | 36 +++++++-------- .../templatesuite/expected/stringliteral.txt | Bin 1538 -> 1552 bytes .../test/templatesuite/expected/switch.txt | 36 +++++++-------- .../test/templatesuite/expected/transforms.txt | 36 +++++++-------- .../expected/type-builtins-ici-2.3.21.txt | 36 +++++++-------- .../expected/type-builtins-ici-2.3.24.txt | 36 +++++++-------- .../templatesuite/expected/type-builtins.txt | 36 +++++++-------- .../test/templatesuite/expected/var-layers.txt | 36 +++++++-------- .../test/templatesuite/expected/varargs.txt | 36 +++++++-------- .../test/templatesuite/expected/variables.txt | 36 +++++++-------- .../templatesuite/expected/whitespace-trim.txt | 36 +++++++-------- .../templatesuite/expected/wstrip-in-header.txt | 36 +++++++-------- .../test/templatesuite/expected/wstripping.txt | 36 +++++++-------- .../templatesuite/expected/xml-fragment.txt | 36 +++++++-------- .../expected/xml-ns_prefix-scope.txt | 36 +++++++-------- .../test/templatesuite/expected/xml.txt | 36 +++++++-------- .../test/templatesuite/expected/xmlns1.txt | 36 +++++++-------- .../test/templatesuite/expected/xmlns3.txt | 36 +++++++-------- .../test/templatesuite/expected/xmlns4.txt | 36 +++++++-------- .../test/templatesuite/expected/xmlns5.txt | 36 +++++++-------- 135 files changed, 2295 insertions(+), 2261 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 881308c..b1e1729 100644 --- a/src/test/java/freemarker/core/ASTTest.java +++ b/src/test/java/freemarker/core/ASTTest.java @@ -88,11 +88,11 @@ public class ASTTest extends FileTestCase { assertExpectedFileEqualsString( testName + ".ast", ASTPrinter.getASTAsString(templateName, - TestUtil.removeFTLCopyrightComment(normalizeLineBreaks(templateName)), ops)); + TestUtil.removeFTLCopyrightComment(normalizeLineBreaks(loadResource(templateName))), ops)); } - private String normalizeLineBreaks(final String templateName) throws FileNotFoundException, IOException { - return StringUtil.replace(loadResource(templateName), "\r\n", "\n").replace('\r', '\n'); + private String normalizeLineBreaks(final String s) throws FileNotFoundException, IOException { + return StringUtil.replace(s, "\r\n", "\n").replace('\r', '\n'); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 a254a51..c97be29 100644 --- a/src/test/java/freemarker/core/CanonicalFormTest.java +++ b/src/test/java/freemarker/core/CanonicalFormTest.java @@ -64,10 +64,7 @@ public class CanonicalFormTest extends FileTestCase { StringWriter sw = new StringWriter(); cfg.getTemplate(ftlFileName).dump(sw); - int lastDotIdx = ftlFileName.lastIndexOf('.'); - String canonicalFtlName = ftlFileName.substring(0, lastDotIdx) + "-canonical" - + ftlFileName.substring(lastDotIdx); - assertExpectedFileEqualsString(canonicalFtlName, sw.toString()); + assertExpectedFileEqualsString(ftlFileName + ".out", sw.toString()); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 4729544..75a3e07 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 = TestUtil.removeFTLCopyrightComment(IOUtils.toString(in, "utf-8")); + expectedOut = TestUtil.removeTxtCopyrightComment(IOUtils.toString(in, "utf-8")); } finally { in.close(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 d90fb47..9505d55 100644 --- a/src/test/java/freemarker/test/TestUtil.java +++ b/src/test/java/freemarker/test/TestUtil.java @@ -24,6 +24,40 @@ public final class TestUtil { // Not meant to be instantiated } + public static String removeTxtCopyrightComment(String s) { + if (!s.startsWith("/*")) { + return s; + } + + int commentEnd = s.indexOf("*/"); + if (commentEnd == -1) { + return s; + } + commentEnd += 2; + if (commentEnd < s.length()) { + char c = s.charAt(commentEnd); + if (c == '\n' || c == '\r') { + commentEnd++; + if (c == '\r' && commentEnd < s.length()) { + if (s.charAt(commentEnd) == '\n') { + commentEnd++; + } + } + } + } + + String comment = s.substring(0, commentEnd); + int copyrightIdx = comment.indexOf("copyright"); + if (copyrightIdx == -1) { + copyrightIdx = comment.indexOf("Copyright"); + } + if (copyrightIdx == -1) { + return s; + } + + return s.substring(commentEnd); + } + 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/a64f1367/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 8e43624..223c696 100644 --- a/src/test/java/freemarker/test/servlet/WebAppTestCase.java +++ b/src/test/java/freemarker/test/servlet/WebAppTestCase.java @@ -179,7 +179,7 @@ public class WebAppTestCase { { final InputStream in = new URL(getWebAppDirURL(webAppName) + EXPECTED_DIR + expectedFileName).openStream(); try { - expected = TestUtil.removeFTLCopyrightComment(normalizeWS(IOUtils.toString(in, "utf-8"), compressWS)); + expected = TestUtil.removeTxtCopyrightComment(normalizeWS(IOUtils.toString(in, "utf-8"), compressWS)); } finally { in.close(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 7b6888f..4989fb7 100644 --- a/src/test/java/freemarker/test/utility/FileTestCase.java +++ b/src/test/java/freemarker/test/utility/FileTestCase.java @@ -145,7 +145,7 @@ public abstract class FileTestCase extends TestCase { } protected String loadFile(File f) throws FileNotFoundException, IOException { - return TestUtil.removeFTLCopyrightComment(loadFile(f, getDefaultCharset())); + return TestUtil.removeTxtCopyrightComment(loadFile(f, getDefaultCharset())); } protected String loadFile(File f, String charset) throws FileNotFoundException, IOException { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 cf65f1f..2956157 100644 --- a/src/test/resources/freemarker/core/ast-1.ast +++ b/src/test/resources/freemarker/core/ast-1.ast @@ -1,21 +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. ---> +/* + * 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. + */ #mixed_content // f.c.MixedContent #text // f.c.TextBlock - content: "1 " // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 939c563..2191544 100644 --- a/src/test/resources/freemarker/core/ast-assignments.ast +++ b/src/test/resources/freemarker/core/ast-assignments.ast @@ -1,21 +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. ---> +/* + * 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. + */ #mixed_content // f.c.MixedContent #text // f.c.TextBlock - content: "1 " // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 c5cf446..53ce0ec 100644 --- a/src/test/resources/freemarker/core/ast-builtins.ast +++ b/src/test/resources/freemarker/core/ast-builtins.ast @@ -1,21 +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. ---> +/* + * 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. + */ #mixed_content // f.c.MixedContent ${...} // f.c.DollarVariable - content: ?trim // f.c.BuiltInsForStringsBasic$trimBI http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 5bd7b9d..f3d240e 100644 --- a/src/test/resources/freemarker/core/ast-locations.ast +++ b/src/test/resources/freemarker/core/ast-locations.ast @@ -1,21 +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. ---> +/* + * 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. + */ #mixed_content // f.c.MixedContent; Location 1:1-18:8 #if // f.c.ConditionalBlock; Location 1:1-1:15 - condition: exp // f.c.Identifier; Location 1:6-1:8 http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 ff9a8b3..32a3f17 100644 --- a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast +++ b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast @@ -1,21 +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. ---> +/* + * 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. + */ #if // f.c.ConditionalBlock - condition: true // f.c.BooleanLiteral - AST-node subtype: "0" // Integer http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 3513f95..979a93a 100644 --- a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast +++ b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast @@ -1,21 +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. ---> +/* + * 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. + */ #mixed_content // f.c.MixedContent #text // f.c.TextBlock - content: "a\n" // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 dd4c815..cbc6970 100644 --- a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast +++ b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast @@ -1,20 +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. ---> +/* + * 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. + */ #outputformat // f.c.OutputFormatBlock - value: "HTML" // f.c.StringLiteral http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 8a6234a..9c553e1 100644 --- a/src/test/resources/freemarker/core/ast-range.ast +++ b/src/test/resources/freemarker/core/ast-range.ast @@ -1,21 +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. ---> +/* + * 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. + */ #mixed_content // f.c.MixedContent #assign // f.c.Assignment - assignment target: "x" // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 7e607f6..cb74d74 100644 --- a/src/test/resources/freemarker/core/ast-strlitinterpolation.ast +++ b/src/test/resources/freemarker/core/ast-strlitinterpolation.ast @@ -1,21 +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. ---> +/* + * 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. + */ #mixed_content // f.c.MixedContent #text // f.c.TextBlock - content: "1. " // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 db468dc..4e4689e 100644 --- a/src/test/resources/freemarker/core/ast-whitespacestripping.ast +++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ast @@ -1,21 +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. ---> +/* + * 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. + */ #mixed_content // f.c.MixedContent #assign // f.c.Assignment - assignment target: "xs" // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/core/cano-assignments-canonical.ftl ---------------------------------------------------------------------- diff --git a/src/test/resources/freemarker/core/cano-assignments-canonical.ftl b/src/test/resources/freemarker/core/cano-assignments-canonical.ftl deleted file mode 100644 index 4450b16..0000000 --- a/src/test/resources/freemarker/core/cano-assignments-canonical.ftl +++ /dev/null @@ -1,34 +0,0 @@ -<#-- - 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. ---> -<#assign x = 1> -<#assign x = 1, y = 2> -<#assign x = 1 in ns> -<#assign x = 1, y = 2 in ns> -<#assign a += b + c> -<#assign a += 1, b -= 2, c *= 3, d /= 4, e %= 5, f++, g--> -<#global x = 1> -<#global x = 1, y = 2> -<#global x++> -<#macro m> - <#local x = 1> - <#local x = 1, y = 2> -</#macro> -<#assign x> - foo ${bar} -</#assign> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 new file mode 100644 index 0000000..5990288 --- /dev/null +++ b/src/test/resources/freemarker/core/cano-assignments.ftl.out @@ -0,0 +1,34 @@ +/* + * 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. + */ +<#assign x = 1> +<#assign x = 1, y = 2> +<#assign x = 1 in ns> +<#assign x = 1, y = 2 in ns> +<#assign a += b + c> +<#assign a += 1, b -= 2, c *= 3, d /= 4, e %= 5, f++, g--> +<#global x = 1> +<#global x = 1, y = 2> +<#global x++> +<#macro m> + <#local x = 1> + <#local x = 1, y = 2> +</#macro> +<#assign x> + foo ${bar} +</#assign> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/core/cano-builtins-canonical.ftl ---------------------------------------------------------------------- diff --git a/src/test/resources/freemarker/core/cano-builtins-canonical.ftl b/src/test/resources/freemarker/core/cano-builtins-canonical.ftl deleted file mode 100644 index 74b15e8..0000000 --- a/src/test/resources/freemarker/core/cano-builtins-canonical.ftl +++ /dev/null @@ -1,22 +0,0 @@ -<#-- - 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. --->${x?trim} -${x?left_pad(5)} -${x?left_pad(5, "-")} -${x?then("y", "n")} -${x?switch(1, 11, 2, 22, 33)} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 new file mode 100644 index 0000000..231d6d2 --- /dev/null +++ b/src/test/resources/freemarker/core/cano-builtins.ftl.out @@ -0,0 +1,23 @@ +/* + * 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. + */ +${x?trim} +${x?left_pad(5)} +${x?left_pad(5, "-")} +${x?then("y", "n")} +${x?switch(1, 11, 2, 22, 33)} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/core/cano-identifier-escaping-canonical.ftl ---------------------------------------------------------------------- diff --git a/src/test/resources/freemarker/core/cano-identifier-escaping-canonical.ftl b/src/test/resources/freemarker/core/cano-identifier-escaping-canonical.ftl deleted file mode 100644 index 7a696b1..0000000 --- a/src/test/resources/freemarker/core/cano-identifier-escaping-canonical.ftl +++ /dev/null @@ -1,43 +0,0 @@ -<#-- - 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. ---><#macro m\-a data\-color><#local \.namespace = 123><a-b>${data\-color}<#nested \.namespace></a-b></#macro><#macro m\-b2></#macro><#macro "m/b2"></#macro> -<@m\-a data\-color="red"; loop\-var, loopVar2>${loop\-var}</@m\-a> - -<#function f\-a(p\-a)><#return p\-a + " works"/></#function>${f\-a("f-a")} - -<#assign \-\-\-\.\: = "dash-dash-dash etc.">${\-\-\-\.\:} -${.vars["---.:"]} -<#assign hash = {"--moz-prop": "propVal"}>${hash.\-\-moz\-prop} -${hash["--moz-prop"]} - -<#assign ls\:a = 1..3>List: <#list ls\:a as \:i>${\:i}</#list> - -<#assign sw\-a = 1>Switch: <#switch sw\-a><#case 1>OK<#break/> - <#default>Fails -</#switch> -<#escape \-x as \-x?upper_case>${"escaped"}</#escape> - -<#if false && sw\-a == 1><#visit x\-y2 using x\-y1/><#recurse x\-y2 using x\-y1/><#import i\-a as i\-b/><#include i\-c/></#if> -<#assign @as@_a = "as1">${@as@_a} -<#assign as\-c = "as2">${.vars["as-c"]} -<#assign "as/b" = "as3">${.vars["as/b"]} -<#assign "as'c" = "as4">${.vars["as'c"]} -<#assign 'as"d' = "as5">${.vars['as"d']} - -<#global g\-a = 1, g\-b = 2, g\-c = 3><#macro dumpNS><#list .namespace?keys?sort as k>${k} = <#local v = .namespace[k]><#if v?is_string>${v}<#else>...</#if> -</#list></#macro><@dumpNS/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 new file mode 100644 index 0000000..3f875be --- /dev/null +++ b/src/test/resources/freemarker/core/cano-identifier-escaping.ftl.out @@ -0,0 +1,44 @@ +/* + * 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. + */ +<#macro m\-a data\-color><#local \.namespace = 123><a-b>${data\-color}<#nested \.namespace></a-b></#macro><#macro m\-b2></#macro><#macro "m/b2"></#macro> +<@m\-a data\-color="red"; loop\-var, loopVar2>${loop\-var}</@m\-a> + +<#function f\-a(p\-a)><#return p\-a + " works"/></#function>${f\-a("f-a")} + +<#assign \-\-\-\.\: = "dash-dash-dash etc.">${\-\-\-\.\:} +${.vars["---.:"]} +<#assign hash = {"--moz-prop": "propVal"}>${hash.\-\-moz\-prop} +${hash["--moz-prop"]} + +<#assign ls\:a = 1..3>List: <#list ls\:a as \:i>${\:i}</#list> + +<#assign sw\-a = 1>Switch: <#switch sw\-a><#case 1>OK<#break/> + <#default>Fails +</#switch> +<#escape \-x as \-x?upper_case>${"escaped"}</#escape> + +<#if false && sw\-a == 1><#visit x\-y2 using x\-y1/><#recurse x\-y2 using x\-y1/><#import i\-a as i\-b/><#include i\-c/></#if> +<#assign @as@_a = "as1">${@as@_a} +<#assign as\-c = "as2">${.vars["as-c"]} +<#assign "as/b" = "as3">${.vars["as/b"]} +<#assign "as'c" = "as4">${.vars["as'c"]} +<#assign 'as"d' = "as5">${.vars['as"d']} + +<#global g\-a = 1, g\-b = 2, g\-c = 3><#macro dumpNS><#list .namespace?keys?sort as k>${k} = <#local v = .namespace[k]><#if v?is_string>${v}<#else>...</#if> +</#list></#macro><@dumpNS/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/core/cano-macros-canonical.ftl ---------------------------------------------------------------------- diff --git a/src/test/resources/freemarker/core/cano-macros-canonical.ftl b/src/test/resources/freemarker/core/cano-macros-canonical.ftl deleted file mode 100644 index 6ed0de1..0000000 --- a/src/test/resources/freemarker/core/cano-macros-canonical.ftl +++ /dev/null @@ -1,28 +0,0 @@ -<#-- - 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. ---> -<#macro m></#macro> -<#macro m a></#macro> -<#macro m a b></#macro> -<#macro m a b c...></#macro> -<#macro m a...></#macro> -<#function f()></#function> -<#function f(a)></#function> -<#function f(a, b)></#function> -<#function f(a, b, c...)></#function> -<#function f(a...)></#function> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 new file mode 100644 index 0000000..ea846cd --- /dev/null +++ b/src/test/resources/freemarker/core/cano-macros.ftl.out @@ -0,0 +1,28 @@ +/* + * 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. + */ +<#macro m></#macro> +<#macro m a></#macro> +<#macro m a b></#macro> +<#macro m a b c...></#macro> +<#macro m a...></#macro> +<#function f()></#function> +<#function f(a)></#function> +<#function f(a, b)></#function> +<#function f(a, b, c...)></#function> +<#function f(a...)></#function> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/core/cano-strlitinterpolation-canonical.ftl ---------------------------------------------------------------------- diff --git a/src/test/resources/freemarker/core/cano-strlitinterpolation-canonical.ftl b/src/test/resources/freemarker/core/cano-strlitinterpolation-canonical.ftl deleted file mode 100644 index a3cd33e..0000000 --- a/src/test/resources/freemarker/core/cano-strlitinterpolation-canonical.ftl +++ /dev/null @@ -1,18 +0,0 @@ -<#-- - 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. ---><@m x="${e1 + \"a'b$\{x}\"}#{x ; m0M2}" y="$\{e2}"/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 new file mode 100644 index 0000000..ecd31be --- /dev/null +++ b/src/test/resources/freemarker/core/cano-strlitinterpolation.ftl.out @@ -0,0 +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. + */ +<@m x="${e1 + \"a'b$\{x}\"}#{x ; m0M2}" y="$\{e2}"/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 0829213..fd77dd6 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,21 +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. ---> +/* + * 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/a64f1367/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 ebb729a..ef5d921 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,21 +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. ---> +/* + * 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/a64f1367/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 b2be90e..b6a06d8 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,21 +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. ---> +/* + * 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/a64f1367/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 3695bfb..6c859a4 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,21 +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. ---> +/* + * 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/a64f1367/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 aaf945e..db19a3c 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,20 +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. ---> +/* + * 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/a64f1367/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 3298cb6..d18ab0a 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,21 +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. ---> +/* + * 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/a64f1367/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 a517a0e..06d516f 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,21 +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. ---> +/* + * 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/a64f1367/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 7e25852..baedcb3 100644 --- a/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out +++ b/src/test/resources/freemarker/manual/AutoEscapingExample-capture.ftlh.out @@ -1,20 +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. ---> +/* + * 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: <b>Test</b> Captured output: <b>Test</b> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 25d475e..f325f85 100644 --- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out +++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert.ftlh.out @@ -1,21 +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. ---> +/* + * 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's bar {} XML: Foo's bar {} RTF: Foo's bar \{\} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 9e75f66..8f04b99 100644 --- a/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out +++ b/src/test/resources/freemarker/manual/AutoEscapingExample-convert2.ftl.out @@ -1,21 +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. ---> +/* + * 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/a64f1367/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 0cae28f..4433d8d 100644 --- a/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out +++ b/src/test/resources/freemarker/manual/AutoEscapingExample-infoBox.ftlh.out @@ -1,21 +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. ---> +/* + * 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 & bar </div> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/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 7fa61b1..39fd18a 100644 --- a/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out +++ b/src/test/resources/freemarker/manual/AutoEscapingExample-markup.ftlh.out @@ -1,21 +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. ---> +/* + * 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/a64f1367/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 714fdbd..f60149c 100644 --- a/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out +++ b/src/test/resources/freemarker/manual/AutoEscapingExample-stringConcat.ftlh.out @@ -1,19 +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. ---> +/* + * 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 & bar</h1> \ No newline at end of file