Merged HEAD (5.1) to 5.1.N (5.1.1)

114774 gcornwell: ACE-4465: PolicyComponent is part of the public API for Spring injection, but getter is not available via ServiceRegistry


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java

@@ -28,6 +28,7 @@ import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.imap.ImapService;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
+import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.search.impl.solr.facet.SolrFacetHelper;
 import org.alfresco.repo.search.impl.solr.facet.handler.FacetLabelDisplayHandlerRegistry;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -468,13 +469,19 @@ public class ServiceDescriptorRegistry
     }
 
     @Override
-    public MessageService getMessageService() {
+    public MessageService getMessageService() 
+    {
         return (MessageService)getService(MESSAGE_SERVICE);
     }
-
+    
-
     @Override
-    public DocumentLinkService getDocumentLinkService() {
+    public DocumentLinkService getDocumentLinkService() 
+    {
         return (DocumentLinkService)getService(DOCUMENT_LINK_SERVICE);
     }
+    
+    public PolicyComponent getPolicyComponent()
+    {
+        return (PolicyComponent)beanFactory.getBean(POLICY_COMPONENT.getLocalName());
+    }
 }

source/java/org/alfresco/service/ServiceRegistry.java

@@ -29,6 +29,7 @@ import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.imap.ImapService;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
+import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.search.impl.solr.facet.SolrFacetHelper;
 import org.alfresco.repo.search.impl.solr.facet.handler.FacetLabelDisplayHandlerRegistry;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -52,7 +53,6 @@ import org.alfresco.service.cmr.rating.RatingService;
 import org.alfresco.service.cmr.rendition.RenditionService;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.CopyService;
-import org.alfresco.service.cmr.repository.CrossRepositoryCopyService;
 import org.alfresco.service.cmr.repository.DocumentLinkService;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -156,6 +156,8 @@ public interface ServiceRegistry
     static final QName WEBDAV_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "webdavService");
     
     static final QName MODULE_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "ModuleService");
+    
+    static final QName POLICY_COMPONENT = QName.createQName(NamespaceService.ALFRESCO_URI, "policyComponent");
 
     /**
      * Get the list of services provided by the Repository
@@ -531,9 +533,16 @@ public interface ServiceRegistry
     MessageService getMessageService();
 
     /**
-     *  Get the document link service
+     * Get the document link service
      * @return the document link service
      */
     @NotAuditable
     DocumentLinkService getDocumentLinkService();
+    
+    /**
+     * Get the policy component
+     * @return The policy component
+     */
+    @NotAuditable
+    PolicyComponent getPolicyComponent();
 }

source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java

@@ -30,6 +30,7 @@ import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.imap.ImapService;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.nodelocator.NodeLocatorService;
+import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.search.impl.solr.facet.SolrFacetHelper;
 import org.alfresco.repo.search.impl.solr.facet.handler.FacetLabelDisplayHandlerRegistry;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -54,7 +55,6 @@ import org.alfresco.service.cmr.rating.RatingService;
 import org.alfresco.service.cmr.rendition.RenditionService;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.CopyService;
-import org.alfresco.service.cmr.repository.CrossRepositoryCopyService;
 import org.alfresco.service.cmr.repository.DocumentLinkService;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -497,7 +497,15 @@ public class MockedTestServiceRegistry implements ServiceRegistry
     }
 
     @Override
-    public DocumentLinkService getDocumentLinkService() {
+    public DocumentLinkService getDocumentLinkService() 
+    {
+        // A mock response
+        return null;
+    }
+    
+    @Override
+    public PolicyComponent getPolicyComponent()
+    {
         // A mock response
         return null;
     }