fix logging warn level

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1546883 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 19 insertions, 19 deletions

diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
index 474b7ab30..ab131059e 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
@@ -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() );
         }
     }
 }
diff --git a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
index 132651bea..315559555 100644
--- a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
+++ b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
@@ -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;
         }
     }
diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
index 4e0680b2a..a5c0ac335 100644
--- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
+++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
@@ -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 );
 
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
index c1cb6613e..2ea248246 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
@@ -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;
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
index bdb8580c8..33b436407 100644
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
@@ -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;
         }
 
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
index 31197c0e3..9133f8456 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
@@ -407,7 +407,7 @@ public class DefaultRoleManagementService
                     }
                     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 DefaultRoleManagementService
                         }
                         catch ( UserNotFoundException e )
                         {
-                            log.warn( "User '" + userAssignment.getPrincipal() + "' doesn't exist.", e );
+                            log.warn( "User '{}' doesn't exist.", userAssignment.getPrincipal(), e );
                         }
                     }
                 }
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
index ec6c32990..db65d887c 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
@@ -80,7 +80,7 @@ public abstract class AbstractRBACManager
             }
             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 AbstractRBACManager
             }
             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 AbstractRBACManager
             }
             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 AbstractRBACManager
             }
             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 AbstractRBACManager
             }
             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 AbstractRBACManager
             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 AbstractRBACManager
             }
             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 AbstractRBACManager
                 {
                     // 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() );
                 }
             }
         }
diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
index 75a3088e8..17b2154fe 100644
--- a/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
@@ -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 );
         }
     }
 
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
index dbaa9b830..767e7b8b9 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/LdapUserManager.java
@@ -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 );
         }
     }