From b53f50865e424f6e05a3205e52a46648ecda909e Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Thu, 18 Feb 2010 14:50:06 +0000
Subject: [PATCH] Merged V3.2 to HEAD     17850 : Addition of AVM - DM
 deployment.     17905 : ETHREEOH-3809 - WCM - First test server deploy fails.
 	- added yet another transaction to read the previous snapshot
 transaction. 	 - added a new system test based upon the WCM services.    The
 beginnings of testing against layered authored sandboxes.     17907 :
 ETHREEOH-3806 - WCM Contributor cant release test server. 	 -  release
 test server now runs without permissions checks (like the deploy action does)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/import-export-context.xml            |  1 +
 config/alfresco/model/wcmAppModel.xml                | 12 ++++++++++++
 config/alfresco/repository.properties                |  1 +
 source/java/org/alfresco/model/WCMAppModel.java      |  5 +++++
 .../repo/model/filefolder/FileFolderServiceImpl.java |  2 +-
 .../repo/node/integrity/IntegrityRecord.java         |  3 ++-
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index 0a83e61275..562ffd7bf3 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -354,6 +354,7 @@
                 <prop key="spaces.imap_templates.childname">${spaces.imap_templates.childname}</prop>
                 <prop key="spaces.emailActions.childname">${spaces.emailActions.childname}</prop>
                 <prop key="spaces.searchAction.childname">${spaces.searchAction.childname}</prop>
+                <prop key="spaces.wcm_deployed.childname">${spaces.wcm_deployed.childname}</prop>
             </props>
         </property>
     </bean>
diff --git a/config/alfresco/model/wcmAppModel.xml b/config/alfresco/model/wcmAppModel.xml
index 1b7a1e1f16..6ba99d531a 100644
--- a/config/alfresco/model/wcmAppModel.xml
+++ b/config/alfresco/model/wcmAppModel.xml
@@ -652,6 +652,18 @@
             </property>
          </properties>
       </aspect>
+      
+      <aspect name="wca:deployed">
+         <title>Has this content been deployed from wcm</title>
+         <properties>
+            <property name="wca:guid">
+               <title>WCM unique version</title>
+               <type>d:text</type>
+               <mandatory enforced="true">true</mandatory>
+            </property>
+         </properties>
+      </aspect>
+      
    </aspects>
 
 </model>
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index ce14685a9c..04f13b336d 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -310,6 +310,7 @@ spaces.content_forms.childname=app:forms
 spaces.user_homes.childname=app:user_homes
 spaces.sites.childname=st:sites
 spaces.templates.email.invite.childname=cm:invite
+spaces.wcm_deployed.childname=cm:wcm_deployed
 
 # ADM VersionStore Configuration
 version.store.deprecated.lightWeightVersionStore=workspace://lightWeightVersionStore
diff --git a/source/java/org/alfresco/model/WCMAppModel.java b/source/java/org/alfresco/model/WCMAppModel.java
index e94374f08e..2699ecc233 100644
--- a/source/java/org/alfresco/model/WCMAppModel.java
+++ b/source/java/org/alfresco/model/WCMAppModel.java
@@ -165,4 +165,9 @@ public interface WCMAppModel
     // Aspect to track content that expires
     static final QName ASPECT_EXPIRES = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "expires");
     static final QName PROP_EXPIRATIONDATE = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "expirationDate");
+
+    // Aspect to track dm deployed content
+    static final QName ASPECT_DEPLOYED = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "deployed");
+    static final QName PROP_GUID = QName.createQName(NamespaceService.WCMAPP_MODEL_1_0_URI, "guid");
+
 }
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
index c0efad2cf7..495e909cfe 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
@@ -965,7 +965,7 @@ public class FileFolderServiceImpl implements FileFolderService
      * @param parentNodeRef
      * @param pathElements
      * @param folderTypeQName
-     * @return
+     * @return FileInfo for the bottom node in pathElements.
      */
     public static FileInfo makeFolders(FileFolderService service, NodeRef parentNodeRef, List<String> pathElements, QName folderTypeQName)
     {
diff --git a/source/java/org/alfresco/repo/node/integrity/IntegrityRecord.java b/source/java/org/alfresco/repo/node/integrity/IntegrityRecord.java
index 5eaac93090..2438fd2d68 100644
--- a/source/java/org/alfresco/repo/node/integrity/IntegrityRecord.java
+++ b/source/java/org/alfresco/repo/node/integrity/IntegrityRecord.java
@@ -25,13 +25,14 @@
 package org.alfresco.repo.node.integrity;
 
 import java.util.List;
+import java.io.Serializable;
 
 /**
  * Represents an integrity violation
  * 
  * @author Derek Hulley
  */
-public class IntegrityRecord
+public class IntegrityRecord implements Serializable
 {
     private String msg;
     private List<StackTraceElement[]> traces;