This is an automated email from the ASF dual-hosted git repository. sgoeschl pushed a commit to branch FREEMARKER-135 in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
commit 9a3b0b4d0248f930e06b9764edd9d40bdba63822 Author: Siegfried Goeschl <[email protected]> AuthorDate: Sat Feb 29 00:13:41 2020 +0100 FREEMARKER-135 Support user-supplied names for datasources --- .../generator/base/activation/MimetypesFileTypeMapFactory.java | 5 +++-- .../freemarker/generator/base/datasource/DatasourceFactory.java | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/activation/MimetypesFileTypeMapFactory.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/activation/MimetypesFileTypeMapFactory.java index 3623bc5..3631395 100644 --- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/activation/MimetypesFileTypeMapFactory.java +++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/activation/MimetypesFileTypeMapFactory.java @@ -32,8 +32,9 @@ public class MimetypesFileTypeMapFactory { mimeTypes.addMimeTypes("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx XLSX"); mimeTypes.addMimeTypes("application/xml xml XML"); mimeTypes.addMimeTypes("text/csv csv CSV"); - mimeTypes.addMimeTypes("text/plain properties"); - mimeTypes.addMimeTypes("text/yaml yml yaml YML YAML"); + mimeTypes.addMimeTypes("text/plain txt TXT log LOG ini INI properties"); + mimeTypes.addMimeTypes("text/yaml yml YML yaml YAML"); + mimeTypes.addMimeTypes("text/tab-separated-values tsv TSV"); } return mimeTypes; diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DatasourceFactory.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DatasourceFactory.java index 6f8571c..c53be60 100644 --- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DatasourceFactory.java +++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DatasourceFactory.java @@ -46,6 +46,12 @@ public class DatasourceFactory { return create(url.getHost(), dataSource, location, UTF_8); } + public static Datasource create(String name, URL url, Charset charset) { + final String location = url.toString(); + final URLDataSource dataSource = new URLDataSource(url); + return create(name, dataSource, location, charset); + } + public static Datasource create(String name, String content) { final StringDataSource dataSource = new StringDataSource(name, content, UTF_8); return create(name, dataSource, Location.STRING, UTF_8);
