inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.3-BUG-FIX to HEAD

Browse Source 
23167: Removed hard-coded "localhost" from ImapMessageTest
   23179: (RECORD ONLY) Merged HEAD to V3.3-BUG-FIX
      23064: Quick build fix (fallout from audit)
      23069: Do not attempt to audit InputStream property
   23190: Merged V3.3 to V3.3-BUG-FIX
      23189: Merged PATCHES/V3.2.0 to V3.3
         23173: ALF-5249: RepositoryContainer needs an 'unlimited' txn helper in order to generate the error response.
      23186: (RECORD ONLY) Merged V3.3-BUG-FIX to V3.3
         23180: Added flag for strict audit config loading: audit.config.strict=false
      23184: (RECORD ONLY) Merged V3.3-BUG-FIX to V3.3
         23179: Merged HEAD to V3.3-BUG-FIX
            23064: Quick build fix (fallout from audit)
            23069: Do not attempt to audit InputStream property
      23171: Fixed ALF-1990: Trashcan "Delete All Items" button might not delete all items
         - NodeArchiveService implements batching and locking for purgeAll... and restoreAll...
         - One user can do this operation at a time.  Other users get 'busy' error.
         - Items will disappear from the trashcan as the process progresses.
      23169: Merged HEAD to V3.3
         22933: Fixed getLock implementation to handle zero retry parameters


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2010-10-18 09:07:11 +00:00
parent af751c3eb7
commit 61079d3769
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/web-scripts-application-context.xml
View File

@@ -195,6 +195,8 @@
</property> </property>
<!-- Use the time-limited transaction helper to keep request times to an acceptable duration --> <!-- Use the time-limited transaction helper to keep request times to an acceptable duration -->
<property name="transactionHelper" ref="web.retryingTransactionHelper" /> <property name="transactionHelper" ref="web.retryingTransactionHelper" />
<!-- The transaction helper used to generate error responses must be unlimited -->
<property name="fallbackTransactionHelper" ref="retryingTransactionHelper" />
<property name="authorityService" ref="AuthorityService" /> <property name="authorityService" ref="AuthorityService" />
<property name="repository" ref="repositoryHelper" /> <property name="repository" ref="repositoryHelper" />
<property name="repositoryImageResolver" ref="webscripts.repo.imageresolver" /> <property name="repositoryImageResolver" ref="webscripts.repo.imageresolver" />

11
source/java/org/alfresco/repo/web/scripts/RepositoryContainer.java
View File

@@ -83,6 +83,7 @@ public class RepositoryContainer extends AbstractRuntimeContainer implements Ten
private Repository repository; private Repository repository;
private RepositoryImageResolver imageResolver; private RepositoryImageResolver imageResolver;
private RetryingTransactionHelper retryingTransactionHelper; private RetryingTransactionHelper retryingTransactionHelper;
private RetryingTransactionHelper fallbackTransactionHelper;
private AuthorityService authorityService; private AuthorityService authorityService;
private DescriptorService descriptorService; private DescriptorService descriptorService;
private TenantAdminService tenantAdminService; private TenantAdminService tenantAdminService;
@@ -129,6 +130,14 @@ public class RepositoryContainer extends AbstractRuntimeContainer implements Ten
{ {
this.retryingTransactionHelper = retryingTransactionHelper; this.retryingTransactionHelper = retryingTransactionHelper;
} }
/**
* @param fallbackTransactionHelper an unlimited transaction helper used to generate error responses
*/
public void setFallbackTransactionHelper(RetryingTransactionHelper fallbackTransactionHelper)
{
this.fallbackTransactionHelper = fallbackTransactionHelper;
}
/** /**
* @param descriptorService * @param descriptorService
@@ -180,7 +189,7 @@ public class RepositoryContainer extends AbstractRuntimeContainer implements Ten
public Map<String, Object> getTemplateParameters() public Map<String, Object> getTemplateParameters()
{ {
// Ensure we have a transaction - we might be generating the status template after the main transaction failed // Ensure we have a transaction - we might be generating the status template after the main transaction failed
return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Map<String, Object>>() return fallbackTransactionHelper.doInTransaction(new RetryingTransactionCallback<Map<String, Object>>()
{ {
public Map<String, Object> execute() throws Throwable public Map<String, Object> execute() throws Throwable
{ {