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 7a6e620 Continued converting md to XDocBook
add 51f8ee1 FREEMARKER-188 [freemarker-generator] Support an output
"generation" mode (#35)
add 45c391f FREEMARKER-195 Improve exposure of DataSources using
TemplateHashModelEx2 (#36)
add 20d7f13 FREEMARKER-199 Add "utah-parser-tool"
new 56bc016 Merge remote-tracking branch 'origin/master' into
FREEMARKER-154. Also updated website module and DocBook content to be
compatible with it.
The 1 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:
freemarker-generator-base/pom.xml | 2 +-
.../generator/base/FreeMarkerConstants.java | 9 ++
.../base/activation/CachingUrlDataSource.java | 1 +
.../generator/base/datasource/DataSource.java | 138 ++++++++++++++++++---
.../base/datasource/DataSourceFactory.java | 18 ++-
.../base/datasource/DataSourceLoader.java | 2 +-
.../base/datasource/DataSourceLoaderFactory.java | 21 ++--
.../generator/base/datasource/DataSources.java | 118 ++++++++++++++----
.../base/datasource/DataSourcesSupplier.java | 48 +++++--
.../generator/base/file/RecursiveFileSupplier.java | 24 ++--
.../freemarker/generator/base/mime/Mimetypes.java | 3 +
.../base/mime/MimetypesFileTypeMapFactory.java | 6 +-
.../generator/base/output/OutputGenerator.java | 20 ++-
.../freemarker/generator/base/table/Table.java | 2 +-
.../freemarker/generator/base/util/FileUtils.java | 48 +++++++
.../freemarker/generator/base/util/ListUtils.java | 19 ++-
.../base/util/NonClosableWriterWrapper.java | 2 +-
.../generator/base/util/OperatingSystem.java | 2 +-
.../generator/base/util/PropertiesTransformer.java | 3 +-
.../generator/base/util/StringUtils.java | 8 ++
.../generator/datasource/DataSourceTest.java | 18 ++-
.../generator/datasource/DataSourcesTest.java | 81 ++++++++----
.../freemarker/generator/util/FileUtilsTest.java | 74 +++++++++++
freemarker-generator-cli/CHANGELOG.md | 16 ++-
freemarker-generator-cli/pom.xml | 10 +-
.../src/app/config/freemarker-generator.properties | 1 +
.../src/app/examples/data/ftl/nginx/nginx.conf.ftl | 2 +-
.../src/app/examples/data/nginx/test1-api.nginx | 30 +++++
.../examples/data/nginx/test1-application.nginx | 27 ++++
.../utahparser/juniper_bgp_summary_example.txt | 12 ++
.../utahparser/juniper_bgp_summary_template.xml | 83 +++++++++++++
.../templates/accesslog/combined-access.ftl | 2 +-
.../templates/csv/csv/gatling-user-credentials.ftl | 2 +-
.../app/examples/templates/csv/fo/transactions.ftl | 2 +-
.../app/examples/templates/csv/fo/transform.ftl | 2 +-
.../examples/templates/csv/html/transactions.ftl | 2 +-
.../src/app/examples/templates/csv/md/filter.ftl | 2 +-
.../src/app/examples/templates/csv/shell/curl.ftl | 2 +-
.../app/examples/templates/dataframe/example.ftl | 2 +-
.../examples/templates/dataframe/html/print.ftl | 2 +-
.../src/app/examples/templates/datasources.ftl | 135 ++++++++++++--------
.../src/app/examples/templates/demo.ftl | 10 +-
.../app/examples/templates/excel/csv/custom.ftl | 2 +-
.../templates/excel/dataframe/transform.ftl | 2 +-
.../examples/templates/html/csv/dependencies.ftl | 2 +-
.../app/examples/templates/html/txt/licence.ftl | 2 +-
.../examples/templates/javafaker/csv/testdata.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/logs/csv/serverlog-to-csv.ftl | 2 +-
.../nginx/confluence/nginx-config-parser.ftl | 34 +++++
.../templates/properties/csv/locker-test-users.ftl | 2 +-
.../app/examples/templates/tsv/fo/transactions.ftl | 2 +-
.../csv/transform.ftl} | 26 ++--
.../templates/utahparser/json}/transform.ftl | 6 +-
.../app/examples/templates/xml/txt/recipients.ftl | 2 +-
.../app/examples/templates/yaml/txt/transform.ftl | 2 +-
.../src/app/scripts/run-examples.bat | 42 ++++++-
.../src/app/scripts/run-examples.sh | 42 ++++++-
.../src/app/templates/freemarker-generator/cat.ftl | 2 +-
.../csv/{md => confluence}/transform.ftl | 7 +-
.../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 | 2 +-
.../freemarker-generator/excel/md/transform.ftl | 2 +-
.../app/templates/freemarker-generator/info.ftl | 50 ++++++--
.../freemarker-generator/json/yaml/transform.ftl | 2 +-
.../freemarker-generator/yaml/json/transform.ftl | 2 +-
.../org/apache/freemarker/generator/cli/Main.java | 19 +--
.../cli/config/ConfigurationSupplier.java | 5 +
.../generator/cli/config/DataModelSupplier.java | 12 +-
.../cli/config/OutputGeneratorsSupplier.java | 111 +++--------------
.../freemarker/generator/cli/config/Settings.java | 43 ++++---
.../freemarker/generator/cli/config/Suppliers.java | 4 +-
.../cli/config/output/AbstractOutputGenerator.java | 80 ++++++++++++
.../output/DataSourceSeedingOutputGenerator.java | 112 +++++++++++++++++
.../output/DataSourceSeedingOutputMapper.java | 58 +++++++++
.../TemplateSeedingOutputGenerator.java} | 75 +++--------
.../cli/config/output}/TemplateTransformation.java | 5 +-
.../output}/TemplateTransformationsBuilder.java | 4 +-
.../generator/cli/picocli/DataModelDefinition.java | 7 ++
.../cli/picocli/DataSourceDefinition.java | 7 ++
.../generator/cli/picocli/GitVersionProvider.java | 9 ++
.../cli/picocli/OutputGeneratorDefinition.java | 35 ++++++
...Definition.java => OutputMapperDefinition.java} | 15 +--
...ceDefinition.java => OutputSeedDefinition.java} | 17 ++-
.../cli/picocli/TemplateOutputDefinition.java | 7 ++
.../cli/picocli/TemplateSourceDefinition.java | 8 ++
.../picocli/TemplateSourceFilterDefinition.java | 12 +-
.../generator/cli/task/FreeMarkerTask.java | 41 ++++--
.../generator/cli/util/TemplateSourceFactory.java | 50 ++++++++
.../generator/cli/wrapper/DataSourcesAdapter.java | 115 +++++++++++++++++
.../wrapper/FreeMarkerGeneratorObjectWrapper.java | 35 +++---
.../src/site/markdown/cli/concepts/data-models.md | 2 +-
.../src/site/markdown/cli/concepts/data-sources.md | 54 ++++----
.../src/site/markdown/cli/concepts/named-uris.md | 12 +-
.../site/markdown/cli/concepts/transformation.md | 44 +++++--
.../site/markdown/cli/usage/parsing-with-grok.md | 4 +-
.../site/markdown/cli/usage/running-examples.md | 98 ++++++---------
.../site/markdown/cli/usage/using-dataframes.md | 6 +-
.../src/test/data}/template/application.properties | 0
.../src/test/data}/template/nginx/nginx.conf.ftl | 0
.../freemarker/generator/cli/ExamplesTest.java | 47 ++++++-
.../freemarker/generator/cli/ManualTest.java | 4 +-
.../freemarker/generator/cli/PicocliTest.java | 2 +-
.../cli/config/AbstractOutputGeneratorTest.java | 79 ++++++++++++
.../cli/config/ConfigurationSupplierTest.java | 5 +-
.../generator/cli/config/SuppliersTest.java | 4 +-
.../config/TemplateSeedingOutputGeneratorTest.java | 121 ++++++++++++++++++
.../DataSourceSeedingOutputGeneratorTest.java | 135 ++++++++++++++++++++
.../output/DataSourceSeedingOutputMapperTest.java | 95 ++++++++++++++
.../TemplateTransformationsBuilderTest.java | 9 +-
.../src/test/templates/echo.ftl | 2 +-
.../src/test/templates/manual.ftl | 8 +-
.../src/test/templates/tools/csv.ftl | 2 +-
freemarker-generator-maven-plugin-sample/pom.xml | 2 +-
freemarker-generator-maven-plugin/pom.xml | 2 +-
freemarker-generator-tools/pom.xml | 8 +-
.../generator/tools/commonscsv/CommonsCSVTool.java | 6 +-
.../commonscsv/impl/CommonsCSVPrinterFacade.java | 12 ++
.../tools/dataframe/impl/CSVConverter.java | 2 +-
.../generator/tools/excel/ExcelTool.java | 2 +-
.../freemarker/generator/tools/grok/GrokTool.java | 4 +-
.../generator/tools/system/SystemTool.java | 29 ++++-
.../generator/tools/utahparser/UtahParserTool.java | 100 +++++++++++++++
.../tools/utahparser/impl/ParserWrapper.java | 86 +++++++++++++
.../utahparser/juniper_bgp_summary_example.txt | 12 ++
.../utahparser/juniper_bgp_summary_template.xml | 69 +++++++++++
.../tools/commonsexec/CommonsExecToolTest.java | 26 ++++
.../generator/tools/system/SystemToolTest.java | 8 +-
.../tools/utahparser/UtahParserToolTest.java | 103 +++++++++++++++
freemarker-generator-website/pom.xml | 2 +-
.../src/main/docgen/book.xml | 54 ++++----
...{LICENSE_ASL-2.0.txt => LICENCE_utahparser.txt} | 5 +-
pom.xml | 10 +-
138 files changed, 2753 insertions(+), 670 deletions(-)
create mode 100644
freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/FileUtils.java
create mode 100644
freemarker-generator-base/src/test/java/org/apache/freemarker/generator/util/FileUtilsTest.java
create mode 100644
freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx
create mode 100644
freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx
create mode 100644
freemarker-generator-cli/src/app/examples/data/text/utahparser/juniper_bgp_summary_example.txt
create mode 100644
freemarker-generator-cli/src/app/examples/data/text/utahparser/juniper_bgp_summary_template.xml
create mode 100644
freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl
copy
freemarker-generator-cli/src/app/examples/templates/{accesslog/combined-access.ftl
=> utahparser/csv/transform.ftl} (51%)
copy
freemarker-generator-cli/src/app/{templates/freemarker-generator/json/yaml =>
examples/templates/utahparser/json}/transform.ftl (76%)
copy freemarker-generator-cli/src/app/templates/freemarker-generator/csv/{md
=> confluence}/transform.ftl (91%)
create mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/AbstractOutputGenerator.java
create mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputGenerator.java
create mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputMapper.java
copy
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/{OutputGeneratorsSupplier.java
=> output/TemplateSeedingOutputGenerator.java} (54%)
rename
{freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template
=>
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output}/TemplateTransformation.java
(89%)
rename
{freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template
=>
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output}/TemplateTransformationsBuilder.java
(98%)
copy
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/{TemplateOutputDefinition.java
=> OutputMapperDefinition.java} (73%)
copy
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/picocli/{DataSourceDefinition.java
=> OutputSeedDefinition.java} (71%)
create mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/util/TemplateSourceFactory.java
create mode 100644
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/wrapper/DataSourcesAdapter.java
copy
freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/jsoup/JsoupTool.java
=>
freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/wrapper/FreeMarkerGeneratorObjectWrapper.java
(56%)
rename {freemarker-generator-base/src/test =>
freemarker-generator-cli/src/test/data}/template/application.properties (100%)
rename {freemarker-generator-base/src/test =>
freemarker-generator-cli/src/test/data}/template/nginx/nginx.conf.ftl (100%)
create mode 100644
freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/AbstractOutputGeneratorTest.java
create mode 100644
freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/TemplateSeedingOutputGeneratorTest.java
create mode 100644
freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputGeneratorTest.java
create mode 100644
freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputMapperTest.java
rename
{freemarker-generator-base/src/test/java/org/apache/freemarker/generator/template
=>
freemarker-generator-cli/src/test/java/org/apache/freemarker/generator/cli/config/output}/TemplateTransformationsBuilderTest.java
(96%)
create mode 100644
freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/utahparser/UtahParserTool.java
create mode 100644
freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/utahparser/impl/ParserWrapper.java
create mode 100644
freemarker-generator-tools/src/test/data/utahparser/juniper_bgp_summary_example.txt
create mode 100644
freemarker-generator-tools/src/test/data/utahparser/juniper_bgp_summary_template.xml
create mode 100644
freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/utahparser/UtahParserToolTest.java
copy licences/{LICENSE_ASL-2.0.txt => LICENCE_utahparser.txt} (99%)
