inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.4-BUG-FIX to HEAD

Browse Source 
31987:Proper fix for ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6
         - Just handle missing defined ACLs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-11-15 13:51:29 +00:00
parent 5c2a68bdd2
commit 0b7432b4d0
3 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/messages/patch-service.properties
View File

@@ -435,6 +435,7 @@ patch.nodeTemplatesFolder.description=Patch to create new Data Dictionary folder
patch.sitesSpacePermissions.description=Patch to remove the EVERYONE Contributor permissions on the Sites Space (parent container of all Sites)
patch.sitesSpacePermissions.result=Permissions corrected.
patch.sitesSpacePermissions.result.none=Permissions corrections not required.
patch.updateWorkflowNotificationTemplates.description=Patch to update the workflow notification templates.
patch.updateWorkflowNotificationTemplates.result=Workflow Notification Templates successfully updated.

10
config/alfresco/patch/patch-services-context.xml
View File

@@ -2918,11 +2918,6 @@
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>5011</value></property>
<property name="targetSchema"><value>5012</value></property>
<property name="alternatives" >
<list>
<ref bean="patch.sitesFolder" />
</list>
</property>
<property name="requiresTransaction"><value>false</value></property>
<property name="fileFolderService" ref="fileFolderService" />
<property name="contentService" ref="contentService" />
@@ -3044,11 +3039,6 @@
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>5017</value></property>
<property name="targetSchema"><value>5018</value></property>
<property name="alternatives" >
<list>
<ref bean="patch.sitesFolder" />
</list>
</property>
<property name="requiresTransaction"><value>true</value></property>
<property name="applyToTenants"><value>true</value></property>
<property name="permissionService" ref="permissionService" />

49
source/java/org/alfresco/repo/admin/patch/impl/SitesSpacePermissionsPatch.java
View File

@@ -44,13 +44,13 @@ public class SitesSpacePermissionsPatch extends AbstractPatch
{
// Message IDs
private static final String MSG_SUCCESS = "patch.sitesSpacePermissions.result";
private static final String MSG_SUCCESS_NONE = "patch.sitesSpacePermissions.result.none";
// Folders' names for path building
private static final String PROPERTY_COMPANY_HOME_CHILDNAME = "spaces.company_home.childname";
private static final String PROPERTY_SITES_CHILDNAME = "spaces.sites.childname";
// Things we've found
private NodeRef companyHomeNodeRef;
private NodeRef sitesNodeRef;
// Dependencies
@@ -102,27 +102,13 @@ public class SitesSpacePermissionsPatch extends AbstractPatch
throw new PatchException("Bootstrap property '" + PROPERTY_SITES_CHILDNAME + "' is not present");
}
// Build the search string to get the company home node
// build the search string to get the sites node
StringBuilder sb = new StringBuilder(256);
sb.append("/").append(companyHomeChildName);
String xpath = sb.toString();
// get the company home
List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, xpath, null, namespaceService, false);
if (nodeRefs.size() == 0)
{
throw new PatchException("XPath didn't return any results: \n" + " root: " + storeRootNodeRef + "\n" + " xpath: " + xpath);
}
else if (nodeRefs.size() > 1)
{
throw new PatchException("XPath returned too many results: \n" + " root: " + storeRootNodeRef + "\n" + " xpath: " + xpath + "\n" + " results: " + nodeRefs);
}
this.companyHomeNodeRef = nodeRefs.get(0);
// build the search string to get the sites node
sb.append("/").append(sitesChildName);
xpath = sb.toString();
String xpath = sb.toString();
// get the sites node
nodeRefs = searchService.selectNodes(storeRootNodeRef, xpath, null, namespaceService, false);
List<NodeRef> nodeRefs = searchService.selectNodes(storeRootNodeRef, xpath, null, namespaceService, false);
if (nodeRefs.size() == 0)
{
throw new PatchException("XPath didn't return any results: \n" + " root: " + storeRootNodeRef + "\n" + " xpath: " + xpath);
@@ -146,15 +132,28 @@ public class SitesSpacePermissionsPatch extends AbstractPatch
throw new IllegalStateException("Sites Space not found in Company Home!");
}
// Remove the permission
permissionService.deletePermission(
sitesSpace,
PermissionService.ALL_AUTHORITIES,
PermissionService.CONTRIBUTOR
);
String msg = I18NUtil.getMessage(MSG_SUCCESS);
try
{
// Remove the permission
permissionService.deletePermission(
sitesSpace,
PermissionService.ALL_AUTHORITIES,
PermissionService.CONTRIBUTOR
);
}
catch (IllegalStateException e)
{
if (e.getMessage().contains("SHARED"))
{
// ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6
// We are catching "Can not delete from this acl in a node context SHARED"
msg = I18NUtil.getMessage(MSG_SUCCESS_NONE);
}
// Something else
}
// All done
String msg = I18NUtil.getMessage(MSG_SUCCESS);
return msg;
}
}