From fd6c9b565cb87cb70cd6b2d07bd2bd011bdaed24 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 11 Jan 2017 10:36:02 +0000
Subject: [PATCH] Merged 5.2.0 (5.2.0) to HEAD (5.2)    133882 rmunteanu:
 REPO-1746: Merge fixes for 5.2 GA issues to 5.2.0 branch       Merged 5.2.N
 (5.2.1) to 5.2.0 (5.2.0)          133704 mward: Merged
 mward/5.2.n-repo1636-customonly (5.2.1) to 5.2.N (5.2.1)             133687
 mward: REPO-1636 no longer require explicit list of cm:person properties to
 exclude.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/rest/api/impl/PeopleImpl.java    | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/source/java/org/alfresco/rest/api/impl/PeopleImpl.java b/source/java/org/alfresco/rest/api/impl/PeopleImpl.java
index c184f8dc6e..adb521cee9 100644
--- a/source/java/org/alfresco/rest/api/impl/PeopleImpl.java
+++ b/source/java/org/alfresco/rest/api/impl/PeopleImpl.java
@@ -85,33 +85,7 @@ public class PeopleImpl implements People
             "http://www.alfresco.org/model/user/1.0",
             NamespaceService.CONTENT_MODEL_1_0_URI);
 	private static final List<QName> EXCLUDED_ASPECTS = Arrays.asList();
-    // TODO: no longer needed? (can be empty)
-	private static final List<QName> EXCLUDED_PROPS = Arrays.asList(
-			ContentModel.PROP_USERNAME,
-			ContentModel.PROP_FIRSTNAME,
-			ContentModel.PROP_LASTNAME,
-			ContentModel.PROP_JOBTITLE,
-			ContentModel.PROP_LOCATION,
-			ContentModel.PROP_TELEPHONE,
-			ContentModel.PROP_MOBILE,
-			ContentModel.PROP_EMAIL,
-			ContentModel.PROP_ORGANIZATION,
-			ContentModel.PROP_COMPANYADDRESS1,
-			ContentModel.PROP_COMPANYADDRESS2,
-			ContentModel.PROP_COMPANYADDRESS3,
-			ContentModel.PROP_COMPANYPOSTCODE,
-			ContentModel.PROP_COMPANYTELEPHONE,
-			ContentModel.PROP_COMPANYFAX,
-			ContentModel.PROP_COMPANYEMAIL,
-			ContentModel.PROP_SKYPE,
-			ContentModel.PROP_INSTANTMSG,
-			ContentModel.PROP_USER_STATUS,
-			ContentModel.PROP_USER_STATUS_TIME,
-			ContentModel.PROP_GOOGLEUSERNAME,
-			ContentModel.PROP_SIZE_QUOTA,
-			ContentModel.PROP_SIZE_CURRENT,
-			ContentModel.PROP_EMAIL_FEED_DISABLED,
-            ContentModel.PROP_PREFERENCE_VALUES);
+	private static final List<QName> EXCLUDED_PROPS = Arrays.asList();
 	protected Nodes nodes;
 	protected Sites sites;