You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/08/22 17:11:46 UTC
[freemarker-generator] 01/02: Merge remote-tracking branch
'origin/FREEMARKER-153' into FREEMARKER-154
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch FREEMARKER-154
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 63869ccc956e7d6b5949df0a88a7aa769e5c21e9
Merge: 8c4a1cd 4286f12
Author: ddekany <dd...@apache.org>
AuthorDate: Thu Aug 20 16:52:22 2020 +0200
Merge remote-tracking branch 'origin/FREEMARKER-153' into FREEMARKER-154
.travis.yml | 5 +-
README.md | 2 +-
.../generator/base/FreeMarkerConstants.java | 6 +-
.../template/TemplateTransformationsBuilder.java | 4 +-
.../src/site/markdown/index.md | 2 +-
.../TemplateTransformationsBuilderTest.java | 7 +-
freemarker-generator-cli/CHANGELOG.md | 9 +-
freemarker-generator-cli/LICENSE | 199 ++++++++++++++++++---
freemarker-generator-cli/README.md | 71 ++++----
freemarker-generator-cli/pom.xml | 10 +-
.../examples/data/accesslog/combined-access.log | 0
.../{ => src}/examples/data/csv/contract.csv | 0
.../{ => src}/examples/data/csv/dataframe.csv | 0
.../examples/data/csv/excel-export-utf8.csv | 0
.../examples/data/csv/locker-test-users.csv | 0
.../{ => src}/examples/data/csv/sales-records.csv | 0
.../{ => src}/examples/data/csv/transactions.csv | 0
.../{ => src}/examples/data/csv/user.csv | 0
.../examples/data/excel/test-multiple-sheets.xlsx | Bin
.../{ => src}/examples/data/excel/test.xls | Bin
.../{ => src}/examples/data/excel/test.xlsx | Bin
.../examples/data/ftl/nginx/nginx.conf.ftl | 0
.../{ => src}/examples/data/ftl/nginx/nginx.env | 0
.../{ => src}/examples/data/html/dependencies.html | 10 +-
.../{ => src}/examples/data/json/github-users.json | 0
.../{ => src}/examples/data/json/swagger-spec.json | 0
.../data/properties/user_0001/user.properties | 0
.../data/properties/user_0002/user.properties | 0
.../data/properties/user_0003/user.properties | 0
.../data/properties/user_0004/user.properties | 0
.../examples/data/template/application.properties | 0
.../examples/data/template/nginx/nginx.conf.ftl | 0
.../{ => src}/examples/data/xml/recipients.xml | 0
.../{ => src}/examples/data/yaml/customer.yaml | 0
.../{ => src}/examples/data/yaml/swagger-spec.yaml | 0
.../templates/accesslog/combined-access.ftl | 0
.../templates/csv/csv/gatling-user-credentials.ftl | 0
.../examples/templates/csv/fo/transactions.ftl | 0
.../examples/templates/csv/fo/transform.ftl | 0
.../examples/templates/csv/html/transactions.ftl | 0
.../{ => src}/examples/templates/csv/md/filter.ftl | 0
.../examples/templates/csv/shell/curl.ftl | 0
.../examples/templates/dataframe/example.ftl | 0
.../examples/templates/dataframe/html/print.ftl | 0
.../{ => src}/examples/templates/demo.ftl | 2 +-
.../examples/templates/excel/csv/custom.ftl | 0
.../templates/excel/dataframe/transform.ftl | 0
.../examples/templates/html/csv/dependencies.ftl | 0
.../examples/templates/html/txt/licence.ftl} | 102 ++++++++---
.../templates/json/csv/swagger-endpoints.ftl | 0
.../templates/json/dataframe/github-users.ftl | 0
.../examples/templates/json/md/github-users.ftl | 0
.../templates/properties/csv/locker-test-users.ftl | 0
.../examples/templates/tsv/fo/transactions.ftl | 0
.../examples/templates/xml/txt/recipients.ftl | 0
.../examples/templates/yaml/txt/transform.ftl | 0
freemarker-generator-cli/src/main/assembly/app.xml | 4 +-
.../src/main/config/freemarker-cli.properties | 40 -----
.../freemarker-generator.properties} | 0
.../org/apache/freemarker/generator/cli/Main.java | 20 +--
.../freemarker/generator/cli/config/Settings.java | 2 +-
.../freemarker/generator/cli/config/Suppliers.java | 7 +-
.../cli/config/TemplateDirectorySupplier.java | 42 ++---
.../src/main/scripts/run-examples.bat | 171 ------------------
.../src/main/scripts/run-examples.sh | 191 --------------------
.../{ => src/scripts}/run-examples.bat | 57 +++---
.../{ => src/scripts}/run-examples.sh | 65 +++----
.../markdown/cli/advanced/cli-configuration.md | 22 +--
.../src/site/markdown/cli/concepts/data-models.md | 12 +-
.../src/site/markdown/cli/concepts/data-sources.md | 24 +--
.../src/site/markdown/cli/concepts/named-uris.md | 8 +-
.../src/site/markdown/cli/concepts/passing-data.md | 10 +-
.../site/markdown/cli/concepts/template-loading.md | 22 +--
.../src/site/markdown/cli/concepts/tools.md | 2 +-
.../site/markdown/cli/concepts/transformation.md | 16 +-
.../markdown/cli/introduction/getting-started.md | 125 ++++++-------
.../site/markdown/cli/usage/running-examples.md | 70 ++++----
.../site/markdown/cli/usage/transforming-csv.md | 14 +-
.../markdown/cli/usage/transforming-directories.md | 20 +--
.../src/site/markdown/index.md | 6 +-
.../templates/freemarker-generator}/cat.ftl | 0
.../freemarker-generator}/csv/csv/transform.ftl | 2 +-
.../freemarker-generator}/csv/html/transform.ftl | 2 +-
.../freemarker-generator}/csv/md/transform.ftl | 2 +-
.../freemarker-generator}/excel/csv/transform.ftl | 2 +-
.../freemarker-generator}/excel/html/transform.ftl | 0
.../freemarker-generator}/excel/md/transform.ftl | 0
.../templates/freemarker-generator}/info.ftl | 12 +-
.../freemarker-generator}/json/yaml/transform.ftl | 0
.../freemarker-generator}/lib/commons-csv.ftl | 0
.../freemarker-generator}/yaml/json/transform.ftl | 0
.../freemarker/generator/cli/AbstractMainTest.java | 12 +-
.../freemarker/generator/cli/ExamplesTest.java | 87 ++++-----
.../generator/cli/TemplateLoadingTest.java | 26 ++-
.../cli/config/TemplateDirectorySupplierTest.java | 13 +-
freemarker-generator-maven-plugin/pom.xml | 7 +
freemarker-generator-tools/pom.xml | 6 +-
.../src/site/markdown/index.md | 8 +-
licences/LICENCE_CDDL-1.0.txt | 131 ++++++++++++++
licences/LICENCE_EPL-1.0.txt | 70 ++++++++
licences/LICENCE_MIT.txt | 5 +
licences/LICENCE_antlr4-runtime.txt | 10 ++
licences/LICENCE_asm.txt | 27 +++
licences/LICENCE_curvesapi.txt | 28 +++
licences/LICENCE_hamcrest.txt | 27 +++
.../LICENSE => licences/LICENSE_ASL-2.0.txt | 23 +--
pom.xml | 64 +------
travis.bat | 4 +-
travis.sh | 4 +-
109 files changed, 1019 insertions(+), 932 deletions(-)