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

Merged DEV/BUGFIXING/HEAD-2014_12_09 to HEAD

Browse Source 
r92608: RM-1659: Make sure node substitution suggester is loaded after the custom model
Minor formatting changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@92867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Balan
2015-01-05 14:33:07 +00:00
parent cf3045306c
commit 4298eb6425
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,7 +201,7 @@
</bean>
<!-- Bootstrap node parameter processor -->
<bean id="nodeParameterSuggesterBootstrap" class="org.alfresco.repo.action.parameter.NodeParameterSuggesterBootstrap" init-method="init">
<bean id="nodeParameterSuggesterBootstrap" class="org.alfresco.repo.action.parameter.NodeParameterSuggesterBootstrap" >
<property name="namespaceService" ref="namespaceService"/>
<property name="nodeParameterProcessor" ref="nodeParameterProcessor"/>
<property name="nodeParameterProcessorAspects">

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

@@ -174,6 +174,7 @@
<property name="caveatConfigService" ref="caveatConfigService"/>
<property name="customEmailMappingService" ref="customEmailMappingService"/>
<property name="recordsManagementAdminService" ref="RecordsManagementAdminService"/>
<property name="suggesterBootstrap" ref="nodeParameterSuggesterBootstrap"/>
</bean>
<!-- Java script interface for rm caveat config-->

16
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/RecordsManagementBootstrap.java
View File

@@ -22,6 +22,7 @@ import org.alfresco.module.org_alfresco_module_rm.admin.RecordsManagementAdminSe
import org.alfresco.module.org_alfresco_module_rm.action.impl.SplitEmailAction;
import org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService;
import org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService;
import org.alfresco.repo.action.parameter.NodeParameterSuggesterBootstrap;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -41,6 +42,17 @@ public class RecordsManagementBootstrap extends AbstractLifecycleBean
private RMCaveatConfigService caveatConfigService;
private CustomEmailMappingService customEmailMappingService;
private RecordsManagementAdminService adminService;
private NodeParameterSuggesterBootstrap suggesterBootstrap;
public NodeParameterSuggesterBootstrap getSuggesterBootstrap()
{
return suggesterBootstrap;
}
public void setSuggesterBootstrap(NodeParameterSuggesterBootstrap suggesterBootstrap)
{
this.suggesterBootstrap = suggesterBootstrap;
}
public void setTransactionService(TransactionService transactionService)
{
@@ -85,6 +97,10 @@ public class RecordsManagementBootstrap extends AbstractLifecycleBean
// Initialise the custom model
adminService.initialiseCustomModel();
// Initialize the suggester after the model
// in case it contains namespaces from custom models
suggesterBootstrap.init();
// Initialise the SplitEmailAction
SplitEmailAction action = (SplitEmailAction)getApplicationContext().getBean("splitEmail");
action.bootstrap();