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 2022/02/16 14:55:55 UTC
[freemarker-generator] branch master updated: FREEMARKER-201 Fix javadoc and cleanup samples
This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/master by this push:
new 54adf8f FREEMARKER-201 Fix javadoc and cleanup samples
54adf8f is described below
commit 54adf8ff82a69521d11353c8811952f55102563d
Author: Siegfried Goeschl <si...@gmail.com>
AuthorDate: Wed Feb 16 15:55:37 2022 +0100
FREEMARKER-201 Fix javadoc and cleanup samples
---
.../org/apache/freemarker/generator/base/datasource/DataSources.java | 4 ++--
freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx | 5 +----
.../src/app/examples/data/nginx/test1-application.nginx | 3 +--
.../app/examples/templates/nginx/confluence/nginx-config-parser.ftl | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
index 7762c41..8abbf3b 100644
--- a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
+++ b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSources.java
@@ -98,9 +98,9 @@ public class DataSources implements Closeable {
}
/**
- * Returns <tt>true</tt> if this list contains no elements.
+ * Returns <code>true</code> if this list contains no elements.
*
- * @return <tt>true</tt> if this list contains no elements
+ * @return <code>true</code> if this list contains no elements
*/
public boolean isEmpty() {
return dataSources.isEmpty();
diff --git a/freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx b/freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx
index 2c2486f..9ffa27a 100644
--- a/freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx
+++ b/freemarker-generator-cli/src/app/examples/data/nginx/test1-api.nginx
@@ -8,7 +8,7 @@ server {
ssl_certificate /etc/nginx/ssl/wildcard.company.org-public.crt;
ssl_certificate_key /etc/nginx/ssl/wildcard.company.org-private.rsa;
- include /etc/nginx/includes/FLKPMM.nginx;
+ include /etc/nginx/fastcgi.conf;
proxy_buffers 16 64k;
proxy_buffer_size 128k;
@@ -18,13 +18,10 @@ server {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
- proxy_set_header X-TPP-QWAC $ssl_client_cert;
ssl_verify_client optional_no_ca;
-
location / {
return 403;
}
-
}
diff --git a/freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx b/freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx
index b618991..b8d1e70 100644
--- a/freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx
+++ b/freemarker-generator-cli/src/app/examples/data/nginx/test1-application.nginx
@@ -12,7 +12,7 @@ server {
proxy_buffer_size 128k;
location / {
- proxy_pass https://osroutercpssl/;
+ proxy_pass http://127.0.0.1:8080;
proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
proxy_redirect off;
@@ -21,7 +21,6 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto https;
}
-
}
diff --git a/freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl b/freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl
index 79331a5..29b08a7 100644
--- a/freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl
+++ b/freemarker-generator-cli/src/app/examples/templates/nginx/confluence/nginx-config-parser.ftl
@@ -12,7 +12,7 @@
</#compress>
<#--------------------------------------------------------------------------->
<#function splunkSearchUrl accessLog>
- <#return "https://splunk.p.santanderconsumer.at/en-US/app/scbdevteam/search?q=search%20source%3D%22${accessLog?url}%22">
+ <#return "https://server.invalid/en-US/app/name/search?q=search%20source%3D%22${accessLog?url}%22">
</#function>
<#--------------------------------------------------------------------------->
<#function getAccessLog text>