mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -18,12 +18,12 @@
|
||||
<property name="runtimeActionService">
|
||||
<ref bean="actionService"/>
|
||||
</property>
|
||||
<property name="searchService">
|
||||
<ref bean="SearchService"/>
|
||||
</property>
|
||||
<property name="dictionaryService">
|
||||
<ref bean="dictionaryService"/>
|
||||
</property>
|
||||
<property name="rulesDisabled">
|
||||
<value>false</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Rules Aspect -->
|
||||
@@ -55,10 +55,7 @@
|
||||
<bean id="rule-type-base" abstract="true" init-method="init">
|
||||
<property name="ruleService">
|
||||
<ref bean="ruleService"/>
|
||||
</property>
|
||||
<property name="actionService">
|
||||
<ref bean="actionService"/>
|
||||
</property>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="inbound" class="org.alfresco.repo.rule.RuleTypeImpl" parent="rule-type-base">
|
||||
@@ -84,6 +81,7 @@
|
||||
<constructor-arg>
|
||||
<list>
|
||||
<ref bean="on-delete-child-association-trigger"/>
|
||||
<ref bean="on-delete-node-trigger"/>
|
||||
</list>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
@@ -126,15 +124,6 @@
|
||||
<bean id="on-property-update-trigger" class="org.alfresco.repo.rule.ruletrigger.OnPropertyUpdateRuleTrigger" parent="rule-trigger-base">
|
||||
</bean>
|
||||
|
||||
<bean id="on-delete-node-trigger" class="org.alfresco.repo.rule.ruletrigger.SingleChildAssocRefPolicyRuleTrigger" parent="rule-trigger-base">
|
||||
<property name="policyName">
|
||||
<value>onDeleteNode</value>
|
||||
</property>
|
||||
<property name="isClassBehaviour">
|
||||
<value>true</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="on-create-child-association-trigger" class="org.alfresco.repo.rule.ruletrigger.SingleChildAssocRefPolicyRuleTrigger" parent="rule-trigger-base">
|
||||
<property name="policyName">
|
||||
<value>onCreateChildAssociation</value>
|
||||
@@ -143,7 +132,19 @@
|
||||
|
||||
<bean id="on-delete-child-association-trigger" class="org.alfresco.repo.rule.ruletrigger.SingleChildAssocRefPolicyRuleTrigger" parent="rule-trigger-base">
|
||||
<property name="policyName">
|
||||
<value>onDeleteChildAssociation</value>
|
||||
<value>beforeDeleteChildAssociation</value>
|
||||
</property>
|
||||
<property name="executeRuleImmediately">
|
||||
<value>true</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="on-delete-node-trigger" class="org.alfresco.repo.rule.ruletrigger.SingleNodeRefPolicyRuleTrigger" parent="rule-trigger-base">
|
||||
<property name="policyName">
|
||||
<value>beforeDeleteNode</value>
|
||||
</property>
|
||||
<property name="executeRuleImmediately">
|
||||
<value>true</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
Reference in New Issue
Block a user