Author: jonesde
Date: Thu Feb 14 10:26:44 2008
New Revision: 627824
URL: http://svn.apache.org/viewvc?rev=627824&view=rev
Log:
Added seed-initial data set and changed all JobSandbox seed data entries to be
in this instead; allows for reloading of seed data withows for reloading of
seed data without redundant jobs scheduled
Modified:
ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
ofbiz/trunk/applications/order/ofbiz-component.xml
ofbiz/trunk/applications/product/ofbiz-component.xml
ofbiz/trunk/framework/entity/config/entityengine.xml
ofbiz/trunk/framework/entityext/ofbiz-component.xml
ofbiz/trunk/framework/service/ofbiz-component.xml
Modified: ofbiz/trunk/applications/manufacturing/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/ofbiz-component.xml?rev=627824&r1=627823&r2=627824&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/manufacturing/ofbiz-component.xml Thu Feb 14
10:26:44 2008
@@ -37,7 +37,7 @@
<entity-resource type="group" reader-name="main" loader="main"
location="entitydef/entitygroup.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ManufacturingData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ManufacturingSecurityData.xml"/>
- <!--<entity-resource type="data" reader-name="seed" loader="main"
location="data/ManufacturingScheduledServices.xml"/>-->
+ <!--<entity-resource type="data" reader-name="seed-initial" loader="main"
location="data/ManufacturingScheduledServices.xml"/>-->
<entity-resource type="data" reader-name="demo" loader="main"
location="data/ManufacturingExampleData.xml"/>
<!-- service resources: model(s) [definitions], eca(s) and group
definitions -->
Modified: ofbiz/trunk/applications/order/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/ofbiz-component.xml?rev=627824&r1=627823&r2=627824&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/order/ofbiz-component.xml Thu Feb 14 10:26:44 2008
@@ -32,7 +32,7 @@
<entity-resource type="group" reader-name="main" loader="main"
location="entitydef/entitygroup.xml"/>
<entity-resource type="eca" reader-name="main" loader="main"
location="entitydef/eecas.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/OrderTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main"
location="data/OrderScheduledServices.xml"/>
+ <entity-resource type="data" reader-name="seed-initial" loader="main"
location="data/OrderScheduledServices.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/OrderSecurityData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/OrderDemoUser.xml"/>
<entity-resource type="data" reader-name="demo" loader="main"
location="data/OrderProcessWorkflow.xml"/>
Modified: ofbiz/trunk/applications/product/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/ofbiz-component.xml?rev=627824&r1=627823&r2=627824&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/product/ofbiz-component.xml Thu Feb 14 10:26:44
2008
@@ -30,7 +30,7 @@
<entity-resource type="model" reader-name="main" loader="main"
location="entitydef/entitymodel_shipment.xml"/>
<entity-resource type="group" reader-name="main" loader="main"
location="entitydef/entitygroup.xml"/>
<entity-resource type="eca" reader-name="main" loader="main"
location="entitydef/eecas.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main"
location="data/ProductScheduledServices.xml"/>
+ <entity-resource type="data" reader-name="seed-initial" loader="main"
location="data/ProductScheduledServices.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ProductTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ShipmentTypeData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ProductSecurityData.xml"/>
Modified: ofbiz/trunk/framework/entity/config/entityengine.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=627824&r1=627823&r2=627824&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Thu Feb 14 10:26:44
2008
@@ -84,6 +84,7 @@
ext-demo = External Demo Data (custom)
-->
<entity-data-reader name="seed"/>
+ <entity-data-reader name="seed-initial"/>
<entity-data-reader name="demo"/>
<entity-data-reader name="ext"/>
<entity-data-reader name="ext-test"/>
@@ -129,6 +130,7 @@
join-style="ansi-no-parenthesis"
alias-view-columns="true">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -154,6 +156,7 @@
use-indices-unique="false"
alias-view-columns="false">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -195,6 +198,7 @@
use-indices-unique="false"
alias-view-columns="false">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -214,6 +218,7 @@
check-on-start="true"
add-missing-on-start="true">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -233,6 +238,7 @@
check-on-start="true"
add-missing-on-start="true">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<!-- this setup is for the embedded version of Daffodil, with
in.co.daffodil.db.jdbc.DaffodilDBDriver -->
@@ -255,6 +261,7 @@
add-missing-on-start="true"
use-pk-constraint-names="false">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -281,6 +288,7 @@
character-set="latin1"
collate="latin1_general_cs">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -332,6 +340,7 @@
result-fetch-size="50"
-->
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -358,6 +367,7 @@
alias-view-columns="false"
join-style="ansi">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -394,6 +404,7 @@
use-fk-initially-deferred="false"
join-style="ansi">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -415,6 +426,7 @@
use-fk-initially-deferred="false"
join-style="ansi-no-parenthesis">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -440,6 +452,7 @@
alias-view-columns="false"
join-style="ansi">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -480,6 +493,7 @@
alias-view-columns="false"
use-fk-initially-deferred="false">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -501,6 +515,7 @@
add-missing-on-start="true"
join-style="ansi">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -526,6 +541,7 @@
alias-view-columns="false"
always-use-constraint-keyword="true">
<read-data reader-name="seed"/>
+ <read-data reader-name="seed-initial"/>
<read-data reader-name="demo"/>
<read-data reader-name="ext"/>
<inline-jdbc
@@ -538,4 +554,3 @@
pool-maxsize="250"/>
</datasource>
</entity-config>
-
Modified: ofbiz/trunk/framework/entityext/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/ofbiz-component.xml?rev=627824&r1=627823&r2=627824&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/entityext/ofbiz-component.xml Thu Feb 14 10:26:44 2008
@@ -27,7 +27,7 @@
<entity-resource type="model" reader-name="main" loader="main"
location="entitydef/entitymodel.xml"/>
<entity-resource type="group" reader-name="main" loader="main"
location="entitydef/entitygroup.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/EntityExtTypeData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main"
location="data/EntityScheduledServices.xml"/>
+ <entity-resource type="data" reader-name="seed-initial" loader="main"
location="data/EntityScheduledServices.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/EntityExtSecurityData.xml"/>
<service-resource type="model" loader="main"
location="servicedef/services.xml"/>
<service-resource type="group" loader="main"
location="servicedef/groups.xml"/>
Modified: ofbiz/trunk/framework/service/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/ofbiz-component.xml?rev=627824&r1=627823&r2=627824&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/service/ofbiz-component.xml Thu Feb 14 10:26:44 2008
@@ -30,7 +30,7 @@
<entity-resource type="model" reader-name="main" loader="main"
location="entitydef/entitymodel.xml"/>
<entity-resource type="group" reader-name="main" loader="main"
location="entitydef/entitygroup.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ScheduledServiceData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main"
location="data/ScheduledServices.xml"/>
+ <entity-resource type="data" reader-name="seed-initial" loader="main"
location="data/ScheduledServices.xml"/>
<entity-resource type="data" reader-name="seed" loader="main"
location="data/ServiceSecurityData.xml"/>
<service-resource type="model" loader="main"
location="servicedef/services.xml"/>
