Author: jleroux
Date: Sun Feb 5 22:00:08 2012
New Revision: 1240847
URL:
http://svn.apache.org/viewvc?rev=1240847&view=revLog:
As suggested by Anne at
https://issues.apache.org/jira/browse/OFBIZ-4675 reverts changes from
https://issues.apache.org/jira/browse/OFBIZ-4381 r1167510
The fix applied in OFBIZ-4381 was to copy DemoShipping.xml from the ecommerce component (where it is loaded as DEMO data), and add it to commonext component as SEED data.
IMO this data should not be part of SEED data, as not all users will use this data. Also, the file should not be duplicated.
I suggest reverting trunk r1167510, R11.04 r1167513, R10.04 r1167514.
I suspect the correct fix for OFBIZ-4381 is either for the user to load the demo data, or to configure the carriers before trying to create a ProductStore.
Modified:
ofbiz/trunk/applications/commonext/ofbiz-component.xml
Modified: ofbiz/trunk/applications/commonext/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/ofbiz-component.xml?rev=1240847&r1=1240846&r2=1240847&view=diff==============================================================================
--- ofbiz/trunk/applications/commonext/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/commonext/ofbiz-component.xml Sun Feb 5 22:00:08 2012
@@ -30,7 +30,6 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/CommonExtHelpData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SystemInfoPortletData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/SetupData.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/ShippingData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/OfbizSetupSecurityData.xml"/>
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
Locked
