You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2013/02/17 21:26:30 UTC
svn commit: r1447069 [1/3] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/api/
core-api/src/main/java/org/apache/directory/server/core/api/filtering/
core-avl/src/main/java/org/apache/directory/server/core/avltr...
Author: elecharny
Date: Sun Feb 17 20:26:29 2013
New Revision: 1447069
URL: http://svn.apache.org/r1447069
Log:
o Used the Loggers class instead of declaring a string for logs
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java
directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
directory/apacheds/trunk/core-integ/src/test/resources/log4j.properties
directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
directory/apacheds/trunk/kerberos-client/src/test/resources/log4j.properties
directory/apacheds/trunk/kerberos-test/src/test/resources/log4j.properties
directory/apacheds/trunk/ldap-client-test/src/test/resources/log4j.properties
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/changepwd/ChangePasswordServer.java
directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
directory/apacheds/trunk/protocol-kerberos/src/test/resources/log4j.properties
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/PingerThread.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplConsumerManager.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplicaEventLog.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/ReplicaJournalCursor.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/provider/SyncReplRequestHandler.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/kerberos/StoreUtils.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/MockSyncReplConsumer.java
directory/apacheds/trunk/server-integ/src/test/resources/log4j.properties
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
directory/apacheds/trunk/service/log4j.properties
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/KeyTupleArrayCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AllEntriesCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/AndCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ApproximateCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/EqualityCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/EntryToResponseCursor.java Sun Feb 17 20:26:29 2013
@@ -24,6 +24,7 @@ package org.apache.directory.server.core
import java.io.IOException;
import java.util.Iterator;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.ClosureMonitor;
import org.apache.directory.api.ldap.model.cursor.Cursor;
@@ -52,7 +53,7 @@ import org.slf4j.LoggerFactory;
public class EntryToResponseCursor extends AbstractCursor<Response> implements SearchCursor
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -76,7 +77,7 @@ public class EntryToResponseCursor exten
{
LOG_CURSOR.debug( "Creating EntryToResponseCursor {}", this );
}
-
+
this.wrapped = wrapped;
this.messageId = messageId;
}
@@ -142,7 +143,7 @@ public class EntryToResponseCursor exten
{
LOG_CURSOR.debug( "Closing EntryToResponseCursor {}", this );
}
-
+
wrapped.close();
}
@@ -156,7 +157,7 @@ public class EntryToResponseCursor exten
{
LOG_CURSOR.debug( "Closing EntryToResponseCursor {}", this );
}
-
+
wrapped.close( e );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java Sun Feb 17 20:26:29 2013
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.ClosureMonitor;
import org.apache.directory.api.ldap.model.cursor.Cursor;
@@ -56,7 +57,7 @@ public class BaseEntryFilteringCursor ex
private static final Logger log = LoggerFactory.getLogger( BaseEntryFilteringCursor.class );
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -66,7 +67,7 @@ public class BaseEntryFilteringCursor ex
/** the parameters associated with the search operation */
private final SearchOperationContext operationContext;
-
+
/** The SchemaManager */
private final SchemaManager schemaManager;
@@ -106,13 +107,14 @@ public class BaseEntryFilteringCursor ex
* @param invocation the search operation invocation creating this Cursor
* @param filter a single filter to be used
*/
- public BaseEntryFilteringCursor( Cursor<Entry> wrapped, SearchOperationContext operationContext, SchemaManager schemaManager )
+ public BaseEntryFilteringCursor( Cursor<Entry> wrapped, SearchOperationContext operationContext,
+ SchemaManager schemaManager )
{
if ( IS_DEBUG )
{
LOG_CURSOR.debug( "Creating BaseEntryFilteringCursor {}", this );
}
-
+
this.wrapped = wrapped;
this.operationContext = operationContext;
this.filters = new ArrayList<EntryFilter>();
@@ -130,15 +132,15 @@ public class BaseEntryFilteringCursor ex
* @param filters a list of filters to be used
*/
public BaseEntryFilteringCursor( Cursor<Entry> wrapped,
- SearchOperationContext operationContext,
- SchemaManager schemaManager,
+ SearchOperationContext operationContext,
+ SchemaManager schemaManager,
List<EntryFilter> filters )
{
if ( IS_DEBUG )
{
LOG_CURSOR.debug( "Creating BaseEntryFilteringCursor {}", this );
}
-
+
this.wrapped = wrapped;
this.operationContext = operationContext;
this.filters = new ArrayList<EntryFilter>();
@@ -269,7 +271,7 @@ public class BaseEntryFilteringCursor ex
{
LOG_CURSOR.debug( "Closing BaseEntryFilteringCursor {}", this );
}
-
+
wrapped.close();
prefetched = null;
}
@@ -284,7 +286,7 @@ public class BaseEntryFilteringCursor ex
{
LOG_CURSOR.debug( "Closing BaseEntryFilteringCursor {}", this );
}
-
+
wrapped.close( reason );
prefetched = null;
}
@@ -402,17 +404,17 @@ public class BaseEntryFilteringCursor ex
if ( filters.isEmpty() )
{
prefetched = tempResult;
- ServerEntryUtils.filterContents(
+ ServerEntryUtils.filterContents(
schemaManager,
operationContext, prefetched );
-
+
return true;
}
if ( ( filters.size() == 1 ) && filters.get( 0 ).accept( operationContext, tempResult ) )
{
prefetched = tempResult;
- ServerEntryUtils.filterContents(
+ ServerEntryUtils.filterContents(
schemaManager,
operationContext, prefetched );
@@ -438,7 +440,7 @@ public class BaseEntryFilteringCursor ex
}
prefetched = null;
-
+
return false;
}
@@ -479,7 +481,7 @@ public class BaseEntryFilteringCursor ex
if ( filters.isEmpty() )
{
prefetched = tempResult;
- ServerEntryUtils.filterContents(
+ ServerEntryUtils.filterContents(
schemaManager,
operationContext, prefetched );
@@ -489,7 +491,7 @@ public class BaseEntryFilteringCursor ex
if ( ( filters.size() == 1 ) && filters.get( 0 ).accept( operationContext, tempResult ) )
{
prefetched = tempResult;
- ServerEntryUtils.filterContents(
+ ServerEntryUtils.filterContents(
schemaManager,
operationContext, prefetched );
@@ -511,7 +513,7 @@ public class BaseEntryFilteringCursor ex
* Here the entry has been accepted by all filters.
*/
prefetched = tempResult;
- ServerEntryUtils.filterContents(
+ ServerEntryUtils.filterContents(
schemaManager,
operationContext, prefetched );
@@ -522,15 +524,15 @@ public class BaseEntryFilteringCursor ex
return false;
}
-
-
+
+
/**
* @see Object#toString()
*/
public String toString( String tabs )
{
StringBuilder sb = new StringBuilder();
-
+
if ( wrapped != null )
{
sb.append( tabs ).append( "BaseEntryFilteringCursor, wrapped : \n" );
@@ -540,11 +542,11 @@ public class BaseEntryFilteringCursor ex
{
sb.append( tabs ).append( "BaseEntryFilteringCursor, no wrapped\n" );
}
-
+
if ( ( filters != null ) && ( filters.size() > 0 ) )
{
sb.append( tabs ).append( "Filters : \n" );
-
+
for ( EntryFilter filter : filters )
{
sb.append( filter.toString( tabs + " " ) ).append( "\n" );
@@ -554,8 +556,7 @@ public class BaseEntryFilteringCursor ex
{
sb.append( tabs ).append( "No filter\n" );
}
-
-
+
if ( prefetched != null )
{
sb.append( tabs ).append( "Prefetched : \n" );
@@ -565,11 +566,11 @@ public class BaseEntryFilteringCursor ex
{
sb.append( tabs ).append( "No prefetched" );
}
-
+
return sb.toString();
}
-
-
+
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/CursorList.java Sun Feb 17 20:26:29 2013
@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.directory.api.i18n.I18n;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.ClosureMonitor;
import org.apache.directory.api.ldap.model.cursor.Cursor;
@@ -50,7 +51,7 @@ import org.slf4j.LoggerFactory;
public class CursorList extends AbstractCursor<Entry> implements EntryFilteringCursor
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -465,7 +466,7 @@ public class CursorList extends Abstract
{
LOG_CURSOR.debug( "Closing CursorList {}", this );
}
-
+
close( null );
}
@@ -479,7 +480,7 @@ public class CursorList extends Abstract
{
LOG_CURSOR.debug( "Closing CursorList {}", this );
}
-
+
closed = true;
for ( EntryFilteringCursor cursor : list )
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTreeCursor.java Sun Feb 17 20:26:29 2013
@@ -22,6 +22,7 @@ package org.apache.directory.server.core
import java.io.IOException;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -38,7 +39,7 @@ import org.slf4j.LoggerFactory;
public class ArrayTreeCursor<E> extends AbstractCursor<E>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -63,7 +64,7 @@ public class ArrayTreeCursor<E> extends
{
LOG_CURSOR.debug( "Creating ArrayTreeCursor {}", this );
}
-
+
this.array = array;
position = Position.BEFORE_FIRST;
}
@@ -320,7 +321,7 @@ public class ArrayTreeCursor<E> extends
{
LOG_CURSOR.debug( "Closing ArrayTreeCursor {}", this );
}
-
+
super.close();
}
@@ -334,7 +335,7 @@ public class ArrayTreeCursor<E> extends
{
LOG_CURSOR.debug( "Closing ArrayTreeCursor {}", this );
}
-
+
super.close( reason );
}
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlSingletonOrOrderedSetCursor.java Sun Feb 17 20:26:29 2013
@@ -23,6 +23,7 @@ package org.apache.directory.server.core
import java.io.IOException;
import java.util.Comparator;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
public class AvlSingletonOrOrderedSetCursor<K, V> extends AbstractCursor<Tuple<K, SingletonOrOrderedSet<V>>>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -63,7 +64,7 @@ public class AvlSingletonOrOrderedSetCur
{
LOG_CURSOR.debug( "Creating AvlSingletonOrOrderedSetCursor {}", this );
}
-
+
this.tree = tree;
}
@@ -204,11 +205,11 @@ public class AvlSingletonOrOrderedSetCur
case ON_NODE:
case AFTER_NODE:
node = node.next;
-
+
if ( node == null )
{
afterLast();
-
+
return false;
}
else
@@ -341,7 +342,7 @@ public class AvlSingletonOrOrderedSetCur
{
LOG_CURSOR.debug( "Closing AvlSingletonOrOrderedSetCursor {}", this );
}
-
+
super.close();
}
@@ -355,7 +356,7 @@ public class AvlSingletonOrOrderedSetCur
{
LOG_CURSOR.debug( "Closing AvlSingletonOrOrderedSetCursor {}", this );
}
-
+
super.close( reason );
}
}
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeCursor.java Sun Feb 17 20:26:29 2013
@@ -22,6 +22,7 @@ package org.apache.directory.server.core
import java.io.IOException;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -38,7 +39,7 @@ import org.slf4j.LoggerFactory;
public class AvlTreeCursor<E> extends AbstractCursor<E>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -59,7 +60,7 @@ public class AvlTreeCursor<E> extends Ab
{
LOG_CURSOR.debug( "Creating AvlTreeCursor {}", this );
}
-
+
this.tree = tree;
}
@@ -297,7 +298,7 @@ public class AvlTreeCursor<E> extends Ab
{
LOG_CURSOR.debug( "Closing AvlTreeCursor {}", this );
}
-
+
super.close();
}
@@ -311,7 +312,7 @@ public class AvlTreeCursor<E> extends Ab
{
LOG_CURSOR.debug( "Closing AvlTreeCursor {}", this );
}
-
+
super.close( reason );
}
}
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMapNoDupsWrapperCursor.java Sun Feb 17 20:26:29 2013
@@ -22,6 +22,7 @@ package org.apache.directory.server.core
import java.io.IOException;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -41,7 +42,7 @@ import org.slf4j.LoggerFactory;
public class AvlTreeMapNoDupsWrapperCursor<K, V> extends AbstractCursor<Tuple<K, V>>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -49,13 +50,14 @@ public class AvlTreeMapNoDupsWrapperCurs
private final AvlSingletonOrOrderedSetCursor<K, V> wrapped;
private final Tuple<K, V> returnedTuple = new Tuple<K, V>();
+
public AvlTreeMapNoDupsWrapperCursor( AvlSingletonOrOrderedSetCursor<K, V> wrapped )
{
if ( IS_DEBUG )
{
LOG_CURSOR.debug( "Creating AvlTreeMapNoDupsWrapperCursor {}", this );
}
-
+
this.wrapped = wrapped;
}
@@ -193,7 +195,7 @@ public class AvlTreeMapNoDupsWrapperCurs
{
LOG_CURSOR.debug( "Closing AvlTreeMapNoDupsWrapperCursor {}", this );
}
-
+
wrapped.close();
}
@@ -204,7 +206,7 @@ public class AvlTreeMapNoDupsWrapperCurs
{
LOG_CURSOR.debug( "Closing AvlTreeMapNoDupsWrapperCursor {}", this );
}
-
+
wrapped.close( reason );
}
}
Modified: directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java (original)
+++ directory/apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java Sun Feb 17 20:26:29 2013
@@ -21,6 +21,7 @@ package org.apache.directory.server.core
import java.io.IOException;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -41,7 +42,7 @@ import org.slf4j.LoggerFactory;
public class KeyTupleAvlCursor<K, V> extends AbstractCursor<Tuple<K, V>>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -65,7 +66,7 @@ public class KeyTupleAvlCursor<K, V> ext
{
LOG_CURSOR.debug( "Creating KeyTupleAvlCursor {}", this );
}
-
+
this.key = key;
this.wrapped = new AvlTreeCursor<V>( avlTree );
}
@@ -218,7 +219,7 @@ public class KeyTupleAvlCursor<K, V> ext
public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
-
+
if ( wrapped.next() )
{
returnedTuple.setKey( key );
@@ -257,7 +258,7 @@ public class KeyTupleAvlCursor<K, V> ext
{
LOG_CURSOR.debug( "Closing KeyTupleAvlCursor {}", this );
}
-
+
super.close();
if ( wrapped != null )
@@ -276,7 +277,7 @@ public class KeyTupleAvlCursor<K, V> ext
{
LOG_CURSOR.debug( "Closing KeyTupleAvlCursor {}", this );
}
-
+
super.close( cause );
if ( wrapped != null )
Modified: directory/apacheds/trunk/core-integ/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/resources/log4j.properties?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/core-integ/src/test/resources/log4j.properties Sun Feb 17 20:26:29 2013
@@ -21,19 +21,14 @@ log4j.appender.stdout.layout=org.apache.
log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
#log4j.logger.org=FATAL
-log4j.logger.ATTRIBUTE_TYPE=FATAL
-log4j.logger.SYNTAX_CHECKER=FATAL
-log4j.logger.MATCHING_RULE=FATAL
-log4j.logger.LDAP_SYNTAX=FATAL
log4j.logger.org.apache.directory.api.ldap.model.schema=FATAL
log4j.logger.org.apache.directory.server.core.partition.impl.btree.JdbmTable=FATAL
log4j.logger.org.apache.directory.server.core.partition.impl.btree.JdbmIndex=FATAL
log4j.logger.jdbm.recman.BaseRecordManager=FATAL
-log4j.logger.LOG_CHANGES=FATAL
-log4j.logger.net=FATAL
-log4j.logger.aci-logger=FATAL
+log4j.logger.org.apache.directory.LOG_CHANGES=FATAL
+log4j.logger.org.apache.directory.ACI_LOG=FATAL
log4j.logger.org.apache.directory.server.core.partition.impl.btree.jdbm.DupsCursor=FATAL
-log4j.logger.PROVIDER_LOG=FATAL
-log4j.logger.CONSUMER_LOG=FATAL
-log4j.logger.CURSOR=FATAL
+log4j.logger.org.apache.directory.PROVIDER_LOG=FATAL
+log4j.logger.org.apache.directory.CONSUMER_LOG=FATAL
+log4j.logger.org.apache.directory.CURSOR=FATAL
log4j.logger.org.apache.directory.api.asn1=FATAL
Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java Sun Feb 17 20:26:29 2013
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import org.apache.directory.api.asn1.EncoderException;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.Attribute;
import org.apache.directory.api.ldap.model.entry.BinaryValue;
@@ -70,7 +71,7 @@ public class KeyDerivationInterceptor ex
{
/** The log for this class. */
private static final Logger LOG = LoggerFactory.getLogger( KeyDerivationInterceptor.class );
- private static final Logger LOG_KRB = LoggerFactory.getLogger( "KERBEROS" );
+ private static final Logger LOG_KRB = LoggerFactory.getLogger( Loggers.KERBEROS_LOG.getName() );
/** The service name. */
private static final String NAME = "keyDerivationService";
Modified: directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java Sun Feb 17 20:26:29 2013
@@ -23,6 +23,7 @@ package org.apache.directory.server.core
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.entry.Entry;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.server.core.api.DirectoryService;
@@ -60,10 +61,10 @@ import org.slf4j.LoggerFactory;
public class TimerInterceptor extends BaseInterceptor
{
/** A aggregating logger */
- private static final Logger OPERATION_STATS = LoggerFactory.getLogger( "OPERATION_STATS" );
+ private static final Logger OPERATION_STATS = LoggerFactory.getLogger( Loggers.OPERATION_STAT.getName() );
/** An operation logger */
- private static final Logger OPERATION_TIME = LoggerFactory.getLogger( "OPERATION_TIME" );
+ private static final Logger OPERATION_TIME = LoggerFactory.getLogger( Loggers.OPERATION_TIME.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG_STATS = OPERATION_STATS.isDebugEnabled();
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java Sun Feb 17 20:26:29 2013
@@ -25,6 +25,7 @@ import java.io.IOException;
import jdbm.btree.BTree;
import jdbm.helper.TupleBrowser;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -46,7 +47,7 @@ import org.slf4j.LoggerFactory;
public class DupsContainerCursor<K, V> extends AbstractCursor<Tuple<K, DupsContainer<V>>>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursor.java Sun Feb 17 20:26:29 2013
@@ -24,6 +24,7 @@ import java.io.IOException;
import jdbm.btree.BTree;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.Cursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
@@ -46,7 +47,7 @@ class DupsCursor<K, V> extends AbstractC
private static final Logger LOG = LoggerFactory.getLogger( DupsCursor.class );
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java Sun Feb 17 20:26:29 2013
@@ -26,6 +26,7 @@ import jdbm.btree.BTree;
import jdbm.helper.Tuple;
import jdbm.helper.TupleBrowser;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
public class KeyBTreeCursor<E> extends AbstractCursor<E>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java Sun Feb 17 20:26:29 2013
@@ -25,6 +25,7 @@ import java.util.Comparator;
import jdbm.btree.BTree;
import jdbm.helper.TupleBrowser;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
public class KeyTupleBTreeCursor<K, V> extends AbstractCursor<Tuple<K, V>>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursor.java Sun Feb 17 20:26:29 2013
@@ -23,6 +23,7 @@ import java.io.IOException;
import jdbm.helper.TupleBrowser;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.cursor.AbstractCursor;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -44,7 +45,7 @@ import org.slf4j.LoggerFactory;
class NoDupsCursor<K, V> extends AbstractCursor<Tuple<K, V>>
{
/** A dedicated log for cursors */
- private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+ private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName() );
/** Speedup for logs */
private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
Modified: directory/apacheds/trunk/kerberos-client/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-client/src/test/resources/log4j.properties?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-client/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/kerberos-client/src/test/resources/log4j.properties Sun Feb 17 20:26:29 2013
@@ -29,21 +29,17 @@ log4j.logger.org.apache.directory.api.ut
log4j.logger.org.apache.directory.server.core.partition.impl.btree.JdbmTable=WARN
log4j.logger.org.apache.directory.server.core.partition.impl.btree.JdbmIndex=WARN
log4j.logger.org.apache.directory.server.core=WARN
-log4j.logger.aci-logger=WARN
+log4j.logger.org.apache.directory.ACI_LOG=WARN
log4j.logger.org.apache.directory.server.xdbm=WARN
log4j.logger.org.apache.directory.kerberos.client=WARN
log4j.logger.org.apache.directory.kerberos.codec=WARN
log4j.logger.org.apache.directory.shared.kerberos.components=WARN
-log4j.logger.ATTRIBUTE_TYPE=FATAL
-log4j.logger.SYNTAX_CHECKER=FATAL
-log4j.logger.MATCHING_RULE=FATAL
-log4j.logger.LDAP_SYNTAX=FATAL
+
log4j.logger.jdbm.recman.BaseRecordManager=FATAL
-log4j.logger.LOG_CHANGES=FATAL
-log4j.logger.net=FATAL
+log4j.logger.org.apache.directory.LOG_CHANGES=FATAL
log4j.logger.org.apache.directory.server.core.partition.impl.btree.jdbm.DupsCursor=FATAL
-log4j.logger.PROVIDER_LOG=FATAL
-log4j.logger.CONSUMER_LOG=FATAL
-log4j.logger.CURSOR=FATAL
-log4j.logger.KERBEROS=DEBUG
+log4j.logger.org.apache.directory.PROVIDER_LOG=FATAL
+log4j.logger.org.apache.directory.CONSUMER_LOG=FATAL
+log4j.logger.org.apache.directory.CURSOR_LOG=FATAL
+log4j.logger.org.apache.directory.KERBEROS_LOG=DEBUG
Modified: directory/apacheds/trunk/kerberos-test/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/resources/log4j.properties?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/kerberos-test/src/test/resources/log4j.properties Sun Feb 17 20:26:29 2013
@@ -22,3 +22,4 @@ log4j.appender.stdout.layout.ConversionP
#log4j.logger.org.apache.directory.server.kerberos=DEBUG
#log4j.logger.org.apache.directory.shared.kerberos=DEBUG
+log4j.logger.org.apache.directory.KERBEROS_LOG=DEBUG
\ No newline at end of file
Modified: directory/apacheds/trunk/ldap-client-test/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/resources/log4j.properties?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/resources/log4j.properties Sun Feb 17 20:26:29 2013
@@ -21,18 +21,13 @@ log4j.appender.stdout.layout=org.apache.
log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
#log4j.logger.org=FATAL
-log4j.logger.ATTRIBUTE_TYPE=FATAL
-log4j.logger.SYNTAX_CHECKER=FATAL
-log4j.logger.MATCHING_RULE=FATAL
-log4j.logger.LDAP_SYNTAX=FATAL
log4j.logger.org.apache.directory.api.ldap.model.schema=FATAL
log4j.logger.logger.org.apache.directory.server.core.partition.impl.btree.JdbmTable=FATAL
log4j.logger.logger.org.apache.directory.server.core.partition.impl.btree.JdbmIndex=FATAL
log4j.logger.jdbm.recman.BaseRecordManager=FATAL
-log4j.logger.LOG_CHANGES=FATAL
-log4j.logger.net=FATAL
-log4j.logger.aci-logger=FATAL
+log4j.logger.org.apache.directory.LOG_CHANGES=FATAL
+log4j.logger.org.apache.directory.ACI_LOG=FATAL
log4j.logger.logger.org.apache.directory.server.core.partition.impl.btree.jdbm.DupsCursor=FATAL
-log4j.logger.PROVIDER_LOG=FATAL
-log4j.logger.CONSUMER_LOG=FATAL
-log4j.logger.CURSOR=FATAL
+log4j.logger.org.apache.directory.PROVIDER_LOG=FATAL
+log4j.logger.org.apache.directory.CONSUMER_LOG=FATAL
+log4j.logger.org.apache.directory.CURSOR_LOG=FATAL
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?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- 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 Sun Feb 17 20:26:29 2013
@@ -46,7 +46,7 @@ public class DnsServer extends Directory
private static final long serialVersionUID = 6943138644427163149L;
/** logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( DnsServer.class.getName() );
+ private static final Logger LOG = LoggerFactory.getLogger( DnsServer.class );
/** The default IP port. */
private static final int DEFAULT_IP_PORT = 53;
@@ -82,7 +82,7 @@ public class DnsServer extends Directory
UdpTransport transport = new UdpTransport( DEFAULT_IP_PORT );
setTransports( transport );
- DatagramAcceptor acceptor = ( DatagramAcceptor ) transport.getAcceptor();
+ DatagramAcceptor acceptor = transport.getAcceptor();
// Set the handler
acceptor.setHandler( new DnsProtocolHandler( this, store ) );
Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/ChangePasswordServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/ChangePasswordServer.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/ChangePasswordServer.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/ChangePasswordServer.java Sun Feb 17 20:26:29 2013
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
public class ChangePasswordServer extends DirectoryBackedService
{
/** logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( ChangePasswordServer.class.getName() );
+ private static final Logger LOG = LoggerFactory.getLogger( ChangePasswordServer.class );
/** The default change password port. */
private static final int DEFAULT_IP_PORT = 464;
@@ -70,6 +70,7 @@ public class ChangePasswordServer extend
/** the cache used for storing change password requests */
private ReplayCache replayCache;
+
/**
* Creates a new instance of ChangePasswordConfiguration.
*/
@@ -78,53 +79,53 @@ public class ChangePasswordServer extend
this( new ChangePasswordConfig() );
}
-
+
public ChangePasswordServer( ChangePasswordConfig config )
{
this.config = config;
}
-
+
/**
* @throws IOException if we cannot bind to the specified ports
*/
public void start() throws IOException, LdapInvalidDnException
{
- PrincipalStore store = new DirectoryPrincipalStore( getDirectoryService(), new Dn(this.getSearchBaseDn()) );
-
+ PrincipalStore store = new DirectoryPrincipalStore( getDirectoryService(), new Dn( this.getSearchBaseDn() ) );
+
LOG.debug( "initializing the changepassword replay cache" );
Cache cache = getDirectoryService().getCacheService().getCache( "changePwdReplayCache" );
replayCache = new ReplayCacheImpl( cache );
- for ( Transport transport:transports )
+ for ( Transport transport : transports )
{
IoAcceptor acceptor = transport.getAcceptor();
-
+
// Disable the disconnection of the clients on unbind
acceptor.setCloseOnDeactivation( false );
-
+
if ( transport instanceof UdpTransport )
{
// Allow the port to be reused even if the socket is in TIME_WAIT state
- ((DatagramSessionConfig)acceptor.getSessionConfig()).setReuseAddress( true );
+ ( ( DatagramSessionConfig ) acceptor.getSessionConfig() ).setReuseAddress( true );
}
else
{
// Allow the port to be reused even if the socket is in TIME_WAIT state
- ((SocketAcceptor)acceptor).setReuseAddress( true );
-
+ ( ( SocketAcceptor ) acceptor ).setReuseAddress( true );
+
// No Nagle's algorithm
- ((SocketAcceptor)acceptor).getSessionConfig().setTcpNoDelay( true );
+ ( ( SocketAcceptor ) acceptor ).getSessionConfig().setTcpNoDelay( true );
}
-
+
// Set the handler
acceptor.setHandler( new ChangePasswordProtocolHandler( this, store ) );
-
+
// Bind
acceptor.bind();
}
-
+
LOG.info( "ChangePassword service started." );
//System.out.println( "ChangePassword service started." );
}
@@ -132,10 +133,10 @@ public class ChangePasswordServer extend
public void stop()
{
- for ( Transport transport :getTransports() )
+ for ( Transport transport : getTransports() )
{
IoAcceptor acceptor = transport.getAcceptor();
-
+
if ( acceptor != null )
{
acceptor.dispose();
@@ -143,7 +144,7 @@ public class ChangePasswordServer extend
}
replayCache.clear();
-
+
LOG.info( "ChangePassword service stopped." );
//System.out.println( "ChangePassword service stopped." );
}
@@ -163,38 +164,38 @@ public class ChangePasswordServer extend
return config;
}
-
+
public int getTcpPort()
{
- for( Transport t : getTransports() )
+ for ( Transport t : getTransports() )
{
if ( t instanceof TcpTransport )
{
return t.getPort();
}
}
-
+
throw new IllegalStateException( "TCP transport is not enabled" );
}
-
+
/**
* @see Object#toString()
*/
public String toString()
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( "ChangePasswordServer[" ).append( getServiceName() ).append( "], listening on :" ).append( '\n' );
-
+
if ( getTransports() != null )
{
- for ( Transport transport:getTransports() )
+ for ( Transport transport : getTransports() )
{
sb.append( " " ).append( transport ).append( '\n' );
}
}
-
+
return sb.toString();
}
}
Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java Sun Feb 17 20:26:29 2013
@@ -55,8 +55,8 @@ public class KdcServer extends Directory
private static final long serialVersionUID = 522567370475574165L;
/** logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( KdcServer.class.getName() );
-
+ private static final Logger LOG = LoggerFactory.getLogger( KdcServer.class );
+
/** The default kdc service name */
private static final String SERVICE_NAME = "Keydap Kerberos Service";
@@ -64,9 +64,10 @@ public class KdcServer extends Directory
private ReplayCache replayCache;
private KerberosConfig config;
-
+
private ChangePasswordServer changePwdServer;
-
+
+
/**
* Creates a new instance of KdcServer with the default configuration.
*/
@@ -74,8 +75,8 @@ public class KdcServer extends Directory
{
this( new KerberosConfig() );
}
-
-
+
+
/**
*
* Creates a new instance of KdcServer with the given config.
@@ -106,52 +107,52 @@ public class KdcServer extends Directory
{
PrincipalStore store;
- store = new DirectoryPrincipalStore( getDirectoryService(), new Dn(this.getSearchBaseDn()) );
-
+ store = new DirectoryPrincipalStore( getDirectoryService(), new Dn( this.getSearchBaseDn() ) );
+
LOG.debug( "initializing the kerberos replay cache" );
Cache cache = getDirectoryService().getCacheService().getCache( "kdcReplayCache" );
replayCache = new ReplayCacheImpl( cache, config.getAllowableClockSkew() );
-
+
// Kerberos can use UDP or TCP
- for ( Transport transport:transports )
+ for ( Transport transport : transports )
{
IoAcceptor acceptor = transport.getAcceptor();
-
+
// Now, configure the acceptor
// Inject the chain
IoFilterChainBuilder chainBuilder = new DefaultIoFilterChainBuilder();
-
+
if ( transport instanceof TcpTransport )
{
// Now, configure the acceptor
// Disable the disconnection of the clients on unbind
acceptor.setCloseOnDeactivation( false );
-
+
// No Nagle's algorithm
- ((NioSocketAcceptor)acceptor).getSessionConfig().setTcpNoDelay( true );
-
+ ( ( NioSocketAcceptor ) acceptor ).getSessionConfig().setTcpNoDelay( true );
+
// Allow the port to be reused even if the socket is in TIME_WAIT state
- ((NioSocketAcceptor)acceptor).setReuseAddress( true );
+ ( ( NioSocketAcceptor ) acceptor ).setReuseAddress( true );
}
-
+
// Inject the codec
- ((DefaultIoFilterChainBuilder)chainBuilder).addFirst( "codec",
- new ProtocolCodecFilter(
+ ( ( DefaultIoFilterChainBuilder ) chainBuilder ).addFirst( "codec",
+ new ProtocolCodecFilter(
KerberosProtocolCodecFactory.getInstance() ) );
-
+
acceptor.setFilterChainBuilder( chainBuilder );
-
+
// Inject the protocol handler
acceptor.setHandler( new KerberosProtocolHandler( this, store ) );
-
+
// Bind to the configured address
acceptor.bind();
}
-
+
LOG.info( "Kerberos service started." );
-
- if( changePwdServer != null )
+
+ if ( changePwdServer != null )
{
changePwdServer.start();
}
@@ -176,8 +177,8 @@ public class KdcServer extends Directory
}
LOG.info( "Kerberos service stopped." );
-
- if( changePwdServer != null )
+
+ if ( changePwdServer != null )
{
changePwdServer.stop();
}
@@ -190,17 +191,18 @@ public class KdcServer extends Directory
*/
public int getTcpPort()
{
- for( Transport t : transports )
+ for ( Transport t : transports )
{
if ( t instanceof TcpTransport )
{
return t.getPort();
}
}
-
+
return -1;
}
-
+
+
/**
* @return the KDC server configuration
*/
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?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- 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 Sun Feb 17 20:26:29 2013
@@ -25,8 +25,8 @@ import java.net.InetSocketAddress;
import javax.security.auth.kerberos.KerberosPrincipal;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.kerberos.KerberosConfig;
import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationContext;
import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationService;
@@ -57,7 +57,7 @@ public class KerberosProtocolHandler imp
{
/** The loggers for this class */
private static final Logger LOG = LoggerFactory.getLogger( KerberosProtocolHandler.class );
- private static final Logger LOG_KRB = LoggerFactory.getLogger( "KERBEROS" );
+ private static final Logger LOG_KRB = LoggerFactory.getLogger( Loggers.KERBEROS_LOG.getName() );
/** The KDC server */
private KdcServer kdcServer;
Modified: directory/apacheds/trunk/protocol-kerberos/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/test/resources/log4j.properties?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/test/resources/log4j.properties Sun Feb 17 20:26:29 2013
@@ -20,19 +20,14 @@ log4j.appender.stdout=org.apache.log4j.C
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
-log4j.logger.ATTRIBUTE_TYPE=FATAL
-log4j.logger.SYNTAX_CHECKER=FATAL
-log4j.logger.MATCHING_RULE=FATAL
-log4j.logger.LDAP_SYNTAX=FATAL
log4j.logger.org.apache.directory.api.ldap.model.schema=FATAL
log4j.logger.org.apache.directory.server.core.partition.impl.btree.JdbmTable=FATAL
log4j.logger.org.apache.directory.server.core.partition.impl.btree.JdbmIndex=FATAL
log4j.logger.jdbm.recman.BaseRecordManager=FATAL
-log4j.logger.LOG_CHANGES=FATAL
-log4j.logger.net=FATAL
-log4j.logger.aci-logger=FATAL
+log4j.logger.org.apache.directory.LOG_CHANGES=FATAL
+log4j.logger.org.apache.directory.ACI_LOG=FATAL
log4j.logger.org.apache.directory.server.core.partition.impl.btree.jdbm.DupsCursor=FATAL
-log4j.logger.PROVIDER_LOG=FATAL
-log4j.logger.CONSUMER_LOG=FATAL
-log4j.logger.CURSOR=FATAL
+log4j.logger.org.apache.directory.PROVIDER_LOG=FATAL
+log4j.logger.org.apache.directory.CONSUMER_LOG=FATAL
+log4j.logger.org.apache.directory.CURSOR_LOG=FATAL
log4j.logger.org.apache.directory.api.asn1=FATAL
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Sun Feb 17 20:26:29 2013
@@ -37,6 +37,7 @@ import java.util.Set;
import javax.net.ssl.KeyManagerFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.api.ldap.model.constants.SaslQoP;
import org.apache.directory.api.ldap.model.exception.LdapConfigurationException;
import org.apache.directory.api.ldap.model.message.AbandonRequest;
@@ -129,10 +130,10 @@ public class LdapServer extends Director
private static final long serialVersionUID = 3757127143811666817L;
/** logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( LdapServer.class.getName() );
+ private static final Logger LOG = LoggerFactory.getLogger( LdapServer.class );
/** Logger for the replication consumer */
- private static final Logger CONSUMER_LOG = LoggerFactory.getLogger( "CONSUMER_LOG" );
+ private static final Logger CONSUMER_LOG = LoggerFactory.getLogger( Loggers.CONSUMER_LOG.getName() );
/** Value (0) for configuration where size limit is unlimited. */
public static final long NO_SIZE_LIMIT = 0;
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/PingerThread.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/PingerThread.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/PingerThread.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/PingerThread.java Sun Feb 17 20:26:29 2013
@@ -19,12 +19,15 @@
*/
package org.apache.directory.server.ldap.replication.consumer;
+
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.slf4j.Logger;
-import org.slf4j.MDC;
import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+
/**
* A thread used to ping the provider o check if they are alive or not.
@@ -34,14 +37,15 @@ import org.slf4j.LoggerFactory;
public class PingerThread extends Thread
{
/** Logger for the replication consumer */
- private static final Logger CONSUMER_LOG = LoggerFactory.getLogger( "CONSUMER_LOG" );
+ private static final Logger CONSUMER_LOG = LoggerFactory.getLogger( Loggers.CONSUMER_LOG.getName() );
/** The list of consumers we want to check */
private Queue<ReplicationConsumer> consumers = new ConcurrentLinkedQueue<ReplicationConsumer>();
-
+
/** A flag to stop the pinger */
private boolean stop = false;
+
/**
* Create a new instance of this thread.
*/
@@ -49,8 +53,8 @@ public class PingerThread extends Thread
{
setDaemon( true );
}
-
-
+
+
/**
* Starts the thread
*/
@@ -61,7 +65,7 @@ public class PingerThread extends Thread
if ( CONSUMER_LOG.isDebugEnabled() )
{
MDC.put( "Replica", "Pinger" );
-
+
CONSUMER_LOG.debug( "Starting the provider's pinger" );
}
@@ -80,8 +84,8 @@ public class PingerThread extends Thread
CONSUMER_LOG.debug( "The pinger has been interrupted" );
}
}
-
-
+
+
/**
* Add a new consumer to ping
*
@@ -94,8 +98,8 @@ public class PingerThread extends Thread
consumers.add( consumer );
}
}
-
-
+
+
/**
* Remove a consumer to ping
* @param consumer The consumer we want to remove
@@ -104,8 +108,8 @@ public class PingerThread extends Thread
{
consumers.remove( consumer );
}
-
-
+
+
/**
* Stops the ping for all the consumers
*/