[PR] Fix freemarker template error in `themes` example [struts-examples]
fp024 opened a new pull request, #297: URL: https://github.com/apache/struts-examples/pull/297 1. Fix freemarker template error in `themes` example 2. Fix typo in class name in `jasperreports` example -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix freemarker template error in `themes` example [struts-examples]
lukaszlenart merged PR #297: URL: https://github.com/apache/struts-examples/pull/297 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(struts-examples) branch master updated: Fix freemarker template error in `themes` example
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
The following commit(s) were added to refs/heads/master by this push:
new 3dbec8e Fix freemarker template error in `themes` example
new 578c0c8 Merge pull request #297 from fp024/dev-2023-12-14
3dbec8e is described below
commit 3dbec8e71ea34333f4c04a06bf3b825fa3c41ce5
Author: fp024
AuthorDate: Thu Dec 14 23:47:54 2023 +0900
Fix freemarker template error in `themes` example
1. Fix freemarker template error in `themes` example
2. Fix typo in class name in `jasperreports` example
---
.../service/{JapserInitializer.java => JasperInitializer.java}| 6 +++---
jasperreports/src/main/resources/applicationContext.xml | 2 +-
.../src/main/resources/template/KUTheme_simple/checkboxlist.ftl | 8
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JapserInitializer.java
b/jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JasperInitializer.java
similarity index 89%
rename from
jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JapserInitializer.java
rename to
jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JasperInitializer.java
index 118602d..d7959b7 100644
---
a/jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JapserInitializer.java
+++
b/jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JasperInitializer.java
@@ -10,10 +10,10 @@ import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.web.context.ServletContextAware;
-public class JapserInitializer implements InitializingBean, DisposableBean,
ServletContextAware {
+public class JasperInitializer implements InitializingBean, DisposableBean,
ServletContextAware {
private ServletContext sc;
- private static final Logger LOG =
LogManager.getLogger(JapserInitializer.class);
+ private static final Logger LOG =
LogManager.getLogger(JasperInitializer.class);
private static final String COMPILED_JASPER_FILE =
"/WEB-INF/jasper/our_compiled_template.jasper";
@@ -23,7 +23,7 @@ public class JapserInitializer implements InitializingBean,
DisposableBean, Serv
LOG.info("=== Start JasperReport compile ===");
JasperCompileManager.compileReportToFile(
Optional.ofNullable(
-
JapserInitializer.class.getResource("/jasper/our_jasper_template.jrxml"))
+
JasperInitializer.class.getResource("/jasper/our_jasper_template.jrxml"))
.orElseThrow(
() -> {
throw new IllegalStateException("our_jasper_template.jrxml
File not found.");
diff --git a/jasperreports/src/main/resources/applicationContext.xml
b/jasperreports/src/main/resources/applicationContext.xml
index 06c28a1..bcaacac 100644
--- a/jasperreports/src/main/resources/applicationContext.xml
+++ b/jasperreports/src/main/resources/applicationContext.xml
@@ -5,6 +5,6 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
https://www.springframework.org/schema/context/spring-context.xsd";>
-
+
diff --git a/themes/src/main/resources/template/KUTheme_simple/checkboxlist.ftl
b/themes/src/main/resources/template/KUTheme_simple/checkboxlist.ftl
index 033f14c..28c70f8 100644
--- a/themes/src/main/resources/template/KUTheme_simple/checkboxlist.ftl
+++ b/themes/src/main/resources/template/KUTheme_simple/checkboxlist.ftl
@@ -13,7 +13,7 @@
<#assign itemValue = stack.findString('top')/>
<#assign itemKeyStr=itemKey.toString() />
-
+
<#if tag.contains(parameters.nameValue, itemKey)>
checked="checked"<#rt/>
@@ -21,17 +21,17 @@
disabled="disabled"<#rt/>
<#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
+ title="${parameters.title?esc}"<#rt/>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
/>
-${itemValue?html}
+${itemValue?esc}
<#else>
-
+
<#if parameters.disabled?default(false)>
disabled="disabled"<#rt/>
Re: [PR] Bump log4j2.version from 2.21.1 to 2.22.0 [struts-examples]
lukaszlenart merged PR #296: URL: https://github.com/apache/struts-examples/pull/296 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(struts-examples) branch master updated (578c0c8 -> ffc22e9)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from 578c0c8 Merge pull request #297 from fp024/dev-2023-12-14 add 7b25e13 Bump log4j2.version from 2.21.1 to 2.22.0 add ffc22e9 Merge pull request #296 from apache/dependabot/maven/log4j2.version-2.22.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch master updated (ffc22e9 -> 877ee31)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from ffc22e9 Merge pull request #296 from apache/dependabot/maven/log4j2.version-2.22.0 add 26e6c92 Bump io.quarkus:quarkus-universe-bom from 3.6.0 to 3.6.1 new 877ee31 Merge pull request #294 from apache/dependabot/maven/io.quarkus-quarkus-universe-bom-3.6.1 The 1 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: quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) 01/01: Merge pull request #294 from apache/dependabot/maven/io.quarkus-quarkus-universe-bom-3.6.1
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 877ee315f78682df4c270b06e3147573e1601ff6 Merge: ffc22e9 26e6c92 Author: Lukasz Lenart AuthorDate: Thu Dec 14 16:32:34 2023 +0100 Merge pull request #294 from apache/dependabot/maven/io.quarkus-quarkus-universe-bom-3.6.1 Bump io.quarkus:quarkus-universe-bom from 3.6.0 to 3.6.1 quarkus/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.6.1 deleted (was 26e6c92)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/io.quarkus-quarkus-universe-bom-3.6.1 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 26e6c92 Bump io.quarkus:quarkus-universe-bom from 3.6.0 to 3.6.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Bump io.quarkus:quarkus-universe-bom from 3.6.0 to 3.6.1 [struts-examples]
lukaszlenart merged PR #294: URL: https://github.com/apache/struts-examples/pull/294 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 [struts-examples]
lukaszlenart merged PR #295: URL: https://github.com/apache/struts-examples/pull/295 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@struts.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(struts-examples) branch dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 deleted (was 29579b6)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 29579b6 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-examples) 01/01: Merge pull request #295 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git commit 525fd9c56fb03db55631702c308720807d4ad588 Merge: 877ee31 29579b6 Author: Lukasz Lenart AuthorDate: Thu Dec 14 16:32:42 2023 +0100 Merge pull request #295 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 jasperreports/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts-examples) branch dependabot/maven/log4j2.version-2.22.0 deleted (was 7b25e13)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch dependabot/maven/log4j2.version-2.22.0 in repository https://gitbox.apache.org/repos/asf/struts-examples.git was 7b25e13 Bump log4j2.version from 2.21.1 to 2.22.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts-examples) branch master updated (877ee31 -> 525fd9c)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts-examples.git from 877ee31 Merge pull request #294 from apache/dependabot/maven/io.quarkus-quarkus-universe-bom-3.6.1 add 29579b6 Bump net.sf.jasperreports:jasperreports from 6.20.6 to 6.21.0 new 525fd9c Merge pull request #295 from apache/dependabot/maven/net.sf.jasperreports-jasperreports-6.21.0 The 1 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: jasperreports/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
