Author: pranayp
Date: Fri Jun 17 06:49:30 2016
New Revision: 1748800
URL: http://svn.apache.org/viewvc?rev=1748800&view=rev
Log:
[OFBIZ-7132] Applied slightly modified patch from the ticket. Added
WebSiteAlias usage example to cmssite data.
Thanks Chandan Khandelwal for providing the patch.
Modified:
ofbiz/trunk/applications/content/data/ContentTypeData.xml
ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml
Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=1748800&r1=1748799&r2=1748800&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Fri Jun 17
06:49:30 2016
@@ -186,6 +186,7 @@ under the License.
<WebSiteContentType webSiteContentTypeId="MENU_ROOT" description="Menu
Containers" hasTable="N" parentTypeId=""/>
<WebSiteContentType webSiteContentTypeId="ERROR_ROOT" description="Error
Page Containers" hasTable="N" parentTypeId=""/>
<WebSiteContentType webSiteContentTypeId="PUBLISH_POINT"
description="Publish Point" hasTable="N" parentTypeId=""/>
+ <WebSiteContentType webSiteContentTypeId="WEB_PAGE" description="Web Page"
hasTable="N" parentTypeId="" />
<!-- survey data -->
<SurveyApplType surveyApplTypeId="CART_ADD" description="Add-To Cart"/>
Modified: ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=1748800&r1=1748799&r2=1748800&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml Fri Jun 17
06:49:30 2016
@@ -101,8 +101,10 @@ under the License.
<Content contentId="CMSS_DEMO_HOME" contentTypeId="DOCUMENT"
decoratorContentId="CMSS_DEC"
contentName="CMS Site Demo Home Page" dataResourceId="CMSS_DEMO_HOME"/>
<ContentPurpose contentId="CMSS_DEMO_HOME" contentPurposeTypeId="SECTION"/>
- <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="CMSS_DEMO_HOME"
contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"
mapKey="demoHome"/>
+ <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="CMSS_DEMO_HOME"
contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
<WebSiteContent webSiteId="CmsSite" contentId="CMSS_DEMO_HOME"
webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/>
+ <!-- WebSitePathAlias will be used for serving the page -->
+ <WebSitePathAlias webSiteId="CmsSite" pathAlias="demoHome"
contentId="CMSS_DEMO_HOME" fromDate="2016-06-09 13:37:30.43"/>
<!-- yet another demo page -->
<DataResource dataResourceId="CMSS_DEMO_PAGE1"
dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL"/>
@@ -114,7 +116,10 @@ under the License.
</ElectronicText>
<Content contentId="CMSS_DEMO_PAGE1" contentTypeId="DOCUMENT"
decoratorContentId="CMSS_DEC" contentName="CMS Site Demo Page 1"
dataResourceId="CMSS_DEMO_PAGE1"/>
<ContentPurpose contentId="CMSS_DEMO_PAGE1"
contentPurposeTypeId="SECTION"/>
- <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="CMSS_DEMO_PAGE1"
contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"
mapKey="demoPage1"/>
+ <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="CMSS_DEMO_PAGE1"
contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
+ <WebSiteContent webSiteId="CmsSite" contentId="CMSS_DEMO_PAGE1"
webSiteContentTypeId="WEB_PAGE" fromDate="2001-01-01 00:00:00"/>
+ <WebSitePathAlias webSiteId="CmsSite" pathAlias="demoPage1"
contentId="CMSS_DEMO_PAGE1" fromDate="2016-06-09 13:37:30.43"/>
+
<DataResource dataResourceId="CMSS_DEMO_PAGE1_1"
dataResourceTypeId="SHORT_TEXT" objectInfo="Sub-content 1"/>
<Content contentId="CMSS_DEMO_PAGE1_1" contentTypeId="DOCUMENT"
contentName="CMS Site Demo Page 1_1" dataResourceId="CMSS_DEMO_PAGE1_1"/>
<ContentPurpose contentId="CMSS_DEMO_PAGE1_1"
contentPurposeTypeId="SECTION"/>
