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:55:44 UTC
svn commit: r1546882 - in /archiva/redback/redback-core/trunk:
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/
redback-integrations/redback-common-integra...
Author: olamy
Date: Mon Dec 2 02:55:43 2013
New Revision: 1546882
URL: http://svn.apache.org/r1546882
Log:
fix logging info level
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
Modified: archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java?rev=1546882&r1=1546881&r2=1546882&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java Mon Dec 2 02:55:43 2013
@@ -77,7 +77,7 @@ public class LdapBindAuthenticatorTest
suffix =
apacheDs.addSimplePartition( "test", new String[]{ "redback", "plexus", "codehaus", "org" } ).getSuffix();
- log.info( "DN Suffix: " + suffix );
+ log.info( "DN Suffix: {}", suffix );
apacheDs.startServer();
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java?rev=1546882&r1=1546881&r2=1546882&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java Mon Dec 2 02:55:43 2013
@@ -161,7 +161,7 @@ public class MailGeneratorTest
assertNotNull( content );
- log.info( "mail content " + content );
+ log.info( "mail content {}", content );
assertTrue( content.indexOf( "baseUrl" ) == -1 ); // make sure everything is properly populate
assertTrue( content.indexOf( "MY_APPLICATION_URL/security" ) > 0 ); // make sure everything is properly populate
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java?rev=1546882&r1=1546881&r2=1546882&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java Mon Dec 2 02:55:43 2013
@@ -113,7 +113,7 @@ public abstract class AbstractRestServic
this.port = tomcat.getConnector().getLocalPort();
- log.info( "start server on port " + this.port );
+ log.info( "start server on port {}", this.port );
UserService userService = getUserService();
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java?rev=1546882&r1=1546881&r2=1546882&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java Mon Dec 2 02:55:43 2013
@@ -100,7 +100,7 @@ public class RoleManagementServiceTest
List<Role> roles = getRoleManagementService( authorizationHeader ).getEffectivelyAssignedRoles( "toto" );
- log.info( "toto roles:" + roles );
+ log.info( "toto roles: {}", roles );
assertTrue( roles.contains( new Role( "User Administrator" ) ) );
}
@@ -123,7 +123,7 @@ public class RoleManagementServiceTest
for ( Role role : roles )
{
- log.info( "role:" + role );
+ log.info( "role: {}", role );
}
}
@@ -133,7 +133,7 @@ public class RoleManagementServiceTest
{
Role role = getRoleManagementService( authorizationHeader ).getRole( "User Administrator" );
- log.info( "role:" + role );
+ log.info( "role: {}", role );
}
@@ -246,7 +246,7 @@ public class RoleManagementServiceTest
for ( ApplicationRoles applicationRoles : applicationRoleList )
{
- log.info( "applicationRoles:" + applicationRoles );
+ log.info( "applicationRoles: {}", applicationRoles );
}
}
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java?rev=1546882&r1=1546881&r2=1546882&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java Mon Dec 2 02:55:43 2013
@@ -314,7 +314,7 @@ public class UserServiceTest
throws Exception
{
Collection<Permission> permissions = getUserService( authorizationHeader ).getUserPermissions( "admin" );
- log.info( "admin permisssions:" + permissions );
+ log.info( "admin permisssions: {}", permissions );
}
@Test
@@ -323,7 +323,7 @@ public class UserServiceTest
{
createGuestIfNeeded();
Collection<Permission> permissions = getUserService().getCurrentUserPermissions();
- log.info( "guest permisssions:" + permissions );
+ log.info( "guest permisssions: {}", permissions );
}
@Test
@@ -331,7 +331,7 @@ public class UserServiceTest
throws Exception
{
Collection<Operation> operations = getUserService( authorizationHeader ).getUserOperations( "admin" );
- log.info( "admin operations:" + operations );
+ log.info( "admin operations: {}", operations );
}
@Test
@@ -340,7 +340,7 @@ public class UserServiceTest
{
createGuestIfNeeded();
Collection<Operation> operations = getUserService().getCurrentUserOperations();
- log.info( "guest operations:" + operations );
+ log.info( "guest operations: {}", operations );
}
@Test
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java?rev=1546882&r1=1546881&r2=1546882&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java Mon Dec 2 02:55:43 2013
@@ -258,8 +258,7 @@ public class DefaultRoleModelProcessor
{
if ( !role.getPermissions().contains( permission ) )
{
- log.info( "Adding new permission '" + permission.getName() + "' to role '" + role.getName()
- + "'" );
+ log.info( "Adding new permission '{}' to role '{}'", permission.getName(), role.getName() );
role.addPermission( permission );
changed = true;
}
@@ -272,8 +271,7 @@ public class DefaultRoleModelProcessor
if ( !permissions.contains( permission ) )
{
log.info(
- "Removing old permission '" + permission.getName() + "' from role '" + role.getName()
- + "'" );
+ "Removing old permission '{}' from role '{}'", permission.getName(), role.getName() );
role.removePermission( permission );
changed = true;
}
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java?rev=1546882&r1=1546881&r2=1546882&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java Mon Dec 2 02:55:43 2013
@@ -325,8 +325,8 @@ public class DefaultRoleTemplateProcesso
{
if ( !role.getPermissions().contains( permission ) )
{
- log.info(
- "Adding new permission '" + permission.getName() + "' to role '" + role.getName() + "'" );
+ log.info( "Adding new permission '{}' to role '{}'",
+ permission.getName(), role.getName() );
role.addPermission( permission );
changed = true;
}
Modified: archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java?rev=1546882&r1=1546881&r2=1546882&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java Mon Dec 2 02:55:43 2013
@@ -99,7 +99,7 @@ public class LdapUserManagerTest
suffix =
apacheDs.addSimplePartition( "test", new String[]{ "redback", "plexus", "codehaus", "org" } ).getSuffix();
- log.info( "DN Suffix: " + suffix );
+ log.info( "DN Suffix: {}", suffix );
apacheDs.startServer();