From a4a51473de7b80d37fe23d49943f1595ede4e151 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Thu, 26 Aug 2010 10:05:19 +0000
Subject: [PATCH] Fixed ALF-4490: VersionModel.versionType is not declared in
 the model  - Was being used as a residual property (d:any)  - To avoid
 storage as a serializable, the property is now d:text  - Added conversion
 from String back to VersionType enum

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/model/contentModel.xml        |  5 ++
 .../repo/version/common/VersionImpl.java      | 64 ++++++++++---------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index 6ee8bb0889..ddd175049d 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -876,6 +876,11 @@
                <type>d:text</type>
                <protected>true</protected>
             </property>
+            <property name="cm:versionType">
+               <title>Version Type</title>
+               <type>d:text</type>
+               <protected>true</protected>
+            </property>
             <property name="cm:initialVersion">
                <title>Initial Version</title>
                <type>d:boolean</type>
diff --git a/source/java/org/alfresco/repo/version/common/VersionImpl.java b/source/java/org/alfresco/repo/version/common/VersionImpl.java
index dea6acebe5..632b5bad91 100644
--- a/source/java/org/alfresco/repo/version/common/VersionImpl.java
+++ b/source/java/org/alfresco/repo/version/common/VersionImpl.java
@@ -90,41 +90,41 @@ public class VersionImpl implements Version
     {
         return versionProperties.toString();
     }
-    
-    public Date getFrozenModifiedDate()
-    {
-        Date modifiedDate = (Date)this.versionProperties.get(Version2Model.PROP_FROZEN_MODIFIED);
-        if (modifiedDate == null)
-        {
-            // Assume deprecated V1 version store
-            modifiedDate = (Date)this.versionProperties.get(VersionBaseModel.PROP_CREATED_DATE);
-        }
-        return modifiedDate;
-    }
-    
-    public String getFrozenModifier()
-    {
-        String modifier = (String)this.versionProperties.get(Version2Model.PROP_FROZEN_MODIFIER);
-        if (modifier == null)
-        {
-            // Assume deprecated V1 version store
-            modifier = (String)this.versionProperties.get(VersionBaseModel.PROP_CREATOR);
-        }
-        return modifier;
-    }
-    
+    
+    public Date getFrozenModifiedDate()
+    {
+        Date modifiedDate = (Date)this.versionProperties.get(Version2Model.PROP_FROZEN_MODIFIED);
+        if (modifiedDate == null)
+        {
+            // Assume deprecated V1 version store
+            modifiedDate = (Date)this.versionProperties.get(VersionBaseModel.PROP_CREATED_DATE);
+        }
+        return modifiedDate;
+    }
+    
+    public String getFrozenModifier()
+    {
+        String modifier = (String)this.versionProperties.get(Version2Model.PROP_FROZEN_MODIFIER);
+        if (modifier == null)
+        {
+            // Assume deprecated V1 version store
+            modifier = (String)this.versionProperties.get(VersionBaseModel.PROP_CREATOR);
+        }
+        return modifier;
+    }
+    
     public Date getCreatedDate()
     {
-        // note: internal version node created date can be retrieved via standard node service
-        return getFrozenModifiedDate();
+        // note: internal version node created date can be retrieved via standard node service
+        return getFrozenModifiedDate();
     }
     
     public String getCreator()
     {
-        // note: internal version node creator can be retrieved via standard node service
-        return getFrozenModifier();
+        // note: internal version node creator can be retrieved via standard node service
+        return getFrozenModifier();
     }
-    
+    
     public String getVersionLabel()
     {
         return (String)this.versionProperties.get(VersionBaseModel.PROP_VERSION_LABEL);
@@ -132,7 +132,9 @@ public class VersionImpl implements Version
     
     public VersionType getVersionType()
     {
-        return (VersionType)this.versionProperties.get(VersionBaseModel.PROP_VERSION_TYPE);
+        return DefaultTypeConverter.INSTANCE.convert(
+                VersionType.class,
+                this.versionProperties.get(VersionBaseModel.PROP_VERSION_TYPE));
     }
     
     public String getDescription()
@@ -144,7 +146,7 @@ public class VersionImpl implements Version
     {
         return this.versionProperties;
     }
-    
+    
     public Serializable getVersionProperty(String name)
     {
         Serializable result = null;
@@ -176,7 +178,7 @@ public class VersionImpl implements Version
         
         return versionedNodeRef;
     }
-    
+    
     public NodeRef getFrozenStateNodeRef()
     {
         return this.nodeRef;