svn commit: r984354 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java

[an...@apache.org]

Author: angela
Date: Wed Aug 11 10:03:59 2010
New Revision: 984354

URL: http://svn.apache.org/viewvc?rev=984354&view=rev
Log:
minor improvement

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java?rev=984354&r1=984353&r2=984354&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/principal/DefaultPrincipalProvider.java Wed Aug 11 10:03:59 2010
@@ -92,21 +92,21 @@ public class DefaultPrincipalProvider ex
      * Creates a new DefaultPrincipalProvider reading the principals from the
      * storage below the given security root node.
      *
-     * @param securitySession for repository access.
-     * @param userManager Used to retrieve the principals.
+     * @param systemSession for repository access.
+     * @param systemUserManager Used to retrieve the principals.
      * @throws RepositoryException if an error accessing the repository occurs.
      */
-    public DefaultPrincipalProvider(Session securitySession,
-                                    UserManagerImpl userManager) throws RepositoryException {
+    public DefaultPrincipalProvider(Session systemSession,
+                                    UserManagerImpl systemUserManager) throws RepositoryException {
 
-        this.userManager = userManager;
+        this.userManager = systemUserManager;
         everyonePrincipal = EveryonePrincipal.getInstance();
         membershipCache = new LRUMap();
 
         // listen to modifications of group-membership
         String[] ntNames = new String[2];
-        if (securitySession instanceof SessionImpl) {
-            NameResolver resolver = (NameResolver) securitySession;
+        if (systemSession instanceof SessionImpl) {
+            NameResolver resolver = (NameResolver) systemSession;
             ntNames[0] = resolver.getJCRName(UserManagerImpl.NT_REP_GROUP);
             ntNames[1] = resolver.getJCRName(UserManagerImpl.NT_REP_AUTHORIZABLE_FOLDER);
             pMembers = resolver.getJCRName(UserManagerImpl.P_MEMBERS);
@@ -124,7 +124,7 @@ public class DefaultPrincipalProvider ex
         while (!Text.isDescendantOrEqual(targetPath, userPath)) {
             targetPath = Text.getRelativeParent(targetPath, 1);
         }
-        securitySession.getWorkspace().getObservationManager().addEventListener(this,
+        systemSession.getWorkspace().getObservationManager().addEventListener(this,
                 Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_ADDED | Event.PROPERTY_CHANGED | Event.PROPERTY_REMOVED,
                 targetPath,
                 true,