From 789b5dc548718669344f618b95ffed0f217ac33f Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 17 Jul 2008 14:38:55 +0000
Subject: [PATCH] Enhanced User properties available ready for User Profile
 component - added new properties to content model definition, ContentModel
 constants file and Slingshot User objects. Added AlfrescoUser object, to be
 responsible for persisting changes to User Profile. Added concept of
 ThreadLocalRequestContext - similar to FacesContext in that it has a static
 accessor method to retrieve the "current" instance. Removal of
 'alfresco-system' endpoint from web-framework and replaced usage with
 'alfresco' endpoint:  - removes the need for admin user detailed to be stored
 in web-framework config files (!) and being constantly transmitted between
 tiers  - refactored appropriate webscripts to accept non-admin authentication
 but added code checks to ensure non-admin users can only bring back meta-data
 about themselves  - refactored AVMRemoteStore and RemoteStore client to use
 authenticated endpoint rather than system admin authentication driven
 endpoint  - this also reduces the the traffic between tiers and vastly
 reduces the number of login tickets requested Added open HTTP endpoint - for
 use by RSS feed components etc. that point to any website feed - configured
 as 'unsecure' endpoint so purposely cannot be accessed via proxy URLs.

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

diff --git a/config/alfresco/model/contentModel.xml b/config/alfresco/model/contentModel.xml
index c70d504097..4c7ae6b6ac 100644
--- a/config/alfresco/model/contentModel.xml
+++ b/config/alfresco/model/contentModel.xml
@@ -197,6 +197,39 @@
             <property name="cm:persondescription">
             	<type>d:content</type>
             </property>
+            <property name="cm:telephone">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:mobile">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:companyaddress1">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:companyaddress2">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:companyaddress3">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:companypostcode">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:companytelephone">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:companyfax">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:companyemail">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:skype">
+            	<type>d:text</type>
+            </property>
+            <property name="cm:instantmsg">
+            	<type>d:text</type>
+            </property>
             
             <!-- system maintained values -->
             <property name="cm:sizeCurrent">
diff --git a/source/java/org/alfresco/model/ContentModel.java b/source/java/org/alfresco/model/ContentModel.java
index 18cc85e8d9..bec4c80ec2 100644
--- a/source/java/org/alfresco/model/ContentModel.java
+++ b/source/java/org/alfresco/model/ContentModel.java
@@ -180,6 +180,17 @@ public interface ContentModel
     static final QName PROP_JOBTITLE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "jobtitle");
     static final QName PROP_LOCATION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "location");
     static final QName PROP_PERSONDESC = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "persondescription");
+    static final QName PROP_TELEPHONE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "telephone");
+    static final QName PROP_MOBILE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "mobile");
+    static final QName PROP_COMPANYADDRESS1 = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "companyaddress1");
+    static final QName PROP_COMPANYADDRESS2 = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "companyaddress2");
+    static final QName PROP_COMPANYADDRESS3 = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "companyaddress3");
+    static final QName PROP_COMPANYPOSTCODE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "companypostcode");
+    static final QName PROP_COMPANYTELEPHONE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "companytelephone");
+    static final QName PROP_COMPANYFAX = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "companyfax");
+    static final QName PROP_COMPANYEMAIL = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "companyemail");
+    static final QName PROP_SKYPE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "skype");
+    static final QName PROP_INSTANTMSG = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "instantmsg");
     
     static final QName PROP_SIZE_CURRENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sizeCurrent");
     static final QName PROP_SIZE_QUOTA = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "sizeQuota");