RM-781: RM Dependency update (update to HEAD QA build #165, Deleted overriding files, Bug fixes)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/UPDATE@52789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2013-07-17 17:39:25 +00:00
parent 98e69ebcef
commit fa0dd007a0
6 changed files with 136 additions and 77 deletions

View File

@@ -180,7 +180,6 @@
class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogPost"
parent="webscript">
<property name="nodeService" ref="nodeService" />
<property name="contentService" ref="ContentService" />
<property name="permissionService" ref="PermissionService" />
<property name="mimetypeService" ref="mimetypeService" />
<property name="recordsManagementAuditService" ref="RecordsManagementAuditService" />
@@ -205,10 +204,10 @@
class="org.alfresco.module.org_alfresco_module_rm.script.ExportPost"
parent="webscript">
<property name="nodeService" ref="nodeService" />
<property name="contentService" ref="ContentService" />
<property name="permissionService" ref="PermissionService" />
<property name="mimetypeService" ref="mimetypeService" />
<property name="exporterService" ref="ExporterService" />
<property name="contentStreamer" ref="webscript.content.streamer" />
</bean>
<!-- REST impl for POST import -->
@@ -226,7 +225,6 @@
<!-- Base bean for transfer web scripts -->
<bean id="rmBaseTransferWebscript" parent="webscript" abstract="true">
<property name="nodeService" ref="nodeService" />
<property name="contentService" ref="ContentService" />
<property name="permissionService" ref="PermissionService" />
<property name="mimetypeService" ref="mimetypeService" />
<property name="exporterService" ref="ExporterService" />
@@ -236,6 +234,7 @@
<bean id="webscript.org.alfresco.rma.transfer.get"
class="org.alfresco.module.org_alfresco_module_rm.script.TransferGet"
parent="rmBaseTransferWebscript">
<property name="contentStreamer" ref="webscript.content.streamer" />
</bean>
<!-- REST impl for GET transfer report -->
@@ -245,6 +244,7 @@
<property name="dictionaryService" ref="DictionaryService" />
<property name="recordsManagementService" ref="RecordsManagementService" />
<property name="dispositionService" ref="DispositionService" />
<property name="contentStreamer" ref="webscript.content.streamer" />
</bean>
<!-- REST impl for POST transfer report -->
@@ -255,6 +255,7 @@
<property name="recordsManagementService" ref="RecordsManagementService" />
<property name="recordsManagementActionService" ref="RecordsManagementActionService" />
<property name="dispositionService" ref="DispositionService" />
<property name="contentService" ref="ContentService"/>
</bean>
<!-- RM Role API-->
@@ -513,7 +514,7 @@
<bean id="webscript.org.alfresco.repository.rule.rm-actionconditiondefinitions.get"
class="org.alfresco.repo.web.scripts.rule.RmActionConditionDefinitionsGet"
parent="webscript">
<property name="actionService" ref="ActionService"/>
<property name="actionService" ref="ActionService"/>
<property name="recordsManagementActionService" ref="RecordsManagementActionService"/>
</bean>
@@ -522,10 +523,10 @@
<!-- REST impl for GET Audit Log -->
<bean id="webscript.org.alfresco.rma.rmauditlog.get" class="org.alfresco.module.org_alfresco_module_rm.script.AuditLogGet" parent="webscript">
<property name="nodeService" ref="nodeService"/>
<property name="contentService" ref="ContentService"/>
<property name="permissionService" ref="PermissionService"/>
<property name="mimetypeService" ref="mimetypeService"/>
<property name="recordsManagementAuditService" ref="RecordsManagementAuditService"/>
<property name="contentStreamer" ref="webscript.content.streamer" />
</bean>
<!-- REST impl for GET Class Definitions for RM/DM -->
@@ -558,6 +559,6 @@
<property name="filePlanService" ref="FilePlanService" />
<property name="filePlanRoleService" ref="FilePlanRoleService" />
<property name="authorityService" ref="AuthorityService" />
</bean>
</bean>
</beans>