[ofbiz-framework] branch trunk updated: Fixed: Have a service that runs periodically to generate CustomTimePeriod records

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

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ccabbd8  Fixed: Have a service that runs periodically to generate CustomTimePeriod records
ccabbd8 is described below

commit ccabbd8e4e811fc8c0a542adc7658df1527e1849
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sat May 16 13:25:17 2020 +0200

    Fixed: Have a service that runs periodically to generate CustomTimePeriod records
   
    (OFBIZ-10905)
   
    Fixes the loading sequence of CommonScheduledServicesDemoData.xml now
    ScheduledServicesDemoData.xml in service component
---
 .../data/ScheduledServicesDemoData.xml}                             | 6 ++----
 framework/service/ofbiz-component.xml                               | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/common/data/CommonScheduledServicesDemoData.xml b/framework/service/data/ScheduledServicesDemoData.xml
similarity index 84%
rename from framework/common/data/CommonScheduledServicesDemoData.xml
rename to framework/service/data/ScheduledServicesDemoData.xml
index eb3eb5d..82f7e58 100644
--- a/framework/common/data/CommonScheduledServicesDemoData.xml
+++ b/framework/service/data/ScheduledServicesDemoData.xml
@@ -18,8 +18,6 @@
     under the License.
 -->
 <entity-engine-xml>
-    <JobSandbox jobId="FUTURE_PERIOD" jobName="Create Future Period" runTime="2000-01-01 00:00:00.000"
-        serviceName="createFuturePeriod" poolId="pool" runAsUser="system" tempExprId="1ST_AND_15TH_MONTH" maxRecurrenceCount="-1"
-    />
-    
+    <JobSandbox jobId="FUTURE_PERIOD" jobName="Create Future Period" runTime="2000-01-01 00:00:00.000" serviceName="createFuturePeriod" poolId="pool" runAsUser="system"
+        tempExprId="1ST_AND_15TH_MONTH" maxRecurrenceCount="-1" />
 </entity-engine-xml>
diff --git a/framework/service/ofbiz-component.xml b/framework/service/ofbiz-component.xml
index 1735f9d..a823d98 100644
--- a/framework/service/ofbiz-component.xml
+++ b/framework/service/ofbiz-component.xml
@@ -31,6 +31,8 @@ under the License.
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ServiceSecurityPermissionSeedData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ServiceSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ServiceDemoData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ScheduledServicesDemoData.xml"/>
+    
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_test_se.xml"/>