Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

58861: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58858: Reverse Merged as it was causing two build failures https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-90/test
         58723: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            58639: Merged DEV to V4.1-BUG-FIX (4.1.8)
               58578: Merged DEV to DEV (4.1.8)
                  58570: MNT-9964 : DB2 unit tests failing
                  Replaced 'TransactionInterceptor' with 'RetryingTransactionInterceptor' for TransferService_transaction.
                  The getThumbnailByName, getThumbnails, getFailedThumbnails methods are marked as read-only.
               58611: MNT-9964 : DB2 unit tests failing
               Added constraints to more methods in ThumbnailService.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62052 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:25:47 +00:00
parent cfaa4f4e82
commit 0a746c042c

View File

@@ -25,18 +25,12 @@
</bean>
<!-- Thumbnail service transaction bean -->
<bean id="ThumbnailService_transaction" class="org.alfresco.repo.transaction.RetryingTransactionInterceptor">
<property name="transactionService" ref="TransactionService" />
<bean id="ThumbnailService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<property name="transactionManager">
<ref bean="transactionManager"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="getThumbnailRegistry">${server.transaction.mode.readOnly}</prop>
<prop key="getThumbnailByName">${server.transaction.mode.readOnly}</prop>
<prop key="getThumbnails">${server.transaction.mode.readOnly}</prop>
<prop key="getFailedThumbnails">${server.transaction.mode.readOnly}</prop>
<prop key="getThumbnailsEnabled">${server.transaction.mode.readOnly}</prop>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>