Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
   svn revert root\common\common.xml
   svn resolved root\projects\repository\config\alfresco\script-services-context.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2006-12-18 13:45:11 +00:00
parent 8e0a637886
commit 72bb79696d
48 changed files with 1960 additions and 299 deletions

View File

@@ -82,26 +82,6 @@
<alias name="namespaceService" alias="NamespaceService"/>
<!--
<bean id="NamespaceService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.service.namespace.NamespaceService</value>
</property>
<property name="target">
<ref bean="namespaceService"/>
</property>
<property name="interceptorNames">
<list>
<idref local="NamespaceService_transaction"/>
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="NamespaceService_security"/>
<idref local="NamespaceService_descriptor"/>
</list>
</property>
</bean>
-->
<bean id="NamespaceService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
@@ -130,26 +110,6 @@
<alias name="dictionaryService" alias="DictionaryService"/>
<!--
<bean id="DictionaryService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.service.cmr.dictionary.DictionaryService</value>
</property>
<property name="target">
<ref bean="dictionaryService"/>
</property>
<property name="interceptorNames">
<list>
<idref local="DictionaryService_transaction"/>
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="DictionaryService_security"/>
<idref local="DictionaryService_descriptor"/>
</list>
</property>
</bean>
-->
<bean id="DictionaryService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
@@ -260,25 +220,6 @@
<alias name="mimetypeService" alias="MimetypeService"/>
<!--
<bean id="MimetypeService" class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces">
<value>org.alfresco.service.cmr.repository.MimetypeService</value>
</property>
<property name="target">
<ref bean="mimetypeService"/>
</property>
<property name="interceptorNames">
<list>
<idref local="AuditMethodInterceptor"/>
<idref local="exceptionTranslator"/>
<idref bean="MimetypeService_security"/>
<idref local="MimetypeService_descriptor"/>
</list>
</property>
</bean>
-->
<bean id="MimetypeService_descriptor" parent="AlfrescoServiceDescriptor">
<property name="interface">
<value>org.alfresco.service.cmr.repository.MimetypeService</value>