[ofbiz-tools] branch master updated: Improved: Migration all docbook file to asciidoc (OFBIZ-11587)
This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git The following commit(s) were added to refs/heads/master by this push: new 7d1a279 Improved: Migration all docbook file to asciidoc (OFBIZ-11587) 7d1a279 is described below commit 7d1a27955444b57de69d15e77c9678bc9a4409d5 Author: Jacques Le Roux AuthorDate: Thu Sep 10 17:55:16 2020 +0200 Improved: Migration all docbook file to asciidoc (OFBIZ-11587) Minor update of main README.html after --- wiki-files/README.html | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/wiki-files/README.html b/wiki-files/README.html index 330505c..087dda8 100644 --- a/wiki-files/README.html +++ b/wiki-files/README.html @@ -1152,11 +1152,6 @@ parameters are passed: Testing tasks - - - - -tag::testingtasks[] Execute all unit tests @@ -1248,7 +1243,7 @@ verbose: gradlew "ofbiz --test component=entity --test suitename=entitytests" --debug-jvm -end::testingtasks[] + Miscellaneous tasks @@ -1343,6 +1338,8 @@ and then from that directory you can run either bin/ofbiz shell scr + + OFBiz plugin system @@ -1709,7 +1706,7 @@ Secure Sockets Extension) API -Last updated 2020-09-01 18:14:06 +0200 +Last updated 2020-09-10 17:53:12 +0200
[ofbiz-plugins] 02/02: Documented: migrate help link to asciidoc user manual for Plugin Scrum (OFBIZ-11587)
This is an automated email from the ASF dual-hosted git repository. holivier pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 94e77248e554f3c0a3588736a9b49c41c920d4b5 Author: holivier AuthorDate: Thu Sep 10 19:02:24 2020 +0200 Documented: migrate help link to asciidoc user manual for Plugin Scrum (OFBIZ-11587) All files have been migrated to asciidoc format and help link now point to the html file generated from the asciidoc files In the global Help Docbook index tree, change Scrum help page to a short page with a link to the new help Remove docbook help files for Scrum --- ...LP_SCRUM_NewProductEmail.xml => HELP_SCRUM.xml} | 27 +--- scrum/data/helpdata/DEMO-CONTENT.xml | 36 - scrum/data/helpdata/HELP_ROOT.xml | 35 - scrum/data/helpdata/HELP_SCRUM.xml | 123 --- scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml | 53 --- scrum/data/helpdata/HELP_SCRUM_AddProduct.xml | 39 - scrum/data/helpdata/HELP_SCRUM_AddSprint.xml | 48 -- .../data/helpdata/HELP_SCRUM_AddSprintBacklog.xml | 32 .../helpdata/HELP_SCRUM_CreateScrumProject.xml | 32 .../HELP_SCRUM_DailyScrumMeetingMinute.xml | 39 - .../helpdata/HELP_SCRUM_EditBacklogItemContent.xml | 52 -- scrum/data/helpdata/HELP_SCRUM_EditProdBacklog.xml | 49 -- .../helpdata/HELP_SCRUM_EditProductContents.xml| 52 -- .../helpdata/HELP_SCRUM_EditProjectContents.xml| 52 -- scrum/data/helpdata/HELP_SCRUM_EditSprint.xml | 32 .../data/helpdata/HELP_SCRUM_EditSprintBacklog.xml | 26 --- scrum/data/helpdata/HELP_SCRUM_FindResource.xml| 58 --- scrum/data/helpdata/HELP_SCRUM_FindTimeSheet.xml | 41 - .../HELP_SCRUM_ListProductBacklogCategories.xml| 56 --- scrum/data/helpdata/HELP_SCRUM_MyWork.xml | 69 scrum/data/helpdata/HELP_SCRUM_OpenTest.xml| 47 -- .../helpdata/HELP_SCRUM_ProductBacklogEmails.xml | 48 -- scrum/data/helpdata/HELP_SCRUM_ProductEmails.xml | 48 -- scrum/data/helpdata/HELP_SCRUM_ProductView.xml | 37 - scrum/data/helpdata/HELP_SCRUM_Project.xml | 30 scrum/data/helpdata/HELP_SCRUM_SprintList.xml | 45 -- scrum/data/helpdata/HELP_SCRUM_SprintMember.xml| 41 - scrum/data/helpdata/HELP_SCRUM_TaskView.xml| 31 .../helpdata/HELP_SCRUM_ViewProdBacklogItem.xml| 86 -- scrum/data/helpdata/HELP_SCRUM_ViewProduct.xml | 86 -- scrum/data/helpdata/HELP_SCRUM_ViewSprint.xml | 42 - scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml| 56 --- scrum/data/scrumHelpData.xml | 175 + scrum/documents/Scrum.xml | 27 scrum/widget/CommonScreens.xml | 5 + scrum/widget/OpenTestScreens.xml | 6 +- scrum/widget/ResourceScreens.xml | 5 +- scrum/widget/TaskScreens.xml | 5 +- scrum/widget/TimeSheetScreens.xml | 5 +- scrum/widget/scrumScreens.xml | 102 +++- 40 files changed, 94 insertions(+), 1784 deletions(-) diff --git a/scrum/data/helpdata/HELP_SCRUM_NewProductEmail.xml b/scrum/data/HELP_SCRUM.xml similarity index 68% rename from scrum/data/helpdata/HELP_SCRUM_NewProductEmail.xml rename to scrum/data/HELP_SCRUM.xml index bf78986..7ebb362 100644 --- a/scrum/data/helpdata/HELP_SCRUM_NewProductEmail.xml +++ b/scrum/data/HELP_SCRUM.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,27 +21,16 @@ version="5.0" xmlns:xl="http://www.w3.org/1999/xlink; xmlns:xi="http://www.w3.org/2001/XInclude; xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" xmlns="http://docbook.org/ns/docbook;> -New Email Help +SCRUM Component Help redirection -New E-mail +Introduction -The screen consists of : - -New Email -E-mail Contents - +The purpose of this component is to have a web based and ERP integrated access and recording for all information +related to your Scrum project development. - - -New Email - -To insert the content to product owner. - - - -E-mail Contents -To offer the
[ofbiz-plugins] branch trunk updated (42192da -> 94e7724)
This is an automated email from the ASF dual-hosted git repository.
holivier pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git.
from 42192da Improved: Added 400 for POST requests with no request
body(OFBIZ-11328)
new e314fc7 Documented: ofbiz-plugins / Scrum, migration of docbook help
files to asciidoc (OFBIZ-11587)
new 94e7724 Documented: migrate help link to asciidoc user manual for
Plugin Scrum (OFBIZ-11587)
The 2 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:
docs/asciidoc/plugins-user-manual.adoc | 1 +
...LP_SCRUM_NewProductEmail.xml => HELP_SCRUM.xml} | 27 +---
scrum/data/helpdata/DEMO-CONTENT.xml | 36 -
scrum/data/helpdata/HELP_ROOT.xml | 35 -
scrum/data/helpdata/HELP_SCRUM.xml | 123 ---
scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml | 53 ---
scrum/data/helpdata/HELP_SCRUM_AddProduct.xml | 39 -
scrum/data/helpdata/HELP_SCRUM_AddSprint.xml | 48 --
.../data/helpdata/HELP_SCRUM_AddSprintBacklog.xml | 32
.../helpdata/HELP_SCRUM_CreateScrumProject.xml | 32
.../HELP_SCRUM_DailyScrumMeetingMinute.xml | 39 -
.../helpdata/HELP_SCRUM_EditBacklogItemContent.xml | 52 --
scrum/data/helpdata/HELP_SCRUM_EditProdBacklog.xml | 49 --
.../helpdata/HELP_SCRUM_EditProductContents.xml| 52 --
.../helpdata/HELP_SCRUM_EditProjectContents.xml| 52 --
scrum/data/helpdata/HELP_SCRUM_EditSprint.xml | 32
.../data/helpdata/HELP_SCRUM_EditSprintBacklog.xml | 26 ---
scrum/data/helpdata/HELP_SCRUM_FindResource.xml| 58 ---
scrum/data/helpdata/HELP_SCRUM_FindTimeSheet.xml | 41 -
.../HELP_SCRUM_ListProductBacklogCategories.xml| 56 ---
scrum/data/helpdata/HELP_SCRUM_MyWork.xml | 69
scrum/data/helpdata/HELP_SCRUM_OpenTest.xml| 47 --
.../helpdata/HELP_SCRUM_ProductBacklogEmails.xml | 48 --
scrum/data/helpdata/HELP_SCRUM_ProductEmails.xml | 48 --
scrum/data/helpdata/HELP_SCRUM_ProductView.xml | 37 -
scrum/data/helpdata/HELP_SCRUM_Project.xml | 30
scrum/data/helpdata/HELP_SCRUM_SprintList.xml | 45 --
scrum/data/helpdata/HELP_SCRUM_SprintMember.xml| 41 -
scrum/data/helpdata/HELP_SCRUM_TaskView.xml| 31
.../helpdata/HELP_SCRUM_ViewProdBacklogItem.xml| 86 --
scrum/data/helpdata/HELP_SCRUM_ViewProduct.xml | 86 --
scrum/data/helpdata/HELP_SCRUM_ViewSprint.xml | 42 -
scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml| 56 ---
scrum/data/scrumHelpData.xml | 175 +
scrum/documents/Scrum.xml | 27
.../docs/asciidoc/_include/scrum-add-sprint.adoc | 43 +
.../_include/scrum-backlogItem-content.adoc| 27 ++--
.../asciidoc/_include/scrum-default-tasks.adoc | 25 +--
.../src/docs/asciidoc/_include/scrum-members.adoc | 47 ++
.../src/docs/asciidoc/_include/scrum-my-work.adoc | 46 +++---
.../docs/asciidoc/_include/scrum-open-test.adoc| 42 +++--
.../_include/scrum-product-backlog-item.adoc | 74 +
.../_include/scrum-product-categories.adoc | 31 ++--
.../asciidoc/_include/scrum-product-overview.adoc | 31
.../src/docs/asciidoc/_include/scrum-product.adoc | 76 +
.../asciidoc/_include/scrum-project-sprint.adoc| 132
.../docs/asciidoc/_include/scrum-timeSheet.adoc| 12 +-
scrum/src/docs/asciidoc/scrum.adoc | 93 +++
scrum/widget/CommonScreens.xml | 5 +
scrum/widget/OpenTestScreens.xml | 6 +-
scrum/widget/ResourceScreens.xml | 5 +-
scrum/widget/TaskScreens.xml | 5 +-
scrum/widget/TimeSheetScreens.xml | 5 +-
scrum/widget/scrumScreens.xml | 102 +++-
54 files changed, 699 insertions(+), 1859 deletions(-)
rename scrum/data/{helpdata/HELP_SCRUM_NewProductEmail.xml => HELP_SCRUM.xml}
(68%)
delete mode 100644 scrum/data/helpdata/DEMO-CONTENT.xml
delete mode 100644 scrum/data/helpdata/HELP_ROOT.xml
delete mode 100644 scrum/data/helpdata/HELP_SCRUM.xml
delete mode 100644 scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml
delete mode 100644 scrum/data/helpdata/HELP_SCRUM_AddProduct.xml
delete mode 100644 scrum/data/helpdata/HELP_SCRUM_AddSprint.xml
delete mode 100644 scrum/data/helpdata/HELP_SCRUM_AddSprintBacklog.xml
delete mode 100644 scrum/data/helpdata/HELP_SCRUM_CreateScrumProject.xml
delete mode 100644 scrum/data/helpdata/HELP_SCRUM_DailyScrumMeetingMinute.xml
delete mode
[ofbiz-plugins] 01/02: Documented: ofbiz-plugins / Scrum, migration of docbook help files to asciidoc (OFBIZ-11587)
This is an automated email from the ASF dual-hosted git repository. holivier pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit e314fc7c99cdf39a7cc21f83ea2de0a0ad24c8ea Author: holivier AuthorDate: Tue May 5 18:55:18 2020 +0200 Documented: ofbiz-plugins / Scrum, migration of docbook help files to asciidoc (OFBIZ-11587) scrum.adoc created and re-organize adoc files to have them similar to menu name and menu items order --- docs/asciidoc/plugins-user-manual.adoc | 1 + .../docs/asciidoc/_include/scrum-add-sprint.adoc | 43 +++ .../_include/scrum-backlogItem-content.adoc| 28 ++--- .../asciidoc/_include/scrum-default-tasks.adoc | 28 ++--- .../src/docs/asciidoc/_include/scrum-members.adoc | 47 .../src/docs/asciidoc/_include/scrum-my-work.adoc | 32 ++--- .../docs/asciidoc/_include/scrum-open-test.adoc| 44 +++ .../_include/scrum-product-backlog-item.adoc | 74 .../_include/scrum-product-categories.adoc | 30 ++--- .../asciidoc/_include/scrum-product-overview.adoc | 31 + .../src/docs/asciidoc/_include/scrum-product.adoc | 76 .../asciidoc/_include/scrum-project-sprint.adoc| 132 + .../docs/asciidoc/_include/scrum-timeSheet.adoc| 28 ++--- scrum/src/docs/asciidoc/scrum.adoc | 93 +++ 14 files changed, 605 insertions(+), 82 deletions(-) diff --git a/docs/asciidoc/plugins-user-manual.adoc b/docs/asciidoc/plugins-user-manual.adoc index 789622e..c30b58e 100644 --- a/docs/asciidoc/plugins-user-manual.adoc +++ b/docs/asciidoc/plugins-user-manual.adoc @@ -37,3 +37,4 @@ include::../../myportal/src/docs/asciidoc/my-portal.adoc[leveloffset=+1] include::../../projectmgr/src/docs/asciidoc/project-mgr.adoc[leveloffset=+1] +include::../../scrum/src/docs/asciidoc/scrum.adoc[leveloffset=+1] \ No newline at end of file diff --git a/scrum/src/docs/asciidoc/_include/scrum-add-sprint.adoc b/scrum/src/docs/asciidoc/_include/scrum-add-sprint.adoc new file mode 100644 index 000..83342b4 --- /dev/null +++ b/scrum/src/docs/asciidoc/_include/scrum-add-sprint.adoc @@ -0,0 +1,43 @@ + +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. + +This screen includes details that need to create sprint. + +== Fields Description +. "Sprint Name" field should contain the name of sprint. +. "Description" field should contain the description of sprint. +. "Start Date" field should contain the starting date of the sprint. +. "End Date" field should contain the ending date of the sprint. +. "How many Sprint Backlog(s)?" field should contain how many Sprint Backlog do you want from the top of Product Backlog. + +== How to create the sprint +. Fill all of fields. +. Click at the submit button. + += Update Sprint. +This part use to update Sprint backlog such as planned hours, + +. Product Name +. Sprint Name +. Sprint Goal +. Status +. Start Date +. End date +. Planned Hours (Integer or floating point). +. Sprint Length Weeks +. Click the update button to update the Sprint Backlog. diff --git a/docs/asciidoc/plugins-user-manual.adoc b/scrum/src/docs/asciidoc/_include/scrum-backlogItem-content.adoc similarity index 56% copy from docs/asciidoc/plugins-user-manual.adoc copy to scrum/src/docs/asciidoc/_include/scrum-backlogItem-content.adoc index 789622e..ec2c833 100644 --- a/docs/asciidoc/plugins-user-manual.adoc +++ b/scrum/src/docs/asciidoc/_include/scrum-backlogItem-content.adoc @@ -16,24 +16,22 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -= Apache OFBiz Plugins -The Apache OFBiz Project -Release trunk -:imagesdir: ./images -ifdef::backend-pdf[] -:title-logo-image: image::OFBiz-Logo.svg[Apache OFBiz Logo, pdfwidth=4.25in, align=center] -:source-highlighter: rouge -endif::[] -:toc: -:sectnums: += Backlog Item Contents +This screen use for uploading any contents that concern to the Backlog Item. +The screen consists of : -include::../../birt/src/docs/asciidoc/birt.adoc[leveloffset=+1] +. Backlog Item Content List +. Add Backlog Item Content
[ofbiz-framework] branch trunk updated: Documented: Framework, migration all docbook files to asciidoc (OFBIZ-11587)
This is an automated email from the ASF dual-hosted git repository. holivier pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 93eb9c6 Documented: Framework, migration all docbook files to asciidoc (OFBIZ-11587) 93eb9c6 is described below commit 93eb9c65a24afce5bfa98f11d52818aca38aa641 Author: holivier AuthorDate: Thu Sep 10 15:27:40 2020 +0200 Documented: Framework, migration all docbook files to asciidoc (OFBIZ-11587) - Correction on tag added in README.adoc, wrong comment characters, - and correction in included:: in unit-tests.adoc to have correct paragraph level --- README.adoc | 8 framework/testtools/src/docs/asciidoc/unit-tests.adoc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.adoc b/README.adoc index 4dfd0a2..944d5ee 100644 --- a/README.adoc +++ b/README.adoc @@ -22,7 +22,7 @@ under the License. image:https://img.shields.io/badge/License-Apache%202.0-blue.svg[link="http://www.apache.org/licenses/LICENSE-2.0;] -If you are reading this file in AsciiDoc format you may want to see it in +If you are reading this file in AsciiDoc format you may want to see it in https://ci.apache.org/projects/ofbiz/site/trunk/readme/html5/README.html[HTML] + or https://ci.apache.org/projects/ofbiz/site/trunk/readme/pdf/README.pdf[PDF] format @@ -395,7 +395,7 @@ dash! Loads all data sets; meant for initial loading of generic OFBiz data. Can be applied for development, testing, demonstration, etc. purposes. Be aware that executing this task can result in your data being overwritten in your database -of choice. +of choice. `gradlew loadAll` OR `gradlew "ofbiz --load-data"` @@ -482,7 +482,7 @@ parameters are passed: [[testing-tasks]] === Testing tasks -# tag::testingtasks[] +// tag::testingtasks[] [[execute-all-unit-tests]] Execute all unit tests @@ -542,7 +542,7 @@ listens on port *5005* `gradlew "ofbiz --test component=entity --test suitename=entitytests" --debug-jvm` -# end::testingtasks[] +// end::testingtasks[] [[miscellaneous-tasks]] diff --git a/framework/testtools/src/docs/asciidoc/unit-tests.adoc b/framework/testtools/src/docs/asciidoc/unit-tests.adoc index e6faa48..6cc2b56 100644 --- a/framework/testtools/src/docs/asciidoc/unit-tests.adoc +++ b/framework/testtools/src/docs/asciidoc/unit-tests.adoc @@ -94,7 +94,7 @@ like this: == How to run a unit test? You can run unit test by run 'gradle' with following target: -include::../../../../../README.adoc[tag=testingtasks] +include::../../../../../README.adoc[tag=testingtasks, leveloffset=-1] == Possible error messages
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1754 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: downstream Build Source Stamp: [branch trunk] a74eac00601c6f4cac5a99d1b9b8f0b42b727744 Blamelist: Jacques Le Roux Build succeeded! Sincerely, -The Buildbot
[ofbiz-framework] branch trunk updated: Fixed: Well-formed html in ftl template (OFBIZ-11996)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new a74eac0 Fixed: Well-formed html in ftl template (OFBIZ-11996)
a74eac0 is described below
commit a74eac00601c6f4cac5a99d1b9b8f0b42b727744
Author: Jacques Le Roux
AuthorDate: Thu Sep 10 12:31:22 2020 +0200
Fixed: Well-formed html in ftl template (OFBIZ-11996)
Fixes Java method names issues
Thanks: Girish
---
.../src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java| 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java
b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java
index 347447c..6145f19 100644
--- a/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java
+++ b/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilHtmlTest.java
@@ -18,22 +18,22 @@
***/
package org.apache.ofbiz.base.util;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import java.util.List;
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
public class UtilHtmlTest {
@Test
-public void parseHtmlFragment_unclosedDiv() {
+public void parseHtmlFragmentUnclosedDiv() {
List errorList = UtilHtml.hasUnclosedTag("");
assertEquals(true, errorList.get(0).contains("Unexpected close tag"));
}
@Test
-public void parseHtmlFragment_multiRoot() {
+public void parseHtmlFragmentMultiRoot() {
List errorList =
UtilHtml.hasUnclosedTag("");
assertEquals(0, errorList.size());
}
[ofbiz-framework] branch trunk updated: Improved: Well-formed html in ftl template (OFBIZ-11996)
This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 161c0c0 Improved: Well-formed html in ftl template (OFBIZ-11996)
161c0c0 is described below
commit 161c0c0c05ad33474779706cf8bf1d548528f817
Author: James Yong
AuthorDate: Thu Sep 10 17:12:36 2020 +0800
Improved: Well-formed html in ftl template (OFBIZ-11996)
refactoring + add test case
---
.../java/org/apache/ofbiz/base/util/UtilHtml.java | 75 --
.../org/apache/ofbiz/base/util/UtilHtmlTest.java | 13 +++-
.../org/apache/ofbiz/widget/model/HtmlWidget.java | 10 +--
3 files changed, 56 insertions(+), 42 deletions(-)
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java
index 39f185e..94f72c3 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHtml.java
@@ -29,6 +29,7 @@ import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Stack;
@@ -59,51 +60,57 @@ public final class UtilHtml {
/**
*
* @param content
- * @param locationInfo for printing location information
- * @return true if there is error
+ * @return list of errors
*/
-public static boolean hasUnclosedTag(String content, String locationInfo) {
+public static List hasUnclosedTag(String content) {
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
XMLEventReader eventReader = null;
+List errorList = new ArrayList<>();
try {
+// wrap with template tag as some content contains multiple root
eventReader = inputFactory.createXMLEventReader(
-new
ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)), "utf-8");
-} catch (XMLStreamException e) {
-Debug.logError(e.getMessage(), MODULE);
-return true;
-}
-
-Stack stack = new Stack();
-boolean hasError = false;
-while (eventReader.hasNext()) {
-try {
-XMLEvent event = eventReader.nextEvent();
-if (event.isStartElement()) {
-StartElement startElement = event.asStartElement();
-stack.push(startElement);
-}
-if (event.isEndElement()) {
-EndElement endElement = event.asEndElement();
-stack.pop();
-}
-} catch (XMLStreamException e) {
-if (!stack.isEmpty()) {
-StartElement startElement = stack.pop();
-String elementName = startElement.getName().getLocalPart();
-if
(Arrays.stream(TAG_SHOULD_CLOSE_LIST).anyMatch(elementName::equals)) {
-hasError = true;
-UtilHtml.logFormattedError(content, locationInfo,
e.getMessage(), MODULE);
+new ByteArrayInputStream(("" + content +
"").getBytes(StandardCharsets.UTF_8)),
+"utf-8");
+Stack stack = new Stack();
+while (eventReader.hasNext()) {
+try {
+XMLEvent event = eventReader.nextEvent();
+if (event.isStartElement()) {
+StartElement startElement = event.asStartElement();
+stack.push(startElement);
}
-} else {
-UtilHtml.logFormattedError(content, locationInfo,
e.getMessage(), MODULE);
+if (event.isEndElement()) {
+EndElement endElement = event.asEndElement();
+stack.pop();
+}
+} catch (XMLStreamException e) {
+if (!stack.isEmpty()) {
+StartElement startElement = stack.pop();
+String elementName =
startElement.getName().getLocalPart();
+if
(Arrays.stream(TAG_SHOULD_CLOSE_LIST).anyMatch(elementName::equals)) {
+errorList.add(e.getMessage());
+}
+} else {
+errorList.add(e.getMessage());
+}
+break;
+}
+}
+} catch (XMLStreamException e) {
+errorList.add(e.getMessage());
+} finally {
+if (eventReader != null) {
+try {
+
buildbot failure in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a new failure on builder ofbizTrunkFrameworkPlugins while building ofbiz-plugins. Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1750 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf945_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch trunk] 42192da7d3cc8bd979711e72a47b104dda0c25a3 Blamelist: Girish Vasmatkar BUILD FAILED: failed check Sincerely, -The Buildbot
