From 7704133d2a8867d7cc1dc6600516c64309730d2c Mon Sep 17 00:00:00 2001
From: Michael Ru <michael@ruflin.ch>
Date: Tue, 23 Sep 2008 11:23:48 +0000
Subject: [PATCH] - replaced cm:contentupdated and blg:released aspects by a
 single cm:syndication aspect that provides cm:published and cm:updated date
 properties - fixed two i18n messages in the editpost component

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/blogIntegrationModel.xml | 13 -------------
 config/alfresco/model/contentModel.xml         | 14 ++++++++------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/config/alfresco/model/blogIntegrationModel.xml b/config/alfresco/model/blogIntegrationModel.xml
index 1447b104e7..ca7d6d71de 100644
--- a/config/alfresco/model/blogIntegrationModel.xml
+++ b/config/alfresco/model/blogIntegrationModel.xml
@@ -121,19 +121,6 @@
             </association>
          </associations>
    	  </aspect>
-     
-
-      <aspect name="blg:released">
-         <title>Release date</title>
-         <properties>
-         	<!-- Released = not a draft anymore -->
-            <property name="blg:released">
-               <title>Post released</title>
-               <type>d:datetime</type>
-               <mandatory>true</mandatory>
-            </property>
-         </properties>
-      </aspect>
 
    </aspects>
    
diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index 4ad9e3170f..ed673bc70c 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -928,14 +928,16 @@
          </associations>
       </aspect>
       
-      <aspect name="cm:contentupdated">
-         <title>Content updated</title>
+      <aspect name="cm:syndication">
+         <title>Content syndication</title>
          <properties>
-            <!-- Last updated timestamp of node "content". -->
-            <property name="cm:contentupdatedate">
-               <title>Last updated</title>
+            <property name="cm:published">
+               <title>Published</title>
+               <type>d:datetime</type>
+            </property>
+            <property name="cm:updated">
+               <title>Updated</title>
                <type>d:datetime</type>
-               <mandatory>true</mandatory>
             </property>
          </properties>
       </aspect>