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

RM-692: Code refactoring

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@50475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-05-29 18:25:10 +00:00
parent 4250c76095
commit 47b47cada8
6 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1414,7 +1414,7 @@
<property name="importerService" ref="ImporterService"/> <property name="importerService" ref="ImporterService"/>
<property name="searchService" ref="SearchService"/> <property name="searchService" ref="SearchService"/>
<property name="nodeService" ref="NodeService"/> <property name="nodeService" ref="NodeService"/>
<property name="recordsManagementService" ref="RecordsManagementService"/> <property name="filePlanService" ref="FilePlanService"/>
<property name="permissionService" ref="PermissionService"/> <property name="permissionService" ref="PermissionService"/>
<property name="authorityService" ref="AuthorityService"/> <property name="authorityService" ref="AuthorityService"/>
<property name="filePlanRoleService" ref="FilePlanRoleService"/> <property name="filePlanRoleService" ref="FilePlanRoleService"/>

22
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetServiceImpl.java
View File

@@ -11,15 +11,15 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel; import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService; import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RecordsManagementSearchBehaviour; import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RecordsManagementSearchBehaviour;
import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderServiceImpl; import org.alfresco.module.org_alfresco_module_rm.recordfolder.RecordFolderServiceImpl;
@@ -69,8 +69,8 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
/** Node service */ /** Node service */
private NodeService nodeService; private NodeService nodeService;
/** Records management service */ /** File plan service service */
private RecordsManagementService recordsManagementService; private FilePlanService filePlanService;
/** Permission service */ /** Permission service */
private PermissionService permissionService; private PermissionService permissionService;
@@ -130,13 +130,13 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
} }
/** /**
* Set records management service * Set file plan service
* *
* @param recordsManagementService the records management service * @param filePlanService the file plan service
*/ */
public void setRecordsManagementService(RecordsManagementService recordsManagementService) public void setFilePlanService(FilePlanService filePlanService)
{ {
this.recordsManagementService = recordsManagementService; this.filePlanService = filePlanService;
} }
/** /**
@@ -358,7 +358,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
{ {
public Object doWork() throws Exception public Object doWork() throws Exception
{ {
java.util.List<NodeRef> rmRoots = recordsManagementService.getFilePlans(); Set<NodeRef> rmRoots = filePlanService.getFilePlans();
logger.info("Bootstraping " + rmRoots.size() + " rm roots ..."); logger.info("Bootstraping " + rmRoots.size() + " rm roots ...");
for (NodeRef rmRoot : rmRoots) for (NodeRef rmRoot : rmRoots)
{ {
@@ -368,7 +368,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
permissionService.setInheritParentPermissions(rmRoot, false); permissionService.setInheritParentPermissions(rmRoot, false);
} }
String allRoleShortName = "AllRoles" + rmRoot.getId(); String allRoleShortName = RMAuthority.ALL_ROLES_PREFIX + rmRoot.getId();
String allRoleGroupName = authorityService.getName(AuthorityType.GROUP, allRoleShortName); String allRoleGroupName = authorityService.getName(AuthorityType.GROUP, allRoleShortName);
if (authorityService.authorityExists(allRoleGroupName) == false) if (authorityService.authorityExists(allRoleGroupName) == false)
@@ -377,7 +377,7 @@ public class DataSetServiceImpl implements DataSetService, RecordsManagementMode
// Create "all" role group for root node // Create "all" role group for root node
String allRoles = authorityService.createAuthority(AuthorityType.GROUP, allRoleShortName, String allRoles = authorityService.createAuthority(AuthorityType.GROUP, allRoleShortName,
"All Roles", new HashSet<String>(Arrays.asList(RMAuthority.ZONE_APP_RM))); RMAuthority.ALL_ROLES_DISPLAY_NAME, new HashSet<String>(Arrays.asList(RMAuthority.ZONE_APP_RM)));
// Put all the role groups in it // Put all the role groups in it
Set<Role> roles = filePlanRoleService.getRoles(rmRoot); Set<Role> roles = filePlanRoleService.getRoles(rmRoot);

5
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/patch/RMv21RolesPatch.java
View File

@@ -29,7 +29,6 @@ import org.alfresco.repo.module.AbstractModuleComponent;
import org.alfresco.repo.security.authority.RMAuthority; import org.alfresco.repo.security.authority.RMAuthority;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.BeanNameAware;
/** /**
@@ -73,8 +72,8 @@ public class RMv21RolesPatch extends AbstractModuleComponent implements BeanName
addAuthorityToZone(roleGroupName); addAuthorityToZone(roleGroupName);
if (parentAddedToZone == false) if (parentAddedToZone == false)
{ {
String allRolesGroup = authorityService.getName(AuthorityType.GROUP, "AllRoles" + filePlan.getId()); String allRolesGroupName = filePlanRoleService.getAllRolesContainerGroup(filePlan);
addAuthorityToZone(allRolesGroup); addAuthorityToZone(allRolesGroupName);
parentAddedToZone = true; parentAddedToZone = true;
} }
} }

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
View File

@@ -247,7 +247,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
*/ */
private String getAllRolesGroupShortName(NodeRef rmRootNode) private String getAllRolesGroupShortName(NodeRef rmRootNode)
{ {
return "AllRoles" + rmRootNode.getId(); return RMAuthority.ALL_ROLES_PREFIX + rmRootNode.getId();
} }
/** /**

4
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/BootstrapTestDataGet.java
View File

@@ -253,7 +253,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript
permissionService.setInheritParentPermissions(rmRoot, false); permissionService.setInheritParentPermissions(rmRoot, false);
} }
String allRoleShortName = "AllRoles" + rmRoot.getId(); String allRoleShortName = RMAuthority.ALL_ROLES_PREFIX + rmRoot.getId();
String allRoleGroupName = authorityService.getName(AuthorityType.GROUP, allRoleShortName); String allRoleGroupName = authorityService.getName(AuthorityType.GROUP, allRoleShortName);
if (authorityService.authorityExists(allRoleGroupName) == false) if (authorityService.authorityExists(allRoleGroupName) == false)
@@ -263,7 +263,7 @@ public class BootstrapTestDataGet extends DeclarativeWebScript
// Create "all" role group for root node // Create "all" role group for root node
String allRoles = authorityService.createAuthority(AuthorityType.GROUP, String allRoles = authorityService.createAuthority(AuthorityType.GROUP,
allRoleShortName, allRoleShortName,
"All Roles", RMAuthority.ALL_ROLES_DISPLAY_NAME,
new HashSet<String>(Arrays.asList(RMAuthority.ZONE_APP_RM))); new HashSet<String>(Arrays.asList(RMAuthority.ZONE_APP_RM)));
// Put all the role groups in it // Put all the role groups in it

10
rm-server/source/java/org/alfresco/repo/security/authority/RMAuthority.java
View File

@@ -30,4 +30,14 @@ public interface RMAuthority
* The default rm zone. * The default rm zone.
*/ */
public static String ZONE_APP_RM = "APP.RM"; public static String ZONE_APP_RM = "APP.RM";
/**
* The constant for all roles display name
*/
public static String ALL_ROLES_DISPLAY_NAME = "All Roles";
/**
* The constant for all roles prefix
*/
public static String ALL_ROLES_PREFIX = "AllRoles";
} }