You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2016/01/01 11:58:39 UTC
incubator-freemarker git commit: Added copyright comment to more
expected result files (ast)
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 701b339a5 -> fc9e6676c
Added copyright comment to more expected result files (ast)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/fc9e6676
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/fc9e6676
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/fc9e6676
Branch: refs/heads/2.3-gae
Commit: fc9e6676c9554005f44956d7efa29ab6461fd750
Parents: 701b339
Author: ddekany <dd...@apache.org>
Authored: Fri Jan 1 11:58:26 2016 +0100
Committer: ddekany <dd...@apache.org>
Committed: Fri Jan 1 11:58:26 2016 +0100
----------------------------------------------------------------------
src/test/resources/freemarker/core/ast-1.ast | 18 ++++++++++++++++++
.../resources/freemarker/core/ast-assignments.ast | 18 ++++++++++++++++++
.../resources/freemarker/core/ast-builtins.ast | 18 ++++++++++++++++++
.../resources/freemarker/core/ast-locations.ast | 18 ++++++++++++++++++
.../core/ast-mixedcontentsimplifications.ast | 18 ++++++++++++++++++
.../core/ast-multipleignoredchildren.ast | 18 ++++++++++++++++++
.../freemarker/core/ast-nestedignoredchildren.ast | 18 ++++++++++++++++++
src/test/resources/freemarker/core/ast-range.ast | 18 ++++++++++++++++++
.../freemarker/core/ast-strlitinterpolation.ast | 18 ++++++++++++++++++
.../freemarker/core/ast-whitespacestripping.ast | 18 ++++++++++++++++++
10 files changed, 180 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fc9e6676/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 9c3b8d1..cf65f1f 100644
--- a/src/test/resources/freemarker/core/ast-1.ast
+++ b/src/test/resources/freemarker/core/ast-1.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#mixed_content // f.c.MixedContent
#text // f.c.TextBlock
- content: "1 " // String
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fc9e6676/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 1d7a3a1..939c563 100644
--- a/src/test/resources/freemarker/core/ast-assignments.ast
+++ b/src/test/resources/freemarker/core/ast-assignments.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#mixed_content // f.c.MixedContent
#text // f.c.TextBlock
- content: "1 " // String
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fc9e6676/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 9278d8b..c5cf446 100644
--- a/src/test/resources/freemarker/core/ast-builtins.ast
+++ b/src/test/resources/freemarker/core/ast-builtins.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#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/fc9e6676/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 fb8974a..5bd7b9d 100644
--- a/src/test/resources/freemarker/core/ast-locations.ast
+++ b/src/test/resources/freemarker/core/ast-locations.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#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/fc9e6676/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 c1116a7..ff9a8b3 100644
--- a/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
+++ b/src/test/resources/freemarker/core/ast-mixedcontentsimplifications.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#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/fc9e6676/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 798e81b..3513f95 100644
--- a/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
+++ b/src/test/resources/freemarker/core/ast-multipleignoredchildren.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#mixed_content // f.c.MixedContent
#text // f.c.TextBlock
- content: "a\n" // String
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fc9e6676/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 5a43456..dd4c815 100644
--- a/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
+++ b/src/test/resources/freemarker/core/ast-nestedignoredchildren.ast
@@ -1,2 +1,20 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#outputformat // f.c.OutputFormatBlock
- value: "HTML" // f.c.StringLiteral
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fc9e6676/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 3ddae45..8a6234a 100644
--- a/src/test/resources/freemarker/core/ast-range.ast
+++ b/src/test/resources/freemarker/core/ast-range.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#mixed_content // f.c.MixedContent
#assign // f.c.Assignment
- assignment target: "x" // String
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fc9e6676/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 c55a320..7e607f6 100644
--- a/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
+++ b/src/test/resources/freemarker/core/ast-strlitinterpolation.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#mixed_content // f.c.MixedContent
#text // f.c.TextBlock
- content: "1. " // String
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/fc9e6676/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 7731fec..db468dc 100644
--- a/src/test/resources/freemarker/core/ast-whitespacestripping.ast
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
@@ -1,3 +1,21 @@
+<#--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
#mixed_content // f.c.MixedContent
#assign // f.c.Assignment
- assignment target: "xs" // String