From 1e5592c51b081ddc5b850a82fba685d841593e34 Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Mon, 10 Aug 2009 11:03:36 +0000
Subject: [PATCH] Merged V3.2 to HEAD    15657: ETHREEOH-2638: Admin and guest
 users duplicated after upgrade to v3.2. Cannot delete duplicates due to
 missing authentication.       - Split out
 alfrescoAuthorityStoreDefaultMembers.xml, only loaded on initial bootstrap so
 that admin and guest users not duplicated       - Modified
 org.alfresco.repo.jscript.People and org.alfresco.web.bean.users.UsersDialog
 so that person deletion doesn't fail if internal authentication information
 doesn't exist

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../bootstrap/alfrescoAuthorityStore.xml      | 34 --------------
 .../alfrescoAuthorityStoreDefaultMembers.xml  | 45 +++++++++++++++++++
 config/alfresco/import-export-context.xml     |  5 +++
 .../org/alfresco/repo/jscript/People.java     |  9 +++-
 4 files changed, 58 insertions(+), 35 deletions(-)
 create mode 100644 config/alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml

diff --git a/config/alfresco/bootstrap/alfrescoAuthorityStore.xml b/config/alfresco/bootstrap/alfrescoAuthorityStore.xml
index 4c6125cc69..add78b272e 100644
--- a/config/alfresco/bootstrap/alfrescoAuthorityStore.xml
+++ b/config/alfresco/bootstrap/alfrescoAuthorityStore.xml
@@ -22,13 +22,6 @@
                         <cm:name>GROUP_ALFRESCO_ADMINISTRATORS</cm:name>
                         <cm:authorityName>GROUP_ALFRESCO_ADMINISTRATORS</cm:authorityName>
                     </view:properties>
-                    <view:associations>
-                        <cm:member>
-                            <view:reference
-                                view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
-                                view:childName="cm:${alfresco_user_store.adminusername}" />
-                        </cm:member>
-                    </view:associations>
                 </cm:authorityContainer>
                 <cm:authorityContainer view:childName="cm:GROUP_EMAIL_CONTRIBUTORS">
                     <view:aspects>
@@ -39,13 +32,6 @@
                         <sys:node-uuid>GROUP_EMAIL_CONTRIBUTORS</sys:node-uuid>
                         <cm:authorityName>GROUP_EMAIL_CONTRIBUTORS</cm:authorityName>
                     </view:properties>
-                    <view:associations>
-                        <cm:member>
-                            <view:reference
-                                view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
-                                view:childName="cm:${alfresco_user_store.adminusername}" />
-                        </cm:member>
-                    </view:associations>
                 </cm:authorityContainer>
             </sys:children>
         </view:associations>
@@ -69,16 +55,6 @@
                         <cm:name>AUTH.ALF</cm:name>
                     </view:properties>
                     <view:associations>
-                        <cm:inZone>
-                            <view:reference
-                                view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
-                                view:childName="cm:${alfresco_user_store.adminusername}" />
-                        </cm:inZone>
-						<cm:inZone>
-                            <view:reference
-                                view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.guestusername}"
-                                view:childName="cm:${alfresco_user_store.guestusername}" />
-                        </cm:inZone>
 						<cm:inZone>
                             <view:reference
                                 view:pathref="${system.authorities_container.childname}/cm:GROUP_ALFRESCO_ADMINISTRATORS"
@@ -100,16 +76,6 @@
                         <cm:name>APP.DEFAULT</cm:name>
                     </view:properties>
                     <view:associations>
-                        <cm:inZone>
-                            <view:reference
-                                view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
-                                view:childName="cm:${alfresco_user_store.adminusername}" />
-                        </cm:inZone>
-						<cm:inZone>
-                            <view:reference
-                                view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.guestusername}"
-                                view:childName="cm:${alfresco_user_store.guestusername}" />
-                        </cm:inZone>
 						<cm:inZone>
                             <view:reference
                                 view:pathref="${system.authorities_container.childname}/cm:GROUP_ALFRESCO_ADMINISTRATORS"
diff --git a/config/alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml b/config/alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml
new file mode 100644
index 0000000000..7018d3d1b5
--- /dev/null
+++ b/config/alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml
@@ -0,0 +1,45 @@
+<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0"
+   xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0">
+
+   <view:reference view:pathref="${system.authorities_container.childname}/cm:GROUP_ALFRESCO_ADMINISTRATORS">
+      <view:associations>
+         <cm:member>
+            <view:reference view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
+               view:childName="cm:${alfresco_user_store.adminusername}" />
+         </cm:member>
+      </view:associations>
+   </view:reference>
+   <view:reference view:pathref="${system.authorities_container.childname}/cm:GROUP_EMAIL_CONTRIBUTORS">
+      <view:associations>
+         <cm:member>
+            <view:reference view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
+               view:childName="cm:${alfresco_user_store.adminusername}" />
+         </cm:member>
+      </view:associations>
+   </view:reference>
+   <view:reference view:pathref="${system.zones_container.childname}/cm:AUTH.ALF">
+      <view:associations>
+         <cm:inZone>
+            <view:reference view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
+               view:childName="cm:${alfresco_user_store.adminusername}" />
+         </cm:inZone>
+         <cm:inZone>
+            <view:reference view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.guestusername}"
+               view:childName="cm:${alfresco_user_store.guestusername}" />
+         </cm:inZone>
+      </view:associations>
+   </view:reference>
+   <view:reference view:pathref="${system.zones_container.childname}/cm:APP.DEFAULT">
+      <view:associations>
+         <cm:inZone>
+            <view:reference view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.adminusername}"
+               view:childName="cm:${alfresco_user_store.adminusername}" />
+         </cm:inZone>
+         <cm:inZone>
+            <view:reference view:pathref="${system.people_container.childname}/cm:${alfresco_user_store.guestusername}"
+               view:childName="cm:${alfresco_user_store.guestusername}" />
+         </cm:inZone>
+      </view:associations>
+   </view:reference>
+
+</view:view>
\ No newline at end of file
diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index 8d23604302..175789d4f0 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -511,6 +511,11 @@
                     <prop key="location">alfresco/bootstrap/alfrescoAuthorityStore.xml</prop>
                 </props>
                 
+                <props>
+                    <prop key="path">/${system.system_container.childname}</prop>
+                    <prop key="location">alfresco/bootstrap/alfrescoAuthorityStoreDefaultMembers.xml</prop>
+                </props>
+
                 <props>
                     <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.scripts.childname}</prop>
                     <prop key="location">alfresco/bootstrap/imapScripts.xml</prop>
diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java
index 49518ba141..8f2efac685 100644
--- a/source/java/org/alfresco/repo/jscript/People.java
+++ b/source/java/org/alfresco/repo/jscript/People.java
@@ -189,7 +189,14 @@ public final class People extends BaseScopableProcessorExtension
     public void deletePerson(String username)
     {
         personService.deletePerson(username);
-        mutableAuthenticationDao.deleteUser(username);
+        try
+        {
+            mutableAuthenticationDao.deleteUser(username);
+        }
+        catch (AuthenticationException e)
+        {
+            // Let's not worry if authentication details don't exist
+        }
     }
     
     /**