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

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/java/org/alfresco/repo/publishing/PublishingRootObject.java
View File

@@ -30,7 +30,9 @@ import java.util.List;
import org.alfresco.repo.node.NodeUtils;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -41,6 +43,7 @@ import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.service.transaction.TransactionService;
import org.springframework.beans.BeansException;
/**
@@ -58,13 +61,18 @@ public class PublishingRootObject
private PublishingEventHelper publishingEventHelper;
private NamespaceService namespaceService;
private SearchService searchService;
private RetryingTransactionHelper retryingTransactionHelper;
private TransactionService transactionService;
private PermissionService permissionService;
private StoreRef publishingStore;
private String publishingRootPath;
public void setTransactionService(TransactionService transactionService)
{
this.transactionService = transactionService;
}
/**
* @return the approprieate {@link Environment} for the current domain.
* @throws BeansException
@@ -90,10 +98,25 @@ public class PublishingRootObject
{
public Environment doWork() throws Exception
{
NodeRef environmentNode = getEnvironmentNode();
PublishingQueueImpl queue = createPublishingQueue(environmentNode);
NodeRef channelsContainer = getChannelsContainer(environmentNode);
return new Environment(environmentNode, queue, channelsContainer);
RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
txnHelper.setForceWritable(true);
boolean requiresNew = false;
if (AlfrescoTransactionSupport.getTransactionReadState() != TxnReadState.TXN_READ_WRITE)
{
//We can be in a read-only transaction, so force a new transaction
requiresNew = true;
}
return txnHelper.doInTransaction(new RetryingTransactionCallback<Environment>()
{
public Environment execute() throws Exception
{
NodeRef environmentNode = getEnvironmentNode();
PublishingQueueImpl queue = createPublishingQueue(environmentNode);
NodeRef channelsContainer = getChannelsContainer(environmentNode);
return new Environment(environmentNode, queue, channelsContainer);
}
}, false,requiresNew);
}
}, AuthenticationUtil.getSystemUserName());
@@ -139,7 +162,7 @@ public class PublishingRootObject
private NodeRef getEnvironmentNode()
{
return retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
return transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<NodeRef>()
{
public NodeRef execute() throws Exception
{
@@ -176,14 +199,6 @@ public class PublishingRootObject
this.publishingRootPath = publishingRootPath;
}
/**
* @param retryingTransactionHelper the retryingTransactionHelper to set
*/
public void setRetryingTransactionHelper(RetryingTransactionHelper retryingTransactionHelper)
{
this.retryingTransactionHelper = retryingTransactionHelper;
}
/**
* @param namespaceService the namespaceService to set
*/