Merging from EC-MC: Initial work to move interceptors and correct bean names

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5743 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-05-22 05:02:18 +00:00
parent e34312ea05
commit 2d461f5dd9
7 changed files with 109 additions and 66 deletions

View File

@@ -323,7 +323,7 @@
<bean id="admLuceneIndexerAndSearcherFactory"
class="org.alfresco.repo.search.impl.lucene.ADMLuceneIndexerAndSearcherFactory">
<property name="nodeService">
<ref bean="mlAwareNodeService" />
<ref bean="nodeService" />
</property>
<property name="dictionaryService">
<ref bean="dictionaryService" />
@@ -835,7 +835,7 @@
<ref bean="nodeService" />
</property>
<property name="multilingualContentService">
<ref bean="MultilingualContentService" />
<ref bean="multilingualContentService" />
</property>
</bean>
@@ -858,7 +858,7 @@
<ref bean="nodeService" />
</property>
<property name="multilingualContentService">
<ref bean="MultilingualContentService" />
<ref bean="multilingualContentService" />
</property>
</bean>

View File

@@ -6,7 +6,7 @@
<bean id="mlPropertyInterceptor" class="org.alfresco.repo.node.MLPropertyInterceptor">
<property name="directNodeService">
<ref bean="mlAwareNodeService"></ref>
<ref bean="nodeService"></ref>
</property>
<property name="dictionaryService">
<ref bean="dictionaryService" />
@@ -14,7 +14,7 @@
</bean>
<bean id="mlTranslationInterceptor" class="org.alfresco.repo.node.MLTranslationInterceptor">
<property name="nodeService">
<property name="directNodeService">
<ref bean="nodeService"/>
</property>
<property name="multilingualContentService">
@@ -22,25 +22,7 @@
</property>
</bean>
<bean id="nodeService" class="org.springframework.aop.framework.ProxyFactoryBean" >
<property name="targetName">
<value>mlAwareNodeService</value>
</property>
<property name="proxyInterfaces">
<list>
<value>org.alfresco.service.cmr.repository.NodeService</value>
</list>
</property>
<property name="interceptorNames">
<list>
<value>mlTranslationInterceptor</value>
<value>mlPropertyInterceptor</value>
</list>
</property>
</bean>
<bean id="mlAwareNodeService" class="org.alfresco.repo.service.StoreRedirectorProxyFactory">
<bean id="nodeService" class="org.alfresco.repo.service.StoreRedirectorProxyFactory">
<property name="proxyInterface">
<value>org.alfresco.service.cmr.repository.NodeService</value>
</property>

View File

@@ -67,9 +67,10 @@
<list>
<idref local="NodeService_transaction"/>
<idref local="AuditMethodInterceptor"/>
<idref local="mlTranslationInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="NodeService_security"/>
<idref bean="mlTranslationInterceptor"/>
<idref bean="mlPropertyInterceptor"/>
</list>
</property>
</bean>