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

jleroux 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 58e4b7b9fb Improved: The big problem when loading seed. (OFBIZ-7754)
58e4b7b9fb is described below

commit 58e4b7b9fb0c873c7c2bb4745becff5057f97b18
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Sep 18 13:55:24 2022 +0200

    Improved: The big problem when loading seed. (OFBIZ-7754)
    
    After a last discussion on dev ML:
    https://lists.apache.org/thread/13kvnxvhrwfj7o1vjv3q8lsfzycc0t8q
    we decided to keep the loading but commented out with a comment.
    
    This also allows to close OFBIZ-7112
    
    Thanks: Michael for the idea of no loading the data.
    
    Conflict handled by hand in framework/common/ofbiz-component.xml
---
 framework/common/ofbiz-component.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/common/ofbiz-component.xml 
b/framework/common/ofbiz-component.xml
index c5ee1b38a1..b4311bfe5f 100644
--- a/framework/common/ofbiz-component.xml
+++ b/framework/common/ofbiz-component.xml
@@ -27,7 +27,7 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" 
location="entitydef/entitymodel.xml"/>
 
     <entity-resource type="data" reader-name="seed" loader="main" 
location="data/CommonSecurityPermissionSeedData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" 
location="data/CommonSystemPropertyData.xml"/>
+    <!-- <entity-resource type="data" reader-name="seed-initial" loader="main" 
location="data/CommonSystemPropertyData.xml"/> Use it if you need/want-->
     <entity-resource type="data" reader-name="seed" loader="main" 
location="data/CommonTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" 
location="data/CurrencyData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" 
location="data/CountryCodeData.xml"/>

Reply via email to