From c193c8585cd50d5ab24be5f23af1ea2e6a262ec7 Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Mon, 25 Jun 2007 12:38:32 +0000
Subject: [PATCH] - Web Script Runtime now takes ServiceRegistry in constructor
 (not an explicit ever growing list of services) - default status templates
 now include Alfresco server information & time of error for diagnostic
 purposes - template url.match does not include service context anymore e.g.
 /alfresco/service/api/path/ is now just /api/path/ - added Retrying
 Transaction Helper to Service Registry

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6088 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/service/ServiceDescriptorRegistry.java | 9 +++++++++
 source/java/org/alfresco/service/ServiceRegistry.java    | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
index 8eec136cbe..0365149b58 100644
--- a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
+++ b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
@@ -27,6 +27,7 @@ package org.alfresco.repo.service;
 import java.util.Collection;
 
 import org.alfresco.mbeans.VirtServerRegistry;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.attributes.AttributeService;
@@ -194,6 +195,14 @@ public class ServiceDescriptorRegistry
         return (TransactionService)getService(TRANSACTION_SERVICE);
     }
 
+    /* (non-Javadoc)
+     * @see org.alfresco.service.ServiceRegistry#getRetryingTransactionHelper()
+     */
+    public RetryingTransactionHelper getRetryingTransactionHelper()
+    {
+        return (RetryingTransactionHelper)getService(RETRYING_TRANSACTION_HELPER);
+    }
+
     /* (non-Javadoc)
      * @see org.alfresco.service.ServiceRegistry#getCopyService()
      */
diff --git a/source/java/org/alfresco/service/ServiceRegistry.java b/source/java/org/alfresco/service/ServiceRegistry.java
index 9b647366f7..af79387ec3 100644
--- a/source/java/org/alfresco/service/ServiceRegistry.java
+++ b/source/java/org/alfresco/service/ServiceRegistry.java
@@ -27,6 +27,7 @@ package org.alfresco.service;
 import java.util.Collection;
 
 import org.alfresco.mbeans.VirtServerRegistry;
+import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.attributes.AttributeService;
 import org.alfresco.service.cmr.audit.AuditService;
@@ -80,6 +81,7 @@ public interface ServiceRegistry
     static final QName REGISTRY_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "ServiceRegistry");
     static final QName DESCRIPTOR_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "DescriptorService");
     static final QName TRANSACTION_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "TransactionService");
+    static final QName RETRYING_TRANSACTION_HELPER = QName.createQName(NamespaceService.ALFRESCO_URI, "retryingTransactionHelper");
     static final QName AUTHENTICATION_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "AuthenticationService");
     static final QName NAMESPACE_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "NamespaceService");
     static final QName DICTIONARY_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "DictionaryService");
@@ -152,6 +154,12 @@ public interface ServiceRegistry
     @NotAuditable
     TransactionService getTransactionService();
 
+    /**
+     * @return the transaction service
+     */
+    @NotAuditable
+    RetryingTransactionHelper getRetryingTransactionHelper();
+
     /**
      * @return the namespace service (or null, if one is not provided)
      */