svn commit: r1540222 - /ofbiz/branches/release12.04/specialpurpose/ofbizwebsite/data/OfbizData.xml

Author: jleroux
Date: Fri Nov  8 23:51:07 2013
New Revision: 1540222

URL: http://svn.apache.org/r1540222
Log:
A patch from Michael Ende for "SpecialPurpose Ofbizwebsite duplicated demo data"  https://issues.apache.org/jira/browse/OFBIZ-5390

They are duplicated demo data in the specialporpose ofbizwebsite component. The data of the website and website content 'OFBIZ' was partly duplicated.

The solution is to merge this differned website difinitions for OFBIZ.

Modified:
    ofbiz/branches/release12.04/specialpurpose/ofbizwebsite/data/OfbizData.xml

Modified: ofbiz/branches/release12.04/specialpurpose/ofbizwebsite/data/OfbizData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/specialpurpose/ofbizwebsite/data/OfbizData.xml?rev=1540222&r1=1540221&r2=1540222&view=diff
==============================================================================
--- ofbiz/branches/release12.04/specialpurpose/ofbizwebsite/data/OfbizData.xml (original)
+++ ofbiz/branches/release12.04/specialpurpose/ofbizwebsite/data/OfbizData.xml Fri Nov  8 23:51:07 2013
@@ -32,9 +32,6 @@ under the License.
     <Content contentId="OFBIZ_FOOT" contentTypeId="DECORATOR" contentName="OFBiz footer" dataResourceId="OFBIZ_FOOT"/>
     <Content contentId="OFBIZ_HOME_EN" localeString="en" contentTypeId="DOCUMENT" decoratorContentId="OFBIZ_DEC" contentName="OFBiz home page" dataResourceId="OFBIZ_HOME_EN"/>
 
-    <WebSite webSiteId="OFBIZ" siteName="OFBiz Website"/>
-    <WebSiteContent webSiteId="OFBIZ" contentId="OFBIZ_POINT" webSiteContentTypeId="PUBLISH_POINT" fromDate="2009-04-27 13:33:05.29"/>
-    <WebSiteContent webSiteId="OFBIZ" contentId="OFBIZ_HOME" webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/>
 
     <ContentPurpose contentId="OFBIZ_DEC" contentPurposeTypeId="SECTION"/>
     <ContentPurpose contentId="OFBIZ_HHEAD" contentPurposeTypeId="SECTION"/>
@@ -50,6 +47,7 @@ under the License.
     <!-- Website -->
     <WebSite webSiteId="OFBIZ" siteName="OFBiz Website"/>
     <WebSiteContent webSiteId="OFBIZ" contentId="OFBIZ_POINT" webSiteContentTypeId="PUBLISH_POINT" fromDate="2009-04-27 13:33:05.29"/>
+    <WebSiteContent webSiteId="OFBIZ" contentId="OFBIZ_HOME" webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/>
     <WebSiteContent webSiteId="OFBIZ" contentId="OFBIZ_HOME_EN" webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/>
 
     <!-- ElectronicText English -->