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/06/01 08:10:32 UTC
[freemarker-generator] 01/01: FREEMARKER-144 Proof Of Concept for
providing DataFrames
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-144
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit adf4cf0e911c9277451920d05b71b6b5aeaea69f
Merge: 6a75561 aea600f
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Mon Jun 1 10:10:14 2020 +0200
FREEMARKER-144 Proof Of Concept for providing DataFrames
CHANGELOG.md | 4 +-
.../base/activation/ByteArrayDataSource.java | 1 -
.../base/datasource/DataSourceFactory.java | 2 +-
.../generator/base/file/RecursiveFileSupplier.java | 1 +
.../generator/base/template/TemplateOutput.java | 85 ++++++
.../generator/base/template/TemplateSource.java | 112 ++++++++
.../base/template/TemplateSourceFactory.java | 40 +++
.../base/template/TemplateTransformation.java | 44 +++
.../base/template/TemplateTransformations.java | 44 +++
.../template/TemplateTransformationsBuilder.java | 303 +++++++++++++++++++++
.../TemplateTransformationsSupplier.java} | 19 +-
.../generator/base/util/ClosableUtils.java | 4 +-
.../generator/base/util/MapFlattener.java | 16 ++
.../freemarker/generator/base/util/Validate.java | 15 +
.../src/test/data/env/nginx.env | 19 ++
.../datasource/DataSourcesSupplierTest.java | 24 +-
...verTest.java => RecursiveFileSupplierTest.java} | 36 +--
.../template/TemplateSourceFactoryTest.java | 89 ++++++
.../TemplateTransformationsBuilderTest.java | 190 +++++++++++++
.../generator/util/MapFlattenerTest.java | 16 ++
.../src/test/template/application.properties | 19 ++
.../src/test/template/nginx/nginx.conf.ftl | 24 ++
freemarker-generator-cli/run-samples.sh | 7 +
.../site/template/application.properties | 19 ++
.../site/template/nginx/nginx.conf.ftl | 24 ++
.../org/apache/freemarker/generator/cli/Main.java | 63 ++---
.../freemarker/generator/cli/config/Settings.java | 142 ++++++----
.../freemarker/generator/cli/config/Suppliers.java | 17 +-
.../generator/cli/task/FreeMarkerTask.java | 126 +++++----
.../src/main/scripts/run-samples.sh | 7 +
.../src/site/markdown/cli/concepts.md | 124 ---------
.../src/site/markdown/cli/concepts/data-sources.md | 86 ++++++
.../site/markdown/cli/concepts/transformation.md | 12 +
.../markdown/cli/usage/transforming-directories.md | 126 +++++++++
.../src/site/markdown/index.md | 7 +-
freemarker-generator-cli/src/site/site.xml | 1 -
.../freemarker/generator/cli/ExamplesTest.java | 9 +-
.../freemarker/generator/cli/PicocliTest.java | 2 +-
.../cli/config/ConfigurationSupplierTest.java | 4 +-
.../generator/cli/config/SettingsTest.java | 12 +-
src/site/markdown/index.md | 12 +-
travis.sh | 5 +
42 files changed, 1583 insertions(+), 329 deletions(-)
diff --cc CHANGELOG.md
index d7f6023,b610dbf..045191a
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,9 -5,9 +5,10 @@@ All notable changes to this project wil
## 0.1.0-SNAPSHOT
### Added
+* [FREEMARKER-144] Proof Of Concept for providing DataFrames
+ * [FREEMARKER-142] Support Transformation Of Directories
* [FREEMARKER-139] freemarker-cli: Provide GsonTool to align with Maven plugin
- * An environment variable can bes passed as `DataSource`
+ * Environment variables can bes passed as `DataSource`
* [FREEMARKER-135] Support user-supplied names for `DataSource` on the command line
* [FREEMARKER-129] Support `DataSource` exclude pattern in addition to include pattern
* [FREEMARKER-129] User-defined parameters are passed as `-Pkey=value` instead of using system properties
@@@ -38,4 -38,4 +39,5 @@@
[FREEMARKER-136]: https://issues.apache.org/jira/browse/FREEMARKER-136
[FREEMARKER-138]: https://issues.apache.org/jira/browse/FREEMARKER-138
[FREEMARKER-139]: https://issues.apache.org/jira/browse/FREEMARKER-139
-[FREEMARKER-142]: https://issues.apache.org/jira/browse/FREEMARKER-142
++[FREEMARKER-142]: https://issues.apache.org/jira/browse/FREEMARKER-142
+[FREEMARKER-144]: https://issues.apache.org/jira/browse/FREEMARKER-144
diff --cc freemarker-generator-cli/src/site/markdown/index.md
index c52e1b4,b8d50e1..2eb0dfd
--- a/freemarker-generator-cli/src/site/markdown/index.md
+++ b/freemarker-generator-cli/src/site/markdown/index.md
@@@ -2,11 -2,12 +2,16 @@@
### Concepts
- * [User-Supplied Parameters](cli/concepts/user-parameters.html)
* [Named URIs](cli/concepts/named-uris.html)
+ * [Data Sources](cli/concepts/data-sources.html)
* [Data Models](cli/concepts/data-models.html)
+ * [User-Supplied Parameters](cli/concepts/user-parameters.html)
+ * [Transformation](cli/concepts/transformation.html)
+### Tools
+
+* [DataFrameTool](cli/tools/dataframe.html)
+
+ ### Usage
+
+ * [Transforming Directories](cli/usage/transforming-directories.html)