You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by sg...@apache.org on 2020/07/07 21:53:55 UTC

[freemarker-generator] branch FREEMARKER-148 updated (d044b0f -> c329680)

This is an automated email from the ASF dual-hosted git repository.

sgoeschl pushed a change to branch FREEMARKER-148
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git.


    from d044b0f  FREEMARKER-148 Rename "DataSources" to "dataSources" in FTL code
     add c329680  FREEMARKER-148 Put the various tools into a "tools" map

No new revisions were added by this update.

Summary of changes:
 .../generator/base/FreeMarkerConstants.java        |   1 +
 .../examples/data/ftl/nginx/nginx.conf.ftl         |   2 +-
 .../templates/accesslog/combined-access.ftl        |   2 +-
 .../templates/csv/csv/gatling-user-credentials.ftl |   4 +-
 .../examples/templates/csv/fo/transactions.ftl     |   4 +-
 .../examples/templates/csv/fo/transform.ftl        |   4 +-
 .../examples/templates/csv/html/transactions.ftl   |   4 +-
 .../examples/templates/csv/md/filter.ftl           |  10 +-
 .../examples/templates/csv/shell/curl.ftl          |   6 +-
 .../examples/templates/dataframe/example.ftl       |  18 +--
 .../examples/templates/dataframe/html/print.ftl    |   6 +-
 .../examples/templates/demo.ftl                    |  56 +++++-----
 .../examples/templates/excel/csv/custom.ftl        |  16 +--
 .../templates/excel/dataframe/transform.ftl        |  10 +-
 .../examples/templates/html/csv/dependencies.ftl   |   2 +-
 .../templates/json/csv/swagger-endpoints.ftl       |   2 +-
 .../templates/json/dataframe/github-users.ftl      |   6 +-
 .../examples/templates/json/md/github-users.ftl    |   2 +-
 .../templates/properties/csv/locker-test-users.ftl |   2 +-
 .../examples/templates/tsv/fo/transactions.ftl     |   4 +-
 .../examples/templates/xml/txt/recipients.ftl      |   2 +-
 .../examples/templates/yaml/txt/transform.ftl      |   2 +-
 freemarker-generator-cli/run-examples.bat          |  12 +-
 freemarker-generator-cli/run-examples.sh           |  12 +-
 .../src/main/config/freemarker-cli.properties      |  28 ++---
 .../generator/cli/config/ToolsSupplier.java        |  14 +++
 .../src/main/resources/freemarker-cli.properties   |  28 ++---
 .../src/main/scripts/run-examples.bat              |  12 +-
 .../src/main/scripts/run-examples.sh               |  12 +-
 .../markdown/cli/advanced/cli-configuration.md     |  28 ++---
 .../site/markdown/cli/concepts/template-loading.md |   2 +-
 .../site/markdown/cli/usage/running-examples.md    | 121 +++++++++------------
 .../site/markdown/cli/usage/using-dataframes.md    |  28 ++---
 .../freemarker/generator/cli/ExamplesTest.java     |  16 +--
 .../freemarker/generator/cli/ManualTest.java       |   2 +-
 .../src/test/templates/tools/csv.ftl               |  18 +--
 .../templates/csv/csv/transform.ftl                |   4 +-
 .../templates/csv/html/transform.ftl               |   2 +-
 .../templates/csv/md/transform.ftl                 |   2 +-
 .../templates/excel/csv/transform.ftl              |  12 +-
 .../templates/excel/html/transform.ftl             |   6 +-
 .../templates/excel/md/transform.ftl               |   6 +-
 freemarker-generator-cli/templates/info.ftl        |  20 ++--
 .../templates/json/yaml/transform.ftl              |   2 +-
 .../templates/lib/commons-csv.ftl                  |   8 +-
 .../templates/yaml/json/transform.ftl              |   2 +-
 46 files changed, 280 insertions(+), 282 deletions(-)