This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a change to branch FREEMARKER-154
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git.
from 8c4a1cd FREEMARKER-154 Updated to use [docgen.insertFile ...].
Inserted an example template like that.
add fcf31fe FREEMARKER-153 Provide licence information about libraries
being distributed with freemarker-cli
add 28cacef FREEMARKER-153 Remove copy & waste argument override of
maven-release-plugin configuration
add 93dc173 FREEMARKER-153 Align Maven plugin versions based on Apache
parent POM 23
add 5ad52bf FREEMARKER-153 Add FTL to generate LICENCE file to examples
add f9826b6 FREEMARKER-153 Use individual BSD licence files for
"antlr4-runtime", "asm", "curvesapi",and "hamcrest".
add 8a0c6ec FREEMARKER-153 Move "freemarker-cli/examples" to
"freemarker-cli/src/examples"
add 142c3f9 FREEMARKER-153 Move "freemarker-cli/templates" to
"freemarker-cli/src/templates"
add ab3c93b FREEMARKER-153 Revert moving "freemarker-cli/templates" to
"freemarker-cli/src/templates"
add 63cc4dc FREEMARKER-153 Rename "freemarker-cli" to
"freemarker-generator"
add c9c58cd FREEMARKER-153 Cleanup code
add 44afd4f FREEMARKER-153 Renamed "FreeMarker CLI" to "FreeMarker
Generator" at some more places
add baf44ed FREEMARKER-153 Use "./templates" as template root directory
instead of "."
add 5400523 FREEMARKER-153 Use "./templates" as template root directory
instead of "."
add a77c069 FREEMARKER-153 Prefix the template path for commonly used
templates with "freemarker-generator/"
add edba495 FREEMARKER-153 Removing bundled
"freemarker-generator.properties" from classpath
add d6f1287 FREEMARKER-153 Pumping library versions
add 4286f12 FREEMARKER-153 Renamed `--basedir` command line option to
`--template-dir`
new 63869cc Merge remote-tracking branch 'origin/FREEMARKER-153' into
FREEMARKER-154
new 9d04cd9 Continued working on porting the .md documentation to
XDocBook. Changed the build process a bit as well.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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
.../src/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 | 48 ++---
.../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 +-
freemarker-generator-website/README.md | 15 +-
freemarker-generator-website/pom.xml | 31 +++-
.../src/main/docgen/book.xml | 125 ++++++-------
.../src/main/docgen/docgen.cjson | 4 +-
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 | 66 +------
travis.bat | 4 +-
travis.sh | 4 +-
113 files changed, 1120 insertions(+), 1014 deletions(-)
rename freemarker-generator-cli/{ =>
src}/examples/data/accesslog/combined-access.log (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/contract.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/dataframe.csv
(100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/csv/excel-export-utf8.csv (100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/csv/locker-test-users.csv (100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/sales-records.csv
(100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/transactions.csv
(100%)
rename freemarker-generator-cli/{ => src}/examples/data/csv/user.csv (100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/excel/test-multiple-sheets.xlsx (100%)
rename freemarker-generator-cli/{ => src}/examples/data/excel/test.xls (100%)
rename freemarker-generator-cli/{ => src}/examples/data/excel/test.xlsx (100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/ftl/nginx/nginx.conf.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/data/ftl/nginx/nginx.env
(100%)
rename freemarker-generator-cli/{ => src}/examples/data/html/dependencies.html
(99%)
rename freemarker-generator-cli/{ => src}/examples/data/json/github-users.json
(100%)
rename freemarker-generator-cli/{ => src}/examples/data/json/swagger-spec.json
(100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/properties/user_0001/user.properties (100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/properties/user_0002/user.properties (100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/properties/user_0003/user.properties (100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/properties/user_0004/user.properties (100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/template/application.properties (100%)
rename freemarker-generator-cli/{ =>
src}/examples/data/template/nginx/nginx.conf.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/data/xml/recipients.xml
(100%)
rename freemarker-generator-cli/{ => src}/examples/data/yaml/customer.yaml
(100%)
rename freemarker-generator-cli/{ => src}/examples/data/yaml/swagger-spec.yaml
(100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/accesslog/combined-access.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/csv/csv/gatling-user-credentials.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/csv/fo/transactions.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/csv/fo/transform.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/csv/html/transactions.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/csv/md/filter.ftl
(100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/csv/shell/curl.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/dataframe/example.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/dataframe/html/print.ftl (100%)
rename freemarker-generator-cli/{ => src}/examples/templates/demo.ftl (99%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/excel/csv/custom.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/excel/dataframe/transform.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/html/csv/dependencies.ftl (100%)
copy freemarker-generator-base/LICENSE =>
freemarker-generator-cli/src/examples/templates/html/txt/licence.ftl (77%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/json/csv/swagger-endpoints.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/json/dataframe/github-users.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/json/md/github-users.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/properties/csv/locker-test-users.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/tsv/fo/transactions.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/xml/txt/recipients.ftl (100%)
rename freemarker-generator-cli/{ =>
src}/examples/templates/yaml/txt/transform.ftl (100%)
delete mode 100644
freemarker-generator-cli/src/main/config/freemarker-cli.properties
rename freemarker-generator-cli/src/main/{resources/freemarker-cli.properties
=> config/freemarker-generator.properties} (100%)
delete mode 100644 freemarker-generator-cli/src/main/scripts/run-examples.bat
delete mode 100755 freemarker-generator-cli/src/main/scripts/run-examples.sh
rename freemarker-generator-cli/{ => src/scripts}/run-examples.bat (77%)
rename freemarker-generator-cli/{ => src/scripts}/run-examples.sh (77%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/cat.ftl (100%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/csv/csv/transform.ftl (94%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/csv/html/transform.ftl (96%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/csv/md/transform.ftl (96%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/excel/csv/transform.ftl (96%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/excel/html/transform.ftl (100%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/excel/md/transform.ftl (100%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/info.ftl (91%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/json/yaml/transform.ftl (100%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/lib/commons-csv.ftl (100%)
rename freemarker-generator-cli/{templates =>
src/templates/freemarker-generator}/yaml/json/transform.ftl (100%)
create mode 100644 licences/LICENCE_CDDL-1.0.txt
create mode 100644 licences/LICENCE_EPL-1.0.txt
create mode 100644 licences/LICENCE_MIT.txt
create mode 100644 licences/LICENCE_antlr4-runtime.txt
create mode 100644 licences/LICENCE_asm.txt
create mode 100644 licences/LICENCE_curvesapi.txt
create mode 100644 licences/LICENCE_hamcrest.txt
copy freemarker-generator-base/LICENSE => licences/LICENSE_ASL-2.0.txt (92%)
