(struts-examples) branch master updated: Fix freemarker template error in `themes` example

[lukaszlenart]

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 <aopena...@naver.com>
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";>
 
-  <bean 
class="org.apache.struts.example.jasperreports.service.JapserInitializer"  />
+  <bean 
class="org.apache.struts.example.jasperreports.service.JasperInitializer"  />
 
 </beans>
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')/>
         </#if>
 <#assign itemKeyStr=itemKey.toString() />
-<input type="checkbox" name="${parameters.name?html}" 
value="${itemKeyStr?html}" id="${parameters.name?html}-${itemCount}"<#rt/>
+<input type="checkbox" name="${parameters.name?esc}" value="${itemKeyStr?esc}" 
id="${parameters.name?esc}-${itemCount}"<#rt/>
         <#if tag.contains(parameters.nameValue, itemKey)>
  checked="checked"<#rt/>
         </#if>
@@ -21,17 +21,17 @@
  disabled="disabled"<#rt/>
         </#if>
         <#if parameters.title??>
- title="${parameters.title?html}"<#rt/>
+ title="${parameters.title?esc}"<#rt/>
         </#if>
         <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
         <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
 />
-<label for="${parameters.name?html}-${itemCount}" 
style="color:red;font-weight:bold">${itemValue?html}</label> <br />
+<label for="${parameters.name?esc}-${itemCount}" 
style="color:red;font-weight:bold">${itemValue?esc}</label> <br />
     </@s.iterator>
 <#else>
   &nbsp;
 </#if>
-<input type="hidden" id="__multiselect_${parameters.id?html}" 
name="__multiselect_${parameters.name?html}" value=""<#rt/>
+<input type="hidden" id="__multiselect_${parameters.id?esc}" 
name="__multiselect_${parameters.name?esc}" value=""<#rt/>
 <#if parameters.disabled?default(false)>
  disabled="disabled"<#rt/>
 </#if>