directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r550110 - in /directory/apacheds/trunk: protocol-changepw/src/main/java/org/apache/directory/server/changepw/ protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ protocol-dns/src/main/java/org/apache/directory/serv...
Date Sat, 23 Jun 2007 21:00:16 GMT
Author: erodriguez
Date: Sat Jun 23 14:00:15 2007
New Revision: 550110

URL: http://svn.apache.org/viewvc?view=rev&rev=550110
Log:
Logging statement clean-up in protocols.

Modified:
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
    directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java
    directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java
    directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java
    directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
    directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java

Modified: directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
(original)
+++ directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
Sat Jun 23 14:00:15 2007
@@ -77,7 +77,7 @@
 
             acceptor.bind( new InetSocketAddress( port ), handler, serviceConfig );
 
-            log.debug( "{} listening on port {}", name, new Integer( port ) );
+            log.debug( "{} listening on port {}.", name, new Integer( port ) );
         }
         catch ( IOException ioe )
         {
@@ -108,6 +108,6 @@
         acceptor = null;
         handler = null;
 
-        log.debug( "{} has stopped listening on port {}", config.getServiceName(), new Integer(
config.getIpPort() ) );
+        log.debug( "{} has stopped listening on port {}.", config.getServiceName(), new Integer(
config.getIpPort() ) );
     }
 }

Modified: directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java
(original)
+++ directory/apacheds/trunk/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java
Sat Jun 23 14:00:15 2007
@@ -63,7 +63,7 @@
         try
         {
             String principalName = store.changePassword( clientPrincipal, newPassword );
-            log.debug( "Successfully modified principal {}", principalName );
+            log.debug( "Successfully modified principal {}.", principalName );
         }
         catch ( NamingException ne )
         {

Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
(original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
Sat Jun 23 14:00:15 2007
@@ -76,7 +76,7 @@
 
             acceptor.bind( new InetSocketAddress( port ), handler, serviceConfig );
 
-            log.debug( "{} listening on port {}", name, new Integer( port ) );
+            log.debug( "{} listening on port {}.", name, new Integer( port ) );
         }
         catch ( IOException ioe )
         {
@@ -107,6 +107,6 @@
         acceptor = null;
         handler = null;
 
-        log.debug( "{} has stopped listening on port {}", config.getServiceName(), new Integer(
config.getIpPort() ) );
+        log.debug( "{} has stopped listening on port {}.", config.getServiceName(), new Integer(
config.getIpPort() ) );
     }
 }

Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java
(original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java
Sat Jun 23 14:00:15 2007
@@ -77,7 +77,7 @@
 
             acceptor.bind( new InetSocketAddress( port ), handler, serviceConfig );
 
-            log.debug( name + " listening on port " + port );
+            log.debug( "{} listening on port {}.", name, port );
         }
         catch ( IOException ioe )
         {
@@ -108,6 +108,6 @@
         acceptor = null;
         handler = null;
 
-        log.debug( config.getServiceName() + " has stopped listening on port " + config.getIpPort()
);
+        log.debug( "{} has stopped listening on port {}.", config.getServiceName(), config.getIpPort()
);
     }
 }

Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java
(original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java
Sat Jun 23 14:00:15 2007
@@ -50,7 +50,7 @@
 
         EncryptionType bestType = getBestEncryptionType( requestedTypes, config.getEncryptionTypes()
);
 
-        log.debug( "Session will use encryption type " + bestType );
+        log.debug( "Session will use encryption type {}.", bestType );
 
         if ( bestType == null )
         {

Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
(original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
Sat Jun 23 14:00:15 2007
@@ -74,8 +74,7 @@
         {
             if ( log.isDebugEnabled() )
             {
-                log.debug( "entry for client principal " + clientName
-                    + " has no SAM type: proceeding with standard pre-authentication" );
+                log.debug( "Entry for client principal {} has no SAM type.  Proceeding with
standard pre-authentication.", clientName );
             }
 
             EncryptionType encryptionType = authContext.getEncryptionType();
@@ -147,7 +146,7 @@
 
         if ( log.isDebugEnabled() )
         {
-            log.debug( "Pre-authentication by encrypted timestamp successful for " + clientName
+ "." );
+            log.debug( "Pre-authentication by encrypted timestamp successful for {}.", clientName
);
         }
 
         next.execute( session, message );

Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java
(original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java
Sat Jun 23 14:00:15 2007
@@ -51,7 +51,7 @@
 
     static
     {
-        log.debug( "Initializing SAM subsystem" );
+        log.debug( "Initializing SAM subsystem." );
         SamSubsystem.getInstance().setIntegrityChecker( new TimestampChecker() );
     }
 
@@ -72,8 +72,7 @@
         {
             if ( log.isDebugEnabled() )
             {
-                log.debug( "entry for client principal " + clientName
-                    + " has a valid SAM type: invoking SAM subsystem for pre-authentication"
);
+                log.debug( "Entry for client principal {} has a valid SAM type: invoking
SAM subsystem for pre-authentication.", clientName );
             }
 
             PreAuthenticationData[] preAuthData = request.getPreAuthData();
@@ -106,7 +105,7 @@
 
             if ( log.isDebugEnabled() )
             {
-                log.debug( "Pre-authentication using SAM subsystem successful for " + clientName
+ "." );
+                log.debug( "Pre-authentication using SAM subsystem successful for {}.", clientName
);
             }
         }
 

Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
(original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
Sat Jun 23 14:00:15 2007
@@ -85,7 +85,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " CREATED : " + session.getTransportType()
);
+            log.debug( "{} CREATED:  {}", session.getRemoteAddress(), session.getTransportType()
);
         }
 
         if ( session.getTransportType() == TransportType.DATAGRAM )
@@ -105,7 +105,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " OPENED" );
+            log.debug( "{} OPENED", session.getRemoteAddress() );
         }
     }
 
@@ -114,7 +114,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " CLOSED" );
+            log.debug( "{} CLOSED", session.getRemoteAddress() );
         }
     }
 
@@ -123,7 +123,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " IDLE(" + status + ")" );
+            log.debug( "{} IDLE({})", session.getRemoteAddress(), status );
         }
     }
 
@@ -139,7 +139,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " RCVD: " + message );
+            log.debug( "{} RCVD:  {}", session.getRemoteAddress(), message );
         }
 
         InetAddress clientAddress = ( ( InetSocketAddress ) session.getRemoteAddress() ).getAddress();
@@ -212,7 +212,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " SENT: " + message );
+            log.debug( "{} SENT:  {}", session.getRemoteAddress(), message );
         }
     }
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AbandonHandler.java
Sat Jun 23 14:00:15 2007
@@ -84,7 +84,7 @@
         {
             if ( IS_DEBUG )
             {
-                log.debug( "Abandoned request: " + req );
+                log.debug( "Abandoned request:  ", req );
             }
         }
     }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/AddHandler.java
Sat Jun 23 14:00:15 2007
@@ -62,7 +62,7 @@
 
         if ( IS_DEBUG )
         {
-            log.debug( "Received a Add message : " + req.toString() );
+            log.debug( "Received an Add message:  {}", req.toString() );
         }
 
         try

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/BindHandler.java
Sat Jun 23 14:00:15 2007
@@ -254,13 +254,12 @@
         {
             if ( bindRequest.isSimple() )
             {
-                log.debug( "Simple authentication" );
+                log.debug( "Simple authentication." );
                 
             }
             else
             {
-                log.debug( "SASL authentication" );
-                log.debug( "SASL mechanism:  {}", bindRequest.getSaslMechanism() );
+                log.debug( "SASL authentication with mechanism:  {}", bindRequest.getSaslMechanism()
);
             }
         }
         

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyDnHandler.java
Sat Jun 23 14:00:15 2007
@@ -79,7 +79,7 @@
 
         if ( IS_DEBUG )
         {
-            log.debug( "req.getName() == [" + req.getName() + "]" );
+            log.debug( "req.getName() == [{}]", req.getName() );
         }
 
         if ( req.getName().isEmpty() )

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
Sat Jun 23 14:00:15 2007
@@ -152,7 +152,7 @@
 
     	if ( IS_DEBUG )
     	{
-    		log.debug( "Message received : " + request.toString() );
+    		log.debug( "Message received:  {}", request.toString() );
     	}
 
     	ServerLdapContext ctx;

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/AbstractSaslCallbackHandler.java
Sat Jun 23 14:00:15 2007
@@ -125,20 +125,23 @@
         {
             Callback callback = callbacks[i];
 
-            log.debug( "Processing callback " + ( i + 1 ) + " of " + callbacks.length + ":
 "
-                + callback.getClass().toString() );
+            if ( log.isDebugEnabled() )
+            {
+                log.debug( "Processing callback " + ( i + 1 ) + " of " + callbacks.length
+ ":  "
+                        + callback.getClass().toString() );
+            }
 
             if ( callback instanceof NameCallback )
             {
                 NameCallback nameCB = ( NameCallback ) callback;
-                log.debug( "NameCallback default name   " + nameCB.getDefaultName() );
+                log.debug( "NameCallback default name:  {}", nameCB.getDefaultName() );
 
                 username = nameCB.getDefaultName();
             }
             else if ( callback instanceof RealmCallback )
             {
                 RealmCallback realmCB = ( RealmCallback ) callback;
-                log.debug( "RealmCallback default text  " + realmCB.getDefaultText() );
+                log.debug( "RealmCallback default text:  {}", realmCB.getDefaultText() );
 
                 realm = realmCB.getDefaultText();
             }
@@ -158,17 +161,17 @@
 
                 // hnelson (CRAM-MD5, DIGEST-MD5)
                 // hnelson@EXAMPLE.COM (GSSAPI)
-                log.debug( "AuthorizeCallback authnID      " + authorizeCB.getAuthenticationID()
);
+                log.debug( "AuthorizeCallback authnID:  {}", authorizeCB.getAuthenticationID()
);
 
                 // hnelson (CRAM-MD5, DIGEST-MD5)
                 // hnelson@EXAMPLE.COM (GSSAPI)
-                log.debug( "AuthorizeCallback authzID      " + authorizeCB.getAuthorizationID()
);
+                log.debug( "AuthorizeCallback authzID:  {}", authorizeCB.getAuthorizationID()
);
 
                 // null (CRAM-MD5, DIGEST-MD5, GSSAPI)
-                log.debug( "AuthorizeCallback authorizedID " + authorizeCB.getAuthorizedID()
);
+                log.debug( "AuthorizeCallback authorizedID:  {}", authorizeCB.getAuthorizedID()
);
 
                 // false (CRAM-MD5, DIGEST-MD5, GSSAPI)
-                log.debug( "AuthorizeCallback isAuthorized " + authorizeCB.isAuthorized()
);
+                log.debug( "AuthorizeCallback isAuthorized:  {}", authorizeCB.isAuthorized()
);
 
                 authorize( authorizeCB );
             }

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/DigestMd5CallbackHandler.java
Sat Jun 23 14:00:15 2007
@@ -80,7 +80,11 @@
 
     protected void authorize( AuthorizeCallback authorizeCB )
     {
-        log.debug( "Converted username " + getUsername() + " to DN " + bindDn + " with password
" + userPassword );
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( "Converted username " + getUsername() + " to DN " + bindDn + " with
password " + userPassword + "." );
+        }
+
         session.setAttribute( Context.SECURITY_PRINCIPAL, bindDn );
 
         authorizeCB.setAuthorizedID( bindDn );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GetLdapContext.java
Sat Jun 23 14:00:15 2007
@@ -135,9 +135,9 @@
         String sessionMechanism = ( String ) session.getAttribute( "sessionMechanism" );
         String authenticationLevel = getAuthenticationLevel( sessionMechanism );
 
-        log.debug( Context.SECURITY_PRINCIPAL + " " + principal );
-        log.debug( Context.SECURITY_CREDENTIALS + " " + credentials );
-        log.debug( Context.SECURITY_AUTHENTICATION + " " + authenticationLevel );
+        log.debug( "{} {}", Context.SECURITY_PRINCIPAL, principal );
+        log.debug( "{} {}", Context.SECURITY_CREDENTIALS, credentials );
+        log.debug( "{} {}", Context.SECURITY_AUTHENTICATION, authenticationLevel );
 
         // clone the environment first then add the required security settings
         Hashtable<String, Object> env = SessionRegistry.getSingleton().getEnvironmentByCopy();

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/GssapiCallbackHandler.java
Sat Jun 23 14:00:15 2007
@@ -80,7 +80,7 @@
         PrincipalStoreEntry entry = ( PrincipalStoreEntry ) getPrincipal.execute( ctx, null
);
         String bindDn = entry.getDistinguishedName();
 
-        log.debug( "Converted username " + username + " to DN " + bindDn + "." );
+        log.debug( "Converted username {} to DN {}.", username, bindDn );
         session.setAttribute( Context.SECURITY_PRINCIPAL, bindDn );
 
         authorizeCB.setAuthorizedID( bindDn );

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/bind/SaslFilter.java
Sat Jun 23 14:00:15 2007
@@ -81,7 +81,7 @@
 
     public void messageReceived( NextFilter nextFilter, IoSession session, Object message
) throws SaslException
     {
-        log.debug( "Message received:  " + message );
+        log.debug( "Message received:  {}", message );
 
         /*
          * Unwrap the data for mechanisms that support QoP (DIGEST-MD5, GSSAPI).
@@ -99,7 +99,7 @@
             byte[] bufferBytes = new byte[bufferLength];
             buf.get( bufferBytes );
 
-            log.debug( "Will use SASL to unwrap received message of length:  " + bufferLength
);
+            log.debug( "Will use SASL to unwrap received message of length:  {}", bufferLength
);
             byte[] token = context.unwrap( bufferBytes, 0, bufferBytes.length );
             nextFilter.messageReceived( session, ByteBuffer.wrap( token ) );
         }
@@ -113,7 +113,7 @@
 
     public void filterWrite( NextFilter nextFilter, IoSession session, WriteRequest writeRequest
) throws SaslException
     {
-        log.debug( "Filtering write request:  " + writeRequest );
+        log.debug( "Filtering write request:  {}", writeRequest );
 
         /*
          * Check if security layer processing should be disabled once.
@@ -145,7 +145,7 @@
             byte[] bufferBytes = new byte[bufferLength];
             buf.get( bufferBytes );
 
-            log.debug( "Will use SASL to wrap message of length:  " + bufferLength );
+            log.debug( "Will use SASL to wrap message of length:  {}", bufferLength );
 
             byte[] saslLayer = context.wrap( bufferBytes, 0, bufferBytes.length );
 
@@ -158,7 +158,7 @@
             saslLayerBuffer.position( 0 );
             saslLayerBuffer.limit( 4 + saslLayer.length );
 
-            log.debug( "Sending encrypted token of length " + saslLayerBuffer.limit() );
+            log.debug( "Sending encrypted token of length {}.", saslLayerBuffer.limit() );
             nextFilter.filterWrite( session, new WriteRequest( saslLayerBuffer, writeRequest.getFuture()
) );
         }
         else

Modified: directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
(original)
+++ directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
Sat Jun 23 14:00:15 2007
@@ -69,7 +69,7 @@
 
             acceptor.bind( new InetSocketAddress( port ), handler, serviceConfig );
 
-            log.debug( name + " listening on port " + port );
+            log.debug( "{} listening on port {}.", name, port );
         }
         catch ( IOException ioe )
         {
@@ -100,6 +100,6 @@
         acceptor = null;
         handler = null;
 
-        log.debug( config.getServiceName() + " has stopped listening on port " + config.getIpPort()
);
+        log.debug( "{} has stopped listening on port {}.", config.getServiceName(), config.getIpPort()
);
     }
 }

Modified: directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java?view=diff&rev=550110&r1=550109&r2=550110
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java
Sat Jun 23 14:00:15 2007
@@ -48,7 +48,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " CREATED" );
+            log.debug( "{} CREATED", session.getRemoteAddress() );
         }
 
         session.getFilterChain().addFirst( "codec", new ProtocolCodecFilter( NtpProtocolCodecFactory.getInstance()
) );
@@ -59,7 +59,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " OPENED" );
+            log.debug( "{} OPENED", session.getRemoteAddress() );
         }
     }
 
@@ -68,7 +68,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " CLOSED" );
+            log.debug( "{} CLOSED", session.getRemoteAddress() );
         }
     }
 
@@ -77,7 +77,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " IDLE(" + status + ")" );
+            log.debug( "{} IDLE({})", session.getRemoteAddress(), status );
         }
     }
 
@@ -93,7 +93,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " RCVD: " + message );
+            log.debug( "{} RCVD: {}", session.getRemoteAddress(), message );
         }
 
         NtpMessage reply = ntpService.getReplyFor( ( NtpMessage ) message );
@@ -106,7 +106,7 @@
     {
         if ( log.isDebugEnabled() )
         {
-            log.debug( session.getRemoteAddress() + " SENT: " + message );
+            log.debug( "{} SENT: {}", session.getRemoteAddress(), message );
         }
     }
 }



Mime
View raw message