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 20:39:09 UTC

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

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 c21ef24  Removing `DataSources.first` and use `DataSources.get(0)` instead (plus some minor improvements)
     add d044b0f  FREEMARKER-148 Rename "DataSources" to "dataSources" in FTL code

No new revisions were added by this update.

Summary of changes:
 .../generator/base/FreeMarkerConstants.java        |  2 +-
 freemarker-generator-cli/CHANGELOG.md              |  2 +-
 .../examples/data/ftl/nginx/nginx.conf.ftl         |  2 +-
 .../templates/accesslog/combined-access.ftl        |  2 +-
 .../templates/csv/csv/gatling-user-credentials.ftl |  2 +-
 .../examples/templates/csv/fo/transactions.ftl     |  2 +-
 .../examples/templates/csv/fo/transform.ftl        |  2 +-
 .../examples/templates/csv/html/transactions.ftl   |  2 +-
 .../examples/templates/csv/md/filter.ftl           |  2 +-
 .../examples/templates/csv/shell/curl.ftl          |  2 +-
 .../examples/templates/dataframe/example.ftl       |  2 +-
 .../examples/templates/dataframe/html/print.ftl    |  2 +-
 .../examples/templates/demo.ftl                    | 14 ++++-----
 .../examples/templates/excel/csv/custom.ftl        |  2 +-
 .../templates/excel/dataframe/transform.ftl        |  2 +-
 .../examples/templates/html/csv/dependencies.ftl   |  2 +-
 .../templates/json/csv/swagger-endpoints.ftl       |  2 +-
 .../templates/json/dataframe/github-users.ftl      |  2 +-
 .../examples/templates/json/md/github-users.ftl    |  2 +-
 .../templates/properties/csv/locker-test-users.ftl |  2 +-
 .../examples/templates/tsv/fo/transactions.ftl     |  2 +-
 .../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 ++++----
 .../cli/config/ConfigurationSupplier.java          |  4 ---
 .../src/main/scripts/run-examples.bat              | 12 ++++----
 .../src/main/scripts/run-examples.sh               | 12 ++++----
 .../src/site/markdown/cli/concepts/data-sources.md |  6 ++--
 .../site/markdown/cli/usage/running-examples.md    | 34 +++++++++++-----------
 .../site/markdown/cli/usage/using-dataframes.md    |  6 ++--
 .../freemarker/generator/cli/ExamplesTest.java     | 34 ++++++++++++----------
 .../freemarker/generator/cli/ManualTest.java       |  2 +-
 .../cli/config/ConfigurationSupplierTest.java      |  2 +-
 .../src/test/templates/echo.ftl                    |  2 +-
 .../src/test/templates/manual.ftl                  | 20 ++++++-------
 .../src/test/templates/tools/csv.ftl               |  2 +-
 freemarker-generator-cli/templates/cat.ftl         |  2 +-
 .../templates/csv/csv/transform.ftl                |  2 +-
 .../templates/csv/html/transform.ftl               |  2 +-
 .../templates/csv/md/transform.ftl                 |  2 +-
 .../templates/excel/csv/transform.ftl              |  2 +-
 .../templates/excel/html/transform.ftl             |  2 +-
 .../templates/excel/md/transform.ftl               |  2 +-
 freemarker-generator-cli/templates/info.ftl        |  4 +--
 .../templates/json/yaml/transform.ftl              |  2 +-
 .../templates/yaml/json/transform.ftl              |  2 +-
 47 files changed, 120 insertions(+), 120 deletions(-)