Author: tripod
Date: Fri Mar 14 00:50:09 2014
New Revision: 1577398
URL: http://svn.apache.org/r1577398
Log:
@trivial use new slf4j signature
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java?rev=1577398&r1=1577397&r2=1577398&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
Fri Mar 14 00:50:09 2014
@@ -221,9 +221,7 @@ public class DefaultSyncHandler implemen
throw new IllegalArgumentException("identity must be user
or group but was: " + identity);
}
if (log.isDebugEnabled()) {
- log.debug("sync({}) -> {} {}", new Object[]{
- identity.getExternalId().getString(),
identity.getId(), timer.getString()
- });
+ log.debug("sync({}) -> {} {}",
identity.getExternalId().getString(), identity.getId(), timer.getString());
}
return ret;
} catch (RepositoryException e) {
@@ -281,7 +279,7 @@ public class DefaultSyncHandler implemen
}
}
if (log.isDebugEnabled()) {
- log.debug("sync({}) -> {} {}", new Object[]{id,
ref.getString(), timer.getString()});
+ log.debug("sync({}) -> {} {}", id, ref.getString(),
timer.getString());
}
return ret;
} catch (RepositoryException e) {
@@ -564,30 +562,19 @@ public class DefaultSyncHandler implemen
Value[] values = auth.getProperty(REP_LAST_SYNCED);
if (values == null || values.length == 0) {
if (log.isDebugEnabled()) {
- log.debug("{} of {} '{}' need sync. " + REP_LAST_SYNCED +
" not set.", new Object[] {
- type,
- auth.isGroup() ? "group" : "user",
- auth.getID()
- });
+ log.debug("{} of {} '{}' need sync. " + REP_LAST_SYNCED +
" not set.",
+ type, auth.isGroup() ? "group" : "user",
auth.getID());
}
return true;
} else if (now - values[0].getLong() > expirationTime) {
if (log.isDebugEnabled()) {
- log.debug("{} of {} '{}' need sync. " + REP_LAST_SYNCED +
" expired ({} > {})", new Object[]{
- type,
- auth.isGroup() ? "group" : "user",
- auth.getID(),
- now - values[0].getLong(), expirationTime
- });
+ log.debug("{} of {} '{}' need sync. " + REP_LAST_SYNCED +
" expired ({} > {})",
+ type, auth.isGroup() ? "group" : "user",
auth.getID(), now - values[0].getLong(), expirationTime);
}
return true;
} else {
if (log.isDebugEnabled()) {
- log.debug("{} of {} '{}' do not need sync.", new Object[]{
- type,
- auth.isGroup() ? "group" : "user",
- auth.getID()
- });
+ log.debug("{} of {} '{}' do not need sync.", type,
auth.isGroup() ? "group" : "user", auth.getID());
}
return false;
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1577398&r1=1577397&r2=1577398&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
Fri Mar 14 00:50:09 2014
@@ -23,7 +23,6 @@ import java.util.Set;
import javax.annotation.Nonnull;
import javax.jcr.Credentials;
-import javax.jcr.RepositoryException;
import javax.jcr.SimpleCredentials;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
@@ -217,19 +216,16 @@ public class ExternalLoginModule extends
return false;
}
} catch (ExternalIdentityException e) {
- log.error("Error while authenticating '{}' with {}", new Object[]{
- userId == null ? credentials : userId, idp.getName(), e
- });
+ log.error("Error while authenticating '{}' with {}",
+ userId == null ? credentials : userId, idp.getName(), e);
return false;
} catch (LoginException e) {
- log.debug("IDP {} throws login exception for '{}': {}", new
Object[] {
- idp.getName(), userId == null ? credentials : userId,
e.getMessage()
- });
+ log.debug("IDP {} throws login exception for '{}': {}",
+ idp.getName(), userId == null ? credentials : userId,
e.getMessage());
throw e;
} catch (Exception e) {
- log.debug("SyncHandler {} throws sync exception for '{}'", new
Object[] {
- syncHandler.getName(), userId == null ? credentials :
userId, e
- });
+ log.debug("SyncHandler {} throws sync exception for '{}'",
+ syncHandler.getName(), userId == null ? credentials :
userId, e);
LoginException le = new LoginException("Error while syncing
user.");
le.initCause(e);
throw le;
Modified:
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java?rev=1577398&r1=1577397&r2=1577398&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
Fri Mar 14 00:50:09 2014
@@ -306,8 +306,7 @@ public class LdapIdentityProvider implem
log.warn("search for {} returned more than one entry.
discarding additional ones.", searchFilter);
}
if (log.isDebugEnabled()) {
- log.debug("search below {} with {} found {}",
- new Object[]{idConfig.getBaseDN(), searchFilter,
resultEntry.getDn()});
+ log.debug("search below {} with {} found {}",
idConfig.getBaseDN(), searchFilter, resultEntry.getDn());
}
return resultEntry;
}
@@ -457,9 +456,8 @@ public class LdapIdentityProvider implem
}
timer.mark("iterate");
if (log.isDebugEnabled()) {
- log.debug("search below {} with {} found {} entries. {}", new
Object[]{
- config.getGroupConfig().getBaseDN(), searchFilter,
groups.size(), timer.getString()
- });
+ log.debug("search below {} with {} found {} entries. {}",
+ config.getGroupConfig().getBaseDN(), searchFilter,
groups.size(), timer.getString());
}
return groups;
} catch (Exception e) {
@@ -495,9 +493,7 @@ public class LdapIdentityProvider implem
}
timer.mark("iterate");
if (log.isDebugEnabled()) {
- log.debug("members lookup of {} found {} members. {}", new
Object[]{
- ref.getId(), members.size(), timer.getString()
- });
+ log.debug("members lookup of {} found {} members. {}",
ref.getId(), members.size(), timer.getString());
}
return members;
} catch (Exception e) {
