From fa6024592d2594df5e8754b48e17ed031bb3129e Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 24 Jul 2008 14:44:45 +0000
Subject: [PATCH] User Profile enhancements:  - Upload of Avatar image - added
 as a child node via preferences aspect to the cm:person node for the current
 user  - Ajax update of image in profile read/edit views  - Auto generated
 thumbnail used for avatar immediately after upload Tweak of file-upload
 component to allow override of destination URL for POST of content Added new
 flag to thumbnail GET call to force thumbnail creation synchronously without
 waiting Fix to Person PUT API (Unit Test now executes correctly)

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

diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index 4c7ae6b6ac..4ad9e3170f 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -907,13 +907,26 @@
       </aspect>
       
       <aspect name="cm:preferences">
-	     <title>Preferences</title>
-	     <properties>
-	        <property name="cm:preferenceValues">
-	           <type>d:content</type>
-	        </property>
-	     </properties>
-	  </aspect>
+	     	<title>Preferences</title>
+	     	<properties>
+	        	<property name="cm:preferenceValues">
+	           	<type>d:content</type>
+	        	</property>
+			</properties>
+         <associations>
+            <child-association name="cm:preferenceImage">
+               <source>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </source>
+               <target>
+                  <class>cm:content</class>
+                  <mandatory>false</mandatory>
+                  <many>false</many>
+               </target>
+            </child-association>
+         </associations>
+      </aspect>
       
       <aspect name="cm:contentupdated">
          <title>Content updated</title>
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index bec4c80ec2..5f56610078 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -266,7 +266,8 @@ public interface ContentModel
     // Preference Aspect
     static final QName ASPECT_PREFERENCES = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "preferences");
     static final QName PROP_PREFERENCE_VALUES = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "preferenceValues");
-
+    static final QName ASSOC_PREFERENCE_IMAGE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "preferenceImage");
+    
     //
     // User Model Definitions
     //