From 32c2528634974d4f4a146f94e60e935e26a6f5c7 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 30 Apr 2014 16:17:10 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    68146:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)       67720: Merged
 V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)          67671: Fix MNT-10916:
 Dictionary Web Service method getClasses() is slow                 - Reverted
 55733 as it caused cyclic Spring dependencies                 - Effectively
 revert fixes for ALF-19912 (now MNT-11251): Impossible to upload/create
 content when lifecycle workflow is deployed                   which causes
 52K transactions to be created when the CMIS dictionary loads          Fixes
 MNT-10930: Alfresco startup time increases exponentially when there's little
 lag between the app server and database server

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68430 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/core-services-context.xml   |  2 +-
 config/alfresco/public-services-context.xml | 29 ---------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 57e98b97de..8cec470376 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -744,7 +744,7 @@
                 <property name="targetSource">
                     <bean class="org.alfresco.config.NonBlockingLazyInitTargetSource">
                         <property name="targetBeanName">
-                            <idref bean="MessageService" />
+                            <idref bean="messageService" />
                         </property>
                     </bean>
                 </property> 
diff --git a/config/alfresco/public-services-context.xml b/config/alfresco/public-services-context.xml
index ef94ea8b47..5b58620c01 100644
--- a/config/alfresco/public-services-context.xml
+++ b/config/alfresco/public-services-context.xml
@@ -1538,33 +1538,4 @@
         </property>
     </bean>
 
-    <bean id="MessageService" class="org.springframework.aop.framework.ProxyFactoryBean">
-        <property name="proxyInterfaces">
-            <list>
-                <value>org.alfresco.repo.i18n.MessageService</value>
-            </list>
-        </property>
-        <property name="target">
-            <ref bean="messageService"/>
-        </property>
-        <property name="interceptorNames">
-            <list>
-                <idref local="MessageService_transaction"/>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="MessageService_transaction" class="org.alfresco.repo.transaction.RetryingTransactionInterceptor">
-        <property name="transactionService">
-            <ref bean="TransactionService"/>
-        </property>
-        <property name="transactionManager">
-            <ref bean="transactionManager"/>
-        </property>
-        <property name="transactionAttributes">
-            <props>
-                <prop key="getMessage">${server.transaction.mode.readOnly}</prop>
-            </props>
-        </property>
-    </bean>
 </beans>