[2/2] incubator-freemarker-docgen git commit: Added missing copyright headers to many files.

[ddekany]

Added missing copyright headers to many files.


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

Branch: refs/heads/master
Commit: 0fa9cbe37c796c8e75ebefc1c0b8bd6fe96fce1b
Parents: 4ace528
Author: ddekany 
Authored: Sat Jan 2 01:41:47 2016 +0100
Committer: ddekany 
Committed: Sat Jan 2 01:41:47 2016 +0100

--
 gulp-output-copyright-header.txt| 18 
 gulp-output-header.txt  | 22 
 gulpfile.js | 11 +-
 .../org/freemarker/docgen/antlib.properties | 17 +++
 src/main/org/freemarker/docgen/js/make-toc.js   | 18 
 src/main/org/freemarker/docgen/js/page-menu.js  | 18 
 src/main/org/freemarker/docgen/js/search.js | 18 
 src/main/org/freemarker/docgen/js/use-strict.js | 18 
 .../org/freemarker/docgen/less/lib/base.less| 18 
 .../docgen/less/lib/components/bookmarks.less   | 18 
 .../docgen/less/lib/components/breadcrumb.less  | 18 
 .../docgen/less/lib/components/callout.less | 18 
 .../docgen/less/lib/components/code-block.less  | 18 
 .../docgen/less/lib/components/logo.less| 18 
 .../docgen/less/lib/components/marked-text.less | 18 
 .../docgen/less/lib/components/page-menu.less   | 18 
 .../docgen/less/lib/components/pagers.less  | 18 
 .../docgen/less/lib/components/search-form.less | 18 
 .../less/lib/components/search-results.less | 18 
 .../less/lib/components/secondary-tabs.less | 18 
 .../less/lib/components/social-icons.less   | 18 
 .../less/lib/components/table-of-contents.less  | 18 
 .../docgen/less/lib/components/table.less   | 18 
 .../docgen/less/lib/components/tabs.less| 18 
 .../org/freemarker/docgen/less/lib/icons.less   | 18 
 .../docgen/less/lib/layout/content.less | 18 
 .../docgen/less/lib/layout/footer.less  | 18 
 .../docgen/less/lib/layout/header.less  | 18 
 .../org/freemarker/docgen/less/lib/mixins.less  | 18 
 .../freemarker/docgen/less/lib/utilities.less   | 18 
 .../freemarker/docgen/less/lib/variables.less   | 18 
 src/main/org/freemarker/docgen/less/styles.less | 18 
 .../docgen/templates/customizations.ftlh| 18 
 .../docgen/templates/eclipse-toc.ftlx   | 18 
 .../org/freemarker/docgen/templates/footer.ftlh | 18 
 .../org/freemarker/docgen/templates/google.ftlh | 18 
 .../org/freemarker/docgen/templates/header.ftlh | 18 
 .../freemarker/docgen/templates/navigation.ftlh | 18 
 .../docgen/templates/node-handlers.ftlh | 18 
 .../org/freemarker/docgen/templates/page.ftlh   | 18 
 .../freemarker/docgen/templates/sitemap.ftlx| 18 
 .../freemarker/docgen/templates/toc-json.ftl| 18 
 .../org/freemarker/docgen/templates/util.ftl| 18 
 .../org/freemarker/docgen/version.properties| 17 +++
 src/main/overview.html  | 18 
 src/test/1/book.xml | 18 
 src/test/1/docgen-foo.txt   | 18 
 src/test/1/docgen-templates/customizations.ftl  | 18 
 src/test/1/docgen.txt   | 18 
 src/test/1/preface.xml  | 18 
 src/test/2/book.xml | 18 
 src/test/5/book.xml | 18 
 src/test/6/article.xml  | 18 
 .../docbook-for-docgen/docbook-for-docgen.css   | 18 
 .../docbook-for-docgen/docbook-for-docgen.xxe   | 18 
 src/xxe-addon/howto.txt | 19 +
 56 files changed, 977 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/0fa9cbe3/gulp-output-copyright-header.txt

[1/2] incubator-freemarker-docgen git commit: Moved gulp-output-header.txt to its proper place.

[ddekany]

Repository: incubator-freemarker-docgen
Updated Branches:
  refs/heads/master d096e24da -> 0fa9cbe37


Moved gulp-output-header.txt to its proper place.


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

Branch: refs/heads/master
Commit: 4ace5282f73318f47ba76113feb8149ab8ac752c
Parents: d096e24
Author: ddekany 
Authored: Sat Jan 2 01:32:02 2016 +0100
Committer: ddekany 
Committed: Sat Jan 2 01:32:02 2016 +0100

--
 gulp-output-header.txt  | 22 
 gulpfile.js |  2 +-
 .../freemarker/docgen/gulp-output-header.txt| 22 
 3 files changed, 23 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/4ace5282/gulp-output-header.txt
--
diff --git a/gulp-output-header.txt b/gulp-output-header.txt
new file mode 100644
index 000..94f0b00
--- /dev/null
+++ b/gulp-output-header.txt
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/*
+ * GENERATED FILE - DO NOT EDIT! Instead, regenerate with Gulp!
+ */

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/4ace5282/gulpfile.js
--
diff --git a/gulpfile.js b/gulpfile.js
index 36020ec..3898ca5 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,7 +15,7 @@ var headerfooter = require('gulp-headerfooter');
 var BASE_DIR = path.join(__dirname, 'src', 'main', 'org', 'freemarker', 
'docgen');
 var OUT_DIR = path.join(BASE_DIR, 'statics');
 
-var header = fs.readFileSync(path.join(BASE_DIR, 'gulp-output-header.txt'));
+var header = fs.readFileSync(path.join(__dirname, 'gulp-output-header.txt'));
 
 gulp.task('styles', function() {
   gulp.src(path.join(BASE_DIR, 'less', 'styles.less'))

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/4ace5282/src/main/org/freemarker/docgen/gulp-output-header.txt
--
diff --git a/src/main/org/freemarker/docgen/gulp-output-header.txt 
b/src/main/org/freemarker/docgen/gulp-output-header.txt
deleted file mode 100644
index 94f0b00..000
--- a/src/main/org/freemarker/docgen/gulp-output-header.txt
+++ /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.
- */
-
-/*
- * GENERATED FILE - DO NOT EDIT! Instead, regenerate with Gulp!
- */

[04/19] incubator-freemarker git commit: Added copyright comment to UnsafeMethods "database"

[ddekany]

Added copyright comment to UnsafeMethods "database"


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

Branch: refs/heads/master
Commit: 4a38aee1228c721e07406f8747ba3ee17366e249
Parents: fc9e667
Author: ddekany 
Authored: Fri Jan 1 12:04:23 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 12:04:23 2016 +0100

--
 .../freemarker/ext/beans/UnsafeMethods.java |  2 +-
 .../ext/beans/unsafeMethods.properties  | 98 
 .../freemarker/ext/beans/unsafeMethods.txt  | 81 
 3 files changed, 99 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4a38aee1/src/main/java/freemarker/ext/beans/UnsafeMethods.java
--
diff --git a/src/main/java/freemarker/ext/beans/UnsafeMethods.java 
b/src/main/java/freemarker/ext/beans/UnsafeMethods.java
index 96d65a7..6d398ec 100644
--- a/src/main/java/freemarker/ext/beans/UnsafeMethods.java
+++ b/src/main/java/freemarker/ext/beans/UnsafeMethods.java
@@ -44,7 +44,7 @@ class UnsafeMethods {
 
 private static final Set createUnsafeMethodsSet() {
 Properties props = new Properties();
-InputStream in = 
BeansWrapper.class.getResourceAsStream("unsafeMethods.txt");
+InputStream in = 
BeansWrapper.class.getResourceAsStream("unsafeMethods.properties");
 if (in != null) {
 String methodSpec = null;
 try {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/4a38aee1/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
--
diff --git a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties 
b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
new file mode 100644
index 000..f1f4e18
--- /dev/null
+++ b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
@@ -0,0 +1,98 @@
+# 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.
+
+java.lang.Object.wait()
+java.lang.Object.wait(long)
+java.lang.Object.wait(long,int)
+java.lang.Object.notify()
+java.lang.Object.notifyAll()
+
+java.lang.Class.getClassLoader()
+java.lang.Class.newInstance()
+java.lang.Class.forName(java.lang.String)
+java.lang.Class.forName(java.lang.String,boolean,java.lang.ClassLoader)
+
+java.lang.reflect.Constructor.newInstance([Ljava.lang.Object;)
+
+java.lang.reflect.Method.invoke(java.lang.Object,[Ljava.lang.Object;)
+
+java.lang.reflect.Field.set(java.lang.Object,java.lang.Object)
+java.lang.reflect.Field.setBoolean(java.lang.Object,boolean)
+java.lang.reflect.Field.setByte(java.lang.Object,byte)
+java.lang.reflect.Field.setChar(java.lang.Object,char)
+java.lang.reflect.Field.setDouble(java.lang.Object,double)
+java.lang.reflect.Field.setFloat(java.lang.Object,float)
+java.lang.reflect.Field.setInt(java.lang.Object,int)
+java.lang.reflect.Field.setLong(java.lang.Object,long)
+java.lang.reflect.Field.setShort(java.lang.Object,short)
+
+java.lang.reflect.AccessibleObject.setAccessible([Ljava.lang.reflect.AccessibleObject;,boolean)
+java.lang.reflect.AccessibleObject.setAccessible(boolean)
+
+java.lang.Thread.destroy()
+java.lang.Thread.getContextClassLoader()
+java.lang.Thread.interrupt()
+java.lang.Thread.join()
+java.lang.Thread.join(long)
+java.lang.Thread.join(long,int)
+java.lang.Thread.resume()
+java.lang.Thread.run()
+java.lang.Thread.setContextClassLoader(java.lang.ClassLoader)
+java.lang.Thread.setDaemon(boolean)
+java.lang.Thread.setName(java.lang.String)
+java.lang.Thread.setPriority(int)
+java.lang.Thread.sleep(long)
+java.lang.Thread.sleep(long,int)
+java.lang.Thread.start()
+java.lang.Thread.stop()
+java.lang.Thread.stop(java.lang.Throwable)
+java.lang.Thread.suspend()
+

[06/19] incubator-freemarker git commit: NOTICE year update

[ddekany]

NOTICE year update


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

Branch: refs/heads/2.3
Commit: ef6b4d112ba8a87b360a00aa8d2caeeb166c6077
Parents: 545cd63
Author: ddekany 
Authored: Fri Jan 1 12:32:03 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 12:32:03 2016 +0100

--
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ef6b4d11/NOTICE
--
diff --git a/NOTICE b/NOTICE
index c3987d6..62a65c0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache FreeMarker
-Copyright 2015 The Apache Software Foundation
+Copyright 2015-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

[13/19] incubator-freemarker git commit: Added copyright comment to the TLD-s inside the test jar-s

[ddekany]

Added copyright comment to the TLD-s inside the test jar-s


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

Branch: refs/heads/2.3
Commit: c52561aaa83816463faeb76b6d96c320d5e9eac6
Parents: 2a567e3
Author: ddekany 
Authored: Fri Jan 1 14:21:18 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 14:21:18 2016 +0100

--
 .../jsp/webapps/config/WEB-INF/lib/templates.jar  | Bin 579 -> 1018 bytes
 .../tldDiscovery/WEB-INF/lib/taglib-foo.jar   | Bin 791 -> 1221 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c52561aa/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar
--
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar
 
b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar
index 0b764df..8e5f2e5 100644
Binary files 
a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar
 and 
b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/lib/templates.jar
 differ

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/c52561aa/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar
--
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar
 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar
index 5164765..aa6c542 100644
Binary files 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar
 and 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/lib/taglib-foo.jar
 differ

[07/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
index f0f4809..916a32c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 
 FreeMarker: Transformation Test

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
index 07a1364..0554864 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 StNuBoMeTaMaHaHxSeCoCxEnInDiNo
 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
 

[08/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
index 361f786..52f49f0 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 === [aardvark, bear, cat, dog] ===
 
 -- List+sep:

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
index 4a4f632..5641694 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 [
 [(11@0, 11@0), (11@0, 22@1), (11@0, 33@2)],
 [(22@1, 11@0), (22@1, 22@1), (22@1, 33@2)],

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
index a7f832c..84fc384 100644
--- 

[15/19] incubator-freemarker git commit: (JavaDoc adjustment)

[ddekany]

(JavaDoc adjustment)


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

Branch: refs/heads/2.3
Commit: 22e5fddfc39a064454d219702328d8c9d9ed9724
Parents: 48f7b87
Author: ddekany 
Authored: Fri Jan 1 20:34:44 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 20:34:44 2016 +0100

--
 src/main/java/freemarker/template/utility/StringUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/22e5fddf/src/main/java/freemarker/template/utility/StringUtil.java
--
diff --git a/src/main/java/freemarker/template/utility/StringUtil.java 
b/src/main/java/freemarker/template/utility/StringUtil.java
index 973c1f4..58d5ffb 100644
--- a/src/main/java/freemarker/template/utility/StringUtil.java
+++ b/src/main/java/freemarker/template/utility/StringUtil.java
@@ -823,7 +823,7 @@ public class StringUtil {
 }
 
 /**
- * Removes the line-break from the end of the string.
+ * Removes a line-break from the end of the string (if there's any).
  */
 public static String chomp(String s) {
 if (s.endsWith("\r\n")) return s.substring(0, s.length() - 2);

[03/19] incubator-freemarker git commit: Added copyright comment to more expected result files (ast)

[ddekany]

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
Commit: fc9e6676c9554005f44956d7efa29ab6461fd750
Parents: 701b339
Author: ddekany 
Authored: Fri Jan 1 11:58:26 2016 +0100
Committer: ddekany 
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 

[02/19] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)

[ddekany]

Added copyright comment to expected result files (txt or out)


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

Branch: refs/heads/master
Commit: 701b339a5f519c1ead0e6892fdc212e6bd9ae035
Parents: 7d355e7
Author: ddekany 
Authored: Fri Jan 1 11:21:29 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 11:21:29 2016 +0100

--
 src/test/java/freemarker/core/ASTTest.java   |   2 +-
 .../java/freemarker/core/CanonicalFormTest.java  |   6 +-
 .../CopyrightCommentRemoverTemplateLoader.java   |   2 +-
 src/test/java/freemarker/test/TemplateTest.java  |   2 +-
 src/test/java/freemarker/test/TestUtil.java  |   2 +-
 .../freemarker/test/servlet/WebAppTestCase.java  |   3 ++-
 .../freemarker/test/utility/FileTestCase.java|   3 ++-
 .../basic/WEB-INF/expected/attributes-2.3.0.txt  |  18 ++
 .../expected/attributes-2.3.22-future.txt|  18 ++
 .../basic/WEB-INF/expected/attributes.txt|  18 ++
 .../basic/WEB-INF/expected/customTags1.txt   |  18 ++
 .../WEB-INF/expected/subdir/test-rel.txt |  18 ++
 .../WEB-INF/expected/test-noClasspath.txt|  18 ++
 .../tldDiscovery/WEB-INF/expected/test1.txt  |  18 ++
 .../manual/AutoEscapingExample-capture.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-convert.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-convert2.ftl.out  |  18 ++
 .../manual/AutoEscapingExample-infoBox.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-markup.ftlh.out   |  18 ++
 .../AutoEscapingExample-stringConcat.ftlh.out|  18 ++
 .../AutoEscapingExample-stringLiteral.ftlh.out   |  18 ++
 .../AutoEscapingExample-stringLiteral2.ftlh.out  |  18 ++
 .../manual/CustomFormatsExample-alias1.ftlh.out  |  18 ++
 .../manual/CustomFormatsExample-alias2.ftlh.out  |  18 ++
 .../CustomFormatsExample-modelAware.ftlh.out |  18 ++
 .../test/templatesuite/expected/arithmetic.txt   |  18 ++
 .../test/templatesuite/expected/bean-maps.txt|  18 ++
 .../test/templatesuite/expected/beans.txt|  18 ++
 .../expected/boolean-formatting.txt  |  18 ++
 .../test/templatesuite/expected/boolean.txt  |  18 ++
 .../templatesuite/expected/charset-in-header.txt |  18 ++
 .../expected/classic-compatible.txt  |  18 ++
 .../test/templatesuite/expected/comment.txt  |  18 ++
 .../test/templatesuite/expected/comparisons.txt  |  18 ++
 .../test/templatesuite/expected/compress.txt |  18 ++
 .../templatesuite/expected/dateformat-java.txt   |  18 ++
 .../templatesuite/expected/default-xmlns.txt |  18 ++
 .../test/templatesuite/expected/default.txt  |  18 ++
 .../expected/encoding-builtins-ici-2.3.20.txt|  18 ++
 .../templatesuite/expected/encoding-builtins.txt |  18 ++
 .../test/templatesuite/expected/escapes.txt  |  18 ++
 .../test/templatesuite/expected/exception.txt|  18 ++
 .../test/templatesuite/expected/exception2.txt   |  18 ++
 .../test/templatesuite/expected/exception3.txt   |  18 ++
 .../test/templatesuite/expected/exthash.txt  |  18 ++
 .../test/templatesuite/expected/hashconcat.txt   |  18 ++
 .../test/templatesuite/expected/hashliteral.txt  |  18 ++
 .../test/templatesuite/expected/helloworld.txt   |  18 ++
 .../expected/identifier-escaping.txt |  18 ++
 .../expected/identifier-non-ascii.txt|  18 ++
 .../test/templatesuite/expected/if.txt   |  18 ++
 .../test/templatesuite/expected/import.txt   |  18 ++
 .../test/templatesuite/expected/include.txt  |  18 ++
 .../test/templatesuite/expected/include2.txt |  18 ++
 .../test/templatesuite/expected/interpret.txt|  18 ++
 .../test/templatesuite/expected/iterators.txt|  18 ++
 .../templatesuite/expected/lastcharacter.txt |  18 ++
 .../test/templatesuite/expected/list-bis.txt |  18 ++
 .../test/templatesuite/expected/list.txt

[15/19] incubator-freemarker git commit: (JavaDoc adjustment)

[ddekany]

(JavaDoc adjustment)


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

Branch: refs/heads/master
Commit: 22e5fddfc39a064454d219702328d8c9d9ed9724
Parents: 48f7b87
Author: ddekany 
Authored: Fri Jan 1 20:34:44 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 20:34:44 2016 +0100

--
 src/main/java/freemarker/template/utility/StringUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/22e5fddf/src/main/java/freemarker/template/utility/StringUtil.java
--
diff --git a/src/main/java/freemarker/template/utility/StringUtil.java 
b/src/main/java/freemarker/template/utility/StringUtil.java
index 973c1f4..58d5ffb 100644
--- a/src/main/java/freemarker/template/utility/StringUtil.java
+++ b/src/main/java/freemarker/template/utility/StringUtil.java
@@ -823,7 +823,7 @@ public class StringUtil {
 }
 
 /**
- * Removes the line-break from the end of the string.
+ * Removes a line-break from the end of the string (if there's any).
  */
 public static String chomp(String s) {
 if (s.endsWith("\r\n")) return s.substring(0, s.length() - 2);

[11/19] incubator-freemarker git commit: Added copyright comment to some more txt documents

[ddekany]

Added copyright comment to some more txt documents


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

Branch: refs/heads/2.3
Commit: 85f52ffccf6bc1d3938ab149dc099dedeb8d14c0
Parents: a64f136
Author: ddekany 
Authored: Fri Jan 1 13:12:04 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 13:12:04 2016 +0100

--
 src/examples/README.txt| 19 +++
 src/examples/ant/README.txt| 19 +++
 src/main/misc/overloadedNumberRules/README.txt | 19 +++
 3 files changed, 57 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/85f52ffc/src/examples/README.txt
--
diff --git a/src/examples/README.txt b/src/examples/README.txt
index 12dfa36..437cd28 100644
--- a/src/examples/README.txt
+++ b/src/examples/README.txt
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+ 
 Examples
 
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/85f52ffc/src/examples/ant/README.txt
--
diff --git a/src/examples/ant/README.txt b/src/examples/ant/README.txt
index 60e4186..5ac811c 100644
--- a/src/examples/ant/README.txt
+++ b/src/examples/ant/README.txt
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+ 
 Issue ant from this directory, and it will create an out directory with HTLM
 in it.
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/85f52ffc/src/main/misc/overloadedNumberRules/README.txt
--
diff --git a/src/main/misc/overloadedNumberRules/README.txt 
b/src/main/misc/overloadedNumberRules/README.txt
index 197444c..a354dab 100644
--- a/src/main/misc/overloadedNumberRules/README.txt
+++ b/src/main/misc/overloadedNumberRules/README.txt
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
 This FMPP project is used for generating the source code of some
 `freemarker.ext.beans.OverloadedNumberUtil` methods based on the
 content of `prices.ods` (LibreOffice spreadsheet).

[01/19] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)

[ddekany]

Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3 ec24a4247 -> 5377aadec


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
index 54d2f71..5b20799 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
@@ -1,3 +1,21 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 
 
 FreeMarker: Last Character Test

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
index 1d6cdba..2978827 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
@@ -1,3 +1,21 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 0: a [0:A, 1:B, 2:C]
 1: b [0:A, 1:B, 2:C]
 2: c [0:A, 1:B, 2:C]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list.txt
--
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/list.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
index 7cdac1e..514cff5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
@@ -1,3 +1,21 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 Size: 4
 Items: @0 aardvark, @1 bear, @2 cat, @3 dog.
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
index 0fe498d..361f786 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
@@ -1,3 

[02/19] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)

[ddekany]

Added copyright comment to expected result files (txt or out)


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

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

--
 src/test/java/freemarker/core/ASTTest.java   |   2 +-
 .../java/freemarker/core/CanonicalFormTest.java  |   6 +-
 .../CopyrightCommentRemoverTemplateLoader.java   |   2 +-
 src/test/java/freemarker/test/TemplateTest.java  |   2 +-
 src/test/java/freemarker/test/TestUtil.java  |   2 +-
 .../freemarker/test/servlet/WebAppTestCase.java  |   3 ++-
 .../freemarker/test/utility/FileTestCase.java|   3 ++-
 .../basic/WEB-INF/expected/attributes-2.3.0.txt  |  18 ++
 .../expected/attributes-2.3.22-future.txt|  18 ++
 .../basic/WEB-INF/expected/attributes.txt|  18 ++
 .../basic/WEB-INF/expected/customTags1.txt   |  18 ++
 .../WEB-INF/expected/subdir/test-rel.txt |  18 ++
 .../WEB-INF/expected/test-noClasspath.txt|  18 ++
 .../tldDiscovery/WEB-INF/expected/test1.txt  |  18 ++
 .../manual/AutoEscapingExample-capture.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-convert.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-convert2.ftl.out  |  18 ++
 .../manual/AutoEscapingExample-infoBox.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-markup.ftlh.out   |  18 ++
 .../AutoEscapingExample-stringConcat.ftlh.out|  18 ++
 .../AutoEscapingExample-stringLiteral.ftlh.out   |  18 ++
 .../AutoEscapingExample-stringLiteral2.ftlh.out  |  18 ++
 .../manual/CustomFormatsExample-alias1.ftlh.out  |  18 ++
 .../manual/CustomFormatsExample-alias2.ftlh.out  |  18 ++
 .../CustomFormatsExample-modelAware.ftlh.out |  18 ++
 .../test/templatesuite/expected/arithmetic.txt   |  18 ++
 .../test/templatesuite/expected/bean-maps.txt|  18 ++
 .../test/templatesuite/expected/beans.txt|  18 ++
 .../expected/boolean-formatting.txt  |  18 ++
 .../test/templatesuite/expected/boolean.txt  |  18 ++
 .../templatesuite/expected/charset-in-header.txt |  18 ++
 .../expected/classic-compatible.txt  |  18 ++
 .../test/templatesuite/expected/comment.txt  |  18 ++
 .../test/templatesuite/expected/comparisons.txt  |  18 ++
 .../test/templatesuite/expected/compress.txt |  18 ++
 .../templatesuite/expected/dateformat-java.txt   |  18 ++
 .../templatesuite/expected/default-xmlns.txt |  18 ++
 .../test/templatesuite/expected/default.txt  |  18 ++
 .../expected/encoding-builtins-ici-2.3.20.txt|  18 ++
 .../templatesuite/expected/encoding-builtins.txt |  18 ++
 .../test/templatesuite/expected/escapes.txt  |  18 ++
 .../test/templatesuite/expected/exception.txt|  18 ++
 .../test/templatesuite/expected/exception2.txt   |  18 ++
 .../test/templatesuite/expected/exception3.txt   |  18 ++
 .../test/templatesuite/expected/exthash.txt  |  18 ++
 .../test/templatesuite/expected/hashconcat.txt   |  18 ++
 .../test/templatesuite/expected/hashliteral.txt  |  18 ++
 .../test/templatesuite/expected/helloworld.txt   |  18 ++
 .../expected/identifier-escaping.txt |  18 ++
 .../expected/identifier-non-ascii.txt|  18 ++
 .../test/templatesuite/expected/if.txt   |  18 ++
 .../test/templatesuite/expected/import.txt   |  18 ++
 .../test/templatesuite/expected/include.txt  |  18 ++
 .../test/templatesuite/expected/include2.txt |  18 ++
 .../test/templatesuite/expected/interpret.txt|  18 ++
 .../test/templatesuite/expected/iterators.txt|  18 ++
 .../templatesuite/expected/lastcharacter.txt |  18 ++
 .../test/templatesuite/expected/list-bis.txt |  18 ++
 .../test/templatesuite/expected/list.txt | 

[14/19] incubator-freemarker git commit: Added copyright comment to the TLD-s inside the test jar-s

[ddekany]

Added copyright comment to the TLD-s inside the test jar-s


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

Branch: refs/heads/master
Commit: 48f7b87c046f2044c1e3ff170727b9600a12051b
Parents: c52561a
Author: ddekany 
Authored: Fri Jan 1 14:42:39 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 14:42:39 2016 +0100

--
 .../jsp/webapps/tldDiscovery/WEB-INF/taglib 2.jar | Bin 752 -> 1179 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/48f7b87c/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib
 2.jar
--
diff --git 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 
2.jar 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 
2.jar
index 1d067f6..a915da1 100644
Binary files 
a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 
2.jar and 
b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/taglib 
2.jar differ

[07/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
index f0f4809..916a32c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 
 FreeMarker: Transformation Test

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
index 07a1364..0554864 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 StNuBoMeTaMaHaHxSeCoCxEnInDiNo
 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
 

[10/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

Replaced txt/out/ast copyright comments with Java-style comments


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

Branch: refs/heads/2.3
Commit: a64f13674dd496a5175d6b8e1f134ae4fd55dd6d
Parents: ef6b4d1
Author: ddekany 
Authored: Fri Jan 1 12:34:37 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 13:11:29 2016 +0100

--
 src/test/java/freemarker/core/ASTTest.java  |   6 +--
 .../java/freemarker/core/CanonicalFormTest.java |   5 +--
 src/test/java/freemarker/test/TemplateTest.java |   2 +-
 src/test/java/freemarker/test/TestUtil.java |  34 ++
 .../freemarker/test/servlet/WebAppTestCase.java |   2 +-
 .../freemarker/test/utility/FileTestCase.java   |   2 +-
 src/test/resources/freemarker/core/ast-1.ast|  36 +++
 .../freemarker/core/ast-assignments.ast |  36 +++
 .../resources/freemarker/core/ast-builtins.ast  |  36 +++
 .../resources/freemarker/core/ast-locations.ast |  36 +++
 .../core/ast-mixedcontentsimplifications.ast|  36 +++
 .../core/ast-multipleignoredchildren.ast|  36 +++
 .../core/ast-nestedignoredchildren.ast  |  36 +++
 .../resources/freemarker/core/ast-range.ast |  36 +++
 .../freemarker/core/ast-strlitinterpolation.ast |  36 +++
 .../freemarker/core/ast-whitespacestripping.ast |  36 +++
 .../core/cano-assignments-canonical.ftl |  34 --
 .../freemarker/core/cano-assignments.ftl.out|  34 ++
 .../freemarker/core/cano-builtins-canonical.ftl |  22 --
 .../freemarker/core/cano-builtins.ftl.out   |  23 ++
 .../core/cano-identifier-escaping-canonical.ftl |  43 --
 .../core/cano-identifier-escaping.ftl.out   |  44 +++
 .../freemarker/core/cano-macros-canonical.ftl   |  28 
 .../freemarker/core/cano-macros.ftl.out |  28 
 .../core/cano-strlitinterpolation-canonical.ftl |  18 
 .../core/cano-strlitinterpolation.ftl.out   |  19 
 .../basic/WEB-INF/expected/attributes-2.3.0.txt |  36 +++
 .../expected/attributes-2.3.22-future.txt   |  36 +++
 .../basic/WEB-INF/expected/attributes.txt   |  36 +++
 .../basic/WEB-INF/expected/customTags1.txt  |  36 +++
 .../WEB-INF/expected/subdir/test-rel.txt|  36 +++
 .../WEB-INF/expected/test-noClasspath.txt   |  36 +++
 .../tldDiscovery/WEB-INF/expected/test1.txt |  36 +++
 .../manual/AutoEscapingExample-capture.ftlh.out |  36 +++
 .../manual/AutoEscapingExample-convert.ftlh.out |  36 +++
 .../manual/AutoEscapingExample-convert2.ftl.out |  36 +++
 .../manual/AutoEscapingExample-infoBox.ftlh.out |  36 +++
 .../manual/AutoEscapingExample-markup.ftlh.out  |  36 +++
 .../AutoEscapingExample-stringConcat.ftlh.out   |  36 +++
 .../AutoEscapingExample-stringLiteral.ftlh.out  |  36 +++
 .../AutoEscapingExample-stringLiteral2.ftlh.out |  36 +++
 .../manual/CustomFormatsExample-alias1.ftlh.out |  36 +++
 .../manual/CustomFormatsExample-alias2.ftlh.out |  36 +++
 .../CustomFormatsExample-modelAware.ftlh.out|  36 +++
 .../test/templatesuite/expected/arithmetic.txt  |  36 +++
 .../test/templatesuite/expected/bean-maps.txt   |  36 +++
 .../test/templatesuite/expected/beans.txt   |  36 +++
 .../expected/boolean-formatting.txt |  36 +++
 .../test/templatesuite/expected/boolean.txt |  36 +++
 .../expected/charset-in-header.txt  |  36 +++
 .../expected/classic-compatible.txt |  36 +++
 .../test/templatesuite/expected/comment.txt |  36 +++
 .../test/templatesuite/expected/comparisons.txt |  36 +++
 .../test/templatesuite/expected/compress.txt|  36 +++
 .../templatesuite/expected/dateformat-java.txt  |  36 +++
 .../templatesuite/expected/default-xmlns.txt|  36 +++
 .../test/templatesuite/expected/default.txt |  36 +++
 .../expected/encoding-builtins-ici-2.3.20.txt   |  36 +++
 .../expected/encoding-builtins.txt  |  36 +++
 .../test/templatesuite/expected/escapes.txt |  36 +++
 .../test/templatesuite/expected/exception.txt   |  36 +++
 .../test/templatesuite/expected/exception2.txt  | 

[18/19] incubator-freemarker git commit: Separated src and bin distribution archives, as per Apache requirements. The bin distro contains both freemarker.jar and the documentation, because these are a

[ddekany]

Separated src and bin distribution archives, as per Apache requirements. The 
bin distro contains both freemarker.jar and the documentation, because these 
are all the build artifacts of the src. Adjusted plain text file names to 
apache conventions, updated their contents. Simplified the distro index.html in 
the documentation artifact, so that no content is duplicated from the Manual.


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

Branch: refs/heads/2.3
Commit: 64f2cd19b18cd507caeea54fe47f0f5ad23b8bc3
Parents: a94e78c
Author: ddekany 
Authored: Sat Jan 2 01:07:05 2016 +0100
Committer: ddekany 
Committed: Sat Jan 2 01:11:38 2016 +0100

--
 README| 134 +++
 README.txt| 132 ---
 RELEASE-NOTES |   6 +
 build.xml | 128 ++
 codestyle.xml |  18 ++
 src/dist/DISCLAIMER   |   8 -
 src/dist/LICENSE  | 257 -
 src/dist/NOTICE   |  30 
 src/dist/bin/LICENSE  | 257 +
 src/dist/bin/NOTICE   |  30 
 src/dist/bin/documentation/index.html |  65 
 src/dist/documentation/index.html |  98 ---
 12 files changed, 608 insertions(+), 555 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/64f2cd19/README
--
diff --git a/README b/README
new file mode 100644
index 000..54c5238
--- /dev/null
+++ b/README
@@ -0,0 +1,134 @@
+/*
+ * 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.
+ */
+
+===
+
+ Apache FreeMarker {version}
+
+ For the latest version or to report bugs visit:
+
+ http://freemarker.org/
+
+===
+
+
+What is Apache FreeMarker?
+--
+
+FreeMarker is a "template engine"; a generic tool to generate text
+output (anything from HTML to auto generated source code) based on
+templates. It's a Java package, a class library for Java programmers.
+It's not an application for end-users in itself, but something that
+programmers can embed into their products. FreeMarker is designed to
+be practical for the generation of HTML Web pages, particularly by
+servlet-based applications following the MVC (Model View Controller)
+pattern.
+
+
+Licensing
+-
+
+FreeMarker is licensed under the Apache License, Version 2.0.
+
+See the LICENSE file for more details!
+
+
+Documentation
+-
+
+Online: http://freemarker.org/docs/
+
+Offline: The full documentation is available in the binary distribution
+in the documentation/index.html directory.
+
+
+Installing
+--
+
+If you are using Maven, just add this dependency:
+
+  
+  
+org.freemarker
+freemarker
+{version}
+  
+
+Otherwise simply copy freemarker.jar to a location where your Java
+application's ClassLoader will find it. For example, if you are using
+FreeMarker in a web application, you probably want to put
+freemarker.jar into the WEB-INF/lib directory of your web application.
+
+FreeMarker has no required dependencies. It has several optional
+dependencies, but usually you don't have to deal with them, because if
+you are using an optional feature that's certainly because your
+application already uses the related library.
+
+
+Change log
+--
+
+Online:
+http://freemarker.org/docs/app_versions.html
+
+Offline:
+In the binary release, open documentation/index.html, and you will find the
+link.
+
+
+Building
+
+
+First of all, if you 

[16/19] incubator-freemarker git commit: Added copyright header to Manual output, also fixed copyright in the footer.

[ddekany]

Added copyright header to Manual output, also fixed copyright in the footer.


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

Branch: refs/heads/2.3
Commit: f310e855bb0d291e7181fba26baba7e3be3b5a94
Parents: 22e5fdd
Author: ddekany 
Authored: Fri Jan 1 20:35:47 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 20:35:47 2016 +0100

--
 src/manual/en_US/docgen-misc/copyrightComment.txt | 16 
 src/manual/en_US/docgen.cjson |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f310e855/src/manual/en_US/docgen-misc/copyrightComment.txt
--
diff --git a/src/manual/en_US/docgen-misc/copyrightComment.txt 
b/src/manual/en_US/docgen-misc/copyrightComment.txt
new file mode 100644
index 000..60b675e
--- /dev/null
+++ b/src/manual/en_US/docgen-misc/copyrightComment.txt
@@ -0,0 +1,16 @@
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f310e855/src/manual/en_US/docgen.cjson
--
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 786ec8c..424f703 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -33,8 +33,9 @@ generateEclipseTOC
 
 removeNodesWhenOnline: [ "preface" ]
 
-copyrightHolder: "The FreeMarker Project"
+copyrightHolder: "The Apache Software Foundation"
 copyrightStartYear: 1999
+copyrightCommentFile: "docgen-misc/copyrightComment.txt"
 
 seoMeta: {
   "dgui_quickstart": {

[19/19] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae'

[ddekany]

Merge remote-tracking branch 'origin/2.3-gae'


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

Branch: refs/heads/master
Commit: c62096801d5b02fc5e2404871e52aee0249b5f0d
Parents: e8fdf53 64f2cd1
Author: ddekany 
Authored: Sat Jan 2 01:44:27 2016 +0100
Committer: ddekany 
Committed: Sat Jan 2 01:46:42 2016 +0100

--
 NOTICE  |   2 +-
 README  | 134 ++
 README.txt  | 113 
 RELEASE-NOTES   |   6 +
 build.xml   | 128 ++---
 codestyle.xml   |  18 ++
 src/dist/DISCLAIMER |   8 -
 src/dist/LICENSE| 257 ---
 src/dist/NOTICE |  30 ---
 src/dist/bin/LICENSE| 257 +++
 src/dist/bin/NOTICE |  30 +++
 src/dist/bin/documentation/index.html   |  65 +
 src/dist/documentation/index.html   |  98 ---
 src/examples/README.txt |  19 ++
 src/examples/ant/README.txt |  19 ++
 .../freemarker/ext/beans/UnsafeMethods.java |   2 +-
 .../freemarker/template/utility/StringUtil.java |   2 +-
 src/main/misc/overloadedNumberRules/README.txt  |  19 ++
 src/main/misc/overloadedNumberRules/prices.csv  |  48 
 .../ext/beans/unsafeMethods.properties  |  98 +++
 .../freemarker/ext/beans/unsafeMethods.txt  |  81 --
 src/manual/change-log-2.4.txt   |  19 ++
 src/manual/en_US/docgen-help/editors-readme.txt |  19 ++
 .../en_US/docgen-misc/copyrightComment.txt  |  16 ++
 .../figures/odg-convert-howto.txt   |  19 ++
 src/manual/en_US/docgen.cjson   |   5 +-
 src/manual/zh_CN/placeholder.txt|  19 ++
 src/test/java/freemarker/core/ASTTest.java  |   6 +-
 .../java/freemarker/core/CanonicalFormTest.java |  11 +-
 .../CopyrightCommentRemoverTemplateLoader.java  |   2 +-
 src/test/java/freemarker/test/TemplateTest.java |   2 +-
 src/test/java/freemarker/test/TestUtil.java |  36 ++-
 .../freemarker/test/servlet/WebAppTestCase.java |   3 +-
 .../freemarker/test/utility/FileTestCase.java   |   3 +-
 src/test/resources/freemarker/core/ast-1.ast|  18 ++
 .../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 ++
 .../core/ast-nestedignoredchildren.ast  |  18 ++
 .../resources/freemarker/core/ast-range.ast |  18 ++
 .../freemarker/core/ast-strlitinterpolation.ast |  18 ++
 .../freemarker/core/ast-whitespacestripping.ast |  18 ++
 .../core/cano-assignments-canonical.ftl |  34 ---
 .../freemarker/core/cano-assignments.ftl.out|  34 +++
 .../freemarker/core/cano-builtins-canonical.ftl |  22 --
 .../freemarker/core/cano-builtins.ftl.out   |  23 ++
 .../core/cano-identifier-escaping-canonical.ftl |  43 
 .../core/cano-identifier-escaping.ftl.out   |  44 
 .../freemarker/core/cano-macros-canonical.ftl   |  28 --
 .../freemarker/core/cano-macros.ftl.out |  28 ++
 .../core/cano-strlitinterpolation-canonical.ftl |  18 --
 .../core/cano-strlitinterpolation.ftl.out   |  19 ++
 .../basic/WEB-INF/expected/attributes-2.3.0.txt |  18 ++
 .../expected/attributes-2.3.22-future.txt   |  18 ++
 .../basic/WEB-INF/expected/attributes.txt   |  18 ++
 .../basic/WEB-INF/expected/customTags1.txt  |  18 ++
 .../webapps/config/WEB-INF/lib/templates.jar| Bin 579 -> 1018 bytes
 .../WEB-INF/expected/subdir/test-rel.txt|  18 ++
 .../WEB-INF/expected/test-noClasspath.txt   |  18 ++
 .../tldDiscovery/WEB-INF/expected/test1.txt |  18 ++
 .../tldDiscovery/WEB-INF/lib/taglib-foo.jar | Bin 791 -> 1221 bytes
 .../webapps/tldDiscovery/WEB-INF/taglib 2.jar   | Bin 752 -> 1179 bytes
 .../manual/AutoEscapingExample-capture.ftlh.out |  18 ++
 .../manual/AutoEscapingExample-convert.ftlh.out |  18 ++
 .../manual/AutoEscapingExample-convert2.ftl.out |  18 ++
 .../manual/AutoEscapingExample-infoBox.ftlh.out |  18 ++
 .../manual/AutoEscapingExample-markup.ftlh.out  |  18 ++
 .../AutoEscapingExample-stringConcat.ftlh.out   |  18 ++
 .../AutoEscapingExample-stringLiteral.ftlh.out  |  18 ++
 .../AutoEscapingExample-stringLiteral2.ftlh.out |  18 

[12/19] incubator-freemarker git commit: Remove re-generatble csv as it's not possible to add copyright comments to it.

[ddekany]

Remove re-generatble csv as it's not possible to add copyright comments to it.


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

Branch: refs/heads/2.3
Commit: 2a567e30cac12229bcbfd230d251d5a9473f2011
Parents: 85f52ff
Author: ddekany 
Authored: Fri Jan 1 13:20:12 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 13:20:12 2016 +0100

--
 src/main/misc/overloadedNumberRules/prices.csv | 48 -
 1 file changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2a567e30/src/main/misc/overloadedNumberRules/prices.csv
--
diff --git a/src/main/misc/overloadedNumberRules/prices.csv 
b/src/main/misc/overloadedNumberRules/prices.csv
deleted file mode 100644
index c12d7ba..000
--- a/src/main/misc/overloadedNumberRules/prices.csv
+++ /dev/null
@@ -1,48 +0,0 @@
-,Byte,Short,Integer,Long,BigInteger,Float,Double,BigDecimal,,Note
-Byte,0,1,1,1,1,2,2,2,,
-ShortOrByte,2.1,0,1,1,1,2,2,2,,
-Short,-,0,1,1,1,2,2,2,,
-IntegerOrByte,2.2,2.1,0,1,1,2.4,2,2,,
-IntegerOrShort,-,2.1,0,1,1,2.4,2,2,,
-Integer,-,-,0,1,1,3,2,2,,
-LongOrByte,2.3,2.2,2.1,0,1,2.4,2.1,2,,
-LongOrShort,-,2.2,2.1,0,1,2.4,2.1,2,,
-LongOrInteger,-,-,2.1,0,1,3,2.1,2,,
-Long,-,-,-,0,1,4,3,2,,
-BigIntegerOrByte,1.8,1.7,1.6,1.5,0,2.4,2,1,,
-BigIntegerOrShort,-,1.7,1.6,1.5,0,2.4,2,1,,
-BigIntegerOrInteger,-,-,1.6,1.5,0,3,2,1,,
-BigIntegerOrLong,-,-,-,1.5,0,4,3,1,,
-BigIntegerOrFloat,N/A,N/A,N/A,N/A,0,2.4,2,1,,"Condition: No whole-number 
target types exist, and abs(value) <= 2**24"
-BigIntegerOrDouble,N/A,N/A,N/A,N/A,0,4,2,1,,"Condition: No whole-number target 
types exist, and abs(value) <= 2**53"
-BigInteger,-,-,-,-,0,-,-,1,,
-FloatOrByte,2.3,2.2,2.1,2.1,2.5,0,1,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-FloatOrShort,-,2.2,2.1,2.1,2.5,0,1,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-FloatOrInteger,-,-,2.1,2.1,2.5,0,1,2,,"Condition: fraction == 0, in [-16777216 
.. 16777216]"
-Float,-,-,-,-,-,0,1,2,,
-DoubleOrByte,2.5,2.4,2.2,2.1,2.1,2.3,0,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-DoubleOrShort,-,2.4,2.2,2.1,2.1,2.3,0,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-DoubleOrIntegerOrFloat,-,-,2.2,2.1,2.1,2.3,0,2,,"Condition: fraction == 0, in 
[-16777216 .. 16777216]"
-DoubleOrInteger,-,-,2.2,2.1,2.1,3,0,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-DoubleOrLong,-,-,-,2.1,2.1,4,0,2,,"Condition: fraction == 0, in 
[-9007199254740992..9007199254740992]"
-DoubleOrFloat,-,-,-,-,-,3,0,2,,Condition: no magnitude loss
-Double,-,-,-,-,-,-,0,2,,
-IntegerBigDecimal,3.5,3.4,3.1,3.1,1,3.3,3.2,0,,Condition: fraction == 0; for 
BC we convert rather �bravely� here.
-BigDecimal,4.5,4.4,4.1,4.1,4,3.3,3.2,0,,Condition: fraction != 0; for BC we 
convert rather �bravely� here.
-,,
-,Legend:,
-,,"The numbers are the �price� of the conversion, and they tell how much 
we try to avoid it (when selecting among overloaded methods):"
-,,
-,,0,No conversion,,,
-,,1,Lossless conversion,,,
-,,2,"Up to but excluding 3, lossless but certainly unintended 
conversion.",,,
-,,3,Smaller precision loss in mantissa.,,,
-,,4,Bigger precision loss in mantissa.,,,
-,,-,Magnitude loss or overflow => not allowed,,,
-,,N/A,Doesn't mater (Not Applicable),,,
-,,
-,Notes:,
-,-,"FooOrBar types mean that the argument's type was Foo, but the value also 
fits into the more specific Bar type."
-,,"This possibility should only be utilized as a last resort, to keep the 
method selection stable (always selects the same method) for Foo-s regardless 
of the actual value."
-,,"This is why the column of Bar-s tends to use higher costs than the less 
fitting columns that are, however, also selectable for higher values of type 
Foo."
-,-,"Between same-price conversions the one in the leftmost column (i.e., the 
smallest type) wins. This is realized in the Java code generator."

[09/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
--
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
index c820e6b..09752b3 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
@@ -1,20 +1,20 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 Foo  bar
 Foo  bar  baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
--
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
index 10dd4d0..d044a43 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 Foo  bar baz
 Foo baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
--
diff --git 
a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out 

incubator-freemarker-docgen git commit: We only need the copyright comments in offline mode. Also, Docgen now removes the copyright comment from the beginning of the embedded tracker HTML snippet.

[ddekany]

Repository: incubator-freemarker-docgen
Updated Branches:
  refs/heads/master 99cfc0423 -> d096e24da


We only need the copyright comments in offline mode. Also, Docgen now removes 
the copyright comment from the beginning of the embedded tracker HTML snippet.


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

Branch: refs/heads/master
Commit: d096e24da965a786ac4868cc1d4649bf62a44360
Parents: 99cfc04
Author: ddekany 
Authored: Fri Jan 1 22:14:27 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 22:14:27 2016 +0100

--
 src/main/org/freemarker/docgen/Transform.java   | 49 ++--
 .../docgen/templates/eclipse-toc.ftlx   |  2 +-
 .../org/freemarker/docgen/templates/page.ftlh   |  2 +-
 .../freemarker/docgen/templates/sitemap.ftlx|  2 +-
 .../freemarker/docgen/templates/toc-json.ftl|  2 +-
 5 files changed, 38 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/d096e24d/src/main/org/freemarker/docgen/Transform.java
--
diff --git a/src/main/org/freemarker/docgen/Transform.java 
b/src/main/org/freemarker/docgen/Transform.java
index 5bc998d..7fcdb9f 100644
--- a/src/main/org/freemarker/docgen/Transform.java
+++ b/src/main/org/freemarker/docgen/Transform.java
@@ -380,7 +380,9 @@ import freemarker.template.utility.StringUtil;
  * copyrightHolder (String): Used in the page footer 
copyright notice.
  * copyrightCommentFile (String): The path of a HTML 
file to the text used inside
  * the output files as copyright header comment. If this path is 
relative, it's relative to the source
- * directory.
+ * directory. Currently, the copyright comment is only inserted if the 
{@code offline} mode is {@code true}.
+ * That's because at ASF currently only the documentation files that 
are part of the released archive need
+ * these comments.
  *   
  *
  *   docgen-templates directory:
@@ -1048,6 +1050,19 @@ public final class Transform {
 deployUrl = castSettingToString(cfgFile, settingName, 
settingValue);
 } else if (settingName.equals(SETTING_ONLINE_TRACKER_HTML)) {
 onlineTrackerHTML = getFileContentForSetting(cfgFile, 
settingName, settingValue);
+if (onlineTrackerHTML.startsWith("");
+if (commentEnd != -1) {
+commentEnd += 3;
+String comment = onlineTrackerHTML.substring(0, 
commentEnd);
+if (comment.contains("copyright") || 
comment.contains("Copyright")) {
+onlineTrackerHTML = 
onlineTrackerHTML.substring(commentEnd);
+}
+}
+}
+String eol = TextUtil.detectEOL(onlineTrackerHTML, "\n");
+onlineTrackerHTML = onlineTrackerHTML.trim();
+onlineTrackerHTML += eol;
 } else if 
(settingName.equals(SETTING_REMOVE_NODES_WHEN_ONLINE)) {
 removeNodesWhenOnline = Collections.unmodifiableSet(new 
HashSet(
 castSettingToStringList(cfgFile, settingName, 
settingValue)));
@@ -1802,7 +1817,7 @@ public final class Transform {
 + Transform.class.getPackage().getName());
 }
 
-if (copyrightComment != null && (staticFileName.endsWith(".css") 
|| staticFileName.endsWith(".js"))) {
+if (staticFileName.endsWith(".css") || 
staticFileName.endsWith(".js")) {
 // ISO-8859-1 will be good enough as far as the resource isn't 
UTF-16 or EBCDIC:
 final Charset fileCharset = StandardCharsets.ISO_8859_1;
 String content = FileUtil.loadString(in, fileCharset);
@@ -1823,14 +1838,16 @@ public final class Transform {
 }
 
 // Include an EOL after the comment, if there's any.
-if (commentEnd < content.length()) {
-char c = content.charAt(commentEnd);
-if (c == '\n') {
-commentEnd++;
-} else if (c == '\r') {
-commentEnd++;
-if (commentEnd < content.length() && 
content.charAt(commentEnd) == '\n') {
+

incubator-freemarker-site git commit: Updated Docgen in Ivy repo

[ddekany]

Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/asf-site 5e6fd0db1 -> 5c7db4950


Updated Docgen in Ivy repo


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

Branch: refs/heads/asf-site
Commit: 5c7db49506717c738a51d9ef3485554dcba7e4ed
Parents: 5e6fd0d
Author: ddekany 
Authored: Fri Jan 1 21:16:13 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 21:16:13 2016 +0100

--
 .../docgen/docgen-2.0-branch-head.jar   | Bin 271771 -> 274475 bytes
 .../docgen/docgen-2.0-branch-head.jar.md5   |   2 +-
 .../docgen/docgen-2.0-branch-head.jar.sha1  |   2 +-
 .../docgen/ivy-2.0-branch-head.xml  |   2 +-
 .../docgen/ivy-2.0-branch-head.xml.md5  |   2 +-
 .../docgen/ivy-2.0-branch-head.xml.sha1 |   2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5c7db495/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar
--
diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar 
b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar
index 7cfd677..d054338 100644
Binary files a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar and 
b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar differ

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5c7db495/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5
--
diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 
b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5
index aba5be2..4b3acc1 100644
--- a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5
+++ b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5
@@ -1 +1 @@
-34fbc777a5a1604d6519b944e15bd685
\ No newline at end of file
+022e1e0bf8180f416b1b5b2cec847ea9
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5c7db495/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1
--
diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 
b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1
index 96c5ef9..b00ae2d 100644
--- a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1
+++ b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1
@@ -1 +1 @@
-2a546a0b4738944e861ec52bd6dffc8d3caf6d8c
\ No newline at end of file
+6ded1a0332a5cb31ec0035977502db09c069c33d
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5c7db495/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml
--
diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml 
b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml
index 15dce4d..0ca8229 100644
--- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml
+++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml
@@ -3,7 +3,7 @@
   AFTER CHANGING THIS FILE don't forget to issue: ant update-deps
 -->
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5c7db495/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5
--
diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 
b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5
index aa746d1..66324e7 100644
--- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5
+++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5
@@ -1 +1 @@
-9ad12fbe15ac593acfb31dfdaa057c7d
\ No newline at end of file
+e14c3324043e2183eb0dbfd2e34008f4
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5c7db495/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1
--
diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 
b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1
index cadd6c0..fb2d89f 100644
--- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1
+++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1
@@ -1 +1 @@
-867cda150d414193b5c9ba4886c788f8e11dded6
\ No newline at end of 

incubator-freemarker git commit: Added copyright comment to more expected result files (ast)

[ddekany]

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 
Authored: Fri Jan 1 11:58:26 2016 +0100
Committer: ddekany 
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 

[2/2] incubator-freemarker git commit: Added copyright comment to txt documents

[ddekany]

Added copyright comment to txt documents


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

Branch: refs/heads/2.3-gae
Commit: 545cd6369b2d51c8ff4537b429bc74c56ba3c71b
Parents: 4a38aee
Author: ddekany 
Authored: Fri Jan 1 12:13:51 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 12:13:51 2016 +0100

--
 README.txt   | 19 +++
 src/manual/en_US/docgen-help/editors-readme.txt  | 19 +++
 .../figures/odg-convert-howto.txt| 19 +++
 src/manual/zh_CN/placeholder.txt | 19 +++
 4 files changed, 76 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/545cd636/README.txt
--
diff --git a/README.txt b/README.txt
index f1aafc9..d5cd9e1 100644
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 ===
 
  FreeMarker {version}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/545cd636/src/manual/en_US/docgen-help/editors-readme.txt
--
diff --git a/src/manual/en_US/docgen-help/editors-readme.txt 
b/src/manual/en_US/docgen-help/editors-readme.txt
index 5280d97..d556d12 100644
--- a/src/manual/en_US/docgen-help/editors-readme.txt
+++ b/src/manual/en_US/docgen-help/editors-readme.txt
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+ 
 Guide to FreeMarker Manual for Editors
 ==
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/545cd636/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt
--
diff --git a/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt 
b/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt
index 1db294c..5509678 100644
--- a/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt
+++ b/src/manual/en_US/docgen-originals/figures/odg-convert-howto.txt
@@ -1,3 +1,22 @@
+/*
+ * 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 

[1/2] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)

[ddekany]

Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 7d355e7a6 -> 701b339a5


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
index 54d2f71..5b20799 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/lastcharacter.txt
@@ -1,3 +1,21 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 
 
 FreeMarker: Last Character Test

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
index 1d6cdba..2978827 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list-bis.txt
@@ -1,3 +1,21 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 0: a [0:A, 1:B, 2:C]
 1: b [0:A, 1:B, 2:C]
 2: c [0:A, 1:B, 2:C]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list.txt
--
diff --git a/src/test/resources/freemarker/test/templatesuite/expected/list.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
index 7cdac1e..514cff5 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list.txt
@@ -1,3 +1,21 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+  
+http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 Size: 4
 Items: @0 aardvark, @1 bear, @2 cat, @3 dog.
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/701b339a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
index 0fe498d..361f786 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
@@ 

[2/2] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)

[ddekany]

Added copyright comment to expected result files (txt or out)


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

Branch: refs/heads/2.3-gae
Commit: 701b339a5f519c1ead0e6892fdc212e6bd9ae035
Parents: 7d355e7
Author: ddekany 
Authored: Fri Jan 1 11:21:29 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 11:21:29 2016 +0100

--
 src/test/java/freemarker/core/ASTTest.java   |   2 +-
 .../java/freemarker/core/CanonicalFormTest.java  |   6 +-
 .../CopyrightCommentRemoverTemplateLoader.java   |   2 +-
 src/test/java/freemarker/test/TemplateTest.java  |   2 +-
 src/test/java/freemarker/test/TestUtil.java  |   2 +-
 .../freemarker/test/servlet/WebAppTestCase.java  |   3 ++-
 .../freemarker/test/utility/FileTestCase.java|   3 ++-
 .../basic/WEB-INF/expected/attributes-2.3.0.txt  |  18 ++
 .../expected/attributes-2.3.22-future.txt|  18 ++
 .../basic/WEB-INF/expected/attributes.txt|  18 ++
 .../basic/WEB-INF/expected/customTags1.txt   |  18 ++
 .../WEB-INF/expected/subdir/test-rel.txt |  18 ++
 .../WEB-INF/expected/test-noClasspath.txt|  18 ++
 .../tldDiscovery/WEB-INF/expected/test1.txt  |  18 ++
 .../manual/AutoEscapingExample-capture.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-convert.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-convert2.ftl.out  |  18 ++
 .../manual/AutoEscapingExample-infoBox.ftlh.out  |  18 ++
 .../manual/AutoEscapingExample-markup.ftlh.out   |  18 ++
 .../AutoEscapingExample-stringConcat.ftlh.out|  18 ++
 .../AutoEscapingExample-stringLiteral.ftlh.out   |  18 ++
 .../AutoEscapingExample-stringLiteral2.ftlh.out  |  18 ++
 .../manual/CustomFormatsExample-alias1.ftlh.out  |  18 ++
 .../manual/CustomFormatsExample-alias2.ftlh.out  |  18 ++
 .../CustomFormatsExample-modelAware.ftlh.out |  18 ++
 .../test/templatesuite/expected/arithmetic.txt   |  18 ++
 .../test/templatesuite/expected/bean-maps.txt|  18 ++
 .../test/templatesuite/expected/beans.txt|  18 ++
 .../expected/boolean-formatting.txt  |  18 ++
 .../test/templatesuite/expected/boolean.txt  |  18 ++
 .../templatesuite/expected/charset-in-header.txt |  18 ++
 .../expected/classic-compatible.txt  |  18 ++
 .../test/templatesuite/expected/comment.txt  |  18 ++
 .../test/templatesuite/expected/comparisons.txt  |  18 ++
 .../test/templatesuite/expected/compress.txt |  18 ++
 .../templatesuite/expected/dateformat-java.txt   |  18 ++
 .../templatesuite/expected/default-xmlns.txt |  18 ++
 .../test/templatesuite/expected/default.txt  |  18 ++
 .../expected/encoding-builtins-ici-2.3.20.txt|  18 ++
 .../templatesuite/expected/encoding-builtins.txt |  18 ++
 .../test/templatesuite/expected/escapes.txt  |  18 ++
 .../test/templatesuite/expected/exception.txt|  18 ++
 .../test/templatesuite/expected/exception2.txt   |  18 ++
 .../test/templatesuite/expected/exception3.txt   |  18 ++
 .../test/templatesuite/expected/exthash.txt  |  18 ++
 .../test/templatesuite/expected/hashconcat.txt   |  18 ++
 .../test/templatesuite/expected/hashliteral.txt  |  18 ++
 .../test/templatesuite/expected/helloworld.txt   |  18 ++
 .../expected/identifier-escaping.txt |  18 ++
 .../expected/identifier-non-ascii.txt|  18 ++
 .../test/templatesuite/expected/if.txt   |  18 ++
 .../test/templatesuite/expected/import.txt   |  18 ++
 .../test/templatesuite/expected/include.txt  |  18 ++
 .../test/templatesuite/expected/include2.txt |  18 ++
 .../test/templatesuite/expected/interpret.txt|  18 ++
 .../test/templatesuite/expected/iterators.txt|  18 ++
 .../templatesuite/expected/lastcharacter.txt |  18 ++
 .../test/templatesuite/expected/list-bis.txt |  18 ++
 .../test/templatesuite/expected/list.txt   

[4/6] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
--
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
index c820e6b..09752b3 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral.ftlh.out
@@ -1,20 +1,20 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 Foo  bar
 Foo  bar  baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
--
diff --git 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
index 10dd4d0..d044a43 100644
--- 
a/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
+++ 
b/src/test/resources/freemarker/manual/AutoEscapingExample-stringLiteral2.ftlh.out
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 Foo  bar baz
 Foo baz
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out
--
diff --git 
a/src/test/resources/freemarker/manual/CustomFormatsExample-alias1.ftlh.out 

[3/6] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
index 361f786..52f49f0 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list2.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 === [aardvark, bear, cat, dog] ===
 
 -- List+sep:

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
index 4a4f632..5641694 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/list3.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 [
 [(11@0, 11@0), (11@0, 22@1), (11@0, 33@2)],
 [(22@1, 11@0), (22@1, 22@1), (22@1, 33@2)],

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/listliteral.txt
index a7f832c..84fc384 100644
--- 

[1/6] incubator-freemarker git commit: NOTICE year update

[ddekany]

Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 545cd6369 -> 85f52ffcc


NOTICE year update


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

Branch: refs/heads/2.3-gae
Commit: ef6b4d112ba8a87b360a00aa8d2caeeb166c6077
Parents: 545cd63
Author: ddekany 
Authored: Fri Jan 1 12:32:03 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 12:32:03 2016 +0100

--
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ef6b4d11/NOTICE
--
diff --git a/NOTICE b/NOTICE
index c3987d6..62a65c0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache FreeMarker
-Copyright 2015 The Apache Software Foundation
+Copyright 2015-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

[5/6] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

Replaced txt/out/ast copyright comments with Java-style comments


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

Branch: refs/heads/2.3-gae
Commit: a64f13674dd496a5175d6b8e1f134ae4fd55dd6d
Parents: ef6b4d1
Author: ddekany 
Authored: Fri Jan 1 12:34:37 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 13:11:29 2016 +0100

--
 src/test/java/freemarker/core/ASTTest.java  |   6 +--
 .../java/freemarker/core/CanonicalFormTest.java |   5 +--
 src/test/java/freemarker/test/TemplateTest.java |   2 +-
 src/test/java/freemarker/test/TestUtil.java |  34 ++
 .../freemarker/test/servlet/WebAppTestCase.java |   2 +-
 .../freemarker/test/utility/FileTestCase.java   |   2 +-
 src/test/resources/freemarker/core/ast-1.ast|  36 +++
 .../freemarker/core/ast-assignments.ast |  36 +++
 .../resources/freemarker/core/ast-builtins.ast  |  36 +++
 .../resources/freemarker/core/ast-locations.ast |  36 +++
 .../core/ast-mixedcontentsimplifications.ast|  36 +++
 .../core/ast-multipleignoredchildren.ast|  36 +++
 .../core/ast-nestedignoredchildren.ast  |  36 +++
 .../resources/freemarker/core/ast-range.ast |  36 +++
 .../freemarker/core/ast-strlitinterpolation.ast |  36 +++
 .../freemarker/core/ast-whitespacestripping.ast |  36 +++
 .../core/cano-assignments-canonical.ftl |  34 --
 .../freemarker/core/cano-assignments.ftl.out|  34 ++
 .../freemarker/core/cano-builtins-canonical.ftl |  22 --
 .../freemarker/core/cano-builtins.ftl.out   |  23 ++
 .../core/cano-identifier-escaping-canonical.ftl |  43 --
 .../core/cano-identifier-escaping.ftl.out   |  44 +++
 .../freemarker/core/cano-macros-canonical.ftl   |  28 
 .../freemarker/core/cano-macros.ftl.out |  28 
 .../core/cano-strlitinterpolation-canonical.ftl |  18 
 .../core/cano-strlitinterpolation.ftl.out   |  19 
 .../basic/WEB-INF/expected/attributes-2.3.0.txt |  36 +++
 .../expected/attributes-2.3.22-future.txt   |  36 +++
 .../basic/WEB-INF/expected/attributes.txt   |  36 +++
 .../basic/WEB-INF/expected/customTags1.txt  |  36 +++
 .../WEB-INF/expected/subdir/test-rel.txt|  36 +++
 .../WEB-INF/expected/test-noClasspath.txt   |  36 +++
 .../tldDiscovery/WEB-INF/expected/test1.txt |  36 +++
 .../manual/AutoEscapingExample-capture.ftlh.out |  36 +++
 .../manual/AutoEscapingExample-convert.ftlh.out |  36 +++
 .../manual/AutoEscapingExample-convert2.ftl.out |  36 +++
 .../manual/AutoEscapingExample-infoBox.ftlh.out |  36 +++
 .../manual/AutoEscapingExample-markup.ftlh.out  |  36 +++
 .../AutoEscapingExample-stringConcat.ftlh.out   |  36 +++
 .../AutoEscapingExample-stringLiteral.ftlh.out  |  36 +++
 .../AutoEscapingExample-stringLiteral2.ftlh.out |  36 +++
 .../manual/CustomFormatsExample-alias1.ftlh.out |  36 +++
 .../manual/CustomFormatsExample-alias2.ftlh.out |  36 +++
 .../CustomFormatsExample-modelAware.ftlh.out|  36 +++
 .../test/templatesuite/expected/arithmetic.txt  |  36 +++
 .../test/templatesuite/expected/bean-maps.txt   |  36 +++
 .../test/templatesuite/expected/beans.txt   |  36 +++
 .../expected/boolean-formatting.txt |  36 +++
 .../test/templatesuite/expected/boolean.txt |  36 +++
 .../expected/charset-in-header.txt  |  36 +++
 .../expected/classic-compatible.txt |  36 +++
 .../test/templatesuite/expected/comment.txt |  36 +++
 .../test/templatesuite/expected/comparisons.txt |  36 +++
 .../test/templatesuite/expected/compress.txt|  36 +++
 .../templatesuite/expected/dateformat-java.txt  |  36 +++
 .../templatesuite/expected/default-xmlns.txt|  36 +++
 .../test/templatesuite/expected/default.txt |  36 +++
 .../expected/encoding-builtins-ici-2.3.20.txt   |  36 +++
 .../expected/encoding-builtins.txt  |  36 +++
 .../test/templatesuite/expected/escapes.txt |  36 +++
 .../test/templatesuite/expected/exception.txt   |  36 +++
 

[2/6] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments

[ddekany]

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt 
b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
index f0f4809..916a32c 100644
--- a/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
+++ b/src/test/resources/freemarker/test/templatesuite/expected/transforms.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 
 FreeMarker: Transformation Test

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
index 07a1364..0554864 100644
--- 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
+++ 
b/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.21.txt
@@ -1,21 +1,21 @@
-<#--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 StNuBoMeTaMaHaHxSeCoCxEnInDiNo
 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a64f1367/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
--
diff --git 
a/src/test/resources/freemarker/test/templatesuite/expected/type-builtins-ici-2.3.24.txt
 

[1/2] incubator-freemarker git commit: Remove re-generatble csv as it's not possible to add copyright comments to it.

[ddekany]

Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 85f52ffcc -> c52561aaa


Remove re-generatble csv as it's not possible to add copyright comments to it.


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

Branch: refs/heads/2.3-gae
Commit: 2a567e30cac12229bcbfd230d251d5a9473f2011
Parents: 85f52ff
Author: ddekany 
Authored: Fri Jan 1 13:20:12 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 13:20:12 2016 +0100

--
 src/main/misc/overloadedNumberRules/prices.csv | 48 -
 1 file changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2a567e30/src/main/misc/overloadedNumberRules/prices.csv
--
diff --git a/src/main/misc/overloadedNumberRules/prices.csv 
b/src/main/misc/overloadedNumberRules/prices.csv
deleted file mode 100644
index c12d7ba..000
--- a/src/main/misc/overloadedNumberRules/prices.csv
+++ /dev/null
@@ -1,48 +0,0 @@
-,Byte,Short,Integer,Long,BigInteger,Float,Double,BigDecimal,,Note
-Byte,0,1,1,1,1,2,2,2,,
-ShortOrByte,2.1,0,1,1,1,2,2,2,,
-Short,-,0,1,1,1,2,2,2,,
-IntegerOrByte,2.2,2.1,0,1,1,2.4,2,2,,
-IntegerOrShort,-,2.1,0,1,1,2.4,2,2,,
-Integer,-,-,0,1,1,3,2,2,,
-LongOrByte,2.3,2.2,2.1,0,1,2.4,2.1,2,,
-LongOrShort,-,2.2,2.1,0,1,2.4,2.1,2,,
-LongOrInteger,-,-,2.1,0,1,3,2.1,2,,
-Long,-,-,-,0,1,4,3,2,,
-BigIntegerOrByte,1.8,1.7,1.6,1.5,0,2.4,2,1,,
-BigIntegerOrShort,-,1.7,1.6,1.5,0,2.4,2,1,,
-BigIntegerOrInteger,-,-,1.6,1.5,0,3,2,1,,
-BigIntegerOrLong,-,-,-,1.5,0,4,3,1,,
-BigIntegerOrFloat,N/A,N/A,N/A,N/A,0,2.4,2,1,,"Condition: No whole-number 
target types exist, and abs(value) <= 2**24"
-BigIntegerOrDouble,N/A,N/A,N/A,N/A,0,4,2,1,,"Condition: No whole-number target 
types exist, and abs(value) <= 2**53"
-BigInteger,-,-,-,-,0,-,-,1,,
-FloatOrByte,2.3,2.2,2.1,2.1,2.5,0,1,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-FloatOrShort,-,2.2,2.1,2.1,2.5,0,1,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-FloatOrInteger,-,-,2.1,2.1,2.5,0,1,2,,"Condition: fraction == 0, in [-16777216 
.. 16777216]"
-Float,-,-,-,-,-,0,1,2,,
-DoubleOrByte,2.5,2.4,2.2,2.1,2.1,2.3,0,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-DoubleOrShort,-,2.4,2.2,2.1,2.1,2.3,0,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-DoubleOrIntegerOrFloat,-,-,2.2,2.1,2.1,2.3,0,2,,"Condition: fraction == 0, in 
[-16777216 .. 16777216]"
-DoubleOrInteger,-,-,2.2,2.1,2.1,3,0,2,,"Condition: fraction == 0, in 
[T.MIN_VALUE .. T.MAX_VALUE]"
-DoubleOrLong,-,-,-,2.1,2.1,4,0,2,,"Condition: fraction == 0, in 
[-9007199254740992..9007199254740992]"
-DoubleOrFloat,-,-,-,-,-,3,0,2,,Condition: no magnitude loss
-Double,-,-,-,-,-,-,0,2,,
-IntegerBigDecimal,3.5,3.4,3.1,3.1,1,3.3,3.2,0,,Condition: fraction == 0; for 
BC we convert rather �bravely� here.
-BigDecimal,4.5,4.4,4.1,4.1,4,3.3,3.2,0,,Condition: fraction != 0; for BC we 
convert rather �bravely� here.
-,,
-,Legend:,
-,,"The numbers are the �price� of the conversion, and they tell how much 
we try to avoid it (when selecting among overloaded methods):"
-,,
-,,0,No conversion,,,
-,,1,Lossless conversion,,,
-,,2,"Up to but excluding 3, lossless but certainly unintended 
conversion.",,,
-,,3,Smaller precision loss in mantissa.,,,
-,,4,Bigger precision loss in mantissa.,,,
-,,-,Magnitude loss or overflow => not allowed,,,
-,,N/A,Doesn't mater (Not Applicable),,,
-,,
-,Notes:,
-,-,"FooOrBar types mean that the argument's type was Foo, but the value also 
fits into the more specific Bar type."
-,,"This possibility should only be utilized as a last resort, to keep the 
method selection stable (always selects the same method) for Foo-s regardless 
of the actual value."
-,,"This is why the column of Bar-s tends to use higher costs than the less 
fitting columns that are, however, also selectable for higher values of type 
Foo."
-,-,"Between same-price conversions the one in the leftmost column (i.e., the 
smallest type) wins. This is realized in the Java code generator."

incubator-freemarker-site git commit: Updated Docgen in Ivy repo

[ddekany]

Repository: incubator-freemarker-site
Updated Branches:
  refs/heads/asf-site 16b8b0614 -> 5e6fd0db1


Updated Docgen in Ivy repo


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

Branch: refs/heads/asf-site
Commit: 5e6fd0db143721a0933eaa2b86be5070c45d03c7
Parents: 16b8b06
Author: ddekany 
Authored: Fri Jan 1 20:30:06 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 20:30:06 2016 +0100

--
 .../docgen/docgen-2.0-branch-head.jar   | Bin 269168 -> 271771 bytes
 .../docgen/docgen-2.0-branch-head.jar.md5   |   2 +-
 .../docgen/docgen-2.0-branch-head.jar.sha1  |   2 +-
 .../docgen/ivy-2.0-branch-head.xml  |   2 +-
 .../docgen/ivy-2.0-branch-head.xml.md5  |   2 +-
 .../docgen/ivy-2.0-branch-head.xml.sha1 |   2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5e6fd0db/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar
--
diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar 
b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar
index 825d7dc..7cfd677 100644
Binary files a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar and 
b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar differ

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5e6fd0db/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5
--
diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5 
b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5
index bfd65ac..aba5be2 100644
--- a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5
+++ b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.md5
@@ -1 +1 @@
-c2354de0669819e0b3618bb2ad3175dd
\ No newline at end of file
+34fbc777a5a1604d6519b944e15bd685
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5e6fd0db/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1
--
diff --git a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1 
b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1
index 9b15bd2..96c5ef9 100644
--- a/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1
+++ b/repos/ivy/org.freemarker/docgen/docgen-2.0-branch-head.jar.sha1
@@ -1 +1 @@
-6496ff6baaa5cfcc662d43daedec6680a4eb9e29
\ No newline at end of file
+2a546a0b4738944e861ec52bd6dffc8d3caf6d8c
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5e6fd0db/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml
--
diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml 
b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml
index 71e4e0e..15dce4d 100644
--- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml
+++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml
@@ -3,7 +3,7 @@
   AFTER CHANGING THIS FILE don't forget to issue: ant update-deps
 -->
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5e6fd0db/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5
--
diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5 
b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5
index d4ec440..aa746d1 100644
--- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5
+++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.md5
@@ -1 +1 @@
-2f1d801f1737b0a993f6e68c012a5518
\ No newline at end of file
+9ad12fbe15ac593acfb31dfdaa057c7d
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5e6fd0db/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1
--
diff --git a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1 
b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1
index 408b717..cadd6c0 100644
--- a/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1
+++ b/repos/ivy/org.freemarker/docgen/ivy-2.0-branch-head.xml.sha1
@@ -1 +1 @@
-55a23cb7d9294d1f667771fe316c727cb7e2d1b8
\ No newline at end of 

[3/3] incubator-freemarker git commit: Added copyright header to Manual output, also fixed copyright in the footer.

[ddekany]

Added copyright header to Manual output, also fixed copyright in the footer.


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

Branch: refs/heads/2.3-gae
Commit: f310e855bb0d291e7181fba26baba7e3be3b5a94
Parents: 22e5fdd
Author: ddekany 
Authored: Fri Jan 1 20:35:47 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 20:35:47 2016 +0100

--
 src/manual/en_US/docgen-misc/copyrightComment.txt | 16 
 src/manual/en_US/docgen.cjson |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f310e855/src/manual/en_US/docgen-misc/copyrightComment.txt
--
diff --git a/src/manual/en_US/docgen-misc/copyrightComment.txt 
b/src/manual/en_US/docgen-misc/copyrightComment.txt
new file mode 100644
index 000..60b675e
--- /dev/null
+++ b/src/manual/en_US/docgen-misc/copyrightComment.txt
@@ -0,0 +1,16 @@
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f310e855/src/manual/en_US/docgen.cjson
--
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 786ec8c..424f703 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -33,8 +33,9 @@ generateEclipseTOC
 
 removeNodesWhenOnline: [ "preface" ]
 
-copyrightHolder: "The FreeMarker Project"
+copyrightHolder: "The Apache Software Foundation"
 copyrightStartYear: 1999
+copyrightCommentFile: "docgen-misc/copyrightComment.txt"
 
 seoMeta: {
   "dgui_quickstart": {

[2/3] incubator-freemarker git commit: (JavaDoc adjustment)

[ddekany]

(JavaDoc adjustment)


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

Branch: refs/heads/2.3-gae
Commit: 22e5fddfc39a064454d219702328d8c9d9ed9724
Parents: 48f7b87
Author: ddekany 
Authored: Fri Jan 1 20:34:44 2016 +0100
Committer: ddekany 
Committed: Fri Jan 1 20:34:44 2016 +0100

--
 src/main/java/freemarker/template/utility/StringUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/22e5fddf/src/main/java/freemarker/template/utility/StringUtil.java
--
diff --git a/src/main/java/freemarker/template/utility/StringUtil.java 
b/src/main/java/freemarker/template/utility/StringUtil.java
index 973c1f4..58d5ffb 100644
--- a/src/main/java/freemarker/template/utility/StringUtil.java
+++ b/src/main/java/freemarker/template/utility/StringUtil.java
@@ -823,7 +823,7 @@ public class StringUtil {
 }
 
 /**
- * Removes the line-break from the end of the string.
+ * Removes a line-break from the end of the string (if there's any).
  */
 public static String chomp(String s) {
 if (s.endsWith("\r\n")) return s.substring(0, s.length() - 2);