jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r833187 - in /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security: SimpleJBossAccessManager.java user/UserAccessControlProvider.java user/UserImporter.java user/UserManagerImpl.java
Date Thu, 05 Nov 2009 21:33:24 GMT
Author: angela
Date: Thu Nov  5 21:33:23 2009
New Revision: 833187

URL: http://svn.apache.org/viewvc?rev=833187&view=rev
Log:
fix typos in comments and javadoc, improve readability of comments

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java?rev=833187&r1=833186&r2=833187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/SimpleJBossAccessManager.java
Thu Nov  5 21:33:23 2009
@@ -109,7 +109,7 @@
 
     public boolean isGranted(ItemId id, int permissions) throws RepositoryException {
         // system has always all permissions
-        // anonymous has only READ premissions
+        // anonymous has only READ permissions
         return system || (anonymous && ((permissions & (WRITE | REMOVE)) == 0));
     }
 
@@ -131,7 +131,7 @@
 
     private boolean internalIsGranted(int permissions) {
         /* system has always all permissions,
-           anonymous has only READ premissions */
+           anonymous has only READ permissions */
         return system || (anonymous && Permission.READ == permissions);
     }
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java?rev=833187&r1=833186&r2=833187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserAccessControlProvider.java
Thu Nov  5 21:33:23 2009
@@ -468,7 +468,7 @@
                     String evPath = ev.getPath();
                     String repMembers = session.getJCRName(UserConstants.P_MEMBERS);
                     if (repMembers.equals(Text.getName(evPath))) {
-                        // recalculate the is...Admin flages
+                        // recalculate the is...Admin flags
                         Node userNode = session.getNode(userNodePath);
                         String nodePath = Text.getRelativeParent(evPath, 1);
                         if (userAdminGroupPath.equals(nodePath)) {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java?rev=833187&r1=833186&r2=833187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java
Thu Nov  5 21:33:23 2009
@@ -177,7 +177,7 @@
         }
 
         /* importer can only handle protected properties below user/group
-           nodes that are properly stored underneith the configured users/groups
+           nodes that are properly stored underneath the configured users/groups
            hierarchies (see {@link UserManagerImpl#getAuthorizable(NodeImpl)}.
            this prevents from importing user/group nodes somewhere in the
            content hierarchy which isn't possible when creating user/groups
@@ -366,7 +366,7 @@
                             Value[] vls = groupNode.getProperty(UserConstants.P_MEMBERS).getValues();
                             memberValues.addAll(Arrays.asList(vls));
                         }
-                        // ... and the non-Existing onces.
+                        // ... and the non-Existing ones.
                         memberValues.addAll(nonExisting);
                         // and use implementation specific method to set the
                         // value of rep:members properties which was not possible

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java?rev=833187&r1=833186&r2=833187&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserManagerImpl.java
Thu Nov  5 21:33:23 2009
@@ -337,7 +337,7 @@
         } else {
             // another Principal implementation.
             // a) try short-cut that works in case of ID.equals(principalName) only.
-            // b) execute query in case of pName mismatch or exc. however, query
+            // b) execute query in case of pName mismatch or exception. however, query
             //    requires persisted user nodes (see known issue of UserImporter).
             String name = principal.getName();           
             try {
@@ -421,7 +421,7 @@
             log.debug("User created: " + userID + "; " + userNode.getPath());
             return user;
         } catch (RepositoryException e) {
-            // something went wrong -> revert changes and rethrow
+            // something went wrong -> revert changes and re-throw
             session.refresh(false);
             log.debug("Failed to create new User, reverting changes.");
             throw e;
@@ -514,8 +514,8 @@
         }
         /*
          Check if there is *another* authorizable with the same principal.
-         The additial validation (nodes not be same) is required in order to
-         circumvent problems with re-importing existing authorizables in which
+         The additional validation (nodes not be same) is required in order to
+         circumvent problems with re-importing existing authorizable in which
          case the original user/group node is being recreated but the search
          used to look for an colliding authorizable still finds the persisted
          node.
@@ -620,7 +620,7 @@
         } catch (ItemNotFoundException e) {
             if (compatibleJR16) {
                 // backwards-compatibility with JR < 2.0 user/group structure that doesn't
-                // allow to determine existance of an authorizable from the id directly.
+                // allow to determine existence of an authorizable from the id directly.
                 // search for it the node belonging to that id
                 n = (NodeImpl) authResolver.findNode(P_USERID, id, NT_REP_USER);
                 if (n == null) {
@@ -743,7 +743,7 @@
      * @see SessionListener#loggedOut(org.apache.jackrabbit.core.SessionImpl)
      */
     public void loggedOut(SessionImpl session) {
-        // and logout the session unless it is the loggedout session itself.
+        // and logout the session unless it is the logged-out session itself.
         if (session != this.session) {
             this.session.logout();
         }
@@ -1124,8 +1124,8 @@
 
             // additional folders needs be created if
             // - the maximal size of child nodes is reached
-            // - if the auth-node to be created potentially collides with any
-            //   of the intermediate nodes.
+            // - if the authorizable node to be created potentially collides with
+            //   any of the intermediate nodes.
             int segmLength = defaultDepth +1;
             
             while (intermediateFolderNeeded(escapedId, folder)) {
@@ -1194,7 +1194,7 @@
                 // existing folder structure: a/ab
                 // authID to be created     : abt
                 // OR
-                // existing collition that would result from
+                // existing collision that would result from
                 // existing folder structure: a/ab/abt
                 // authID to be create      : abt
                 return true;



Mime
View raw message