svn commit: r1859908 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ ecommerce/template/order/QuickAdd.ftl ecommerce/template/order/QuickAddSummary.ftl
Author: surajk
Date: Sat May 25 05:08:07 2019
New Revision: 1859908
URL: http://svn.apache.org/viewvc?rev=1859908=rev
Log:
Applied fix from trunk for revision: 1859906
===
Fixed: Unable to find any product in Quick Add functionality.
(OFBIZ-10978)
Thanks Vivek Bisen for providing the patch, Pawan Verma and Jacques Le Roux for
review.
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAddSummary.ftl
Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 25 05:08:07 2019
@@ -11,4 +11,4 @@
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
/ofbiz/ofbiz-framework/trunk:1836107
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893,1859906
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl?rev=1859908=1859907=1859908=diff
==
---
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
(original)
+++
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/order/QuickAdd.ftl
Sat May 25 05:08:07 2019
@@ -16,51 +16,54 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
-<#if product??>
-
-
- ${product.productId}
-
-
-
-
-
- ${productContentWrapper.get("PRODUCT_NAME", "html")!}
-
-
- <#if price.listPrice?? && price.price?? && price.price?double <
price.listPrice?double>
-${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice
isoCode=price.currencyUsed/>
- <#else>
-
-
-
-
-<#if totalPrice??>
-${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice
isoCode=totalPrice.currencyUsed/>
-<#else>
-
-<@ofbizCurrency amount=price.price isoCode=price.currencyUsed/>
-
-
-
-
-<#-- check to see if introductionDate hasn't passed yet -->
-<#if product.introductionDate?? &&
nowTimestamp.before(product.introductionDate)>
- ${uiLabelMap.ProductNotYetAvailable}
-<#-- check to see if salesDiscontinuationDate has passed -->
-<#elseif product.salesDiscontinuationDate?? &&
nowTimestamp.before(product.salesDiscontinuationDate)>
- ${uiLabelMap.ProductNoLongerAvailable}
-<#-- check to see if the product is a virtual product -->
-<#elseif "Y" == product.isVirtual?default("N")>
-${uiLabelMap.OrderChooseVariations}...
-<#else>
-
-
-
-
-<#else>
- ${uiLabelMap.ProductErrorProductNotFound}.
+
+<#if productCategory?has_content>
+${productCategory.categoryName!}
+
+
+${productCategory.categoryName!}
+--
+<#list quickAddCats as quickAddCatalogId>
+<#assign loopCategory = delegator.findOne("ProductCategory",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productCategoryId",
quickAddCatalogId), true)>
+<#if loopCategory?has_content>
+${loopCategory.categoryName!}
+
+
+
+${uiLabelMap.ProductChooseQuickAddCategory}
+
+<#if productCategory.categoryImageUrl?? || productCategory.longDescription??>
+
+ <#if productCategory.categoryImageUrl??>
+
+${productCategory.longDescription!}
-
\ No newline at end of file
+
+
+
+<#if productCategoryMembers?? && 0 < productCategoryMembers?size>
+
+
+
+
+ ${uiLabelMap.OrderAddAllToCart}
+
+
+ <#list productCategoryMembers as productCategoryMember>
+ <#assign product = productCategoryMember.getRelatedOne("Product", true)>
+
+${setRequestAttribute("optProductId",
svn commit: r1859907 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ ecommerce/template/order/QuickAdd.ftl ecommerce/template/order/QuickAddSummary.ftl
Author: surajk
Date: Sat May 25 05:07:01 2019
New Revision: 1859907
URL: http://svn.apache.org/viewvc?rev=1859907=rev
Log:
Applied fix from trunk for revision: 1859906
===
Fixed: Unable to find any product in Quick Add functionality.
(OFBIZ-10978)
Thanks Vivek Bisen for providing the patch, Pawan Verma and Jacques Le Roux for
review.
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAddSummary.ftl
Propchange: ofbiz/ofbiz-plugins/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 25 05:07:01 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893
+/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893,1859906
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl?rev=1859907=1859906=1859907=diff
==
---
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl
(original)
+++
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAdd.ftl
Sat May 25 05:07:01 2019
@@ -16,51 +16,54 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
-<#if product??>
-
-
- ${product.productId}
-
-
-
-
-
- ${productContentWrapper.get("PRODUCT_NAME", "html")!}
-
-
- <#if price.listPrice?? && price.price?? && price.price?double <
price.listPrice?double>
-${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice
isoCode=price.currencyUsed/>
- <#else>
-
-
-
-
-<#if totalPrice??>
-${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice
isoCode=totalPrice.currencyUsed/>
-<#else>
-
-<@ofbizCurrency amount=price.price isoCode=price.currencyUsed/>
-
-
-
-
-<#-- check to see if introductionDate hasn't passed yet -->
-<#if product.introductionDate?? &&
nowTimestamp.before(product.introductionDate)>
- ${uiLabelMap.ProductNotYetAvailable}
-<#-- check to see if salesDiscontinuationDate has passed -->
-<#elseif product.salesDiscontinuationDate?? &&
nowTimestamp.before(product.salesDiscontinuationDate)>
- ${uiLabelMap.ProductNoLongerAvailable}
-<#-- check to see if the product is a virtual product -->
-<#elseif "Y" == product.isVirtual?default("N")>
-${uiLabelMap.OrderChooseVariations}...
-<#else>
-
-
-
-
-<#else>
- ${uiLabelMap.ProductErrorProductNotFound}.
+
+<#if productCategory?has_content>
+${productCategory.categoryName!}
+
+
+${productCategory.categoryName!}
+--
+<#list quickAddCats as quickAddCatalogId>
+<#assign loopCategory = delegator.findOne("ProductCategory",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productCategoryId",
quickAddCatalogId), true)>
+<#if loopCategory?has_content>
+${loopCategory.categoryName!}
+
+
+
+${uiLabelMap.ProductChooseQuickAddCategory}
+
+<#if productCategory.categoryImageUrl?? || productCategory.longDescription??>
+
+ <#if productCategory.categoryImageUrl??>
+
+${productCategory.longDescription!}
-
\ No newline at end of file
+
+
+
+<#if productCategoryMembers?? && 0 < productCategoryMembers?size>
+
+
+
+
+ ${uiLabelMap.OrderAddAllToCart}
+
+
+ <#list productCategoryMembers as productCategoryMember>
+ <#assign product = productCategoryMember.getRelatedOne("Product", true)>
+
+${setRequestAttribute("optProductId", productCategoryMember.productId)}
+${screens.render(quickaddsummaryScreen)}
+
+
+
+
+ ${uiLabelMap.OrderAddAllToCart}
+
+
+
+<#else>
+${uiLabelMap.ProductNoProductsInThisCategory}.
+
+
Modified:
ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAddSummary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ecommerce/template/order/QuickAddSummary.ftl?rev=1859907=1859906=1859907=diff
svn commit: r1859906 - in /ofbiz/ofbiz-plugins/trunk/ecommerce/template/order: QuickAdd.ftl QuickAddSummary.ftl
Author: surajk
Date: Sat May 25 05:02:06 2019
New Revision: 1859906
URL: http://svn.apache.org/viewvc?rev=1859906=rev
Log:
Fixed: Unable to find any product in Quick Add functionality.
(OFBIZ-10978)
Thanks Vivek Bisen for providing the patch, Pawan Verma and Jacques Le Roux for
review.
Modified:
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl
ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl?rev=1859906=1859905=1859906=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl (original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAdd.ftl Sat May 25
05:02:06 2019
@@ -16,51 +16,54 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
-<#if product??>
-
-
- ${product.productId}
-
-
-
-
-
- ${productContentWrapper.get("PRODUCT_NAME", "html")!}
-
-
- <#if price.listPrice?? && price.price?? && price.price?double <
price.listPrice?double>
-${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice
isoCode=price.currencyUsed/>
- <#else>
-
-
-
-
-<#if totalPrice??>
-${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice
isoCode=totalPrice.currencyUsed/>
-<#else>
-
-<@ofbizCurrency amount=price.price isoCode=price.currencyUsed/>
-
-
-
-
-<#-- check to see if introductionDate hasn't passed yet -->
-<#if product.introductionDate?? &&
nowTimestamp.before(product.introductionDate)>
- ${uiLabelMap.ProductNotYetAvailable}
-<#-- check to see if salesDiscontinuationDate has passed -->
-<#elseif product.salesDiscontinuationDate?? &&
nowTimestamp.before(product.salesDiscontinuationDate)>
- ${uiLabelMap.ProductNoLongerAvailable}
-<#-- check to see if the product is a virtual product -->
-<#elseif "Y" == product.isVirtual?default("N")>
-${uiLabelMap.OrderChooseVariations}...
-<#else>
-
-
-
-
-<#else>
- ${uiLabelMap.ProductErrorProductNotFound}.
+
+<#if productCategory?has_content>
+${productCategory.categoryName!}
+
+
+${productCategory.categoryName!}
+--
+<#list quickAddCats as quickAddCatalogId>
+<#assign loopCategory = delegator.findOne("ProductCategory",
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productCategoryId",
quickAddCatalogId), true)>
+<#if loopCategory?has_content>
+${loopCategory.categoryName!}
+
+
+
+${uiLabelMap.ProductChooseQuickAddCategory}
+
+<#if productCategory.categoryImageUrl?? || productCategory.longDescription??>
+
+ <#if productCategory.categoryImageUrl??>
+
+${productCategory.longDescription!}
-
\ No newline at end of file
+
+
+
+<#if productCategoryMembers?? && 0 < productCategoryMembers?size>
+
+
+
+
+ ${uiLabelMap.OrderAddAllToCart}
+
+
+ <#list productCategoryMembers as productCategoryMember>
+ <#assign product = productCategoryMember.getRelatedOne("Product", true)>
+
+${setRequestAttribute("optProductId", productCategoryMember.productId)}
+${screens.render(quickaddsummaryScreen)}
+
+
+
+
+ ${uiLabelMap.OrderAddAllToCart}
+
+
+
+<#else>
+${uiLabelMap.ProductNoProductsInThisCategory}.
+
+
Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl?rev=1859906=1859905=1859906=diff
==
--- ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl
(original)
+++ ofbiz/ofbiz-plugins/trunk/ecommerce/template/order/QuickAddSummary.ftl Sat
May 25 05:02:06 2019
@@ -25,17 +25,17 @@ under the License.
-
+
${productContentWrapper.get("PRODUCT_NAME", "html")!}
-
+
<#if price.listPrice?? && price.price?? && price.price?double <
price.listPrice?double>
${uiLabelMap.ProductListPrice}: <@ofbizCurrency amount=price.listPrice
isoCode=price.currencyUsed/>
<#else>
-
+
<#if totalPrice??>
${uiLabelMap.ProductAggregatedPrice}: <@ofbizCurrency amount=totalPrice
isoCode=totalPrice.currencyUsed/>
<#else>
@@ -44,7 +44,7 @@ under the License.
-
+
<#-- check to see if introductionDate hasn't passed yet -->
<#if product.introductionDate?? &&
nowTimestamp.before(product.introductionDate)>
${uiLabelMap.ProductNotYetAvailable}
svn commit: r1859901 - in /ofbiz/ofbiz-framework/trunk: applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDel
Author: mthl Date: Fri May 24 23:49:09 2019 New Revision: 1859901 URL: http://svn.apache.org/viewvc?rev=1859901=rev Log: Improved: Remove unused imports Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java?rev=1859901=1859900=1859901=diff == --- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java Fri May 24 23:49:09 2019 @@ -24,14 +24,11 @@ import java.io.Writer; import java.util.List; import java.util.Locale; -import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.GeneralRuntimeException; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java?rev=1859901=1859900=1859901=diff == --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java Fri May 24 23:49:09 2019 @@ -81,7 +81,6 @@ import org.apache.ofbiz.entity.util.Enti import org.apache.ofbiz.entity.util.EntityQuery; import org.apache.ofbiz.entity.util.EntityStoreOptions; import org.apache.ofbiz.entity.util.SequenceUtil; -import org.apache.ofbiz.entityext.eca.EntityEcaRule; import org.apache.ofbiz.entityext.eca.EntityEcaUtil; import org.w3c.dom.Document; import org.w3c.dom.Element;
buildbot success in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a restored build on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/806 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkPluginsCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-plugins/trunk] 1859893 Blamelist: jleroux Build succeeded! Sincerely, -The Buildbot
svn commit: r1859896 [1/2] - in /ofbiz/branches/release16.11: ./ specialpurpose/ebaystore/servicedef/services.xml
Author: jleroux Date: Fri May 24 17:21:42 2019 New Revision: 1859896 URL: http://svn.apache.org/viewvc?rev=1859896=rev Log: "Applied fix from plugins for revision: 1859893" Handled by hand r1859893 | jleroux | 2019-05-24 19:15:04 +0200 (ven. 24 mai 2019) | 4 lignes Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe" (OFBIZ-5254) Once again forgot to commit this changes in plugins :/ Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/specialpurpose/ebaystore/servicedef/services.xml Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 17:21:42 2019 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273, 1816289,1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247,1851319,1851805,1851998,1852587,1852818,1853070,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,18566 67,1857088,1857099,1857180,1857213,1857392,1857617,1857692,1857813,1858141,1858250,1858275,1858312,1858319,1858432,1858444,1858523,1858539,1858933,1858965,1858980,1859012,1859033,1859255,1859263,1859543,1859571,1859576,1859691,1859704,1859796,1859807,1859871,1859877,1859882 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
svn commit: r1859896 [2/2] - in /ofbiz/branches/release16.11: ./ specialpurpose/ebaystore/servicedef/services.xml
Modified: ofbiz/branches/release16.11/specialpurpose/ebaystore/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/specialpurpose/ebaystore/servicedef/services.xml?rev=1859896=1859895=1859896=diff == --- ofbiz/branches/release16.11/specialpurpose/ebaystore/servicedef/services.xml (original) +++ ofbiz/branches/release16.11/specialpurpose/ebaystore/servicedef/services.xml Fri May 24 17:21:42 2019 @@ -1,699 +1,699 @@ - - - -http://www.w3.org/2001/XMLSchema-instance; - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd;> -eBay Component Services -OFBiz -1.0 - - - - - - - - - - - - - - -Export categories in store to eBay store - - - - - - -get ebay store description - - - - -get ebay store logos description - - - - -get ebay store Basic theme Array description - - - - -get ebay store Advanced theme Array description - - - - - -get ebay store Advanced theme Array description - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Reserve Inventory in a Product Store - - - - - - - -Reserve product for ebay Inventory and make reserve for a Product By Facility -If requireInventory is Y the quantity not reserved is returned, if N then a negative -availableToPromise will be used to track quantity ordered beyond what is in stock. - - - - - - - - - - - - - - - - -update Inventory on ebay store inventory - - - - - - -get ebay folder in ebay store inventory - - - - -update status Inventory from ebay store inventory - - - - - - - - - -Update/cancel an Product quantity that reserved from inventory - - - - - -Export categories in store to eBay store - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Update EbayProductStoreInventory entity - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Create Dispute if checkout has not been completed - - - - -Create Dispute if checkout has been completed but no payment has been received - - - - -automatically service sending an email when ebay seller has been received payment from ebay buyer - - - - -Automatic service to combine orders from condition in automatically preferences screen - - - - -Automatic service to send notification email to winning buyer on eBay - - - - -Automatic service to send item dispatched notification email when user mark sold listing as dispatched - - - - -Automatic service to send item dispatched notification email when user mark sold listing as dispatched - - - - -Export Product Each
svn commit: r1859895 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ ebaystore/servicedef/services.xml
Author: jleroux Date: Fri May 24 17:17:12 2019 New Revision: 1859895 URL: http://svn.apache.org/viewvc?rev=1859895=rev Log: "Applied fix from plugins for revision: 1859893" r1859893 | jleroux | 2019-05-24 19:15:04 +0200 (ven. 24 mai 2019) | 4 lignes Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe" (OFBIZ-5254) Once again forgot to commit this changes in plugins :/ Modified: ofbiz/ofbiz-plugins/branches/release17.12/ (props changed) ofbiz/ofbiz-plugins/branches/release17.12/ebaystore/servicedef/services.xml Propchange: ofbiz/ofbiz-plugins/branches/release17.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 17:17:12 2019 @@ -11,4 +11,4 @@ /ofbiz/branches/multitenant20100310/plugins:921280-927264 /ofbiz/branches/release13.07/plugins:1547657 /ofbiz/ofbiz-framework/trunk:1836107 -/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735 +/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650,1824654,1828569,1830856,1831084,1832727,1832800,1837796,1837845,1837857,1838249,1838381,1838816,1841650,1845558,1847272,1847346,1847398,1847528,1847530,1848009,1848396,1848398,1848921,1849119,1851002,1851068,1851135,1851185,1852988,1855082,1856802,1856917,1857120,1857173,1858141,1858244,1858285,1858312,1859012,1859735,1859893 Modified: ofbiz/ofbiz-plugins/branches/release17.12/ebaystore/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ebaystore/servicedef/services.xml?rev=1859895=1859894=1859895=diff == --- ofbiz/ofbiz-plugins/branches/release17.12/ebaystore/servicedef/services.xml (original) +++ ofbiz/ofbiz-plugins/branches/release17.12/ebaystore/servicedef/services.xml Fri May 24 17:17:12 2019 @@ -491,7 +491,7 @@ under the License. - +
svn commit: r1859894 - in /ofbiz/ofbiz-plugins/branches/release18.12: ./ ebaystore/servicedef/services.xml
Author: jleroux Date: Fri May 24 17:16:44 2019 New Revision: 1859894 URL: http://svn.apache.org/viewvc?rev=1859894=rev Log: "Applied fix from plugins for revision: 1859893" r1859893 | jleroux | 2019-05-24 19:15:04 +0200 (ven. 24 mai 2019) | 4 lignes Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe" (OFBIZ-5254) Once again forgot to commit this changes in plugins :/ Modified: ofbiz/ofbiz-plugins/branches/release18.12/ (props changed) ofbiz/ofbiz-plugins/branches/release18.12/ebaystore/servicedef/services.xml Propchange: ofbiz/ofbiz-plugins/branches/release18.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 17:16:44 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900 /ofbiz/branches/multitenant20100310/plugins:921280-927264 /ofbiz/branches/release13.07/plugins:1547657 -/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735 +/ofbiz/ofbiz-plugins/trunk:1851002,1851009,1851068,1851135,1851139-1851140,1851185,1851316,1851885,1852988,1853904,1854684,1855082,1855084,1856212,1856802,1856917,1857120,1857173,1858141,1858244,1858265,1858285,1858289,1858312,1859012,1859735,1859893 Modified: ofbiz/ofbiz-plugins/branches/release18.12/ebaystore/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release18.12/ebaystore/servicedef/services.xml?rev=1859894=1859893=1859894=diff == --- ofbiz/ofbiz-plugins/branches/release18.12/ebaystore/servicedef/services.xml (original) +++ ofbiz/ofbiz-plugins/branches/release18.12/ebaystore/servicedef/services.xml Fri May 24 17:16:44 2019 @@ -491,7 +491,7 @@ under the License. - +
svn commit: r1859893 - /ofbiz/ofbiz-plugins/trunk/ebaystore/servicedef/services.xml
Author: jleroux Date: Fri May 24 17:15:04 2019 New Revision: 1859893 URL: http://svn.apache.org/viewvc?rev=1859893=rev Log: Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe" (OFBIZ-5254) Once again forgot to commit this changes in plugins :/ Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/servicedef/services.xml Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/servicedef/services.xml?rev=1859893=1859892=1859893=diff == --- ofbiz/ofbiz-plugins/trunk/ebaystore/servicedef/services.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ebaystore/servicedef/services.xml Fri May 24 17:15:04 2019 @@ -491,7 +491,7 @@ under the License. - +
svn commit: r1859890 - /ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java
Author: nmalin Date: Fri May 24 15:16:39 2019 New Revision: 1859890 URL: http://svn.apache.org/viewvc?rev=1859890=rev Log: Reverted: uneeded bad formatting push Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java Modified: ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java?rev=1859890=1859889=1859890=diff == --- ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java (original) +++ ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java Fri May 24 15:16:39 2019 @@ -1,4 +1,4 @@ - /*** +/*** * 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
svn commit: r1859889 - in /ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src: main/java/org/apache/ofbiz/entity/GenericDelegator.java test/java/org/apache/ofbiz/entity/util/EntitySaxRea
Author: nmalin
Date: Fri May 24 15:12:45 2019
New Revision: 1859889
URL: http://svn.apache.org/viewvc?rev=1859889=rev
Log:
Fixed: Backport: Manage EECAs on delegator.removeBy
(OFBIZ-11040)
When you delete some entities through removeByAnd or removeByCondition, eeca
aren't enable and the remove is quite as regard implemented rules.
With
And
delegator.removeByAnd('GoodIdentification', [productId: 'WG-'])
The service indexProductKeywords wasn't call for the productId WG-
To solve this situation, the idea would be delegator.removeValue for each
element to delete when an eeca is present otherwise call the standard
helper.removeByCondition.
Thanks to Leila Mekika for raise and fix this issue, Jacques Leroux and Mathieu
Lirzin for the review
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java?rev=1859889=1859888=1859889=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
Fri May 24 15:12:45 2019
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.net.URL;
import java.sql.Timestamp;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -79,6 +80,8 @@ import org.apache.ofbiz.entity.util.Enti
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.entity.util.EntityStoreOptions;
import org.apache.ofbiz.entity.util.SequenceUtil;
+import org.apache.ofbiz.entityext.eca.EntityEcaRule;
+import org.apache.ofbiz.entityext.eca.EntityEcaUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -1097,14 +1100,28 @@ public class GenericDelegator implements
ModelEntity modelEntity =
getModelReader().getModelEntity(entityName);
GenericHelper helper = getEntityHelper(entityName);
-List removedEntities = null;
-if (testMode) {
-removedEntities = this.findList(entityName, condition, null,
null, null, false);
-}
-
-int rowsAffected = helper.removeByCondition(this, modelEntity,
condition);
-if (rowsAffected > 0) {
-this.clearCacheLine(entityName);
+// We check if there are eca rules for this entity
+String entityEcaReaderName =
EntityEcaUtil.getEntityEcaReaderName(this.delegatorBaseName);
+boolean hasEntityEcaRules = UtilValidate.isNotEmpty(
+
EntityEcaUtil.getEntityEcaCache(entityEcaReaderName).get(entityName));
+
+// When we delete in mass, if we are in test mode or the entity
have an eeca linked we will remove one by one
+// for test mode to help the rollback
+// for eeca to analyse each value to check if a condition match
+List removedEntities = (testMode ||
hasEntityEcaRules)
+? findList(entityName, condition, null, null, null, false)
+: Collections.emptyList();
+
+int rowsAffected = 0;
+if (! removedEntities.isEmpty()) {
+for (GenericValue entity : removedEntities) {
+rowsAffected += removeValue(entity);
+}
+} else {
+rowsAffected = helper.removeByCondition(this, modelEntity,
condition);
+if (rowsAffected > 0) {
+this.clearCacheLine(entityName);
+}
}
if (testMode) {
Modified:
ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java?rev=1859889=1859888=1859889=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java
Fri May 24 15:12:45 2019
@@ -1,4
svn commit: r1859888 - /ofbiz/ofbiz-framework/branches/release18.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
Author: nmalin
Date: Fri May 24 15:08:22 2019
New Revision: 1859888
URL: http://svn.apache.org/viewvc?rev=1859888=rev
Log:
Fixed: Backport: Manage EECAs on delegator.removeBy
(OFBIZ-11040)
When you delete some entities through removeByAnd or removeByCondition, eeca
aren't enable and the remove is quite as regard implemented rules.
With
And
delegator.removeByAnd('GoodIdentification', [productId: 'WG-'])
The service indexProductKeywords wasn't call for the productId WG-
To solve this situation, the idea would be delegator.removeValue for each
element to delete when an eeca is present otherwise call the standard
helper.removeByCondition.
Thanks to Leila Mekika for raise and fix this issue, Jacques Leroux and Mathieu
Lirzin for the review
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java?rev=1859888=1859887=1859888=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
Fri May 24 15:08:22 2019
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.net.URL;
import java.sql.Timestamp;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -80,6 +81,8 @@ import org.apache.ofbiz.entity.util.Enti
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.entity.util.EntityStoreOptions;
import org.apache.ofbiz.entity.util.SequenceUtil;
+import org.apache.ofbiz.entityext.eca.EntityEcaRule;
+import org.apache.ofbiz.entityext.eca.EntityEcaUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -1091,14 +1094,28 @@ public class GenericDelegator implements
ModelEntity modelEntity =
getModelReader().getModelEntity(entityName);
GenericHelper helper = getEntityHelper(entityName);
-List removedEntities = null;
-if (testMode) {
-removedEntities = this.findList(entityName, condition, null,
null, null, false);
-}
-
-int rowsAffected = helper.removeByCondition(this, modelEntity,
condition);
-if (rowsAffected > 0) {
-this.clearCacheLine(entityName);
+// We check if there are eca rules for this entity
+String entityEcaReaderName =
EntityEcaUtil.getEntityEcaReaderName(this.delegatorBaseName);
+boolean hasEntityEcaRules = UtilValidate.isNotEmpty(
+
EntityEcaUtil.getEntityEcaCache(entityEcaReaderName).get(entityName));
+
+// When we delete in mass, if we are in test mode or the entity
have an eeca linked we will remove one by one
+// for test mode to help the rollback
+// for eeca to analyse each value to check if a condition match
+List removedEntities = (testMode ||
hasEntityEcaRules)
+? findList(entityName, condition, null, null, null, false)
+: Collections.emptyList();
+
+int rowsAffected = 0;
+if (! removedEntities.isEmpty()) {
+for (GenericValue entity : removedEntities) {
+rowsAffected += removeValue(entity);
+}
+} else {
+rowsAffected = helper.removeByCondition(this, modelEntity,
condition);
+if (rowsAffected > 0) {
+this.clearCacheLine(entityName);
+}
}
if (testMode) {
svn commit: r1859887 - /ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
Author: nmalin
Date: Fri May 24 15:07:30 2019
New Revision: 1859887
URL: http://svn.apache.org/viewvc?rev=1859887=rev
Log:
Fixed: Manage EECAs on delegator.removeBy
(OFBIZ-11040)
When you delete some entities through removeByAnd or removeByCondition, eeca
aren't enable and the remove is quite as regard implemented rules.
With
And
delegator.removeByAnd('GoodIdentification', [productId: 'WG-'])
The service indexProductKeywords wasn't call for the productId WG-
To solve this situation, the idea would be delegator.removeValue for each
element to delete when an eeca is present otherwise call the standard
helper.removeByCondition.
Thanks to Leila Mekika for raise and fix this issue, Jacques Leroux and Mathieu
Lirzin for the review
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java?rev=1859887=1859886=1859887=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
Fri May 24 15:07:30 2019
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.net.URL;
import java.sql.Timestamp;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -80,6 +81,8 @@ import org.apache.ofbiz.entity.util.Enti
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.entity.util.EntityStoreOptions;
import org.apache.ofbiz.entity.util.SequenceUtil;
+import org.apache.ofbiz.entityext.eca.EntityEcaRule;
+import org.apache.ofbiz.entityext.eca.EntityEcaUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -1073,14 +1076,28 @@ public class GenericDelegator implements
ModelEntity modelEntity =
getModelReader().getModelEntity(entityName);
GenericHelper helper = getEntityHelper(entityName);
-List removedEntities = null;
-if (testMode) {
-removedEntities = this.findList(entityName, condition, null,
null, null, false);
-}
-
-int rowsAffected = helper.removeByCondition(this, modelEntity,
condition);
-if (rowsAffected > 0) {
-this.clearCacheLine(entityName);
+// We check if there are eca rules for this entity
+String entityEcaReaderName =
EntityEcaUtil.getEntityEcaReaderName(this.delegatorBaseName);
+boolean hasEntityEcaRules = UtilValidate.isNotEmpty(
+
EntityEcaUtil.getEntityEcaCache(entityEcaReaderName).get(entityName));
+
+// When we delete in mass, if we are in test mode or the entity
have an eeca linked we will remove one by one
+// for test mode to help the rollback
+// for eeca to analyse each value to check if a condition match
+List removedEntities = (testMode ||
hasEntityEcaRules)
+? findList(entityName, condition, null, null, null, false)
+: Collections.emptyList();
+
+int rowsAffected = 0;
+if (! removedEntities.isEmpty()) {
+for (GenericValue entity : removedEntities) {
+rowsAffected += removeValue(entity);
+}
+} else {
+rowsAffected = helper.removeByCondition(this, modelEntity,
condition);
+if (rowsAffected > 0) {
+this.clearCacheLine(entityName);
+}
}
if (testMode) {
buildbot failure in on ofbizBranch18Framework
The Buildbot has detected a new failure on builder ofbizBranch18Framework while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch18Framework/builds/127 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch18FrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release18.12] 1859878 Blamelist: jleroux BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
buildbot failure in on ofbizTrunkFramework
The Buildbot has detected a new failure on builder ofbizTrunkFramework while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFramework/builds/856 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onTrunkFrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1859877 Blamelist: jleroux BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
svn commit: r1859885 - in /ofbiz/branches/release16.11: ./ framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Author: jleroux Date: Fri May 24 14:17:09 2019 New Revision: 1859885 URL: http://svn.apache.org/viewvc?rev=1859885=rev Log: "Applied fix from trunk framework for revision: 1859882" r1859882 | jleroux | 2019-05-24 16:16:39 +0200 (ven. 24 mai 2019) | 5 lignes Improved: no functional change Javadoc was unhappy: CustomPermissivePolicy.java:13: error: element not closed: blockquote Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 14:17:09 2019 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273, 1816289,1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247,1851319,1851805,1851998,1852587,1852818,1853070,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,18566 67,1857088,1857099,1857180,1857213,1857392,1857617,1857692,1857813,1858141,1858250,1858275,1858312,1858319,1858432,1858444,1858523,1858539,1858933,1858965,1858980,1859012,1859033,1859255,1859263,1859543,1859571,1859576,1859691,1859704,1859796,1859807,1859871,1859877 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
svn commit: r1859884 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Author: jleroux Date: Fri May 24 14:17:07 2019 New Revision: 1859884 URL: http://svn.apache.org/viewvc?rev=1859884=rev Log: "Applied fix from trunk for revision: 1859882" r1859882 | jleroux | 2019-05-24 16:16:39 +0200 (ven. 24 mai 2019) | 5 lignes Improved: no functional change Javadoc was unhappy: CustomPermissivePolicy.java:13: error: element not closed: blockquote Modified: ofbiz/ofbiz-framework/branches/release17.12/ (props changed) ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java Propchange: ofbiz/ofbiz-framework/branches/release17.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 14:17:07 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715, 1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849165,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350,1851805,1851998,1852587,1852818,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,1856667,1857088,1857099,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858250,1858256,1858275,1858319,1858432,1858444,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877 +/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715, 1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849165,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350,1851805,1851998,1852587,1852818,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,1856667,1857088,1857099,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858250,1858256,1858275,1858319,1858432,1858444,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882 Modified:
svn commit: r1859883 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Author: jleroux Date: Fri May 24 14:17:04 2019 New Revision: 1859883 URL: http://svn.apache.org/viewvc?rev=1859883=rev Log: "Applied fix from trunk for revision: 1859882" r1859882 | jleroux | 2019-05-24 16:16:39 +0200 (ven. 24 mai 2019) | 5 lignes Improved: no functional change Javadoc was unhappy: CustomPermissivePolicy.java:13: error: element not closed: blockquote Modified: ofbiz/ofbiz-framework/branches/release18.12/ (props changed) ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java Propchange: ofbiz/ofbiz-framework/branches/release18.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 14:17:04 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877 +/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882 Modified: ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java?rev=1859883=1859882=1859883=diff == --- ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java (original) +++ ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java Fri May 24 14:17:04 2019 @@ -10,7 +10,7 @@ import com.google.common.base.Predicate; /** * Based on the http://www.owasp.org/index.php/Category:OWASP_AntiSamy_Project#Stage_2_-_Choosing_a_base_policy_file;>AntiSamy - * EBay example. eBay (http://www.ebay.com/) is the most + * EBay example. eBay (http://www.ebay.com/) is the most * popular online auction site in the universe, as far as I can tell. It is a * public site so anyone is allowed to post listings with rich HTML content. * It's not surprising that given the attractiveness of eBay as a target that it
svn commit: r1859882 - /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Author: jleroux Date: Fri May 24 14:16:39 2019 New Revision: 1859882 URL: http://svn.apache.org/viewvc?rev=1859882=rev Log: Improved: no functional change Javadoc was unhappy: CustomPermissivePolicy.java:13: error: element not closed: blockquote Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java?rev=1859882=1859881=1859882=diff == --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java Fri May 24 14:16:39 2019 @@ -10,7 +10,7 @@ import com.google.common.base.Predicate; /** * Based on the http://www.owasp.org/index.php/Category:OWASP_AntiSamy_Project#Stage_2_-_Choosing_a_base_policy_file;>AntiSamy - * EBay example. eBay (http://www.ebay.com/) is the most + * EBay example. eBay (http://www.ebay.com/) is the most * popular online auction site in the universe, as far as I can tell. It is a * public site so anyone is allowed to post listings with rich HTML content. * It's not surprising that given the attractiveness of eBay as a target that it
svn propchange: r1859878 - svn:log
Author: jleroux Revision: 1859878 Modified property: svn:log Modified: svn:log at Fri May 24 14:08:39 2019 -- --- svn:log (original) +++ svn:log Fri May 24 14:08:39 2019 @@ -8,7 +8,7 @@ Fixed: Services allow arbitrary HTML for This was reopened after discussion at https://markmail.org/message/jnaitmwahjcjmdn5 -This is a new solution which follows the work done with and OFBIZ-10187 +This is a new solution which follows the work done with OFBIZ-6669 and OFBIZ-10187 Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers Thanks: Christoph Neuroth for report
svn propchange: r1859880 - svn:log
Author: jleroux Revision: 1859880 Modified property: svn:log Modified: svn:log at Fri May 24 14:08:57 2019 -- --- svn:log (original) +++ svn:log Fri May 24 14:08:57 2019 @@ -8,9 +8,8 @@ Fixed: Services allow arbitrary HTML for This was reopened after discussion at https://markmail.org/message/jnaitmwahjcjmdn5 -This is a new solution which follows the work done with and OFBIZ-10187 +This is a new solution which follows the work done with OFBIZ-6669 and OFBIZ-10187 Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers Thanks: Christoph Neuroth for report -
svn propchange: r1859877 - svn:log
Author: jleroux Revision: 1859877 Modified property: svn:log Modified: svn:log at Fri May 24 14:08:12 2019 -- --- svn:log (original) +++ svn:log Fri May 24 14:08:12 2019 @@ -4,7 +4,7 @@ Fixed: Services allow arbitrary HTML for This was reopened after discussion at https://markmail.org/message/jnaitmwahjcjmdn5 -This is a new solution which follows the work done with and OFBIZ-10187 +This is a new solution which follows the work done with OFBIZ-6669 and OFBIZ-10187 Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers Thanks: Christoph Neuroth for report
svn propchange: r1859879 - svn:log
Author: jleroux Revision: 1859879 Modified property: svn:log Modified: svn:log at Fri May 24 14:08:33 2019 -- --- svn:log (original) +++ svn:log Fri May 24 14:08:33 2019 @@ -8,7 +8,7 @@ Fixed: Services allow arbitrary HTML for This was reopened after discussion at https://markmail.org/message/jnaitmwahjcjmdn5 -This is a new solution which follows the work done with and OFBIZ-10187 +This is a new solution which follows the work done with OFBIZ-6669 and OFBIZ-10187 Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers Thanks: Christoph Neuroth for report
buildbot failure in on ofbizBranch17Framework
The Buildbot has detected a new failure on builder ofbizBranch17Framework while building . Full details are available at: https://ci.apache.org/builders/ofbizBranch17Framework/builds/283 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'onBranch17FrameworkCommit' triggered this build Build Source Stamp: [branch ofbiz/ofbiz-framework/branches/release17.12] 1859879 Blamelist: jleroux BUILD FAILED: failed shell_2 Sincerely, -The Buildbot
svn commit: r1859880 - in /ofbiz/branches/release16.11: ./ applications/accounting/servicedef/ applications/content/servicedef/ applications/marketing/servicedef/ applications/order/servicedef/ applic
Author: jleroux Date: Fri May 24 13:57:20 2019 New Revision: 1859880 URL: http://svn.apache.org/viewvc?rev=1859880=rev Log: "Applied fix from trunk framework for revision: 1859877" r1859877 | jleroux | 2019-05-24 15:47:08 +0200 (ven. 24 mai 2019) | 10 lignes Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe" (OFBIZ-5254) This was reopened after discussion at https://markmail.org/message/jnaitmwahjcjmdn5 This is a new solution which follows the work done with and OFBIZ-10187 Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers Thanks: Christoph Neuroth for report Added: ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java - copied unchanged from r1859877, ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/accounting/servicedef/services_agreement.xml ofbiz/branches/release16.11/applications/accounting/servicedef/services_invoice.xml ofbiz/branches/release16.11/applications/content/servicedef/services.xml ofbiz/branches/release16.11/applications/content/servicedef/services_content.xml ofbiz/branches/release16.11/applications/content/servicedef/services_data.xml ofbiz/branches/release16.11/applications/marketing/servicedef/services_opportunity.xml ofbiz/branches/release16.11/applications/order/servicedef/services.xml ofbiz/branches/release16.11/applications/order/servicedef/services_quote.xml ofbiz/branches/release16.11/applications/order/servicedef/services_request.xml ofbiz/branches/release16.11/applications/party/servicedef/services.xml ofbiz/branches/release16.11/applications/product/servicedef/services.xml ofbiz/branches/release16.11/applications/product/servicedef/services_pricepromo.xml ofbiz/branches/release16.11/applications/workeffort/servicedef/services.xml ofbiz/branches/release16.11/framework/base/config/owasp.properties ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java ofbiz/branches/release16.11/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java ofbiz/branches/release16.11/framework/common/config/SecurityUiLabels.xml ofbiz/branches/release16.11/framework/common/servicedef/services.xml ofbiz/branches/release16.11/framework/common/servicedef/services_email.xml ofbiz/branches/release16.11/framework/service/dtd/services.xsd ofbiz/branches/release16.11/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java Propchange: ofbiz/branches/release16.11/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 13:57:20 2019 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
svn commit: r1859879 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/accounting/servicedef/ applications/content/servicedef/ applications/marketing/servicedef/ applications/order/se
Author: jleroux Date: Fri May 24 13:52:11 2019 New Revision: 1859879 URL: http://svn.apache.org/viewvc?rev=1859879=rev Log: "Applied fix from trunk for revision: 1859877" r1859877 | jleroux | 2019-05-24 15:47:08 +0200 (ven. 24 mai 2019) | 10 lignes Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe" (OFBIZ-5254) This was reopened after discussion at https://markmail.org/message/jnaitmwahjcjmdn5 This is a new solution which follows the work done with and OFBIZ-10187 Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers Thanks: Christoph Neuroth for report Added: ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java - copied unchanged from r1859877, ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java Modified: ofbiz/ofbiz-framework/branches/release17.12/ (props changed) ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/servicedef/services_agreement.xml ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/servicedef/services_invoice.xml ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services.xml ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services_content.xml ofbiz/ofbiz-framework/branches/release17.12/applications/content/servicedef/services_data.xml ofbiz/ofbiz-framework/branches/release17.12/applications/marketing/servicedef/services_opportunity.xml ofbiz/ofbiz-framework/branches/release17.12/applications/order/servicedef/services.xml ofbiz/ofbiz-framework/branches/release17.12/applications/order/servicedef/services_quote.xml ofbiz/ofbiz-framework/branches/release17.12/applications/order/servicedef/services_request.xml ofbiz/ofbiz-framework/branches/release17.12/applications/party/servicedef/services.xml ofbiz/ofbiz-framework/branches/release17.12/applications/product/servicedef/services.xml ofbiz/ofbiz-framework/branches/release17.12/applications/product/servicedef/services_pricepromo.xml ofbiz/ofbiz-framework/branches/release17.12/applications/workeffort/servicedef/services.xml ofbiz/ofbiz-framework/branches/release17.12/framework/base/config/owasp.properties ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java ofbiz/ofbiz-framework/branches/release17.12/framework/common/config/SecurityUiLabels.xml ofbiz/ofbiz-framework/branches/release17.12/framework/common/servicedef/services.xml ofbiz/ofbiz-framework/branches/release17.12/framework/common/servicedef/services_email.xml ofbiz/ofbiz-framework/branches/release17.12/framework/service/dtd/services.xsd ofbiz/ofbiz-framework/branches/release17.12/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java Propchange: ofbiz/ofbiz-framework/branches/release17.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 13:52:11 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
svn commit: r1859878 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ applications/accounting/servicedef/ applications/content/servicedef/ applications/marketing/servicedef/ applications/order/se
Author: jleroux Date: Fri May 24 13:51:26 2019 New Revision: 1859878 URL: http://svn.apache.org/viewvc?rev=1859878=rev Log: "Applied fix from trunk for revision: 1859877" r1859877 | jleroux | 2019-05-24 15:47:08 +0200 (ven. 24 mai 2019) | 10 lignes Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe" (OFBIZ-5254) This was reopened after discussion at https://markmail.org/message/jnaitmwahjcjmdn5 This is a new solution which follows the work done with and OFBIZ-10187 Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers Thanks: Christoph Neuroth for report Added: ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java - copied unchanged from r1859877, ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java Modified: ofbiz/ofbiz-framework/branches/release18.12/ (props changed) ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/servicedef/services_agreement.xml ofbiz/ofbiz-framework/branches/release18.12/applications/accounting/servicedef/services_invoice.xml ofbiz/ofbiz-framework/branches/release18.12/applications/content/servicedef/services.xml ofbiz/ofbiz-framework/branches/release18.12/applications/content/servicedef/services_content.xml ofbiz/ofbiz-framework/branches/release18.12/applications/content/servicedef/services_data.xml ofbiz/ofbiz-framework/branches/release18.12/applications/marketing/servicedef/services_opportunity.xml ofbiz/ofbiz-framework/branches/release18.12/applications/order/servicedef/services.xml ofbiz/ofbiz-framework/branches/release18.12/applications/order/servicedef/services_quote.xml ofbiz/ofbiz-framework/branches/release18.12/applications/order/servicedef/services_request.xml ofbiz/ofbiz-framework/branches/release18.12/applications/party/servicedef/services.xml ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services.xml ofbiz/ofbiz-framework/branches/release18.12/applications/product/servicedef/services_pricepromo.xml ofbiz/ofbiz-framework/branches/release18.12/applications/workeffort/servicedef/services.xml ofbiz/ofbiz-framework/branches/release18.12/framework/base/config/owasp.properties ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java ofbiz/ofbiz-framework/branches/release18.12/framework/common/config/SecurityUiLabels.xml ofbiz/ofbiz-framework/branches/release18.12/framework/common/servicedef/services.xml ofbiz/ofbiz-framework/branches/release18.12/framework/common/servicedef/services_email.xml ofbiz/ofbiz-framework/branches/release18.12/framework/service/dtd/services.xsd ofbiz/ofbiz-framework/branches/release18.12/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java Propchange: ofbiz/ofbiz-framework/branches/release18.12/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 24 13:51:26 2019 @@ -10,4 +10,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871
buildbot exception in on ofbizTrunkFrameworkPlugins
The Buildbot has detected a build exception on builder ofbizTrunkFrameworkPlugins while building . Full details are available at: https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/805 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: downstream Build Source Stamp: [branch ofbiz/ofbiz-framework/trunk] 1859871 Blamelist: jleroux BUILD FAILED: exception shell_2 upload_1 Sincerely, -The Buildbot
svn commit: r1859877 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/servicedef/ applications/content/servicedef/ applications/marketing/servicedef/ applications/order/servicedef/ applicati
Author: jleroux Date: Fri May 24 13:47:08 2019 New Revision: 1859877 URL: http://svn.apache.org/viewvc?rev=1859877=rev Log: Fixed: Services allow arbitrary HTML for parameters with allow-html set to "safe" (OFBIZ-5254) This was reopened after discussion at https://markmail.org/message/jnaitmwahjcjmdn5 This is a new solution which follows the work done with and OFBIZ-10187 Roughly said, it uses org.owasp.html.PolicyFactory and org.owasp.html.Sanitizers Thanks: Christoph Neuroth for report Added: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomSafePolicy.java (with props) Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_agreement.xml ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_invoice.xml ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services.xml ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services_content.xml ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services_data.xml ofbiz/ofbiz-framework/trunk/applications/marketing/servicedef/services_opportunity.xml ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services.xml ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_quote.xml ofbiz/ofbiz-framework/trunk/applications/order/servicedef/services_request.xml ofbiz/ofbiz-framework/trunk/applications/party/servicedef/services.xml ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services.xml ofbiz/ofbiz-framework/trunk/applications/product/servicedef/services_pricepromo.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml ofbiz/ofbiz-framework/trunk/framework/base/config/owasp.properties ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java ofbiz/ofbiz-framework/trunk/framework/common/config/SecurityUiLabels.xml ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services.xml ofbiz/ofbiz-framework/trunk/framework/common/servicedef/services_email.xml ofbiz/ofbiz-framework/trunk/framework/service/dtd/services.xsd ofbiz/ofbiz-framework/trunk/framework/service/src/main/java/org/apache/ofbiz/service/ModelService.java Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_agreement.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_agreement.xml?rev=1859877=1859876=1859877=diff == --- ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_agreement.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_agreement.xml Fri May 24 13:47:08 2019 @@ -29,14 +29,14 @@ under the License. - + Update an Agreement - + Expire an Agreement @@ -60,7 +60,7 @@ under the License. - + @@ -68,7 +68,7 @@ under the License. - + Remove an AgreementItem @@ -102,14 +102,14 @@ under the License. - + Update an AgreementTerm - + Delete an AgreementTerm Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_invoice.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_invoice.xml?rev=1859877=1859876=1859877=diff == --- ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_invoice.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/servicedef/services_invoice.xml Fri May 24 13:47:08 2019 @@ -56,8 +56,8 @@ under the License. - - + + @@ -80,8 +80,8 @@ under the License. - - + + @@ -117,7 +117,7 @@ under the License. - + @@ -125,7 +125,7 @@ under the License. - + @@ -429,7 +429,7 @@ under the License. - + @@ -439,7 +439,7 @@ under the License. - + Modified: ofbiz/ofbiz-framework/trunk/applications/content/servicedef/services.xml URL:
svn commit: r1859876 - in /ofbiz/tools/demo-backup: Nicolas/functions.sh Nicolas/trunk.sh trunk.sh
Author: nmalin
Date: Fri May 24 13:44:11 2019
New Revision: 1859876
URL: http://svn.apache.org/viewvc?rev=1859876=rev
Log:
Improved: Call nit-gradle-wrapper.sh if gradlew not present
To prepare commit issue :
Remove the Gradle wrapper from our release packages
and add a step to our build notes (OFBIZ-10145)
Modified:
ofbiz/tools/demo-backup/Nicolas/functions.sh
ofbiz/tools/demo-backup/Nicolas/trunk.sh
ofbiz/tools/demo-backup/trunk.sh
Modified: ofbiz/tools/demo-backup/Nicolas/functions.sh
URL:
http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/functions.sh?rev=1859876=1859875=1859876=diff
==
--- ofbiz/tools/demo-backup/Nicolas/functions.sh (original)
+++ ofbiz/tools/demo-backup/Nicolas/functions.sh Fri May 24 13:44:11 2019
@@ -37,4 +37,11 @@ applyPatches () {
for i in $(ls $2); do
patch -p0 < $2/$i;
done
+}
+
+#control if gradlew is present, otherwise init it before
+checkGradlew () {
+if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
+sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
+fi
}
\ No newline at end of file
Modified: ofbiz/tools/demo-backup/Nicolas/trunk.sh
URL:
http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/trunk.sh?rev=1859876=1859875=1859876=diff
==
--- ofbiz/tools/demo-backup/Nicolas/trunk.sh (original)
+++ ofbiz/tools/demo-backup/Nicolas/trunk.sh Fri May 24 13:44:11 2019
@@ -18,6 +18,8 @@ removeUneededFiles $OFBIZ_DIR
applyPatches $OFBIZ_DIR ~/patch/trunk
+checkGradlew
+
# run OFBiz
./gradlew --no-daemon loadAll
./gradlew --no-daemon svnInfoFooter
Modified: ofbiz/tools/demo-backup/trunk.sh
URL:
http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/trunk.sh?rev=1859876=1859875=1859876=diff
==
--- ofbiz/tools/demo-backup/trunk.sh (original)
+++ ofbiz/tools/demo-backup/trunk.sh Fri May 24 13:44:11 2019
@@ -4,6 +4,11 @@ cd /home/ofbizDemo/trunk
svn up
rm /home/ofbizDemo/trunk/framework/base/config/*.jks
rm /home/ofbizDemo/trunk/framework/base/config/jesse.properties
+
+if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
+sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
+fi
+
./gradlew --no-daemon pullAllPluginsSource
./gradlew --no-daemon terminateOfbiz
./gradlew --no-daemon cleanAll
svn commit: r1859875 - in /ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins: elrte-1.3/css/smoothness/ jsTree/themes/apple/ jsTree/themes/classic/ jsTree/theme
Author: jleroux
Date: Fri May 24 13:40:19 2019
New Revision: 1859875
URL: http://svn.apache.org/viewvc?rev=1859875=rev
Log:
Fixed: no functional changes
Revert changes from r1859873 which inadvertently slipped in
Modified:
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/elrte-1.3/css/smoothness/jquery-ui-1.8.13.custom.css
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/jsTree/themes/apple/style.css
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/jsTree/themes/classic/style.css
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/jsTree/themes/default-rtl/style.css
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/jsTree/themes/default/style.css
Modified:
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/elrte-1.3/css/smoothness/jquery-ui-1.8.13.custom.css
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/elrte-1.3/css/smoothness/jquery-ui-1.8.13.custom.css?rev=1859875=1859874=1859875=diff
==
---
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/elrte-1.3/css/smoothness/jquery-ui-1.8.13.custom.css
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/elrte-1.3/css/smoothness/jquery-ui-1.8.13.custom.css
Fri May 24 13:40:19 2019
@@ -59,26 +59,26 @@
.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
.ui-widget .ui-widget { font-size: 1em; }
.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #aa; background: #ff
url(/images/ui-bg_flat_75_ff_40x100.png) 50% 50% repeat-x; color: #22; }
+.ui-widget-content { border: 1px solid #aa; background: #ff
url(images/ui-bg_flat_75_ff_40x100.png) 50% 50% repeat-x; color: #22; }
.ui-widget-content a { color: #22; }
-.ui-widget-header { border: 1px solid #aa; background: #cc
url(/images/ui-bg_highlight-soft_75_cc_1x100.png) 50% 50% repeat-x; color:
#22; font-weight: bold; }
+.ui-widget-header { border: 1px solid #aa; background: #cc
url(images/ui-bg_highlight-soft_75_cc_1x100.png) 50% 50% repeat-x; color:
#22; font-weight: bold; }
.ui-widget-header a { color: #22; }
/* Interaction states
--*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header
.ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6
url(/images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight:
normal; color: #55; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header
.ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6
url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight:
normal; color: #55; }
.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
color: #55; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header
.ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus { border: 1px solid #99; background:
#dadada url(/images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
font-weight: normal; color: #212121; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header
.ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus,
.ui-widget-header .ui-state-focus { border: 1px solid #99; background:
#dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
font-weight: normal; color: #212121; }
.ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration:
none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header
.ui-state-active { border: 1px solid #aa; background: #ff
url(/images/ui-bg_glass_65_ff_1x400.png) 50% 50% repeat-x; font-weight:
normal; color: #212121; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header
.ui-state-active { border: 1px solid #aa; background: #ff
url(images/ui-bg_glass_65_ff_1x400.png) 50% 50% repeat-x; font-weight:
normal; color: #212121; }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
color: #212121; text-decoration: none; }
.ui-widget :active { outline: none; }
/* Interaction Cues
--*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header
.ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee
svn commit: r1859872 - in /ofbiz/ofbiz-framework/branches/release18.12: ./ framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Author: jleroux
Date: Fri May 24 13:27:35 2019
New Revision: 1859872
URL: http://svn.apache.org/viewvc?rev=1859872=rev
Log:
"Applied fix from trunk for revision: 1859871"
r1859871 | jleroux | 2019-05-24 15:24:31 +0200 (ven. 24 mai 2019) | 14 lignes
Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)
After a discussion with Dennis, I checked and the pattern ONSITE_URL would be
useless without
.allowAttributes("background").matching(ONSITE_URL)
.onElements("table")
.allowAttributes("background").matching(ONSITE_URL)
.onElements("td", "th", "tr")
So here they are
Thanks: Dennis Balkir for discussion
Modified:
ofbiz/ofbiz-framework/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 24 13:27:35 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java?rev=1859872=1859871=1859872=diff
==
---
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Fri May 24 13:27:35 2019
@@ -17,7 +17,7 @@ import com.google.common.base.Predicate;
* has been subject to a few complex XSS attacks. Listings are allowed to
* contain much more rich content than, say, Slashdot- so it's attack surface
is
* considerably larger. The following tags appear to be accepted by eBay (they
- * don't publish rules): {@code },...
+ * don't publish rules): {@code },...
*/
public class CustomPermissivePolicy implements SanitizerCustomPolicy {
@@ -112,11 +112,15 @@ public class CustomPermissivePolicy impl
.matching(NUMBER).onElements("table")
.allowAttributes("bgcolor").matching(COLOR_NAME_OR_COLOR_CODE)
.onElements("table")
+.allowAttributes("background").matching(ONSITE_URL)
+.onElements("table")
+.allowAttributes("background").matching(ONSITE_URL)
+.onElements("td", "th", "tr")
.allowAttributes("align").matching(ALIGN)
.onElements("table")
.allowAttributes("noresize").matching(Pattern.compile("(?i)noresize"))
.onElements("table")
-
svn commit: r1859873 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ framework/base/src/main/java/org/apache/ofbiz/base/html/ themes/common/webapp/common/js/jquery/plugins/elrte-1.3/css/smoothne
Author: jleroux
Date: Fri May 24 13:27:38 2019
New Revision: 1859873
URL: http://svn.apache.org/viewvc?rev=1859873=rev
Log:
"Applied fix from trunk for revision: 1859871"
r1859871 | jleroux | 2019-05-24 15:24:31 +0200 (ven. 24 mai 2019) | 14 lignes
Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)
After a discussion with Dennis, I checked and the pattern ONSITE_URL would be
useless without
.allowAttributes("background").matching(ONSITE_URL)
.onElements("table")
.allowAttributes("background").matching(ONSITE_URL)
.onElements("td", "th", "tr")
So here they are
Thanks: Dennis Balkir for discussion
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/elrte-1.3/css/smoothness/jquery-ui-1.8.13.custom.css
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/jsTree/themes/apple/style.css
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/jsTree/themes/classic/style.css
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/jsTree/themes/default-rtl/style.css
ofbiz/ofbiz-framework/branches/release17.12/themes/common/webapp/common/js/jquery/plugins/jsTree/themes/default/style.css
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 24 13:27:38 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849165,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350,1851805,1851998,1852587,1852818,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,1856667,1857088,1857099,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858250,1858256,1858275,1858319,1858432,1858444,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
svn commit: r1859874 - in /ofbiz/branches/release16.11: ./ framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Author: jleroux
Date: Fri May 24 13:27:38 2019
New Revision: 1859874
URL: http://svn.apache.org/viewvc?rev=1859874=rev
Log:
"Applied fix from trunk framework for revision: 1859871"
r1859871 | jleroux | 2019-05-24 15:24:31 +0200 (ven. 24 mai 2019) | 14 lignes
Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)
After a discussion with Dennis, I checked and the pattern ONSITE_URL would be
useless without
.allowAttributes("background").matching(ONSITE_URL)
.onElements("table")
.allowAttributes("background").matching(ONSITE_URL)
.onElements("td", "th", "tr")
So here they are
Thanks: Dennis Balkir for discussion
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Propchange: ofbiz/branches/release16.11/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 24 13:27:38 2019
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
1816289,1816291,1816297,1816369,1816373,1816461,1816635,1816795,1818101,1818269,1818273,1818402,1819122,1819136,1819144,1819811,1820823,1820949,1820966,1821012,1821036,1821613,1821965,1822310,1822377,1822383,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825233,1825262,1825444,1825450,1826374,1826592,1826671,1826805,1826938,1828255,1830936,1831234,1831608,1831831,1832577,1832662,1832756,1832944,1833211,1834181,1834191,1835235,1836144,1838032,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1845418,1845420,1845466,1845544,1845552,1846214,1846594,1846632,1847398,1848263,1848336,1848398,1848444,1848449,1849191,1849193,1849275,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850685,1850914,1850918,1850948,1851200,1851247,1851319,1851805,1851998,1852587,1852818,1853070,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,18566
67,1857088,1857099,1857180,1857213,1857392,1857617,1857692,1857813,1858141,1858250,1858275,1858312,1858319,1858432,1858444,1858523,1858539,1858933,1858965,1858980,1859012,1859033,1859255,1859263,1859543,1859571,1859576,1859691,1859704,1859796,1859807
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1793300,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801316,1801318-1801319,1801336,1801340,1801346,1801349-1801350,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814392,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,
svn commit: r1859871 - /ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Author: jleroux
Date: Fri May 24 13:24:31 2019
New Revision: 1859871
URL: http://svn.apache.org/viewvc?rev=1859871=rev
Log:
Fixed: OWASP sanitizer breaks proper rendering of HTML code
(OFBIZ-10187)
After a discussion with Dennis, I checked and the pattern ONSITE_URL would be
useless without
.allowAttributes("background").matching(ONSITE_URL)
.onElements("table")
.allowAttributes("background").matching(ONSITE_URL)
.onElements("td", "th", "tr")
So here they are
Thanks: Dennis Balkir for discussion
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java?rev=1859871=1859870=1859871=diff
==
---
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/html/CustomPermissivePolicy.java
Fri May 24 13:24:31 2019
@@ -17,7 +17,7 @@ import com.google.common.base.Predicate;
* has been subject to a few complex XSS attacks. Listings are allowed to
* contain much more rich content than, say, Slashdot- so it's attack surface
is
* considerably larger. The following tags appear to be accepted by eBay (they
- * don't publish rules): {@code },...
+ * don't publish rules): {@code },...
*/
public class CustomPermissivePolicy implements SanitizerCustomPolicy {
@@ -111,11 +111,15 @@ public class CustomPermissivePolicy impl
.matching(NUMBER).onElements("table")
.allowAttributes("bgcolor").matching(COLOR_NAME_OR_COLOR_CODE)
.onElements("table")
+.allowAttributes("background").matching(ONSITE_URL)
+.onElements("table")
+.allowAttributes("background").matching(ONSITE_URL)
+.onElements("td", "th", "tr")
.allowAttributes("align").matching(ALIGN)
.onElements("table")
.allowAttributes("noresize").matching(Pattern.compile("(?i)noresize"))
.onElements("table")
-.allowAttributes("bgcolor").matching(COLOR_NAME_OR_COLOR_CODE)
+.allowAttributes("bgcolor").matching(COLOR_NAME_OR_COLOR_CODE)
.onElements("td", "th")
.allowAttributes("abbr").matching(PARAGRAPH)
.onElements("td", "th")
