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

Fixed failing unit tests after refactoring

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@58093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-11-21 16:49:16 +00:00
parent b30410c1db
commit baa9f2b914
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -1254,7 +1254,7 @@
<property name="nodeService" ref="NodeService"/>
<property name="dictionaryService" ref="DictionaryService"/>
<property name="identifierService" ref="recordsManagementIdentifierService"/>
<property name="permissionService" ref="ExtendedPermissionService"/>
<property name="extendedPermissionService" ref="ExtendedPermissionService"/>
<property name="extendedSecurityService" ref="ExtendedSecurityService" />
<property name="policyComponent" ref="policyComponent" />
<property name="dispositionService" ref="DispositionService" />
@@ -1267,6 +1267,7 @@
<property name="recordFolderService" ref="RecordFolderService" />
<property name="vitalRecordService" ref="VitalRecordService" />
<property name="filePlanRoleService" ref="FilePlanRoleService" />
<property name="permissionService" ref="permissionService" />
</bean>
<bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean">

27
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -153,8 +153,8 @@ public class RecordServiceImpl implements RecordService,
/** Dictionary service */
private DictionaryService dictionaryService;
/** Permission service */
private ExtendedPermissionService permissionService;
/** Extended permission service */
private ExtendedPermissionService extendedPermissionService;
/** Extended security service */
private ExtendedSecurityService extendedSecurityService;
@@ -192,6 +192,9 @@ public class RecordServiceImpl implements RecordService,
/** File plan role service */
private FilePlanRoleService filePlanRoleService;
/** Permission service */
private PermissionService permissionService;
/** List of available record meta-data aspects */
private Set<QName> recordMetaDataAspects;
@@ -234,11 +237,11 @@ public class RecordServiceImpl implements RecordService,
}
/**
* @param permissionService permission service
* @param extendedPermissionService extended permission service
*/
public void setPermissionService(ExtendedPermissionService permissionService)
public void setExtendedPermissionService(ExtendedPermissionService extendedPermissionService)
{
this.permissionService = permissionService;
this.extendedPermissionService = extendedPermissionService;
}
/**
@@ -337,6 +340,14 @@ public class RecordServiceImpl implements RecordService,
this.filePlanRoleService = filePlanRoleService;
}
/**
* @param permissionService permission service
*/
public void setPermissionService(PermissionService permissionService)
{
this.permissionService = permissionService;
}
/**
* Init method
*/
@@ -667,7 +678,7 @@ public class RecordServiceImpl implements RecordService,
ParameterCheck.mandatory("isLinked", isLinked);
// first we do a sanity check to ensure that the user has at least write permissions on the document
if (permissionService.hasPermission(nodeRef, PermissionService.WRITE) != AccessStatus.ALLOWED)
if (extendedPermissionService.hasPermission(nodeRef, PermissionService.WRITE) != AccessStatus.ALLOWED)
{
throw new AccessDeniedException("Can not create record from document, because the user " +
AuthenticationUtil.getFullyAuthenticatedUser() +
@@ -699,8 +710,8 @@ public class RecordServiceImpl implements RecordService,
// get the documents readers
Long aclId = nodeService.getNodeAclId(nodeRef);
Set<String> readers = permissionService.getReaders(aclId);
Set<String> writers = permissionService.getWriters(aclId);
Set<String> readers = extendedPermissionService.getReaders(aclId);
Set<String> writers = extendedPermissionService.getWriters(aclId);
// add the current owner to the list of extended writers
String owner = ownableService.getOwner(nodeRef);