(ofbiz-framework) branch trunk updated: Improvements for ContentWorker methods and view-entities (OFBIZ-12829)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new e7420fe4cf Improvements for ContentWorker methods and view-entities
(OFBIZ-12829)
e7420fe4cf is described below
commit e7420fe4cf40f21e03bba3566d9b99d63a6e79a5
Author: Cheng Hu Shan
AuthorDate: Thu Jun 15 13:56:26 2023 +0200
Improvements for ContentWorker methods and view-entities (OFBIZ-12829)
---
.../ofbiz/content/content/ContentWorker.java | 45 +++---
.../datamodel/entitydef/product-entitymodel.xml| 4 +-
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
index 4f4171d786..f8a6f8953b 100644
---
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
+++
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWorker.java
@@ -411,7 +411,33 @@ public class ContentWorker implements
org.apache.ofbiz.widget.content.ContentWor
}
}
+public static List findAlternateLocaleContents(Delegator
delegator, GenericValue view) {
+return findAlternateLocaleContents(delegator, view, true);
+}
+
+public static List findAlternateLocaleContents(Delegator
delegator, GenericValue view,
+boolean useCache) {
+List alternateViews = null;
+try {
+alternateViews = view.getRelated("ContentAssocDataResourceViewTo",
UtilMisc.toMap("caContentAssocTypeId",
+"ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate"),
useCache);
+
+alternateViews = EntityUtil.filterByDate(alternateViews,
UtilDateTime.nowTimestamp(), "caFromDate",
+"caThruDate", true);
+} catch (GenericEntityException e) {
+Debug.logError(e, "Error finding alternate locale content: " + e,
MODULE);
+alternateViews = UtilMisc.toList(view);
+}
+
+return alternateViews;
+}
+
public static GenericValue findAlternateLocaleContent(Delegator delegator,
GenericValue view, Locale locale) {
+return findAlternateLocaleContent(delegator, view, locale, true);
+}
+
+public static GenericValue findAlternateLocaleContent(Delegator delegator,
GenericValue view, Locale locale,
+boolean useCache) {
GenericValue contentAssocDataResourceViewFrom = null;
if (locale == null) {
return view;
@@ -420,16 +446,7 @@ public class ContentWorker implements
org.apache.ofbiz.widget.content.ContentWor
String localeStr = locale.toString();
boolean isTwoLetterLocale = localeStr.length() == 2;
-List alternateViews = null;
-try {
-alternateViews = view.getRelated("ContentAssocDataResourceViewTo",
UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"),
-UtilMisc.toList("-caFromDate"), true);
-} catch (GenericEntityException e) {
-Debug.logError(e, "Error finding alternate locale content: " +
e.toString(), MODULE);
-return view;
-}
-
-alternateViews = EntityUtil.filterByDate(alternateViews,
UtilDateTime.nowTimestamp(), "caFromDate", "caThruDate", true);
+List alternateViews =
findAlternateLocaleContents(delegator, view, useCache);
// also check the given view for a matching locale
alternateViews.add(0, view);
@@ -445,25 +462,25 @@ public class ContentWorker implements
org.apache.ofbiz.widget.content.ContentWor
if (isTwoLetterLocale) {
if (currentLocaleLength == 2) {
// if the currentLocaleString is only a two letter code
and the current one is a two and it matches, we are done
-if (localeStr.equals(currentLocaleString)) {
+if (localeStr.equalsIgnoreCase(currentLocaleString)) {
contentAssocDataResourceViewFrom = thisView;
break;
}
} else if (currentLocaleLength == 5) {
// if the currentLocaleString is only a two letter code
and the current one is a five, match up but keep going
-if (localeStr.equals(currentLocaleString.substring(0, 2)))
{
+if
(localeStr.equalsIgnoreCase(currentLocaleString.substring(0, 2))) {
contentAssocDataResourceViewFrom = thisView;
}
}
} else {
if (currentLocaleLeng
(ofbiz-framework) branch trunk updated: Improved: Refactoring WebSiteProperties.java (OFBIZ-12843)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new a1e700b7d2 Improved: Refactoring WebSiteProperties.java (OFBIZ-12843)
a1e700b7d2 is described below
commit a1e700b7d2d801d0c74298ca22c28c2e373281d9
Author: Cheng Hu Shan
AuthorDate: Fri Aug 18 10:06:00 2023 +0200
Improved: Refactoring WebSiteProperties.java (OFBIZ-12843)
---
.../ofbiz/webapp/website/WebSiteProperties.java| 195 -
1 file changed, 108 insertions(+), 87 deletions(-)
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
index f3f6088aee..80a0143449 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
@@ -35,6 +35,31 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties;
@ThreadSafe
public final class WebSiteProperties {
+private final String httpPort;
+private final String httpHost;
+private final String httpsPort;
+private final String httpsHost;
+private final String webappPath;
+private final boolean enableHttps;
+
+private WebSiteProperties(String httpPort, String httpHost, String
httpsPort, String httpsHost, String webappPath, boolean enableHttps) {
+this.httpPort = httpPort;
+this.httpHost = httpHost;
+this.httpsPort = httpsPort;
+this.httpsHost = httpsHost;
+this.webappPath = webappPath;
+this.enableHttps = enableHttps;
+}
+
+private WebSiteProperties(Delegator delegator) {
+this(
+EntityUtilProperties.getPropertyValue("url", "port.http",
delegator),
+EntityUtilProperties.getPropertyValue("url",
"force.http.host", delegator),
+EntityUtilProperties.getPropertyValue("url", "port.https",
delegator),
+EntityUtilProperties.getPropertyValue("url",
"force.https.host", delegator),
+null,
+EntityUtilProperties.propertyValueEqualsIgnoreCase("url",
"port.https.enabled", "Y", delegator));
+}
/**
* Returns a WebSiteProperties instance initialized to the
settings found
@@ -56,71 +81,34 @@ public final class WebSiteProperties {
Assert.notNull("request", request);
WebSiteProperties webSiteProps = (WebSiteProperties)
request.getAttribute("_WEBSITE_PROPS_");
if (webSiteProps == null) {
-Boolean dontAddPortoffset = false;
+Boolean addPortoffset = true;
Delegator delegator = (Delegator)
request.getAttribute("delegator");
-WebSiteProperties defaults = new WebSiteProperties(delegator);
-String httpPort = defaults.getHttpPort();
-String httpHost = defaults.getHttpHost();
-String httpsPort = defaults.getHttpsPort();
-String httpsHost = defaults.getHttpsHost();
-boolean enableHttps = defaults.getEnableHttps();
-String webappPath = null;
if (delegator != null) {
String webSiteId = WebSiteWorker.getWebSiteId(request);
if (webSiteId != null) {
GenericValue webSiteValue =
EntityQuery.use(delegator).from("WebSite").where("webSiteId",
webSiteId).cache().queryOne();
if (webSiteValue != null) {
-if (webSiteValue.get("httpPort") != null) {
-httpPort = webSiteValue.getString("httpPort");
-}
-if (webSiteValue.get("httpHost") != null) {
-httpHost = webSiteValue.getString("httpHost");
-}
-if (webSiteValue.get("httpsPort") != null) {
-httpsPort = webSiteValue.getString("httpsPort");
-}
-if (webSiteValue.get("httpsHost") != null) {
-httpsHost = webSiteValue.getString("httpsHost");
-}
-if (webSiteValue.get("enableHttps") != null) {
-enableHttps =
webSiteValue.getBoolean("enableHttps");
-}
-if (webSiteValue.get("webappPath") != null) {
-webappPath = webSiteValue.getString("webappPath");
-
(ofbiz-framework) branch trunk updated: Fixed: Apply orderItemAttributes when adding to Shoppingcart from addToCartFromOrder. (OFBIZ-12886)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new da3e353e51 Fixed: Apply orderItemAttributes when adding to
Shoppingcart from addToCartFromOrder. (OFBIZ-12886)
da3e353e51 is described below
commit da3e353e51ac270c328c1f307d4c77ed356a8c75
Author: Elaheh Lolaki
AuthorDate: Wed Jan 31 17:43:28 2024 +0100
Fixed: Apply orderItemAttributes when adding to Shoppingcart from
addToCartFromOrder. (OFBIZ-12886)
---
.../order/shoppingcart/ShoppingCartHelper.java | 23 +++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
index 18b3bfbeb1..67629629c1 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartHelper.java
@@ -364,10 +364,27 @@ public class ShoppingCartHelper {
}
}
+// get order item attributes to transfer it to the new
cart item
+Map orderItemAttributes = null;
try {
-
this.cart.addOrIncreaseItem(UtilValidate.isNotEmpty(aggregatedProdId) ?
aggregatedProdId : productId, amount,
-orderItem.getBigDecimal("quantity"), null,
null, null, null, null, null, null, catalogId, configWrapper,
-orderItemTypeId, itemGroupNumber, null,
dispatcher);
+List oiAttributes =
orderItem.getRelated("OrderItemAttribute", null, null, false);
+if (UtilValidate.isNotEmpty(oiAttributes)) {
+orderItemAttributes = new HashMap();
+for (GenericValue attrib : oiAttributes) {
+if
(UtilValidate.isNotEmpty(attrib.getString("attrValue"))) {
+
orderItemAttributes.put(attrib.getString("attrName"), attrib.getString(
+"attrValue"));
+}
+}
+}
+} catch (GenericEntityException e) {
+errorMsgs.add(e.getMessage());
+}
+try {
+
this.cart.addOrIncreaseItem(UtilValidate.isNotEmpty(aggregatedProdId) ?
aggregatedProdId
+: productId, amount,
orderItem.getBigDecimal("quantity"),
+null, null, null, null, null, null, null,
null, null, orderItemAttributes, catalogId,
+configWrapper, orderItemTypeId,
itemGroupNumber, null, dispatcher);
noItems = false;
} catch (CartItemModifyException | ItemNotFoundException
e) {
errorMsgs.add(e.getMessage());
(ofbiz-framework) branch trunk updated: Improved: LoginServices.userLogin: Respond "fail" instead of "error" to avoid the (automatic service engine) logging of a stack trace on missing/invalid credent
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new a31195af89 Improved: LoginServices.userLogin: Respond "fail" instead
of "error" to avoid the (automatic service engine) logging of a stack trace on
missing/invalid credentials (OFBIZ-10507)
a31195af89 is described below
commit a31195af8963f03f4e338dcf4e7c0f749193e350
Author: Benjamin Jugl
AuthorDate: Tue Nov 30 16:31:51 2021 +0100
Improved: LoginServices.userLogin: Respond "fail" instead of "error" to
avoid the (automatic service engine) logging of a stack trace on
missing/invalid credentials (OFBIZ-10507)
---
.../apache/ofbiz/common/login/LoginServices.java | 55 --
1 file changed, 41 insertions(+), 14 deletions(-)
diff --git
a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
index c24757d056..c125a39d8d 100644
---
a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
+++
b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
@@ -20,6 +20,7 @@
package org.apache.ofbiz.common.login;
import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.LinkedHashMap;
import java.util.LinkedList;
@@ -81,6 +82,11 @@ public class LoginServices {
Locale locale = (Locale) context.get("locale");
Delegator delegator = ctx.getDelegator();
+// Keep track of two different kinds of errors (UserOnly and DebugLog)
and set the RESPONSE_MESSAGE of the
+// service according to what kind of errors where thrown
+List userErrMsgs = new ArrayList<>();
+List debugErrMsgs = new ArrayList<>();
+
// load the external auth modules -- note: this will only run once and
cache the objects
if (!AuthHelper.authenticatorsLoaded()) {
AuthHelper.loadAuthenticators(dispatcher);
@@ -120,11 +126,10 @@ public class LoginServices {
// get the visitId for the history entity
String visitId = (String) context.get("visitId");
-String errMsg = "";
if (UtilValidate.isEmpty(username)) {
-errMsg = UtilProperties.getMessage(RESOURCE,
"loginservices.username_missing", locale);
+userErrMsgs.add(UtilProperties.getMessage(RESOURCE,
"loginservices.username_missing", locale));
} else if (UtilValidate.isEmpty(password) &&
UtilValidate.isEmpty(jwtToken)) {
-errMsg = UtilProperties.getMessage(RESOURCE,
"loginservices.password_missing", locale);
+userErrMsgs.add(UtilProperties.getMessage(RESOURCE,
"loginservices.password_missing", locale));
} else {
if
("true".equalsIgnoreCase(EntityUtilProperties.getPropertyValue("security",
"username.lowercase", delegator))) {
@@ -275,9 +280,9 @@ public class LoginServices {
Debug.logInfo("[LoginServices.userLogin] :
Password Incorrect", MODULE);
// password invalid...
if (password != null) {
-errMsg = UtilProperties.getMessage(RESOURCE,
"loginservices.password_incorrect", locale);
+
userErrMsgs.add(UtilProperties.getMessage(RESOURCE,
"loginservices.password_incorrect", locale));
} else if (jwtToken != null) {
-errMsg = UtilProperties.getMessage(RESOURCE,
"loginservices.token_incorrect", locale);
+
userErrMsgs.add(UtilProperties.getMessage(RESOURCE,
"loginservices.token_incorrect", locale));
}
// increment failed login count
Long currentFailedLogins =
userLogin.getLong("successiveFailedLogins");
@@ -400,20 +405,25 @@ public class LoginServices {
continue;
}
Map messageMap = UtilMisc.toMap("username", username);
-errMsg = UtilProperties.getMessage(RESOURCE,
"loginservices.account_for_user_login_id_disabled", messageMap, locale);
+userErrMsgs.add(UtilProperties.getMessage(RESOURCE,
"loginservices.account_for_user_login_id_disabled", messageMap, locale));
+StringBuilder tmpErrMsg = new StringBuilder();
if (disabledDateTime != null) {
(ofbiz-framework) branch trunk updated: Fixed: Missing package and syntax error in FixedAssetServices.groovy (OFBIZ-12890)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new c156ab4414 Fixed: Missing package and syntax error in
FixedAssetServices.groovy (OFBIZ-12890)
c156ab4414 is described below
commit c156ab44141ff166f6620e754ac01df00d5e8a1f
Author: Michael Brohl
AuthorDate: Mon Feb 5 10:18:09 2024 +0100
Fixed: Missing package and syntax error in FixedAssetServices.groovy
(OFBIZ-12890)
---
.../org/apache/ofbiz/accounting/fixedasset/FixedAssetServices.groovy | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/fixedasset/FixedAssetServices.groovy
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/fixedasset/FixedAssetServices.groovy
index 6cf1ce6005..9058e8c92f 100644
---
a/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/fixedasset/FixedAssetServices.groovy
+++
b/applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/fixedasset/FixedAssetServices.groovy
@@ -1,3 +1,5 @@
+package org.apache.ofbiz.accounting.fixedasset
+
import org.apache.ofbiz.base.util.UtilDateTime
import org.apache.ofbiz.entity.GenericValue
import org.apache.ofbiz.entity.condition.EntityCondition
@@ -139,7 +141,7 @@ Map createMaintsFromMeterReading() {
long listSize = maintList ? maintList.size() : 0L
BigDecimal maxIntervalQty = maintList ? maintList
-.findAll(maint -> maint.intervalQuantity)
+.findAll{maint -> maint.intervalQuantity}
.max() : 0
BigDecimal nextIntervalQty = maxIntervalQty +
p.intervalQuantity
(ofbiz-framework) branch trunk updated: Fixed: Corrects improper/incomplete changes (OFBIZ-12888)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new b397054740 Fixed: Corrects improper/incomplete changes (OFBIZ-12888)
b397054740 is described below
commit b39705474062afe91aec6a35a6311cc4a242e078
Author: Michael Brohl
AuthorDate: Mon Feb 5 10:01:36 2024 +0100
Fixed: Corrects improper/incomplete changes (OFBIZ-12888)
---
build.gradle | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/build.gradle b/build.gradle
index 1b91375ef9..a18972055a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -352,13 +352,6 @@ sourceSets {
srcDirs =
getDirectoryInActiveComponentsIfExists('src/test/resources')
}
}
-
-groovyScripts {
-groovy {
-compileClasspath += sourceSets.main.compileClasspath
-compileClasspath += sourceSets.main.output
-}
-}
}
jar.manifest.attributes(
@@ -379,7 +372,7 @@ checkstyle {
showViolations = true
}
gitHooks {
-hooks = ['pre-push': 'checkstyleMain codenarcMain codenarcTes']
+hooks = ['pre-push': 'checkstyleMain codenarcMain codenarcTest']
}
// Checks OFBiz Groovy coding conventions.
(ofbiz-framework) branch trunk updated: Improved: comments and code formatting, no functional changes.
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1d9df1edd0 Improved: comments and code formatting, no functional
changes.
1d9df1edd0 is described below
commit 1d9df1edd0441f0638b866d0a8eb56c10b512ed9
Author: Michael Brohl
AuthorDate: Fri Feb 2 14:16:06 2024 +0100
Improved: comments and code formatting, no functional changes.
---
.../org/apache/ofbiz/product/product/ProductContentWrapper.java| 7 +++
.../apache/ofbiz/product/product/ProductPromoContentWrapper.java | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
index f80918aa33..fa8aa1b402 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
@@ -107,13 +107,12 @@ public class ProductContentWrapper implements
ContentWrapper {
/*
* Look for a previously cached entry (may also be an entry with null
value if
* there was no content to retrieve) caching: there is one cache
created,
- * "product.content" Each product's content is cached with a key of
+ * "product.content.rendered" Each product's content is cached with a
key of
* contentTypeId::locale::mimeType::productId, or whatever the
CACHE_KEY_SEPARATOR is
* defined above to be.
*/
-String cacheKey = productContentTypeId + CACHE_KEY_SEPARATOR + locale
+ CACHE_KEY_SEPARATOR + mimeTypeId + CACHE_KEY_SEPARATOR + product.get(
-"productId") + CACHE_KEY_SEPARATOR
-+ encoderType + CACHE_KEY_SEPARATOR + delegator;
+String cacheKey = productContentTypeId + CACHE_KEY_SEPARATOR + locale
+ CACHE_KEY_SEPARATOR + mimeTypeId + CACHE_KEY_SEPARATOR
++ product.get("productId") + CACHE_KEY_SEPARATOR + encoderType
+ CACHE_KEY_SEPARATOR + delegator;
String cachedValue = PRODUCT_CONTENT_CACHE.get(cacheKey);
if (cachedValue != null ||
PRODUCT_CONTENT_CACHE.containsKey(cacheKey)) {
return cachedValue;
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
index 175b31d0c0..41e95176e6 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
@@ -114,7 +114,7 @@ public class ProductPromoContentWrapper implements
ContentWrapper {
/* Look for a previously cached entry (may also be an entry with null
value if
* there was no content to retrieve)
*/
-/* caching: there is one cache created, "product.promo.content" Each
productPromo's content is cached with a key of
+/* caching: there is one cache created,
"product.promo.content.rendered" Each productPromo's content is cached with a
key of
* contentTypeId::locale::mimeType::productPromoId, or whatever the
CACHE_KEY_SEPARATOR is defined above to be.
*/
String cacheKey = productPromoContentTypeId + CACHE_KEY_SEPARATOR +
locale + CACHE_KEY_SEPARATOR + mimeTypeId
(ofbiz-framework) 01/03: Implemented: Refactored the ContentWrapper implementations to use the central cache key separator (OFBIZ-10194)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 502c56b3d9fb6bb5daf86bff364597d3548a6b3c
Author: Michael Brohl
AuthorDate: Fri Feb 2 12:19:05 2024 +0100
Implemented: Refactored the ContentWrapper implementations to use the
central cache key separator (OFBIZ-10194)
---
.../java/org/apache/ofbiz/content/content/ContentWrapper.java| 5 +++--
.../java/org/apache/ofbiz/order/order/OrderContentWrapper.java | 7 +++
.../java/org/apache/ofbiz/party/content/PartyContentWrapper.java | 1 -
.../apache/ofbiz/product/category/CategoryContentWrapper.java| 6 +++---
.../ofbiz/product/config/ProductConfigItemContentWrapper.java| 6 +++---
.../org/apache/ofbiz/product/product/ProductContentWrapper.java | 9 -
.../apache/ofbiz/product/product/ProductPromoContentWrapper.java | 7 +++
.../ofbiz/workeffort/content/WorkEffortContentWrapper.java | 1 -
8 files changed, 19 insertions(+), 23 deletions(-)
diff --git
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
index 5a0db6df11..86b321e404 100644
---
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
+++
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
@@ -37,7 +37,8 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties;
public interface ContentWrapper {
-String MDOULE = ContentWrapper.class.getName();
+String MODULE = ContentWrapper.class.getName();
+static final String CACHE_KEY_SEPARATOR = "::";
StringUtil.StringWrapper get(String contentTypeId, String encoderType);
@@ -108,7 +109,7 @@ public interface ContentWrapper {
if (encoder != null) {
value = encoder.sanitize(value, null);
} else {
-Debug.logWarning("Unknown encoderType %s for encoding content
value!", MDOULE, encoderType);
+Debug.logWarning("Unknown encoderType %s for encoding content
value!", MODULE, encoderType);
}
}
return value;
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
index 06e7ae347c..940bf47fb3 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/order/OrderContentWrapper.java
@@ -48,7 +48,6 @@ import org.apache.ofbiz.service.LocalDispatcher;
public class OrderContentWrapper implements ContentWrapper {
private static final String MODULE = OrderContentWrapper.class.getName();
-private static final String SEPARATOR = "::";// cache key separator
private static final UtilCache ORDER_CONTENT_CACHE =
UtilCache.createUtilCache(
"order.content.rendered", true); // use soft reference to free up
memory if needed
@@ -106,11 +105,11 @@ public class OrderContentWrapper implements
ContentWrapper {
* there was no content to retrieve)
*/
/* caching: there is one cache created, "order.content" Each order's
content is cached with a key of
- * contentTypeId::locale::mimeType::orderId::orderItemSeqId, or
whatever the SEPARATOR is defined above to be.
+ * contentTypeId::locale::mimeType::orderId::orderItemSeqId, or
whatever the CACHE_KEY_SEPARATOR is defined above to be.
*/
-String cacheKey = orderContentTypeId + SEPARATOR + locale + SEPARATOR
+ mimeTypeId + SEPARATOR + order.get(
-"orderId") + SEPARATOR + orderItemSeqId + SEPARATOR +
encoderType + SEPARATOR + delegator;
+String cacheKey = orderContentTypeId + CACHE_KEY_SEPARATOR + locale +
CACHE_KEY_SEPARATOR + mimeTypeId + CACHE_KEY_SEPARATOR + order.get(
+"orderId") + CACHE_KEY_SEPARATOR + orderItemSeqId +
CACHE_KEY_SEPARATOR + encoderType + CACHE_KEY_SEPARATOR + delegator;
String cachedValue = ORDER_CONTENT_CACHE.get(cacheKey);
if (cachedValue != null || ORDER_CONTENT_CACHE.containsKey(cacheKey)) {
return cachedValue;
diff --git
a/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
b/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
index 6a6c526b61..8ee3e93548 100644
---
a/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
+++
b/applications/party/src/main/java/org/apache/ofbiz/party/content/PartyContentWrapper.java
@@ -52,7 +52,6 @@ import org.apache.ofbiz.service.LocalDispatcher;
public class PartyCont
(ofbiz-framework) 02/03: Fixed: Corrections based on Codenarc and Checkstyle errors (OFBIZ-10194)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit e7502ac544327a5d1c5602572219570cbedc3847
Author: Michael Brohl
AuthorDate: Fri Feb 2 12:40:46 2024 +0100
Fixed: Corrections based on Codenarc and Checkstyle errors (OFBIZ-10194)
---
.../src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java | 2 +-
.../org/apache/ofbiz/product/product/ProductPromoContentWrapper.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
index 86b321e404..9b584dfe86 100644
---
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
+++
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
@@ -38,7 +38,7 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties;
public interface ContentWrapper {
String MODULE = ContentWrapper.class.getName();
-static final String CACHE_KEY_SEPARATOR = "::";
+String CACHE_KEY_SEPARATOR = "::";
StringUtil.StringWrapper get(String contentTypeId, String encoderType);
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
index b3ce91881a..86f2aa8141 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
@@ -117,7 +117,8 @@ public class ProductPromoContentWrapper implements
ContentWrapper {
/* caching: there is one cache created, "product.promo.content" Each
productPromo's content is cached with a key of
* contentTypeId::locale::mimeType::productPromoId, or whatever the
CACHE_KEY_SEPARATOR is defined above to be.
*/
-String cacheKey = productPromoContentTypeId + CACHE_KEY_SEPARATOR +
locale + CACHE_KEY_SEPARATOR + mimeTypeId + CACHE_KEY_SEPARATOR +
productPromo.get("productPromoId")
+String cacheKey = productPromoContentTypeId + CACHE_KEY_SEPARATOR +
locale + CACHE_KEY_SEPARATOR + mimeTypeId
++ CACHE_KEY_SEPARATOR + productPromo.get("productPromoId")
+ CACHE_KEY_SEPARATOR + encoderType + CACHE_KEY_SEPARATOR +
delegator;
String cachedValue = PRODUCT_PROMO_CONTENT_CACHE.get(cacheKey);
if (cachedValue != null ||
PRODUCT_PROMO_CONTENT_CACHE.containsKey(cacheKey)) {
(ofbiz-framework) 03/03: Implemented: Use the rendered cache in content wrappers (OFBIZ-10194)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 625b80dbc626db35dddbaa62057e34b20ae7c38c
Author: Michael Brohl
AuthorDate: Fri Feb 2 13:06:38 2024 +0100
Implemented: Use the rendered cache in content wrappers (OFBIZ-10194)
---
.../org/apache/ofbiz/product/category/CategoryContentWrapper.java | 4 +++-
.../ofbiz/product/config/ProductConfigItemContentWrapper.java | 4 +++-
.../org/apache/ofbiz/product/product/ProductContentWrapper.java | 5 +++--
.../apache/ofbiz/product/product/ProductPromoContentWrapper.java| 4 +++-
.../apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java | 6 --
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
index 529a1d9c87..d6a5e8ecac 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
@@ -118,8 +118,10 @@ public class CategoryContentWrapper implements
ContentWrapper {
String outString = null;
try {
Writer outWriter = new StringWriter();
+// Use cache == true to have entity-cache managed content from
cache while (not managed) rendered cache above
+// may be configured with short expire time
getProductCategoryContentAsText(null, productCategory,
prodCatContentTypeId, locale, mimeTypeId, delegator,
-dispatcher, outWriter, false);
+dispatcher, outWriter, true);
outString = outWriter.toString();
} catch (GeneralException | IOException e) {
Debug.logError(e, "Error rendering CategoryContent", MODULE);
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
index 2100a45c57..a1e47ef70e 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
@@ -149,8 +149,10 @@ public class ProductConfigItemContentWrapper implements
ContentWrapper {
try {
Writer outWriter = new StringWriter();
+// Use cache == true to have entity-cache managed content from
cache while (not managed) rendered cache above
+// may be configured with short expire time
getProductConfigItemContentAsText(null, productConfigItem,
confItemContentTypeId, locale, mimeTypeId, delegator, dispatcher,
-outWriter, false);
+outWriter, true);
outString = outWriter.toString();
} catch (GeneralException | IOException e) {
Debug.logError(e, "Error rendering ProdConfItemContent", MODULE);
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
index 473e5d4606..f80918aa33 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
@@ -124,9 +124,10 @@ public class ProductContentWrapper implements
ContentWrapper {
String outString = null;
try {
Writer outWriter = new StringWriter();
+// Use cache == true to have entity-cache managed content from
cache while (not managed) rendered cache above
+// may be configured with short expire time
getProductContentAsText(null, product, productContentTypeId,
locale, mimeTypeId, partyId, roleTypeId,
-delegator, dispatcher,
-outWriter, false);
+delegator, dispatcher, outWriter, true);
outString = outWriter.toString();
} catch (GeneralException | IOException e) {
Debug.logError(e, "Error rendering ProductContent", MODULE);
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
index 86f2aa8141..175b31d0c0 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductProm
(ofbiz-framework) branch trunk updated (a2f3ec8830 -> 625b80dbc6)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git from a2f3ec8830 Fixed: Removes duplicate srcDirs entry for "src/main/groovy" to prevent error in Eclipse. new 502c56b3d9 Implemented: Refactored the ContentWrapper implementations to use the central cache key separator (OFBIZ-10194) new e7502ac544 Fixed: Corrections based on Codenarc and Checkstyle errors (OFBIZ-10194) new 625b80dbc6 Implemented: Use the rendered cache in content wrappers (OFBIZ-10194) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/ofbiz/content/content/ContentWrapper.java | 5 +++-- .../org/apache/ofbiz/order/order/OrderContentWrapper.java | 7 +++ .../apache/ofbiz/party/content/PartyContentWrapper.java| 1 - .../ofbiz/product/category/CategoryContentWrapper.java | 10 ++ .../product/config/ProductConfigItemContentWrapper.java| 10 ++ .../ofbiz/product/product/ProductContentWrapper.java | 14 +++--- .../ofbiz/product/product/ProductPromoContentWrapper.java | 12 +++- .../ofbiz/workeffort/content/WorkEffortContentWrapper.java | 7 --- 8 files changed, 36 insertions(+), 30 deletions(-)
(ofbiz-framework) branch trunk updated: Fixed: Removes duplicate srcDirs entry for "src/main/groovy" to prevent error in Eclipse.
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new a2f3ec8830 Fixed: Removes duplicate srcDirs entry for
"src/main/groovy" to prevent error in Eclipse.
a2f3ec8830 is described below
commit a2f3ec88309f8440fe65b227ff3fc2df279dde24
Author: Michael Brohl
AuthorDate: Fri Feb 2 12:23:12 2024 +0100
Fixed: Removes duplicate srcDirs entry for "src/main/groovy" to prevent
error in Eclipse.
---
build.gradle | 1 -
1 file changed, 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 04cffdafc4..cbb6d98fcf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -355,7 +355,6 @@ sourceSets {
groovyScripts {
groovy {
-srcDirs +=
getDirectoryInActiveComponentsIfExists('src/main/groovy')
compileClasspath += sourceSets.main.compileClasspath
compileClasspath += sourceSets.main.output
}
(ofbiz-framework) branch trunk updated: Fixed: Set discountRate from ShoppingCartItem (OFBIZ-12802)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 79242f65b3 Fixed: Set discountRate from ShoppingCartItem (OFBIZ-12802)
79242f65b3 is described below
commit 79242f65b3337be7c5218ef8902a16cc4e14134e
Author: Michael Brohl
AuthorDate: Fri Feb 2 09:45:09 2024 +0100
Fixed: Set discountRate from ShoppingCartItem (OFBIZ-12802)
---
.../main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
index 1bf7b3b8d1..ec4ae9e359 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
@@ -215,6 +215,7 @@ public class ShoppingCartItem implements
java.io.Serializable {
this.reserv2ndPPPerc = item.getReserv2ndPPPerc();
this.reservNthPPPerc = item.getReservNthPPPerc();
this.listPrice = item.getListPrice();
+this.discountRate = item.getDiscountRate();
this.setIsModifiedPrice(item.getIsModifiedPrice());
this.selectedAmount = item.getSelectedAmount();
this.requirementId = item.getRequirementId();
(ofbiz-framework) branch trunk updated: Fixed: Keep needed classpath entries in the Eclipse .classpath file (OFBIZ-12880)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6a35d40d3b Fixed: Keep needed classpath entries in the Eclipse
.classpath file (OFBIZ-12880)
6a35d40d3b is described below
commit 6a35d40d3b333d04f79704169035ed1bfc49c55e
Author: Michael Brohl
AuthorDate: Tue Jan 23 23:20:06 2024 +0100
Fixed: Keep needed classpath entries in the Eclipse .classpath file
(OFBIZ-12880)
Keeps classpath entries for config folders and dtds which are removed
from the .classpath file after it is generated by the Eclipse Gradle
task.
---
build.gradle | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index e55529938c..04cffdafc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -411,14 +411,12 @@ eclipse.classpath.file.whenMerged { classpath ->
classpath.entries.removeAll { entry ->
// remove any "src" entries in .classpath of the form
/componentName
-entry.kind == 'src' && !(entry.path ==~ 'framework/base/config' ||
entry.path ==~ 'framework/base/dtd') && (
+entry.kind == 'src' && (
entry.path ==~ '.*/+(' + componentName.tokenize(fileSep).last() +
')$' ||
entry.path ==~ /(\/+framework)$/ ||
entry.path ==~ /(\/+applications)$/ ||
entry.path ==~ /(\/+plugins)$/ ||
-entry.path ==~ /(\/+themes)$/ ||
-entry.path ==~ eclipseEntry + '/config' ||
-entry.path ==~ eclipseEntry + '/dtd')
+entry.path ==~ /(\/+themes)$/ )
}
}
}
(ofbiz-framework) branch trunk updated: Extending individual discountRate value (OFBIZ-12802)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new a07c44f516 Extending individual discountRate value (OFBIZ-12802)
a07c44f516 is described below
commit a07c44f51660f091feec66723017b3366b243b11
Author: Adrian Wolf
AuthorDate: Mon Apr 17 10:09:12 2023 +0200
Extending individual discountRate value (OFBIZ-12802)
+ Addition of additional context information "productStoreGroupId" and
"partyId" to the call parameters of a "customMethodName"
price-calc-service
+ Obtaining the fields discountRate and listPrice from calling a
"customMethodName" price-calc-service
+ discountRate as Result Field
+ Transport original discount rate from custom price calculation over
cart to order to have the correct rate instead of back-calculating it
from unitPrice and unitListPrice
---
applications/datamodel/entitydef/order-entitymodel.xml | 1 +
.../apache/ofbiz/order/shoppingcart/ShoppingCart.java | 1 +
.../ofbiz/order/shoppingcart/ShoppingCartItem.java | 10 ++
.../product/servicedef/services_pricepromo.xml | 1 +
.../org/apache/ofbiz/product/price/PriceServices.java | 18 --
5 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/applications/datamodel/entitydef/order-entitymodel.xml
b/applications/datamodel/entitydef/order-entitymodel.xml
index f827711b7a..54b3cd9bba 100644
--- a/applications/datamodel/entitydef/order-entitymodel.xml
+++ b/applications/datamodel/entitydef/order-entitymodel.xml
@@ -549,6 +549,7 @@ under the License.
+
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
index 42f9c702ec..431c6cfb12 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
@@ -4376,6 +4376,7 @@ public class ShoppingCart implements
Iterable, Serializable {
orderItem.set("selectedAmount", item.getSelectedAmount());
orderItem.set("unitPrice", item.getBasePrice());
orderItem.set("unitListPrice", item.getListPrice());
+orderItem.set("discountRate", item.getDiscountRate());
orderItem.set("isModifiedPrice", item.getIsModifiedPrice() ?
"Y" : "N");
orderItem.set("isPromo", item.getIsPromo() ? "Y" : "N");
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
index 8a3064b45d..1bf7b3b8d1 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
@@ -135,6 +135,7 @@ public class ShoppingCartItem implements
java.io.Serializable {
*/
private BigDecimal reservNthPPPerc = BigDecimal.ZERO;
private BigDecimal listPrice = BigDecimal.ZERO;
+private BigDecimal discountRate = null;
/**
* flag to know if the price have been modified
*/
@@ -1412,6 +1413,7 @@ public class ShoppingCartItem implements
java.io.Serializable {
}
this.setSpecialPromoPrice((BigDecimal)
priceResult.get("specialPromoPrice"));
+this.discountRate = (BigDecimal)
priceResult.get("discountRate");
}
this.orderItemPriceInfos =
UtilGenerics.cast(priceResult.get("orderItemPriceInfos"));
@@ -2502,6 +2504,14 @@ public class ShoppingCartItem implements
java.io.Serializable {
this.listPrice = listPrice;
}
+/**
+ * Returns the DiscountRate
+ * @return discountRate
+ */
+public BigDecimal getDiscountRate() {
+return discountRate;
+}
+
/**
* Returns isModifiedPrice
*/
diff --git a/applications/product/servicedef/services_pricepromo.xml
b/applications/product/servicedef/services_pricepromo.xml
index cd59004ea9..83f0ec0b9b 100644
--- a/applications/product/servicedef/services_pricepromo.xml
+++ b/applications/product/servicedef/services_pricepromo.xml
@@ -49,6 +49,7 @@ under the License.
+
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
b/applications/product/sr
(ofbiz-framework) branch trunk updated: Improved: ContentWrapper empty string result breaks simple FTL null check and default syntax (OFBIZ-10194)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new a41f0540ba Improved: ContentWrapper empty string result breaks simple
FTL null check and default syntax (OFBIZ-10194)
a41f0540ba is described below
commit a41f0540ba3c7f99a1deb1d2d1efb55510cd19e1
Author: Adrian Wolf
AuthorDate: Fri Apr 21 14:08:14 2023 +0200
Improved: ContentWrapper empty string result breaks simple FTL null
check and default syntax (OFBIZ-10194)
---
.../ofbiz/content/content/ContentWrapper.java | 85 +
.../ofbiz/order/order/OrderContentWrapper.java | 51
.../ofbiz/party/content/PartyContentWrapper.java | 132 +
.../product/category/CategoryContentWrapper.java | 113 +-
.../config/ProductConfigItemContentWrapper.java| 94 ---
.../product/product/ProductContentWrapper.java | 129 +---
.../product/ProductPromoContentWrapper.java| 80 ++---
7 files changed, 375 insertions(+), 309 deletions(-)
diff --git
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
index 15115c90e1..5a0db6df11 100644
---
a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
+++
b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentWrapper.java
@@ -18,7 +18,18 @@
***/
package org.apache.ofbiz.content.content;
+import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.StringUtil;
+import org.apache.ofbiz.base.util.UtilCodec;
+import org.apache.ofbiz.base.util.UtilValidate;
+import org.apache.ofbiz.entity.Delegator;
+import org.apache.ofbiz.entity.GenericEntityException;
+import org.apache.ofbiz.entity.GenericValue;
+import org.apache.ofbiz.entity.condition.EntityCondition;
+import org.apache.ofbiz.entity.model.ModelEntity;
+import org.apache.ofbiz.entity.model.ModelUtil;
+import org.apache.ofbiz.entity.util.EntityQuery;
+import org.apache.ofbiz.entity.util.EntityUtilProperties;
/**
* ContentWrapper Interface
@@ -26,6 +37,80 @@ import org.apache.ofbiz.base.util.StringUtil;
public interface ContentWrapper {
+String MDOULE = ContentWrapper.class.getName();
+
StringUtil.StringWrapper get(String contentTypeId, String encoderType);
+/**
+ * Get the configured default for content mimeTypeId.
+ * @param delegator
+ * @return
+ */
+static String getDefaultMimeTypeId(Delegator delegator) {
+return EntityUtilProperties.getPropertyValue("content",
"defaultMimeType", "text/html; charset=utf-8", delegator);
+}
+
+/**
+ * Check modelObject for existance of a field named like given
contentTypeId and
+ * return its value as String.
+ * @param modelObject
+ * @param contentTypeId
+ * @return
+ */
+static String getCandidateFieldValue(GenericValue modelObject, String
contentTypeId) {
+if (modelObject != null) {
+String candidateFieldName =
ModelUtil.dbNameToVarName(contentTypeId);
+if (modelObject.getModelEntity().isField(candidateFieldName)) {
+return modelObject.getString(candidateFieldName);
+}
+}
+return null;
+}
+
+/**
+ * Check if modelEntityName is an existing entity and has a field named
like
+ * given contentTypeId and get the unique modelObject entry by
modelObjectPk and
+ * return the candidate field value as String.
+ * @param delegator
+ * @param modelEntityName
+ * @param modelObjectPk
+ * @param contentTypeId
+ * @param useCache
+ * @return
+ * @throws GenericEntityException
+ */
+static String getCandidateFieldValue(Delegator delegator, String
modelEntityName, EntityCondition modelObjectPk,
+String contentTypeId, boolean useCache) throws
GenericEntityException {
+
+ModelEntity modelEntity = delegator.getModelEntity(modelEntityName);
+if (modelEntity != null) {
+String candidateFieldName =
ModelUtil.dbNameToVarName(contentTypeId);
+
+if (modelEntity.isField(candidateFieldName)) {
+GenericValue modelObject =
EntityQuery.use(delegator).from(modelEntityName).where(modelObjectPk).cache(useCache).queryOne();
+if (modelObject != null) {
+return modelObject.getString(candidateFieldName);
+}
+}
+}
+return null;
+}
+
+/**
+ * Encode given content string via given encoderType.
+ * @param value
+ * @param encoderType
+ * @retu
[ofbiz-plugins] branch trunk updated: Fixed: Renamed ProductsExportToEbay.groovy to ProductsExportToEbayScript.groovy (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 65ee57f7d Fixed: Renamed ProductsExportToEbay.groovy to
ProductsExportToEbayScript.groovy (OFBIZ-12813)
65ee57f7d is described below
commit 65ee57f7d5a52a62288a9be03f5baa8836d18e98
Author: Michael Brohl
AuthorDate: Tue Aug 1 12:17:57 2023 +0200
Fixed: Renamed ProductsExportToEbay.groovy to
ProductsExportToEbayScript.groovy (OFBIZ-12813)
This was necessary after the groovy scripts refactoring to avoid
duplicate classes.
---
.../{ProductsExportToEbay.groovy => ProductsExportToEbayScript.groovy} | 0
ebay/widget/EbayScreens.xml | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ebay/src/main/groovy/org/apache/ofbiz/ebay/ProductsExportToEbay.groovy
b/ebay/src/main/groovy/org/apache/ofbiz/ebay/ProductsExportToEbayScript.groovy
similarity index 100%
rename from
ebay/src/main/groovy/org/apache/ofbiz/ebay/ProductsExportToEbay.groovy
rename to
ebay/src/main/groovy/org/apache/ofbiz/ebay/ProductsExportToEbayScript.groovy
diff --git a/ebay/widget/EbayScreens.xml b/ebay/widget/EbayScreens.xml
index 9e6bfdca2..51d2e096a 100644
--- a/ebay/widget/EbayScreens.xml
+++ b/ebay/widget/EbayScreens.xml
@@ -80,7 +80,7 @@ under the License.
-
+
[ofbiz-plugins] 04/05: Improved: Removes obsolete groovy script call (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 425b4560c2b4d19812b2d64d1721d72b5be21fc2 Author: Michael Brohl AuthorDate: Sun Jul 30 21:20:20 2023 +0200 Improved: Removes obsolete groovy script call (OFBIZ-12813) The referenced groovy script GetEmailOptions.groovy was not present anymore which lead to the untouched reference to groovyScripts. --- ebaystore/widget/EbayEmailScreens.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/ebaystore/widget/EbayEmailScreens.xml b/ebaystore/widget/EbayEmailScreens.xml index 28d8f541b..619fb94d3 100644 --- a/ebaystore/widget/EbayEmailScreens.xml +++ b/ebaystore/widget/EbayEmailScreens.xml @@ -47,7 +47,6 @@ -
[ofbiz-plugins] 03/05: Improved: Removes obsolete request entry (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 0bf579f8dd5bc5bb5fe4ee503df3279126a869db Author: Michael Brohl AuthorDate: Sun Jul 30 21:15:41 2023 +0200 Improved: Removes obsolete request entry (OFBIZ-12813) The references groovy script was not present anymore which lead to the untouched reference to groovyScripts. --- birt/webapp/ordermgr/WEB-INF/controller.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/birt/webapp/ordermgr/WEB-INF/controller.xml b/birt/webapp/ordermgr/WEB-INF/controller.xml index 2adb62bfa..dd23bbb5e 100644 --- a/birt/webapp/ordermgr/WEB-INF/controller.xml +++ b/birt/webapp/ordermgr/WEB-INF/controller.xml @@ -85,11 +85,6 @@ under the License. - - - - -
[ofbiz-plugins] 05/05: Imporved: Removes unused screen SubTaslsInfo.
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 235f24a5a143f320cbad5b577c887a5835df0b52 Author: Michael Brohl AuthorDate: Sun Jul 30 21:26:13 2023 +0200 Imporved: Removes unused screen SubTaslsInfo. --- projectmgr/widget/TaskScreens.xml | 14 -- 1 file changed, 14 deletions(-) diff --git a/projectmgr/widget/TaskScreens.xml b/projectmgr/widget/TaskScreens.xml index b9e54fd0f..a236f3be6 100644 --- a/projectmgr/widget/TaskScreens.xml +++ b/projectmgr/widget/TaskScreens.xml @@ -379,20 +379,6 @@ under the License. - - - - - - - - - - - - - -
[ofbiz-plugins] 02/05: Improved: Changes script location for the moved CreateApplicationList.groovy (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit b7c7757b35a22529ca272ea690d82e755d2afa49
Author: Michael Brohl
AuthorDate: Sun Jul 30 21:09:26 2023 +0200
Improved: Changes script location for the moved
CreateApplicationList.groovy (OFBIZ-12813)
---
birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
b/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
index f85e0c8eb..54a9c2fd3 100644
--- a/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
+++ b/birt/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
@@ -68,7 +68,7 @@ if (!logoImageUrl) {
// create application list
var context = new HashMap();
context.put("invoice", invoice);
-GroovyUtil.runScriptAtLocation("component://accounting/groovyScripts/invoice/CreateApplicationList.groovy",
context);
+GroovyUtil.runScriptAtLocation("component://accounting/src/main/groovy/org/apache/ofbiz/accounting/invoice/CreateApplicationList.groovy",
context);
invoiceApplications = context.get("invoiceApplications");
// create debit/credit total variable
[ofbiz-plugins] branch trunk updated (020d76e68 -> 235f24a5a)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git from 020d76e68 Updated applications refactored groovy location for plugins components (OFBIZ-12813) new 7a9e6aaa1 Improved: Refactoring groovy folder structure and package declaration (OFBIZ-12813) new b7c7757b3 Improved: Changes script location for the moved CreateApplicationList.groovy (OFBIZ-12813) new 0bf579f8d Improved: Removes obsolete request entry (OFBIZ-12813) new 425b4560c Improved: Removes obsolete groovy script call (OFBIZ-12813) new 235f24a5a Imporved: Removes unused screen SubTaslsInfo. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assetmaint/servicedef/services.xml |8 +- .../ofbiz/assetmaint}/assetmaint/EditMaint.groovy |5 +- .../assetmaint/FixedAssetMaintServices.groovy |7 +- .../assetmaint/PrintFixedAssetMaint.groovy |5 +- .../assetmaint}/workeffort/EditWorkEfforts.groovy |3 + .../assetmaint/test/FixedAssetMaintTests.groovy|0 assetmaint/widget/AssetmaintScreens.xml|6 +- bi/servicedef/services.xml | 30 +- .../org/apache/ofbiz/bi}/DimensionServices.groovy |5 +- .../org/apache/ofbiz/bi}/FactServices.groovy |5 +- .../apache/ofbiz/bi}/GetStarSchemaFields.groovy|5 +- .../org/apache/ofbiz/bi}/GetStarSchemas.groovy |5 +- .../org/apache/ofbiz/bi}/RunStarSchemaQuery.groovy |5 +- bi/widget/BiForms.xml |2 +- bi/widget/BiScreens.xml|4 +- ...AcctgTransEntriesSearchResultsParameters.groovy |5 +- .../birt}/accounting/BalanceSheetParameters.groovy |7 +- .../accounting/IncomeStatementParameters.groovy|7 +- .../InvoiceAcctgTransEntryParameters.groovy|7 +- .../PaymentAcctgTransEntryParameters.groovy|7 +- .../ofbiz/birt}/accounting/PaymentReport.groovy|5 +- .../birt}/accounting/TrialBalanceParameters.groovy |7 +- .../birt}/facility/InventoryItemReport.groovy |5 +- .../apache/ofbiz/birt}/order/CheckReportBy.groovy |5 +- .../birt}/order/NetBeforeOverheadReport.groovy |5 +- .../apache/ofbiz/birt}/order/OrderByChannel.groovy |5 +- .../ofbiz/birt}/order/ProductDemandReport.groovy |5 +- .../apache/ofbiz/birt}/order/SalesReport.groovy|5 +- .../ofbiz/birt}/report/PrepareBirtCall.groovy |5 +- birt/webapp/accounting/WEB-INF/controller.xml | 16 +- .../reports/InvoiceAcctgTransEntry.rptdesign |2 +- birt/webapp/birt/WEB-INF/controller.xml|2 +- birt/webapp/facility/WEB-INF/controller.xml| 10 +- birt/webapp/ordermgr/WEB-INF/controller.xml| 29 +- .../apache/ofbiz/ebay}/EbayAdvancedSearch.groovy |5 +- .../org/apache/ofbiz/ebay}/EbayOrders.groovy |5 +- .../apache/ofbiz/ebay}/ProductsExportToEbay.groovy |5 +- .../apache/ofbiz/ebay}/UpdatedEbayOrders.groovy|5 +- ebay/webapp/ebay/WEB-INF/controller.xml|2 +- ebay/widget/EbayScreens.xml|8 +- .../automationPreferences/GetDisputeInfo.groovy|5 +- .../automationPreferences/GetEbayJobsandbox.groovy |5 +- .../email/GetProductStoreEmailTemplate.groovy |5 +- .../ofbiz/ebaystore}/feedback/FeedbackList.groovy |5 +- .../ofbiz/ebaystore}/store/CheckOrderStatus.groovy |5 +- .../ebaystore}/store/OrderListParameters.groovy|5 +- .../ofbiz/ebaystore}/store/OrderListPrepare.groovy |5 +- .../ebaystore}/store/PrepareProductListing.groovy |5 +- .../ebaystore}/store/RetrieveStoreOptions.groovy |5 +- .../ofbiz/ebaystore}/store/SoldAction.groovy |5 +- .../ofbiz/ebaystore}/store/StoreAccount.groovy |5 +- ebaystore/widget/EbayAccountScreens.xml|4 +- ebaystore/widget/EbayEmailScreens.xml |3 +- ebaystore/widget/EbaySellingManagerForms.xml |6 +- ebaystore/widget/EbaySellingManagerScreens.xml |6 +- ebaystore/widget/EbayStoreForms.xml|4 +- ebaystore/widget/EbayStoreScreens.xml |6 +- .../apache/ofbiz/ecommerce}/EcommerceSetup.groovy |5 +- .../org/apache/ofbiz/ecommerce}/Login.groovy |5 +- .../groovy/org/apache/ofbiz/ecommerce}/Main.groovy |5 +- .../ofbiz/ecommerce}/ProcessPaymentSettings.groovy |5 +- .../apache/ofbiz/ecommerce}/cart/ShowCart.groovy |5 +- .../ofbiz/ecommerce}/cart/ShowPromoText.groovy |5 +- .../ecommerce}/catalog/AjaxBreadcrumbs.groovy |5 +- .../ecommerce}/catalog/BestSellingCat
[ofbiz-framework] 02/04: Fixed: Corrects path reference for groovy files (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 88071b0eaf1d14db93c7b29d2a70bfb81d35ef38
Author: Michael Brohl
AuthorDate: Mon Jul 31 17:16:07 2023 +0200
Fixed: Corrects path reference for groovy files (OFBIZ-12813)
---
.../java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
index a89963d321..53d5167c49 100644
---
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
+++
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java
@@ -203,7 +203,7 @@ public class LabelReferences {
private void getLabelsFromGroovyFiles() throws IOException {
for (Path rootFolder : this.rootFolders) {
List groovyFiles =
-FileUtil.findFiles("groovy",
rootFolder.resolve("groovyScripts").toString(), null, null);
+FileUtil.findFiles("groovy",
rootFolder.resolve("src/main/groovy").toString(), null, null);
for (File file : groovyFiles) {
String inFile = FileUtil.readString("UTF-8", file);
findUiLabelMapInPattern(inFile, UILABEL_MAP, file.getPath());
[ofbiz-framework] 03/04: Improved: Reword comment (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 870f673e2c1e9a8e45ed48694a6f3f28b83bc5d6
Author: Michael Brohl
AuthorDate: Mon Jul 31 17:34:49 2023 +0200
Improved: Reword comment (OFBIZ-12813)
---
.../base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/framework/base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy
b/framework/base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy
index aa36b768e9..f6e214d884 100644
---
a/framework/base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy
+++
b/framework/base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy
@@ -22,7 +22,7 @@ package org.apache.ofbizbase.test
import org.apache.ofbiz.testtools.GroovyScriptTestCase
/**
- * Class validating groovyScripts test engine.
+ * Class validating groovy scripts test engine.
*/
class SimpleTests extends GroovyScriptTestCase {
[ofbiz-framework] 01/04: Fixed: Corrects wrong groovy file reference (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 12f69648418b3c63467e39c1a759ca6241e8094b Author: Michael Brohl AuthorDate: Mon Jul 31 17:12:33 2023 +0200 Fixed: Corrects wrong groovy file reference (OFBIZ-12813) --- applications/party/widget/partymgr/CommunicationEventScreens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/party/widget/partymgr/CommunicationEventScreens.xml b/applications/party/widget/partymgr/CommunicationEventScreens.xml index 73a8307fd3..1d24800ff7 100644 --- a/applications/party/widget/partymgr/CommunicationEventScreens.xml +++ b/applications/party/widget/partymgr/CommunicationEventScreens.xml @@ -965,7 +965,7 @@ under the License. - +
[ofbiz-framework] 04/04: Fixed: Corrects groovy source folder location in build.gradle (OFBIZ-12813)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 3e077e5f17b839d8cca88643e605975c2fc552c7
Author: Michael Brohl
AuthorDate: Mon Jul 31 17:47:23 2023 +0200
Fixed: Corrects groovy source folder location in build.gradle
(OFBIZ-12813)
---
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 8fce176ecc..a31dea061a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -357,7 +357,7 @@ sourceSets {
groovyScripts {
groovy {
-srcDirs += getDirectoryInActiveComponentsIfExists('groovyScripts')
+srcDirs +=
getDirectoryInActiveComponentsIfExists('src/main/groovy')
compileClasspath += sourceSets.main.compileClasspath
compileClasspath += sourceSets.main.output
}
@@ -809,7 +809,7 @@ task createPlugin(group: ofbizPlugin, description: 'create
a new plugin componen
def pluginDir = "${pluginsDir}/${pluginId}"
['config', 'dtd', 'entitydef', 'lib', 'patches/test', 'patches/qa',
-'patches/production', 'groovyScripts', 'minilang',
'servicedef', 'src/main/java', 'src/test/java', 'testdef',
+'patches/production', 'src/main/groovy', 'minilang',
'servicedef', 'src/main/java', 'src/test/java', 'testdef',
'widget', "webapp/${webappName}/error",
"webapp/${webappName}/WEB-INF"].each {
mkdir pluginDir + '/' + it
}
[ofbiz-framework] branch trunk updated (5be826024c -> 3e077e5f17)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git from 5be826024c Improved: Refactor groovy folder structure and add package declaration new 12f6964841 Fixed: Corrects wrong groovy file reference (OFBIZ-12813) new 88071b0eaf Fixed: Corrects path reference for groovy files (OFBIZ-12813) new 870f673e2c Improved: Reword comment (OFBIZ-12813) new 3e077e5f17 Fixed: Corrects groovy source folder location in build.gradle (OFBIZ-12813) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: applications/party/widget/partymgr/CommunicationEventScreens.xml | 2 +- build.gradle | 4 ++-- .../base/src/test/groovy/org/apache/ofbizbase/test/SimpleTests.groovy | 2 +- .../java/org/apache/ofbiz/webtools/labelmanager/LabelReferences.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
[ofbiz-framework] branch trunk updated: Fixed: Convert InventoryServices.xml mini lang to groovy (OFBIZ-12174)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6348424361 Fixed: Convert InventoryServices.xml mini lang to groovy
(OFBIZ-12174)
6348424361 is described below
commit 634842436167a4c399d2d98162ad211f3a4fcc45
Author: Cheng Hu Shan
AuthorDate: Thu Jul 27 16:37:39 2023 +0200
Fixed: Convert InventoryServices.xml mini lang to groovy (OFBIZ-12174)
---
.../ofbiz/product/product/inventory/InventoryServicesScript.groovy| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/applications/product/src/main/groovy/org/apache/ofbiz/product/product/inventory/InventoryServicesScript.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/inventory/InventoryServicesScript.groovy
index 590ae0d1c4..059ec9a55f 100644
---
a/applications/product/src/main/groovy/org/apache/ofbiz/product/product/inventory/InventoryServicesScript.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/inventory/InventoryServicesScript.groovy
@@ -139,7 +139,9 @@ Map createInventoryItem() {
Map partyAccountingPreferencesCallMap = [organizationPartyId:
inventoryItem.ownerPartyId]
Map serviceResult = run service: 'getPartyAccountingPreferences',
with: partyAccountingPreferencesCallMap
Map accPref = serviceResult.partyAccountingPreference
-inventoryItem.currencyUomId = accPref.baseCurrencyUomId
+if (accPref) {
+inventoryItem.currencyUomId = accPref.baseCurrencyUomId
+}
inventoryItem.currencyUomId = inventoryItem.currencyUomId ?:
UtilProperties.getPropertyValue('general.properties', 'currency.uom.id.default')
// if inventoryItem's currencyUomId is still empty, return an error
message
[ofbiz-framework] branch trunk updated: Improved: Refactored DataResourceWorker getMimeType (OFBIZ-9403)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new e87b199483 Improved: Refactored DataResourceWorker getMimeType
(OFBIZ-9403)
e87b199483 is described below
commit e87b1994836ca88c3ba04fadef33f7bb8e828511
Author: Cheng Hu Shan
AuthorDate: Thu Jul 27 16:22:49 2023 +0200
Improved: Refactored DataResourceWorker getMimeType (OFBIZ-9403)
---
.../ofbiz/content/data/DataResourceWorker.java | 67 --
1 file changed, 48 insertions(+), 19 deletions(-)
diff --git
a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
index a606f72820..18bd81734b 100644
---
a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
+++
b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataResourceWorker.java
@@ -107,6 +107,7 @@ public class DataResourceWorker implements
org.apache.ofbiz.widget.content.DataR
private static final String MODULE = DataResourceWorker.class.getName();
private static final String ERR_RESOURCE = "ContentErrorUiLabels";
+private static final String PROPERTY_RESOURCE = "content";
/**
* Traverses the DataCategory parent/child structure and put it in
categoryNode. Returns non-null error string if there is an error.
@@ -377,35 +378,63 @@ public class DataResourceWorker implements
org.apache.ofbiz.widget.content.DataR
return b;
}
+/**
+ * Gets the MIME-Type from a given data resource, using the default value
set in properties as fallback.
+ * @param dataResource
+ * @return MIME-Type
+ */
public static String getMimeType(GenericValue dataResource) {
+String defaultMimeType =
EntityUtilProperties.getPropertyValue(PROPERTY_RESOURCE, "defaultMimeType",
"application/octet-stream",
+dataResource.getDelegator());
+return getMimeType(dataResource, defaultMimeType);
+}
+
+/**
+ * Gets the MIME-Type from a given data resource.
+ * @param dataResource
+ * @param defaultMimeTypeId
+ * @return MIME-Type
+ */
+public static String getMimeType(GenericValue dataResource, String
defaultMimeTypeId) {
String mimeTypeId = null;
if (dataResource != null) {
mimeTypeId = (String) dataResource.get("mimeTypeId");
if (UtilValidate.isEmpty(mimeTypeId)) {
String fileName = (String) dataResource.get("objectInfo");
-if (fileName != null && fileName.indexOf('.') > -1) {
-String fileExtension =
fileName.substring(fileName.lastIndexOf('.') + 1);
-if (UtilValidate.isNotEmpty(fileExtension)) {
-GenericValue ext = null;
-try {
-ext =
dataResource.getDelegator().findOne("FileExtension",
-UtilMisc.toMap("fileExtensionId",
fileExtension), false);
-} catch (GenericEntityException e) {
-Debug.logError(e, MODULE);
-}
-if (ext != null) {
-mimeTypeId = ext.getString("mimeTypeId");
-}
-}
-}
+mimeTypeId = getMimeType(dataResource.getDelegator(),
fileName, defaultMimeTypeId);
+}
+}
+return mimeTypeId;
+}
+
+/**
+ * Gets the MIME-Type from a given filename.
+ * @param delegator
+ * @param fileName
+ * @param defaultMimeTypeId
+ * @return MIME-Type
+ */
+public static String getMimeType(Delegator delegator, String fileName,
String defaultMimeTypeId) {
+String mimeTypeId = null;
-// check one last time
-if (UtilValidate.isEmpty(mimeTypeId)) {
-// use a default mime type
-mimeTypeId = "application/octet-stream";
+if (UtilValidate.isNotEmpty(fileName) && fileName.indexOf('.') > -1) {
+String fileExtension =
fileName.substring(fileName.lastIndexOf('.') + 1);
+if (UtilValidate.isNotEmpty(fileExtension)) {
+GenericValue ext = null;
+try {
+ext = delegator.findOne("FileExtension", true,
"fileExtensionId", fileExtension);
+if (ext != null) {
+mimeTypeId = ext.getString("mimeTypeId");
+}
+} catch (GenericEntityException e) {
+
[ofbiz-framework] branch trunk updated: Fixed: Persist OrderItemAttribute of ShoppingCartItem (OFBIZ-12828)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3d349c4870 Fixed: Persist OrderItemAttribute of ShoppingCartItem
(OFBIZ-12828)
3d349c4870 is described below
commit 3d349c48708723e99220858cc45b8f392ec50eaf
Author: Sebastian Berg
AuthorDate: Thu Jul 27 15:52:48 2023 +0200
Fixed: Persist OrderItemAttribute of ShoppingCartItem (OFBIZ-12828)
Fix introduced so that OrderItemAttributes are persisted inside
ShoppingCartItemAttributes from now on.
Checkstyle ParameterNumber needed to be increased by one
---
.../datamodel/entitydef/order-entitymodel.xml | 15 +++
.../order/servicedef/services_shoppinglist.xml | 1 +
.../shoppinglist/ShoppingListServicesScript.groovy | 61 +++-
.../ofbiz/order/shoppingcart/ShoppingCart.java | 7 --
.../ofbiz/order/shoppingcart/ShoppingCartItem.java | 109 -
.../order/shoppinglist/ShoppingListEvents.java | 74 --
config/checkstyle/checkstyle.xml | 2 +-
7 files changed, 199 insertions(+), 70 deletions(-)
diff --git a/applications/datamodel/entitydef/order-entitymodel.xml
b/applications/datamodel/entitydef/order-entitymodel.xml
index 5bb9f6c56d..f827711b7a 100644
--- a/applications/datamodel/entitydef/order-entitymodel.xml
+++ b/applications/datamodel/entitydef/order-entitymodel.xml
@@ -2951,6 +2951,21 @@ under the License.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/applications/order/servicedef/services_shoppinglist.xml
b/applications/order/servicedef/services_shoppinglist.xml
index 947ee8f707..8e46990395 100644
--- a/applications/order/servicedef/services_shoppinglist.xml
+++ b/applications/order/servicedef/services_shoppinglist.xml
@@ -124,6 +124,7 @@ under the License.
+
, Serializable {
reserveAfterDate, features, attributes, prodCatalogId,
configWrapper, itemType, itemGroup, dispatcher,
this, Boolean.TRUE, Boolean.TRUE, parentProductId,
Boolean.FALSE, Boolean.FALSE);
}
-// add order item attributes
-if (UtilValidate.isNotEmpty(orderItemAttributes)) {
-for (Entry entry : orderItemAttributes.entrySet())
{
-item.setOrderItemAttribute(entry.getKey(), entry.getValue());
-}
-}
return this.addItem(0, item);
@@ -5013,7 +5007,6 @@ public class ShoppingCart implements
Iterable, Serializable {
}
List supplierProducts =
UtilGenerics.cast(getSuppliersForProductResult.get("supplierProducts"));
-
if (supplierProducts.isEmpty()) {
return ServiceUtil.returnError(
"Sorry! No supplier available to droship product
#" + productId + " with quantity "
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
index 3ba990b1a6..8a3064b45d 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCartItem.java
@@ -31,6 +31,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.apache.ofbiz.base.util.Debug;
@@ -532,20 +533,44 @@ public class ShoppingCartItem implements
java.io.Serializable {
parentProductId, skipInventoryChecks, skipProductChecks);
}
+/**
+ * Method for backwards compatibility after extending makeItem method
below with
+ * additional orderItemAttributes parameter.
+ */
+public static ShoppingCartItem makeItem(Integer cartLocation, String
productId, BigDecimal selectedAmount,
+BigDecimal quantity, BigDecimal unitPrice,
+Timestamp reservStart, BigDecimal reservLength, BigDecimal
reservPersons, String accommodationMapId,
+String accommodationSpotId, Timestamp shipBeforeDate, Timestamp
shipAfterDate, Timestamp reserveAfterDate,
+Map additionalProductFeatureAndAppls,
Map attributes,
+String prodCatalogId, ProductConfigWrapper configWrapper,
+String itemType, ShoppingCart.ShoppingCartItemGroup itemGroup,
LocalDispatcher dispatcher,
+ShoppingCart cart, Boolean triggerExternalOpsBool, Boolean
triggerPriceRulesBool, String parentProductId,
+Boolean skipInventoryChecks, Boolean skipProductChecks)
+
[ofbiz-framework] branch trunk updated: Improved: getPathInfoOnlyParameterMap should be public (OFBIZ-12842)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3f7776159d Improved: getPathInfoOnlyParameterMap should be public
(OFBIZ-12842)
3f7776159d is described below
commit 3f7776159dc1285aeb054dbe5eaf5003449bf687
Author: Cheng Hu Shan
AuthorDate: Thu Jul 27 12:09:35 2023 +0200
Improved: getPathInfoOnlyParameterMap should be public (OFBIZ-12842)
---
framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
index fb8d1b5663..3ba66da041 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
@@ -380,7 +380,7 @@ public final class UtilHttp {
* @param pred the predicate filtering parameter names
* @return a canonicalized parameter map.
*/
-static Map getPathInfoOnlyParameterMap(String path,
Predicate pred) {
+public static Map getPathInfoOnlyParameterMap(String path,
Predicate pred) {
String path1 = Optional.ofNullable(path).orElse("");
Map> allParams = Arrays.stream(path1.split("/"))
.filter(segment -> segment.startsWith("~") &&
segment.contains("="))
[ofbiz-framework] branch trunk updated: Bugfix: findList method should return unmodifiable list (OFBIZ -12841)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8897448a61 Bugfix: findList method should return unmodifiable list
(OFBIZ -12841)
8897448a61 is described below
commit 8897448a610b8b2a521187a62e402379edc0c0d5
Author: Cheng Hu Shan
AuthorDate: Thu Jul 27 11:47:49 2023 +0200
Bugfix: findList method should return unmodifiable list (OFBIZ -12841)
---
.../entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
index 35f4a80f71..1ad455082c 100644
---
a/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
+++
b/framework/entity/src/main/java/org/apache/ofbiz/entity/GenericDelegator.java
@@ -1634,7 +1634,7 @@ public class GenericDelegator implements Delegator {
List cacheList = this.cache.get(entityName,
entityCondition, orderBy);
if (cacheList != null) {
-return cacheList;
+return Collections.unmodifiableList(cacheList);
}
}
[ofbiz-framework] branch trunk updated: Improved: Added missing getter/setter (OFBIZ-12840)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2eae767e40 Improved: Added missing getter/setter (OFBIZ-12840)
2eae767e40 is described below
commit 2eae767e4026359dadac9870044d6eccafef61bd
Author: Cheng Hu Shan
AuthorDate: Thu Jul 27 11:23:09 2023 +0200
Improved: Added missing getter/setter (OFBIZ-12840)
---
.../ofbiz/order/shoppingcart/ShoppingCart.java | 85 ++
.../ofbiz/webapp/control/ConfigXMLReader.java | 40 ++
2 files changed, 125 insertions(+)
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
index 3b46dd7ff2..fef531cd16 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/ShoppingCart.java
@@ -5367,10 +5367,18 @@ public class ShoppingCart implements
Iterable, Serializable {
private String productStoreShipMethId = null;
private Map attributes = new HashMap<>();
+/** get ship before date */
+public Timestamp getShipBeforeDate() {
+return shipBeforeDate;
+}
/** set ship before date */
public void setShipBeforeDate(Timestamp shipBeforeDate) {
this.shipBeforeDate = shipBeforeDate;
}
+/** get ship after date */
+public Timestamp getShipAfterDate() {
+return shipAfterDate;
+}
/** set ship after date */
public void setShipAfterDate(Timestamp shipAfterDate) {
this.shipAfterDate = shipAfterDate;
@@ -5383,10 +5391,18 @@ public class ShoppingCart implements
Iterable, Serializable {
public void setAttribute(String name, Object value) {
this.attributes.put(name, value);
}
+/** get gift message */
+public String getGiftMessage() {
+return giftMessage;
+}
/** set gift message */
public void setGiftMessage(String giftMessage) {
this.giftMessage = giftMessage;
}
+/** get shippingInstructions */
+public String getShippingInstructions() {
+return shippingInstructions;
+}
/** set shipping instructions */
public void setShippingInstructions(String shippingInstructions) {
this.shippingInstructions = shippingInstructions;
@@ -5404,6 +5420,10 @@ public class ShoppingCart implements
Iterable, Serializable {
public String getOrderTypeId() {
return orderTypeId;
}
+/** set order type id */
+public void setOrderTypeId(String orderTypeId) {
+this.orderTypeId = orderTypeId;
+}
/** get contact mech id */
public String getContactMechId() {
return internalContactMechId;
@@ -5420,6 +5440,23 @@ public class ShoppingCart implements
Iterable, Serializable {
public void setCarrierPartyId(String carrierPartyId) {
this.carrierPartyId = carrierPartyId;
}
+/** get carrier roleType id */
+public String getCarrierRoleTypeId() {
+return carrierRoleTypeId;
+}
+/** set carrier roleType id */
+public void setCarrierRoleTypeId(String carrierRoleTypeId) {
+this.carrierRoleTypeId = carrierRoleTypeId;
+}
+/** get productStoreShipMeth id */
+public String getProductStoreShipMethId() {
+return productStoreShipMethId;
+}
+
+/** set productStoreShipMeth id */
+public void setProductStoreShipMethId(String productStoreShipMethId) {
+this.productStoreShipMethId = productStoreShipMethId;
+}
/** get supplier party id */
public String getSupplierPartyId() {
return supplierPartyId;
@@ -5444,6 +5481,10 @@ public class ShoppingCart implements
Iterable, Serializable {
public BigDecimal getShipEstimate() {
return shipEstimate;
}
+/** set ship estimate */
+public void getShipEstimate(BigDecimal shipEstimate) {
+this.shipEstimate = shipEstimate;
+}
/** get ship group seq id */
public String getShipGroupSeqId() {
return shipGroupSeqId;
@@ -5452,6 +5493,14 @@ public class ShoppingCart implements
Iterable, Serializable {
public void setShipGroupSeqId(String shipGroupSeqId) {
this.shipGroupSeqId = shipGroupSeqId;
}
+/** get telecom contact mech id */
+public String getTelecomContactMechId() {
+return telecomContactMechId;
+}
+/** set telecom contac
[ofbiz-framework] branch trunk updated: Fixed: Updates installation instructions to use JDK 17 instead of 11
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 6953f65398 Fixed: Updates installation instructions to use JDK 17 instead of 11 6953f65398 is described below commit 6953f6539811d44e9a465e6da8d34da8add4c610 Author: Michael Brohl AuthorDate: Fri May 5 13:57:33 2023 +0200 Fixed: Updates installation instructions to use JDK 17 instead of 11 --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 9cf4302456..bc02446403 100644 --- a/INSTALL +++ b/INSTALL @@ -6,7 +6,7 @@ your business. System requirements The only requirement to run OFBiz is to have the Java Development Kit (JDK) -version 11 installed on your system (not just the JRE, but the full JDK) which +version 17 installed on your system (not just the JRE, but the full JDK) which you can download from the below link. Make sure of setting the $JAVA_HOME environment variable.
[ofbiz-plugins] branch trunk updated: Fixed: Eclipse build problems and proper dependency setup (OFBIZ-12808)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new e5beba5bd Fixed: Eclipse build problems and proper dependency setup
(OFBIZ-12808)
e5beba5bd is described below
commit e5beba5bd779bc75bfca6519e86a3136764ad2d4
Author: Michael Brohl
AuthorDate: Fri Apr 21 14:51:15 2023 +0200
Fixed: Eclipse build problems and proper dependency setup (OFBIZ-12808)
Due to improper dependency configurations and the JPMS (Java Plattform
Module System) which was introduced to Java since version 9, the Eclipse
build and running/debugging is not working with JDK 17 (trunk and
release22.01).
The reason is that there are dependencies to libraries which are also
shipped with the JDK which causes a conflict leading to ignore those
packages/classes in the build.
This commit fixes the problems for the trunk plugins.
---
birt/build.gradle | 6 ++
ldap/build.gradle | 9 +
2 files changed, 15 insertions(+)
diff --git a/birt/build.gradle b/birt/build.gradle
index 0ce984e1e..6ee6e884f 100644
--- a/birt/build.gradle
+++ b/birt/build.gradle
@@ -23,3 +23,9 @@ dependencies {
exclude group: 'org.eclipse.birt.runtime.3_7_1', module:
'org.apache.batik.pdf'
}
}
+
+configurations.all {
+exclude group: 'org.eclipse.birt.runtime', module: 'javax.xml.stream'
+exclude group: 'org.eclipse.birt.runtime.3_7_1', module:
'org.apache.xml.serializer'
+exclude group: 'org.eclipse.birt.runtime.3_7_1', module:
'org.apache.xerces'
+}
diff --git a/ldap/build.gradle b/ldap/build.gradle
index c638c854e..38d884967 100644
--- a/ldap/build.gradle
+++ b/ldap/build.gradle
@@ -28,3 +28,12 @@
dependencies {
pluginLibsCompile 'org.apereo.cas:cas-server-support-ldap-core:5.0.10'
}
+
+configurations.all {
+exclude group: 'javax.xml.parsers', module: 'jsr173_api'
+exclude group: 'javax.xml.namespace', module: 'jsr173_api'
+exclude group: 'javax.xml.bind', module: 'jsr173_api'
+exclude group: 'javax.xml.bind', module: 'jaxb-api'
+exclude group: 'geronimo-spec', module: 'geronimo-spec-jta'
+
+}
[ofbiz-plugins] branch release22.01 updated: Fixed: Eclipse build problems and proper dependency setup (OFBIZ-12808)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/release22.01 by this push:
new c8860b0a2 Fixed: Eclipse build problems and proper dependency setup
(OFBIZ-12808)
c8860b0a2 is described below
commit c8860b0a2fdd12d9a52e4a5e27a7cda77472c643
Author: Michael Brohl
AuthorDate: Fri Apr 21 14:24:56 2023 +0200
Fixed: Eclipse build problems and proper dependency setup (OFBIZ-12808)
Due to improper dependency configurations and the JPMS (Java Plattform
Module System) which was introduced to Java since version 9, the Eclipse
build and running/debugging is not working with JDK 17 (trunk and
release22.01).
The reason is that there are dependencies to libraries which are also
shipped with the JDK which causes a conflict leading to ignore those
packages/classes in the build.
This commit fixes the problems for the release22.01 plugins.
---
birt/build.gradle | 6 ++
ldap/build.gradle | 9 +
2 files changed, 15 insertions(+)
diff --git a/birt/build.gradle b/birt/build.gradle
index 0ce984e1e..6ee6e884f 100644
--- a/birt/build.gradle
+++ b/birt/build.gradle
@@ -23,3 +23,9 @@ dependencies {
exclude group: 'org.eclipse.birt.runtime.3_7_1', module:
'org.apache.batik.pdf'
}
}
+
+configurations.all {
+exclude group: 'org.eclipse.birt.runtime', module: 'javax.xml.stream'
+exclude group: 'org.eclipse.birt.runtime.3_7_1', module:
'org.apache.xml.serializer'
+exclude group: 'org.eclipse.birt.runtime.3_7_1', module:
'org.apache.xerces'
+}
diff --git a/ldap/build.gradle b/ldap/build.gradle
index a734dd948..d541161d3 100644
--- a/ldap/build.gradle
+++ b/ldap/build.gradle
@@ -20,3 +20,12 @@
dependencies {
pluginLibsCompile 'org.apereo.cas:cas-server-support-ldap-core:5.0.10' //
6.4.0 declares an API of a component compatible with Java 11 and the consumer
needed a runtime of a component compatible with Java 8
}
+
+configurations.all {
+exclude group: 'javax.xml.parsers', module: 'jsr173_api'
+exclude group: 'javax.xml.namespace', module: 'jsr173_api'
+exclude group: 'javax.xml.bind', module: 'jsr173_api'
+exclude group: 'javax.xml.bind', module: 'jaxb-api'
+exclude group: 'geronimo-spec', module: 'geronimo-spec-jta'
+
+}
[ofbiz-framework] branch trunk updated: Fixed: Eclipse build problems and proper dependency setup (OFBIZ-12808)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new c61adca927 Fixed: Eclipse build problems and proper dependency setup
(OFBIZ-12808)
c61adca927 is described below
commit c61adca927d0084cfeac9cb8ec9b05e60758e884
Author: Michael Brohl
AuthorDate: Thu Apr 20 12:35:18 2023 +0200
Fixed: Eclipse build problems and proper dependency setup (OFBIZ-12808)
Due to improper dependency configurations and the JPMS (Java Plattform
Module System) which was introduced to Java since version 9, the Eclipse
build and running/debugging is not working with JDK 17 (trunk and
release22.01).
The reason is that there are dependencies to libraries which are also
shipped with the JDK which causes a conflict leading to ignore those
packages/classes in the build.
This commit fixes the problems for trunk without plugins, they have to
be modified separately.
---
build.gradle| 17 +++--
.../java/org/apache/ofbiz/security/SecuredUpload.java | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index 91dd822533..d3e3abf526 100644
--- a/build.gradle
+++ b/build.gradle
@@ -195,6 +195,17 @@ configurations {
}
}
+configurations.all {
+exclude group: 'log4j', module: 'log4j'
+exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+exclude group: 'xml-apis', module: 'xml-apis'
+exclude group: 'jaxen', module: 'jaxen'
+exclude group: 'javax.xml.stream', module: 'stax-api'
+exclude group: 'org.apache.geronimo.specs', module:
'geronimo-stax-api_1.0_spec'
+exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
+exclude group: 'javax.transaction', module: 'jta'
+}
+
dependencies {
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
implementation 'com.google.zxing:core:3.5.1'
@@ -216,6 +227,7 @@ dependencies {
implementation 'commons-net:commons-net:3.8.0'
implementation 'commons-validator:commons-validator:1.7'
implementation 'de.odysseus.juel:juel-impl:2.2.7'
+implementation 'javax.transaction:javax.transaction-api:1.3'
implementation 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
implementation 'net.lingala.zip4j:zip4j:2.11.2'
implementation 'org.apache.ant:ant-junit:1.10.12'
@@ -241,7 +253,9 @@ dependencies {
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.74' // Remember
to change the version number (9 now) in javadoc block if needed.
implementation 'org.apache.tomcat:tomcat-jasper:9.0.74'
implementation 'org.apache.axis2:axis2-kernel:1.8.2'
-implementation 'batik:batik-svg-dom:1.6-1'
+implementation 'org.apache.xmlgraphics:batik-anim:1.14'
+implementation 'org.apache.xmlgraphics:batik-util:1.14'
+implementation 'org.apache.xmlgraphics:batik-bridge:1.14'
implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: since 2.4
dependencies are messed up. See
https://github.com/moqui/moqui-fop/blob/master/build.gradle
implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
@@ -278,7 +292,6 @@ dependencies {
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.19.0' // for
external jars using slf4j: routes logging to log4j 2
runtimeOnly 'org.apache.logging.log4j:log4j-web:2.19.0' //???
runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.19.0' // need to
constrain to version to avoid classpath conflict (ReflectionUtil)
-runtimeOnly 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
// Dependencies defined by the plugins
subprojects.each { subProject ->
diff --git
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
index c9c52f7051..d4c1b68420 100644
---
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
+++
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
@@ -49,7 +49,7 @@ import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.util.XMLResourceDescriptor;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
[ofbiz-framework] branch release22.01 updated: Fixed: Eclipse build problems and proper dependency setup (OFBIZ-12808)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release22.01 by this push:
new 452ceeb0dc Fixed: Eclipse build problems and proper dependency setup
(OFBIZ-12808)
452ceeb0dc is described below
commit 452ceeb0dca5c1dd6685c22ec9746ff6eb5c2839
Author: Michael Brohl
AuthorDate: Thu Apr 20 12:18:30 2023 +0200
Fixed: Eclipse build problems and proper dependency setup (OFBIZ-12808)
Due to improper dependency configurations and the JPMS (Java Plattform
Module System) which was introduced to Java since version 9, the Eclipse
build and running/debugging is not working with JDK 17 (trunk and
release22.01).
The reason is that there are dependencies to libraries which are also
shipped with the JDK which causes a conflict leading to ignore those
packages/classes in the build.
This commit fixes the problems for release22.01 without plugins, they
have to be modified separately.
---
build.gradle| 17 +++--
.../java/org/apache/ofbiz/security/SecuredUpload.java | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index e7c437061b..e460b8dbd1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -186,6 +186,17 @@ configurations {
}
}
+configurations.all {
+exclude group: 'log4j', module: 'log4j'
+exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+exclude group: 'xml-apis', module: 'xml-apis'
+exclude group: 'jaxen', module: 'jaxen'
+exclude group: 'javax.xml.stream', module: 'stax-api'
+exclude group: 'org.apache.geronimo.specs', module:
'geronimo-stax-api_1.0_spec'
+exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
+exclude group: 'javax.transaction', module: 'jta'
+}
+
dependencies {
implementation 'xerces:xercesImpl:2.12.2'
implementation 'com.google.zxing:core:3.4.1'
@@ -206,6 +217,7 @@ dependencies {
implementation 'commons-net:commons-net:3.8.0'
implementation 'commons-validator:commons-validator:1.7'
implementation 'de.odysseus.juel:juel-impl:2.2.7'
+implementation 'javax.transaction:javax.transaction-api:1.3'
implementation 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
implementation 'net.lingala.zip4j:zip4j:2.9.0'
implementation 'org.apache.ant:ant-junit:1.10.11'
@@ -231,7 +243,9 @@ dependencies {
implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.74' // Remember
to change the version number (9 now) in javadoc block if needed.
implementation 'org.apache.tomcat:tomcat-jasper:9.0.74'
implementation 'org.apache.axis2:axis2-kernel:1.7.9' // Above:
SOAPEventHandler.java:42: error: package org.apache.axiom.om.impl.builder does
not exist
-implementation 'batik:batik-svg-dom:1.6-1'
+implementation 'org.apache.xmlgraphics:batik-anim:1.14'
+implementation 'org.apache.xmlgraphics:batik-util:1.14'
+implementation 'org.apache.xmlgraphics:batik-bridge:1.14'
implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: since 2.4
dependencies are messed up. See
https://github.com/moqui/moqui-fop/blob/master/build.gradle
implementation 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
implementation 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
@@ -265,7 +279,6 @@ dependencies {
runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2' // for
external jars using slf4j: routes logging to log4j 2
runtimeOnly 'org.apache.logging.log4j:log4j-web:2.17.2' //???
runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.17.2' // need to
constrain to version to avoid classpath conflict (ReflectionUtil)
-runtimeOnly 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
// Dependencies defined by the plugins
subprojects.each { subProject ->
diff --git
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
index c9c52f7051..d4c1b68420 100644
---
a/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
+++
b/framework/security/src/main/java/org/apache/ofbiz/security/SecuredUpload.java
@@ -49,7 +49,7 @@ import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.util.XMLResourceDescriptor;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
[ofbiz-framework] branch trunk updated: Improved: Added isEmpty Interface to StringWrapper (OFBIZ-10197)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 569cebdadd Improved: Added isEmpty Interface to StringWrapper
(OFBIZ-10197)
569cebdadd is described below
commit 569cebdadd6b17682c33da6defcef3cbd82d6085
Author: Cheng Hu Shan
AuthorDate: Tue Feb 7 09:56:26 2023 +0100
Improved: Added isEmpty Interface to StringWrapper (OFBIZ-10197)
Added convenience API to check if contained theString is null/empty
(interface IsEmpty, see UtilValidate.isEmpty) and isEmpty method
---
.../java/org/apache/ofbiz/base/util/StringUtil.java | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
index 8aa11971d8..9715ba2318 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
@@ -35,6 +35,7 @@ import java.util.stream.Collectors;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
+import org.apache.ofbiz.base.lang.IsEmpty;
/**
* Misc String Utility Functions
@@ -407,20 +408,25 @@ public final class StringUtil {
}
/**
- * A super-lightweight object to wrap a String object. Mainly used with
FTL templates
- * to avoid the general HTML auto-encoding that is now done through the
Screen Widget.
+ * A super-lightweight object to wrap a String object. Mainly used with FTL
+ * templates to avoid the general HTML auto-encoding that is now done
through
+ * the Screen Widget.
*/
-public static class StringWrapper {
+public static class StringWrapper implements IsEmpty {
public static final StringWrapper EMPTY_STRING_WRAPPER = new
StringWrapper("");
private String theString;
-protected StringWrapper() { }
+
+protected StringWrapper() {
+}
+
public StringWrapper(String theString) {
this.theString = theString;
}
/**
* Fairly simple method used for the plus (+) base concatenation in
Groovy.
+ *
* @param value
* @return the wrapped string, plus the value
*/
@@ -435,5 +441,12 @@ public final class StringUtil {
public String toString() {
return this.theString;
}
+
+/**
+ * @return true, if wrapped string is null or empty; false otherwise
+ */
+public boolean isEmpty() {
+return (theString == null || theString.isEmpty());
+}
}
}
[ofbiz-plugins] branch trunk updated: Fixed: Makes Forum Articles respond to pagination controls (OFBIZ-11434) (#76)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 43147eedd Fixed: Makes Forum Articles respond to pagination controls
(OFBIZ-11434) (#76)
43147eedd is described below
commit 43147eedd00e5e63cc036e32dd1f69bda97c8fd6
Author: cshan-ecomify <117295991+cshan-ecom...@users.noreply.github.com>
AuthorDate: Mon Mar 27 08:08:14 2023 +0200
Fixed: Makes Forum Articles respond to pagination controls (OFBIZ-11434)
(#76)
* Fixed: Makes Forum Articles respond to pagination controls (OFBIZ-11434)
* Improved: Removed commented out code (OFBIZ-11434)
---
ecommerce/groovyScripts/forum/ShowForum.groovy | 31
.../apache/ofbiz/ecommerce/forum/ForumEvents.java | 87 ++
ecommerce/template/forum/ForumPaging.ftl | 9 ++-
ecommerce/widget/ForumScreens.xml | 18 +
4 files changed, 127 insertions(+), 18 deletions(-)
diff --git a/ecommerce/groovyScripts/forum/ShowForum.groovy
b/ecommerce/groovyScripts/forum/ShowForum.groovy
new file mode 100644
index 0..d04160c50
--- /dev/null
+++ b/ecommerce/groovyScripts/forum/ShowForum.groovy
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.ofbiz.ecommerce.forum.ForumEvents
+import org.apache.ofbiz.service.ServiceUtil
+
+Map result = ForumEvents.getForumMessages(request, delegator)
+if (ServiceUtil.isSuccess(result)) {
+context.put("viewSize",result.get("viewSize"))
+context.put("forumMessages", result.get("forumMessages"))
+context.put("viewIndex", result.get("viewIndex"))
+context.put("listSize", result.get("listSize"))
+context.put("lowIndex", result.get("lowIndex"))
+context.put("highIndex", result.get("highIndex"))
+}
diff --git
a/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/forum/ForumEvents.java
b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/forum/ForumEvents.java
new file mode 100644
index 0..0d60927b3
--- /dev/null
+++ b/ecommerce/src/main/java/org/apache/ofbiz/ecommerce/forum/ForumEvents.java
@@ -0,0 +1,87 @@
+package org.apache.ofbiz.ecommerce.forum;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.ofbiz.base.util.Debug;
+import org.apache.ofbiz.base.util.UtilMisc;
+import org.apache.ofbiz.base.util.UtilValidate;
+import org.apache.ofbiz.entity.Delegator;
+import org.apache.ofbiz.entity.GenericEntityException;
+import org.apache.ofbiz.entity.GenericValue;
+import org.apache.ofbiz.entity.util.EntityListIterator;
+import org.apache.ofbiz.service.GenericServiceException;
+import org.apache.ofbiz.service.LocalDispatcher;
+import org.apache.ofbiz.service.ServiceUtil;
+
+public class ForumEvents {
+
+public static final String module = ForumEvents.class.getName();
+
+public static Map getForumMessages(HttpServletRequest
request, Delegator delegator) {
+
+LocalDispatcher dispatcher = (LocalDispatcher)
request.getAttribute("dispatcher");
+// == Create View Indexes
+int viewIndex = 0;
+int viewSize = 20;
+
+if (UtilValidate.isNotEmpty(request.getParameter("VIEW_INDEX"))) {
+Integer viewIndexInteger =
Integer.parseInt(request.getParameter("VIEW_INDEX"));
+if (viewIndexInteger != null) {
+viewIndex = viewIndexInteger;
+}
+}
+
+if (UtilValidate.isNotEmpty(request.getParameter("VIEW_SIZE"))) {
+Integer viewSizeInteger =
Integer.parseInt(request.getParameter("VIEW_SIZE"));
+if (viewSizeInteger != null) {
+viewSize = viewSizeInteger;
+}
+}
+
+int lowIndex = viewIndex * viewSize;
+int highIndex = (viewIndex + 1) * viewSize;
+
+// === Set up the PerformFindList
[ofbiz-site] branch master updated: Implemented: Optimizes and corrects the css files.
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git
The following commit(s) were added to refs/heads/master by this push:
new 1066b97 Implemented: Optimizes and corrects the css files.
1066b97 is described below
commit 1066b97932282e50c0a21fef77b94d28319f0dfe
Author: Michael Brohl
AuthorDate: Sat Feb 18 15:00:27 2023 +0100
Implemented: Optimizes and corrects the css files.
Removes outdated and empty directives.
---
css/colors.css | 4
css/layout.css | 47 +--
2 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/css/colors.css b/css/colors.css
index b72b17e..3b62ca7 100644
--- a/css/colors.css
+++ b/css/colors.css
@@ -433,8 +433,6 @@ color:#E05D30;
.PortfolioStickyMenu a:hover {
color:#4F6266;
}
-.scrollElement .pInfo {
-}
.scrollElement .pInfo a:hover {
color:#4F6266;
}
@@ -555,8 +553,6 @@ table.pricingBloc h2 {
table.pricingBloc .line1 {
background-color:#e4e4e4;
}
-table.pricingBloc .line2 {/*background-color:#fff;*/
-}
.sign {
background-color:#ededed;
}
diff --git a/css/layout.css b/css/layout.css
index 9a670fc..63cd723 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -74,11 +74,6 @@ p, ul {
strong {
font-weight:bold
}
-small, aside {
-}
-li p {
-/*line-height: 1.5em;*/
-}
a:link, a:visited {
text-decoration:none;
}
@@ -106,7 +101,6 @@ hr {height:0; padding:0; margin:3em 0 3em 0;}
== */
.pagination ul {
- moz-border-radius: 0 !important;
-webkit-border-radius: 0 !important;
border-radius:0 !important;
box-shadow: none !important;
@@ -119,7 +113,6 @@ hr {height:0; padding:0; margin:3em 0 3em 0;}
.accordion-group {
border:none;
border-bottom:1px solid #EAEAEA;
-moz-border-radius: 0;
-webkit-border-radius: 0;
border-radius: 0;
}
@@ -169,7 +162,6 @@ img {
}
.topBox {
padding:1.5em;
-moz-border-radius: 0 0 10px 10px;
-webkit-border-radius: 0 0 10px 10px;
border-radius: 0 0 10px 10px;
/*font-size:0.85em;*/
@@ -192,7 +184,6 @@ img {
.blockBox {
padding:3em;
-moz-border-radius:10px;
-webkit-border-radius:10px;
border-radius:10px;
@@ -227,8 +218,6 @@ img {
font-size: 0.9em;
line-height:1.88em;
}
-#footerRights {
-}
/*twitter widget*/
ul.tweet_list {
padding:0;
@@ -303,7 +292,6 @@ width: 20px;
}
#mainHeader .open a.firstLevel {
background-color: #111 !important;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
}
@@ -555,8 +543,6 @@ width: 20px;
#mapWrapper img, #mapWrapperFullwidth img {
max-width: none;
}
-.contentMap {
-}
#contactWrapperHome .error_message {
font-size:0.6em;
line-height:1em;
@@ -686,8 +672,6 @@ textarea {
line-height: 1.25em;
margin-bottom:0;
}
-.topQuote span {
-}
.bigIconsColumnsWrapper h2 {
/*font-size:1.25em;*/
margin:1em 0 0.75em 0;
@@ -826,7 +810,7 @@ textarea {
-o-transform: scale(0);
-ms-transform: scale(0);
transform: scale(0);
--webkit-backface-visibility: hidden; /*for a smooth font */
+backface-visibility: hidden; /*for a smooth font */
}
.ie .ch-info {
display:none;
@@ -928,9 +912,6 @@ textarea {
height:525px;
}
/* responsive sliders */
-#sliderWrapper {
-/*min-height:432px;
background-image:url('../images/icons/ajax-loader.gif') no-repeat center
center;*/
-}
#sliderShadow {
height:3em;
}
@@ -941,16 +922,12 @@ textarea {
.bgNoSlider img {
vertical-align: bottom;
}
-.logoBig {/*margin-bottom:1.5em;*/
-}
#videoWrapper {
background:transparent url('../images/icons/ajax-loader.gif') no-repeat
center center;
}
/* #Page Styles
== */
-#content {
-}
/* nav trail */
#navTrail {
margin-top:2.35em;
@@ -977,8 +954,6 @@ aside#sidebar {
#sidebar #subnav {
margin-bottom:0;
}
-#sidebar #subnav li:first-child {
-}
#sidebar #subnav li {
margin:0;
}
@@ -1005,9 +980,6 @@ aside#sidebar {
#widgetArea .widget p {
margin:0;
}
-/* fullWidth */
-#fullWidth {
-}
/* Team page */
.team1, .team2, .team3 {
margin-top:3em;
@@ -1256,8 +1228,6 @@ header#blogHeader h2 {
border-top:1px solid #D8D8D8;
padding:1.5em 0 0 0;
}
-.comments h4 {
-}
.blogPostContent .commentInfo {
font-size:0.9em;
margin-bottom:1em;
@@ -1314,8 +1284,6 @@ ul.entry-meta [class^="icon-"], [class*=" icon-"] {
}
/* #portfolio Styles
== */
-.portfolio {
-}
.sizer {
outline:none !important;
}
@@ -1436,9 +1404,6 @@ ul.entry-meta [class^="icon-"], [class*=" icon-"] {
margin-top:0;
margin-bottom: 0.5em;
}
-#fourColumns article {
-/*margin-
[ofbiz-site] branch master updated (0b66099 -> b24c79c)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git from 0b66099 Adds Daniel to the PMC list new 6c1af75 Implemented: OFBiz Website: store and load fonts locally (OFBIZ-12763) new b24c79c Implemented: OFBiz Website: store and load fonts locally (OFBIZ-12763) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 404.html | 4 +-- about-ofbiz.html | 4 +-- business-users.html| 4 +-- css/fonts.css | 55 + developers.html| 4 +-- download.html | 4 +-- faqs.html | 4 +-- fonts/OpenSans-Bold.ttf| Bin 0 -> 129784 bytes fonts/OpenSans-BoldItalic.ttf | Bin 0 -> 135108 bytes fonts/OpenSans-ExtraBold.ttf | Bin 0 -> 130180 bytes fonts/OpenSans-ExtraBoldItalic.ttf | Bin 0 -> 135688 bytes fonts/OpenSans-Italic.ttf | Bin 0 -> 135380 bytes fonts/OpenSans-Light.ttf | Bin 0 -> 129756 bytes fonts/OpenSans-LightItalic.ttf | Bin 0 -> 135668 bytes fonts/OpenSans-Regular.ttf | Bin 0 -> 129796 bytes getting-involved.html | 4 +-- index.html | 4 +-- mailing-lists.html | 4 +-- ofbiz-demos.html | 4 +-- release-notes-12.04.06.html| 4 +-- release-notes-13.07.01.html| 4 +-- release-notes-13.07.02.html| 4 +-- release-notes-13.07.03.html| 4 +-- release-notes-16.11.01.html| 4 +-- release-notes-16.11.02.html| 4 +-- release-notes-16.11.03.html| 4 +-- release-notes-16.11.04.html| 4 +-- release-notes-16.11.05.html| 4 +-- release-notes-16.11.06.html| 4 +-- release-notes-16.11.07.html| 4 +-- release-notes-17.12.01.html| 4 +-- release-notes-17.12.03.html| 4 +-- release-notes-17.12.04.html| 4 +-- release-notes-17.12.05.html| 4 +-- release-notes-17.12.06.html| 4 +-- release-notes-17.12.07.html| 4 +-- release-notes-17.12.08.html| 4 +-- release-notes-17.12.09.html| 4 +-- release-notes-18.12.01.html| 4 +-- release-notes-18.12.02.html| 4 +-- release-notes-18.12.03.html| 4 +-- release-notes-18.12.04.html| 4 +-- release-notes-18.12.05.html| 4 +-- release-notes-18.12.06.html| 4 +-- security.html | 4 +-- service-providers.html | 4 +-- source-repositories.html | 4 +-- template/region/head.tpl.php | 4 +-- user-stories.html | 4 +-- 49 files changed, 135 insertions(+), 80 deletions(-) create mode 100644 css/fonts.css create mode 100644 fonts/OpenSans-Bold.ttf create mode 100644 fonts/OpenSans-BoldItalic.ttf create mode 100644 fonts/OpenSans-ExtraBold.ttf create mode 100644 fonts/OpenSans-ExtraBoldItalic.ttf create mode 100644 fonts/OpenSans-Italic.ttf create mode 100644 fonts/OpenSans-Light.ttf create mode 100644 fonts/OpenSans-LightItalic.ttf create mode 100644 fonts/OpenSans-Regular.ttf
[ofbiz-site] 02/02: Implemented: OFBiz Website: store and load fonts locally (OFBIZ-12763)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git commit b24c79c0b2472dbb82a2d95c3e4a68ef9c45e299 Author: Michael Brohl AuthorDate: Sat Feb 18 14:34:42 2023 +0100 Implemented: OFBiz Website: store and load fonts locally (OFBIZ-12763) Provides the newly generated HTML files using local fonts. --- 404.html| 4 ++-- about-ofbiz.html| 4 ++-- business-users.html | 4 ++-- developers.html | 4 ++-- download.html | 4 ++-- faqs.html | 4 ++-- getting-involved.html | 4 ++-- index.html | 4 ++-- mailing-lists.html | 4 ++-- ofbiz-demos.html| 4 ++-- release-notes-12.04.06.html | 4 ++-- release-notes-13.07.01.html | 4 ++-- release-notes-13.07.02.html | 4 ++-- release-notes-13.07.03.html | 4 ++-- release-notes-16.11.01.html | 4 ++-- release-notes-16.11.02.html | 4 ++-- release-notes-16.11.03.html | 4 ++-- release-notes-16.11.04.html | 4 ++-- release-notes-16.11.05.html | 4 ++-- release-notes-16.11.06.html | 4 ++-- release-notes-16.11.07.html | 4 ++-- release-notes-17.12.01.html | 4 ++-- release-notes-17.12.03.html | 4 ++-- release-notes-17.12.04.html | 4 ++-- release-notes-17.12.05.html | 4 ++-- release-notes-17.12.06.html | 4 ++-- release-notes-17.12.07.html | 4 ++-- release-notes-17.12.08.html | 4 ++-- release-notes-17.12.09.html | 4 ++-- release-notes-18.12.01.html | 4 ++-- release-notes-18.12.02.html | 4 ++-- release-notes-18.12.03.html | 4 ++-- release-notes-18.12.04.html | 4 ++-- release-notes-18.12.05.html | 4 ++-- release-notes-18.12.06.html | 4 ++-- security.html | 4 ++-- service-providers.html | 4 ++-- source-repositories.html| 4 ++-- user-stories.html | 4 ++-- 39 files changed, 78 insertions(+), 78 deletions(-) diff --git a/404.html b/404.html index d9a13ee..5e28146 100644 --- a/404.html +++ b/404.html @@ -14,10 +14,10 @@ + + - - diff --git a/about-ofbiz.html b/about-ofbiz.html index dd681c3..0032a53 100644 --- a/about-ofbiz.html +++ b/about-ofbiz.html @@ -14,10 +14,10 @@ + + - - diff --git a/business-users.html b/business-users.html index 315ab03..35b27f0 100644 --- a/business-users.html +++ b/business-users.html @@ -14,10 +14,10 @@ + + - - diff --git a/developers.html b/developers.html index cb1ea55..2d80413 100644 --- a/developers.html +++ b/developers.html @@ -14,10 +14,10 @@ + + - - diff --git a/download.html b/download.html index 85688c5..c12a2ea 100644 --- a/download.html +++ b/download.html @@ -14,10 +14,10 @@ + + - - diff --git a/faqs.html b/faqs.html index c47a69a..672e9bf 100644 --- a/faqs.html +++ b/faqs.html @@ -14,10 +14,10 @@ + + - - diff --git a/getting-involved.html b/getting-involved.html index 9983c2f..a000179 100644 --- a/getting-involved.html +++ b/getting-involved.html @@ -14,10 +14,10 @@ + + - - diff --git a/index.html b/index.html index a7d88a2..d6d20b0 100644 --- a/index.html +++ b/index.html @@ -14,10 +14,10 @@ + + - - diff --git a/mailing-lists.html b/mailing-lists.html index da84ec8..1a9b041 100644 --- a/mailing-lists.html +++ b/mailing-lists.html @@ -14,10 +14,10 @@ + + - - diff --git a/ofbiz-demos.html b/ofbiz-demos.html index 9e2c98e..3ebee5a 100644 --- a/ofbiz-demos.html +++ b/ofbiz-demos.html @@ -14,10 +14,10 @@ + + - - diff --git a/release-notes-12.04.06.html b/release-notes-12.04.06.html index 649b410..7542f4a 100644 --- a/release-notes-12.04.06.html +++ b/release-notes-12.04.06.html @@ -14,10 +14,10 @@ + + - - diff --git a/release-notes-13.07.01.html b/release-notes-13.07.01.html index a01dad8..6f31e0b 100644 --- a/release-notes-13.07.01.html +++ b/release-notes-13.07.01.html @@ -14,10 +14,10 @@ + + - - diff --git a/release-notes-13.07.02.html b/release-notes-13.07.02.html index 29b99e3..0736cc3 100644 --- a/release-notes-13.07.02.html +++ b/release-notes-13.07.02.html @@ -14,10 +14,10 @@ + + - - diff --git a/release-notes-13.07.03.html b/release-notes-13.07.03.html index 616d603..1e01850 100644 --- a/release-notes-13.07.03.html +++ b/release-notes-13.07.03.html @@ -14,10 +14,10 @@ + + - - diff --git a/release-notes-16.11.01.html b/release-notes-16.11.01.html index d5d6849..291da6b 100644 --- a/release-notes-16.11.01.html +++ b/release-notes-16.11.01.html @@ -14,10 +14,10 @@ + + - - diff --git a/release-notes-16.11.02.html b/release-notes-16.11.02.html index b7ed246..9ddbed4 100644 --- a/release-notes-16.11.02.html +++ b/release-notes-16.11.02.html @@ -14,10 +14,10 @@ + + - - diff --git a/release-notes-16.11.03.html b/release-notes-16.11.03.html index da890c0..e5042f7 100644 --- a/release-notes-16.11.03.html +++ b/release
[ofbiz-site] 01/02: Implemented: OFBiz Website: store and load fonts locally (OFBIZ-12763)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git
commit 6c1af752cbcd6ae1409014979083ab75133beea3
Author: Michael Brohl
AuthorDate: Sat Feb 18 14:33:55 2023 +0100
Implemented: OFBiz Website: store and load fonts locally (OFBIZ-12763)
Provides the local font files, fonts.css containing the font faces and the
change to the header to laod fonts.css.
---
css/fonts.css | 55 +
fonts/OpenSans-Bold.ttf| Bin 0 -> 129784 bytes
fonts/OpenSans-BoldItalic.ttf | Bin 0 -> 135108 bytes
fonts/OpenSans-ExtraBold.ttf | Bin 0 -> 130180 bytes
fonts/OpenSans-ExtraBoldItalic.ttf | Bin 0 -> 135688 bytes
fonts/OpenSans-Italic.ttf | Bin 0 -> 135380 bytes
fonts/OpenSans-Light.ttf | Bin 0 -> 129756 bytes
fonts/OpenSans-LightItalic.ttf | Bin 0 -> 135668 bytes
fonts/OpenSans-Regular.ttf | Bin 0 -> 129796 bytes
template/region/head.tpl.php | 4 +--
10 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/css/fonts.css b/css/fonts.css
new file mode 100644
index 000..c4caa18
--- /dev/null
+++ b/css/fonts.css
@@ -0,0 +1,55 @@
+@font-face {
+font-family: "Open Sans";
+font-weight: 300;
+font-style: normal;
+src: url(/fonts/OpenSans-Light.ttf) format("truetype");
+}
+
+@font-face {
+font-family: "Open Sans";
+font-weight: 300;
+font-style: italic;
+src: url(/fonts/OpenSans-LightItalic.ttf) format("truetype");
+}
+
+@font-face {
+font-family: "Open Sans";
+font-weight: 400;
+font-style: normal;
+src: url(/fonts/OpenSans-Regular.ttf) format("truetype");
+}
+
+@font-face {
+font-family: "Open Sans";
+font-weight: 400;
+font-style: italic;
+src: url(/fonts/OpenSans-Italic.ttf) format("truetype");
+}
+
+@font-face {
+font-family: "Open Sans";
+font-weight: 700;
+font-style: normal;
+src: url(/fonts/OpenSans-Bold.ttf) format("truetype");
+}
+
+@font-face {
+font-family: "Open Sans";
+font-weight: 700;
+font-style: italic;
+src: url(/fonts/OpenSans-BoldItalic.ttf) format("truetype");
+}
+
+@font-face {
+font-family: "Open Sans";
+font-weight: 800;
+font-style: normal;
+src: url(/fonts/OpenSans-ExtraBold.ttf) format("truetype");
+}
+
+@font-face {
+font-family: "Open Sans";
+font-weight: 800;
+font-style: italic;
+src: url(/fonts/OpenSans-ExtraBoldItalic.ttf) format("truetype");
+}
\ No newline at end of file
diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf
new file mode 100644
index 000..a1398b3
Binary files /dev/null and b/fonts/OpenSans-Bold.ttf differ
diff --git a/fonts/OpenSans-BoldItalic.ttf b/fonts/OpenSans-BoldItalic.ttf
new file mode 100644
index 000..307122c
Binary files /dev/null and b/fonts/OpenSans-BoldItalic.ttf differ
diff --git a/fonts/OpenSans-ExtraBold.ttf b/fonts/OpenSans-ExtraBold.ttf
new file mode 100644
index 000..08d7185
Binary files /dev/null and b/fonts/OpenSans-ExtraBold.ttf differ
diff --git a/fonts/OpenSans-ExtraBoldItalic.ttf
b/fonts/OpenSans-ExtraBoldItalic.ttf
new file mode 100644
index 000..c35f57f
Binary files /dev/null and b/fonts/OpenSans-ExtraBoldItalic.ttf differ
diff --git a/fonts/OpenSans-Italic.ttf b/fonts/OpenSans-Italic.ttf
new file mode 100644
index 000..790286f
Binary files /dev/null and b/fonts/OpenSans-Italic.ttf differ
diff --git a/fonts/OpenSans-Light.ttf b/fonts/OpenSans-Light.ttf
new file mode 100644
index 000..d9a9e27
Binary files /dev/null and b/fonts/OpenSans-Light.ttf differ
diff --git a/fonts/OpenSans-LightItalic.ttf b/fonts/OpenSans-LightItalic.ttf
new file mode 100644
index 000..77f2e6c
Binary files /dev/null and b/fonts/OpenSans-LightItalic.ttf differ
diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
new file mode 100644
index 000..1dc226d
Binary files /dev/null and b/fonts/OpenSans-Regular.ttf differ
diff --git a/template/region/head.tpl.php b/template/region/head.tpl.php
index 10177b8..6247b28 100644
--- a/template/region/head.tpl.php
+++ b/template/region/head.tpl.php
@@ -14,10 +14,10 @@
+
+
-
-
[ofbiz-framework] branch trunk updated: Improved: Configure of after-login Events in BasicLogin. (OFBIZ-12630)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new b1cd87b415 Improved: Configure of after-login Events in BasicLogin.
(OFBIZ-12630)
b1cd87b415 is described below
commit b1cd87b415a2110c021574f62acf545d68aa669f
Author: Georg
AuthorDate: Fri Jul 29 14:59:10 2022 +0200
Improved: Configure of after-login Events in BasicLogin. (OFBIZ-12630)
---
framework/security/config/security.properties | 2 ++
.../ofbiz/webapp/control/ExternalLoginKeysManager.java | 2 +-
.../org/apache/ofbiz/webapp/control/JWTManager.java| 2 +-
.../org/apache/ofbiz/webapp/control/LoginWorker.java | 18 --
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/framework/security/config/security.properties
b/framework/security/config/security.properties
index 80e098090e..b7acb53346 100644
--- a/framework/security/config/security.properties
+++ b/framework/security/config/security.properties
@@ -291,3 +291,5 @@ allowedProtocols=localhost,127.0.0.1
#-- eg:
allowedURIsForFreemarkerInterpolation=createTextContentCms,updateTextContentCms,...
allowedURIsForFreemarkerInterpolation=
+#-- Configure if after-login events are run in doMainLogin (default) or in do
BasicLogin
+security.login.loginEventsAfterBasicLogin=N
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
index 867954304e..0abeaeca45 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ExternalLoginKeysManager.java
@@ -144,7 +144,7 @@ public class ExternalLoginKeysManager {
request.getSession().setAttribute("userLogin", userLogin);
userLogin = LoginWorker.checkLogout(request, response);
-LoginWorker.doBasicLogin(userLogin, request);
+LoginWorker.doBasicLogin(userLogin, request, response);
// Create a secured cookie with the correct userLoginId
LoginWorker.createSecuredLoginIdCookie(request, response);
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
index d8f06822fb..6b9f17e2ab 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/JWTManager.java
@@ -120,7 +120,7 @@ public class JWTManager {
return "success";
}
-LoginWorker.doBasicLogin(userLogin, request);
+LoginWorker.doBasicLogin(userLogin, request, response);
return "success";
}
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
index 56eca9c5cc..5af41248a2 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/LoginWorker.java
@@ -804,7 +804,7 @@ public final class LoginWorker {
return "error";
}
if (userLogin != null && hasBasePermission(userLogin, request)) {
-doBasicLogin(userLogin, request);
+doBasicLogin(userLogin, request, response);
} else {
String errMsg = UtilProperties.getMessage(RESOURCE,
"loginevents.unable_to_login_this_application", UtilHttp.getLocale(request));
request.setAttribute("_ERROR_MESSAGE_", errMsg);
@@ -817,10 +817,11 @@ public final class LoginWorker {
request.setAttribute("_LOGIN_PASSED_", "TRUE");
-// run the after-login events
-RequestHandler rh =
RequestHandler.getRequestHandler(request.getSession().getServletContext());
-rh.runAfterLoginEvents(request, response);
-
+if (!"Y".equals(UtilProperties.getPropertyValue(SEC_PROPERTIES,
"security.login.loginEventsAfterBasicLogin", "N"))) {
+// run the after-login events
+RequestHandler rh =
RequestHandler.getRequestHandler(request.getSession().getServletContext());
+rh.runAfterLoginEvents(request, response);
+}
// Create a secured cookie with the correct userLoginId
createSecuredLoginIdCookie(request, response);
@@ -830,7 +831,7 @@ public final class LoginWorker {
return autoLoginCheck(request, response);
}
-public static void doBasicLogin(GenericValue userLogin, HttpServletRequest
request) {
[ofbiz-framework] branch release22.01 updated: Improved: Make loading of data containing urls configurable (OFBIZ-12670)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release22.01 by this push:
new 0b36f12327 Improved: Make loading of data containing urls configurable
(OFBIZ-12670)
0b36f12327 is described below
commit 0b36f12327a6afcbdf8840d9e35a167c911b0173
Author: Michael Brohl
AuthorDate: Tue Jul 19 13:34:58 2022 +0200
Improved: Make loading of data containing urls configurable
(OFBIZ-12670)
Introduces a SystemProperty security/security.datafile.loadurls.enable
which can be set to true to allow loading of urls in the XML import.
---
framework/webtools/config/WebtoolsUiLabels.xml | 4
.../main/java/org/apache/ofbiz/webtools/WebToolsServices.java| 9 ++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/framework/webtools/config/WebtoolsUiLabels.xml
b/framework/webtools/config/WebtoolsUiLabels.xml
index 92f8c28b06..9cf9d79d21 100644
--- a/framework/webtools/config/WebtoolsUiLabels.xml
+++ b/framework/webtools/config/WebtoolsUiLabels.xml
@@ -2125,6 +2125,10 @@
错误：读取文件名 ${filename}：${errorString}
錯誤:讀取檔案名 ${filename}:${errorString}
+
+ERROR: For security reason HTTP URLs are not
accepted, see OFBIZ-12304. Rather load your data from a file or set
SystemProperty security.datafile.loadurls.enable = true
+FEHLER: Aus Sicherheitsgründen wird das Laden von
HTTP Urls nicht erlaubt. Laden Sie die Daten über eine Datei oder setzen Sie
die SystemProperty security.datafile.loadurls.enable = true.
+
ERROR: reading template file ${filename}:
${errorString}
ERREUR : lors de la lecture du fichier modèle
${filename}, une exception c'est levée (${errorString})
diff --git
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
index c21169a3b5..dd99fd6b62 100644
---
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
+++
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
@@ -84,6 +84,7 @@ import org.apache.ofbiz.entity.util.EntityDataLoader;
import org.apache.ofbiz.entity.util.EntityListIterator;
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.entity.util.EntitySaxReader;
+import org.apache.ofbiz.entity.util.EntityUtilProperties;
import org.apache.ofbiz.entityext.EntityGroupUtil;
import org.apache.ofbiz.security.Security;
import org.apache.ofbiz.service.DispatchContext;
@@ -108,6 +109,7 @@ public class WebToolsServices {
public static Map entityImport(DispatchContext dctx,
Map context) {
GenericValue userLogin = (GenericValue) context.get("userLogin");
LocalDispatcher dispatcher = dctx.getDispatcher();
+Delegator delegator = dctx.getDelegator();
Locale locale = (Locale) context.get("locale");
List messages = new LinkedList<>();
@@ -145,10 +147,11 @@ public class WebToolsServices {
// #
// FM Template
// #
-if (UtilValidate.urlInString(fulltext)) {
+if (UtilValidate.urlInString(fulltext)
+&&
!"true".equals(EntityUtilProperties.getPropertyValue("security",
"security.datafile.loadurls.enable", "false", delegator))) {
Debug.logError("For security reason HTTP URLs are not accepted,
see OFBIZ-12304", MODULE);
-Debug.logInfo("Rather load your data from a file", MODULE);
-return null;
+Debug.logInfo("Rather load your data from a file or set
SystemProperty security.datafile.loadurls.enable = true", MODULE);
+return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE,
"WebtoolsErrorDatafileLoadUrlNotEnabled", locale));
}
if (UtilValidate.isNotEmpty(fmfilename) &&
(UtilValidate.isNotEmpty(fulltext) || url != null)) {
File fmFile = new File(fmfilename);
[ofbiz-framework] branch release18.12 updated: Improved: Make loading of data containing urls configurable (OFBIZ-12670)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 598f70f501 Improved: Make loading of data containing urls configurable
(OFBIZ-12670)
598f70f501 is described below
commit 598f70f50116bb4aaae950b35c8f2906613bc9ab
Author: Michael Brohl
AuthorDate: Tue Jul 19 13:19:51 2022 +0200
Improved: Make loading of data containing urls configurable
(OFBIZ-12670)
Introduces a SystemProperty security/security.datafile.loadurls.enable
which can be set to true to allow loading of urls in the XML import.
---
framework/webtools/config/WebtoolsUiLabels.xml | 4
.../main/java/org/apache/ofbiz/webtools/WebToolsServices.java| 9 ++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/framework/webtools/config/WebtoolsUiLabels.xml
b/framework/webtools/config/WebtoolsUiLabels.xml
index cc06e39504..824f5a567e 100644
--- a/framework/webtools/config/WebtoolsUiLabels.xml
+++ b/framework/webtools/config/WebtoolsUiLabels.xml
@@ -2113,6 +2113,10 @@
错误：读取文件名 ${filename}：${errorString}
錯誤:讀取檔案名 ${filename}:${errorString}
+
+ERROR: For security reason HTTP URLs are not
accepted, see OFBIZ-12304. Rather load your data from a file or set
SystemProperty security.datafile.loadurls.enable = true
+FEHLER: Aus Sicherheitsgründen wird das Laden von
HTTP Urls nicht erlaubt. Laden Sie die Daten über eine Datei oder setzen Sie
die SystemProperty security.datafile.loadurls.enable = true.
+
ERROR: reading template file ${filename}:
${errorString}
ERREUR : lors de la lecture du fichier modèle
${filename}, une exception c'est levée (${errorString})
diff --git
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
index b7f5b56d76..e9af09091b 100644
---
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
+++
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
@@ -84,6 +84,7 @@ import org.apache.ofbiz.entity.util.EntityDataLoader;
import org.apache.ofbiz.entity.util.EntityListIterator;
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.entity.util.EntitySaxReader;
+import org.apache.ofbiz.entity.util.EntityUtilProperties;
import org.apache.ofbiz.entityext.EntityGroupUtil;
import org.apache.ofbiz.security.Security;
import org.apache.ofbiz.service.DispatchContext;
@@ -108,6 +109,7 @@ public class WebToolsServices {
public static Map entityImport(DispatchContext dctx,
Map context) {
GenericValue userLogin = (GenericValue) context.get("userLogin");
LocalDispatcher dispatcher = dctx.getDispatcher();
+Delegator delegator = dctx.getDelegator();
Locale locale = (Locale) context.get("locale");
List messages = new LinkedList();
@@ -143,10 +145,11 @@ public class WebToolsServices {
// #
// FM Template
// #
-if (UtilValidate.urlInString(fulltext)) {
+if (UtilValidate.urlInString(fulltext)
+&&
!"true".equals(EntityUtilProperties.getPropertyValue("security",
"security.datafile.loadurls.enable", "false", delegator))) {
Debug.logError("For security reason HTTP URLs are not accepted,
see OFBIZ-12304", module);
-Debug.logInfo("Rather load your data from a file", module);
-return null;
+Debug.logInfo("Rather load your data from a file or set
SystemProperty security.datafile.loadurls.enable = true", module);
+return ServiceUtil.returnError(UtilProperties.getMessage(resource,
"WebtoolsErrorDatafileLoadUrlNotEnabled", locale));
}
if (UtilValidate.isNotEmpty(fmfilename) &&
(UtilValidate.isNotEmpty(fulltext) || url != null)) {
File fmFile = new File(fmfilename);
[ofbiz-framework] branch trunk updated: Improved: Make loading of data containing urls configurable (OFBIZ-12670)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 20ccb4dcfd Improved: Make loading of data containing urls configurable
(OFBIZ-12670)
20ccb4dcfd is described below
commit 20ccb4dcfd79ab2fdbf8844ebd3be523e30e906f
Author: Michael Brohl
AuthorDate: Tue Jul 19 12:57:58 2022 +0200
Improved: Make loading of data containing urls configurable
(OFBIZ-12670)
Introduces a SystemProperty security#security.datafile.loadurls.enable
which can be set to true to allow loading of urls in the XML import.
---
framework/webtools/config/WebtoolsUiLabels.xml | 4
.../main/java/org/apache/ofbiz/webtools/WebToolsServices.java| 9 ++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/framework/webtools/config/WebtoolsUiLabels.xml
b/framework/webtools/config/WebtoolsUiLabels.xml
index 92f8c28b06..9cf9d79d21 100644
--- a/framework/webtools/config/WebtoolsUiLabels.xml
+++ b/framework/webtools/config/WebtoolsUiLabels.xml
@@ -2125,6 +2125,10 @@
错误：读取文件名 ${filename}：${errorString}
錯誤:讀取檔案名 ${filename}:${errorString}
+
+ERROR: For security reason HTTP URLs are not
accepted, see OFBIZ-12304. Rather load your data from a file or set
SystemProperty security.datafile.loadurls.enable = true
+FEHLER: Aus Sicherheitsgründen wird das Laden von
HTTP Urls nicht erlaubt. Laden Sie die Daten über eine Datei oder setzen Sie
die SystemProperty security.datafile.loadurls.enable = true.
+
ERROR: reading template file ${filename}:
${errorString}
ERREUR : lors de la lecture du fichier modèle
${filename}, une exception c'est levée (${errorString})
diff --git
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
index c21169a3b5..dd99fd6b62 100644
---
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
+++
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/WebToolsServices.java
@@ -84,6 +84,7 @@ import org.apache.ofbiz.entity.util.EntityDataLoader;
import org.apache.ofbiz.entity.util.EntityListIterator;
import org.apache.ofbiz.entity.util.EntityQuery;
import org.apache.ofbiz.entity.util.EntitySaxReader;
+import org.apache.ofbiz.entity.util.EntityUtilProperties;
import org.apache.ofbiz.entityext.EntityGroupUtil;
import org.apache.ofbiz.security.Security;
import org.apache.ofbiz.service.DispatchContext;
@@ -108,6 +109,7 @@ public class WebToolsServices {
public static Map entityImport(DispatchContext dctx,
Map context) {
GenericValue userLogin = (GenericValue) context.get("userLogin");
LocalDispatcher dispatcher = dctx.getDispatcher();
+Delegator delegator = dctx.getDelegator();
Locale locale = (Locale) context.get("locale");
List messages = new LinkedList<>();
@@ -145,10 +147,11 @@ public class WebToolsServices {
// #
// FM Template
// #
-if (UtilValidate.urlInString(fulltext)) {
+if (UtilValidate.urlInString(fulltext)
+&&
!"true".equals(EntityUtilProperties.getPropertyValue("security",
"security.datafile.loadurls.enable", "false", delegator))) {
Debug.logError("For security reason HTTP URLs are not accepted,
see OFBIZ-12304", MODULE);
-Debug.logInfo("Rather load your data from a file", MODULE);
-return null;
+Debug.logInfo("Rather load your data from a file or set
SystemProperty security.datafile.loadurls.enable = true", MODULE);
+return ServiceUtil.returnError(UtilProperties.getMessage(RESOURCE,
"WebtoolsErrorDatafileLoadUrlNotEnabled", locale));
}
if (UtilValidate.isNotEmpty(fmfilename) &&
(UtilValidate.isNotEmpty(fulltext) || url != null)) {
File fmFile = new File(fmfilename);
[ofbiz-framework] branch trunk updated: Improved: Regular expression denial of service in jquery-validation (OFBIZ-12634)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new d52ded8f54 Improved: Regular expression denial of service in
jquery-validation (OFBIZ-12634)
d52ded8f54 is described below
commit d52ded8f54f924c288cc8d12703027cf9f082035
Author: Michael Brohl
AuthorDate: Tue Jun 7 22:32:49 2022 +0200
Improved: Regular expression denial of service in jquery-validation
(OFBIZ-12634)
---
.../webapp/common-theme/js/package-lock.json | 28 +++---
.../webapp/common-theme/js/package.json| 4 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/themes/common-theme/webapp/common-theme/js/package-lock.json
b/themes/common-theme/webapp/common-theme/js/package-lock.json
index ceca41e8b9..de0ba5ba46 100644
--- a/themes/common-theme/webapp/common-theme/js/package-lock.json
+++ b/themes/common-theme/webapp/common-theme/js/package-lock.json
@@ -8,12 +8,12 @@
"license": "Apache-2.0",
"dependencies": {
"@chinchilla-software/jquery-ui-timepicker-addon": "^1.6.3",
-"dompurify": "^2.3.6",
+"dompurify": "^2.3.8",
"flot": "^4.2.2",
"jquery": "^3.6.0",
"jquery-migrate": "^3.4.0",
"jquery-ui-dist": "^1.13.1",
-"jquery-validation": "^1.19.3",
+"jquery-validation": "^1.19.4",
"jquery.browser": "^0.1.0",
"trumbowyg": "^2.25.1",
"uglify-js": "latest"
@@ -28,9 +28,9 @@
}
},
"node_modules/dompurify": {
-"version": "2.3.6",
-"resolved":
"https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz;,
-"integrity":
"sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg=="
+"version": "2.3.8",
+"resolved":
"https://registry.npmjs.org/dompurify/-/dompurify-2.3.8.tgz;,
+"integrity":
"sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw=="
},
"node_modules/flot": {
"version": "4.2.2",
@@ -59,9 +59,9 @@
}
},
"node_modules/jquery-validation": {
-"version": "1.19.3",
-"resolved":
"https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.3.tgz;,
-"integrity":
"sha512-iXxCS5W7STthSTMFX/NDZfWHBLbJ1behVK3eAgHXAV8/0vRa9M4tiqHvJMr39VGWHMGdlkhrtrkBuaL2UlE8yw==",
+"version": "1.19.4",
+"resolved":
"https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.4.tgz;,
+"integrity":
"sha512-PcwKcATCR+JL77m9kkWd84NAHAunJP9iasF6IbMxUgl73xDAimxjt5oYFmYHDXBmTZM4rpkXxMNR/jGI5TlSjA==",
"peerDependencies": {
"jquery": "^1.7 || ^2.0 || ^3.1"
}
@@ -101,9 +101,9 @@
"integrity":
"sha512-P2rOR4MWcBMTbkaA0AE77COj8BTBIeNp9trtUKbvWFAoBoWHpwGhN8WIEjST7h/1nVQH+4CSpa4i9XoXZYvWXg=="
},
"dompurify": {
-"version": "2.3.6",
-"resolved":
"https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz;,
-"integrity":
"sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg=="
+"version": "2.3.8",
+"resolved":
"https://registry.npmjs.org/dompurify/-/dompurify-2.3.8.tgz;,
+"integrity":
"sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw=="
},
"flot": {
"version": "4.2.2",
@@ -130,9 +130,9 @@
}
},
"jquery-validation": {
-"version": "1.19.3",
-"resolved":
"https://registry.npmjs.org/jquery-validation/-/jquery-validation-1.19.3.tgz;,
-"integrity":
"sha512-iXxCS5W7STthSTMFX/NDZfWHBLbJ1behVK3eAgHXAV8/0vRa9M4tiqHvJMr39VGWHMGdlkhrtrkBuaL2UlE8yw==",
+
[ofbiz-framework] branch release18.12 updated: Improved: German Translation - Category (OFBIZ-12632)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release18.12 by this push: new 9c18374ad3 Improved: German Translation - Category (OFBIZ-12632) 9c18374ad3 is described below commit 9c18374ad342250474b65474b72eac0f6bf1a31c Author: Michael Brohl AuthorDate: Tue Jun 7 21:27:58 2022 +0200 Improved: German Translation - Category (OFBIZ-12632) Updates a few german translations for consistency. Thanks Ingo Wolfmayr for reporting and providing the patch. --- applications/product/config/ProductUiLabels.xml | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/applications/product/config/ProductUiLabels.xml b/applications/product/config/ProductUiLabels.xml index b94659e895..2fa37c47f6 100644 --- a/applications/product/config/ProductUiLabels.xml +++ b/applications/product/config/ProductUiLabels.xml @@ -10956,6 +10956,7 @@ 尋找庫存細項標籤 +Produkt suchen Find Product Recherche d'articles Ricerca prodotti @@ -12741,7 +12742,7 @@ Přidat výrobky této skupiny do košíku v přednastaveném možství -Produkte dieser Produktgruppe in der vorgegebenen Menge in den Warenkorb legen +Produkte dieser Produktkategorie in der vorgegebenen Menge in den Warenkorb legen Add Products in this Category to the Cart using Default Quantities Add Products in this Category to the basket using default quantities Agregue los productos en esta categoría al carro usando cantidades predeterminadas @@ -12979,7 +12980,7 @@ Rozšířené hledání ve skupině výrobků -Erweiterte Suche in der Produktgruppe +Erweiterte Suche in der Produktkategorie Advanced Search in Category Búsqueda Avanzada en las Categorías Recherche avancée dans la catégorie @@ -14082,7 +14083,7 @@ Výběr skupiny výrobků -Produktgruppen durchsuchen +Produktkategorien durchsuchen Browse Categories Hojear Categorías Parcourir les catégories @@ -14562,7 +14563,7 @@ Skupina výrobků -Produktgruppe +Kategorie Category Categoría Catégorie @@ -14678,7 +14679,7 @@ Skupina výrobků nenalezena -Produktgruppe wurde nicht gefunden mit ID +Kategorie wurde nicht gefunden mit ID Category not found for Category ID Categoría no encontrada por ID Aucune catégorie pour cet réf. @@ -14695,11 +14696,11 @@ 沒有找到分類識別 -Eine Attribut mit diesem Namen existiert bereits für die Produktgruppe mit dieser ID. +Eine Attribut mit diesem Namen existiert bereits für die Kategorie mit dieser ID. There already is an attribute with this name for a group with this ID. -Eine Produktgruppe mit dieser ID existiert bereits. +Eine Kategorie mit dieser ID existiert bereits. There already is a Category with this ID. @@ -15058,7 +15059,7 @@ Výběr zrychleným zadáním produktové skupiny -Auswahl einer Produktgruppe für Schnelleingabe +Auswahl einer Produktkategorie für Schnelleingabe Choose QuickAdd Category Elegir la categoría Añadir-Rápido Choisir une catégorie d'ajout-rapide @@ -22820,7 +22821,7 @@ V této skupině nejsou žádné výrobky -Es gibt keine Produkte in dieser Produktgruppe +Es gibt keine Produkte in dieser Produktkategorie There are no products in this category No hay productos en esta categoría Aucun article dans cette catégorie @@ -28488,7 +28489,7 @@ Hledání ve skupině výrobků -Suche in Produktgruppe +Suche in Produktkategorie Search in Category Buscar en la Categoría Rechercher dans la catégorie
[ofbiz-framework] branch release22.01 updated: Improved: German Translation - Category (OFBIZ-12632)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release22.01 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release22.01 by this push: new c3de53667e Improved: German Translation - Category (OFBIZ-12632) c3de53667e is described below commit c3de53667e3420c4aac48f973f1510d610b9bef4 Author: Michael Brohl AuthorDate: Tue Jun 7 21:27:58 2022 +0200 Improved: German Translation - Category (OFBIZ-12632) Updates a few german translations for consistency. Thanks Ingo Wolfmayr for reporting and providing the patch. --- applications/product/config/ProductUiLabels.xml | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/applications/product/config/ProductUiLabels.xml b/applications/product/config/ProductUiLabels.xml index 37f5799100..f83ba19dce 100644 --- a/applications/product/config/ProductUiLabels.xml +++ b/applications/product/config/ProductUiLabels.xml @@ -11331,6 +11331,7 @@ 尋找庫存細項標籤 +Produkt suchen Find Product Buscar Producto Recherche d'articles @@ -13101,7 +13102,7 @@ Přidat výrobky této skupiny do košíku v přednastaveném možství -Produkte dieser Produktgruppe in der vorgegebenen Menge in den Warenkorb legen +Produkte dieser Produktkategorie in der vorgegebenen Menge in den Warenkorb legen Add Products in this Category to the Cart using Default Quantities Add Products in this Category to the basket using default quantities Agregue los productos en esta categoría al carro usando cantidades predeterminadas @@ -13298,7 +13299,7 @@ Rozšířené hledání ve skupině výrobků -Erweiterte Suche in der Produktgruppe +Erweiterte Suche in der Produktkategorie Advanced Search in Category Búsqueda Avanzada en las Categorías Recherche avancée dans la catégorie @@ -14379,7 +14380,7 @@ Výběr skupiny výrobků -Produktgruppen durchsuchen +Produktkategorien durchsuchen Browse Categories Hojear Categorías Navegar Categorías @@ -14866,7 +14867,7 @@ Skupina výrobků -Produktgruppe +Kategorie Category Categoría Catégorie @@ -14983,7 +14984,7 @@ Skupina výrobků nenalezena -Produktgruppe wurde nicht gefunden mit ID +Kategorie wurde nicht gefunden mit ID Category not found for Category ID Categoría no encontrada por ID Aucune catégorie pour cet réf. @@ -15000,11 +15001,11 @@ 沒有找到分類識別 -Eine Attribut mit diesem Namen existiert bereits für die Produktgruppe mit dieser ID. +Eine Attribut mit diesem Namen existiert bereits für die Kategorie mit dieser ID. There already is an attribute with this name for a group with this ID. -Eine Produktgruppe mit dieser ID existiert bereits. +Eine Kategorie mit dieser ID existiert bereits. There already is a Category with this ID. @@ -15367,7 +15368,7 @@ Výběr zrychleným zadáním produktové skupiny -Auswahl einer Produktgruppe für Schnelleingabe +Auswahl einer Produktkategorie für Schnelleingabe Choose QuickAdd Category Elegir la categoría Añadir-Rápido Choisir une catégorie d'ajout-rapide @@ -23272,7 +23273,7 @@ V této skupině nejsou žádné výrobky -Es gibt keine Produkte in dieser Produktgruppe +Es gibt keine Produkte in dieser Produktkategorie There are no products in this category No hay productos en esta categoría Aucun article dans cette catégorie @@ -29050,7 +29051,7 @@ Hledání ve skupině výrobků -Suche in Produktgruppe +Suche in Produktkategorie Search in Category Buscar en la Categoría Rechercher dans la catégorie
[ofbiz-framework] branch trunk updated: Improved: German Translation - Category (OFBIZ-12632)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new a70342279f Improved: German Translation - Category (OFBIZ-12632) a70342279f is described below commit a70342279f5f46c312096481156af6a16af0be41 Author: Michael Brohl AuthorDate: Tue Jun 7 21:27:58 2022 +0200 Improved: German Translation - Category (OFBIZ-12632) Updates a few german translations for consistency. Thanks Ingo Wolfmayr for reporting and providing the patch. --- applications/product/config/ProductUiLabels.xml | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/applications/product/config/ProductUiLabels.xml b/applications/product/config/ProductUiLabels.xml index 0550642e62..74f64ff1eb 100644 --- a/applications/product/config/ProductUiLabels.xml +++ b/applications/product/config/ProductUiLabels.xml @@ -11332,6 +11332,7 @@ 尋找庫存細項標籤 +Produkt suchen Find Product Buscar Producto Recherche d'articles @@ -13102,7 +13103,7 @@ Přidat výrobky této skupiny do košíku v přednastaveném možství -Produkte dieser Produktgruppe in der vorgegebenen Menge in den Warenkorb legen +Produkte dieser Produktkategorie in der vorgegebenen Menge in den Warenkorb legen Add Products in this Category to the Cart using Default Quantities Add Products in this Category to the basket using default quantities Agregue los productos en esta categoría al carro usando cantidades predeterminadas @@ -13299,7 +13300,7 @@ Rozšířené hledání ve skupině výrobků -Erweiterte Suche in der Produktgruppe +Erweiterte Suche in der Produktkategorie Advanced Search in Category Búsqueda Avanzada en las Categorías Recherche avancée dans la catégorie @@ -14380,7 +14381,7 @@ Výběr skupiny výrobků -Produktgruppen durchsuchen +Produktkategorien durchsuchen Browse Categories Hojear Categorías Navegar Categorías @@ -14867,7 +14868,7 @@ Skupina výrobků -Produktgruppe +Kategorie Category Categoría Catégorie @@ -14984,7 +14985,7 @@ Skupina výrobků nenalezena -Produktgruppe wurde nicht gefunden mit ID +Kategorie wurde nicht gefunden mit ID Category not found for Category ID Categoría no encontrada por ID Aucune catégorie pour cet réf. @@ -15001,11 +15002,11 @@ 沒有找到分類識別 -Eine Attribut mit diesem Namen existiert bereits für die Produktgruppe mit dieser ID. +Eine Attribut mit diesem Namen existiert bereits für die Kategorie mit dieser ID. There already is an attribute with this name for a group with this ID. -Eine Produktgruppe mit dieser ID existiert bereits. +Eine Kategorie mit dieser ID existiert bereits. There already is a Category with this ID. @@ -15368,7 +15369,7 @@ Výběr zrychleným zadáním produktové skupiny -Auswahl einer Produktgruppe für Schnelleingabe +Auswahl einer Produktkategorie für Schnelleingabe Choose QuickAdd Category Elegir la categoría Añadir-Rápido Choisir une catégorie d'ajout-rapide @@ -23273,7 +23274,7 @@ V této skupině nejsou žádné výrobky -Es gibt keine Produkte in dieser Produktgruppe +Es gibt keine Produkte in dieser Produktkategorie There are no products in this category No hay productos en esta categoría Aucun article dans cette catégorie @@ -29053,7 +29054,7 @@ Hledání ve skupině výrobků -Suche in Produktgruppe +Suche in Produktkategorie Search in Category Buscar en la Categoría Rechercher dans la catégorie
[ofbiz-site] branch master updated: Fixed: Website: API reference links not found (OFBIZ-12611)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git The following commit(s) were added to refs/heads/master by this push: new a90f038 Fixed: Website: API reference links not found (OFBIZ-12611) a90f038 is described below commit a90f0381a038cdcecc93a7a1f7c6e7bacf0f2b74 Author: Michael Brohl AuthorDate: Wed May 4 17:01:40 2022 +0200 Fixed: Website: API reference links not found (OFBIZ-12611) --- 404.html | 6 +++--- about-ofbiz.html | 6 +++--- business-users.html | 6 +++--- developers.html | 12 ++-- download.html| 6 +++--- faqs.html| 6 +++--- getting-involved.html| 6 +++--- index.html | 6 +++--- mailing-lists.html | 6 +++--- ofbiz-demos.html | 6 +++--- release-notes-12.04.06.html | 6 +++--- release-notes-13.07.01.html | 6 +++--- release-notes-13.07.02.html | 6 +++--- release-notes-13.07.03.html | 6 +++--- release-notes-16.11.01.html | 6 +++--- release-notes-16.11.02.html | 6 +++--- release-notes-16.11.03.html | 6 +++--- release-notes-16.11.04.html | 6 +++--- release-notes-16.11.05.html | 6 +++--- release-notes-16.11.06.html | 6 +++--- release-notes-16.11.07.html | 6 +++--- release-notes-17.12.01.html | 6 +++--- release-notes-17.12.03.html | 6 +++--- release-notes-17.12.04.html | 6 +++--- release-notes-17.12.05.html | 6 +++--- release-notes-17.12.06.html | 6 +++--- release-notes-17.12.07.html | 6 +++--- release-notes-17.12.08.html | 6 +++--- release-notes-17.12.09.html | 6 +++--- release-notes-18.12.01.html | 6 +++--- release-notes-18.12.02.html | 6 +++--- release-notes-18.12.03.html | 6 +++--- release-notes-18.12.04.html | 6 +++--- release-notes-18.12.05.html | 6 +++--- security.html| 6 +++--- service-providers.html | 6 +++--- source-repositories.html | 6 +++--- template/page/developers.tpl.php | 6 +++--- template/region/header.tpl.php | 6 +++--- user-stories.html| 6 +++--- 40 files changed, 123 insertions(+), 123 deletions(-) diff --git a/404.html b/404.html index d84d654..b642209 100644 --- a/404.html +++ b/404.html @@ -68,13 +68,13 @@ API Reference - Trunk API + https://nightlies.apache.org/ofbiz/trunk/javadoc/; target="external">Trunk API - Stable Release API + https://nightlies.apache.org/ofbiz/stable/javadoc/; target="external">Stable Release API - Next Release API + https://nightlies.apache.org/ofbiz/next/javadoc/; target="external">Next Release API diff --git a/about-ofbiz.html b/about-ofbiz.html index e4551f6..f70cd5e 100644 --- a/about-ofbiz.html +++ b/about-ofbiz.html @@ -68,13 +68,13 @@ API Reference - Trunk API + https://nightlies.apache.org/ofbiz/trunk/javadoc/; target="external">Trunk API - Stable Release API + https://nightlies.apache.org/ofbiz/stable/javadoc/; target="external">Stable Release API - Next Release API + https://nightlies.apache.org/ofbiz/next/javadoc/; target="external">Next Release API diff --git a/business-users.html b/business-users.html index f78c48a..d5d65f5 100644 --- a/business-users.html +++ b/business-users.html @@ -68,13 +68,13 @@ API Reference - Trunk API + https://nightlies.apache.org/ofbiz/trunk/javadoc/; target="external">Trunk API - Stable Release API + https://nightlies.apache.org/ofbiz/stable/javadoc/; target="external">Stable Release API - Next Release API + https://nightlies.apache.org/ofbiz/next/javadoc/; target="external">Next Release API diff --git a/developers.html b/developers.ht
[ofbiz-site] branch master updated: Improved: Change website according to the new ASF data privacy policy (OFBIZ-12610)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git
The following commit(s) were added to refs/heads/master by this push:
new e9a9469 Improved: Change website according to the new ASF data
privacy policy (OFBIZ-12610)
e9a9469 is described below
commit e9a94694558f57028b5b8d950e30c1540185a23e
Author: Michael Brohl
AuthorDate: Tue May 3 22:07:23 2022 +0200
Improved: Change website according to the new ASF data privacy policy
(OFBIZ-12610)
* adds a link to the official privacy policy
* removes Google analytics tracking code
* adds Matomo tracking code
---
404.html| 26 +---
about-ofbiz.html| 26 +---
business-users.html | 26 +---
developers.html | 26 +---
download.html | 26 +---
faqs.html | 26 +---
getting-involved.html | 26 +---
index.html | 26 +---
mailing-lists.html | 26 +---
ofbiz-demos.html| 54 +++--
release-notes-12.04.06.html | 26 +---
release-notes-13.07.01.html | 26 +---
release-notes-13.07.02.html | 26 +---
release-notes-13.07.03.html | 26 +---
release-notes-16.11.01.html | 26 +---
release-notes-16.11.02.html | 26 +---
release-notes-16.11.03.html | 26 +---
release-notes-16.11.04.html | 26 +---
release-notes-16.11.05.html | 26 +---
release-notes-16.11.06.html | 26 +---
release-notes-16.11.07.html | 26 +---
release-notes-17.12.01.html | 26 +---
release-notes-17.12.03.html | 26 +---
release-notes-17.12.04.html | 26 +---
release-notes-17.12.05.html | 26 +---
release-notes-17.12.06.html | 26 +---
release-notes-17.12.07.html | 26 +---
release-notes-17.12.08.html | 26 +---
release-notes-17.12.09.html | 26 +---
release-notes-18.12.01.html | 26 +---
release-notes-18.12.02.html | 26 +---
release-notes-18.12.03.html | 26 +---
release-notes-18.12.04.html | 26 +---
release-notes-18.12.05.html | 26 +---
security.html | 26 +---
service-providers.html | 26 +---
source-repositories.html| 26 +---
template/region/footer.tpl.php | 1 +
template/region/scripts.tpl.php | 25 ---
user-stories.html | 26 +---
40 files changed, 677 insertions(+), 365 deletions(-)
diff --git a/404.html b/404.html
index 92f744b..d84d654 100644
--- a/404.html
+++ b/404.html
@@ -189,6 +189,7 @@
https://www.apache.org/foundation/;
target="external">Apache Software Foundation
+ https://privacy.apache.org/policies/privacy-policy-public.html;
target="external">Privacy Policy
https://www.apache.org/events/current-event;
target="external">Events
https://www.apache.org/foundation/sponsorship.html;
target="external">Sponsorship
and https://www.apache.org/foundation/contributing.html;
target="external">Donations
@@ -232,16 +233,23 @@
+
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', UA]);
-_gaq.push(['_trackPageview']);
-
-(function() {
-var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;
-ga.src = ('https:' == document.location.protocol ? '<a rel="nofollow" href="https://ssl">https://ssl</a>' :
'<a rel="nofollow" href="http://www">http://www</a>') + '.google-analytics.com/ga.js';
-var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
-})();
+ var _paq = window._paq = window._paq || [];
+ /* tracker methods like "setCustomDimension" should be called before
+"trackPageView" */
+ /* We explicitly disable cookie tracking to avoid privacy issues */
+ _paq.push(['disableCookies']);
+ _paq.push(['trackPageView']);
+ _paq.push(['enableLinkTracking']);
+ (function() {
+var u="<a rel="nofollow" href="https://analytics.apache.org/"">https://analytics.apache.org/"</a>;;
+_paq.push(['setT
[ofbiz-framework] branch release18.12 updated: Improved: Update to log4j 2.17.2 (OFBIZ-12590)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 6302587 Improved: Update to log4j 2.17.2 (OFBIZ-12590)
6302587 is described below
commit 630258751dfd361938159ab111ef55532fb3
Author: Michael Brohl
AuthorDate: Wed Mar 23 18:34:15 2022 +0100
Improved: Update to log4j 2.17.2 (OFBIZ-12590)
Contains bugfixes and improvements, see
https://logging.apache.org/log4j/2.x/changes-report.html#a2.17.2
This introduces the exclusion of some compile
dependencies (bountycastle bc*-jed14) for the
itext library which interfered with newer
versions from another dependency.
---
build.gradle | 20
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/build.gradle b/build.gradle
index 080b732..de8cc97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -167,7 +167,11 @@ dependencies {
compile
'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
compile 'com.googlecode.libphonenumber:libphonenumber:8.9.16'
compile 'com.ibm.icu:icu4j:63.1'
-compile 'com.lowagie:itext:2.1.7' // Don't update due to license change in
newer versions, see OFBIZ-10455
+compile('com.lowagie:itext:2.1.7') { // Don't update due to license change
in newer versions, see OFBIZ-10455
+exclude module: 'bcmail-jdk14'
+exclude module: 'bcprov-jdk14'
+exclude module: 'bctsp-jdk14'
+}
compile 'com.sun.mail:javax.mail:1.6.2'
compile 'com.rometools:rome:1.16.0'
compile 'com.thoughtworks.xstream:xstream:1.4.11.1'
@@ -190,8 +194,8 @@ dependencies {
compile 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
compile 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
compile 'org.apache.httpcomponents:httpclient-cache:4.5.6'
-compile 'org.apache.logging.log4j:log4j-api:2.17.1' // the API of log4j 2
-compile 'org.apache.logging.log4j:log4j-web:2.17.1' //???
+compile 'org.apache.logging.log4j:log4j-api:2.17.2' // the API of log4j 2
+compile 'org.apache.logging.log4j:log4j-web:2.17.2' //???
compile 'org.apache.poi:poi:3.17'
compile 'org.apache.pdfbox:pdfbox:2.0.24'
compile 'org.apache.shiro:shiro-core:1.4.0'
@@ -232,11 +236,11 @@ dependencies {
runtime 'org.apache.axis2:axis2-transport-local:1.7.8'
runtime 'org.apache.derby:derby:10.14.2.0'
runtime 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:1.1'
-runtime 'org.apache.logging.log4j:log4j-1.2-api:2.17.1' // for external
jars using the old log4j1.2: routes logging to log4j 2
-runtime 'org.apache.logging.log4j:log4j-core:2.17.1' // the implementation
of the log4j 2 API
-runtime 'org.apache.logging.log4j:log4j-jul:2.17.1' // for external jars
using the java.util.logging: routes logging to log4j 2
-runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1' // for external
jars using slf4j: routes logging to log4j 2
-runtime 'org.apache.logging.log4j:log4j-jcl:2.17.1' // need to constrain
to version to avoid classpath conflict (ReflectionUtil)
+runtime 'org.apache.logging.log4j:log4j-1.2-api:2.17.2' // for external
jars using the old log4j1.2: routes logging to log4j 2
+runtime 'org.apache.logging.log4j:log4j-core:2.17.2' // the implementation
of the log4j 2 API
+runtime 'org.apache.logging.log4j:log4j-jul:2.17.2' // for external jars
using the java.util.logging: routes logging to log4j 2
+runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2' // for external
jars using slf4j: routes logging to log4j 2
+runtime 'org.apache.logging.log4j:log4j-jcl:2.17.2' // need to constrain
to version to avoid classpath conflict (ReflectionUtil)
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
// plugin libs
[ofbiz-framework] branch release22.01 updated: Improved: Update to log4j 2.17.2 (OFBIZ-12590)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release22.01 by this push:
new 6203b58 Improved: Update to log4j 2.17.2 (OFBIZ-12590)
6203b58 is described below
commit 6203b5881c43740a16d602e5b7f66527530038aa
Author: Michael Brohl
AuthorDate: Tue Mar 15 16:44:27 2022 +0100
Improved: Update to log4j 2.17.2 (OFBIZ-12590)
Contains bugfixes and improvements, see
https://logging.apache.org/log4j/2.x/changes-report.html#a2.17.2
---
build.gradle | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/build.gradle b/build.gradle
index ec76db2..5aec30d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -217,8 +217,8 @@ dependencies {
implementation 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
implementation 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
implementation 'org.apache.httpcomponents:httpclient-cache:4.5.13'
-implementation 'org.apache.logging.log4j:log4j-api:2.17.1' // the API of
log4j 2
-implementation 'org.apache.logging.log4j:log4j-core:2.17.1' // Somehow
needed by Buildbot to compile OFBizDynamicThresholdFilter.java
+implementation 'org.apache.logging.log4j:log4j-api:2.17.2' // the API of
log4j 2
+implementation 'org.apache.logging.log4j:log4j-core:2.17.2' // Somehow
needed by Buildbot to compile OFBizDynamicThresholdFilter.java
implementation 'org.apache.poi:poi:4.1.2' // poi-ooxml-schemas-5.0.0.pom'.
Received status code 401 from server
implementation 'org.apache.pdfbox:pdfbox:2.0.24'
implementation 'org.apache.shiro:shiro-core:1.8.0'
@@ -256,11 +256,11 @@ dependencies {
runtimeOnly 'org.apache.axis2:axis2-transport-local:1.7.9' // Above:
SOAPEventHandler.java:42: error: package org.apache.axiom.om.impl.builder does
not exist
runtimeOnly 'org.apache.derby:derby:10.14.2.0' // So far we did not
update from 10.14.2.0 because of a compile issue. You may try w/ a newer
version than 10.15.1.3
runtimeOnly 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:2.1'
-runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.17.1' // for
external jars using the old log4j1.2: routes logging to log4j 2
-runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.17.1' // for external
jars using the java.util.logging: routes logging to log4j 2
-runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1' // for
external jars using slf4j: routes logging to log4j 2
-runtimeOnly 'org.apache.logging.log4j:log4j-web:2.17.1' //???
-runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.17.1' // need to
constrain to version to avoid classpath conflict (ReflectionUtil)
+runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.17.2' // for
external jars using the old log4j1.2: routes logging to log4j 2
+runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.17.2' // for external
jars using the java.util.logging: routes logging to log4j 2
+runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2' // for
external jars using slf4j: routes logging to log4j 2
+runtimeOnly 'org.apache.logging.log4j:log4j-web:2.17.2' //???
+runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.17.2' // need to
constrain to version to avoid classpath conflict (ReflectionUtil)
runtimeOnly 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
// Dependencies defined by the plugins
[ofbiz-framework] branch trunk updated: Improved: Update to log4j 2.17.2 (OFBIZ-12590)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new c522a7e Improved: Update to log4j 2.17.2 (OFBIZ-12590)
c522a7e is described below
commit c522a7efd7fffa242f1e021e4f1c476908d272ee
Author: Michael Brohl
AuthorDate: Tue Mar 15 16:44:27 2022 +0100
Improved: Update to log4j 2.17.2 (OFBIZ-12590)
Contains bugfixes and improvements, see
https://logging.apache.org/log4j/2.x/changes-report.html#a2.17.2
---
build.gradle | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/build.gradle b/build.gradle
index a6e329a..cd5bab0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -217,8 +217,8 @@ dependencies {
implementation 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
implementation 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
implementation 'org.apache.httpcomponents:httpclient-cache:4.5.13'
-implementation 'org.apache.logging.log4j:log4j-api:2.17.1' // the API of
log4j 2
-implementation 'org.apache.logging.log4j:log4j-core:2.17.1' // Somehow
needed by Buildbot to compile OFBizDynamicThresholdFilter.java
+implementation 'org.apache.logging.log4j:log4j-api:2.17.2' // the API of
log4j 2
+implementation 'org.apache.logging.log4j:log4j-core:2.17.2' // Somehow
needed by Buildbot to compile OFBizDynamicThresholdFilter.java
implementation 'org.apache.poi:poi:4.1.2' // poi-ooxml-schemas-5.0.0.pom'.
Received status code 401 from server
implementation 'org.apache.pdfbox:pdfbox:2.0.24'
implementation 'org.apache.shiro:shiro-core:1.8.0'
@@ -256,11 +256,11 @@ dependencies {
runtimeOnly 'org.apache.axis2:axis2-transport-local:1.7.9' // Above:
SOAPEventHandler.java:42: error: package org.apache.axiom.om.impl.builder does
not exist
runtimeOnly 'org.apache.derby:derby:10.14.2.0' // So far we did not
update from 10.14.2.0 because of a compile issue. You may try w/ a newer
version than 10.15.1.3
runtimeOnly 'org.apache.geronimo.specs:geronimo-jaxrpc_1.1_spec:2.1'
-runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.17.1' // for
external jars using the old log4j1.2: routes logging to log4j 2
-runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.17.1' // for external
jars using the java.util.logging: routes logging to log4j 2
-runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.1' // for
external jars using slf4j: routes logging to log4j 2
-runtimeOnly 'org.apache.logging.log4j:log4j-web:2.17.1' //???
-runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.17.1' // need to
constrain to version to avoid classpath conflict (ReflectionUtil)
+runtimeOnly 'org.apache.logging.log4j:log4j-1.2-api:2.17.2' // for
external jars using the old log4j1.2: routes logging to log4j 2
+runtimeOnly 'org.apache.logging.log4j:log4j-jul:2.17.2' // for external
jars using the java.util.logging: routes logging to log4j 2
+runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.2' // for
external jars using slf4j: routes logging to log4j 2
+runtimeOnly 'org.apache.logging.log4j:log4j-web:2.17.2' //???
+runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.17.2' // need to
constrain to version to avoid classpath conflict (ReflectionUtil)
runtimeOnly 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
// Dependencies defined by the plugins
[ofbiz-framework] branch release18.12 updated: Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 6cf0c73 Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
6cf0c73 is described below
commit 6cf0c732c1a0f7224c7b9382a676133b3a196a78
Author: Michael Brohl
AuthorDate: Tue Mar 15 12:26:55 2022 +0100
Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
For changes see https://tomcat.apache.org/tomcat-9.0-doc/changelog.html
---
build.gradle | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index 2b8087c..080b732 100644
--- a/build.gradle
+++ b/build.gradle
@@ -198,10 +198,10 @@ dependencies {
compile 'org.apache.sshd:sshd-core:1.7.0'
compile 'org.apache.tika:tika-core:1.28.1'
compile 'org.apache.tika:tika-parsers:1.28.1'
-compile 'org.apache.tomcat:tomcat-catalina-ha:9.0.58'
-compile 'org.apache.tomcat:tomcat-catalina:9.0.58'
-compile 'org.apache.tomcat:tomcat-jasper:9.0.58'
-compile 'org.apache.tomcat:tomcat-tribes:9.0.58'
+compile 'org.apache.tomcat:tomcat-catalina-ha:9.0.60'
+compile 'org.apache.tomcat:tomcat-catalina:9.0.60'
+compile 'org.apache.tomcat:tomcat-jasper:9.0.60'
+compile 'org.apache.tomcat:tomcat-tribes:9.0.60'
compile 'org.apache.xmlgraphics:fop:2.3'
compile 'org.apache.xmlrpc:xmlrpc-client:3.1.3'
compile 'org.apache.xmlrpc:xmlrpc-server:3.1.3'
[ofbiz-framework] branch release22.01 updated: Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release22.01 by this push:
new f8fd3eb Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
f8fd3eb is described below
commit f8fd3ebcc72513c455b56702403727d9764335b9
Author: Michael Brohl
AuthorDate: Tue Mar 15 12:05:47 2022 +0100
Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
For changes see https://tomcat.apache.org/tomcat-9.0-doc/changelog.html
---
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 5cd3a71..ec76db2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -225,8 +225,8 @@ dependencies {
implementation 'org.apache.sshd:sshd-core:1.7.0' // So far we did not
update from 1.7.0 because of a compile issue. You may try w/ a newer version
than 2.4.0
implementation 'org.apache.tika:tika-core:1.28.1' // 2.1.0 does not work
implementation 'org.apache.tika:tika-parsers:1.28.1' // 2.1.0 does not
work
-implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.58' // Remember
to change the version number (9 now) in javadoc block if needed.
-implementation 'org.apache.tomcat:tomcat-jasper:9.0.58'
+implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.60' // Remember
to change the version number (9 now) in javadoc block if needed.
+implementation 'org.apache.tomcat:tomcat-jasper:9.0.60'
implementation 'org.apache.axis2:axis2-kernel:1.7.9' // Above:
SOAPEventHandler.java:42: error: package org.apache.axiom.om.impl.builder does
not exist
implementation 'batik:batik-svg-dom:1.6-1'
implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: since 2.4
dependencies are messed up. See
https://github.com/moqui/moqui-fop/blob/master/build.gradle
[ofbiz-framework] branch trunk updated: Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9991c9e Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
9991c9e is described below
commit 9991c9ec638bc0c8095dccbd62ec44e3566d91e8
Author: Michael Brohl
AuthorDate: Tue Mar 15 12:05:47 2022 +0100
Improved: Update Tomcat to Version 9.0.60 (OFBIZ-12589)
For changes see https://tomcat.apache.org/tomcat-9.0-doc/changelog.html
---
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 35dc331..a6e329a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -225,8 +225,8 @@ dependencies {
implementation 'org.apache.sshd:sshd-core:1.7.0' // So far we did not
update from 1.7.0 because of a compile issue. You may try w/ a newer version
than 2.4.0
implementation 'org.apache.tika:tika-core:1.28.1' // 2.1.0 does not work
implementation 'org.apache.tika:tika-parsers:1.28.1' // 2.1.0 does not
work
-implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.58' // Remember
to change the version number (9 now) in javadoc block if needed.
-implementation 'org.apache.tomcat:tomcat-jasper:9.0.58'
+implementation 'org.apache.tomcat:tomcat-catalina-ha:9.0.60' // Remember
to change the version number (9 now) in javadoc block if needed.
+implementation 'org.apache.tomcat:tomcat-jasper:9.0.60'
implementation 'org.apache.axis2:axis2-kernel:1.7.9' // Above:
SOAPEventHandler.java:42: error: package org.apache.axiom.om.impl.builder does
not exist
implementation 'batik:batik-svg-dom:1.6-1'
implementation 'org.apache.xmlgraphics:fop:2.3' // NOTE: since 2.4
dependencies are messed up. See
https://github.com/moqui/moqui-fop/blob/master/build.gradle
[ofbiz-plugins] branch trunk updated: Improved: Update Redoc to v2.0.0-rc.59 (OFBIZ-12520)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new a38685f Improved: Update Redoc to v2.0.0-rc.59 (OFBIZ-12520)
a38685f is described below
commit a38685f23d65c634d8723db0eaa7011c8f4aa1ae
Author: Michael Brohl
AuthorDate: Sat Jan 22 18:18:39 2022 +0100
Improved: Update Redoc to v2.0.0-rc.59 (OFBIZ-12520)
---
rest-api/webapp/docs/README.adoc | 2 +-
rest-api/webapp/docs/redoc.standalone.js | 104 +--
2 files changed, 3 insertions(+), 103 deletions(-)
diff --git a/rest-api/webapp/docs/README.adoc b/rest-api/webapp/docs/README.adoc
index 1556d52..7559d9d 100644
--- a/rest-api/webapp/docs/README.adoc
+++ b/rest-api/webapp/docs/README.adoc
@@ -10,6 +10,6 @@ Access: https://localhost:8443/docs/swagger-ui.html
== Redoc
-Current version: redoc@2.0.0-rc.50
+Current version: redoc@2.0.0-rc.59
Accesss: https://localhost:8443/docs/redoc.html
\ No newline at end of file
diff --git a/rest-api/webapp/docs/redoc.standalone.js
b/rest-api/webapp/docs/redoc.standalone.js
index 2e0bbfa..09f3ab8 100644
--- a/rest-api/webapp/docs/redoc.standalone.js
+++ b/rest-api/webapp/docs/redoc.standalone.js
@@ -1,103 +1,3 @@
-/*!
- * ReDoc - OpenAPI/Swagger-generated API Reference Documentation
- * -
- * Version: "2.0.0-rc.50"
- * Repo: https://github.com/Redocly/redoc
- */
-!function(e,t){"object"==typeof exports&&"object"==typeof
module?module.exports=t(require("null"),function(){try{return
require("esprima")}catch(e){}}()):"function"==typeof
define&?define(["null","esprima"],t):"object"==typeof
exports?exports.Redoc=t(require("null"),function(){try{return
require("esprima")}catch(e){}}()):e.Redoc=t(e.null,e.esprima)}(this,(function(e,t){return
function(e){var t={};function n(r){if(t[r])return t[r].exports;var
o=t[r]={i:r,l:!1,exports:{}};return [...]
-/*!
*
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-*
*/
-var r=function(e,t){return(r=Object.setPrototypeOf||{__proto__:[]}instanceof
Array&(e,t){e.__proto__=t}||function(e,t){for(var n in
t)t.hasOwnProperty(n)&&(e[n]=t[n])})(e,t)};function o(e,t){function
n(){this.constructor=e}r(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new
n)}var i=function(){return(i=Object.assign||function(e){for(var
t,n=1,r=arguments.length;nhttp://feross.org>
- * @license MIT
- */
-var r=n(243),o=n(244),i=n(131);function a(){return
l.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function s(e,t){if(a()https://opensource.org/licenses/MIT>
- * @author Lea Verou <https://lea.verou.me>
- * @namespace
- * @public
- */e.exports&&(e.exports=n),void
0!==t&&(t.Prism=n),n.languages.markup={comment://,prolog:/<\?[\s\S]+?\?>/,doctype:{pattern:/"'[\]]|"[^"]*"|'[^']*')+(?:\[(?:[^<"'\]]|"[^"]*"|'[^']*'|<(?!!--)|)*\]\s*)?>/i,greedy:!0,inside:{"internal-subset":{pattern:/(\[)[\s\S]+(?=\]>$)/,lookbehind:!0,greedy:!0,inside:null},string:{pattern:/"[^"]*"|'[^']*'/,greedy:!0},punctuation:/^$|[[\]]/,"doctype-tag":/^DOCTYPE/,name:/[^\s<>'"]+/}},cdata:/https://markjs.io/
-* Copyright (c) 2014–2018, Julian Kühnel
-* Released under the MIT license https://git.io/vwTVl
-*/
-e.exports=function(){"use strict";var e="function"==typeof
Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof
e}:function(e){return e&&"function"==typeof
Symbol&===Symbol&!==Symbol.prototype?"symbol":typeof
e},t=function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a
class as a function")},n=function(){function e(e,t){for(var
n=0;nhttp://jedwatson.github.io/classnames
-*/!function(){"use strict";var n={}.hasOwnP
[ofbiz-plugins] branch trunk updated: Improved: Update to Swagger UI 4.2.1 (OFBIZ-12519)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new cea04fe Improved: Update to Swagger UI 4.2.1 (OFBIZ-12519)
cea04fe is described below
commit cea04fea0f200242ef2f4bcf8541278703f317d0
Author: Michael Brohl
AuthorDate: Sat Jan 22 18:09:16 2022 +0100
Improved: Update to Swagger UI 4.2.1 (OFBIZ-12519)
---
rest-api/webapp/docs/README.adoc | 2 +-
rest-api/webapp/docs/swagger-ui-bundle.js| 2 +-
rest-api/webapp/docs/swagger-ui-bundle.js.map| 2 +-
rest-api/webapp/docs/swagger-ui-es-bundle-core.js| 2 +-
rest-api/webapp/docs/swagger-ui-es-bundle-core.js.map| 2 +-
rest-api/webapp/docs/swagger-ui-es-bundle.js | 2 +-
rest-api/webapp/docs/swagger-ui-es-bundle.js.map | 2 +-
rest-api/webapp/docs/swagger-ui-standalone-preset.js | 2 +-
rest-api/webapp/docs/swagger-ui-standalone-preset.js.map | 2 +-
rest-api/webapp/docs/swagger-ui.css | 4 ++--
rest-api/webapp/docs/swagger-ui.css.map | 2 +-
rest-api/webapp/docs/swagger-ui.js | 2 +-
rest-api/webapp/docs/swagger-ui.js.map | 2 +-
13 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/rest-api/webapp/docs/README.adoc b/rest-api/webapp/docs/README.adoc
index b6448a5..1556d52 100644
--- a/rest-api/webapp/docs/README.adoc
+++ b/rest-api/webapp/docs/README.adoc
@@ -4,7 +4,7 @@ You can choose between Swagger UI and Redoc to publish
documentation for the RES
== Swagger
-Current version: swagger-ui-3.45.1
+Current version: swagger-ui-4.2.1
Access: https://localhost:8443/docs/swagger-ui.html
diff --git a/rest-api/webapp/docs/swagger-ui-bundle.js
b/rest-api/webapp/docs/swagger-ui-bundle.js
index 7643f50..008952e 100644
--- a/rest-api/webapp/docs/swagger-ui-bundle.js
+++ b/rest-api/webapp/docs/swagger-ui-bundle.js
@@ -1,3 +1,3 @@
/*! For license information please see swagger-ui-bundle.js.LICENSE.txt */
-!function(e,t){"object"==typeof exports&&"object"==typeof
module?module.exports=t(function(){try{return
require("esprima")}catch(e){}}()):"function"==typeof
define&?define(["esprima"],t):"object"==typeof
exports?exports.SwaggerUIBundle=t(function(){try{return
require("esprima")}catch(e){}}()):e.SwaggerUIBundle=t(e.esprima)}(this,(function(e){return
function(e){var t={};function n(r){if(t[r])return t[r].exports;var
o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exp [...]
+!function(e,t){"object"==typeof exports&&"object"==typeof
module?module.exports=t():"function"==typeof
define&?define([],t):"object"==typeof
exports?exports.SwaggerUIBundle=t():e.SwaggerUIBundle=t()}(this,(function(){return
function(e){var t={};function n(r){if(t[r])return t[r].exports;var
o=t[r]={i:r,l:!1,exports:{}};return
e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return
n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r
[...]
//# sourceMappingURL=swagger-ui-bundle.js.map
\ No newline at end of file
diff --git a/rest-api/webapp/docs/swagger-ui-bundle.js.map
b/rest-api/webapp/docs/swagger-ui-bundle.js.map
index e1a3760..2695fec 100644
--- a/rest-api/webapp/docs/swagger-ui-bundle.js.map
+++ b/rest-api/webapp/docs/swagger-ui-bundle.js.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack://SwaggerUIBundle/webpack/universalModuleDefinition","webpack://SwaggerUIBundle/webpack/bootstrap","webpack://SwaggerUIBundle/./node_modules/react/react.js","webpack://SwaggerUIBundle/./node_modules/immutable/dist/immutable.js","webpack://SwaggerUIBundle/./node_modules/@babel/runtime-corejs3/core-js-stable/instance/concat.js","webpack://SwaggerUIBundle/./node_modules/@babel/runtime-corejs3/helpers/defineProperty.js","webpack://SwaggerUIBundle/./node_modul
[...]
\ No newline at end of file
+{"version":3,"sources":["webpack://SwaggerUIBundle/webpack/universalModuleDefinition","webpack://SwaggerUIBundle/webpack/bootstrap","webpack://SwaggerUIBundle/./node_modules/react/index.js","webpack://SwaggerUIBundle/./node_modules/immutable/dist/immutable.js","webpack://SwaggerUIBundle/./node_modules/@babel/runtime-corejs3/core-js-stable/instance/concat.js","webpack://SwaggerUIBundle/./node_modules/@babel/runtime-corejs3/helpers/defineProperty.js","webpack://SwaggerUIBundle/./node_modul
[...]
\ No newline at end of file
diff --git a/rest-api/webapp/docs/swagger-ui-es-bundle-core.js
b/rest-api/webapp/docs/swagger-ui-es-bundle-core.js
index 10e4bb2..fab30ab 10064
[ofbiz-site] branch master updated: Improved: Updates source repository information (OFBIZ-12581)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git The following commit(s) were added to refs/heads/master by this push: new b432630 Improved: Updates source repository information (OFBIZ-12581) b432630 is described below commit b4326307197836d3b8587f1c0e6a1d5c876189f0 Author: Michael Brohl AuthorDate: Tue Feb 22 23:39:20 2022 +0100 Improved: Updates source repository information (OFBIZ-12581) Removes the 17.12 branch, makes 18.12 the stable branch and adds 22.01. --- source-repositories.html | 26 +- template/page/source-repositories.tpl.php | 26 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/source-repositories.html b/source-repositories.html index 3c51ece..c3cdc77 100644 --- a/source-repositories.html +++ b/source-repositories.html @@ -176,18 +176,18 @@ Releases - ofbiz-framework branch release17.12 (stable) + ofbiz-framework branch release18.12 (stable) $ git clone https://gitbox.apache.org/repos/asf/ofbiz-framework.git ofbiz-framework -$ git checkout origin/release17.12 - ofbiz-plugins branch release17.12 (stable) +$ git checkout origin/release18.12 + ofbiz-plugins branch release18.12 (stable) $ git clone https://gitbox.apache.org/repos/asf/ofbiz-plugins.git plugins -$ git checkout origin/release17.12 - ofbiz-framework branch release18.12 -$ git clone https://gitbox.apache.org/repos/asf/ofbiz-framework.git ofbiz-framework $ git checkout origin/release18.12 - ofbiz-plugins branch release18.12 + ofbiz-framework branch release22.01 +$ git clone https://gitbox.apache.org/repos/asf/ofbiz-framework.git ofbiz-framework +$ git checkout origin/release22.01 + ofbiz-plugins branch release22.01 $ git clone https://gitbox.apache.org/repos/asf/ofbiz-plugins.git plugins -$ git checkout origin/release18.12 +$ git checkout origin/release22.01 Tools @@ -206,10 +206,10 @@ Committer Access - Committer access requires a special account which is provided by the OFBiz adminstrators. If you have a Committer account you can access the repository through HTTPS. When checking in, you will be prompted your userID and password - When you first connect you will be prompted to accept the SSL certificate. Verify the certificate. . - Git handles keyword expansion, EOL conversion as well as many other features. These features are configured at the server level, so you don't have to worry about them - + Committer access requires a special account which is provided by the OFBiz adminstrators. If you have a Committer account you can access the repository through HTTPS. When checking in, you will be prompted your userID and password + When you first connect you will be prompted to accept the SSL certificate. Verify the certificate. . + Git handles keyword expansion, EOL conversion as well as many other features. These features are configured at the server level, so you don't have to worry about them + @@ -219,7 +219,7 @@ - + diff --git a/template/page/source-repositories.tpl.php b/template/page/source-repositories.tpl.php index 0dfeab7..f2c3f82 100644 --- a/template/page/source-repositories.tpl.php +++ b/template/page/source-repositories.tpl.php @@ -65,18 +65,18 @@ Releases - ofbiz-framework branch release17.12 (stable) + ofbiz-framework branch release18.12 (stable) $ git clone https://gitbox.apache.org/repos/asf/ofbiz-framework.git ofbiz-framework -$ git checkout origin/release17.12 - ofbiz-plugins branch release17.12 (stable) +$ git checkout origin/release18.12 + ofbiz-plugins branch release18.12 (stable) $ git clone https://gitbox.apache.org/repos/asf/ofbiz-plugins.git plugins -$ git checkout origin/release17.12 - ofbiz-framework branch release18.12 -$ git clone https://gitbox.apache.org/repos/asf/ofbiz-framework.git ofbiz-framework $ git checkout origin/release18.12 - ofbiz-plugins branch release18.12 + ofbiz-framework branch release22.01 +$ git clone https://gitbox.apache.org/repos/asf/ofbiz-framework.git ofbiz-framework +$ git checkout origin/release22.01 + ofbiz-plugins branch release22.01 $ git clone https://gitbox.apache.org/repos/asf/ofbiz-plugins.git plugins -$ git checkout origin/release18.12 +$ git checkout origin
[ofbiz-plugins] branch release22.01 updated: Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release22.01 in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git The following commit(s) were added to refs/heads/release22.01 by this push: new bef13b5 Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429) bef13b5 is described below commit bef13b56ef956055124d2cc0c88ac2273fe62c9e Author: Benjamin Jugl AuthorDate: Fri Jan 22 15:27:41 2021 +0100 Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429) --- ecommerce/widget/ForumScreens.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecommerce/widget/ForumScreens.xml b/ecommerce/widget/ForumScreens.xml index 0c75232..2174fec 100644 --- a/ecommerce/widget/ForumScreens.xml +++ b/ecommerce/widget/ForumScreens.xml @@ -60,7 +60,7 @@ under the License. - + @@ -95,7 +95,7 @@ under the License. - +
[ofbiz-plugins] branch release18.12 updated: Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git The following commit(s) were added to refs/heads/release18.12 by this push: new fae9da9 Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429) fae9da9 is described below commit fae9da9aa13a72677b7c6aeb99d1796479bb3809 Author: Benjamin Jugl AuthorDate: Fri Jan 22 15:27:41 2021 +0100 Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429) --- ecommerce/widget/ForumScreens.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecommerce/widget/ForumScreens.xml b/ecommerce/widget/ForumScreens.xml index 0c75232..2174fec 100644 --- a/ecommerce/widget/ForumScreens.xml +++ b/ecommerce/widget/ForumScreens.xml @@ -60,7 +60,7 @@ under the License. - + @@ -95,7 +95,7 @@ under the License. - +
[ofbiz-plugins] branch trunk updated: Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git The following commit(s) were added to refs/heads/trunk by this push: new 82f6198 Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429) 82f6198 is described below commit 82f6198e2e8a877117dd67220059b4b2635b2848 Author: Benjamin Jugl AuthorDate: Fri Jan 22 15:27:41 2021 +0100 Fixed: Setting VIEW_INDEX to 0 in ForumScreens.xml when not initialized (OFBIZ-11429) --- ecommerce/widget/ForumScreens.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecommerce/widget/ForumScreens.xml b/ecommerce/widget/ForumScreens.xml index 0c75232..2174fec 100644 --- a/ecommerce/widget/ForumScreens.xml +++ b/ecommerce/widget/ForumScreens.xml @@ -60,7 +60,7 @@ under the License. - + @@ -95,7 +95,7 @@ under the License. - +
[ofbiz-framework] branch release18.12 updated: Fixed: Induction from DB does not represent relations properly. (OFBIZ-12178)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 1ed929c Fixed: Induction from DB does not represent relations
properly. (OFBIZ-12178)
1ed929c is described below
commit 1ed929cfc6675ef4cece8941b6333a53c5e1b477
Author: Benjamin Jugl
AuthorDate: Thu Dec 2 12:42:31 2021 +0100
Fixed: Induction from DB does not represent relations properly.
(OFBIZ-12178)
---
.../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java | 260 ++---
.../org/apache/ofbiz/entity/model/ModelEntity.java | 27 +++
.../apache/ofbiz/entity/model/ModelRelation.java | 67 +++---
framework/webtools/config/WebtoolsUiLabels.xml | 8 +
.../webtools/template/entity/ModelInduceFromDb.ftl | 3 +
5 files changed, 251 insertions(+), 114 deletions(-)
diff --git
a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
index f20dad1..8d9b252 100644
---
a/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
+++
b/framework/entity/src/main/java/org/apache/ofbiz/entity/jdbc/DatabaseUtil.java
@@ -45,6 +45,7 @@ import java.util.concurrent.Future;
import org.apache.ofbiz.base.concurrent.ExecutionPool;
import org.apache.ofbiz.base.util.Debug;
+import org.apache.ofbiz.base.util.StringUtil;
import org.apache.ofbiz.base.util.UtilTimer;
import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.entity.GenericEntityException;
@@ -58,6 +59,7 @@ import org.apache.ofbiz.entity.model.ModelFieldTypeReader;
import org.apache.ofbiz.entity.model.ModelIndex;
import org.apache.ofbiz.entity.model.ModelKeyMap;
import org.apache.ofbiz.entity.model.ModelRelation;
+import org.apache.ofbiz.entity.model.ModelUtil;
import org.apache.ofbiz.entity.model.ModelViewEntity;
import org.apache.ofbiz.entity.transaction.TransactionFactoryLoader;
import org.apache.ofbiz.entity.transaction.TransactionUtil;
@@ -720,7 +722,7 @@ public class DatabaseUtil {
// get ALL column info, put into hashmap by table name
Map> colInfo =
getColumnInfo(tableNames, true, messages, executor);
-
+Map> refInfo =
getReferenceInfo(tableNames, messages);
// go through each table and make a ModelEntity object, add to list
// for each entity make corresponding ModelField objects
// then print out XML for the entities/fields
@@ -731,7 +733,8 @@ public class DatabaseUtil {
// iterate over the table names is alphabetical order
for (String tableName: new TreeSet(colInfo.keySet())) {
Map colMap = colInfo.get(tableName);
-ModelEntity newEntity = new ModelEntity(tableName, colMap,
modelFieldTypeReader, isCaseSensitive);
+Map refMap = refInfo.get(tableName);
+ModelEntity newEntity = new ModelEntity(tableName, colMap, refMap,
modelFieldTypeReader, isCaseSensitive);
newEntList.add(newEntity);
}
@@ -1229,7 +1232,17 @@ public class DatabaseUtil {
return pkCount;
}
-public Map>
getReferenceInfo(Set tableNames, Collection messages) {
+/**
+ * Gets reference info.
+ * @param tableNames the table names
+ * @param messages the messages
+ * @return the reference info
+ */
+public Map>
getReferenceInfo(Set tableNames,
+Collection messages) {
+if (UtilValidate.isEmpty(tableNames)) {
+return new HashMap<>();
+}
Connection connection = getConnectionLogged(messages);
if (connection == null) {
return null;
@@ -1241,39 +1254,30 @@ public class DatabaseUtil {
} catch (SQLException e) {
String message = "Unable to get database meta data... Error was:"
+ e.toString();
Debug.logError(message, module);
-if (messages != null) messages.add(message);
+if (messages != null) {
+messages.add(message);
+}
try {
connection.close();
} catch (SQLException e2) {
-String message2 = "Unable to close database connection,
continuing anyway... Error was:" + e2.toString();
+String message2 = "Unable to close database connection,
continuing anyway... Error was:" + e2
+.toString();
Debug.logError(message2, module);
-if (messages != null) messages.add(message2);
+if (messages != null) {
+messages.add(message2);
+}
}
return null;
}
-/*
- try {
- if (Debug.infoOn()) Debug.logInfo("Database Product
[ofbiz-framework] branch trunk updated: Improved: Remove Whitespaces before checkboxes (OFBIZ-10461)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new f3a9f05 Improved: Remove Whitespaces before checkboxes (OFBIZ-10461)
f3a9f05 is described below
commit f3a9f05a30431f3aecb67edbc094d5e855ae9ac2
Author: Benjamin Jugl
AuthorDate: Mon Dec 6 09:43:42 2021 +0100
Improved: Remove Whitespaces before checkboxes (OFBIZ-10461)
---
.../order/template/order/AppendOrderItem.ftl | 2 +-
applications/order/template/order/OrderList.ftl| 41 +-
framework/webtools/template/entity/CheckDb.ftl | 10 +++---
3 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/applications/order/template/order/AppendOrderItem.ftl
b/applications/order/template/order/AppendOrderItem.ftl
index 42abfc5..1f6bb15 100644
--- a/applications/order/template/order/AppendOrderItem.ftl
+++ b/applications/order/template/order/AppendOrderItem.ftl
@@ -69,7 +69,7 @@ under the License.
${uiLabelMap.OrderPrice}
-${uiLabelMap.OrderOverridePrice}
+${uiLabelMap.OrderOverridePrice}
diff --git a/applications/order/template/order/OrderList.ftl
b/applications/order/template/order/OrderList.ftl
index 8ef7e5c..562f630 100644
--- a/applications/order/template/order/OrderList.ftl
+++ b/applications/order/template/order/OrderList.ftl
@@ -101,10 +101,12 @@ under the License.
${uiLabelMap.CommonType}
-checked="checked"/>
-${descr_SALES_ORDER}
-checked="checked"/>
-${descr_PURCHASE_ORDER}
+<#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
+checked="checked"/>${descr_SALES_ORDER}
+<#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
+checked="checked"/>${descr_PURCHASE_ORDER}
@@ -113,13 +115,13 @@ under the License.
+<#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
checked="checked"/>
-${uiLabelMap.OrderFilterInventoryProblems}
+<#if
state.hasFilter('filterInventoryProblems')>checked="checked"/>${uiLabelMap.OrderFilterInventoryProblems}
+<#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
checked="checked"/>
-${uiLabelMap.OrderFilterAuthProblems}
+<#if
state.hasFilter('filterAuthProblems')>checked="checked"/>${uiLabelMap.OrderFilterAuthProblems}
@@ -127,16 +129,21 @@ under the License.
${uiLabelMap.CommonFilter}
(${uiLabelMap.OrderFilterPOs})
+<#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
-checked="checked"/>
-${uiLabelMap.OrderFilterPartiallyReceivedPOs}
-checked="checked"/>
-${uiLabelMap.OrderFilterPOsOpenPastTheirETA}
-checked="checked"/>
-${uiLabelMap.OrderFilterPOsWithRejectedItems}
+checked="checked"/>${uiLabelMap.OrderFilterPartiallyReceivedPOs}
+
+<#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
+
+checked="checked"/>${uiLabelMap.OrderFilterPOsOpenPastTheirETA}
+
+<#-- !if the linebreak was performed after the tag, it
would be misinterpreted as a blank! -->
+
+checked="checked"/>${uiLabelMap.OrderFilterPOsWithRejectedItems}
+
diff --git a/framework/webtools/template/entity/CheckDb.ftl
b/framework/webtools/template/entity/CheckDb.ftl
index 91cf8d3..01f04a8 100644
--- a/framework/webtools/template/entity/CheckDb.ftl
+++ b/framework/webtools/template/entity/CheckDb.ftl
@@ -37,11 +37,11 @@ under the License.
[ofbiz-framework] branch trunk updated (30770e1 -> 8c5100d)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from 30770e1 Fixed: Remote Code Execution (File Upload) Vulnerability (OFBIZ-11948) add 8c5100d Improved: Dutch labels (OFBIZ-10363) No new revisions were added by this update. Summary of changes: applications/workeffort/config/WorkEffortUiLabels.xml | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-)
[ofbiz-framework] branch trunk updated: Improved: Dutch labels (OFBIZ-10363)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new bbdeb09 Improved: Dutch labels (OFBIZ-10363) bbdeb09 is described below commit bbdeb09f67de85c6ac80b5a9086e924b1c59c732 Author: Pierre Smits AuthorDate: Sun Jan 23 14:32:44 2022 +0100 Improved: Dutch labels (OFBIZ-10363) A more complete/improved translation of labels increases the appeal of OFBiz. Modified: CommonUiLabels.xml improving dutch translations --- framework/common/config/CommonUiLabels.xml | 65 +++--- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/framework/common/config/CommonUiLabels.xml b/framework/common/config/CommonUiLabels.xml index 3a71f7d..1df606e 100644 --- a/framework/common/config/CommonUiLabels.xml +++ b/framework/common/config/CommonUiLabels.xml @@ -164,6 +164,7 @@ Gestión de Catálogo de Productos, Categorías, Productos, Reglas de Precios, Promociones, Tienda de Productos Gestion des catalogues, Catégories, Articles, Promotions, Règles de prix, Centres de profit 製品カタログ管理、カテゴリ、製品、価格ルール、プロモーション、製品店舗 +Product Informantie Beheer Каталог управления товарами, Категории, Товар, Цены, Акции, Магазин Quản lý Phân loại Trình diễn, Phân loại Quản lý, Sản phẩm, Công thức giá, Khuyến mãi, Cửa hàng 产品目录管理，包括分类、产品、价格规则、促销、产品店铺 @@ -177,6 +178,7 @@ Cancelar Abandonner アボート +Afbreken Отменить Hủy 放弃 @@ -322,6 +324,7 @@ Ajouter une nouvelle colonne à ce portail Aggiunge una nuova colonna a questa pagina このポータルに新規項目を追加 +Kolom toevoegen Adicionar uma nova coluna neste portal Добавить новый столбец в этот портал Thêm một cột cho Cổng thông tin này này @@ -338,7 +341,7 @@ एक Portlet जोड़ें... Aggiungi un portlet... ポートレットを追加 -Toevoegen portlet... +Toevoegen portlet Adicionar um Portlet ... Добавить портлет Thêm một ứng dụng Portlet... @@ -356,7 +359,7 @@ कॉलम जोड़ें Aggiungi una colonna 項目を追加 -Toevoegen column... +Toevoegen kolom Adicionar Coluna Добавить столбец Thêm cột @@ -375,7 +378,7 @@ डिफ़ॉल्ट जोड़ें Aggiungi default デフォルトを追加 -Toevoegen standaard +Standaard toevoegen Adicionar Default Adicionar Padrão Adicionar Pré-definições @@ -399,7 +402,7 @@ क्रमांक जोड़ें Aggiungi codice IDを追加 -Toevoegen nummer +ID toevoegen Adicionar ID Adauga Cod Добавить ID @@ -421,7 +424,7 @@ नया जोड़ें Aggiungi nuovo 新規追加 -Toevoegen nieuwe +Nieuw(e) toevoegen Adicionar Novo Criar um Novo Adauga Nou @@ -441,6 +444,7 @@ Ajouter une portlet à la page Aggiunge un portlet in questa colonna ポータルページにポートレットを追加 +Portlet aan pagina toevoegen Adicionar um portlet à página do portal Добавить портлет на страницу портала Thêm một portlet vào trang portal @@ -459,7 +463,7 @@ समस्या जोड़ें Aggiungi problema 問題を追加 -Toevoegen probleem +Probleem toevoegen Adicionar Problema Problema de criação Adauga Problema @@ -536,7 +540,7 @@ पता पंक्ति Riga indirizzo 住所行 -Adres lijn +Adresregel Linha de Endereço Linie Adresa Строка адреса @@ -555,6 +559,7 @@ Dirección no encontrada. Adresse inconnue 住所が見つかりません。 +Adres niet gevonden Адрес не найден Không tìm thấy địa chỉ 没有找到地址。 @@ -604,6 +609,7 @@ उन्नत सुविधाएँ Caratteristiche avanzate 詳細機能 +uitgebreide eigenschappen Recursos avançados Дополнительные функции Tính năng chuyên sâu @@ -621,7 +627,7 @@ उन्नत खोज Ricerca avanzata 詳細検索 -Uitgebreide zoek +Uitgebreid zoeken Pesquisa Avançada Cautare Avansata Расширенный поиск @@ -729,6 +735,7 @@ हमेशा शामिल करें Include sempre 常に含む +Altijd opnemen Incluir Sempre Sempre incluir Всегда включать @@ -813,7 +820,7 @@ कोईभी वापसी स्थिति Qualsiasi stato reso 任意のステータス -Elke retour status +Elke retourstatus Qualquer Estado de Devolução Qualquer estado de resposta Orice Stadiu Returnare @@ -835,7 +842,7 @@ कोईभी भूमिका प्रकार Qualsiasi tipo ruolo 任意のロール種類
[ofbiz-framework] branch trunk updated: Improved: Maintenance (demo) dataset(s) (OFBIZ-12526)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/trunk by this push: new 9f97826 Improved: Maintenance (demo) dataset(s) (OFBIZ-12526) 9f97826 is described below commit 9f978262f580a733fc5b080eb54d2d705f0defc6 Author: Pierre Smits AuthorDate: Sun Jan 23 15:13:35 2022 +0100 Improved: Maintenance (demo) dataset(s) (OFBIZ-12526) Good (demo) data increases the appeal of OFBiz, making it easier for both user and contributor to understand how particular functions like screens, services, etc. (should) work. modified: MarketingDemoData.xml added demo data regarding sfa forecasts --- applications/datamodel/data/demo/MarketingDemoData.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/applications/datamodel/data/demo/MarketingDemoData.xml b/applications/datamodel/data/demo/MarketingDemoData.xml index d2e0673..ac8955b 100644 --- a/applications/datamodel/data/demo/MarketingDemoData.xml +++ b/applications/datamodel/data/demo/MarketingDemoData.xml @@ -218,4 +218,9 @@ under the License. + + + + +
[ofbiz-plugins] branch trunk updated: Fixed: Typo in debug log message.
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new f33ff27 Fixed: Typo in debug log message.
f33ff27 is described below
commit f33ff270598b2b047c61ecb59bc1e1d39392d589
Author: Michael Brohl
AuthorDate: Wed Dec 15 16:53:09 2021 +0100
Fixed: Typo in debug log message.
---
rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java
b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java
index 0e2d13a..d85d87f 100644
--- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java
+++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java
@@ -96,7 +96,7 @@ public class OFBizApiConfig extends ResourceConfig {
private void traverseAndRegisterApiDefinitions() {
if (UtilValidate.isEmpty(MICRO_APIS)) {
-Debug.logInfo("No API defintion to process", MODULE);
+Debug.logInfo("No API definitions to process", MODULE);
return;
}
MICRO_APIS.forEach((k, v) -> {
[ofbiz-plugins] branch trunk updated: Fixed: REST-API Plugin: Remove errors and warnings in generated openapi documentation (OFBIZ-12426)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 421e0e7 Fixed: REST-API Plugin: Remove errors and warnings in
generated openapi documentation (OFBIZ-12426)
421e0e7 is described below
commit 421e0e7994ad5e69e6a60cb75a3c8715f0891c26
Author: Michael Brohl
AuthorDate: Wed Dec 1 17:42:05 2021 +0100
Fixed: REST-API Plugin: Remove errors and warnings in generated openapi
documentation (OFBIZ-12426)
This fixes the following errors and warnings which are displayed by the
Swagger Editor (editor.swagger.io) when reading the generated openapi
documentation:
Errors fixed
* "Header parameters named "Authorization" are ignored. Use the
`securitySchemes` and `security` sections instead to define
authorization."
* "Structural error at paths./parameters.0 should have either a
`schema` or `content` property"
the generated parameters from the service definition now have schema
entries generated
* the same applies to the WWW-Authenticate header in the responses
Warnings fixed
* "Header parameters named "Accept" are ignored. The values for the
"Accept" header are defined by `responses..content.`."
---
.../java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java | 4 ++--
.../src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java| 8 +---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git
a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java
b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java
index 86f0269..df77b94 100644
---
a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java
+++
b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java
@@ -141,7 +141,6 @@ public final class OFBizOpenApiReader extends Reader
implements OpenApiReader {
serviceInParam.content(new
Content().addMediaType(javax.ws.rs.core.MediaType.APPLICATION_JSON,
new MediaType().schema(refSchema)));
operation.addParametersItem(serviceInParam);
-operation.addParametersItem(HEADER_ACCEPT_JSON);
} else if (verb.matches(HttpMethod.POST + "|" +
HttpMethod.PUT + "|" + HttpMethod.PATCH)) {
RequestBody request = new RequestBody()
.description("Request Body for operation " +
op.getDescription())
@@ -158,7 +157,8 @@ public final class OFBizOpenApiReader extends Reader
implements OpenApiReader {
.findFirst().orElse(null);
final PathParameter pathParameter = (PathParameter)
new PathParameter().required(true)
.description(mdParam != null ?
mdParam.getShortDisplayDescription() : "")
-.name(pathParam);
+.name(pathParam)
+
.schema(OpenApiUtil.getAttributeSchema(service, mdParam));
operation.addParametersItem(pathParameter);
}
addServiceOutSchema(service);
diff --git
a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
index a486786..96d7d3c 100644
--- a/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
+++ b/rest-api/src/main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java
@@ -160,7 +160,7 @@ public final class OpenApiUtil {
private static void buildApiResponseSchemas() {
Schema genericErrorSchema = new
MapSchema().addProperties("statusCode", new IntegerSchema().description("HTTP
Status Code"))
.addProperties("statusDescription", new
StringSchema().description("HTTP Status Code Description"))
- .addProperties("errorTyoe", new
StringSchema().description("Error Type for the error"))
+ .addProperties("errorType", new
StringSchema().description("Error Type for the error"))
.addProperties("errorMessage", new
StringSchema().description("Error Message"));
SCHEMAS.put("api.response.unauthorized.noheader", genericErrorSchema);
SCHEMAS.put("api.response.unauthorized.invalidtoken",
genericErrorSchema);
@@ -203,7 +203,7 @@ public final class OpenApiUtil {
"errorMessage", "HTTP POST is not allowed on service
'demoDoGetService'.");
final ApiRe
[ofbiz-framework] branch release18.12 updated: Fixed: Adding tel protocol in CustomPermissivePolicy is not working (OFBIZ-12258)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 1f0797d Fixed: Adding tel protocol in CustomPermissivePolicy is not
working (OFBIZ-12258)
1f0797d is described below
commit 1f0797d5f32c8c040963a0b96196aaebaf9152ae
Author: Wiebke Pätzold
AuthorDate: Mon Jun 14 12:16:10 2021 +0200
Fixed: Adding tel protocol in CustomPermissivePolicy is not working
(OFBIZ-12258)
With these changes, the default sanitizers rules are only loaded if
there is no CustomPermissivePolicy
---
.../main/java/org/apache/ofbiz/base/util/UtilCodec.java | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
index 1433977..40e033a 100644
--- a/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
+++ b/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilCodec.java
@@ -128,12 +128,11 @@ public class UtilCodec {
return null;
}
if (UtilProperties.getPropertyAsBoolean("owasp",
"sanitizer.enable", true)) {
-PolicyFactory sanitizer =
Sanitizers.FORMATTING.and(Sanitizers.BLOCKS).and(Sanitizers.IMAGES).and(
-Sanitizers.LINKS).and(Sanitizers.STYLES);
+PolicyFactory sanitizer = null;
// TODO to be improved to use a (or several) contentTypeId/s
when necessary.
// Below is an example with BIRT_FLEXIBLE_REPORT_POLICY
if ("FLEXIBLE_REPORT".equals(contentTypeId)) {
-sanitizer = sanitizer.and(BIRT_FLEXIBLE_REPORT_POLICY);
+sanitizer = BIRT_FLEXIBLE_REPORT_POLICY;
}
// Check if custom policy should be used and if so don't use
PERMISSIVE_POLICY
@@ -155,9 +154,21 @@ public class UtilCodec {
}
if (policy != null) {
+if (UtilValidate.isNotEmpty(sanitizer)) {
sanitizer = sanitizer.and(policy);
+} else {
+sanitizer = policy;
+}
return sanitizer.sanitize(original);
}
+} else {
+if (UtilValidate.isNotEmpty(sanitizer)) {
+sanitizer =
sanitizer.and(Sanitizers.FORMATTING.and(Sanitizers.BLOCKS).and(Sanitizers.IMAGES).and(
+Sanitizers.LINKS).and(Sanitizers.STYLES));
+} else {
+sanitizer =
Sanitizers.FORMATTING.and(Sanitizers.BLOCKS).and(Sanitizers.IMAGES).and(
+Sanitizers.LINKS).and(Sanitizers.STYLES);
+}
}
// Fallback should be the default option PERMISSIVE_POLICY
[ofbiz-plugins] 02/02: Improved: Updates swagger ui version to 3.45.1, moves and updates README (OFBIZ-12207)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit 57d24425dfa6bf1ffb703f0bf5dcab40d49c6cb3
Author: Michael Brohl
AuthorDate: Sat Mar 27 11:47:28 2021 +0100
Improved: Updates swagger ui version to 3.45.1, moves and updates README
(OFBIZ-12207)
---
rest-api/webapp/docs/README.adoc | 15 +++
rest-api/webapp/docs/WEB-INF/README.adoc | 15 ---
rest-api/webapp/docs/swagger-ui-bundle.js| 2 +-
rest-api/webapp/docs/swagger-ui-bundle.js.map| 2 +-
rest-api/webapp/docs/swagger-ui-es-bundle-core.js| 2 +-
rest-api/webapp/docs/swagger-ui-es-bundle-core.js.map| 2 +-
rest-api/webapp/docs/swagger-ui-es-bundle.js | 2 +-
rest-api/webapp/docs/swagger-ui-es-bundle.js.map | 2 +-
rest-api/webapp/docs/swagger-ui-standalone-preset.js | 2 +-
rest-api/webapp/docs/swagger-ui-standalone-preset.js.map | 2 +-
rest-api/webapp/docs/swagger-ui.css | 2 +-
rest-api/webapp/docs/swagger-ui.css.map | 2 +-
rest-api/webapp/docs/swagger-ui.js | 2 +-
rest-api/webapp/docs/swagger-ui.js.map | 2 +-
14 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/rest-api/webapp/docs/README.adoc b/rest-api/webapp/docs/README.adoc
new file mode 100644
index 000..b6448a5
--- /dev/null
+++ b/rest-api/webapp/docs/README.adoc
@@ -0,0 +1,15 @@
+= REST API documentation
+
+You can choose between Swagger UI and Redoc to publish documentation for the
REST API.
+
+== Swagger
+
+Current version: swagger-ui-3.45.1
+
+Access: https://localhost:8443/docs/swagger-ui.html
+
+== Redoc
+
+Current version: redoc@2.0.0-rc.50
+
+Accesss: https://localhost:8443/docs/redoc.html
\ No newline at end of file
diff --git a/rest-api/webapp/docs/WEB-INF/README.adoc
b/rest-api/webapp/docs/WEB-INF/README.adoc
deleted file mode 100644
index f99ef3c..000
--- a/rest-api/webapp/docs/WEB-INF/README.adoc
+++ /dev/null
@@ -1,15 +0,0 @@
-= REST API documentation
-
-You can choose between Swagger UI and Redoc to generate documentation for the
REST API.
-
-== Swagger
-
-Current version:
-
-Access: https://localhost:8443/docs/swagger-ui.html
-
-== Redoc
-
-Current version: redoc@2.0.0-rc.50
-
-Accesss: https://localhost:8443/docs/redoc.html
\ No newline at end of file
diff --git a/rest-api/webapp/docs/swagger-ui-bundle.js
b/rest-api/webapp/docs/swagger-ui-bundle.js
index d3afaab..7643f50 100644
--- a/rest-api/webapp/docs/swagger-ui-bundle.js
+++ b/rest-api/webapp/docs/swagger-ui-bundle.js
@@ -1,3 +1,3 @@
/*! For license information please see swagger-ui-bundle.js.LICENSE.txt */
-!function(e,t){"object"==typeof exports&&"object"==typeof
module?module.exports=t(function(){try{return
require("esprima")}catch(e){}}()):"function"==typeof
define&?define(["esprima"],t):"object"==typeof
exports?exports.SwaggerUIBundle=t(function(){try{return
require("esprima")}catch(e){}}()):e.SwaggerUIBundle=t(e.esprima)}(this,(function(e){return
function(e){var t={};function n(r){if(t[r])return t[r].exports;var
o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exp [...]
+!function(e,t){"object"==typeof exports&&"object"==typeof
module?module.exports=t(function(){try{return
require("esprima")}catch(e){}}()):"function"==typeof
define&?define(["esprima"],t):"object"==typeof
exports?exports.SwaggerUIBundle=t(function(){try{return
require("esprima")}catch(e){}}()):e.SwaggerUIBundle=t(e.esprima)}(this,(function(e){return
function(e){var t={};function n(r){if(t[r])return t[r].exports;var
o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exp [...]
//# sourceMappingURL=swagger-ui-bundle.js.map
\ No newline at end of file
diff --git a/rest-api/webapp/docs/swagger-ui-bundle.js.map
b/rest-api/webapp/docs/swagger-ui-bundle.js.map
index d6e9de3..e1a3760 100644
--- a/rest-api/webapp/docs/swagger-ui-bundle.js.map
+++ b/rest-api/webapp/docs/swagger-ui-bundle.js.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack://SwaggerUIBundle/webpack/universalModuleDefinition","webpack://SwaggerUIBundle/webpack/bootstrap","webpack://SwaggerUIBundle/./node_modules/react/react.js","webpack://SwaggerUIBundle/./node_modules/immutable/dist/immutable.js","webpack://SwaggerUIBundle/./node_modules/@babel/runtime-corejs3/core-js-stable/instance/concat.js","webpack://SwaggerUIBundle/./node_modules/@babel/runtime-corejs3/helpers/defineProperty.js","webpack://SwaggerUIBundle/./src/core/u
[...]
\ No newline at end of file
+{"version":3,"sources":["webpack://SwaggerUIBundle/
[ofbiz-plugins] branch trunk updated (66055a7 -> 57d2442)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git. from 66055a7 Improved: Fixes sonarcloud error by using the resource integrity feature for embedding external redoc javascript file (OFBIZ-12197) new 5eb003e Improved: Updates Redoc version and makes it locally available (OFBIZ-12207) new 57d2442 Improved: Updates swagger ui version to 3.45.1, moves and updates README (OFBIZ-12207) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: rest-api/webapp/docs/README.adoc | 15 +++ rest-api/webapp/docs/redoc.html| 2 +- rest-api/webapp/docs/redoc.standalone.js | 103 + rest-api/webapp/docs/swagger-ui-bundle.js | 2 +- rest-api/webapp/docs/swagger-ui-bundle.js.map | 2 +- rest-api/webapp/docs/swagger-ui-es-bundle-core.js | 2 +- .../webapp/docs/swagger-ui-es-bundle-core.js.map | 2 +- rest-api/webapp/docs/swagger-ui-es-bundle.js | 2 +- rest-api/webapp/docs/swagger-ui-es-bundle.js.map | 2 +- .../webapp/docs/swagger-ui-standalone-preset.js| 2 +- .../docs/swagger-ui-standalone-preset.js.map | 2 +- rest-api/webapp/docs/swagger-ui.css| 2 +- rest-api/webapp/docs/swagger-ui.css.map| 2 +- rest-api/webapp/docs/swagger-ui.js | 2 +- rest-api/webapp/docs/swagger-ui.js.map | 2 +- 15 files changed, 131 insertions(+), 13 deletions(-) create mode 100644 rest-api/webapp/docs/README.adoc create mode 100644 rest-api/webapp/docs/redoc.standalone.js
[ofbiz-plugins] 01/02: Improved: Updates Redoc version and makes it locally available (OFBIZ-12207)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 5eb003e1a6d0124bcb92100983ca76a066dfece4 Author: Michael Brohl AuthorDate: Sat Mar 27 11:35:22 2021 +0100 Improved: Updates Redoc version and makes it locally available (OFBIZ-12207) The reference was chanegd from cdn-hosted version to a locally saved version to avoid integrity check mechanism and making it possible to track the used version in the README. --- rest-api/webapp/docs/WEB-INF/README.adoc | 15 + rest-api/webapp/docs/redoc.html | 2 +- rest-api/webapp/docs/redoc.standalone.js | 103 +++ 3 files changed, 119 insertions(+), 1 deletion(-) diff --git a/rest-api/webapp/docs/WEB-INF/README.adoc b/rest-api/webapp/docs/WEB-INF/README.adoc new file mode 100644 index 000..f99ef3c --- /dev/null +++ b/rest-api/webapp/docs/WEB-INF/README.adoc @@ -0,0 +1,15 @@ += REST API documentation + +You can choose between Swagger UI and Redoc to generate documentation for the REST API. + +== Swagger + +Current version: + +Access: https://localhost:8443/docs/swagger-ui.html + +== Redoc + +Current version: redoc@2.0.0-rc.50 + +Accesss: https://localhost:8443/docs/redoc.html \ No newline at end of file diff --git a/rest-api/webapp/docs/redoc.html b/rest-api/webapp/docs/redoc.html index 5825848..6fa1d23 100644 --- a/rest-api/webapp/docs/redoc.html +++ b/rest-api/webapp/docs/redoc.html @@ -36,7 +36,7 @@ under the License. - https://cdn.jsdelivr.net/npm/redoc@2.0.0-rc.50/bundles/redoc.standalone.js"</a>; integrity="sha384-YWcR83P+iCIwWinEgobyIHtCpa2GHXZY4EGN+8CK2dDrcay1wIz3l4Txk2AEc7Qc"> +
[ofbiz-plugins] 05/05: Improved: Fixes sonarcloud error by using the resource integrity feature for embedding external redoc javascript file (OFBIZ-12197)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 66055a731aa15706044e4612ea8b7f36c4dbe60c Author: Michael Brohl AuthorDate: Wed Mar 24 23:16:34 2021 +0100 Improved: Fixes sonarcloud error by using the resource integrity feature for embedding external redoc javascript file (OFBIZ-12197) --- rest-api/webapp/docs/redoc.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest-api/webapp/docs/redoc.html b/rest-api/webapp/docs/redoc.html index f6a1f49..5825848 100644 --- a/rest-api/webapp/docs/redoc.html +++ b/rest-api/webapp/docs/redoc.html @@ -36,7 +36,7 @@ under the License. - https://cdn.jsdelivr.net/npm/redoc@next/bundles/redoc.standalone.js"</a>;> + https://cdn.jsdelivr.net/npm/redoc@2.0.0-rc.50/bundles/redoc.standalone.js"</a>; integrity="sha384-YWcR83P+iCIwWinEgobyIHtCpa2GHXZY4EGN+8CK2dDrcay1wIz3l4Txk2AEc7Qc">
[ofbiz-plugins] 04/05: Improved: Fixes html bugs spotted by sonarcloud (OFBIZ-12197)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git commit 84d705373fcc7043434f02c97507deb7c3ad2fca Author: Michael Brohl AuthorDate: Mon Mar 22 22:30:47 2021 +0100 Improved: Fixes html bugs spotted by sonarcloud (OFBIZ-12197) --- rest-api/webapp/docs/oauth2-redirect.html | 4 +++- rest-api/webapp/docs/redoc.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rest-api/webapp/docs/oauth2-redirect.html b/rest-api/webapp/docs/oauth2-redirect.html index d04e1ba..80168cc 100644 --- a/rest-api/webapp/docs/oauth2-redirect.html +++ b/rest-api/webapp/docs/oauth2-redirect.html @@ -1,6 +1,8 @@ -Swagger UI: OAuth2 Redirect + + Swagger UI: OAuth2 Redirect + diff --git a/rest-api/webapp/docs/redoc.html b/rest-api/webapp/docs/redoc.html index 94faf4e..f6a1f49 100644 --- a/rest-api/webapp/docs/redoc.html +++ b/rest-api/webapp/docs/redoc.html @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + OFBiz REST API
[ofbiz-plugins] 02/05: Improved: Removes "ofbiz" prefix from files and folders, code cleanup (OFBIZ-12197)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit 1a6e4f82947f14ab4725d5763985b68972259ca7
Author: Michael Brohl
AuthorDate: Mon Mar 22 21:34:21 2021 +0100
Improved: Removes "ofbiz" prefix from files and folders, code cleanup
(OFBIZ-12197)
---
rest-api/config/ApiUiLabels.xml| 20 --
rest-api/data/Ofbiz-rest-jerseyDemoData.xml| 23 ---
.../Ofbiz-rest-jerseySecurityGroupDemoData.xml | 36 ---
...Ofbiz-rest-jerseySecurityPermissionSeedData.xml | 35 ---
rest-api/data/Ofbiz-rest-jerseyTypeData.xml| 23 ---
rest-api/entitydef/entitymodel.xml | 31 --
rest-api/ofbiz-component.xml | 27 +++-
rest-api/servicedef/services.xml | 2 +-
...fbiz-rest-jerseyTests.xml => rest-apiTests.xml} | 2 +-
.../ofbiz-rest-jersey/WEB-INF/controller.xml | 47 --
rest-api/webapp/ofbiz-rest-jersey/index.jsp| 20 --
.../WEB-INF/web.xml| 11 +---
rest-api/widget/CommonScreens.xml | 71 --
rest-api/widget/Ofbiz-rest-jerseyForms.xml | 26
rest-api/widget/Ofbiz-rest-jerseyMenus.xml | 29 -
rest-api/widget/Ofbiz-rest-jerseyScreens.xml | 40
16 files changed, 12 insertions(+), 431 deletions(-)
diff --git a/rest-api/config/ApiUiLabels.xml b/rest-api/config/ApiUiLabels.xml
index 7cad87e..c1d5a0d 100644
--- a/rest-api/config/ApiUiLabels.xml
+++ b/rest-api/config/ApiUiLabels.xml
@@ -20,26 +20,6 @@ under the License.
http://www.w3.org/2001/XMLSchema-instance;
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-properties.xsd;>
-
-OFBiz-rest-jersey Application
-Ofbiz-rest-jersey应用程序
-Ofbiz-rest-jersey應用程式
-
-
-OFBiz: OFBiz-rest-jersey
-OFBiz: OFBiz-rest-jersey
-
-
-Part of the Apache OFBiz Family of Open Source
Software
-Un modulo della famiglia di software open source
Apache OFBiz
-开源软件OFBiz的组成部分
-開源軟體OFBiz的組成部分
-
-
-You are not allowed to view this page.
-不允许你浏览这个页面。
-不允許您檢視這個頁面.
-
${service} validation failed. The request
contained invalid information and could not be processed.
diff --git a/rest-api/data/Ofbiz-rest-jerseyDemoData.xml
b/rest-api/data/Ofbiz-rest-jerseyDemoData.xml
deleted file mode 100644
index b76e67e..000
--- a/rest-api/data/Ofbiz-rest-jerseyDemoData.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/rest-api/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml
b/rest-api/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml
deleted file mode 100644
index cd952cd..000
--- a/rest-api/data/Ofbiz-rest-jerseySecurityGroupDemoData.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/rest-api/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml
b/rest-api/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml
deleted file mode 100644
index 597f97a..000
--- a/rest-api/data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/rest-api/data/Ofbiz-rest-jerseyTypeData.xml
b/rest-api/data/Ofbiz-rest-jerseyTypeData.xml
deleted file mode 100644
index b76e67e..000
--- a/rest-api/data/Ofbiz-rest-jerseyTypeData.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/rest-api/entitydef/entitymodel.xml
b/rest-api/entitydef/entitymodel.xml
deleted file mode 100644
index 4ffbc30..000
--- a/rest-api/entitydef/entitymodel.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-http://www.w3.org/2001/XMLSchema-instance;
-
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd;>
-
-
-
-Entity of OFBiz-rest-jersey Component
-None
-
-
-
-
\ No newline at end of file
diff --git a/rest-api/ofbiz-component.xml b/rest-api/ofbiz-component.xml
index 47bc4f9..ec9764f 100644
--- a/rest-api/ofbiz-component.xml
+++ b/rest-api/ofbiz-component.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
-http://www.w3.org/2001/XMLSchema-instance;
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd;>
@@ -26,32 +26,19 @@ under the License.
-
-
-
-
-
-
-
-
+
-
-
+
-
+
http://www.w3.org/2001/XMLSchema-instance;
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd;>
-OFBiz-rest-jersey Services
+rest-api Services
[ofbiz-plugins] 01/05: Improved: Remove ofbiz prefix from files and folders (OFBIZ-12197)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit 107b26b66c0a594994bb32d122976622673ef5ce
Author: Michael Brohl
AuthorDate: Mon Mar 15 22:38:30 2021 +0100
Improved: Remove ofbiz prefix from files and folders (OFBIZ-12197)
Renames ofbiz-rest-impl to rest-api.
---
{ofbiz-rest-impl => rest-api}/README.adoc | 0
{ofbiz-rest-impl => rest-api}/build.gradle | 0
{ofbiz-rest-impl => rest-api}/config/ApiUiLabels.xml| 0
.../data/Ofbiz-rest-jerseyDemoData.xml | 0
.../data/Ofbiz-rest-jerseySecurityGroupDemoData.xml | 0
.../data/Ofbiz-rest-jerseySecurityPermissionSeedData.xml| 0
.../data/Ofbiz-rest-jerseyTypeData.xml | 0
{ofbiz-rest-impl => rest-api}/dtd/rest-api.xsd | 0
{ofbiz-rest-impl => rest-api}/entitydef/entitymodel.xml | 0
{ofbiz-rest-impl => rest-api}/ofbiz-component.xml | 0
{ofbiz-rest-impl => rest-api}/servicedef/services.xml | 0
.../main/java/org/apache/ofbiz/ws/rs/ApiServiceRequest.java | 0
.../main/java/org/apache/ofbiz/ws/rs/ConflictException.java | 0
.../org/apache/ofbiz/ws/rs/MethodNotAllowedException.java | 0
.../org/apache/ofbiz/ws/rs/ServiceNotFoundException.java| 0
.../java/org/apache/ofbiz/ws/rs/ServiceRequestFilter.java | 0
.../org/apache/ofbiz/ws/rs/ServiceRequestProcessor.java | 0
.../ofbiz/ws/rs/annotation/ServiceRequestValidator.java | 0
.../org/apache/ofbiz/ws/rs/common/AuthenticationScheme.java | 0
.../java/org/apache/ofbiz/ws/rs/core/OFBizApiConfig.java| 0
.../java/org/apache/ofbiz/ws/rs/core/ResponseStatus.java| 0
.../org/apache/ofbiz/ws/rs/listener/ApiContextListener.java | 0
.../main/java/org/apache/ofbiz/ws/rs/model/ModelApi.java| 0
.../java/org/apache/ofbiz/ws/rs/model/ModelApiReader.java | 0
.../java/org/apache/ofbiz/ws/rs/model/ModelOperation.java | 0
.../java/org/apache/ofbiz/ws/rs/model/ModelResource.java| 0
.../org/apache/ofbiz/ws/rs/openapi/OFBizOpenApiReader.java | 0
.../apache/ofbiz/ws/rs/openapi/OFBizResourceScanner.java| 0
.../org/apache/ofbiz/ws/rs/process/RestRequestHandler.java | 0
.../apache/ofbiz/ws/rs/process/ServiceRequestHandler.java | 0
.../org/apache/ofbiz/ws/rs/resources/ApiRootResource.java | 0
.../ofbiz/ws/rs/resources/AuthenticationResource.java | 0
.../org/apache/ofbiz/ws/rs/resources/IOFBizResource.java| 0
.../org/apache/ofbiz/ws/rs/resources/OFBizResource.java | 0
.../apache/ofbiz/ws/rs/resources/OFBizServiceResource.java | 0
.../org/apache/ofbiz/ws/rs/resources/OpenApiResource.java | 0
.../main/java/org/apache/ofbiz/ws/rs/response/Error.java| 0
.../main/java/org/apache/ofbiz/ws/rs/response/Messages.java | 0
.../main/java/org/apache/ofbiz/ws/rs/response/Response.java | 0
.../main/java/org/apache/ofbiz/ws/rs/response/Success.java | 0
.../java/org/apache/ofbiz/ws/rs/security/AuthToken.java | 0
.../main/java/org/apache/ofbiz/ws/rs/security/Secured.java | 0
.../org/apache/ofbiz/ws/rs/security/auth/APIAuthFilter.java | 0
.../ofbiz/ws/rs/security/auth/HttpBasicAuthFilter.java | 0
.../java/org/apache/ofbiz/ws/rs/services/RestServices.java | 0
.../org/apache/ofbiz/ws/rs/spi/AbstractExceptionMapper.java | 0
.../ofbiz/ws/rs/spi/impl/GenericServiceExceptionMapper.java | 0
.../apache/ofbiz/ws/rs/spi/impl/GlobalExceptionMapper.java | 0
.../java/org/apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java | 0
.../ws/rs/spi/impl/JsonifiedParamConverterProvider.java | 0
.../org/apache/ofbiz/ws/rs/spi/impl/LinkSerializer.java | 0
.../main/java/org/apache/ofbiz/ws/rs/util/ErrorUtil.java| 0
.../main/java/org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 0
.../main/java/org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 0
.../testdef/Ofbiz-rest-jerseyTests.xml | 0
{ofbiz-rest-impl => rest-api}/webapp/docs/WEB-INF/web.xml | 0
{ofbiz-rest-impl => rest-api}/webapp/docs/favicon-16x16.png | Bin
{ofbiz-rest-impl => rest-api}/webapp/docs/favicon-32x32.png | Bin
.../webapp/docs/oauth2-redirect.html| 0
{ofbiz-rest-impl => rest-api}/webapp/docs/redoc.html| 0
.../webapp/docs/swagger-ui-bundle.js| 0
.../webapp/docs/swagger-ui-bundle.js.map| 0
.../webapp/docs/swagger-ui-es-bundle-core.js| 0
.../webapp/docs/swagger-ui-es-bundle-core.js.map| 0
.../webapp/docs/swagger-ui-es-bundle.js | 0
.../webapp/docs/swagger-ui-es-bundle.js.map | 0
.../webapp/docs/swagger-ui-standalone-preset.js | 0
.../webapp/docs/swagger-ui-standalone-preset.js.map |
[ofbiz-plugins] branch trunk updated (c6704e9 -> 66055a7)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git.
from c6704e9 Fixed: Error message is displayed when user clicks on create
link after the user quick chechout and user is not logged in (OFBIZ-12188)
Added missing UtilHttp class import statement Thanks: Arpit Mor for reporting
the issue and Sourabh Punyani for providing the fix.
new 107b26b Improved: Remove ofbiz prefix from files and folders
(OFBIZ-12197)
new 1a6e4f8 Improved: Removes "ofbiz" prefix from files and folders, code
cleanup (OFBIZ-12197)
new b5c6a17 Improved: Corrects asciidoc levels and follows
one-sentence-per-line rule (OFBIZ-12197)
new 84d7053 Improved: Fixes html bugs spotted by sonarcloud (OFBIZ-12197)
new 66055a7 Improved: Fixes sonarcloud error by using the resource
integrity feature for embedding external redoc javascript file (OFBIZ-12197)
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ofbiz-rest-impl/data/Ofbiz-rest-jerseyDemoData.xml | 23 ---
.../Ofbiz-rest-jerseySecurityGroupDemoData.xml | 36 ---
...Ofbiz-rest-jerseySecurityPermissionSeedData.xml | 35 --
ofbiz-rest-impl/data/Ofbiz-rest-jerseyTypeData.xml | 23 ---
ofbiz-rest-impl/entitydef/entitymodel.xml | 31 -
.../ofbiz-rest-jersey/WEB-INF/controller.xml | 47 --
ofbiz-rest-impl/webapp/ofbiz-rest-jersey/index.jsp | 20 --
ofbiz-rest-impl/widget/CommonScreens.xml | 71 -
ofbiz-rest-impl/widget/Ofbiz-rest-jerseyForms.xml | 26
ofbiz-rest-impl/widget/Ofbiz-rest-jerseyMenus.xml | 29 -
.../widget/Ofbiz-rest-jerseyScreens.xml| 40
{ofbiz-rest-impl => rest-api}/README.adoc | 20 +++---
{ofbiz-rest-impl => rest-api}/build.gradle | 0
.../config/ApiUiLabels.xml | 20 --
{ofbiz-rest-impl => rest-api}/dtd/rest-api.xsd | 0
{ofbiz-rest-impl => rest-api}/ofbiz-component.xml | 27 ++--
.../servicedef/services.xml| 2 +-
.../org/apache/ofbiz/ws/rs/ApiServiceRequest.java | 0
.../org/apache/ofbiz/ws/rs/ConflictException.java | 0
.../ofbiz/ws/rs/MethodNotAllowedException.java | 0
.../ofbiz/ws/rs/ServiceNotFoundException.java | 0
.../apache/ofbiz/ws/rs/ServiceRequestFilter.java | 0
.../ofbiz/ws/rs/ServiceRequestProcessor.java | 0
.../ws/rs/annotation/ServiceRequestValidator.java | 0
.../ofbiz/ws/rs/common/AuthenticationScheme.java | 0
.../apache/ofbiz/ws/rs/core/OFBizApiConfig.java| 0
.../apache/ofbiz/ws/rs/core/ResponseStatus.java| 0
.../ofbiz/ws/rs/listener/ApiContextListener.java | 0
.../org/apache/ofbiz/ws/rs/model/ModelApi.java | 0
.../apache/ofbiz/ws/rs/model/ModelApiReader.java | 0
.../apache/ofbiz/ws/rs/model/ModelOperation.java | 0
.../apache/ofbiz/ws/rs/model/ModelResource.java| 0
.../ofbiz/ws/rs/openapi/OFBizOpenApiReader.java| 0
.../ofbiz/ws/rs/openapi/OFBizResourceScanner.java | 0
.../ofbiz/ws/rs/process/RestRequestHandler.java| 0
.../ofbiz/ws/rs/process/ServiceRequestHandler.java | 0
.../ofbiz/ws/rs/resources/ApiRootResource.java | 0
.../ws/rs/resources/AuthenticationResource.java| 0
.../ofbiz/ws/rs/resources/IOFBizResource.java | 0
.../ofbiz/ws/rs/resources/OFBizResource.java | 0
.../ws/rs/resources/OFBizServiceResource.java | 0
.../ofbiz/ws/rs/resources/OpenApiResource.java | 0
.../org/apache/ofbiz/ws/rs/response/Error.java | 0
.../org/apache/ofbiz/ws/rs/response/Messages.java | 0
.../org/apache/ofbiz/ws/rs/response/Response.java | 0
.../org/apache/ofbiz/ws/rs/response/Success.java | 0
.../org/apache/ofbiz/ws/rs/security/AuthToken.java | 0
.../org/apache/ofbiz/ws/rs/security/Secured.java | 0
.../ofbiz/ws/rs/security/auth/APIAuthFilter.java | 0
.../ws/rs/security/auth/HttpBasicAuthFilter.java | 0
.../apache/ofbiz/ws/rs/services/RestServices.java | 0
.../ofbiz/ws/rs/spi/AbstractExceptionMapper.java | 0
.../rs/spi/impl/GenericServiceExceptionMapper.java | 0
.../ws/rs/spi/impl/GlobalExceptionMapper.java | 0
.../apache/ofbiz/ws/rs/spi/impl/JacksonConfig.java | 0
.../spi/impl/JsonifiedParamConverterProvider.java | 0
.../ofbiz/ws/rs/spi/impl/LinkSerializer.java | 0
.../org/apache/ofbiz/ws/rs/util/ErrorUtil.java | 0
.../org/apache/ofbiz/ws/rs/util/OpenApiUtil.java | 0
.../org/apache/ofbiz/ws/rs/util/RestApiUtil.java | 0
.../testdef/rest-apiTests.xml | 2 +-
.../webapp/doc
[ofbiz-plugins] 03/05: Improved: Corrects asciidoc levels and follows one-sentence-per-line rule (OFBIZ-12197)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
commit b5c6a17024013ec655b18975d6878e95f019ee40
Author: Michael Brohl
AuthorDate: Mon Mar 22 21:36:04 2021 +0100
Improved: Corrects asciidoc levels and follows one-sentence-per-line
rule (OFBIZ-12197)
---
rest-api/README.adoc | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/rest-api/README.adoc b/rest-api/README.adoc
index e959aa7..98fc07c 100644
--- a/rest-api/README.adoc
+++ b/rest-api/README.adoc
@@ -1,26 +1,29 @@
= Apache OFBiz® plugin for REST
-This initial implementation helps to expose existing or new OFBiz services as
REST. To facilitate this, added a new "action" attribute to service elements
that helps to determine how a particular service can be accessed via REST.
+This initial implementation helps to expose existing or new OFBiz services as
REST.
+To facilitate this, added a new "action" attribute to service elements that
helps to determine how a particular service can be accessed via REST.
- Important URLs
+== Important URLs
* API https://localhost:8443/rest
* WADL https://localhost:8443/rest/application.wadl
* OpenAPI docs https://localhost:8443/docs/swagger-ui.html
- Endpoints
+== Endpoints
Once deployed, following URLs can be accessed
* GET /rest/services
* GET /rest/services/{serviceName}?inParams=
* POST /rest/services/{serviceName} (For this endpoint, the service in
parameters must be part of Request Body)
- Authentication
-API is protected by JWT tokens, although other forms of access tokens may be
supported in future. An API client must first needs to authenticate itself
using Basic Auth using username and password. Username is nothing but OFBiz
'userLogin'. Token can also be generated using Swagger UI.
+== Authentication
+API is protected by JWT tokens, although other forms of access tokens may be
supported in future.
+An API client must first needs to authenticate itself using Basic Auth using
username and password.
+Username is nothing but OFBiz 'userLogin'. Token can also be generated using
Swagger UI.
[source, json]
curl -X POST "https://localhost:8443/rest/auth/token; -H "accept:
application/json" -H "Authorization: Basic YWRtaW46b2ZiaXo="
-If successfully validated, generated token should be received in response -
+If successfully validated, generated token should be received in response
[source, json]
{
@@ -43,7 +46,7 @@ GET /rest/services HTTP/1.1
Authorization: Bearer
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJ1c2VyTG9naW5JZCI6ImFkbWluIiwiaXNzIjoiQXBhY2hlT0ZCaXoiLCJleHAiOjE1OTY3MDk4MjAsImlhdCI6MTU5NjcwODAyMH0.9Hj4pkkeQowAMxPLrI_To0WTohxxgVR6FoViyx5HoboTACQZ4iqDyqiIBodkuCVsZwOTPT1RSAQJ0L_oSVMqBA
- Example
+== Example
* List All Services (export="true" and verb = "get|post")
[source, json]
@@ -152,6 +155,3 @@ Response +
}
}
-
-
-
[ofbiz-framework] branch release18.12 updated: Improved: German translation for OrderShoppingList Labels (OFBIZ-12208)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 583d308 Improved: German translation for OrderShoppingList Labels
(OFBIZ-12208)
583d308 is described below
commit 583d30819fd27273a7387fa43bcc83ff654400b0
Author: Wiebke Pätzold
AuthorDate: Wed Mar 24 15:21:50 2021 +0100
Improved: German translation for OrderShoppingList Labels (OFBIZ-12208)
---
applications/order/config/OrderUiLabels.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/applications/order/config/OrderUiLabels.xml
b/applications/order/config/OrderUiLabels.xml
index 63cc977..7828d3f 100644
--- a/applications/order/config/OrderUiLabels.xml
+++ b/applications/order/config/OrderUiLabels.xml
@@ -13913,9 +13913,11 @@
基於自動重下訂單新建新的送貨清單時出錯${errorString}
+Die Einkaufsliste wurde erfolgreich
erstellt.
Shopping list has been created
successfully.
+Die Einkaufsliste wurde erfolgreich
aktualisiert.
Shopping list has been updated
successfully.
[ofbiz-framework] branch trunk updated: Improved: German translation for OrderShoppingList Labels (OFBIZ-12208)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 42cc987 Improved: German translation for OrderShoppingList Labels
(OFBIZ-12208)
42cc987 is described below
commit 42cc987fdb1c975dd95de014a781d1ca602704db
Author: Wiebke Pätzold
AuthorDate: Wed Mar 24 15:21:50 2021 +0100
Improved: German translation for OrderShoppingList Labels (OFBIZ-12208)
---
applications/order/config/OrderUiLabels.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/applications/order/config/OrderUiLabels.xml
b/applications/order/config/OrderUiLabels.xml
index 30826f2..15fb2ff 100644
--- a/applications/order/config/OrderUiLabels.xml
+++ b/applications/order/config/OrderUiLabels.xml
@@ -13958,9 +13958,11 @@
基於自動重下訂單新建新的送貨清單時出錯${errorString}
+Die Einkaufsliste wurde erfolgreich
erstellt.
Shopping list has been created
successfully.
+Die Einkaufsliste wurde erfolgreich
aktualisiert.
Shopping list has been updated
successfully.
[ofbiz-tools] branch master updated: Fixed: check for remaining release parameter was wrong
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 5f4fc5a Fixed: check for remaining release parameter was wrong
new 73bbd8a Merge branch 'master' of
https://gitbox.apache.org/repos/asf/ofbiz-tools
5f4fc5a is described below
commit 5f4fc5a3ef67b5a4d067033ed5fd653022402c8c
Author: Michael Brohl
AuthorDate: Mon Mar 15 18:50:36 2021 +0100
Fixed: check for remaining release parameter was wrong
---
verify-ofbiz-release.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/verify-ofbiz-release.sh b/verify-ofbiz-release.sh
index 80bf20d..52e90d0 100755
--- a/verify-ofbiz-release.sh
+++ b/verify-ofbiz-release.sh
@@ -94,7 +94,7 @@ done
shift $(( OPTIND - 1 ))
# no remaining argument with the release name - print help and exit
-if [[ $1 -eq 0 ]] ; then
+if [ -z "$1" ] ; then
printHelp
exit 1
fi
@@ -122,6 +122,7 @@ downloadFiles () {
wget $URL/$ZIP.sha512
echo 'Done!'
+echo " "
}
verifyFiles () {
@@ -141,6 +142,8 @@ verifyFiles () {
echo "GPG verification output"
LC_MESSAGES=en_EN.UTF-8 gpg --verify $ZIP.asc $ZIP
fi
+
+echo " "
}
checkSHA () {
[ofbiz-tools] branch master updated: Improved: Enhanced the verification tool to download, verify and run integration tests automatically
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new ab7ee00 Improved: Enhanced the verification tool to download, verify
and run integration tests automatically
ab7ee00 is described below
commit ab7ee001f33253dc28373d0ac827536a5456a8f9
Author: Michael Brohl
AuthorDate: Mon Mar 15 00:46:46 2021 +0100
Improved: Enhanced the verification tool to download, verify and run
integration tests automatically
---
verify-ofbiz-release.sh | 190 +++-
1 file changed, 173 insertions(+), 17 deletions(-)
diff --git a/verify-ofbiz-release.sh b/verify-ofbiz-release.sh
index a81d85d..80bf20d 100755
--- a/verify-ofbiz-release.sh
+++ b/verify-ofbiz-release.sh
@@ -1,25 +1,154 @@
#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
# verify-ofbiz-release.sh
-# checks the given release zip file for correct md5/SHA checksums and signing
certificate
-# see https://www.apache.org/dev/release-signing.html
+# Apache OFBiz release verification tool.
+# Downloads and checks the given release zip file for correct md5/SHA
checksums
+# and signing certificate (see
https://www.apache.org/dev/release-signing.html).
+# If selected, can also automatically unpack the release, init the Gradle
warapper
+# and perform the integration tests.
+#
+# Usage: $0 [-h] [-d] [-v] [-t] [-a] [apache-ofbiz-xx.xx.xx]
+# Options
+# -h print help and exit
+# -d download release files
+# -v verify release files
+# -t run integration tests
+# -a all of the above
+#
+# to log the output to a file, do something like
+# ./verify-ofbiz-release.sh -a apache-ofbiz-17.12.06 2>&1 | tee verify.log
+
+# configuration
+VERSION=0.2
+URL='https://dist.apache.org/repos/dist/dev/ofbiz'
# color definitions for output
RED='\033[0;31m'
GRN='\033[0;32m'
NC='\033[0m' # No Color
+# Preserve original language and set en_EN
+TEMPLANG=$LANG
+LANG=en_EN.UTF-8
+
+printHelp () {
+cat <&1 | tee verify.log
+EOF
+}
+
+# np parameters at all - print help and exit
if [[ $# -eq 0 ]] ; then
-echo "Usage: $0 [apache-ofbiz-xx.xx.xx.zip]"
+printHelp
+exit 1
+fi
+
+# initialize switches
+download=false
+verify=false
+runtests=false
+
+# get options and strip from commandline
+while getopts "hdvta" option
+do
+ case $option in
+h) printHelp; exit 0 ;;
+d) download=true ;;
+v) verify=true ;;
+t) runtests=true ;;
+a) download=true; verify=true; runtests=true ;;
+?) echo "Error: option -$OPTARG is not implemented."; exit 1;;
+ esac
+done
+
+shift $(( OPTIND - 1 ))
+
+# no remaining argument with the release name - print help and exit
+if [[ $1 -eq 0 ]] ; then
+printHelp
exit 1
fi
+# remaining (last) parameter is the release name
+RELEASE=$1
+ZIP=$RELEASE.zip
+
+printHelp () {
+echo "Usage: $0 [-h] [-d] [-v] [-t] [-a] [apache-ofbiz-xx.xx.xx]"
+echo "Options:"
+echo "-h print help and exit"
+echo "-d download release files"
+echo "-v verify release files"
+echo "-t run integration tests"
+echo "-a all of the above"
+}
+
+downloadFiles () {
+echo "Downloading files for $ZIP..."
+
+wget $URL/KEYS
+wget $URL/$ZIP
+wget $URL/$ZIP.asc
+wget $URL/$ZIP.sha512
+
+echo 'Done!'
+}
+
+verifyFiles () {
+echo "Verifying files..."
+
+if [ ! -f $ZIP.sha512 ];
+then
+echo -e "${RED}skipping sha check!${NC} (sha checksum file $ZIP.sha512
not found)\n"
+else
+checkSHA $ZIP
+fi
+
+if [ ! -f $ZIP.asc ];
+then
+echo -e "${RED}skipping signature check!${NC} (signature file $ZIP.asc
not found)"
+else
+echo "GPG verification output"
+LC_MESSAGES=en_EN.UTF-8 gpg --verify $ZIP.asc $ZIP
+fi
+}
+
checkSHA () {
[ofbiz-framework] branch release18.12 updated: Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git The following commit(s) were added to refs/heads/release18.12 by this push: new 94265fd Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192) 94265fd is described below commit 94265fdb917982a66697ea285e7ed5a8ca581f3c Author: Michael Brohl AuthorDate: Sat Mar 13 16:12:32 2021 +0100 Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192) Changes script to use the proper Gradle wrapper version. Changes the download url from Bintray to Gradle GitHub repository and removes the backup link. Adjusts the sha checksums accordingly. The Gradle download link pulls a gradle-wrapper.properties file which references services.gradle.org/distributions/gradle-5.0-rc-5-bin.zip instead of a 5.0.0 distribution. This was left this way for consistency. --- gradle/init-gradle-wrapper.sh| 5 ++--- gradle/wrapper/gradle-wrapper.jar| Bin 55741 -> 55759 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle/init-gradle-wrapper.sh b/gradle/init-gradle-wrapper.sh index c8ac130..cad3b9b 100755 --- a/gradle/init-gradle-wrapper.sh +++ b/gradle/init-gradle-wrapper.sh @@ -23,12 +23,11 @@ GRADLE_WRAPPER_OFBIZ_PATH="$GRADLE_OFBIZ_PATH/wrapper" # version and uri to download the wrapper RELEASE="5.0.0" -GRADLE_WRAPPER_URI="https://dl.bintray.com/apacheofbiz/GradleWrapper/v$RELEASE/; -GRADLE_WRAPPER_URI_BACKUP="https://github.com/gradle/gradle/raw/v$RELEASE/gradle/wrapper/; +GRADLE_WRAPPER_URI="https://github.com/gradle/gradle/raw/v$RELEASE/gradle/wrapper/; # checksum to verify the downloaded file SHASUM_GRADLE_WRAPPER_FILES="1d23286bcb9e7d3debff18c1b892b9dbb9a4ec6c gradle/wrapper/gradle-wrapper.jar -f9c2ad227ef1fe774cb0e141abfc431b05fc9fd4 gradle/wrapper/gradle-wrapper.properties +7895f7f8ded9986d4f13b14a35b1842e47771541 gradle/wrapper/gradle-wrapper.properties b4a6a7e1dca81a692a775193fada937e035265f3 gradlew" GRADLE_WRAPPER_JAR="gradle-wrapper.jar" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 457aad0..df1d7c1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 75b8c7c..2be2301 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-rc-5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists
[ofbiz-framework] branch trunk updated: Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new e08bfa1 Fixed: Replace Bintray by a new place to upload the Gradle
Wrapper (OFBIZ-12192)
e08bfa1 is described below
commit e08bfa17cb3cf72ad34f87e3492bbc90eeac885e
Author: Michael Brohl
AuthorDate: Sat Mar 13 16:02:42 2021 +0100
Fixed: Replace Bintray by a new place to upload the Gradle Wrapper
(OFBIZ-12192)
Changes script to use the proper Gradle wrapper version. Changes the
download url from Bintray to Gradle GitHub repository and removes the
backup link. Adjusts the sha checksums accordingly.
The Gradle download link pulls a gradle-wrapper.properties file which
references services.gradle.org/distributions/gradle-6.5-bin.zip instead
of a 6.5.1 distribution. This was left this way for consistency.
---
gradle/init-gradle-wrapper.sh| 14 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/gradle/init-gradle-wrapper.sh b/gradle/init-gradle-wrapper.sh
index 40641a5..a8c2d34 100755
--- a/gradle/init-gradle-wrapper.sh
+++ b/gradle/init-gradle-wrapper.sh
@@ -22,13 +22,12 @@ GRADLE_OFBIZ_PATH="$OFBIZ_HOME/gradle"
GRADLE_WRAPPER_OFBIZ_PATH="$GRADLE_OFBIZ_PATH/wrapper"
# version and uri to download the wrapper
-RELEASE="5.0.0"
-GRADLE_WRAPPER_URI="https://dl.bintray.com/apacheofbiz/GradleWrapper/v$RELEASE/;
-GRADLE_WRAPPER_URI_BACKUP="https://github.com/gradle/gradle/raw/v$RELEASE/gradle/wrapper/;
+RELEASE="6.5.1"
+GRADLE_WRAPPER_URI="https://github.com/gradle/gradle/raw/v$RELEASE/gradle/wrapper/;
# checksum to verify the downloaded file
-SHASUM_GRADLE_WRAPPER_FILES="1d23286bcb9e7d3debff18c1b892b9dbb9a4ec6c
gradle/wrapper/gradle-wrapper.jar
-f9c2ad227ef1fe774cb0e141abfc431b05fc9fd4
gradle/wrapper/gradle-wrapper.properties
+SHASUM_GRADLE_WRAPPER_FILES="33b0acb4572934fc1dd7d5880c65036724974e06
gradle/wrapper/gradle-wrapper.jar
+b76cfc82d574180f435b4bd9d4b0f29a3c32294b
gradle/wrapper/gradle-wrapper.properties
67bc176bca816684cf5218570a931f57d5f2b423 gradlew"
GRADLE_WRAPPER_JAR="gradle-wrapper.jar"
@@ -55,12 +54,9 @@ downloadFile() {
return 1
}
-# Download the file from the main URI; if the download fails then use the
backup URI
+# Download the file from the main URI
resolveFile() {
downloadFile $1 $GRADLE_WRAPPER_URI;
- if [ $? -eq 1 ]; then
- downloadFile $1 $GRADLE_WRAPPER_URI_BACKUP;
- fi
}
echo " === Prepare operation ===";
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc..622ab64 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
[ofbiz-framework] 02/03: Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 58f2b14ee85c4387c6af5177fc2c0521e4cc8968
Author: Michael Brohl
AuthorDate: Sat Mar 13 09:14:05 2021 +0100
Fixed: Replace Bintray by a new place to upload the Gradle Wrapper
(OFBIZ-12192)
Changed script to use the proper Gradle wrapper version. Changed the
download url from Bintray to Gradle GitHub repository and removed the
backup link.
---
gradle/init-gradle-wrapper.sh | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/gradle/init-gradle-wrapper.sh b/gradle/init-gradle-wrapper.sh
index 82e3b44..a7ac045 100755
--- a/gradle/init-gradle-wrapper.sh
+++ b/gradle/init-gradle-wrapper.sh
@@ -22,18 +22,17 @@ GRADLE_OFBIZ_PATH="$OFBIZ_HOME/gradle"
GRADLE_WRAPPER_OFBIZ_PATH="$GRADLE_OFBIZ_PATH/wrapper"
# version and uri to download the wrapper
-RELEASE="3.2.1"
-GRADLE_WRAPPER_URI="https://dl.bintray.com/apacheofbiz/GradleWrapper/v$RELEASE/;
-GRADLE_WRAPPER_URI_BACKUP="https://github.com/gradle/gradle/raw/v$RELEASE/gradle/wrapper/;
+RELEASE="4.5.1"
+GRADLE_WRAPPER_URI="https://github.com/gradle/gradle/raw/v$RELEASE/gradle/wrapper/;
# checksum to verify the downloaded file
-SHASUM_GRADLE_WRAPPER_FILES="12478d9829998a5433231ad971bae52978279a3d
gradle/wrapper/gradle-wrapper.jar
-05d4ab69d3f2143e017710b0917b740f75a75c07
gradle/wrapper/gradle-wrapper.properties
+SHASUM_GRADLE_WRAPPER_FILES="00d0743607178962f8b120da4ccad2c64c698aec
gradle/wrapper/gradle-wrapper.jar
+609c5f1fbbc2ec3feeaf1c8f7183f810e9e8b22e
gradle/wrapper/gradle-wrapper.properties
aaa5fb4c074407cb4d7f8c89a80342f3130880c3 gradlew"
GRADLE_WRAPPER_JAR="gradle-wrapper.jar"
GRADLE_WRAPPER_PROPERTIES="gradle-wrapper.properties"
-GRADLE_WRAPPER_FILES="$GRADLE_WRAPPER_JAR $GRADLE_WRAPPER_PROPERTIES"
+GRADLE_WRAPPER_FILES="$GRADLE_WRAPPER_JAR"
GRADLE_WRAPPER_SCRIPT="gradlew"
whereIsBinary() {
@@ -55,12 +54,9 @@ downloadFile() {
return 1
}
-# Download the file from the main URI; if the download fails then use the
backup URI
+# Download the file from the main URI
resolveFile() {
downloadFile $1 $GRADLE_WRAPPER_URI;
- if [ $? -eq 1 ]; then
- downloadFile $1 $GRADLE_WRAPPER_URI_BACKUP;
- fi
}
echo " === Prepare operation ===";
[ofbiz-framework] branch release17.12 updated (c32abb8 -> 9c0c433)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from c32abb8 Fixed: Use Labels in themes names (OFBIZ-9863) new 20e1e1f Improved: Upgrade Gradle to version 4.5.1 for the jcenter to mavenCentral migration (OFBIZ-12171) new 58f2b14 Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192) new 9c0c433 Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gradle/init-gradle-wrapper.ps1| 7 ++- gradle/init-gradle-wrapper.sh | 16 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 54227 -> 54351 bytes 3 files changed, 8 insertions(+), 15 deletions(-)
[ofbiz-framework] 01/03: Improved: Upgrade Gradle to version 4.5.1 for the jcenter to mavenCentral migration (OFBIZ-12171)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 20e1e1fae737f5ec6c186d6391b51267d3ef10ce Author: Michael Brohl AuthorDate: Sat Mar 13 08:49:41 2021 +0100 Improved: Upgrade Gradle to version 4.5.1 for the jcenter to mavenCentral migration (OFBIZ-12171) --- gradle/wrapper/gradle-wrapper.jar | Bin 54227 -> 54351 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 51288f9..fa0e5f1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
[ofbiz-framework] 03/03: Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 9c0c43365f70558f1eee00d20dae60d24ddc8320
Author: Michael Brohl
AuthorDate: Sat Mar 13 09:16:03 2021 +0100
Fixed: Replace Bintray by a new place to upload the Gradle Wrapper
(OFBIZ-12192)
Changed Windows powershell script to use the proper Gradle wrapper
version. Removed the properties and batch file download.
---
gradle/init-gradle-wrapper.ps1 | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/gradle/init-gradle-wrapper.ps1 b/gradle/init-gradle-wrapper.ps1
index 883259c..73dd083 100644
--- a/gradle/init-gradle-wrapper.ps1
+++ b/gradle/init-gradle-wrapper.ps1
@@ -15,13 +15,10 @@
# specific language governing permissions and limitations
# under the License.
-if ((Test-Path -Path ((Get-Item -Path ".\").FullName +
"\gradle\wrapper\gradle-wrapper.jar")) -and (Test-Path -Path ((Get-Item -Path
".\").FullName + "\gradle\wrapper\gradle-wrapper.properties"))) {
+if ((Test-Path -Path ((Get-Item -Path ".\").FullName +
"\gradle\wrapper\gradle-wrapper.jar"))) {
Write-Host "The Gradle Wrapper has already been downloaded.";
exit
}
# HTTPS is not used because it gets complicated with Powershell and .Net
framework versions depending on Windows versions
-Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.jar
http://dl.bintray.com/apacheofbiz/GradleWrapper/v3.2.1/gradle-wrapper.jar
-Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.properties
http://dl.bintray.com/apacheofbiz/GradleWrapper/v3.2.1/gradle-wrapper.properties
-Invoke-WebRequest -outf gradlew.bat
http://dl.bintray.com/apacheofbiz/GradleWrapper/v3.2.1/gradlew.bat
-
+Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.jar
https://github.com/gradle/gradle/raw/v4.5.1/gradle/wrapper/gradle-wrapper.jar
[ofbiz-framework] 03/03: Improved: Switch from jCenter to mavenCentral to handle the jCenter shutdown (OFBIZ-12171)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit ec4bff76a0dabf8f3be44606d3707c79b2fc5a8d
Author: Michael Brohl
AuthorDate: Thu Feb 18 21:58:42 2021 +0100
Improved: Switch from jCenter to mavenCentral to handle the jCenter
shutdown (OFBIZ-12171)
---
build.gradle | 43 ++-
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/build.gradle b/build.gradle
index e301d16..a0c915a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,10 @@ import org.asciidoctor.gradle.AsciidoctorTask
* */
buildscript {
repositories {
-jcenter()
+mavenCentral()
+maven {
+url "https://plugins.gradle.org/m2/;
+}
}
dependencies {
classpath 'at.bxm.gradleplugins:gradle-svntools-plugin:2.2.1'
@@ -79,8 +82,34 @@ defaultTasks 'build'
allprojects {
repositories{
-jcenter()
-mavenLocal()
+mavenCentral()
+// the switch from jCenter to mavenCentral needs some additional
repositories to be configured here
+// this should be checked frequently to remove obsolete configurations
if the artifacts are available
+// on mavenCentral directly
+maven {
+// org.restlet and org.restlet.ext.servlet
+url "https://maven.restlet.talend.com;
+}
+maven {
+// apache-xerces:xercesImpl:2.9.1
+url "https://maven.repository.redhat.com/ga/;
+}
+maven {
+// net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12
+url "https://packages.atlassian.com/maven-3rdparty;
+}
+maven {
+// org/milyn/flute/1.3/flute-1.3.jar
+// need artifact only because of wrong pom metadata in maven
central
+url "https://repo1.maven.org/maven2;
+metadataSources {
+artifact()
+}
+}
+maven {
+// com.springsource.com.sun.syndication
+url "https://repo.spring.io/plugins-release;
+}
}
}
@@ -116,7 +145,7 @@ dependencies {
compile 'com.ibm.icu:icu4j:60.2'
compile 'com.lowagie:itext:2.1.7' // Don't update due to license change in
newer versions, see OFBIZ-10455
compile 'com.sun.mail:javax.mail:1.6.0'
-compile 'com.sun.syndication:com.springsource.com.sun.syndication:0.9.0'
+compile 'com.sun.syndication:com.springsource.com.sun.syndication:1.0.0'
compile 'com.thoughtworks.xstream:xstream:1.4.10'
compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
@@ -127,12 +156,15 @@ dependencies {
compile 'javax.servlet:javax.servlet-api:4.0.0'
compile 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02'
compile 'junit:junit-dep:4.11'
-compile 'net.fortuna.ical4j:ical4j:1.0-rc3-atlassian-11'
+compile 'net.fortuna.ical4j:ical4j:1.0-rc4-atlassian-12'
compile 'org.apache.ant:ant-junit:1.10.1'
compile 'org.apache.axis2:axis2-kernel:1.7.7'
compile 'org.apache.commons:commons-collections4:4.1'
compile 'org.apache.commons:commons-csv:1.5'
compile 'org.apache.commons:commons-dbcp2:2.1.1'
+compile ('commons-io:commons-io:2.5') {
+force = true
+}
compile 'org.apache.commons:commons-text:1.6'
compile 'org.apache.geronimo.components:geronimo-transaction:3.1.4'
compile 'org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1'
@@ -177,6 +209,7 @@ dependencies {
runtime 'org.apache.logging.log4j:log4j-core:2.10.0' // the implementation
of the log4j 2 API
runtime 'org.apache.logging.log4j:log4j-jul:2.10.0' // for external jars
using the java.util.logging: routes logging to log4j 2
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' // for external
jars using slf4j: routes logging to log4j 2
+runtime 'org.apache.logging.log4j:log4j-jcl:2.10.0' // need to constrain
to version to avoid classpath conflict (ReflectionUtil)
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
// plugin libs
[ofbiz-framework] branch release17.12 updated (392f18f -> ec4bff7)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from 392f18f Improved: Enlarge the "more-app" menu in Rainbow Stome theme (OFBIZ-12181) new 2b8f4f8 Fixed: Corrects wrong API use for Collections and Arrays new d6c6330 Improved: Upgrades Gradle due to the jCenter to mavenCentral migration (OFBIZ-12171) new ec4bff7 Improved: Switch from jCenter to mavenCentral to handle the jCenter shutdown (OFBIZ-12171) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/ofbiz/content/data/DataServices.java| 2 +- .../ofbiz/securityext/login/LoginEvents.java | 3 +- build.gradle | 43 +++--- .../ofbiz/base/container/ContainerLoader.java | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 42 insertions(+), 10 deletions(-)
[ofbiz-framework] 02/03: Improved: Upgrades Gradle due to the jCenter to mavenCentral migration (OFBIZ-12171)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit d6c6330b390a96bdf6a7d65573117b693455c685 Author: Michael Brohl AuthorDate: Thu Feb 18 21:57:35 2021 +0100 Improved: Upgrades Gradle due to the jCenter to mavenCentral migration (OFBIZ-12171) --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19894ea..554ced3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -22,4 +22,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip
[ofbiz-framework] 01/03: Fixed: Corrects wrong API use for Collections and Arrays
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a commit to branch release17.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git commit 2b8f4f8b64a7d82d5ac4ae3d5f3a144982a8876d Author: Michael Brohl AuthorDate: Thu Feb 18 21:56:00 2021 +0100 Fixed: Corrects wrong API use for Collections and Arrays edu.emory.mathcs.backport.java.util.* instead of java.util.* which was spotted during the jCenter to mavenCentral migration. --- .../src/main/java/org/apache/ofbiz/content/data/DataServices.java | 2 +- .../src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java | 3 +-- .../src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java index 4e8e23c..2b30528 100644 --- a/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java +++ b/applications/content/src/main/java/org/apache/ofbiz/content/data/DataServices.java @@ -28,6 +28,7 @@ import java.io.StringWriter; import java.io.Writer; import java.nio.ByteBuffer; import java.sql.Timestamp; +import java.util.Arrays; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -50,7 +51,6 @@ import org.apache.ofbiz.service.GenericServiceException; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.service.ServiceUtil; -import edu.emory.mathcs.backport.java.util.Arrays; /** * DataServices Class diff --git a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java index 3565826..86b448e 100644 --- a/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java +++ b/applications/securityext/src/main/java/org/apache/ofbiz/securityext/login/LoginEvents.java @@ -21,6 +21,7 @@ package org.apache.ofbiz.securityext.login; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.Locale; @@ -58,8 +59,6 @@ import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.service.ModelService; import org.apache.ofbiz.webapp.control.LoginWorker; -import edu.emory.mathcs.backport.java.util.Arrays; - /** * LoginEvents - Events for UserLogin and Security handling. */ diff --git a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java index 619c52c..8a3e594 100644 --- a/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java +++ b/framework/base/src/main/java/org/apache/ofbiz/base/container/ContainerLoader.java @@ -20,6 +20,7 @@ package org.apache.ofbiz.base.container; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -32,7 +33,6 @@ import org.apache.ofbiz.base.start.StartupLoader; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; -import edu.emory.mathcs.backport.java.util.Collections; /** * An object that loads containers (background processes).
[ofbiz-framework] 03/04: Fixed: Add missing dependency for the build (OFBIZ-12171)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 9a7d471e08f826856659b709d50708d38251dae2
Author: Michael Brohl
AuthorDate: Sun Feb 14 11:04:37 2021 +0100
Fixed: Add missing dependency for the build (OFBIZ-12171)
---
build.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.gradle b/build.gradle
index ea9dd40..820dbd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -236,6 +236,7 @@ dependencies {
runtime 'org.apache.logging.log4j:log4j-core:2.11.1' // the implementation
of the log4j 2 API
runtime 'org.apache.logging.log4j:log4j-jul:2.11.1' // for external jars
using the java.util.logging: routes logging to log4j 2
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1' // for external
jars using slf4j: routes logging to log4j 2
+runtime 'org.apache.logging.log4j:log4j-jcl:2.14.0' // need to constrain
to version to avoid classpath conflict (ReflectionUtil)
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
// plugin libs
[ofbiz-framework] 04/04: Improved: Corrects the log4j-jcl version to match the other log4j libraries (OFBIZ-12171)
This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit d395d0f78f49f5ff0119816afee88d4e05262d42
Author: Michael Brohl
AuthorDate: Sun Feb 21 00:19:28 2021 +0100
Improved: Corrects the log4j-jcl version to match the other log4j
libraries (OFBIZ-12171)
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 820dbd6..c81724a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -236,7 +236,7 @@ dependencies {
runtime 'org.apache.logging.log4j:log4j-core:2.11.1' // the implementation
of the log4j 2 API
runtime 'org.apache.logging.log4j:log4j-jul:2.11.1' // for external jars
using the java.util.logging: routes logging to log4j 2
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1' // for external
jars using slf4j: routes logging to log4j 2
-runtime 'org.apache.logging.log4j:log4j-jcl:2.14.0' // need to constrain
to version to avoid classpath conflict (ReflectionUtil)
+runtime 'org.apache.logging.log4j:log4j-jcl:2.11.1' // need to constrain
to version to avoid classpath conflict (ReflectionUtil)
runtime 'org.codeartisans.thirdparties.swing:batik-all:1.8pre-r1084380'
// plugin libs
[ofbiz-framework] branch release18.12 updated (aa4c6a8 -> d395d0f)
This is an automated email from the ASF dual-hosted git repository. mbrohl pushed a change to branch release18.12 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git. from aa4c6a8 Improved: Enlarge the "more-app" menu in Rainbow Stome theme (OFBIZ-12181) new 80a01d4 Fixed: Corrects wrong API use for Collections and Arrays new f53ea72 Improved: Switch from jCenter to mavenCentral to handle the jCenter shutdown (OFBIZ-12171) new 9a7d471 Fixed: Add missing dependency for the build (OFBIZ-12171) new d395d0f Improved: Corrects the log4j-jcl version to match the other log4j libraries (OFBIZ-12171) The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/ofbiz/content/data/DataServices.java| 3 +- build.gradle | 40 +++--- .../ofbiz/base/container/ContainerLoader.java | 3 +- 3 files changed, 37 insertions(+), 9 deletions(-)
