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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
83462: - ACE-2671 (Move QName Custom Editor from RM into core)
   - ACE-2669 (Move behaviour annotation framework from RM into core)
      * Moved beans to core-services-context.xml as the bootstrap-context.xml is reserved for processes that require sequencing order when starting the repo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-18 16:54:17 +00:00
parent 74a57d33cb
commit fb59c6968e
2 changed files with 94 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/alfresco/bootstrap-context.xml
View File

@@ -727,24 +727,4 @@
class="org.alfresco.repo.workflow.activiti.ActivitiEngineInitializer">
<property name="workflowAdminService" ref="workflowAdminService" />
</bean>
<!-- Custom property editors -->
<bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
<property name="propertyEditorRegistrars">
<list>
<ref bean="customPropertyEditorRegistrar"/>
</list>
</property>
</bean>
<bean id="customPropertyEditorRegistrar"
class="org.alfresco.util.CustomPropertyEditorRegistrar">
<property name="namespaceService" ref="NamespaceService"/>
</bean>
<!-- Annotated behaviour bean post processor -->
<bean id="annotatedBehaviourBeanPostProcessor" class="org.alfresco.repo.policy.annotation.AnnotatedBehaviourPostProcessor">
<property name="policyComponent" ref="policyComponent" />
<property name="namespaceService" ref="namespaceService" />
</bean>
</beans>

19
config/alfresco/core-services-context.xml
View File

@@ -1383,4 +1383,23 @@
<property name="dictionaryService" ref="dictionaryService" />
</bean>
<!-- Custom property editors -->
<bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
<property name="propertyEditorRegistrars">
<list>
<ref bean="customPropertyEditorRegistrar"/>
</list>
</property>
</bean>
<bean id="customPropertyEditorRegistrar"
class="org.alfresco.util.CustomPropertyEditorRegistrar">
<property name="namespaceService" ref="NamespaceService"/>
</bean>
<!-- Annotated behaviour bean post processor -->
<bean id="annotatedBehaviourBeanPostProcessor" class="org.alfresco.repo.policy.annotation.AnnotatedBehaviourPostProcessor">
<property name="policyComponent" ref="policyComponent" />
<property name="namespaceService" ref="namespaceService" />
</bean>
</beans>