[ofbiz-framework] branch trunkGB created (now 4f5e6f9)

[holivier]

This is an automated email from the ASF dual-hosted git repository.

holivier pushed a change to branch trunkGB
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


      at 4f5e6f9  Improved: <script-template> widget tag (OFBIZ-11686)

This branch includes the following new commits:

     new 4f5e6f9  Improved: <script-template> widget tag (OFBIZ-11686)

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.

[holivier]

This is an automated email from the ASF dual-hosted git repository.

holivier pushed a commit to branch trunkGB
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 4f5e6f9f06095b406128f6cdfce38b325a31668c
Author: holivier <[hidden email]>
AuthorDate: Thu May 14 09:38:23 2020 +0200

    Improved: <script-template> widget tag
    (OFBIZ-11686)
   
    Correction in javadoc, <script is not authorize in javadoc because it
    can introduce some javascript in javadoc, and so generate an error in
    javadoc build.
    Replace <script-template/> by "script-template"
---
 .../java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java   | 2 +-
 .../src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java
index c749c87..6b3f385 100644
--- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java
+++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java
@@ -33,7 +33,7 @@ import freemarker.template.TemplateModelException;
 import freemarker.template.TemplateTransformModel;
 
 /**
- * Render the script tags collected from the <script-template/>
+ * Render the script tags collected from the "script-template" tag
  */
 public class ScriptTemplateListTransform implements TemplateTransformModel {
 
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java
index d6d16a2..9d3417c 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java
@@ -52,7 +52,7 @@ public class ScriptTemplateUtil {
     }
 
     /**
-     * get the script src links collected from the <script-template/> tags
+     * get the script src links collected from the "script-template" tags
      * @param request
      * @return
      */