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:22 UTC
svn commit: r1546884 - in /archiva/redback/redback-core/trunk:
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva...
Author: olamy
Date: Mon Dec 2 02:56:22 2013
New Revision: 1546884
URL: http://svn.apache.org/r1546884
Log:
fix logging error level
Modified:
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-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.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-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.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-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=1546884&r1=1546883&r2=1546884&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:22 2013
@@ -136,15 +136,15 @@ public class MailerImpl
}
catch ( AddressException e )
{
- log.error( "Unable to send message, subject [" + subject + "]", e );
+ log.error( "Unable to send message, subject [{}]", subject, e );
}
catch ( MessagingException e )
{
- log.error( "Unable to send message, subject [" + subject + "]", e );
+ log.error( "Unable to send message, subject [{}]", subject, e );
}
catch ( UnsupportedEncodingException e )
{
- log.error( "Unable to send message, subject [" + subject + "]", e );
+ log.error( "Unable to send message, subject [{}]", subject, e );
}
}
}
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.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/VelocityMailGenerator.java?rev=1546884&r1=1546883&r2=1546884&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java Mon Dec 2 02:56:22 2013
@@ -76,15 +76,15 @@ public class VelocityMailGenerator
}
catch ( ParseErrorException e )
{
- log.error( "Unable to generate email for template '" + templateFile + "': " + e.getMessage(), e );
+ log.error( "Unable to generate email for template '{}': {}", templateFile, e.getMessage(), e );
}
catch ( MethodInvocationException e )
{
- log.error( "Unable to generate email for template '" + templateFile + "': " + e.getMessage(), e );
+ log.error( "Unable to generate email for template '{}': {}", templateFile, e.getMessage(), e );
}
catch ( Exception e )
{
- log.error( "Unable to generate email for template '" + templateFile + "': " + e.getMessage(), e );
+ log.error( "Unable to generate email for template '{}': {}", templateFile, e.getMessage(), e );
}
return writer.getBuffer().toString();
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.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/util/AutoLoginCookies.java?rev=1546884&r1=1546883&r2=1546884&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java Mon Dec 2 02:56:22 2013
@@ -211,7 +211,7 @@ public class AutoLoginCookies
}
catch ( KeyManagerException e )
{
- log.error( "KeyManagerException: " + e.getMessage(), e );
+ log.error( "KeyManagerException: {}", e.getMessage(), e );
}
return null;
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=1546884&r1=1546883&r2=1546884&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:22 2013
@@ -516,7 +516,7 @@ public class DefaultRoleManagementServic
}
catch ( RbacManagerException e )
{
- log.error( "error during assign role " + role.getName() + "Â to user " + username, e );
+ log.error( "error during assign role {}Â to user {}" , role.getName(), username, e );
throw new RedbackServiceException(
new ErrorMessage( "error.assign.role.user", new String[]{ role.getName(), username } ) );
}
@@ -557,7 +557,7 @@ public class DefaultRoleManagementServic
}
catch ( RbacManagerException e )
{
- log.error( "error during unassign role " + role.getName() + "Â to user " + username, e );
+ log.error( "error during assign role {}Â to user {}" , role.getName(), username, e );
throw new RedbackServiceException(
new ErrorMessage( "error.unassign.role.user", new String[]{ role.getName(), username } ) );
}
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.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/DefaultUserService.java?rev=1546884&r1=1546883&r2=1546884&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java Mon Dec 2 02:56:22 2013
@@ -210,7 +210,7 @@ public class DefaultUserService
}
catch ( RoleManagerException rpe )
{
- log.error( "RoleProfile Error: " + rpe.getMessage(), rpe );
+ log.error( "RoleProfile Error: {}", rpe.getMessage(), rpe );
throw new RedbackServiceException( new ErrorMessage( "assign.role.failure", null ) );
}
catch ( UserManagerException e )
@@ -647,7 +647,7 @@ public class DefaultUserService
}
catch ( RoleManagerException rpe )
{
- log.error( "RoleProfile Error: " + rpe.getMessage(), rpe );
+ log.error( "RoleProfile Error: {}", rpe.getMessage(), rpe );
throw new RedbackServiceException( new ErrorMessage( "assign.role.failure", null ) );
}
catch ( UserManagerException 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=1546884&r1=1546883&r2=1546884&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:22 2013
@@ -138,11 +138,11 @@ public class LdapUserManager
}
catch ( LdapControllerException e )
{
- log.error( "Error mapping user: " + user.getUsername() + " to LDAP attributes.", e );
+ log.error( "Error mapping user: {} to LDAP attributes.", user.getUsername(), e );
}
catch ( MappingException e )
{
- log.error( "Error mapping user: " + user.getUsername() + " to LDAP attributes.", e );
+ log.error( "Error mapping user: {} to LDAP attributes.", user.getUsername(), e );
}
finally
{
@@ -178,7 +178,7 @@ public class LdapUserManager
}
catch ( LdapControllerException e )
{
- log.error( "Failed to delete user: " + username, e );
+ log.error( "Failed to delete user: {}", username, e );
}
catch ( LdapException e )
{
@@ -396,11 +396,11 @@ public class LdapUserManager
}
catch ( LdapControllerException e )
{
- log.error( "Failed to update user: " + user.getUsername(), e );
+ log.error( "Failed to update user: {}", user.getUsername(), e );
}
catch ( MappingException e )
{
- log.error( "Failed to update user: " + user.getUsername(), e );
+ log.error( "Failed to update user: {}", user.getUsername(), e );
}
catch ( LdapException e )
{