http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-range.ast ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-range.ast b/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-range.ast deleted file mode 100644 index 831c7dc..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-range.ast +++ /dev/null @@ -1,281 +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. - */ -#mixed_content // o.a.f.c.ASTImplicitParent - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: .. // o.a.f.c.ASTExpRange - - left-hand operand: 0 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: null // Null - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: .. // o.a.f.c.ASTExpRange - - left-hand operand: 0 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: ..< // o.a.f.c.ASTExpRange - - left-hand operand: 0 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: ..< // o.a.f.c.ASTExpRange - - left-hand operand: 0 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: .. // o.a.f.c.ASTExpRange - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: ..< // o.a.f.c.ASTExpRange - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: ..< // o.a.f.c.ASTExpRange - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: .. // o.a.f.c.ASTExpRange - - left-hand operand: * // o.a.f.c.ArithmeticExpression - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "1" // Integer - - right-hand operand: * // o.a.f.c.ArithmeticExpression - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "1" // Integer - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: .. // o.a.f.c.ASTExpRange - - left-hand operand: ?abs // o.a.f.c.BuiltInsForNumbers$absBI - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: "abs" // String - - right-hand operand: ?abs // o.a.f.c.BuiltInsForNumbers$absBI - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: "abs" // String - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: .. // o.a.f.c.ASTExpRange - - left-hand operand: ...(...) // o.a.f.c.ASTExpMethodCall - - callee: ?index_of // o.a.f.c.BuiltInsForStringsBasic$index_ofBI - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: "index_of" // String - - argument value: "x" // o.a.f.c.ASTExpStringLiteral - - right-hand operand: ...(...) // o.a.f.c.ASTExpMethodCall - - callee: ?index_of // o.a.f.c.BuiltInsForStringsBasic$index_ofBI - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: "index_of" // String - - argument value: "y" // o.a.f.c.ASTExpStringLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: == // o.a.f.c.ASTExpComparison - - left-hand operand: .. // o.a.f.c.ASTExpRange - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: .. // o.a.f.c.ASTExpRange - - left-hand operand: o // o.a.f.c.ASTExpVariable - - right-hand operand: p // o.a.f.c.ASTExpVariable - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: == // o.a.f.c.ASTExpComparison - - left-hand operand: .. // o.a.f.c.ASTExpRange - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - - right-hand operand: .. // o.a.f.c.ASTExpRange - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: o // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: p // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: .. // o.a.f.c.ASTExpRange - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: a // o.a.f.c.ASTExpVariable - - right-hand operand: +... // o.a.f.c.ASTExpNegateOrPlus - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "1" // Integer - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: .. // o.a.f.c.ASTExpRange - - left-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: a // o.a.f.c.ASTExpVariable - - AST-node subtype: "0" // Integer - - right-hand operand: -... // o.a.f.c.ASTExpNegateOrPlus - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: ..* // o.a.f.c.ASTExpRange - - left-hand operand: * // o.a.f.c.ArithmeticExpression - - left-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: a // o.a.f.c.ASTExpVariable - - AST-node subtype: "1" // Integer - - right-hand operand: 2 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: || // o.a.f.c.ASTExpOr - - left-hand operand: && // o.a.f.c.ASTExpAnd - - left-hand operand: a // o.a.f.c.ASTExpVariable - - right-hand operand: .. // o.a.f.c.ASTExpRange - - left-hand operand: b // o.a.f.c.ASTExpVariable - - right-hand operand: c // o.a.f.c.ASTExpVariable - - right-hand operand: d // o.a.f.c.ASTExpVariable - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "x" // String - - assignment operator: "=" // String - - assignment source: || // o.a.f.c.ASTExpOr - - left-hand operand: && // o.a.f.c.ASTExpAnd - - left-hand operand: .. // o.a.f.c.ASTExpRange - - left-hand operand: a // o.a.f.c.ASTExpVariable - - right-hand operand: null // Null - - right-hand operand: .. // o.a.f.c.ASTExpRange - - left-hand operand: b // o.a.f.c.ASTExpVariable - - right-hand operand: null // Null - - right-hand operand: d // o.a.f.c.ASTExpVariable - - variable scope: "1" // Integer - - namespace: null // Null - #text // o.a.f.c.ASTStaticText - - content: "\n" // String - ${...} // o.a.f.c.ASTDollarInterpolation - - content: ...(...) // o.a.f.c.ASTExpMethodCall - - callee: f // o.a.f.c.ASTExpVariable - - argument value: .. // o.a.f.c.ASTExpRange - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: null // Null - - argument value: .. // o.a.f.c.ASTExpRange - - left-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - - right-hand operand: null // Null - - argument value: .. // o.a.f.c.ASTExpRange - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - #text // o.a.f.c.ASTStaticText - - content: "\n\n" // String - @ // o.a.f.c.ASTDirUserDefined - - callee: m // o.a.f.c.ASTExpVariable - - argument value: .. // o.a.f.c.ASTExpRange - - left-hand operand: * // o.a.f.c.ArithmeticExpression - - left-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: m // o.a.f.c.ASTExpVariable - - AST-node subtype: "1" // Integer - - right-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - - argument value: .. // o.a.f.c.ASTExpRange - - left-hand operand: + // o.a.f.c.ASTExpAddOrConcat - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - right-hand operand: - // o.a.f.c.ArithmeticExpression - - left-hand operand: n // o.a.f.c.ASTExpVariable - - right-hand operand: 1 // o.a.f.c.ASTExpNumberLiteral - - AST-node subtype: "0" // Integer - - argument value: .. // o.a.f.c.ASTExpRange - - left-hand operand: m // o.a.f.c.ASTExpVariable - - right-hand operand: null // Null
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-range.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-range.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-range.ftl deleted file mode 100644 index cb55c8a..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-range.ftl +++ /dev/null @@ -1,47 +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 = 0..> - -<#assign x = 0..1> -<#assign x = 0..<1> -<#assign x = 0..!1> - -<#assign x = n + 1 .. m + 2> -<#assign x = n + 1 ..< m + 2> -<#assign x = n + 1 ..! m + 2> - -<#assign x = n * 1 .. m * 2> - -<#assign x = n?abs .. m?abs> - -<#assign x = n?index_of('x') .. m?index_of('y')> - -<#assign x = n..m == o..p> - -<#assign x = n+1+2..m-1-2 == o+1+2..p-1-2> - -<#assign x = 1+a..+2> -<#assign x = 1-a..-2> -<#assign x = 1*a..*2> -<#assign x = a && b..c || d> -<#assign x = a.. && b.. || d> - -${f(m.., m-1.., m+1..n-1)} - -<@m 1 * m .. m - 1 m + 1 .. n - 1 m .. /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast b/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast deleted file mode 100644 index 321721e..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ast +++ /dev/null @@ -1,82 +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. - */ -#mixed_content // o.a.f.c.ASTImplicitParent - #text // o.a.f.c.ASTStaticText - - content: "1. " // String - @ // o.a.f.c.ASTDirUserDefined - - callee: m // o.a.f.c.ASTExpVariable - - argument name: "x" // String - - argument value: dynamic "..." // o.a.f.c.ASTExpStringLiteral - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: e1 // o.a.f.c.ASTExpVariable - - argument name: "y" // String - - argument value: "$\\{e2}" // o.a.f.c.ASTExpStringLiteral - #text // o.a.f.c.ASTStaticText - - content: "\n2. " // String - ${...} // o.a.f.c.ASTDollarInterpolation - - content: dynamic "..." // o.a.f.c.ASTExpStringLiteral - - value part: "a" // String - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: x // o.a.f.c.ASTExpVariable - - value part: "b" // String - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: x // o.a.f.c.ASTExpVariable - - value part: "c" // String - #text // o.a.f.c.ASTStaticText - - content: "\n3. " // String - ${...} // o.a.f.c.ASTDollarInterpolation - - content: dynamic "..." // o.a.f.c.ASTExpStringLiteral - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: x // o.a.f.c.ASTExpVariable - - value part: "b" // String - #text // o.a.f.c.ASTStaticText - - content: "\n4. " // String - ${...} // o.a.f.c.ASTDollarInterpolation - - content: dynamic "..." // o.a.f.c.ASTExpStringLiteral - - value part: "a" // String - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: x // o.a.f.c.ASTExpVariable - #text // o.a.f.c.ASTStaticText - - content: "\n5. " // String - ${...} // o.a.f.c.ASTDollarInterpolation - - content: dynamic "..." // o.a.f.c.ASTExpStringLiteral - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: x // o.a.f.c.ASTExpVariable - - value part: #{...} // o.a.f.c.ASTHashInterpolation - - content: y // o.a.f.c.ASTExpVariable - - minimum decimals: "0" // Integer - - maximum decimals: "0" // Integer - #text // o.a.f.c.ASTStaticText - - content: "\n6. " // String - ${...} // o.a.f.c.ASTDollarInterpolation - - content: dynamic "..." // o.a.f.c.ASTExpStringLiteral - - value part: "a b " // String - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: x // o.a.f.c.ASTExpVariable - - value part: " c d" // String - #text // o.a.f.c.ASTStaticText - - content: "\n7. " // String - ${...} // o.a.f.c.ASTDollarInterpolation - - content: dynamic "..." // o.a.f.c.ASTExpStringLiteral - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: x // o.a.f.c.ASTExpVariable - - value part: " a b " // String - - value part: ${...} // o.a.f.c.ASTDollarInterpolation - - content: y // o.a.f.c.ASTExpVariable - - value part: " c$d" // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ftl deleted file mode 100644 index cd86f2f..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-strlitinterpolation.ftl +++ /dev/null @@ -1,25 +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. ---> -1. <@m x='${e1}' y='$\\{e2}' /> -2. ${'a${x}b${x}c'} -3. ${'${x}b'} -4. ${'a${x}'} -5. ${'${x}#{y}'} -6. ${'a b ${x} c d'} -7. ${'${x} a b ${y} c$d'} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast b/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast deleted file mode 100644 index 868fc69..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ast +++ /dev/null @@ -1,70 +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. - */ -#mixed_content // o.a.f.c.ASTImplicitParent - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "xs" // String - - assignment operator: "=" // String - - assignment source: [...] // o.a.f.c.ASTExpListLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #text // o.a.f.c.ASTStaticText - - content: "\n" // String - #list // o.a.f.c.ASTDirList - - list source: x // o.a.f.c.ASTExpVariable - - target loop variable: "xs" // String - #text // o.a.f.c.ASTStaticText - - content: " " // String - ${...} // o.a.f.c.ASTDollarInterpolation - - content: x // o.a.f.c.ASTExpVariable - #text // o.a.f.c.ASTStaticText - - content: "\n" // String - #text // o.a.f.c.ASTStaticText - - content: "\n" // String - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "a" // String - - assignment operator: "=" // String - - assignment source: 1 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #assign // o.a.f.c.ASTDirAssignment - - assignment target: "b" // String - - assignment operator: "=" // String - - assignment source: 1 // o.a.f.c.ASTExpNumberLiteral - - variable scope: "1" // Integer - - namespace: null // Null - #text // o.a.f.c.ASTStaticText - - content: "\n" // String - @ // o.a.f.c.ASTDirUserDefined - - callee: b // o.a.f.c.ASTExpVariable - #text // o.a.f.c.ASTStaticText - - content: " x\n" // String - #text // o.a.f.c.ASTStaticText - - content: "\n" // String - @ // o.a.f.c.ASTDirUserDefined - - callee: c // o.a.f.c.ASTExpVariable - #text // o.a.f.c.ASTStaticText - - content: "\n" // String - @ // o.a.f.c.ASTDirUserDefined - - callee: d // o.a.f.c.ASTExpVariable - #text // o.a.f.c.ASTStaticText - - content: "\na\n" // String - #--...-- // o.a.f.c.ASTComment - - content: " comment " // String - #text // o.a.f.c.ASTStaticText - - content: "b" // String http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ftl deleted file mode 100644 index cba7289..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/ast-whitespacestripping.ftl +++ /dev/null @@ -1,40 +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 xs = []> - -<#list x as xs> - ${x} -</#list> - -<#assign a = 1> -<#assign b = 1> - -<@b> - x -</@b> - -<@c /> - -<@d></@d> - -a -<#-- comment --> -b \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-assignments.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-assignments.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-assignments.ftl deleted file mode 100644 index 24c8984..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-assignments.ftl +++ /dev/null @@ -1,35 +0,0 @@ -<#ftl stripWhitespace=false> -<#-- - 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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-assignments.ftl.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-assignments.ftl.out b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-assignments.ftl.out deleted file mode 100644 index 3dd2307..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-assignments.ftl.out +++ /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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl deleted file mode 100644 index 74aee52..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl +++ /dev/null @@ -1,23 +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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out deleted file mode 100644 index 3c62974..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-builtins.ftl.out +++ /dev/null @@ -1,23 +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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl deleted file mode 100644 index 75d52f1..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl +++ /dev/null @@ -1,76 +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><#t> -</#macro> -<#macro "m-b2"></#macro> -<#macro "m/b2"></#macro> - -<@m\-a data\-color="red"; loop\-var, loopVar2>${loop\-var}</@> - -<#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><#lt> - </#list> -</#macro> -<@dumpNS /> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out deleted file mode 100644 index 17e2b4e..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-identifier-escaping.ftl.out +++ /dev/null @@ -1,44 +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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-macros.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-macros.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-macros.ftl deleted file mode 100644 index 9288e63..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-macros.ftl +++ /dev/null @@ -1,29 +0,0 @@ -<#ftl stripWhitespace=false> -<#-- - 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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-macros.ftl.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-macros.ftl.out b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-macros.ftl.out deleted file mode 100644 index ad49cae..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-macros.ftl.out +++ /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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-strlitinterpolation.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-strlitinterpolation.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-strlitinterpolation.ftl deleted file mode 100644 index 85189a4..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-strlitinterpolation.ftl +++ /dev/null @@ -1,19 +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; M2}' y='$\{e2}' /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-strlitinterpolation.ftl.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-strlitinterpolation.ftl.out b/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-strlitinterpolation.ftl.out deleted file mode 100644 index 754c225..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/cano-strlitinterpolation.ftl.out +++ /dev/null @@ -1,19 +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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/encodingOverride-ISO-8859-1.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/encodingOverride-ISO-8859-1.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/encodingOverride-ISO-8859-1.ftl deleted file mode 100644 index e0382c7..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/encodingOverride-ISO-8859-1.ftl +++ /dev/null @@ -1,20 +0,0 @@ -<#ftl encoding="ISO-8859-1"> -<#-- - 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. ---> -B�ka \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/encodingOverride-UTF-8.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/encodingOverride-UTF-8.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/encodingOverride-UTF-8.ftl deleted file mode 100644 index 5948e30..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/encodingOverride-UTF-8.ftl +++ /dev/null @@ -1,20 +0,0 @@ -<#ftl encoding="UTF-8"> -<#-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -Béka \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/templateresolver/test.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/templateresolver/test.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/templateresolver/test.ftl deleted file mode 100644 index fb3f45d..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/templateresolver/test.ftl +++ /dev/null @@ -1,19 +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. ---> -dummy \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/toCache1.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/toCache1.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/toCache1.ftl deleted file mode 100644 index 462f1ae..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/toCache1.ftl +++ /dev/null @@ -1,19 +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. ---> -Template 1 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/core/toCache2.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/core/toCache2.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/core/toCache2.ftl deleted file mode 100644 index f59424c..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/core/toCache2.ftl +++ /dev/null @@ -1,19 +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. ---> -Template 2 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/dom/DOMSiblingTest.xml ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/dom/DOMSiblingTest.xml b/freemarker-core/src/test/resources/org/apache/freemarker/dom/DOMSiblingTest.xml deleted file mode 100644 index d1fe3dc..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/dom/DOMSiblingTest.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.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. ---> -<person> - <gender>male</gender> - <name>pradeep</name> - <dob>12th August</dob><address>Chennai, India</address> - <!--This is a comment Node --> - <?xml-stylesheet type="text/css" href="style.css"?> - <profession>Software Engineer</profession> - <![CDATA[ ]]> - <hobby>gardening</hobby> - <![CDATA[this is a valid cdata]]> - <phone>12345678</phone> -</person> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-capture.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-capture.ftlh b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-capture.ftlh deleted file mode 100644 index 24bd0ee..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-capture.ftlh +++ /dev/null @@ -1,21 +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 captured><b>Test</b></#assign> -Just a string: ${"<b>Test</b>"} -Captured output: ${captured} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-capture.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-capture.ftlh.out b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-capture.ftlh.out deleted file mode 100644 index cf0da7e..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-capture.ftlh.out +++ /dev/null @@ -1,20 +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. - */ -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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert.ftlh b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert.ftlh deleted file mode 100644 index e0d3348..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert.ftlh +++ /dev/null @@ -1,27 +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 mo1 = "Foo's bar {}"?esc> -HTLM: ${mo1} -XML: <#outputformat 'XML'>${mo1}</#outputformat> -RTF: <#outputformat 'RTF'>${mo1}</#outputformat> - -<#assign mo2><p>Test</#assign> -HTML: ${mo2} -XML: <#attempt><#outputformat 'XML'>${mo2}</#outputformat><#recover>Failed</#attempt> -RTF: <#attempt><#outputformat 'RTF'>${mo2}</#outputformat><#recover>Failed</#attempt> http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert.ftlh.out b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert.ftlh.out deleted file mode 100644 index 65be2a0..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert.ftlh.out +++ /dev/null @@ -1,25 +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. - */ -HTLM: Foo's bar {} -XML: Foo's bar {} -RTF: Foo's bar \{\} - -HTML: <p>Test -XML: Failed -RTF: Failed http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert2.ftl ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert2.ftl b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert2.ftl deleted file mode 100644 index 80ae292..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert2.ftl +++ /dev/null @@ -1,25 +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. ---> -<#outputformat "HTML"><#assign htmlMO><p>Test</#assign></#outputformat> -<#outputformat "XML"><#assign xmlMO><p>Test</p></#assign></#outputformat> -<#outputformat "RTF"><#assign rtfMO>\par Test</#assign></#outputformat> -<#-- We assume that we have "undefined" output format here. --> -HTML: ${htmlMO} -XML: ${xmlMO} -RTF: ${rtfMO} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert2.ftl.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert2.ftl.out b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert2.ftl.out deleted file mode 100644 index cd84bd2..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-convert2.ftl.out +++ /dev/null @@ -1,21 +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. - */ -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/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-infoBox.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-infoBox.ftlh b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-infoBox.ftlh deleted file mode 100644 index 9b8dbd9..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-infoBox.ftlh +++ /dev/null @@ -1,26 +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. ---> -<@infoBox "Foo & bar" /> -<@infoBox "Foo <b>bar</b>"?no_esc /> - -<#macro infoBox message> - <div class="infoBox"> - ${message} - </div> -</#macro> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-infoBox.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-infoBox.ftlh.out b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-infoBox.ftlh.out deleted file mode 100644 index 9471ab7..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-infoBox.ftlh.out +++ /dev/null @@ -1,25 +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. - */ - <div class="infoBox"> - Foo & bar - </div> - <div class="infoBox"> - Foo <b>bar</b> - </div> - http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-markup.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-markup.ftlh b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-markup.ftlh deleted file mode 100644 index f9deeae..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-markup.ftlh +++ /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. ---> -<#assign markupOutput1="<b>Test</b>"?no_esc> -<#assign markupOutput2="Foo & bar"?esc> - -As expected: -${markupOutput1} -${markupOutput2} - -Double escaping: -${markupOutput1?markup_string} -${markupOutput2?markup_string} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-markup.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-markup.ftlh.out b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-markup.ftlh.out deleted file mode 100644 index 0420cca..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-markup.ftlh.out +++ /dev/null @@ -1,26 +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. - */ - -As expected: -<b>Test</b> -Foo & bar - -Double escaping: -<b>Test</b> -Foo &amp; bar \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringConcat.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringConcat.ftlh b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringConcat.ftlh deleted file mode 100644 index f7884bb..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringConcat.ftlh +++ /dev/null @@ -1,19 +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. ---> -${"<h1>"?no_esc + "Foo & bar" + "</h1>"?no_esc} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringConcat.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringConcat.ftlh.out b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringConcat.ftlh.out deleted file mode 100644 index d016072..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringConcat.ftlh.out +++ /dev/null @@ -1,19 +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. - */ -<h1>Foo & bar</h1> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral.ftlh b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral.ftlh deleted file mode 100644 index 4904f60..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral.ftlh +++ /dev/null @@ -1,21 +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 s = "Foo & bar"> -${s} -${"${s} & baz"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral.ftlh.out b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral.ftlh.out deleted file mode 100644 index c6bd10d..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral.ftlh.out +++ /dev/null @@ -1,20 +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. - */ -Foo & bar -Foo & bar & baz \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh deleted file mode 100644 index 52db70b..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh +++ /dev/null @@ -1,25 +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. ---> -<#-- Markup output value created by escaping plain text: --> -<#assign mo1 = "Foo & bar"?esc> -<#-- Markup output value created outherwise: --> -<#assign mo2 = "<p>Foo"?no_esc> - -${"${mo1} baz"} -${"${mo2} baz"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh.out ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh.out b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh.out deleted file mode 100644 index f47e521..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/AutoEscapingExample-stringLiteral2.ftlh.out +++ /dev/null @@ -1,21 +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. - */ - -Foo & bar baz -<p>Foo baz \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties deleted file mode 100644 index 0df9e33..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties +++ /dev/null @@ -1,21 +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. - -templateConfigurations = \ - ConditionalTemplateConfigurationFactory( \ - PathGlobMatcher("mail/**"), \ - TemplateConfiguration(outputFormat = HTMLOutputFormat())) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties deleted file mode 100644 index 5d2a738..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties +++ /dev/null @@ -1,31 +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. - -templateConfigurations = \ - FirstMatchTemplateConfigurationFactory( \ - ConditionalTemplateConfigurationFactory( \ - FileExtensionMatcher("xml"), \ - TemplateConfiguration(outputFormat = XMLOutputFormat())), \ - ConditionalTemplateConfigurationFactory( \ - OrMatcher( \ - FileExtensionMatcher("html"), \ - FileExtensionMatcher("htm")), \ - TemplateConfiguration(outputFormat = HTMLOutputFormat())), \ - ConditionalTemplateConfigurationFactory( \ - FileExtensionMatcher("rtf"), \ - TemplateConfiguration(outputFormat = RTFOutputFormat())), \ - allowNoMatch = true) http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/28a276c8/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh ---------------------------------------------------------------------- diff --git a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh b/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh deleted file mode 100644 index fe9690c..0000000 --- a/freemarker-core/src/test/resources/org/apache/freemarker/manualtest/CustomFormatsExample-alias1.ftlh +++ /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. ---> -${p?string.@price} -${w?string.@weight} -${fd?string.@fileDate} -${let?datetime?string.@logEventTime}
