svn commit: r1412693 - in /archiva/redback/redback-core/trunk: redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/ redback-users/redback-users-providers/redba...

[olamy]

Author: olamy
Date: Thu Nov 22 22:16:43 2012
New Revision: 1412693

URL: http://svn.apache.org/viewvc?rev=1412693&view=rev
Log:
reduce logs

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-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.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=1412693&r1=1412692&r2=1412693&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
 Thu Nov 22 22:16:43 2012
@@ -98,7 +98,7 @@ public class LdapBindAuthenticator
             + ( mapper.getUserFilter() != null ? mapper.getUserFilter() : "" ) 
+ "(" + mapper.getUserIdAttribute() + "="
             + source.getPrincipal() + "))";
 
-        log.info( "Searching for users with filter: '{}' from base dn: {}", 
filter, mapper.getUserBaseDn() );
+        log.debug( "Searching for users with filter: '{}' from base dn: {}", 
filter, mapper.getUserBaseDn() );
                                                               
         LdapConnection ldapConnection = getLdapConnection();
         LdapConnection authLdapConnection = null;
@@ -116,7 +116,7 @@ public class LdapBindAuthenticator
 
                 results = context.search( mapper.getUserBaseDn(), filter, ctls 
);
 
-                log.info( "Found user?: {}", results.hasMoreElements() );
+                log.debug( "Found user '{}': {}", source.getPrincipal(), 
results.hasMoreElements() );
 
                 if ( results.hasMoreElements() )
                 {
@@ -135,10 +135,12 @@ public class LdapBindAuthenticator
                 }
             }
 
-            log.info( "Attempting Authenication: {}", userDn );
+            log.debug( "Attempting Authenication: {}", userDn );
 
             authLdapConnection = connectionFactory.getConnection( userDn, 
source.getPassword() );
 
+            log.info( "user '{}' authenticated", source.getPrincipal() );
+
             return new AuthenticationResult( true, source.getPrincipal(), null 
);
         }
         catch ( LdapException e )

Modified: 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.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/ctl/DefaultLdapController.java?rev=1412693&r1=1412692&r2=1412693&view=diff
==============================================================================
--- 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
 (original)
+++ 
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
 Thu Nov 22 22:16:43 2012
@@ -144,7 +144,7 @@ public class DefaultLdapController
         String finalFilter = "(&(objectClass=" + mapper.getUserObjectClass() + 
")" +
             ( mapper.getUserFilter() != null ? mapper.getUserFilter() : "" ) + 
query.getLdapFilter(mapper) + ")";
 
-        log.info( "Searching for users with filter: \'{}\'" + " from base dn: 
{}",finalFilter, mapper.getUserBaseDn() );
+        log.debug( "Searching for users with filter: '{}'" + " from base dn: 
{}",finalFilter, mapper.getUserBaseDn() );
 
         return context.search( mapper.getUserBaseDn(), finalFilter, ctls );
     }
@@ -257,7 +257,8 @@ public class DefaultLdapController
     {
         String username = key.toString();
 
-        log.info( "Searching for user: {}", username );
+        log.debug( "Searching for user: {}", username );
+
         LdapUserQuery query = new LdapUserQuery();
         query.setUsername( username );
 
@@ -270,6 +271,8 @@ public class DefaultLdapController
             {
                 SearchResult next = result.nextElement();
 
+                log.info( "Found user: {}", username );
+
                 return mapper.getUser( next.getAttributes() );
             }
             else