diff --git a/shared/src/main/java/com/inteligr8/alfresco/asie/service/ShardBackupService.java b/shared/src/main/java/com/inteligr8/alfresco/asie/service/ShardBackupService.java index 3fd68fe..bb887c0 100644 --- a/shared/src/main/java/com/inteligr8/alfresco/asie/service/ShardBackupService.java +++ b/shared/src/main/java/com/inteligr8/alfresco/asie/service/ShardBackupService.java @@ -1,8 +1,6 @@ package com.inteligr8.alfresco.asie.service; -import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.service.cmr.attributes.AttributeService; -import org.alfresco.service.transaction.TransactionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -24,23 +22,11 @@ public class ShardBackupService implements com.inteligr8.alfresco.asie.spi.Shard @Autowired @Qualifier(Constants.QUALIFIER_ASIE) private AttributeService attributeService; - - @Autowired - private TransactionService txService; @Value("${inteligr8.asie.backup.persistTimeMinutes}") private int persistTimeMinutes; public SolrHost selectNode(ShardSet shardSet, int shardId, SolrHost node) { - return this.txService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback() { - @Override - public SolrHost execute() { - return selectNodeTx(shardSet, shardId, node); - } - }, false, false); - } - - protected SolrHost selectNodeTx(ShardSet shardSet, int shardId, SolrHost node) { String shardKey = shardSet.getCore() + "-" + shardId; PersistedNode backupNode = (PersistedNode) this.attributeService.getAttribute(Constants.ATTR_ASIE, ATTR_BACKUP_NODE, shardKey); @@ -55,30 +41,10 @@ public class ShardBackupService implements com.inteligr8.alfresco.asie.spi.Shard } public void forget() { - this.txService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback() { - @Override - public Void execute() { - forgetTx(); - return null; - } - }, false, false); - } - - protected void forgetTx() { this.attributeService.removeAttribute(Constants.ATTR_ASIE, ATTR_BACKUP_NODE); } - public void forget(final ShardSet shardSet, final int shardId) { - this.txService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback() { - @Override - public Void execute() { - forgetTx(shardSet, shardId); - return null; - } - }, false, false); - } - - public void forgetTx(ShardSet shardSet, int shardId) { + public void forget(ShardSet shardSet, int shardId) { String shardKey = shardSet.getCore() + "-" + shardId; this.attributeService.removeAttribute(Constants.ATTR_ASIE, ATTR_BACKUP_NODE, shardKey); } diff --git a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/backupNode.get.desc.xml b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/backupNode.get.desc.xml index 87e2c02..234dc86 100644 --- a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/backupNode.get.desc.xml +++ b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/backupNode.get.desc.xml @@ -38,6 +38,9 @@ none + + required + false diff --git a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/leadNode.get.desc.xml b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/leadNode.get.desc.xml index c1e839f..8fb445c 100644 --- a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/leadNode.get.desc.xml +++ b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/leadNode.get.desc.xml @@ -34,6 +34,9 @@ none + + required + false diff --git a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/node.delete.desc.xml b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/node.delete.desc.xml index f1ece9d..300ccd3 100644 --- a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/node.delete.desc.xml +++ b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/node.delete.desc.xml @@ -31,6 +31,9 @@ admin + + required + false diff --git a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/nodeShard.delete.desc.xml b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/nodeShard.delete.desc.xml index 22b59f9..bcbdef8 100644 --- a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/nodeShard.delete.desc.xml +++ b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/nodeShard.delete.desc.xml @@ -34,6 +34,9 @@ admin + + required + false diff --git a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/nodeShard.post.desc.xml b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/nodeShard.post.desc.xml index b502ed3..a37d084 100644 --- a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/nodeShard.post.desc.xml +++ b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/nodeShard.post.desc.xml @@ -32,6 +32,9 @@ admin + + required + false diff --git a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/registry.delete.desc.xml b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/registry.delete.desc.xml index 721c459..130ed09 100644 --- a/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/registry.delete.desc.xml +++ b/shared/src/main/resources/alfresco/extension/templates/webscripts/com/inteligr8/alfresco/asie/registry.delete.desc.xml @@ -23,6 +23,9 @@ admin + + required + false