This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch FREEMARKER-148 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit a288c4e7b058d1825629199da08d8d7fac89f1a6 Merge: d85b723 b27c6ba Author: Siegfried Goeschl <[email protected]> AuthorDate: Sun Jul 5 08:40:16 2020 +0200 FREEMARKER-148 Make usage of "DataSources" more "Freemarker" like .../generator/base/datasource/DataSources.java | 2 +- .../generator/base/file/RecursiveFileSupplier.java | 6 +- .../generator/base/template/TemplateOutput.java | 8 +++ .../base/template/TemplateTransformation.java | 8 +++ .../template/TemplateTransformationsBuilder.java | 34 ++++++---- .../freemarker/generator/base/uri/NamedUri.java | 2 +- .../freemarker/generator/base/util/ListUtils.java | 4 ++ freemarker-generator-cli/CHANGELOG.md | 8 ++- freemarker-generator-cli/README.md | 29 ++++---- freemarker-generator-cli/pom.xml | 2 + .../org/apache/freemarker/generator/cli/Main.java | 42 +++++++----- .../freemarker/generator/cli/config/Settings.java | 30 ++++---- .../freemarker/generator/cli/config/Suppliers.java | 2 +- .../markdown/cli/advanced/cli-configuration.md | 2 +- .../site/markdown/cli/concepts/template-loading.md | 2 +- .../site/markdown/cli/concepts/transformation.md | 74 ++++++++++++++++++-- .../markdown/cli/introduction/getting-started.md | 79 +++++++++++----------- .../freemarker/generator/cli/ExamplesTest.java | 17 ++++- .../freemarker/generator/cli/ManualTest.java | 2 +- .../freemarker/generator/cli/PicocliTest.java | 8 +++ .../generator/cli/config/SettingsTest.java | 5 +- .../generator/tools/excel/ExcelTool.java | 2 +- 22 files changed, 246 insertions(+), 122 deletions(-)
