svn commit: r828948 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManager.java

[mr...@apache.org]

Author: mreutegg
Date: Fri Oct 23 07:14:11 2009
New Revision: 828948

URL: http://svn.apache.org/viewvc?rev=828948&view=rev
Log:
JCR-2313: Improvements to user management (2)
- fix regression, PrincipalProviderRegistry must not throw UnsupportedRepositoryOperationException

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManager.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManager.java?rev=828948&r1=828947&r2=828948&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/UserPerWorkspaceSecurityManager.java Fri Oct 23 07:14:11 2009
@@ -68,13 +68,13 @@
      */
     private static final Logger log = LoggerFactory.getLogger(UserPerWorkspaceSecurityManager.class);
 
-    private final Map<String, PrincipalProviderRegistry> ppRegistries = new HashMap();
+    private final Map<String, PrincipalProviderRegistry> ppRegistries = new HashMap<String, PrincipalProviderRegistry>();
 
     /**
      * List of workspace names for which {@link #createSystemUsers} has already
      * been called.
      */
-    private final List<String> systemUsersInitialized = new ArrayList();
+    private final List<String> systemUsersInitialized = new ArrayList<String>();
 
     private PrincipalProviderRegistry getPrincipalProviderRegistry(SessionImpl s) throws RepositoryException {
         String wspName = s.getWorkspace().getName();
@@ -285,7 +285,7 @@
         }
 
         public PrincipalProvider registerProvider(Properties configuration) throws RepositoryException {
-            throw new UnsupportedOperationException();
+            return getPrincipalProviderRegistry().registerProvider(configuration);
         }
 
         public PrincipalProvider getDefault() {
@@ -301,7 +301,7 @@
         }
 
         public PrincipalProvider[] getProviders() {
-            List<PrincipalProvider> l = new ArrayList();
+            List<PrincipalProvider> l = new ArrayList<PrincipalProvider>();
             l.addAll(Arrays.asList(getPrincipalProviderRegistry().getProviders()));
             l.add(defaultPrincipalProvider);
             return l.toArray(new PrincipalProvider[l.size()]);