mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Unfix AR-822 and defer to AR-1573.
The in-transaction work has to align with the work that will be done by the actual background archival, but node archival doesn't fully support all model constructs and associated behaviour. Instead of continuing to hack away at each issue that comes up, a complete archive rethink is in order. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6154 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -344,17 +344,6 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Remove sys:deleted tags from interrupted archivals -->
|
||||
|
||||
<bean id="deletedTagRemover" class="org.alfresco.repo.node.archive.DeletedTagBootstrap">
|
||||
<property name="nodeService">
|
||||
<ref bean="NodeService" />
|
||||
</property>
|
||||
<property name="searchService">
|
||||
<ref bean="SearchService" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Start module components -->
|
||||
|
||||
<bean id="moduleStarter" class="org.alfresco.repo.module.ModuleStarter">
|
||||
|
@@ -141,21 +141,6 @@
|
||||
<title>Temporary</title>
|
||||
</aspect>
|
||||
|
||||
<!-- aspect to tag deleted nodes -->
|
||||
<aspect name="sys:deletedNode">
|
||||
<title>Deleted Node</title>
|
||||
<properties>
|
||||
<property name="sys:deletedNodeOriginalName">
|
||||
<type>d:text</type>
|
||||
<mandatory enforced="true">true</mandatory>
|
||||
</property>
|
||||
<property name="sys:deletedNodeUser">
|
||||
<type>d:text</type>
|
||||
<mandatory enforced="true">true</mandatory>
|
||||
</property>
|
||||
</properties>
|
||||
</aspect>
|
||||
|
||||
<!-- details stored on archived nodes -->
|
||||
<aspect name="sys:archived">
|
||||
<title>Archived</title>
|
||||
|
@@ -4,27 +4,6 @@
|
||||
<!-- Beans pertinent to node persistence and services -->
|
||||
<beans>
|
||||
|
||||
<bean id="nodeArchiveInterceptor" class="org.alfresco.repo.node.archive.NodeArchiveInterceptor">
|
||||
<property name="transactionService">
|
||||
<ref bean="transactionService" />
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="mlAwareNodeService" />
|
||||
</property>
|
||||
<property name="dictionaryService">
|
||||
<ref bean="dictionaryService" />
|
||||
</property>
|
||||
<property name="storeArchiveMap">
|
||||
<ref bean="storeArchiveMap"/>
|
||||
</property>
|
||||
<property name="threadPoolExecutor">
|
||||
<ref bean="threadPoolExecutor"/>
|
||||
</property>
|
||||
<property name="archiveMode">
|
||||
<value>${system.deleted-items.mode}</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="mlPropertyInterceptor" class="org.alfresco.repo.node.MLPropertyInterceptor">
|
||||
<property name="nodeService">
|
||||
<ref bean="mlAwareNodeService" />
|
||||
@@ -46,7 +25,6 @@
|
||||
<property name="interceptorNames">
|
||||
<list>
|
||||
<value>mlPropertyInterceptor</value>
|
||||
<value>nodeArchiveInterceptor</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
|
@@ -27,12 +27,6 @@ system.acl.maxPermissionCheckTimeMillis=10000
|
||||
# The maximum number of results to perform permission checks against
|
||||
system.acl.maxPermissionChecks=1000
|
||||
|
||||
#
|
||||
# Control the transfer of nodes to 'Deleted Items'
|
||||
# EAGER - Transfer nodes to 'Deleted Items' in the same transaction. (Slower)
|
||||
# LAZY - Move nodes away but transfer to 'Deleted Items' separately. (Faster)
|
||||
system.deleted-items.mode=LAZY
|
||||
|
||||
# #################### #
|
||||
# Lucene configuration #
|
||||
# #################### #
|
||||
|
Reference in New Issue
Block a user