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

More for AR-460: System concurrency

Browse Source 
There might be a few SDK projects that still use TransactionUtil, but this checkin gets rid of
its use otherwise.
I took a glance over the areas of the code that use UserTransaction directly and didn't see any
transactionally wrapped code that desperately needed to be put into a retry loop (i.e. write
transactions in a concurrent scenario).  If you spot any that you think might qualify, let me know.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-07-12 04:15:28 +00:00
parent 2c4637723f
commit 0d8df71921
5 changed files with 165 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
source/java/org/alfresco/repo/webservice/authoring/AuthoringWebService.java
View File

@@ -35,7 +35,7 @@ import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.transaction.TransactionUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.webservice.AbstractWebService;
import org.alfresco.repo.webservice.Utils;
import org.alfresco.repo.webservice.types.ContentFormat;
@@ -142,11 +142,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<CheckoutResult>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<CheckoutResult>()
{
public CheckoutResult doWork()
public CheckoutResult execute()
{
List<NodeRef> nodes = Utils.resolvePredicate(items,
AuthoringWebService.this.nodeService,
@@ -224,11 +223,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<CheckinResult>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<CheckinResult>()
{
public CheckinResult doWork()
public CheckinResult execute()
{
// Get the passed nodes
List<NodeRef> nodes = Utils.resolvePredicate(
@@ -301,11 +299,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<Reference>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<Reference>()
{
public Reference doWork()
public Reference execute()
{
// Get the passed nodes
NodeRef nodeRef = Utils.convertToNodeRef(
@@ -364,11 +361,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<CancelCheckoutResult>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<CancelCheckoutResult>()
{
public CancelCheckoutResult doWork()
public CancelCheckoutResult execute()
{
// Get the passed nodes
List<NodeRef> nodes = Utils.resolvePredicate(
@@ -421,11 +417,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<Reference[]>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<Reference[]>()
{
public Reference[] doWork()
public Reference[] execute()
{
// Get the passed nodes
List<NodeRef> nodes = Utils.resolvePredicate(
@@ -489,11 +484,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<Reference[]>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<Reference[]>()
{
public Reference[] doWork()
public Reference[] execute()
{
// Get the passed nodes
List<NodeRef> nodes = Utils.resolvePredicate(
@@ -536,11 +530,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<LockStatus[]>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<LockStatus[]>()
{
public LockStatus[] doWork()
public LockStatus[] execute()
{
// Get the passed nodes
List<NodeRef> nodes = Utils.resolvePredicate(
@@ -613,11 +606,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<VersionResult>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<VersionResult>()
{
public VersionResult doWork()
public VersionResult execute()
{
// Get the passed nodes
List<NodeRef> nodes = Utils.resolvePredicate(
@@ -675,11 +667,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<VersionHistory>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<VersionHistory>()
{
public VersionHistory doWork()
public VersionHistory execute()
{
org.alfresco.service.cmr.version.VersionHistory versionHistory =
AuthoringWebService.this.versionService.getVersionHistory(
@@ -728,11 +719,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork()
transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<Object>()
{
public Object doWork()
public Object execute()
{
NodeRef nodeRef = Utils.convertToNodeRef(
node,
@@ -781,11 +771,10 @@ public class AuthoringWebService extends AbstractWebService implements
{
try
{
return TransactionUtil.executeInUserTransaction(
this.transactionService,
new TransactionUtil.TransactionWork<VersionHistory>()
return transactionService.getRetryingTransactionHelper().doInTransaction(
new RetryingTransactionCallback<VersionHistory>()
{
public VersionHistory doWork()
public VersionHistory execute()
{
NodeRef nodeRef = Utils.convertToNodeRef(
node,