You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2017/02/16 18:09:08 UTC
svn commit: r1783263 - in /jackrabbit/oak/branches/1.6: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
Author: angela
Date: Thu Feb 16 18:09:08 2017
New Revision: 1783263
URL: http://svn.apache.org/viewvc?rev=1783263&view=rev
Log:
OAK-5654 : Improve log output with UserImporter (merge r.1782973)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 18:09:08 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782990,1783061,1783066,1783089,1783104-1783105
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782770,1782945,1782973,1782990,1783061,1783066,1783089,1783104-1783105
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1783263&r1=1783262&r2=1783263&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java Thu Feb 16 18:09:08 2017
@@ -233,7 +233,7 @@ class UserImporter implements ProtectedP
} else {
Authorizable a = userManager.getAuthorizable(parent);
if (a == null) {
- log.warn("Cannot handle protected PropInfo " + propInfo + ". Node " + parent + " doesn't represent a valid Authorizable.");
+ log.debug("Cannot handle protected PropInfo " + propInfo + ". Node " + parent + " doesn't represent an Authorizable.");
return false;
}
@@ -618,7 +618,7 @@ class UserImporter implements ProtectedP
} else {
handleFailure("New member of " + gr + ": No such authorizable (NodeID = " + memberContentId + ')');
if (importBehavior == ImportBehavior.BESTEFFORT) {
- log.info("ImportBehavior.BESTEFFORT: Remember non-existing member for processing.");
+ log.debug("ImportBehavior.BESTEFFORT: Remember non-existing member for processing.");
/* since we ignore the set of failed ids later on and
don't know the real memberId => use fake memberId as
value in the map */
@@ -644,7 +644,7 @@ class UserImporter implements ProtectedP
// handling non-existing members in case of best-effort
if (!nonExisting.isEmpty()) {
- log.info("ImportBehavior.BESTEFFORT: Found " + nonExisting.size() + " entries of rep:members pointing to non-existing authorizables. Adding to rep:members.");
+ log.debug("ImportBehavior.BESTEFFORT: Found " + nonExisting.size() + " entries of rep:members pointing to non-existing authorizables. Adding to rep:members.");
Tree groupTree = root.getTree(gr.getPath());
MembershipProvider membershipProvider = userManager.getMembershipProvider();
@@ -716,7 +716,7 @@ class UserImporter implements ProtectedP
handleFailure("Failed to grant impersonation for " + principalName + " on " + a);
if (importBehavior == ImportBehavior.BESTEFFORT &&
getPrincipalManager().getPrincipal(principalName) == null) {
- log.info("ImportBehavior.BESTEFFORT: Remember non-existing impersonator for special processing.");
+ log.debug("ImportBehavior.BESTEFFORT: Remember non-existing impersonator for special processing.");
nonExisting.add(principalName);
}
}