mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
RM-1224 (Rmadmin user is not created if auth chain contains not only ALfrescoNTLM)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@73546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
@@ -14,7 +14,6 @@
|
||||
|
||||
<!-- Create record action -->
|
||||
<bean id="create-record" parent="action-executer" class="org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction">
|
||||
<property name="filePlanAuthenticationService" ref="FilePlanAuthenticationService"/>
|
||||
<property name="recordService" ref="RecordService" />
|
||||
<property name="nodeService" ref="NodeService" />
|
||||
<property name="filePlanService" ref="FilePlanService" />
|
||||
|
||||
@@ -25,17 +25,9 @@ cache.writersSharedCache.maxItems=10000
|
||||
cache.writersSharedCache.cluster.type=fully-distributed
|
||||
|
||||
#
|
||||
# Global RM admin default bootstrap details
|
||||
# Indicates whether RM rules will be run as Admin or not by default
|
||||
#
|
||||
# Note: rmadmin is created with a randomly generated password. This can be changed by 'admin' if
|
||||
# required.
|
||||
#
|
||||
bootstrap.rmadmin.name=rmadmin
|
||||
|
||||
#
|
||||
# Indicates whether RM rules will be run as RM Admin or not by default
|
||||
#
|
||||
rm.rule.runasrmadmin=true
|
||||
rm.rule.runasadmin=true
|
||||
|
||||
#
|
||||
# Auto-complete suggestion parameters
|
||||
|
||||
@@ -219,10 +219,9 @@
|
||||
</property>
|
||||
|
||||
<!-- Since RM 2.1 -->
|
||||
<property name="filePlanAuthenticationService" ref="FilePlanAuthenticationService"/>
|
||||
<property name="filePlanService" ref="FilePlanService" />
|
||||
<property name="runAsRmAdmin">
|
||||
<value>${rm.rule.runasrmadmin}</value>
|
||||
<property name="runAsAdmin">
|
||||
<value>${rm.rule.runasadmin}</value>
|
||||
</property>
|
||||
|
||||
<property name="recordService" ref="RecordService" />
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
bootstrap.rmadmin.firstName=Records Management
|
||||
bootstrap.rmadmin.lastName=System Administrator
|
||||
|
||||
rm.hold.name=Hold
|
||||
|
||||
## Defaut roles
|
||||
|
||||
@@ -52,21 +52,6 @@
|
||||
<property name="capabilityService" ref="CapabilityService"/>
|
||||
</bean>
|
||||
|
||||
<bean id="org_alfresco_module_rm_RMv21RMAdminUserPatch"
|
||||
parent="rm.baseModulePatch"
|
||||
class="org.alfresco.module.org_alfresco_module_rm.patch.v21.RMv21RMAdminUserPatch">
|
||||
<property name="moduleId" value="org_alfresco_module_rm"/>
|
||||
<property name="name" value="org_alfresco_module_rm_RMv21RMAdminUserPatch"/>
|
||||
<property name="description" value="Adds the global RM admin user to all existing file plans."/>
|
||||
<property name="sinceVersion" value="2.1"/>
|
||||
<property name="appliesFromVersion" value="2.1"/>
|
||||
<property name="filePlanService" ref="FilePlanService"/>
|
||||
<property name="filePlanRoleService" ref="FilePlanRoleService"/>
|
||||
<property name="authenticationService" ref="AuthenticationService" />
|
||||
<property name="personService" ref="PersonService" />
|
||||
<property name="filePlanAuthenticationService" ref="FilePlanAuthenticationService" />
|
||||
</bean>
|
||||
|
||||
<bean id="org_alfresco_module_rm_RMv21RecordInheritancePatch"
|
||||
parent="rm.baseModulePatch"
|
||||
class="org.alfresco.module.org_alfresco_module_rm.patch.v21.RMv21RecordInheritancePatch">
|
||||
@@ -118,5 +103,5 @@
|
||||
<property name="fileFolderService" ref="FileFolderService"/>
|
||||
<property name="nodeService" ref="NodeService"/>
|
||||
</bean>
|
||||
|
||||
|
||||
</beans>
|
||||
@@ -41,7 +41,6 @@
|
||||
<bean id="org_alfresco_module_rm_dispositionSelectionStrategy"
|
||||
class="org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSelectionStrategy" >
|
||||
<property name="dispositionService" ref="dispositionService"/>
|
||||
<property name="filePlanAuthenticationService" ref="FilePlanAuthenticationService"/>
|
||||
</bean>
|
||||
|
||||
<!-- Vital Record Service -->
|
||||
@@ -496,10 +495,6 @@
|
||||
<property name="permissionService" ref="PermissionService"/>
|
||||
<property name="nodeService" ref="NodeService"/>
|
||||
<property name="filePlanService" ref="FilePlanService" />
|
||||
<property name="filePlanAuthenticationService" ref="FilePlanAuthenticationService" />
|
||||
<property name="authenticationService" ref="AuthenticationService" />
|
||||
<property name="personService" ref="PersonService" />
|
||||
|
||||
<!-- init repo for when a tenant is created -->
|
||||
<property name="bootstrapImporterModuleComponent" ref="org_alfresco_module_rm_bootstrapData"/>
|
||||
|
||||
@@ -1088,7 +1083,7 @@
|
||||
<property name="objectDefinitionSource">
|
||||
<value>
|
||||
<![CDATA[
|
||||
org.alfresco.module.org_alfresco_module_rm.record.RecordService.registerRecordMetadataAspect=RM_ALLOW
|
||||
org.alfresco.module.org_alfresco_module_rm.record.RecordService.registerRecordMetadataAspect=RM_ALLOW
|
||||
org.alfresco.module.org_alfresco_module_rm.record.RecordService.disablePropertyEditableCheck=RM_ALLOW
|
||||
org.alfresco.module.org_alfresco_module_rm.record.RecordService.enablePropertyEditableCheck=RM_ALLOW
|
||||
org.alfresco.module.org_alfresco_module_rm.record.RecordService.getRecordMetaDataAspects=RM_ALLOW
|
||||
@@ -1112,45 +1107,6 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- File Plan Authentication Service -->
|
||||
|
||||
<bean id="filePlanAuthenticationService"
|
||||
class="org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationServiceImpl">
|
||||
<property name="rmAdminUserName" value="${bootstrap.rmadmin.name}" />
|
||||
<property name="tenantService">
|
||||
<ref bean="tenantService"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="FilePlanAuthenticationService" class="org.springframework.aop.framework.ProxyFactoryBean">
|
||||
<property name="proxyInterfaces">
|
||||
<value>org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService</value>
|
||||
</property>
|
||||
<property name="target">
|
||||
<ref bean="filePlanAuthenticationService"/>
|
||||
</property>
|
||||
<property name="interceptorNames">
|
||||
<list>
|
||||
<idref local="FilePlanAuthenticationService_transaction"/>
|
||||
<idref bean="exceptionTranslator"/>
|
||||
<idref local="FilePlanAuthenticationService_security"/>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="FilePlanAuthenticationService_transaction" parent="baseTransaction"/>
|
||||
|
||||
<bean id="FilePlanAuthenticationService_security" parent="baseSecurity">
|
||||
<property name="objectDefinitionSource">
|
||||
<value>
|
||||
<![CDATA[
|
||||
org.alfresco.module.org_alfresco_module_rm.security.FilePlanAuthenticationService.*=RM_ALLOW
|
||||
]]>
|
||||
</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
<!-- Custom EMail Mapping Service -->
|
||||
<bean id="customEmailMappingService"
|
||||
class="org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingServiceImpl" >
|
||||
|
||||
Reference in New Issue
Block a user