From 827f73e493888d461f28684d301e80cb3c0f8d84 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 30 Apr 2014 16:16:51 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    68145:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)       67653: Reverse
 merged          << Caused build error
 https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-288 >>     
     67559: MNT-10930 : Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)   
          67557: Merged DEV to V4.1-BUG-FIX (4.1.9)                64119:
 MNT-10916 : Dictionary Web Service method getClasses() is slow               
 Removed the fix for ALF-19912 and added a proxy for ContentService to
 messageService.

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

diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 9a9e0d0a5a..57e98b97de 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -491,7 +491,7 @@
             <ref bean="nodeService" />
         </property>
         <property name="contentService">
-            <ref bean="ContentService"/>
+            <ref bean="contentService"/>
         </property>
         <property name="resourceBundleBaseNamesCache">
             <ref bean="resourceBundleBaseNamesCache"/>
@@ -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 4a6cc76771..ef94ea8b47 100644
--- a/config/alfresco/public-services-context.xml
+++ b/config/alfresco/public-services-context.xml
@@ -1537,4 +1537,34 @@
             </props>
         </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>