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 55385b1 Removed now unused websitePomGenerated from website, which
made fresh builds fail
new b1beff7 (FTL style improvement in an example)
add c50c7fd FREEMARKER-176 [freemarker-generator] Running examples on
Windows fails
add dba2617 FREEMARKER-181 Support custom pattern definitions for Grok
tool (#33)
add c383534 FREEMARKER-182 Upgrade to Apache FreeMarker 2.3.31 (#34)
add 82bd725 FREEMARKER-182 Upgrade to Apache FreeMarker 2.3.31
add 77d7991 Bumping dependencies and minor code cleanup
new ba8f32b Merge remote-tracking branch 'origin/master' into
FREEMARKER-154
new 6a8d2e0 Allow overriding environment variables with a system
properties with special prefix for env:\\ data source. It's useful when running
examples for the documentation, and in tests, because Java can't set
environment variables.
new 7a6e620 Continued converting md to XDocBook
The 4 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:
README.md | 2 +-
freemarker-generator-base/pom.xml | 1 +
.../generator/base/datasource/DataSource.java | 16 +-
.../base/datasource/DataSourceFactory.java | 12 +-
.../datasource/loader/FileDataSourceLoader.java | 1 -
.../freemarker/generator/base/uri/NamedUri.java | 1 -
.../src/site/markdown/index.md | 3 +-
.../datasource/DataSourceFactoryTest.java | 2 +-
.../generator/datasource/DataSourceLoaderTest.java | 25 +-
freemarker-generator-cli/CHANGELOG.md | 5 +
freemarker-generator-cli/README.md | 2 +-
freemarker-generator-cli/pom.xml | 2 +
.../src/app/examples/data/logs/server.01.log | 14 +
.../src/app/examples/data/logs/server.02.log | 13 +
.../templates/accesslog/combined-access.ftl | 4 +-
.../src/app/examples/templates/datasources.ftl | 8 +-
.../templates/logs/csv/serverlog-to-csv.ftl | 50 +++
.../src/app/scripts/examples-win.args | 109 +++++++
.../src/app/scripts/examples.args | 109 +++++++
.../src/app/scripts/run-examples.bat | 9 +-
.../src/app/scripts/run-examples.sh | 3 +
.../cli/config/ConfigurationSupplier.java | 2 +-
.../cli/picocli/OutputGeneratorDefinition.java | 1 -
.../src/site/markdown/cli/concepts/data-sources.md | 4 +-
.../src/site/markdown/cli/concepts/named-uris.md | 2 +-
.../src/site/markdown/cli/concepts/passing-data.md | 2 +-
.../site/markdown/cli/concepts/transformation.md | 23 +-
.../site/markdown/cli/usage/parsing-with-grok.md | 121 ++++++++
.../site/markdown/cli/usage/running-examples.md | 65 +---
.../src/site/markdown/index.md | 1 +
.../freemarker/generator/cli/ExamplesTest.java | 1 +
.../cli/config/DataModelSupplierTest.java | 14 +-
freemarker-generator-maven-plugin-sample/README.md | 2 +-
.../freemarker/generator/maven/UnitTestHelper.java | 5 +-
freemarker-generator-tools/pom.xml | 10 +-
.../tools/dataframe/impl/ConverterUtils.java | 7 +-
.../generator/tools/freemarker/FreeMarkerTool.java | 2 +-
.../freemarker/generator/tools/grok/GrokTool.java | 49 ++-
.../generator/tools/grok/impl/GrokWrapper.java | 42 ---
.../generator/tools/grok/GrokToolTest.java | 35 ++-
.../tools/javafaker/JavaFakerToolTest.java | 43 +++
.../src/main/docgen/book.xml | 340 ++++++++++++++++-----
pom.xml | 14 +-
travis.sh | 1 +
44 files changed, 911 insertions(+), 266 deletions(-)
create mode 100644
freemarker-generator-cli/src/app/examples/data/logs/server.01.log
create mode 100644
freemarker-generator-cli/src/app/examples/data/logs/server.02.log
create mode 100644
freemarker-generator-cli/src/app/examples/templates/logs/csv/serverlog-to-csv.ftl
create mode 100644 freemarker-generator-cli/src/app/scripts/examples-win.args
create mode 100644 freemarker-generator-cli/src/app/scripts/examples.args
create mode 100644
freemarker-generator-cli/src/site/markdown/cli/usage/parsing-with-grok.md
delete mode 100644
freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/grok/impl/GrokWrapper.java
