svn commit: r745995 - in /ofbiz/trunk/applications: component-load.xml content/data/DemoTreeContent.xml content/ofbiz-component.xml ecommerce/data/DemoTreeContent.xml ecommerce/ofbiz-component.xml

[jonesde]

Author: jonesde
Date: Thu Feb 19 21:10:11 2009
New Revision: 745995

URL: http://svn.apache.org/viewvc?rev=745995&view=rev
Log:
Fixed data loading dependency issues

Added:
    ofbiz/trunk/applications/ecommerce/data/DemoTreeContent.xml
      - copied unchanged from r745978, ofbiz/trunk/applications/content/data/DemoTreeContent.xml
Removed:
    ofbiz/trunk/applications/content/data/DemoTreeContent.xml
Modified:
    ofbiz/trunk/applications/component-load.xml
    ofbiz/trunk/applications/content/ofbiz-component.xml
    ofbiz/trunk/applications/ecommerce/ofbiz-component.xml

Modified: ofbiz/trunk/applications/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/component-load.xml?rev=745995&r1=745994&r2=745995&view=diff
==============================================================================
--- ofbiz/trunk/applications/component-load.xml (original)
+++ ofbiz/trunk/applications/component-load.xml Thu Feb 19 21:10:11 2009
@@ -24,10 +24,10 @@
     <load-component component-location="securityext"/>
     <load-component component-location="content"/>
     <load-component component-location="workeffort"/>
-    <load-component component-location="humanres"/>
     <load-component component-location="product"/>
     <load-component component-location="manufacturing"/>
     <load-component component-location="accounting"/>
+    <load-component component-location="humanres"/>
     <load-component component-location="order"/>
     <load-component component-location="marketing"/>
     <load-component component-location="ecommerce"/>

Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=745995&r1=745994&r2=745995&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Thu Feb 19 21:10:11 2009
@@ -46,7 +46,6 @@
     <entity-resource type="data" reader-name="demo" loader="main" location="data/WebSitePublishPointData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/CompDocData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ForumDemoData.xml"/>
-    <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoTreeContent.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_content.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_contenttypes.xml"/>

Modified: ofbiz/trunk/applications/ecommerce/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/ofbiz-component.xml?rev=745995&r1=745994&r2=745995&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/ecommerce/ofbiz-component.xml Thu Feb 19 21:10:11 2009
@@ -50,7 +50,8 @@
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoFinAccount.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProductI18nData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoProductCategoriesI18nData.xml"/>    
-
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoTreeContent.xml"/>
+    
     <webapp name="ecommerce"
         title="eCommerce"
         server="default-server"