svn commit: r1848449 - in /ofbiz/ofbiz-framework/trunk/framework/service/data: ScheduledServices.xml ServiceSeedData.xml

[mb...@apache.org]

Author: mbrohl
Date: Sat Dec  8 09:49:21 2018
New Revision: 1848449

URL: http://svn.apache.org/viewvc?rev=1848449&view=rev
Log:
Seed data sequence bug regarding "MIDNIGHT_DAILY" TemporalExpression.
(OFBIZ-10533)

The TemporalExpression for "MIDNIGHT_DAILY" has to be loaded as seed 
data instead of initial-seed data to be available for other seed-initial
usages of this TemporalExpression.
The fix moves this TemporalExpression to the other TemporalExpression 
seed data in ServiceSeedData.xml.

Thanks Martin Becker for reporting and providing the patch.

Modified:
    ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServices.xml
    ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSeedData.xml

Modified: ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServices.xml?rev=1848449&r1=1848448&r2=1848449&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/data/ScheduledServices.xml Sat Dec  8 09:49:21 2018
@@ -18,7 +18,6 @@ specific language governing permissions
 under the License.
 -->
 <entity-engine-xml>
-    <TemporalExpression tempExprId="MIDNIGHT_DAILY" tempExprTypeId="FREQUENCY" description="Daily Midnight" date1="2000-01-01 00:00:00.000" integer1="5" integer2="1"/>
     <!-- The JobManager handles purging old jobs now.
     <JobSandbox jobId="PURGE_OLD_JOBS" jobName="Purge Old Jobs" runTime="2000-01-01 00:00:00.000" serviceName="purgeOldJobs" poolId="pool" runAsUser="system" tempExprId="MIDNIGHT_DAILY" maxRecurrenceCount="-1"/>
     -->

Modified: ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSeedData.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSeedData.xml?rev=1848449&r1=1848448&r2=1848449&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSeedData.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/service/data/ServiceSeedData.xml Sat Dec  8 09:49:21 2018
@@ -21,6 +21,8 @@ under the License.
 <entity-engine-xml>
     <!-- Temporal Expression seed data -->
 
+    <TemporalExpression tempExprId="MIDNIGHT_DAILY" tempExprTypeId="FREQUENCY" description="Daily Midnight" date1="2000-01-01 00:00:00.000" integer1="5" integer2="1"/>
+
     <!-- Pre-define all 60 minutes -->
     <TemporalExpression tempExprId="MINUTE_00" tempExprTypeId="MINUTE_RANGE" description="Minute 0" integer1="0" integer2="0"/>
     <TemporalExpression tempExprId="MINUTE_01" tempExprTypeId="MINUTE_RANGE" description="Minute 1" integer1="1" integer2="1"/>