diff --git a/source/java/org/alfresco/repo/webservice/accesscontrol/AccessControlWebService.java b/source/java/org/alfresco/repo/webservice/accesscontrol/AccessControlWebService.java index a1b73ac445..afcc631f1e 100644 --- a/source/java/org/alfresco/repo/webservice/accesscontrol/AccessControlWebService.java +++ b/source/java/org/alfresco/repo/webservice/accesscontrol/AccessControlWebService.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.alfresco.repo.transaction.TransactionComponent; +import org.alfresco.repo.transaction.TransactionServiceImpl; import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.repo.transaction.TransactionUtil.TransactionWork; import org.alfresco.repo.webservice.AbstractWebService; @@ -27,7 +27,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces private static Log logger = LogFactory.getLog(AccessControlWebService.class); /** Transaction service */ - private TransactionComponent transactionService = null; + private TransactionServiceImpl transactionService = null; /** Permission service */ private PermissionService permissionService = null; @@ -40,7 +40,7 @@ public class AccessControlWebService extends AbstractWebService implements Acces * * @param transactionService the transaction service */ - public void setTransactionService(TransactionComponent transactionService) + public void setTransactionService(TransactionServiceImpl transactionService) { this.transactionService = transactionService; } diff --git a/source/java/org/alfresco/repo/webservice/action/ActionWebService.java b/source/java/org/alfresco/repo/webservice/action/ActionWebService.java index 24357339ad..06799aa8aa 100644 --- a/source/java/org/alfresco/repo/webservice/action/ActionWebService.java +++ b/source/java/org/alfresco/repo/webservice/action/ActionWebService.java @@ -34,7 +34,7 @@ import org.alfresco.repo.action.ActionConditionImpl; import org.alfresco.repo.action.ActionImpl; import org.alfresco.repo.action.CompositeActionImpl; import org.alfresco.repo.action.executer.CompositeActionExecuter; -import org.alfresco.repo.transaction.TransactionComponent; +import org.alfresco.repo.transaction.TransactionServiceImpl; import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.repo.transaction.TransactionUtil.TransactionWork; import org.alfresco.repo.webservice.AbstractWebService; @@ -82,7 +82,7 @@ public class ActionWebService extends AbstractWebService implements ActionServic private DictionaryService dictionaryService; /** The transaction service */ - private TransactionComponent transactionService; + private TransactionServiceImpl transactionService; /** * Set the action service @@ -119,7 +119,7 @@ public class ActionWebService extends AbstractWebService implements ActionServic * * @param transactionService the transaction service */ - public void setTransactionService(TransactionComponent transactionService) + public void setTransactionService(TransactionServiceImpl transactionService) { this.transactionService = transactionService; } diff --git a/source/java/org/alfresco/repo/webservice/administration/AdministrationWebService.java b/source/java/org/alfresco/repo/webservice/administration/AdministrationWebService.java index 01497e535c..9fce9eaa42 100644 --- a/source/java/org/alfresco/repo/webservice/administration/AdministrationWebService.java +++ b/source/java/org/alfresco/repo/webservice/administration/AdministrationWebService.java @@ -36,7 +36,6 @@ import java.util.Set; import org.alfresco.model.ContentModel; import org.alfresco.repo.cache.SimpleCache; -import org.alfresco.repo.transaction.TransactionComponent; import org.alfresco.repo.transaction.TransactionUtil; import org.alfresco.repo.transaction.TransactionUtil.TransactionWork; import org.alfresco.repo.webservice.AbstractWebService; @@ -48,6 +47,7 @@ import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.QName; +import org.alfresco.service.transaction.TransactionService; import org.alfresco.util.GUID; import org.apache.axis.MessageContext; import org.apache.commons.logging.Log; @@ -69,7 +69,7 @@ public class AdministrationWebService extends AbstractWebService implements private AuthenticationService authenticationService = null; /** The transaction service */ - private TransactionComponent transactionService = null; + private TransactionService transactionService = null; /** A set of ignored properties */ private static Set ignoredProperties = new HashSet(3); @@ -93,7 +93,7 @@ public class AdministrationWebService extends AbstractWebService implements * * @param transactionService the transaction service */ - public void setTransactionService(TransactionComponent transactionService) + public void setTransactionService(TransactionService transactionService) { this.transactionService = transactionService; } diff --git a/source/java/web-services-application-context.xml b/source/java/web-services-application-context.xml index 12bd642854..392a2a95b5 100644 --- a/source/java/web-services-application-context.xml +++ b/source/java/web-services-application-context.xml @@ -133,7 +133,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -184,7 +184,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -220,7 +220,7 @@ - +