[Aplaws-commit] r1013 - in releases/1.0.3/ccm-cms/src: WEB-INF/resources com/arsdigita/cms/installer

[<ap...@vh...>]

Author: apevec
Date: 2005-11-25 23:56:40 +0100 (Fri, 25 Nov 2005)
New Revision: 1013

Modified:
   releases/1.0.3/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml
   releases/1.0.3/ccm-cms/src/com/arsdigita/cms/installer/Initializer.java
Log:
merge r1008 from trunk:
  add auditing info in ContentItem XML output


Modified: releases/1.0.3/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml
===================================================================
--- releases/1.0.3/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml	2005-11-24 14:57:51 UTC (rev 1012)
+++ releases/1.0.3/ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml	2005-11-25 22:56:40 UTC (rev 1013)
@@ -32,6 +32,9 @@
     </xrd:adapter>
 
     <xrd:adapter objectType="com.arsdigita.cms.ContentPage" extends="com.arsdigita.cms.ContentItem" traversalClass="com.arsdigita.cms.contenttypes.ContentItemTraversalAdapter">
+      <xrd:associations rule="include">
+        <xrd:property name="/object/auditing"/>
+      </xrd:associations>
     </xrd:adapter>
 
     <!-- Adds a text asset -->

Modified: releases/1.0.3/ccm-cms/src/com/arsdigita/cms/installer/Initializer.java
===================================================================
--- releases/1.0.3/ccm-cms/src/com/arsdigita/cms/installer/Initializer.java	2005-11-24 14:57:51 UTC (rev 1012)
+++ releases/1.0.3/ccm-cms/src/com/arsdigita/cms/installer/Initializer.java	2005-11-25 22:56:40 UTC (rev 1013)
@@ -18,10 +18,15 @@
  */
 package com.arsdigita.cms.installer;
 
+import com.arsdigita.auditing.BasicAuditTrail;
 import com.arsdigita.cms.dispatcher.ContentCenterDispatcher;
 import com.arsdigita.cms.dispatcher.ItemDispatcher;
+import com.arsdigita.domain.DomainObject;
+import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.domain.DomainObjectInstantiator;
 import com.arsdigita.initializer.Configuration;
 import com.arsdigita.initializer.InitializationException;
+import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.TransactionContext;
 
@@ -138,6 +143,14 @@
         } finally {
             txn.commitTxn();
         }
+
+    	DomainObjectFactory.registerInstantiator
+    		("com.arsdigita.auditing.BasicAuditTrail",
+    		 new DomainObjectInstantiator() {
+    		     public DomainObject doNewInstance(DataObject dataObject) {
+    		    	 return new BasicAuditTrail(dataObject);
+    		     }
+    		 });
     }
 
     protected void doShutdown() {}