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

59023: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58901: 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.
         58898: MNT-9964 : DB2 unit tests failing
         Declared ThumbnailService.createThumbnail as read-only as we should be able to create thumbnails in read-only server state and via GET webscript.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62067 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:37:51 +00:00
parent 6ccd948c48
commit c36b855e58

View File

@@ -25,12 +25,20 @@
</bean>
<!-- Thumbnail service transaction bean -->
<bean id="ThumbnailService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
<bean id="ThumbnailService_transaction" class="org.alfresco.repo.transaction.RetryingTransactionInterceptor">
<property name="transactionService" ref="TransactionService" />
<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>
<!-- It is read-only intentionally, see MNT-9964 -->
<prop key="createThumbnail">${server.transaction.mode.readOnly}</prop>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>