Backing out stuff that should have gone on its own branch.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/avm/util/RawServices.java

@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.alfresco.repo.avm.util;
 
@@ -10,7 +10,6 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.security.AuthorityService;
-import org.alfresco.service.simple.permission.AuthorityCapabilityRegistry;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
@@ -24,75 +23,70 @@ public class RawServices implements ApplicationContextAware
      * The instance of RawServices
      */
     private static RawServices fgInstance;
-    
+
     /**
      * The Application Context.
      */
-    private ApplicationContext fContext; 
-    
+    private ApplicationContext fContext;
+
     /**
      * The AuthenticationComponent.
      */
     private AuthenticationComponent fAuthenticationComponent;
-    
+
     /**
      * The Content Service.
      */
     private ContentService fContentService;
-    
+
     /**
      * The Mimetype Service.
      */
     private MimetypeService fMimetypeService;
-    
+
     /**
      * The Dictionary Service.
      */
     private DictionaryService fDictionaryService;
-    
+
     /**
      * The Content Store.
      */
     private ContentStore fContentStore;
-    
+
     /**
      * The LookupCache.
      */
     private LookupCache fLookupCache;
-    
+
     /**
      * The Authority Service.
      */
     private AuthorityService fAuthorityService;
-    
-    /**
-     * The CapabilityRegistry.
-     */
-    private AuthorityCapabilityRegistry fCapabilityRegistry;
-    
+
     /**
      * Default constructor.
      */
     public RawServices()
     {
-        fgInstance = this;    
+        fgInstance = this;
     }
-    
+
     public static RawServices Instance()
     {
         return fgInstance;
     }
-    
+
     public void setApplicationContext(ApplicationContext applicationContext)
     {
         fContext = applicationContext;
     }
-    
+
     public AuthenticationComponent getAuthenticationComponent()
     {
         if (fAuthenticationComponent == null)
         {
-            fAuthenticationComponent = 
+            fAuthenticationComponent =
                 (AuthenticationComponent)fContext.getBean("authenticationComponent");
         }
         return fAuthenticationComponent;
@@ -102,7 +96,7 @@ public class RawServices implements ApplicationContextAware
     {
         if (fContentService == null)
         {
-            fContentService = 
+            fContentService =
                 (ContentService)fContext.getBean("contentService");
         }
         return fContentService;
@@ -112,12 +106,12 @@ public class RawServices implements ApplicationContextAware
     {
         if (fMimetypeService == null)
         {
-            fMimetypeService = 
+            fMimetypeService =
                 (MimetypeService)fContext.getBean("mimetypeService");
         }
         return fMimetypeService;
     }
-    
+
     public DictionaryService getDictionaryService()
     {
         if (fDictionaryService == null)
@@ -127,7 +121,7 @@ public class RawServices implements ApplicationContextAware
         }
         return fDictionaryService;
     }
-    
+
     public ContentStore getContentStore()
     {
         if (fContentStore == null)
@@ -137,7 +131,7 @@ public class RawServices implements ApplicationContextAware
         }
         return fContentStore;
     }
-    
+
     public LookupCache getLookupCache()
     {
         if (fLookupCache == null)
@@ -146,7 +140,7 @@ public class RawServices implements ApplicationContextAware
         }
         return fLookupCache;
     }
-    
+
     public AuthorityService getAuthorityService()
     {
         if (fAuthorityService == null)
@@ -157,15 +151,6 @@ public class RawServices implements ApplicationContextAware
         return fAuthorityService;
     }
 
-    public AuthorityCapabilityRegistry getAuthorityCapabilityRegistry()
-    {
-        if (fCapabilityRegistry == null)
-        {
-            fCapabilityRegistry = (AuthorityCapabilityRegistry)fContext.getBean("authorityCapabilityRegistry");
-        }
-        return fCapabilityRegistry;
-    }
-    
     public ApplicationContext getContext()
     {
         return fContext;