incubator-freemarker-docgen git commit: (Prevent automatic copyright replacement in concated Gulp files.)
Repository: incubator-freemarker-docgen
Updated Branches:
refs/heads/master cf47ce8cc -> 0b89e0fd9
(Prevent automatic copyright replacement in concated Gulp 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/0b89e0fd
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/0b89e0fd
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/0b89e0fd
Branch: refs/heads/master
Commit: 0b89e0fd956090206dc6480985abe50bb4f97fa9
Parents: cf47ce8
Author: ddekany
Authored: Sat Jan 2 02:32:44 2016 +0100
Committer: ddekany
Committed: Sat Jan 2 02:32:44 2016 +0100
--
gulpfile.js | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/0b89e0fd/gulpfile.js
--
diff --git a/gulpfile.js b/gulpfile.js
index bf51a8b..405c6be 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -19,6 +19,7 @@ var copyrightHeader = fs.readFileSync(path.join(__dirname,
'gulp-output-copyrigh
var doNotEditHeader = "/*\n"
+ " * GENERATED WITH GULP - DO NOT EDIT!\n"
+ " * Any copyright headers below are coming from the source files
from which this file was generated.\n"
++ " * <#DO_NOT_UPDATE_COPYRIGHT>\n"
+ " */\n\n"
gulp.task('styles', function() {
incubator-freemarker-docgen git commit: Added license information about the DocBook 5 RELAX NG schema.
Repository: incubator-freemarker-docgen Updated Branches: refs/heads/master a18b4f1a6 -> cf47ce8cc Added license information about the DocBook 5 RELAX NG schema. 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/cf47ce8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/cf47ce8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/cf47ce8c Branch: refs/heads/master Commit: cf47ce8cc49d966579fe7a5613c63683af183d09 Parents: a18b4f1 Author: ddekany Authored: Sat Jan 2 02:23:05 2016 +0100 Committer: ddekany Committed: Sat Jan 2 02:23:05 2016 +0100 -- LICENSE-DOCBOOK-RNG | 24 NOTICE | 9 + 2 files changed, 33 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/cf47ce8c/LICENSE-DOCBOOK-RNG -- diff --git a/LICENSE-DOCBOOK-RNG b/LICENSE-DOCBOOK-RNG new file mode 100644 index 000..06c16fe --- /dev/null +++ b/LICENSE-DOCBOOK-RNG @@ -0,0 +1,24 @@ +Copyright 1992-2008 HaL Computer Systems, Inc., +O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software +Corporation, Norman Walsh, Sun Microsystems, Inc., and the +Organization for the Advancement of Structured Information +Standards (OASIS). + +Release: $Id: docbook.rnc 7661 2008-02-06 13:52:59Z nwalsh $ + +Permission to use, copy, modify and distribute the DocBook schema +and its accompanying documentation for any purpose and without fee +is hereby granted in perpetuity, provided that the above copyright +notice and this paragraph appear in all copies. The copyright +holders make no representation about the suitability of the schema +for any purpose. It is provided "as is" without expressed or implied +warranty. + +If you modify the DocBook schema in any way, label your schema as a +variant of DocBook. See the reference documentation +(http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) +for more information. + +Please direct all questions, bug reports, or suggestions for changes +to the docb...@lists.oasis-open.org mailing list. For more +information, see http://www.oasis-open.org/docbook/. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/cf47ce8c/NOTICE -- diff --git a/NOTICE b/NOTICE index cea738e..dfbb5d3 100644 --- a/NOTICE +++ b/NOTICE @@ -28,3 +28,12 @@ Creative Common Attribution 4.0 International License (CC-BY 4.0) (https://creativecommons.org/licenses/by/4.0/). = + +This product includes the DocBook V5.0 RELAX NG schema, Copyright +1992-2008 HaL Computer Systems, Inc., O'Reilly & Associates, Inc., +ArborText, Inc., Fujitsu Software Corporation, Norman Walsh, Sun +Microsystems, Inc., and the Organization for the Advancement of +Structured Information Standards (OASIS). See license details in the +LICENSE-DOCBOOK-RNG file. + +=
[1/4] incubator-freemarker-docgen git commit: Removed unused XSD files.
Repository: incubator-freemarker-docgen Updated Branches: refs/heads/master 0fa9cbe37 -> a18b4f1a6 http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/115ca1e9/src/main/org/freemarker/docgen/schema/xlink.xsd -- diff --git a/src/main/org/freemarker/docgen/schema/xlink.xsd b/src/main/org/freemarker/docgen/schema/xlink.xsd deleted file mode 100644 index ff9a7c1..000 --- a/src/main/org/freemarker/docgen/schema/xlink.xsd +++ /dev/null @@ -1,32 +0,0 @@ - -http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified" targetNamespace="http://www.w3.org/1999/xlink"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:docbook="http://docbook.org/ns/docbook";> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/115ca1e9/src/main/org/freemarker/docgen/schema/xml.xsd -- diff --git a/src/main/org/freemarker/docgen/schema/xml.xsd b/src/main/org/freemarker/docgen/schema/xml.xsd deleted file mode 100644 index c6e9c46..000 --- a/src/main/org/freemarker/docgen/schema/xml.xsd +++ /dev/null @@ -1,13 +0,0 @@ - -http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified" targetNamespace="http://www.w3.org/XML/1998/namespace"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:docbook="http://docbook.org/ns/docbook";> - - - - - - - - - - -
[3/4] incubator-freemarker-docgen git commit: Removed unused XSD files.
Removed unused XSD 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/115ca1e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/115ca1e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/115ca1e9 Branch: refs/heads/master Commit: 115ca1e9ce652eceb6655ab0ef1c2e705bc00447 Parents: 0fa9cbe Author: ddekany Authored: Sat Jan 2 02:09:38 2016 +0100 Committer: ddekany Committed: Sat Jan 2 02:09:38 2016 +0100 -- .../org/freemarker/docgen/schema/docbook.xsd| 17458 - src/main/org/freemarker/docgen/schema/xlink.xsd |32 - src/main/org/freemarker/docgen/schema/xml.xsd |13 - 3 files changed, 17503 deletions(-) --
[2/4] incubator-freemarker-docgen git commit: Removed unused XSD files.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/115ca1e9/src/main/org/freemarker/docgen/schema/docbook.xsd -- diff --git a/src/main/org/freemarker/docgen/schema/docbook.xsd b/src/main/org/freemarker/docgen/schema/docbook.xsd deleted file mode 100644 index 42b9b0e..000 --- a/src/main/org/freemarker/docgen/schema/docbook.xsd +++ /dev/null @@ -1,17458 +0,0 @@ - -http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified" targetNamespace="http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:docbook="http://docbook.org/ns/docbook";> - http://www.w3.org/1999/xlink"; schemaLocation="xlink.xsd"/> - http://www.w3.org/XML/1998/namespace"; schemaLocation="xml.xsd"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[4/4] incubator-freemarker-docgen git commit: We can't have the non-minified Gulp-concatenated files in the output, unless the license header issues will be fixed.
We can't have the non-minified Gulp-concatenated files in the output, unless
the license header issues will be fixed.
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/a18b4f1a
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/a18b4f1a
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/a18b4f1a
Branch: refs/heads/master
Commit: a18b4f1a65a4cd6102b9853bdf904ce008ae3816
Parents: 115ca1e
Author: ddekany
Authored: Sat Jan 2 02:11:04 2016 +0100
Committer: ddekany
Committed: Sat Jan 2 02:11:04 2016 +0100
--
gulpfile.js | 5 -
src/main/org/freemarker/docgen/Transform.java | 2 --
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/a18b4f1a/gulpfile.js
--
diff --git a/gulpfile.js b/gulpfile.js
index 0c108de..bf51a8b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -16,7 +16,10 @@ var BASE_DIR = path.join(__dirname, 'src', 'main', 'org',
'freemarker', 'docgen'
var OUT_DIR = path.join(BASE_DIR, 'statics');
var copyrightHeader = fs.readFileSync(path.join(__dirname,
'gulp-output-copyright-header.txt'));
-var doNotEditHeader = "/* GENERATED WITH GULP - DO NOT EDIT! */\n\n"
+var doNotEditHeader = "/*\n"
++ " * GENERATED WITH GULP - DO NOT EDIT!\n"
++ " * Any copyright headers below are coming from the source files
from which this file was generated.\n"
++ " */\n\n"
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/a18b4f1a/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 7fcdb9f..5dc1d6f 100644
--- a/src/main/org/freemarker/docgen/Transform.java
+++ b/src/main/org/freemarker/docgen/Transform.java
@@ -1499,7 +1499,6 @@ public final class Transform {
// - Copy the standard statics:
logger.info("Copying common static files...");
-copyCommonStatic("docgen.css");
copyCommonStatic("docgen.min.css");
copyCommonStatic("img/patterned-bg.png");
@@ -1517,7 +1516,6 @@ public final class Transform {
copyCommonStatic("img/xxe.png");
}
if (!disableJavaScript) {
- copyCommonStatic("main.js");
copyCommonStatic("main.min.js");
}
[05/19] incubator-freemarker git commit: Added copyright comment to txt documents
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/master
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 permissions and limitations
+ * under the License
[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
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/master
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 haven't yet, download the source rele
[16/19] incubator-freemarker git commit: Added copyright header to Manual output, also fixed copyright in the footer.
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": {
[17/19] incubator-freemarker git commit: (Broken Manual link)
(Broken Manual link)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a94e78cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a94e78cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a94e78cf
Branch: refs/heads/master
Commit: a94e78cf98296292af1e13d2fc91802cc5a9ce37
Parents: f310e85
Author: ddekany
Authored: Fri Jan 1 22:24:52 2016 +0100
Committer: ddekany
Committed: Fri Jan 1 22:24:52 2016 +0100
--
src/manual/en_US/docgen.cjson | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a94e78cf/src/manual/en_US/docgen.cjson
--
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 424f703..22ea74f 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -60,7 +60,7 @@ olinks: {
freemarkerdownload: "http://freemarker.org/freemarkerdownload.html";
contribute: "http://freemarker.org/contribute.html";
history: "http://freemarker.org/history.html";
- what-is-freemarker: "id:preface"
+ what-is-freemarker: "http://freemarker.org/";
mailing-lists: "http://freemarker.org/mailing-lists.html";
// External URL-s:
[12/19] incubator-freemarker git commit: Remove re-generatble csv as it's not possible to add copyright comments to it.
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/master 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."
[14/19] incubator-freemarker git commit: Added copyright comment to the TLD-s inside the test jar-s
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/2.3 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
[09/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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 b/src/test/resources/freemarker/manual/C
[14/19] incubator-freemarker git commit: Added copyright comment to the TLD-s inside the test jar-s
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
[10/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
Replaced txt/out/ast copyright comments with Java-style comments Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a64f1367 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a64f1367 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a64f1367 Branch: refs/heads/master Commit: a64f13674dd496a5175d6b8e1f134ae4fd55dd6d Parents: ef6b4d1 Author: ddekany 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 | 36 +++ .../test/templat
[07/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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
[05/19] incubator-freemarker git commit: Added copyright comment to txt documents
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
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 permissions and limitations
+ * under the License.
+
[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
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 haven't yet, download the source release
[06/19] incubator-freemarker git commit: NOTICE year update
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/master 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/).
[01/19] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)
Repository: incubator-freemarker Updated Branches: refs/heads/master e8fdf5372 -> c62096801 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
[01/19] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)
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 +1,
[02/19] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)
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 | 18 ++ .../test/templat
[10/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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 | 36 +++ .../test/templatesu
[12/19] incubator-freemarker git commit: Remove re-generatble csv as it's not possible to add copyright comments to it.
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
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 b/src/test/resources/freemarker/manual/C
[08/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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 --- a/src/test/resourc
[13/19] incubator-freemarker git commit: Added copyright comment to the TLD-s inside the test jar-s
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/master 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
[19/19] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae'
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 ++ .../manual/CustomFormatsExample-alias1
[13/19] incubator-freemarker git commit: Added copyright comment to the TLD-s inside the test jar-s
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
[19/19] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Merge remote-tracking branch 'origin/2.3-gae' into 2.3 Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/5377aade Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/5377aade Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/5377aade Branch: refs/heads/2.3 Commit: 5377aadec284ef4a9360c2313147b4de297c3a0e Parents: ec24a42 64f2cd1 Author: ddekany Authored: Sat Jan 2 01:43:36 2016 +0100 Committer: ddekany Committed: Sat Jan 2 01:43:36 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/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 ++ .../manual/CustomFormatsExample-alias1.ftlh.out | 18 ++ .../manual/CustomFormatsExample-
[07/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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
[02/19] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)
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 | 18 ++ .../test/temp
[15/19] incubator-freemarker git commit: (JavaDoc adjustment)
(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)
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/master 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 information + regarding copyright ownership
[03/19] incubator-freemarker git commit: Added copyright comment to more expected result files (ast)
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 information + regarding copyright ownership.
[04/19] incubator-freemarker git commit: Added copyright comment to UnsafeMethods "database"
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()
+
+java.lang.ThreadGroup.allowThreadSuspension(boolean)
+java
[06/19] incubator-freemarker git commit: NOTICE year update
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/).
[08/19] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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 --- a/src/test/resourc
[04/19] incubator-freemarker git commit: Added copyright comment to UnsafeMethods "database"
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/2.3
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()
+
+java.lang.ThreadGroup.allowThreadSuspension(boolean)
+java.la
[16/19] incubator-freemarker git commit: Added copyright header to Manual output, also fixed copyright in the footer.
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/master
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": {
[15/19] incubator-freemarker git commit: (JavaDoc adjustment)
(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
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).
[17/19] incubator-freemarker git commit: (Broken Manual link)
(Broken Manual link)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a94e78cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a94e78cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a94e78cf
Branch: refs/heads/2.3
Commit: a94e78cf98296292af1e13d2fc91802cc5a9ce37
Parents: f310e85
Author: ddekany
Authored: Fri Jan 1 22:24:52 2016 +0100
Committer: ddekany
Committed: Fri Jan 1 22:24:52 2016 +0100
--
src/manual/en_US/docgen.cjson | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a94e78cf/src/manual/en_US/docgen.cjson
--
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 424f703..22ea74f 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -60,7 +60,7 @@ olinks: {
freemarkerdownload: "http://freemarker.org/freemarkerdownload.html";
contribute: "http://freemarker.org/contribute.html";
history: "http://freemarker.org/history.html";
- what-is-freemarker: "id:preface"
+ what-is-freemarker: "http://freemarker.org/";
mailing-lists: "http://freemarker.org/mailing-lists.html";
// External URL-s:
[11/19] incubator-freemarker git commit: Added copyright comment to some more txt documents
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/master 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).
[2/2] incubator-freemarker-docgen git commit: Added missing copyright headers to many files.
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 -- diff --git a/gulp-output-copyrigh
[1/2] incubator-freemarker-docgen git commit: Moved gulp-output-header.txt to its proper place.
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!
- */
incubator-freemarker-site git commit: Added missing copyright comments.
Repository: incubator-freemarker-site Updated Branches: refs/heads/master 8c339eef4 -> e934e478f Added missing copyright comments. 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/e934e478 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/e934e478 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/e934e478 Branch: refs/heads/master Commit: e934e478f551bbd800df9bd94b89bddb36bf8f5e Parents: 8c339ee Author: ddekany Authored: Sat Jan 2 01:21:00 2016 +0100 Committer: ddekany Committed: Sat Jan 2 01:21:00 2016 +0100 -- README | 32 README.txt | 12 build.xml | 18 +++ src/main/docgen/book.xml| 18 +++ .../docgen/docgen-misc/googleAnalytics.html | 5 +++ src/main/docgen/docgen.cjson| 17 +++ src/main/docgen/sitemap-index.xml | 18 +++ 7 files changed, 108 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/README -- diff --git a/README b/README new file mode 100644 index 000..05741f8 --- /dev/null +++ b/README @@ -0,0 +1,32 @@ +/* + * 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 Site +-- + +This is the project with which we generate the freemarker.org home page. +Note that most of the work is done by Apache FreeMarker Docgen, which is +a dependency of this project. + +To publish the built site, comit the output into the "asf-site" branch. + +Note that as of this writing, the "docgen" dependency is get from the Ivy +repo on the published homepage (http://freemarker.org/repos/ivy/). Those +modifying docgen should upload the fresh docgen jar there. Then you need to +run `ant update-deps` here to grab the latest version. http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/README.txt -- diff --git a/README.txt b/README.txt deleted file mode 100644 index 0b69973..000 --- a/README.txt +++ /dev/null @@ -1,12 +0,0 @@ -Apache FreeMarker Site - -This is just the project with which we generate the freemarker.org home -page content. Note that most of the work is done by Apache FreeMarker -Docgen, which is a dependency of this project. - -To publish the built site, comit the output into the "asf-site" branch. - -Note that as of this writing, the "docgen" dependency is get from the Ivy -repo on the published homepage (http://freemarker.org/repos/ivy/). Those -modifying docgen should upload the fresh docgen jar there. Then you need to -run `ant update-deps` here to grab the latest version. http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/build.xml -- diff --git a/build.xml b/build.xml index 663bfdb..b892dd5 100644 --- a/build.xml +++ b/build.xml @@ -1,4 +1,22 @@ + http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/src/main/docgen/book.xml -- diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml index 0230193..daa95a7 100644 --- a/src/main/docgen/book.xml +++ b/src/main/docgen/book.xml @@ -1,4 +1,22 @@ + http://docbook.org/ns/docbook"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:xi="http://www.w3.org/2001/XInclude"; http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e934e478/src/main/docgen/docgen-misc/googleAnalytics.html -- diff --git a/src/main/docgen/docgen-misc/googleAnalytics.html b/src/main/docgen/docgen-misc/googleAnalytics.html inde
incubator-freemarker-site git commit: Changed copyright owner in the footer to ASF
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/master e5daf202b -> 8c339eef4
Changed copyright owner in the footer to ASF
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/8c339eef
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/8c339eef
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/8c339eef
Branch: refs/heads/master
Commit: 8c339eef48a134b620e2d378ac79672a26973b3f
Parents: e5daf20
Author: ddekany
Authored: Sat Jan 2 01:13:37 2016 +0100
Committer: ddekany
Committed: Sat Jan 2 01:13:37 2016 +0100
--
src/main/docgen/docgen.cjson | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/8c339eef/src/main/docgen/docgen.cjson
--
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 239e648..627364c 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -11,7 +11,7 @@ validation: {
}
showXXELogo
-copyrightHolder: "The FreeMarker Project"
+copyrightHolder: "The Apache Software Foundation"
copyrightStartYear: 1999
seoMeta: {
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 all the b
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae a94e78cf9 -> 64f2cd19b
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-gae
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 fin
incubator-freemarker git commit: (Broken Manual link)
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae f310e855b -> a94e78cf9
(Broken Manual link)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a94e78cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a94e78cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a94e78cf
Branch: refs/heads/2.3-gae
Commit: a94e78cf98296292af1e13d2fc91802cc5a9ce37
Parents: f310e85
Author: ddekany
Authored: Fri Jan 1 22:24:52 2016 +0100
Committer: ddekany
Committed: Fri Jan 1 22:24:52 2016 +0100
--
src/manual/en_US/docgen.cjson | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a94e78cf/src/manual/en_US/docgen.cjson
--
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 424f703..22ea74f 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -60,7 +60,7 @@ olinks: {
freemarkerdownload: "http://freemarker.org/freemarkerdownload.html";
contribute: "http://freemarker.org/contribute.html";
history: "http://freemarker.org/history.html";
- what-is-freemarker: "id:preface"
+ what-is-freemarker: "http://freemarker.org/";
mailing-lists: "http://freemarker.org/mailing-lists.html";
// External URL-s:
incubator-freemarker-site git commit: Changed copyright notice in the footer so that the copyright holder is the ASF now.
Repository: incubator-freemarker-site
Updated Branches:
refs/heads/asf-site 9525ca104 -> 5515133dc
Changed copyright notice in the footer so that the copyright holder is the ASF
now.
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/5515133d
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/5515133d
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/5515133d
Branch: refs/heads/asf-site
Commit: 5515133dcbc56a8095227a9d198b885039b7a480
Parents: 9525ca1
Author: ddekany
Authored: Fri Jan 1 22:21:03 2016 +0100
Committer: ddekany
Committed: Fri Jan 1 22:21:03 2016 +0100
--
contribute.html| 8
docgen-resources/docgen.css| 3 +++
docgen-resources/docgen.min.css| 3 +++
docgen-resources/fonts/NOTICE | 19 +++
docgen-resources/fonts/icomoon.svg | 1 +
docgen-resources/main.js | 3 +++
docgen-resources/main.min.js | 3 +++
editors.html | 6 +++---
freemarkerdownload.html| 6 +++---
history.html | 6 +++---
index.html | 6 +++---
mailing-lists.html | 6 +++---
poweredBy.html | 6 +++---
sourcecode.html| 6 +++---
14 files changed, 57 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5515133d/contribute.html
--
diff --git a/contribute.html b/contribute.html
index 03d5729..7798a38 100644
--- a/contribute.html
+++ b/contribute.html
@@ -188,9 +188,9 @@ ga('send', 'pageview');
contribute to Apache projects.
-OverviewWhat is
FreeMarker?DownloadVersion historyAbout usLicenseHandy stuffhttp://freemarker-online.kenshoo.com/";>Try template onlineExpressions
cheatsheet#directives?built_ins.special_varsCommunityFreeMarker on Githubhttps://twitter.com/freemarker";>Follow us on Twitterhttps://issues.apache.org/jira/browse/FREEMARKER/";>Report a
bughttp://stackoverflow.com/questions/ask?tags=freemarker";>Ask a
questionMailing
listsGitHubhttps://twitter.com/freemarker";>Twitterhttp://stackoverflow.com/questions/ask?tags=freemarker";>Stack
Overflowhttp://www.xmlmind.com/xmleditor/";
rel="nofollow" title="Edited with XMLMind XML Editor">Edited with XMLMind
XML Editor Last generated:
-2015-12-21 10:54:04 GMT
-© 1999â2015
-http://schema.org/Organization"; itemprop="copyrightHolder"
href="http://freemarker.org";>The FreeMarker Project. All rights reserved.
+OverviewWhat is
FreeMarker?DownloadVersion historyAbout usLicenseHandy stuffhttp://freemarker-online.kenshoo.com/";>Try template onlineExpressions
cheatsheet#directives?built_ins.special_varsCommunityhttps://github.com/apach
e/incubator-freemarker">FreeMarker on Githubhttps://twitter.com/freemarker";>Follow us on Twitterhttps://issues.apache.org/jira/browse/FREEMARKER/";>Report a
bughttp://stackoverflow.com/questions/ask?tags=freemarker";>Ask a
questionMailing
listshttps://github.com/apache/incubator-freemarker";>GitHubhttps://twitter.com/freemarker";>Twitterhttp://stackoverflow.com/questions/ask?tags=freemarker";>Stack
Overflowhttp://www.xmlmind.com/xmleditor/";
rel="nofollow" title="Edited with XMLMind XML Editor">Edited with XMLMind
XML Editor Last generated:
+2016-01-01 21:18:15 GMT
+© 1999â2016
+http://schema.org/Organization"; itemprop="copyrightHolder"
href="http://freemarker.org";>The Apache Software Foundation. All rights
reserved.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5515133d/docgen-resources/docgen.css
--
diff --git a/docgen-resources/docgen.css b/docgen-resources/docgen.css
index 298aaa3..fe5a678 100644
--- a/docgen-resources/docgen.css
+++ b/docgen-resources/docgen.css
@@ -1,3 +1,6 @@
+/*
+ * GENERATED FILE - DO NOT EDIT! Instead, regenerate with Gulp!
+ */
@font-face {
font-family: 'icomoon';
src: url('fonts/icomoon.eot?-fbty7i');
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/5515133d/docgen-resources/docgen.min.css
--
diff --git a/docgen-resources/docgen.min.css b/docgen-resources/docgen.min.css
index 81b0bc0..4ca4062 100644
--- a/docgen-resources/docgen.min.css
+++ b/docgen-resources/docgen.min.css
@@ -1 +1,4 @@
+/*
+ * GENERATED FILE - DO NOT EDIT! Instead, regenerate with Gulp!
+ */
@font-face{font-family:icomoon;src:url(fonts/icomoon.eot?-fbty7i);src:url(fonts/icomoon.eot?#iefix-fbty7i)
format('embedded-opentype'),url(fonts/icomoon.woff?-fbty7i)
format(
incubator-freemarker-site git commit: Updated Docgen in Ivy repo
Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site e6aa2a5d8 -> 9525ca104 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/9525ca10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/9525ca10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/9525ca10 Branch: refs/heads/asf-site Commit: 9525ca104f0f74d2f7dec36c084f7a668edac7ba Parents: e6aa2a5 Author: ddekany Authored: Fri Jan 1 22:17:18 2016 +0100 Committer: ddekany Committed: Fri Jan 1 22:17:18 2016 +0100 -- .../docgen/docgen-2.0-branch-head.jar | Bin 274795 -> 275011 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/9525ca10/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 833c1fd..e5c1241 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/9525ca10/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 04084be..895be5d 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 @@ -29aa21fc489967d1aac056337c714891 \ No newline at end of file +8c46e50563f9218e8955768198a00898 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/9525ca10/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 70e4533..9d86bce 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 @@ -1d3040fea09f139d0a423b58c218ebf9d03a4608 \ No newline at end of file +9778da65bb3ffd66f4dfc4207e84372accd3a1d2 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/9525ca10/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 bc86d80..17eb65f 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/9525ca10/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 7f50acb..edee263 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 @@ -2608053f72f2869a4ad41f35de66964b \ No newline at end of file +de4f233340722d069332258be8b3d14f \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/9525ca10/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 f8efc34..4d21b3a 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 @@ -4ad226fa073f4cacea32bda037936dc2cd6d9b64 \ No newline at end of file +f8be8bbaf0217cda7f8617485ac9ccc907
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.
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') {
+for (int i = 0; i < 2; i++) {
+
incubator-freemarker-site git commit: Updated Docgen in Ivy repo
Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site 5c7db4950 -> e6aa2a5d8 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/e6aa2a5d Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/e6aa2a5d Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/e6aa2a5d Branch: refs/heads/asf-site Commit: e6aa2a5d8114d4463b5abe50d5f263dd76262a9e Parents: 5c7db49 Author: ddekany Authored: Fri Jan 1 21:37:31 2016 +0100 Committer: ddekany Committed: Fri Jan 1 21:37:31 2016 +0100 -- .../docgen/docgen-2.0-branch-head.jar | Bin 274475 -> 274795 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/e6aa2a5d/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 d054338..833c1fd 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/e6aa2a5d/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 4b3acc1..04084be 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 @@ -022e1e0bf8180f416b1b5b2cec847ea9 \ No newline at end of file +29aa21fc489967d1aac056337c714891 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e6aa2a5d/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 b00ae2d..70e4533 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 @@ -6ded1a0332a5cb31ec0035977502db09c069c33d \ No newline at end of file +1d3040fea09f139d0a423b58c218ebf9d03a4608 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e6aa2a5d/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 0ca8229..bc86d80 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/e6aa2a5d/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 66324e7..7f50acb 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 @@ -e14c3324043e2183eb0dbfd2e34008f4 \ No newline at end of file +2608053f72f2869a4ad41f35de66964b \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/e6aa2a5d/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 fb2d89f..f8efc34 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 @@ -83a11a480aaccb71d104e4cf04eaa1c9e1e473c4 \ No newline at end of file +4ad226fa073f4cacea32bda037936dc2cd
incubator-freemarker-docgen git commit: Fixed normalizeEOL method.
Repository: incubator-freemarker-docgen
Updated Branches:
refs/heads/master d03201fa6 -> 99cfc0423
Fixed normalizeEOL method.
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/99cfc042
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/99cfc042
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/99cfc042
Branch: refs/heads/master
Commit: 99cfc042346a90c163d2d4d559e4d84e2c78213a
Parents: d03201f
Author: ddekany
Authored: Fri Jan 1 21:34:32 2016 +0100
Committer: ddekany
Committed: Fri Jan 1 21:34:32 2016 +0100
--
src/main/org/freemarker/docgen/TextUtil.java | 44 +++
1 file changed, 37 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/99cfc042/src/main/org/freemarker/docgen/TextUtil.java
--
diff --git a/src/main/org/freemarker/docgen/TextUtil.java
b/src/main/org/freemarker/docgen/TextUtil.java
index 5e6f8ae..d49f722 100644
--- a/src/main/org/freemarker/docgen/TextUtil.java
+++ b/src/main/org/freemarker/docgen/TextUtil.java
@@ -18,11 +18,6 @@
*/
package org.freemarker.docgen;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import freemarker.template.utility.StringUtil;
-
final class TextUtil {
// Can't be instantiated
@@ -298,8 +293,43 @@ final class TextUtil {
}
}
-public static String normalizeEOL(final String s, String eol) throws
FileNotFoundException, IOException {
-return StringUtil.replace(s, "\r\n", eol).replace("\n",
eol).replace("\r", eol);
+public static String normalizeEOL(final String s, String eol) {
+int ln = s.length();
+int i = 0;
+while (i < ln) {
+char c = s.charAt(i);
+if (c == '\r' || c == '\n') {
+break;
+}
+i++;
+}
+if (i == ln) {
+return s;
+}
+
+StringBuilder sb = new StringBuilder(ln + ln / 10);
+int nextToAppend = 0;
+while (i < ln) {
+char c = s.charAt(i);
+if (c == '\r' || c == '\n') {
+sb.append(s, nextToAppend, i);
+sb.append(eol);
+if (c == '\r' && i + 1 < ln && s.charAt(i + 1) == '\n') {
+i++;
+}
+nextToAppend = i + 1;
+}
+i++;
+}
+sb.append(s, nextToAppend, ln);
+return sb.toString();
+}
+
+public static void main(String[] args) {
+System.out.println(normalizeEOL("", "|"));
+System.out.println(normalizeEOL("abc", "|"));
+System.out.println(normalizeEOL("a\nb\nc\r\nd", "|"));
+System.out.println(normalizeEOL("\n\n\r\r\r\n", "|"));
}
}
incubator-freemarker-site git commit: Updated Docgen in Ivy repo
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 file +83a11a480aaccb71d104e4cf04eaa1c9e1
incubator-freemarker-docgen git commit: Added copyright headers and "do not edit" warning to Gulp generated CSS and JS files.
Repository: incubator-freemarker-docgen
Updated Branches:
refs/heads/master b69ded483 -> d03201fa6
Added copyright headers and "do not edit" warning to Gulp generated CSS and JS
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/d03201fa
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/d03201fa
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/d03201fa
Branch: refs/heads/master
Commit: d03201fa676270c057c4aa7af0d88441393558f4
Parents: b69ded4
Author: ddekany
Authored: Fri Jan 1 21:14:09 2016 +0100
Committer: ddekany
Committed: Fri Jan 1 21:14:09 2016 +0100
--
gulpfile.js | 8 +++
package.json| 1 +
.../freemarker/docgen/gulp-output-header.txt| 22
3 files changed, 31 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/d03201fa/gulpfile.js
--
diff --git a/gulpfile.js b/gulpfile.js
index 8a15fb6..36020ec 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,7 @@
'use strict';
var path = require('path');
+var fs = require('fs');
var gulp = require('gulp');
var less = require('gulp-less');
@@ -9,10 +10,13 @@ var minifyCss = require('gulp-minify-css');
var prefix = require('gulp-autoprefixer');
var uglify = require('gulp-uglify');
var concat = require('gulp-concat');
+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'));
+
gulp.task('styles', function() {
gulp.src(path.join(BASE_DIR, 'less', 'styles.less'))
.pipe(less({ paths: path.join(__dirname, 'node_modules') }))
@@ -20,6 +24,7 @@ gulp.task('styles', function() {
// rename and prefix
.pipe(rename({ basename: 'docgen' }))
.pipe(prefix({ cascade: false }))
+.pipe(headerfooter.header(header))
.pipe(gulp.dest(OUT_DIR))
// minify
@@ -29,6 +34,7 @@ gulp.task('styles', function() {
restructuring: false,
aggressiveMerging: false
}))
+.pipe(headerfooter.header(header))
.pipe(gulp.dest(OUT_DIR));
});
@@ -40,9 +46,11 @@ gulp.task('js', function() {
path.join(BASE_DIR, 'js', 'search.js')
])
.pipe(concat('main.js'))
+.pipe(headerfooter.header(header))
.pipe(gulp.dest(OUT_DIR))
.pipe(uglify())
.pipe(rename({ suffix: '.min' }))
+.pipe(headerfooter.header(header))
.pipe(gulp.dest(OUT_DIR));
});
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/d03201fa/package.json
--
diff --git a/package.json b/package.json
index b9b0f74..d402648 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
"gulp-minify-css": "1.2.1",
"gulp-rename": "1.2.2",
"gulp-uglify": "1.5.1",
+"gulp-headerfooter": "1.0.3",
"less": "2.5.3"
},
"engines": {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/d03201fa/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
new file mode 100644
index 000..94f0b00
--- /dev/null
+++ b/src/main/org/freemarker/docgen/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!
+ */
[3/3] incubator-freemarker git commit: Added copyright header to Manual output, also fixed copyright in the footer.
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": {
[1/3] incubator-freemarker git commit: Added copyright comment to the TLD-s inside the test jar-s
Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae c52561aaa -> f310e855b 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/2.3-gae 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
[2/3] incubator-freemarker git commit: (JavaDoc adjustment)
(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);
incubator-freemarker-site git commit: Updated Docgen in Ivy repo
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 file +867cda150d414193b5c9ba4886c788f8e1
incubator-freemarker-docgen git commit: Added features so that the non-binary output files will contain a configured copyright header comment
Repository: incubator-freemarker-docgen
Updated Branches:
refs/heads/master 3f34f5638 -> b69ded483
Added features so that the non-binary output files will contain a configured
copyright header comment
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/b69ded48
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/tree/b69ded48
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/diff/b69ded48
Branch: refs/heads/master
Commit: b69ded483275ad4d1c0be1f7dee043eff9b6ea93
Parents: 3f34f56
Author: ddekany
Authored: Fri Jan 1 20:25:30 2016 +0100
Committer: ddekany
Committed: Fri Jan 1 20:25:30 2016 +0100
--
.../org/freemarker/docgen/CJSONInterpreter.java | 4 +-
src/main/org/freemarker/docgen/TextUtil.java| 39 ++
src/main/org/freemarker/docgen/Transform.java | 129 ---
.../org/freemarker/docgen/statics/fonts/NOTICE | 19 +++
.../docgen/statics/fonts/README-BUILD.txt | 19 ---
.../freemarker/docgen/statics/fonts/icomoon.svg | 1 +
.../docgen/templates/eclipse-toc.ftlx | 5 +
.../org/freemarker/docgen/templates/page.ftlh | 5 +
.../freemarker/docgen/templates/sitemap.ftlx| 5 +
.../freemarker/docgen/templates/toc-json.ftl| 3 +
10 files changed, 193 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/b69ded48/src/main/org/freemarker/docgen/CJSONInterpreter.java
--
diff --git a/src/main/org/freemarker/docgen/CJSONInterpreter.java
b/src/main/org/freemarker/docgen/CJSONInterpreter.java
index 615b555..8b23cfe 100644
--- a/src/main/org/freemarker/docgen/CJSONInterpreter.java
+++ b/src/main/org/freemarker/docgen/CJSONInterpreter.java
@@ -774,7 +774,7 @@ final class CJSONInterpreter {
c = tx.charAt(p);
-// Map:
+// JSON Object:
if (c == '{') {
Object nr;
p++;
@@ -815,7 +815,7 @@ final class CJSONInterpreter {
return res; //!
}
-// List:
+// JSON array:
if (c == '[') {
p++;
List res = new ArrayList();
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/b69ded48/src/main/org/freemarker/docgen/TextUtil.java
--
diff --git a/src/main/org/freemarker/docgen/TextUtil.java
b/src/main/org/freemarker/docgen/TextUtil.java
index ed3b47e..5e6f8ae 100644
--- a/src/main/org/freemarker/docgen/TextUtil.java
+++ b/src/main/org/freemarker/docgen/TextUtil.java
@@ -18,6 +18,11 @@
*/
package org.freemarker.docgen;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import freemarker.template.utility.StringUtil;
+
final class TextUtil {
// Can't be instantiated
@@ -262,5 +267,39 @@ final class TextUtil {
return sb.toString();
}
+
+public static String detectEOL(String s, String defaultEOL) {
+int unixEOLs = 0;
+int windowsEOLs = 0;
+int macEOLs = 0;
+for (int i = 0; i < s.length(); i++) {
+char c = s.charAt(i);
+if (c == '\n') {
+unixEOLs++;
+}
+if (c == '\r') {
+if (i + 1 < s.length() && s.charAt(i + 1) == '\n') {
+i++;
+windowsEOLs++;
+} else {
+macEOLs++;
+}
+}
+}
+
+if (unixEOLs > windowsEOLs && unixEOLs > macEOLs) {
+return "\n";
+} else if (windowsEOLs > unixEOLs && windowsEOLs > macEOLs) {
+return "\r\n";
+} else if (macEOLs > unixEOLs && macEOLs > windowsEOLs) {
+return "\r";
+} else {
+return defaultEOL;
+}
+}
+
+public static String normalizeEOL(final String s, String eol) throws
FileNotFoundException, IOException {
+return StringUtil.replace(s, "\r\n", eol).replace("\n",
eol).replace("\r", eol);
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-freemarker-docgen/blob/b69ded48/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 c1c6e21..5bc998d 100644
--- a/src/main/org/freemarker/docgen/Transform.java
+++ b/src/main/org/freemarker/docgen/Transform.java
@@ -49,13 +49,19 @@ import static
org.freemarker.docgen.DocBook5Constants.VISIBLE_TOPLEVEL_ELEMENTS;
import static org.freemarker.docgen.DocBook5Constants.XMLNS_DOCBOOK5;
im
[1/2] incubator-freemarker git commit: Remove re-generatble csv as it's not possible to add copyright comments to it.
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."
[2/2] incubator-freemarker git commit: Added copyright comment to the TLD-s inside the test jar-s
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-gae 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
[5/6] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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 +++ .../test/templatesuite/expected/exception2.txt | 36 +++ .../test/templa
[4/6] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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 b/src/test/resources/freemarker/manual/C
[3/6] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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 --- a/src/test/resourc
[2/6] incubator-freemarker git commit: Replaced txt/out/ast copyright comments with Java-style comments
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/6] incubator-freemarker git commit: NOTICE year update
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/).
[6/6] incubator-freemarker git commit: Added copyright comment to some more txt documents
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-gae 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).
[2/2] incubator-freemarker git commit: Added copyright comment to txt documents
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 permissions and limitations
+ * under the Licens
[1/2] incubator-freemarker git commit: Added copyright comment to UnsafeMethods "database"
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae fc9e6676c -> 545cd6369
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/2.3-gae
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.Th
incubator-freemarker git commit: Added copyright comment to more expected result files (ast)
Repository: incubator-freemarker Updated Branches: refs/heads/2.3-gae 701b339a5 -> fc9e6676c Added copyright comment to more expected result files (ast) Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/fc9e6676 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/fc9e6676 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/fc9e6676 Branch: refs/heads/2.3-gae Commit: fc9e6676c9554005f44956d7efa29ab6461fd750 Parents: 701b339 Author: ddekany 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 NOT
[2/2] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)
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 | 18 ++ .../test/tem
[1/2] incubator-freemarker git commit: Added copyright comment to expected result files (txt or out)
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 @@ -1,3
