mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merging from EC-MC: Project compile
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -7,8 +7,8 @@
|
||||
<view:acl view:inherit="false">
|
||||
<view:ace view:access="ALLOWED">
|
||||
<view:authority>GROUP_EVERYONE</view:authority>
|
||||
<view:permission>Coordinator</view:permission>
|
||||
</view:ace>
|
||||
<view:permission>Consumer</view:permission>
|
||||
</view:ace>
|
||||
</view:acl>
|
||||
</cm:mlRoot>
|
||||
|
||||
|
@@ -99,24 +99,24 @@
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
|
||||
<bean id="contentFilterLanguagesConfigService" class="org.alfresco.config.xml.XMLConfigService" init-method="init">
|
||||
<constructor-arg>
|
||||
<bean class="org.alfresco.config.source.UrlConfigSource">
|
||||
<constructor-arg>
|
||||
<list>
|
||||
<value>classpath:alfresco/ml/content-filter-lang.xml</value>
|
||||
</list>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="contentFilterLanguagesService" class="org.alfresco.repo.model.ml.ContentFilterLanguagesMap" init-method="init" >
|
||||
<bean id="contentFilterLanguagesConfigService" class="org.alfresco.config.xml.XMLConfigService" init-method="init">
|
||||
<constructor-arg>
|
||||
<ref bean="contentFilterLanguagesConfigService" />
|
||||
<bean class="org.alfresco.config.source.UrlConfigSource">
|
||||
<constructor-arg>
|
||||
<list>
|
||||
<value>classpath:alfresco/ml/content-filter-lang.xml</value>
|
||||
</list>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
</constructor-arg>
|
||||
</bean>
|
||||
|
||||
<bean id="contentFilterLanguagesService" class="org.alfresco.repo.model.ml.ContentFilterLanguagesMap" init-method="init" >
|
||||
<property name="configService">
|
||||
<ref bean="contentFilterLanguagesConfigService" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="openOfficeConnection" class="net.sf.jooreports.openoffice.connection.SocketOpenOfficeConnection" />
|
||||
<bean id="openOfficeConnectionTester" class="org.alfresco.util.OpenOfficeConnectionTester" init-method="checkConnection" >
|
||||
<property name="connection">
|
||||
|
@@ -43,19 +43,19 @@
|
||||
<!-- Multilingual specific service -->
|
||||
<bean name="multilingualContentService" class="org.alfresco.repo.model.ml.MultilingualContentServiceImpl" >
|
||||
<property name="nodeService">
|
||||
<ref bean="NodeService" />
|
||||
<ref bean="nodeService" />
|
||||
</property>
|
||||
<property name="searchService">
|
||||
<ref bean="SearchService" />
|
||||
<ref bean="searchService" />
|
||||
</property>
|
||||
<property name="versionService">
|
||||
<ref bean="VersionService" />
|
||||
<ref bean="versionService" />
|
||||
</property>
|
||||
<property name="contentFilterLanguagesService">
|
||||
<ref bean="ContentFilterLanguagesService" />
|
||||
<ref bean="contentFilterLanguagesService" />
|
||||
</property>
|
||||
<property name="fileFolderService">
|
||||
<ref bean="FileFolderService" />
|
||||
<ref bean="fileFolderService" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
@@ -13,6 +13,16 @@
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="mlTranslationInterceptor" class="org.alfresco.repo.node.MLTranslationInterceptor">
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService"/>
|
||||
</property>
|
||||
<property name="multilingualContentService">
|
||||
<ref bean="multilingualContentService"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
|
||||
<bean id="nodeService" class="org.springframework.aop.framework.ProxyFactoryBean" >
|
||||
<property name="targetName">
|
||||
<value>mlAwareNodeService</value>
|
||||
@@ -24,6 +34,7 @@
|
||||
</property>
|
||||
<property name="interceptorNames">
|
||||
<list>
|
||||
<value>mlTranslationInterceptor</value>
|
||||
<value>mlPropertyInterceptor</value>
|
||||
</list>
|
||||
</property>
|
||||
|
Reference in New Issue
Block a user