You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/12/02 03:56:09 UTC
svn commit: r1546883 - in /archiva/redback/redback-core/trunk:
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/
redback-common/redback-common-jdo/src/main/...
Author: olamy
Date: Mon Dec 2 02:56:08 2013
New Revision: 1546883
URL: http://svn.apache.org/r1546883
Log:
fix logging warn level
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java Mon Dec 2 02:56:08 2013
@@ -198,7 +198,7 @@ public class LdapBindAuthenticator
}
catch ( NamingException e )
{
- log.warn( "skip exception closing naming search result " + e.getMessage() );
+ log.warn( "skip exception closing naming search result {}", e.getMessage() );
}
}
}
Modified: archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java (original)
+++ archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java Mon Dec 2 02:56:08 2013
@@ -77,7 +77,7 @@ public class UserConfigurableJdoFactory
catch ( InterpolationException e )
{
// ignore interpolation issue
- log.warn( "skip issue during interpolation " + e.getMessage() );
+ log.warn( "skip issue during interpolation {}", e.getMessage() );
return value;
}
}
Modified: archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java Mon Dec 2 02:56:08 2013
@@ -129,7 +129,7 @@ public class DefaultUserConfiguration
}
catch ( EvaluatorException e )
{
- log.warn( "Unable to resolve configuration name: " + e.getMessage(), e );
+ log.warn( "Unable to resolve configuration name: {}", e.getMessage(), e );
}
log.info( "Attempting to find configuration [{}] (resolved to [{}])", configName, configName );
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java Mon Dec 2 02:56:08 2013
@@ -107,7 +107,7 @@ public class LockedAdminEnvironmentCheck
}
catch ( RbacManagerException e )
{
- log.warn( "Exception when checking for locked admin user: " + e.getMessage(), e );
+ log.warn( "Exception when checking for locked admin user: {}", e.getMessage(), e );
}
checked = true;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java Mon Dec 2 02:56:08 2013
@@ -93,7 +93,7 @@ public class MailerImpl
{
if ( recipients.isEmpty() )
{
- log.warn( "Mail Not Sent - No mail recipients for email. subject [" + subject + "]" );
+ log.warn( "Mail Not Sent - No mail recipients for email. subject [{}]", subject );
return;
}
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java Mon Dec 2 02:56:08 2013
@@ -407,7 +407,7 @@ public class DefaultRoleManagementServic
}
catch ( UserNotFoundException e )
{
- log.warn( "User '" + userAssignment.getPrincipal() + "' doesn't exist.", e );
+ log.warn( "User '{}' doesn't exist.", userAssignment.getPrincipal(), e );
}
}
}
@@ -428,7 +428,7 @@ public class DefaultRoleManagementServic
}
catch ( UserNotFoundException e )
{
- log.warn( "User '" + userAssignment.getPrincipal() + "' doesn't exist.", e );
+ log.warn( "User '{}' doesn't exist.", userAssignment.getPrincipal(), e );
}
}
}
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java Mon Dec 2 02:56:08 2013
@@ -80,7 +80,7 @@ public abstract class AbstractRBACManage
}
catch ( Exception e )
{
- log.warn( "Unable to trigger .rbacInit( boolean ) to " + listener.getClass().getName(), e );
+ log.warn( "Unable to trigger .rbacInit( boolean ) to {}", listener.getClass().getName(), e );
}
}
}
@@ -95,7 +95,7 @@ public abstract class AbstractRBACManage
}
catch ( Exception e )
{
- log.warn( "Unable to trigger .rbacRoleSaved( Role ) to " + listener.getClass().getName(), e );
+ log.warn( "Unable to trigger .rbacRoleSaved( Role ) to {}", listener.getClass().getName(), e );
}
}
}
@@ -110,7 +110,7 @@ public abstract class AbstractRBACManage
}
catch ( Exception e )
{
- log.warn( "Unable to trigger .rbacRoleRemoved( Role ) to " + listener.getClass().getName(), e );
+ log.warn( "Unable to trigger .rbacRoleRemoved( Role ) to {}", listener.getClass().getName(), e );
}
}
}
@@ -125,7 +125,7 @@ public abstract class AbstractRBACManage
}
catch ( Exception e )
{
- log.warn( "Unable to trigger .rbacPermissionSaved( Permission ) to " + listener.getClass().getName(),
+ log.warn( "Unable to trigger .rbacPermissionSaved( Permission ) to {}", listener.getClass().getName(),
e );
}
}
@@ -141,7 +141,7 @@ public abstract class AbstractRBACManage
}
catch ( Exception e )
{
- log.warn( "Unable to trigger .rbacPermissionRemoved( Permission ) to " + listener.getClass().getName(),
+ log.warn( "Unable to trigger .rbacPermissionRemoved( Permission ) to {}", listener.getClass().getName(),
e );
}
}
@@ -158,7 +158,7 @@ public abstract class AbstractRBACManage
catch ( Exception e )
{
log.warn(
- "Unable to trigger .rbacUserAssignmentSaved( UserAssignment ) to " + listener.getClass().getName(),
+ "Unable to trigger .rbacUserAssignmentSaved( UserAssignment ) to {}", listener.getClass().getName(),
e );
}
}
@@ -174,8 +174,8 @@ public abstract class AbstractRBACManage
}
catch ( Exception e )
{
- log.warn( "Unable to trigger .rbacUserAssignmentRemoved( UserAssignment ) to "
- + listener.getClass().getName(), e );
+ log.warn( "Unable to trigger .rbacUserAssignmentRemoved( UserAssignment ) to {}",
+ listener.getClass().getName(), e );
}
}
}
@@ -594,7 +594,7 @@ public abstract class AbstractRBACManage
{
// the client application might not manage role clean up totally correctly so we want to notify
// of a child role issue and offer a clean up process at some point
- log.warn( "dangling child role: " + roleName + " on " + role.getName() );
+ log.warn( "dangling child role: {} on {}", roleName, role.getName() );
}
}
}
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java Mon Dec 2 02:56:08 2013
@@ -261,7 +261,7 @@ public class JdoUserManager
}
catch ( UserNotFoundException e )
{
- log.warn( "Unable to delete user " + username + ", user not found.", e );
+ log.warn( "Unable to delete user {}, user not found.", username, e );
}
}
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java?rev=1546883&r1=1546882&r2=1546883&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java Mon Dec 2 02:56:08 2013
@@ -440,7 +440,7 @@ public class LdapUserManager
}
catch ( LdapControllerException e )
{
- log.warn( "Failed to search for user: " + principal, e );
+ log.warn( "Failed to search for user: {}", principal, e );
return false;
}
catch ( LdapException e )
@@ -462,7 +462,7 @@ public class LdapUserManager
}
catch ( LdapException e )
{
- log.warn( "failed to get a ldap connection " + e.getMessage(), e );
+ log.warn( "failed to get a ldap connection {}", e.getMessage(), e );
throw new LdapException( "failed to get a ldap connection " + e.getMessage(), e );
}
}