You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/08/08 11:13:00 UTC
[freemarker-generator] branch FREEMARKER-153 updated:
FREEMARKER-153 Renamed "FreeMarker CLI" to "FreeMarker Generator" at some
more places
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch FREEMARKER-153
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-153 by this push:
new 44afd4f FREEMARKER-153 Renamed "FreeMarker CLI" to "FreeMarker Generator" at some more places
44afd4f is described below
commit 44afd4f5ffc6b8e1007e522197f8c102065d5cf4
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Aug 8 12:59:20 2020 +0200
FREEMARKER-153 Renamed "FreeMarker CLI" to "FreeMarker Generator" at some more places
---
.../src/examples/data/html/dependencies.html | 10 +++++-----
.../src/examples/templates/demo.ftl | 2 +-
.../java/org/apache/freemarker/generator/cli/Main.java | 6 +++---
.../freemarker/generator/cli/config/Settings.java | 2 +-
.../site/markdown/cli/advanced/cli-configuration.md | 2 +-
.../src/site/markdown/cli/concepts/data-sources.md | 12 ++++++------
.../src/site/markdown/cli/concepts/template-loading.md | 2 +-
.../site/markdown/cli/introduction/getting-started.md | 18 +++++++++---------
.../src/site/markdown/cli/usage/running-examples.md | 4 ++--
freemarker-generator-cli/src/site/markdown/index.md | 2 +-
freemarker-generator-cli/templates/info.ftl | 12 ++++++------
11 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/freemarker-generator-cli/src/examples/data/html/dependencies.html b/freemarker-generator-cli/src/examples/data/html/dependencies.html
index c67940f..4e969bd 100644
--- a/freemarker-generator-cli/src/examples/data/html/dependencies.html
+++ b/freemarker-generator-cli/src/examples/data/html/dependencies.html
@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>FreeMarker CLI – Project Dependencies</title>
+ <title>FreeMarker Generator – Project Dependencies</title>
<style type="text/css" media="all">
@import url("./css/maven-base.css");
@import url("./css/maven-theme.css");
@@ -16,7 +16,7 @@
<body class="composite">
<div id="banner">
<div id="bannerLeft">
-FreeMarker CLI
+FreeMarker Generator
</div>
<div class="clear">
<hr/>
@@ -27,7 +27,7 @@ FreeMarker CLI
<span id="publishDate">Last Published: 2019-02-07</span>
| <span id="projectVersion">Version: 1.0.2-SNAPSHOT</span>
</div>
- <div class="xright"><a href="${project.url}" title="FreeMarker CLI">FreeMarker CLI</a> </div>
+ <div class="xright"><a href="${project.url}" title="FreeMarker Generator">FreeMarker Generator</a> </div>
<div class="clear">
<hr/>
</div>
@@ -227,7 +227,7 @@ FreeMarker CLI
<li>org.github.sgoeschl:freemarker-cli:jar:1.0.2-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="[Information]" onclick="toggleDependencyDetails( '_dep0', '_img1' );" style="cursor: pointer; vertical-align: text-bottom;"></img><div id="_dep0" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
-<th>FreeMarker CLI</th></tr>
+<th>FreeMarker Generator</th></tr>
<tr class="b">
<td>
<p><b>Description: </b>There is currently no description associated with this project.</p>
@@ -428,7 +428,7 @@ CSV files of various types.</p>
<div class="section">
<h2><a name="Licenses"></a>Licenses</h2>
<p><b>BSD: </b>ASM Core</p>
-<p><b>Unknown: </b>FreeMarker CLI</p>
+<p><b>Unknown: </b>FreeMarker Generator</p>
<p><b>BSD License: </b>curvesapi</p>
<p><b>The MIT License: </b>jsoup Java HTML Parser</p>
<p><b>MIT License: </b>SLF4J API Module, SLF4J LOG4J-12 Binding</p>
diff --git a/freemarker-generator-cli/src/examples/templates/demo.ftl b/freemarker-generator-cli/src/examples/templates/demo.ftl
index da3a61d..f6d52af 100644
--- a/freemarker-generator-cli/src/examples/templates/demo.ftl
+++ b/freemarker-generator-cli/src/examples/templates/demo.ftl
@@ -114,7 +114,7 @@ List all data sources having "src/test/data/properties" in their file path
- ${key}<#lt>
</#list>
-13) FreeMarker CLI Tools
+13) FreeMarker Generator Tools
---------------------------------------------------------------------------
<#list .data_model.tools?keys?sort as key>
- ${key?right_pad(20)} : ${.data_model.tools[key]}
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java
index 669cac7..d8858cd 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/Main.java
@@ -53,7 +53,7 @@ import static org.apache.freemarker.generator.cli.config.Suppliers.templateDirec
@Command(description = "Apache FreeMarker Generator", name = "freemarker-generator", mixinStandardHelpOptions = true, versionProvider = GitVersionProvider.class)
public class Main implements Callable<Integer> {
- private static final String FREEMARKER_GENERATOR_CLI_PROPERTY_FILE = "freemarker-generator.properties";
+ private static final String FREEMARKER_GENERATOR_PROPERTY_FILE = "freemarker-generator.properties";
@ArgGroup(multiplicity = "1")
TemplateSourceOptions templateSourceOptions;
@@ -90,7 +90,7 @@ public class Main implements Callable<Integer> {
@Option(names = { "-s", "--data-source" }, description = "data source used for rendering")
List<String> dataSources;
- @Option(names = { "--config" }, defaultValue = FREEMARKER_GENERATOR_CLI_PROPERTY_FILE, description = "FreeMarker CLI configuration file")
+ @Option(names = { "--config" }, defaultValue = FREEMARKER_GENERATOR_PROPERTY_FILE, description = "FreeMarker Generator configuration file")
String configFile;
@Option(names = { "--data-source-include" }, description = "file include pattern for data sources")
@@ -267,7 +267,7 @@ public class Main implements Callable<Integer> {
if (properties != null) {
return properties;
} else {
- throw new RuntimeException("FreeMarker CLI configuration file not found: " + fileName);
+ throw new RuntimeException("FreeMarker Generator configuration file not found: " + fileName);
}
}
diff --git a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
index 245a2a8..427fd93 100644
--- a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
+++ b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
@@ -45,7 +45,7 @@ import static org.apache.freemarker.generator.base.util.StringUtils.isEmpty;
*/
public class Settings {
- /** FreeMarker CLI configuration containing tool mappings, etc. */
+ /** FreeMarker Generator configuration containing tool mappings, etc. */
private final Properties configuration;
/** Command line arguments */
diff --git a/freemarker-generator-cli/src/site/markdown/cli/advanced/cli-configuration.md b/freemarker-generator-cli/src/site/markdown/cli/advanced/cli-configuration.md
index 4460330..2027743 100644
--- a/freemarker-generator-cli/src/site/markdown/cli/advanced/cli-configuration.md
+++ b/freemarker-generator-cli/src/site/markdown/cli/advanced/cli-configuration.md
@@ -69,7 +69,7 @@ You can easily check this, e.g.
```
> freemarker-generator -t templates/info.ftl
-FreeMarker CLI Template Loader Directories
+FreeMarker Generator Template Loader Directories
------------------------------------------------------------------------------
[#1] /Users/sgoeschl
[#2] /Users/sgoeschl/.freemarker-generator
diff --git a/freemarker-generator-cli/src/site/markdown/cli/concepts/data-sources.md b/freemarker-generator-cli/src/site/markdown/cli/concepts/data-sources.md
index 6d048ab..9d1a4bd 100644
--- a/freemarker-generator-cli/src/site/markdown/cli/concepts/data-sources.md
+++ b/freemarker-generator-cli/src/site/markdown/cli/concepts/data-sources.md
@@ -15,7 +15,7 @@ A `DataSource` can be loaded from the file system, e.g. as positional command li
```
freemarker-cli -t templates/info.ftl README.md
-FreeMarker CLI DataSources
+FreeMarker Generator DataSources
------------------------------------------------------------------------------
[#1], name=README.md, group=default, contentType=text/markdown, charset=UTF-8, length=57,188 Bytes
URI : file:/Users/sgoeschl/work/github/apache/freemarker-generator/freemarker-generator-cli/target/appassembler/README.md
@@ -26,7 +26,7 @@ from an URL
```
freemarker-cli --data-source xkcd=https://xkcd.com/info.0.json -t templates/info.ftl
-FreeMarker CLI DataSources
+FreeMarker Generator DataSources
------------------------------------------------------------------------------
[#1], name=xkcd, group=default, contentType=application/json, charset=UTF-8, length=-1 Bytes
URI : https://xkcd.com/info.0.json
@@ -38,7 +38,7 @@ or from an environment variable, e.g. `NGINX_CONF` having a JSON payload
export NGINX_CONF='{"NGINX_PORT":"8443","NGINX_HOSTNAME":"localhost"}'
freemarker-cli -t templates/info.ftl -s conf=env:///NGINX_CONF#mimeType=application/json
-FreeMarker CLI DataSources
+FreeMarker Generator DataSources
------------------------------------------------------------------------------
[#1], name=conf, group=default, contentType=application/json, charset=UTF-8, length=50 Bytes
URI : env:///NGINX_CONF
@@ -49,7 +49,7 @@ Of course you can load multiple `DataSources` directly
```
freemarker-cli -t templates/info.ftl README.md xkcd=https://xkcd.com/info.0.json
-FreeMarker CLI DataSources
+FreeMarker Generator DataSources
------------------------------------------------------------------------------
[#1], name=README.md, group=default, contentType=text/markdown, charset=UTF-8, length=57,188 Bytes
URI : file:/Users/sgoeschl/work/github/apache/freemarker-generator/freemarker-generator-cli/target/appassembler/README.md
@@ -61,7 +61,7 @@ or load them from a directory
```
freemarker-cli -t templates/info.ftl -s examples/data
-FreeMarker CLI DataSources
+FreeMarker Generator DataSources
------------------------------------------------------------------------------
[#1], name=combined-access.log, group=default, contentType=text/plain, charset=UTF-8, length=2,068 Bytes
URI : file:/Users/sgoeschl/work/github/apache/freemarker-generator/freemarker-generator-cli/target/appassembler/examples/data/accesslog/combined-access.log
@@ -76,7 +76,7 @@ which can be combined with `include` and `exclude` filters
```
freemarker-cli -t templates/info.ftl -s examples/data --data-source-include=*.json
-FreeMarker CLI DataSources
+FreeMarker Generator DataSources
------------------------------------------------------------------------------
[#1], name=github-users.json, group=default, contentType=application/json, charset=UTF-8, length=7,168 Bytes
URI : file:/Users/sgoeschl/work/github/apache/freemarker-generator/freemarker-generator-cli/target/appassembler/examples/data/json/github-users.json
diff --git a/freemarker-generator-cli/src/site/markdown/cli/concepts/template-loading.md b/freemarker-generator-cli/src/site/markdown/cli/concepts/template-loading.md
index 43ae25a..1c4d0cb 100644
--- a/freemarker-generator-cli/src/site/markdown/cli/concepts/template-loading.md
+++ b/freemarker-generator-cli/src/site/markdown/cli/concepts/template-loading.md
@@ -19,7 +19,7 @@ You can check the currently used template loader directories easily on the comma
```
freemarker-generator -t templates/info.ftl
-FreeMarker CLI Template Loader Directories
+FreeMarker Generator Template Loader Directories
------------------------------------------------------------------------------
[#1] /Users/sgoeschl/work/github/apache/freemarker-generator
[#2] /Users/sgoeschl/.freemarker-generator
diff --git a/freemarker-generator-cli/src/site/markdown/cli/introduction/getting-started.md b/freemarker-generator-cli/src/site/markdown/cli/introduction/getting-started.md
index d90fbfd..8dda6f7 100644
--- a/freemarker-generator-cli/src/site/markdown/cli/introduction/getting-started.md
+++ b/freemarker-generator-cli/src/site/markdown/cli/introduction/getting-started.md
@@ -49,7 +49,7 @@ version=0.1.0-SNAPSHOT, time=2020-06-25T21:48:02+0200, commit=b320d00094be878908
Apache FreeMarker Generator
[<sources>...] data source files and/or directories
-b, --basedir=<baseDir> additional template base directory
- --config=<configFile> FreeMarker CLI configuration file
+ --config=<configFile> FreeMarker Generator configuration file
-D, --system-property=<String=String>
set system property
--data-source-exclude=<dataSourceExcludePattern>
@@ -85,7 +85,7 @@ to better understand `Apache FreeMarker Generator`
```
> freemarker-generator -t templates/info.ftl
-FreeMarker CLI Information
+FreeMarker Generator Information
------------------------------------------------------------------------------
FreeMarker version : 2.3.30
Template name : templates/info.ftl
@@ -95,13 +95,13 @@ Timestamp : Jun 26, 2020 10:44:15 AM
Output encoding : UTF-8
Output format : plainText
-FreeMarker CLI Template Loader Directories
+FreeMarker Generator Template Loader Directories
------------------------------------------------------------------------------
[#1] /Users/sgoeschl/work/github/apache/freemarker-generator
[#2] /Users/sgoeschl/.freemarker-generator
[#3] /Applications/Java/freemarker-generator-2.0.0
-FreeMarker CLI Tools
+FreeMarker Generator Tools
------------------------------------------------------------------------------
- CSVTool : Process CSV files using Apache Commons CSV (see https://commons.apache.org/proper/commons-csv/)
- DataFrameTool : Bridge to [nRo/DataFrame](https://github.com/nRo/DataFrame)
@@ -118,7 +118,7 @@ FreeMarker CLI Tools
- XmlTool : Process XML files using Apache FreeMarker (see https://freemarker.apache.org/docs/xgui.html)
- YamlTool : Process YAML files using SnakeYAML(see https://bitbucket.org/asomov/snakeyaml/wiki/Home)
-FreeMarker CLI Data Model
+FreeMarker Generator Data Model
---------------------------------------------------------------------------
- CSVTool
- DataFrameTool
@@ -137,7 +137,7 @@ FreeMarker CLI Data Model
- YamlTool
```
-* The "FreeMarker CLI Information" section provides insights into configuration and currently processed template.
-* The "FreeMarker CLI Template Loader Directories" shows the template directories being searched to resolve a template path
-* The "FreeMarker CLI Tools" section list the available tools
-* The "FreeMarker CLI Data Model" section shows all available entries in the current FreeMarker context
+* The "FreeMarker Generator Information" section provides insights into configuration and currently processed template.
+* The "FreeMarker Generator Template Loader Directories" shows the template directories being searched to resolve a template path
+* The "FreeMarker Generator Tools" section list the available tools
+* The "FreeMarker Generator Data Model" section shows all available entries in the current FreeMarker context
diff --git a/freemarker-generator-cli/src/site/markdown/cli/usage/running-examples.md b/freemarker-generator-cli/src/site/markdown/cli/usage/running-examples.md
index 0c185fb..fa3e48f 100644
--- a/freemarker-generator-cli/src/site/markdown/cli/usage/running-examples.md
+++ b/freemarker-generator-cli/src/site/markdown/cli/usage/running-examples.md
@@ -778,7 +778,7 @@ Post Title : qui est esse
John Smith
> bin/freemarker-generator -i '${tools.jsoup.parse(dataSources?values[0]).select("a")[0]}' examples/data/html/dependencies.html; echo
-<a href="${project.url}" title="FreeMarker CLI">FreeMarker CLI</a>
+<a href="${project.url}" title="FreeMarker Generator">FreeMarker Generator</a>
> freemarker-generator -i '<#list tools.system.envs as name,value>${name} ==> ${value}${"\n"}</#list>'
TERM ==> xterm-256color
@@ -1038,7 +1038,7 @@ Get all documents
- dataSources
- tools
-13) FreeMarker CLI Tools
+13) FreeMarker Generator Tools
---------------------------------------------------------------------------
- csv : Process CSV files using Apache Commons CSV (see https://commons.apache.org/proper/commons-csv/)
- dataframe : Bridge to [nRo/DataFrame](https://github.com/nRo/DataFrame)
diff --git a/freemarker-generator-cli/src/site/markdown/index.md b/freemarker-generator-cli/src/site/markdown/index.md
index 0bef5c0..1b33d5c 100644
--- a/freemarker-generator-cli/src/site/markdown/index.md
+++ b/freemarker-generator-cli/src/site/markdown/index.md
@@ -33,4 +33,4 @@
### Advanced Topics
-* [FreeMarker CLI Configuration](cli/advanced/cli-configuration.html)
+* [FreeMarker Generator Configuration](cli/advanced/cli-configuration.html)
diff --git a/freemarker-generator-cli/templates/info.ftl b/freemarker-generator-cli/templates/info.ftl
index 10b692c..1a34880 100644
--- a/freemarker-generator-cli/templates/info.ftl
+++ b/freemarker-generator-cli/templates/info.ftl
@@ -15,7 +15,7 @@
specific language governing permissions and limitations
under the License.
-->
-FreeMarker CLI Information
+FreeMarker Generator Information
------------------------------------------------------------------------------
FreeMarker version : ${.version}
Template name : ${.current_template_name}
@@ -25,26 +25,26 @@ Timestamp : ${.now}
Output encoding : ${.output_encoding}
Output format : ${.output_format}
-FreeMarker CLI Template Loader Directories
+FreeMarker Generator Template Loader Directories
------------------------------------------------------------------------------
<#list tools.system.getTemplateDirectories() as directory>
[#${directory?counter}] ${directory}
</#list>
-FreeMarker CLI Data Model
+FreeMarker Generator Data Model
---------------------------------------------------------------------------
<#list .data_model?keys?sort as key>
- ${key}<#lt>
</#list>
-FreeMarker CLI Tools
+FreeMarker Generator Tools
------------------------------------------------------------------------------
<#list tools?keys?sort as name>
- ${name?right_pad(20)} : ${tools[name]}
</#list>
<#if dataSources?has_content>
-FreeMarker CLI DataSources
+FreeMarker Generator DataSources
------------------------------------------------------------------------------
<#list dataSources?values as ds>
[#${ds?counter}]: name=${ds.name}, group=${ds.group}, fileName=${ds.fileName} mimeType=${ds.mimeType}, charset=${ds.charset}, length=${ds.length} Bytes
@@ -53,7 +53,7 @@ URI : ${ds.uri}
</#if>
<#if tools.system.parameters?has_content>
-FreeMarker CLI Parameters
+FreeMarker Generator Parameters
------------------------------------------------------------------------------
<#list tools.system.parameters as key,value>
<#if value?is_hash>