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

ACE-2237 : Rel38: Upgrade was not completed.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@78600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-30 10:29:37 +00:00
parent 76a6951c3a
commit 74d5b35127
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/repo/dictionary/DynamicCreateRepositoryLocation.java
View File

@@ -8,6 +8,7 @@ import java.util.ResourceBundle;
import org.alfresco.repo.importer.ACPImportPackageHandler;
import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.SearchService;
@@ -19,6 +20,7 @@ import org.alfresco.service.cmr.view.ImporterService;
import org.alfresco.service.cmr.view.Location;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.I18NUtil;
@@ -37,6 +39,7 @@ public class DynamicCreateRepositoryLocation extends RepositoryLocation
private ResourceBundle bundle;
private NamespaceService namespaceService;
private SearchService searchService;
private TransactionService transactionService;
public void setSearchService(SearchService searchService)
{
@@ -95,6 +98,20 @@ public class DynamicCreateRepositoryLocation extends RepositoryLocation
protected void create()
{
RetryingTransactionCallback<Void> initCallback = new RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
onCreateInTxn();
return null;
}
};
getTransactionService().getRetryingTransactionHelper().doInTransaction(initCallback, false, true);
}
private void onCreateInTxn()
{
final File viewFile = ImporterBootstrap.getFile(contentViewLocation);
ImportPackageHandler acpHandler = new ACPImportPackageHandler(viewFile, null);
Location location = new Location(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
@@ -135,4 +152,14 @@ public class DynamicCreateRepositoryLocation extends RepositoryLocation
importerService.importView(acpHandler, location, binding, (ImporterProgress) null);
}
public TransactionService getTransactionService()
{
return transactionService;
}
public void setTransactionService(TransactionService transactionService)
{
this.transactionService = transactionService;
}
}