This is an automated email from the ASF dual-hosted git repository.
mridulpathak 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 dda00100d3 Remove defunct eBay integration and its references
(OFBIZ-13454)
dda00100d3 is described below
commit dda00100d376993d889112d98e77532f03c8b681
Author: Mridul Pathak <[email protected]>
AuthorDate: Wed Jul 22 19:21:07 2026 +0530
Remove defunct eBay integration and its references (OFBIZ-13454)
---
.../accounting/config/AccountingEntityLabels.xml | 7 ---
.../data/OfbizSetupChartOfAccountsData.xml | 2 -
.../_include/HELP_GlAccountNrPaymentMethod.adoc | 3 +-
.../commonext/data/OfbizSetupGlAccountData.xml | 1 -
.../datamodel/data/demo/AccountingDemoData.xml | 2 -
.../datamodel/data/seed/AccountingSeedData.xml | 1 -
applications/datamodel/data/seed/OrderSeedData.xml | 1 -
.../datamodel/data/seed/ProductSeedData.xml | 1 -
.../product/config/ProductEntityLabels.xml | 15 -----
.../product/inventory/InventoryReserveServices.xml | 71 ++++++++++------------
.../ofbiz/product/catalog/CatalogWorker.java | 3 -
.../product/product/ProductSearchSession.java | 3 -
framework/base/dtd/ofbiz-component.xsd | 14 ++---
framework/common/config/CommonEntityLabels.xml | 15 -----
framework/common/config/CommonUiLabels.xml | 9 ---
framework/security/config/SecurityEntityLabels.xml | 7 ---
.../webtools/labelmanager/LabelManagerFactory.java | 1 -
17 files changed, 39 insertions(+), 117 deletions(-)
diff --git a/applications/accounting/config/AccountingEntityLabels.xml
b/applications/accounting/config/AccountingEntityLabels.xml
index a52242d7da..a6efd52ca5 100644
--- a/applications/accounting/config/AccountingEntityLabels.xml
+++ b/applications/accounting/config/AccountingEntityLabels.xml
@@ -4982,13 +4982,6 @@
<value xml:lang="zh">到货付款</value>
<value xml:lang="zh-TW">到貨付款</value>
</property>
- <property key="PaymentMethodType.description.EXT_EBAY">
- <value xml:lang="ar">eBay</value>
- <value xml:lang="de">eBay</value>
- <value xml:lang="en">eBay</value>
- <value xml:lang="th">อีเบย์</value>
- <value xml:lang="zh">eBay</value>
- </property>
<property key="PaymentMethodType.description.EXT_OFFLINE">
<value xml:lang="ar">دفعة offline</value>
<value xml:lang="de">Offline Zahlung</value>
diff --git a/applications/accounting/data/OfbizSetupChartOfAccountsData.xml
b/applications/accounting/data/OfbizSetupChartOfAccountsData.xml
index 3c1921cd44..c8d1da497e 100644
--- a/applications/accounting/data/OfbizSetupChartOfAccountsData.xml
+++ b/applications/accounting/data/OfbizSetupChartOfAccountsData.xml
@@ -196,7 +196,6 @@ under the License.
<PaymentMethodType paymentMethodTypeId="COMPANY_ACCOUNT"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_BILLACT"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_COD"
defaultGlAccountId="122000"/>
- <PaymentMethodType paymentMethodTypeId="EXT_EBAY"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_OFFLINE"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_PAYPAL"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_WORLDPAY"
defaultGlAccountId="122000"/>
@@ -357,7 +356,6 @@ under the License.
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="COMPANY_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_BILLACT" glAccountId="213000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_COD" glAccountId="112000"/>
- <PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_EBAY" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_OFFLINE" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_PAYPAL" glAccountId="122500"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_WORLDPAY" glAccountId="122500"/>
diff --git
a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc
b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc
index 8854165485..105dbe4f15 100644
---
a/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc
+++
b/applications/accounting/src/docs/asciidoc/_include/HELP_GlAccountNrPaymentMethod.adoc
@@ -27,7 +27,7 @@ A main GL account used would be the one that represents the
Company bank account
In the demo data mappings Electronic Funds Transfer, Company Account,
Financial Account are all linked
to the Company bank account GL account.
-OFBiz demo data defines 15 different payment methods as follows:
+OFBiz demo data defines 14 different payment methods as follows:
* Cash
* Certified Cheque
@@ -38,7 +38,6 @@ OFBiz demo data defines 15 different payment methods as
follows:
A direct debit is controlled by the payee and an automatic payment via
bank account is controlled by the payer)
* Billing Account
* Cash on Delivery (COD)
-* eBay
* Offline Payment +
(NOTE: Is this ambiguous - since COD is an offline payment...)
* PayPal
diff --git a/applications/commonext/data/OfbizSetupGlAccountData.xml
b/applications/commonext/data/OfbizSetupGlAccountData.xml
index 650a017330..4e690fbb61 100644
--- a/applications/commonext/data/OfbizSetupGlAccountData.xml
+++ b/applications/commonext/data/OfbizSetupGlAccountData.xml
@@ -132,7 +132,6 @@
<PaymentMethodTypeGlAccount organizationPartyId="${orgPartyId}"
paymentMethodTypeId="COMPANY_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="${orgPartyId}"
paymentMethodTypeId="EXT_BILLACT" glAccountId="213000"/>
<PaymentMethodTypeGlAccount organizationPartyId="${orgPartyId}"
paymentMethodTypeId="EXT_COD" glAccountId="112000"/>
- <PaymentMethodTypeGlAccount organizationPartyId="${orgPartyId}"
paymentMethodTypeId="EXT_EBAY" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="${orgPartyId}"
paymentMethodTypeId="EXT_OFFLINE" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="${orgPartyId}"
paymentMethodTypeId="EXT_PAYPAL" glAccountId="122500"/>
<PaymentMethodTypeGlAccount organizationPartyId="${orgPartyId}"
paymentMethodTypeId="EXT_WORLDPAY" glAccountId="122500"/>
diff --git a/applications/datamodel/data/demo/AccountingDemoData.xml
b/applications/datamodel/data/demo/AccountingDemoData.xml
index 0c0d1bdca7..ff9ac264fe 100644
--- a/applications/datamodel/data/demo/AccountingDemoData.xml
+++ b/applications/datamodel/data/demo/AccountingDemoData.xml
@@ -627,7 +627,6 @@ under the License.
<PaymentMethodType paymentMethodTypeId="COMPANY_ACCOUNT"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_BILLACT"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_COD"
defaultGlAccountId="122000"/>
- <PaymentMethodType paymentMethodTypeId="EXT_EBAY"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_OFFLINE"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_PAYPAL"
defaultGlAccountId="122000"/>
<PaymentMethodType paymentMethodTypeId="EXT_WORLDPAY"
defaultGlAccountId="122000"/>
@@ -788,7 +787,6 @@ under the License.
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="COMPANY_ACCOUNT" glAccountId="111100"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_BILLACT" glAccountId="213000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_COD" glAccountId="112000"/>
- <PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_EBAY" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_OFFLINE" glAccountId="112000"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_PAYPAL" glAccountId="122500"/>
<PaymentMethodTypeGlAccount organizationPartyId="Company"
paymentMethodTypeId="EXT_WORLDPAY" glAccountId="122500"/>
diff --git a/applications/datamodel/data/seed/AccountingSeedData.xml
b/applications/datamodel/data/seed/AccountingSeedData.xml
index 3fe5318a3e..6dbc5cfbcb 100644
--- a/applications/datamodel/data/seed/AccountingSeedData.xml
+++ b/applications/datamodel/data/seed/AccountingSeedData.xml
@@ -706,7 +706,6 @@ under the License.
<PaymentMethodType description="Company Account"
paymentMethodTypeId="COMPANY_ACCOUNT"/>
<PaymentMethodType description="Billing Account"
paymentMethodTypeId="EXT_BILLACT"/>
<PaymentMethodType description="Cash On Delivery"
paymentMethodTypeId="EXT_COD"/>
- <PaymentMethodType description="eBay" paymentMethodTypeId="EXT_EBAY"/>
<PaymentMethodType description="Offline Payment"
paymentMethodTypeId="EXT_OFFLINE"/>
<PaymentMethodType description="PayPal" paymentMethodTypeId="EXT_PAYPAL"/>
<PaymentMethodType description="RBS WorldPay"
paymentMethodTypeId="EXT_WORLDPAY"/>
diff --git a/applications/datamodel/data/seed/OrderSeedData.xml
b/applications/datamodel/data/seed/OrderSeedData.xml
index 106a613051..8c20db87fc 100644
--- a/applications/datamodel/data/seed/OrderSeedData.xml
+++ b/applications/datamodel/data/seed/OrderSeedData.xml
@@ -81,7 +81,6 @@ under the License.
<Enumeration description="E-Mail Channel" enumCode="EMAIL_CHANNEL"
enumId="EMAIL_SALES_CHANNEL" sequenceId="05" enumTypeId="ORDER_SALES_CHANNEL"/>
<Enumeration description="Snail Mail Channel" enumCode="SNAIL_CHANNEL"
enumId="SNAIL_SALES_CHANNEL" sequenceId="06" enumTypeId="ORDER_SALES_CHANNEL"/>
<Enumeration description="Affiliate Channel" enumCode="AFFIL_CHANNEL"
enumId="AFFIL_SALES_CHANNEL" sequenceId="07" enumTypeId="ORDER_SALES_CHANNEL"/>
- <Enumeration description="eBay Channel" enumCode="EBAY_CHANNEL"
enumId="EBAY_SALES_CHANNEL" sequenceId="08" enumTypeId="ORDER_SALES_CHANNEL"/>
<Enumeration description="Unknown Channel" enumCode="UNKOWN_CHANNEL"
enumId="UNKNWN_SALES_CHANNEL" sequenceId="99" enumTypeId="ORDER_SALES_CHANNEL"/>
<EnumerationType description="Order Item Change Type"
enumTypeId="ODR_ITM_CHANGE_TYPE" hasTable="N"/>
<Enumeration description="Order Item Update" enumCode="ITM_UPDATE"
enumId="ODR_ITM_UPDATE" sequenceId="01" enumTypeId="ODR_ITM_CHANGE_TYPE"/>
diff --git a/applications/datamodel/data/seed/ProductSeedData.xml
b/applications/datamodel/data/seed/ProductSeedData.xml
index fd902ccfa9..c4e2af3ee3 100644
--- a/applications/datamodel/data/seed/ProductSeedData.xml
+++ b/applications/datamodel/data/seed/ProductSeedData.xml
@@ -60,7 +60,6 @@ under the License.
<ProdCatalogCategoryType description="View Allow (One)"
prodCatalogCategoryTypeId="PCCT_VIEW_ALLW"/>
<ProdCatalogCategoryType description="Purchase Allow (One)"
prodCatalogCategoryTypeId="PCCT_PURCH_ALLW"/>
<ProdCatalogCategoryType description="Admin Allow (One)"
prodCatalogCategoryTypeId="PCCT_ADMIN_ALLW"/>
- <ProdCatalogCategoryType description="Ebay Root (One)"
prodCatalogCategoryTypeId="PCCT_EBAY_ROOT"/>
<ProdCatalogCategoryType description="Best Selling (One)"
prodCatalogCategoryTypeId="PCCT_BEST_SELL"/>
<ProductAssocType description="Also Bought" hasTable="N"
productAssocTypeId="ALSO_BOUGHT"/>
diff --git a/applications/product/config/ProductEntityLabels.xml
b/applications/product/config/ProductEntityLabels.xml
index ed978262ac..14d241a682 100644
--- a/applications/product/config/ProductEntityLabels.xml
+++ b/applications/product/config/ProductEntityLabels.xml
@@ -569,16 +569,6 @@
<value xml:lang="zh">浏览根 (一个)</value>
<value xml:lang="zh-TW">瀏覽根 (一個)</value>
</property>
- <property key="ProdCatalogCategoryType.description.PCCT_EBAY_ROOT">
- <value xml:lang="de">Ebay Root (Eine)</value>
- <value xml:lang="en">Ebay Root (One)</value>
- <value xml:lang="es">Raíz de Ebay (uno)</value>
- <value xml:lang="fr">Ebay Root (Un)</value>
- <value xml:lang="ja">Epayルート(1)</value>
- <value xml:lang="vi">Thư mục gốc Ebay (duy nhất)</value>
- <value xml:lang="zh">eBay根（一个）</value>
- <value xml:lang="zh-TW">eBay根(一個)</value>
- </property>
<property key="ProdCatalogCategoryType.description.PCCT_MOST_POPULAR">
<value xml:lang="de">Am populärsten (Eine)</value>
<value xml:lang="en">Most Popular (One)</value>
@@ -1993,11 +1983,6 @@
<value xml:lang="zh">警告</value>
<value xml:lang="zh-TW">警告</value>
</property>
- <property key="ProductContentType.description.EBAY_DESCRIPTION">
- <value xml:lang="en">Detail Page for eBay Auctions</value>
- <value xml:lang="es">Página de detalles para subastas de eBay</value>
- <value xml:lang="fr">Page de ventes aux enchères eBay.</value>
- </property>
<property key="ProductContentType.description.META_DESCRIPTION">
<value xml:lang="en">Meta Description</value>
<value xml:lang="es">Metadescripción</value>
diff --git
a/applications/product/minilang/product/inventory/InventoryReserveServices.xml
b/applications/product/minilang/product/inventory/InventoryReserveServices.xml
index c556ab1d0c..2111952e83 100644
---
a/applications/product/minilang/product/inventory/InventoryReserveServices.xml
+++
b/applications/product/minilang/product/inventory/InventoryReserveServices.xml
@@ -508,12 +508,6 @@ under the License.
</if-compare>
</if-compare>
<if-compare field="inventoryItem.inventoryItemTypeId"
operator="equals" value="NON_SERIAL_INV_ITEM">
- <!-- check reasonenumId reserve for ebay inventory -->
- <if-not-empty field="parameters.reserveReasonEnumId">
- <if-compare field="parameters.reserveReasonEnumId"
value="EBAY_INV_RES" operator="equals">
- <set field="ebayReserveReasonEnumId"
from-field="parameters.reserveReasonEnumId"/>
- </if-compare>
- </if-not-empty>
<!-- reduce atp on inventoryItem if availableToPromise greater
than 0, if not the code at the end of this method will handle it -->
<if>
<condition>
@@ -540,44 +534,41 @@ under the License.
<calcop operator="negative"
field="parameters.deductAmount"/>
</calculate>
<set from-field="parameters.workEffortId"
field="createDetailMap.workEffortId"/>
- <if-not-empty field="ebayReserveReasonEnumId"><set
from-field="parameters.reserveReasonEnumId"
field="createDetailMap.reasonEnumId"/></if-not-empty>
<call-service service-name="createInventoryItemDetail"
in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>
- <!-- create OrderItemShipGrpInvRes record and check
for reserved from ebay don't need shipgroup-->
- <if-empty field="ebayReserveReasonEnumId">
- <if-not-empty field="orderHeader">
- <call-simple-method
method-name="getPromisedDateTime"/>
- <set from-field="parameters.orderId"
field="reserveOisgirMap.orderId"/>
- <set from-field="parameters.orderItemSeqId"
field="reserveOisgirMap.orderItemSeqId"/>
- <set from-field="parameters.shipGroupSeqId"
field="reserveOisgirMap.shipGroupSeqId"/>
- <set from-field="inventoryItem.inventoryItemId"
field="reserveOisgirMap.inventoryItemId"/>
- <set from-field="parameters.reserveOrderEnumId"
field="reserveOisgirMap.reserveOrderEnumId"/>
- <set from-field="parameters.reservedDatetime"
field="reserveOisgirMap.reservedDatetime"/>
- <set from-field="parameters.deductAmount"
field="reserveOisgirMap.quantity" type="BigDecimal"/>
- <set from-field="promisedDatetime"
field="reserveOisgirMap.promisedDatetime"/>
- <set from-field="parameters.priority"
field="reserveOisgirMap.priority"/>
- <if-not-empty field="parameters.sequenceId">
- <set field="reserveOisgirMap.sequenceId"
from-field="parameters.sequenceId"/>
- </if-not-empty>
- <call-service
service-name="reserveOrderItemInventory" in-map-name="reserveOisgirMap"/>
- <clear-field field="reserveOisgirMap"/>
- </if-not-empty>
+ <!-- create OrderItemShipGrpInvRes record -->
+ <if-not-empty field="orderHeader">
+ <call-simple-method method-name="getPromisedDateTime"/>
+ <set from-field="parameters.orderId"
field="reserveOisgirMap.orderId"/>
+ <set from-field="parameters.orderItemSeqId"
field="reserveOisgirMap.orderItemSeqId"/>
+ <set from-field="parameters.shipGroupSeqId"
field="reserveOisgirMap.shipGroupSeqId"/>
+ <set from-field="inventoryItem.inventoryItemId"
field="reserveOisgirMap.inventoryItemId"/>
+ <set from-field="parameters.reserveOrderEnumId"
field="reserveOisgirMap.reserveOrderEnumId"/>
+ <set from-field="parameters.reservedDatetime"
field="reserveOisgirMap.reservedDatetime"/>
+ <set from-field="parameters.deductAmount"
field="reserveOisgirMap.quantity" type="BigDecimal"/>
+ <set from-field="promisedDatetime"
field="reserveOisgirMap.promisedDatetime"/>
+ <set from-field="parameters.priority"
field="reserveOisgirMap.priority"/>
+ <if-not-empty field="parameters.sequenceId">
+ <set field="reserveOisgirMap.sequenceId"
from-field="parameters.sequenceId"/>
+ </if-not-empty>
+ <call-service service-name="reserveOrderItemInventory"
in-map-name="reserveOisgirMap"/>
+ <clear-field field="reserveOisgirMap"/>
+ </if-not-empty>
- <!-- create WorkEffortInvRes record -->
- <if-not-empty field="productionRunTask">
- <set from-field="parameters.workEffortId"
field="reserveProductionRunMap.workEffortId"/>
- <set
from-field="inventoryItem.inventoryItemId"
field="reserveProductionRunMap.inventoryItemId"/>
- <set
from-field="parameters.reserveOrderEnumId"
field="reserveProductionRunMap.reserveOrderEnumId"/>
- <set from-field="parameters.reservedDatetime"
field="reserveProductionRunMap.reservedDatetime"/>
- <set from-field="parameters.deductAmount"
field="reserveProductionRunMap.quantity" type="BigDecimal"/>
- <set from-field="promisedDatetime"
field="reserveProductionRunMap.promisedDatetime"/>
- <set from-field="parameters.sequenceId"
field="reserveProductionRunMap.sequenceId"/>
- <set from-field="parameters.productId"
field="reserveProductionRunMap.productId"/>
- <call-service
service-name="reserveWorkEffortInventory"
in-map-name="reserveProductionRunMap"/>
- <clear-field field="reserveProductionRunMap"/>
- </if-not-empty>
- </if-empty>
+ <!-- create WorkEffortInvRes record -->
+ <if-not-empty field="productionRunTask">
+ <set from-field="parameters.workEffortId"
field="reserveProductionRunMap.workEffortId"/>
+ <set from-field="inventoryItem.inventoryItemId"
field="reserveProductionRunMap.inventoryItemId"/>
+ <set from-field="parameters.reserveOrderEnumId"
field="reserveProductionRunMap.reserveOrderEnumId"/>
+ <set from-field="parameters.reservedDatetime"
field="reserveProductionRunMap.reservedDatetime"/>
+ <set from-field="parameters.deductAmount"
field="reserveProductionRunMap.quantity" type="BigDecimal"/>
+ <set from-field="promisedDatetime"
field="reserveProductionRunMap.promisedDatetime"/>
+ <set from-field="parameters.sequenceId"
field="reserveProductionRunMap.sequenceId"/>
+ <set from-field="parameters.productId"
field="reserveProductionRunMap.productId"/>
+ <call-service
service-name="reserveWorkEffortInventory"
in-map-name="reserveProductionRunMap"/>
+ <clear-field field="reserveProductionRunMap"/>
+ </if-not-empty>
<calculate field="parameters.quantityNotReserved"
decimal-scale="6">
<calcop operator="subtract"
field="parameters.quantityNotReserved">
<calcop operator="get"
field="parameters.deductAmount"/>
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java
b/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java
index 80d11210d0..9c4ed5b039 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/catalog/CatalogWorker.java
@@ -359,7 +359,4 @@ public final class CatalogWorker {
"productCategoryId", true);
}
- public static String getCatalogTopEbayCategoryId(ServletRequest request,
String prodCatalogId) {
- return getProdCatalogCategoryId((Delegator)
request.getAttribute("delegator"), prodCatalogId, "PCCT_EBAY_ROOT");
- }
}
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java
index c62f7f7c9b..cf6d8f3e23 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java
@@ -640,9 +640,6 @@ public class ProductSearchSession {
String searchCatalogId = (String)
parameters.get("SEARCH_CATALOG_ID");
if (searchCatalogId != null &&
!"".equalsIgnoreCase(searchCatalogId)) {
String topCategory =
CatalogWorker.getCatalogTopCategoryId(request, searchCatalogId);
- if (UtilValidate.isEmpty(topCategory)) {
- topCategory =
CatalogWorker.getCatalogTopEbayCategoryId(request, searchCatalogId);
- }
List<GenericValue> categories =
CategoryWorker.getRelatedCategoriesRet(request, "topLevelList", topCategory,
true, false, true);
searchAddConstraint(new
ProductSearch.CatalogConstraint(searchCatalogId, categories), session);
constraintsChanged = true;
diff --git a/framework/base/dtd/ofbiz-component.xsd
b/framework/base/dtd/ofbiz-component.xsd
index 307ad0587d..2d280c9549 100644
--- a/framework/base/dtd/ofbiz-component.xsd
+++ b/framework/base/dtd/ofbiz-component.xsd
@@ -54,17 +54,17 @@ under the License.
The plugins Auto-Loading feature also loads all
components in the order they are found (i.e. alphabetic or creation date).
Using depends-on allows to create a series of
dependencies for component loading, before loading a particular component.
- For instance we can define dependency for a component
like component ebaystore is dependent on component ebay
- (even multiple dependencies for a single component is
supported).
-
+ For instance we can define a dependency for a
component named componentB that depends on a component named componentA
+ (even multiple dependencies for a single component is
supported).
+
If any anomaly is found loading of components will
stop.
-
- We can declare it in this fashion in
ofbiz-component.xml file (beware ebaystore is disabled by default)
+
+ We can declare it in this fashion in the componentB's
ofbiz-component.xml file:
<![CDATA[
- <ofbiz-component name="ebaystore" enabled="true"
+ <ofbiz-component name="componentB" enabled="true"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd";>
- <depends-on component-name="ebay"/>
+ <depends-on component-name="componentA"/>
]]>
</xs:documentation>
</xs:annotation>
diff --git a/framework/common/config/CommonEntityLabels.xml
b/framework/common/config/CommonEntityLabels.xml
index 2be11e8e0b..de96990a55 100644
--- a/framework/common/config/CommonEntityLabels.xml
+++ b/framework/common/config/CommonEntityLabels.xml
@@ -493,21 +493,6 @@
<value xml:lang="zh">后进先出法</value>
<value xml:lang="zh-TW">後進先出法</value>
</property>
- <property key="Enumeration.description.EBAY_SALES_CHANNEL">
- <value xml:lang="cs">eBay</value>
- <value xml:lang="de">Verkaufskanal: eBay</value>
- <value xml:lang="en">eBay Channel</value>
- <value xml:lang="es">eBay</value>
- <value xml:lang="fr">Canal de vente : eBay</value>
- <value xml:lang="it">Canale eBay</value>
- <value xml:lang="ja">eBayチャネル</value>
- <value xml:lang="pt">Canal eBay</value>
- <value xml:lang="ru">Каннал eBay</value>
- <value xml:lang="th">ช่องทาง eBay</value>
- <value xml:lang="vi">Kênh eBay</value>
- <value xml:lang="zh">EBay渠道</value>
- <value xml:lang="zh-TW">EBay通路</value>
- </property>
<property key="Enumeration.description.EMAIL_SALES_CHANNEL">
<value xml:lang="ar">قناة البريد الالكتروني</value>
<value xml:lang="cs">Elektronická pošta</value>
diff --git a/framework/common/config/CommonUiLabels.xml
b/framework/common/config/CommonUiLabels.xml
index 22633bdc24..90601c7f7f 100644
--- a/framework/common/config/CommonUiLabels.xml
+++ b/framework/common/config/CommonUiLabels.xml
@@ -13919,15 +13919,6 @@
<value xml:lang="zh-CN">建立数据源类型</value>
<value xml:lang="zh-TW">新建資料源類型</value>
</property>
- <property key="Ebay">
- <value xml:lang="en">eBay</value>
- <value xml:lang="es">eBay</value>
- <value xml:lang="es-CL">eBay</value>
- <value xml:lang="es-MX">eBay</value>
- <value xml:lang="th">อีเบย์</value>
- <value xml:lang="zh">eBay</value>
- <value xml:lang="zh-TW">eBay</value>
- </property>
<property key="Example">
<value xml:lang="ar">مثال</value>
<value xml:lang="cs">Příklad</value>
diff --git a/framework/security/config/SecurityEntityLabels.xml
b/framework/security/config/SecurityEntityLabels.xml
index 9b27c9698d..ac9787806e 100644
--- a/framework/security/config/SecurityEntityLabels.xml
+++ b/framework/security/config/SecurityEntityLabels.xml
@@ -776,13 +776,6 @@
<value xml:lang="zh">使用数据文件维护页面。</value>
<value xml:lang="zh-TW">使用資料檔維護頁面.</value>
</property>
- <property key="SecurityPermission.description.EBAY_VIEW">
- <value xml:lang="en">View operations in the eBay application.</value>
- <value xml:lang="it">Operazioni di visualizzazione nell'applicazione
eBay.</value>
- <value xml:lang="ja">eBay業務での表示操作。</value>
- <value xml:lang="zh">EBay应用程序中的浏览操作。</value>
- <value xml:lang="zh-TW">eBay應用程式中的檢視操作.</value>
- </property>
<property key="SecurityPermission.description.ENTITY_DATA_ADMIN">
<value xml:lang="en">ALL with the Entity Data Maintenance
pages.</value>
<value xml:lang="es">TODO dentro de las páginas de Mantenimiento de
Datos de Entidad.</value>
diff --git
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
index 3dcd4852aa..783adec09a 100644
---
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
+++
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
@@ -124,7 +124,6 @@ public final class LabelManagerFactory {
|| labelKey.contains("TemporalExpression_")
|| labelKey.contains(".portalPageName.")
||
labelKey.contains("ProductStoreGroup.productStoreGroupName.NA")
- || labelKey.contains("buildEbayConfig.")
|| labelKey.contains("week.")
|| labelKey.contains("second.")
|| labelKey.contains("hour.")
