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 9d04cd9 Continued working on porting the .md documentation to
XDocBook. Changed the build process a bit as well.
new 641d82c Continued working on porting the .md documentation to
XDocBook.
add f4e1378 FREEMARKER-153 FreeMarker Generator release preparations (#21)
add 73b40a8 Fix broken build caused by merging FREEMARKER-153
new 448bf95 Merge remote-tracking branch 'origin/master' into
FREEMARKER-154
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:
.../generator/base/FreeMarkerConstants.java | 19 +-
.../template/TemplateTransformationsBuilder.java | 1 -
.../template/TemplateSourceFactoryTest.java | 2 +-
freemarker-generator-cli/CHANGELOG.md | 3 +-
freemarker-generator-cli/pom.xml | 12 +-
.../config/freemarker-generator.properties | 0
.../examples/data/accesslog/combined-access.log | 0
.../src/{ => app}/examples/data/csv/contract.csv | 0
.../src/{ => app}/examples/data/csv/dataframe.csv | 0
.../examples/data/csv/excel-export-utf8.csv | 0
.../examples/data/csv/locker-test-users.csv | 0
.../{ => app}/examples/data/csv/sales-records.csv | 0
.../{ => app}/examples/data/csv/transactions.csv | 0
.../src/{ => app}/examples/data/csv/user.csv | 0
.../examples/data/excel/test-multiple-sheets.xlsx | Bin
.../src/{ => app}/examples/data/excel/test.xls | Bin
.../src/{ => app}/examples/data/excel/test.xlsx | Bin
.../examples/data/ftl/nginx/nginx.conf.ftl | 0
.../{ => app}/examples/data/ftl/nginx/nginx.env | 0
.../{ => app}/examples/data/html/dependencies.html | 0
.../{ => app}/examples/data/json/github-users.json | 0
.../{ => app}/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/{ => app}/examples/data/xml/recipients.xml | 0
.../src/{ => app}/examples/data/yaml/customer.yaml | 0
.../{ => app}/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
.../{ => app}/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/{ => app}/examples/templates/demo.ftl | 0
.../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 | 0
.../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
.../src/{ => app}/scripts/run-examples.bat | 0
.../src/{ => app}/scripts/run-examples.sh | 0
.../templates/freemarker-generator/cat.ftl | 0
.../freemarker-generator/csv/csv/transform.ftl | 0
.../freemarker-generator/csv/html/transform.ftl | 0
.../freemarker-generator/csv/md/transform.ftl | 0
.../freemarker-generator/excel/csv/transform.ftl | 0
.../freemarker-generator/excel/html/transform.ftl | 0
.../freemarker-generator/excel/md/transform.ftl | 0
.../templates/freemarker-generator/info.ftl | 0
.../freemarker-generator/json/yaml/transform.ftl | 0
.../freemarker-generator/lib/commons-csv.ftl | 0
.../freemarker-generator/yaml/json/transform.ftl | 0
.../org/apache/freemarker/generator/cli/Main.java | 26 +-
.../cli/config/TemplateDirectorySupplier.java | 48 +-
.../freemarker/generator/cli/AbstractMainTest.java | 11 +-
.../freemarker/generator/cli/ExamplesTest.java | 84 ++--
.../generator/cli/TemplateLoadingTest.java | 2 +-
.../cli/config/TemplateDirectorySupplierTest.java | 4 +-
freemarker-generator-website/pom.xml | 15 +-
.../src/main/docgen/book.xml | 503 +++++++++++++++++++++
73 files changed, 632 insertions(+), 98 deletions(-)
rename freemarker-generator-cli/src/{main =>
app}/config/freemarker-generator.properties (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/accesslog/combined-access.log (100%)
rename freemarker-generator-cli/src/{ => app}/examples/data/csv/contract.csv
(100%)
rename freemarker-generator-cli/src/{ => app}/examples/data/csv/dataframe.csv
(100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/csv/excel-export-utf8.csv (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/csv/locker-test-users.csv (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/csv/sales-records.csv (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/csv/transactions.csv (100%)
rename freemarker-generator-cli/src/{ => app}/examples/data/csv/user.csv (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/excel/test-multiple-sheets.xlsx (100%)
rename freemarker-generator-cli/src/{ => app}/examples/data/excel/test.xls
(100%)
rename freemarker-generator-cli/src/{ => app}/examples/data/excel/test.xlsx
(100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/ftl/nginx/nginx.conf.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/ftl/nginx/nginx.env (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/html/dependencies.html (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/json/github-users.json (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/json/swagger-spec.json (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/properties/user_0001/user.properties (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/properties/user_0002/user.properties (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/properties/user_0003/user.properties (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/properties/user_0004/user.properties (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/template/application.properties (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/template/nginx/nginx.conf.ftl (100%)
rename freemarker-generator-cli/src/{ => app}/examples/data/xml/recipients.xml
(100%)
rename freemarker-generator-cli/src/{ => app}/examples/data/yaml/customer.yaml
(100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/data/yaml/swagger-spec.yaml (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/accesslog/combined-access.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/csv/csv/gatling-user-credentials.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/csv/fo/transactions.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/csv/fo/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/csv/html/transactions.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/csv/md/filter.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/csv/shell/curl.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/dataframe/example.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/dataframe/html/print.ftl (100%)
rename freemarker-generator-cli/src/{ => app}/examples/templates/demo.ftl
(100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/excel/csv/custom.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/excel/dataframe/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/html/csv/dependencies.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/html/txt/licence.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/json/csv/swagger-endpoints.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/json/dataframe/github-users.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/json/md/github-users.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/properties/csv/locker-test-users.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/tsv/fo/transactions.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/xml/txt/recipients.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/examples/templates/yaml/txt/transform.ftl (100%)
rename freemarker-generator-cli/src/{ => app}/scripts/run-examples.bat (100%)
rename freemarker-generator-cli/src/{ => app}/scripts/run-examples.sh (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/cat.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/csv/csv/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/csv/html/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/csv/md/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/excel/csv/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/excel/html/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/excel/md/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/info.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/json/yaml/transform.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/lib/commons-csv.ftl (100%)
rename freemarker-generator-cli/src/{ =>
app}/templates/freemarker-generator/yaml/json/transform.ftl (100%)
