From caa03b12b9f8e5090984be70360ef15b2e037b18 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Thu, 13 Mar 2008 13:43:38 +0000
Subject: [PATCH] Merge Offline Edit dev branch to HEAD

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8527 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/contentModel.xml           | 3 +++
 source/java/org/alfresco/model/ContentModel.java | 1 +
 2 files changed, 4 insertions(+)

diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index cd6e926218..d74b5ae624 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -638,6 +638,9 @@
                <protected>true</protected>
                <mandatory>true</mandatory>
             </property>
+            <property name="cm:workingCopyMode">
+               <type>d:text</type>
+            </property>
            </properties>
       </aspect>
    
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index b3c5bdb346..934e4b9688 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -105,6 +105,7 @@ public interface ContentModel
     // working copy aspect contants
     static final QName ASPECT_WORKING_COPY = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "workingcopy");
     static final QName PROP_WORKING_COPY_OWNER = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "workingCopyOwner");
+    static final QName PROP_WORKING_COPY_MODE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "workingCopyMode");
     
     // content type and aspect constants
     static final QName TYPE_CONTENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "content");