svn commit: r773346 - /ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml

[jl...@apache.org]

Author: jleroux
Date: Sun May 10 14:44:43 2009
New Revision: 773346

URL: http://svn.apache.org/viewvc?rev=773346&view=rev
Log:
No need to escape in CDATA http://www.w3.org/TR/REC-xml/#dt-chardata. Trying to fix an issue with CMSS_DEMO_TPL_DATA when rendering, exactly:
Error rendering FTL template (Expression thisContent.content.CMSS_DEMO_TPL_DATA is undefined on line 9, column 33 in DataResource:CMSS_DEMO_HOME.)

Modified:
    ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml

Modified: ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml?rev=773346&r1=773345&r2=773346&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/data/CmsSiteDemoData.xml Sun May 10 14:44:43 2009
@@ -123,9 +123,9 @@
     <Content contentId="CMSS_DEMO_BLOG" contentTypeId="DOCUMENT" contentName="CMS Site Demo blog screen example" dataResourceId="CMSS_DEMO_BLOG"/>
     <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="CMSS_DEMO_BLOG" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
 
-    <DataResource dataResourceId="CMSS_DEMO_TPL_DATA" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="data xml file" mimeTypeId="text/xml" isPublic="Y"/>    
-    <DataResource dataResourceId="CMSS_DEMO_TPL_TEMPL" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="demo xml templ" mimeTypeId="text/html" isPublic="Y" />    
-    <Content contentId="CMSS_DEMO_TPL" contentTypeId="DOCUMENT" templateDataResourceId="CMSS_DEMO_TPL_TEMPL" dataResourceId="CMSS_DEMO_TPL_DATA" statusId="CTNT_IN_PROGRESS" contentName="Demo xml data + ftl template file" mimeTypeId="text/html"/>    
+    <DataResource dataResourceId="CMSS_DEMO_TPL_DATA" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="data xml file" mimeTypeId="text/xml" isPublic="Y"/>
+    <DataResource dataResourceId="CMSS_DEMO_TPL_TEMPL" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="demo xml templ" mimeTypeId="text/html" isPublic="Y" />
+    <Content contentId="CMSS_DEMO_TPL" contentTypeId="DOCUMENT" templateDataResourceId="CMSS_DEMO_TPL_TEMPL" dataResourceId="CMSS_DEMO_TPL_DATA" statusId="CTNT_IN_PROGRESS" contentName="Demo xml data + ftl template file" mimeTypeId="text/html"/>
     <ContentAssoc contentId="CMSS_PPOINT" contentIdTo="CMSS_DEMO_TPL" contentAssocTypeId="SUB_CONTENT" fromDate="2001-01-01 00:00:00"/>
     <ElectronicText dataResourceId="CMSS_DEMO_TPL_DATA">
         <textData><![CDATA[
@@ -134,7 +134,7 @@
                     Demo to show how to format a xml resource using an ftl template dataresource.
                 </headerText>
                 <bodyText>
-                    This is XML data in dataResourceId CMSS_DEMO_TPL_DATA which is normal xml data, stored in a dataresource.&lt;br/&gt;
+                    This is XML data in dataResourceId CMSS_DEMO_TPL_DATA which is normal xml data, stored in a dataresource.<br/>
                     It is formatted using the ftl template in dataResourceId CMSS_DEMO_TPL_TEMPL  and rendered in the program renderContentAsText in
                     java file ContentWorker.java
                 </bodyText>
@@ -148,7 +148,7 @@
                 <br/><br/>
         ]]></textData>
     </ElectronicText>
-    
+
 
 
     <!--