jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r982251 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/user/UserImporter.java
Date Wed, 04 Aug 2010 13:55:01 GMT
Author: mduerig
Date: Wed Aug  4 13:55:00 2010
New Revision: 982251

URL: http://svn.apache.org/viewvc?rev=982251&view=rev
Log:
fixed typos 

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

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=982251&r1=982250&r2=982251&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
Wed Aug  4 13:55:00 2010
@@ -17,37 +17,39 @@
 package org.apache.jackrabbit.core.security.user;
 
 import org.apache.jackrabbit.api.JackrabbitSession;
-import org.apache.jackrabbit.api.security.user.UserManager;
+import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
-import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.api.security.user.Impersonation;
-import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
+import org.apache.jackrabbit.api.security.user.User;
+import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.jackrabbit.core.NodeImpl;
 import org.apache.jackrabbit.core.SessionImpl;
 import org.apache.jackrabbit.core.id.NodeId;
+import org.apache.jackrabbit.core.security.principal.PrincipalImpl;
+import org.apache.jackrabbit.core.security.user.UserImporter.ImportBehavior;
+import org.apache.jackrabbit.core.util.ReferenceChangeTracker;
 import org.apache.jackrabbit.core.xml.DefaultProtectedPropertyImporter;
 import org.apache.jackrabbit.core.xml.PropInfo;
-import org.apache.jackrabbit.core.util.ReferenceChangeTracker;
-import org.apache.jackrabbit.core.security.principal.PrincipalImpl;
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.QPropertyDefinition;
 import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.jcr.RepositoryException;
+import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
 import javax.jcr.Value;
-import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.nodetype.ConstraintViolationException;
-import java.util.List;
-import java.util.Iterator;
+
+import java.security.Principal;
 import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Arrays;
-import java.security.Principal;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <code>UserImporter</code> implements a
@@ -81,7 +83,7 @@ import java.security.Principal;
  * inserting the user/group node at some other place in the node hierarchy.</li>
  * <li>While creating user/groups through the API the <code>UserManagerImpl</code>
makes
  * sure that authorizables are never nested and are created below a hierarchy
- * of nt:AuthorizableFolder nodes. This isn't efforced by means of node type
+ * of nt:AuthorizableFolder nodes. This isn't enforced by means of node type
  * constraints but only by the API. This importer currently doesn't perform such
  * a validation check.</li>
  * <li>Any attempt to import conflicting data will cause the import to fail
@@ -95,7 +97,7 @@ import java.security.Principal;
  * configuration parameter, which can be set to
  * <ul>
  * <li>{@link ImportBehavior#NAME_IGNORE ignore}: A warning is logged.</li>
- * <li>{@link ImportBehavior#NAME_BESTEFFORT besteffort}: A warning is logged
+ * <li>{@link ImportBehavior#NAME_BESTEFFORT best effort}: A warning is logged
  * and the importer tries to fix the problem.</li>
  * <li>{@link ImportBehavior#NAME_ABORT abort}: The import is immediately
  * aborted with a ConstraintViolationException. (<strong>default</strong>)</li>
@@ -103,7 +105,7 @@ import java.security.Principal;
  * </li>
  * </ul>
  * Known Issue:<br>
- * Importing <code>rep:impersonators</code> property refering to principals
+ * Importing <code>rep:impersonators</code> property referring to principals
  * that are created during this import AND have principalName different from the
  * ID will no succeed, as the validation in <code>ImpersonationImpl</code> isn't
able
  * to find the authorizable with the given principal (reason: query will only



Mime
View raw message