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/15 13:03:33 UTC
svn commit: r1446546 - in /directory/apacheds/trunk:
core-avl/src/test/java/org/apache/directory/server/core/avltree/
core-integ/src/test/resources/
jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
jdbm-partition...
Author: elecharny
Date: Fri Feb 15 12:03:31 2013
New Revision: 1446546
URL: http://svn.apache.org/r1446546
Log:
o Fixed the Logger problem (removed the XXX.class.getSimpleName()) (See DIRSERVER-1804)
Modified:
directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
directory/apacheds/trunk/core-integ/src/test/resources/log4j.properties
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/JdbmTable.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
directory/apacheds/trunk/kerberos-client/src/test/resources/log4j.properties
directory/apacheds/trunk/ldap-client-test/src/test/resources/log4j.properties
directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java
directory/apacheds/trunk/protocol-kerberos/src/test/resources/log4j.properties
directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
directory/apacheds/trunk/server-integ/src/test/resources/log4j.properties
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
Modified: directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java (original)
+++ directory/apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java Fri Feb 15 12:03:31 2013
@@ -33,8 +33,6 @@ import java.io.IOException;
import java.io.Serializable;
import java.util.Comparator;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -42,6 +40,9 @@ import org.junit.runner.RunWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
/**
* TestCase for AvlTreeMarshaller.
@@ -97,7 +98,7 @@ public class AvlTreeMarshallerTest
private static Comparator<Integer> comparator;
- private static final Logger LOG = LoggerFactory.getLogger( AvlTreeMarshallerTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( AvlTreeMarshallerTest.class );
@BeforeClass
@@ -299,7 +300,7 @@ public class AvlTreeMarshallerTest
assertEquals( ii, ( int ) cursor.get() );
cursor.next();
}
-
+
cursor.close();
}
@@ -338,7 +339,7 @@ public class AvlTreeMarshallerTest
// this marshaller fails to preserve last node reference
assertNotNull( deserialized.getLast() );
assertEquals( 99, ( int ) deserialized.getLast().getKey() );
-
+
cursor.close();
}
@@ -374,7 +375,7 @@ public class AvlTreeMarshallerTest
assertEquals( ii, ( int ) cursor.get().intValue );
cursor.next();
}
-
+
cursor.close();
}
@@ -437,7 +438,7 @@ public class AvlTreeMarshallerTest
byte[] data = new byte[( int ) treeFile.length()];
fin.read( data );
-
+
fin.close();
AvlTree<Integer> unmarshalledTree = treeMarshaller.deserialize( data );
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=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/core-integ/src/test/resources/log4j.properties Fri Feb 15 12:03:31 2013
@@ -26,13 +26,13 @@ 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.JdbmTable=FATAL
-log4j.logger.JdbmIndex=FATAL
-log4j.logger.BaseRecordManager=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.DupsCursor=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
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=1446546&r1=1446545&r2=1446546&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 Fri Feb 15 12:03:31 2013
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
*/
class DupsCursor<K, V> extends AbstractCursor<Tuple<K, V>>
{
- private static final Logger LOG = LoggerFactory.getLogger( DupsCursor.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( DupsCursor.class );
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -97,7 +97,7 @@ class DupsCursor<K, V> extends AbstractC
{
LOG_CURSOR.debug( "Creating DupsCursor {}", this );
}
-
+
this.table = table;
this.containerCursor = new DupsContainerCursor<K, V>( table );
LOG.debug( "Created on table {}", table );
@@ -311,7 +311,7 @@ class DupsCursor<K, V> extends AbstractC
valueAvailable = true;
returnedTuple.setKey( containerTuple.getKey() );
returnedTuple.setValue( dupsCursor.get() );
-
+
return true;
}
@@ -353,7 +353,7 @@ class DupsCursor<K, V> extends AbstractC
valueAvailable = true;
returnedTuple.setKey( containerTuple.getKey() );
returnedTuple.setValue( dupsCursor.get() );
-
+
return true;
}
@@ -425,7 +425,7 @@ class DupsCursor<K, V> extends AbstractC
returnedTuple.setKey( containerTuple.getKey() );
returnedTuple.setValue( dupsCursor.get() );
-
+
return valueAvailable = true;
}
@@ -446,7 +446,7 @@ class DupsCursor<K, V> extends AbstractC
{
dupsCursor.close();
}
-
+
/*
* If the wrappedCursor cursor has more elements we get the next
* key/AvlTree Tuple to work with and get a cursor over it.
@@ -492,7 +492,7 @@ class DupsCursor<K, V> extends AbstractC
*/
returnedTuple.setKey( containerTuple.getKey() );
returnedTuple.setValue( dupsCursor.get() );
-
+
return valueAvailable = true;
}
@@ -523,10 +523,10 @@ class DupsCursor<K, V> extends AbstractC
{
LOG_CURSOR.debug( "Closing DupsCursor {}", this );
}
-
+
super.close();
containerCursor.close();
-
+
if ( dupsCursor != null )
{
dupsCursor.close();
@@ -544,10 +544,10 @@ class DupsCursor<K, V> extends AbstractC
{
LOG_CURSOR.debug( "Closing DupsCursor {}", this );
}
-
+
super.close( cause );
containerCursor.close( cause );
-
+
if ( dupsCursor != null )
{
dupsCursor.close( cause );
Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Fri Feb 15 12:03:31 2013
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
public class JdbmTable<K, V> extends AbstractTable<K, V>
{
/** A logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( JdbmTable.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( JdbmTable.class );
/** the key to store and retreive the count information */
private static final String SZSUFFIX = "_btree_sz";
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Fri Feb 15 12:03:31 2013
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*/
public class DupsContainerCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( NoDupsCursorTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( NoDupsCursorTest.class );
private static final String TEST_OUTPUT_PATH = "test.output.path";
JdbmTable<String, String> table;
@@ -170,7 +170,7 @@ public class DupsContainerCursorTest
assertFalse( cursor.next() );
cursor.after( new Tuple<String, DupsContainer<String>>( "7", null ) );
-
+
try
{
cursor.get();
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Fri Feb 15 12:03:31 2013
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*/
public class DupsCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( DupsCursorTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( DupsCursorTest.class );
private static final String TEST_OUTPUT_PATH = "test.output.path";
private static final int SIZE = 15;
@@ -150,7 +150,7 @@ public class DupsCursorTest
assertFalse( cursor.first() );
assertFalse( cursor.last() );
-
+
cursor.close();
}
@@ -176,7 +176,7 @@ public class DupsCursorTest
assertEquals( i, Integer.parseInt( tuple.getValue() ) );
i++;
}
-
+
cursor.close();
}
@@ -201,7 +201,7 @@ public class DupsCursorTest
assertEquals( i, Integer.parseInt( tuple.getValue() ) );
i--;
}
-
+
cursor.close();
}
@@ -244,7 +244,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
}
@@ -289,7 +289,7 @@ public class DupsCursorTest
i--;
}
-
+
cursor.close();
}
@@ -421,7 +421,7 @@ public class DupsCursorTest
i--;
}
-
+
cursor.close();
}
@@ -556,7 +556,7 @@ public class DupsCursorTest
i--;
}
-
+
cursor.close();
}
@@ -688,7 +688,7 @@ public class DupsCursorTest
i--;
}
-
+
cursor.close();
}
@@ -823,7 +823,7 @@ public class DupsCursorTest
i--;
}
-
+
cursor.close();
}
@@ -837,7 +837,7 @@ public class DupsCursorTest
cursor.before( new Tuple<String, String>( "1", "2" ) );
assertFalse( cursor.available() );
-
+
cursor.close();
}
@@ -862,7 +862,7 @@ public class DupsCursorTest
cursor.before( new Tuple<String, String>( "7", "2" ) );
assertFalse( cursor.available() );
-
+
cursor.close();
}
@@ -887,7 +887,7 @@ public class DupsCursorTest
cursor.before( new Tuple<String, String>( "7", "2" ) );
assertFalse( cursor.available() );
-
+
cursor.close();
}
@@ -941,7 +941,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test before to advance just before a key with a single value but
@@ -959,7 +959,7 @@ public class DupsCursorTest
}
Tuple<String, String> tuple = cursor.get();
-
+
if ( i > 12 && i < 17 )
{
assertEquals( 13, Integer.parseInt( tuple.getKey() ) );
@@ -972,7 +972,7 @@ public class DupsCursorTest
}
i++;
}
-
+
cursor.close();
// test before to advance just before a key value pair where the key
@@ -1004,14 +1004,14 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test after to advance just after the end
cursor = table.cursor();
cursor.after( new Tuple<String, String>( "111", null ) );
assertFalse( cursor.next() );
-
+
cursor.close();
// test after to advance just before a key with a single value
@@ -1042,7 +1042,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test before to advance just before a key & value with multiple
@@ -1077,7 +1077,7 @@ public class DupsCursorTest
}
i++;
}
-
+
cursor.close();
// test after to advance just before a key & value with multiple
@@ -1114,7 +1114,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test after to advance just before a key that does not exist
@@ -1150,7 +1150,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test after to advance just before a key and value where the key
@@ -1187,7 +1187,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
}
@@ -1241,7 +1241,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test before to advance just before a key with a single value but
@@ -1272,7 +1272,7 @@ public class DupsCursorTest
}
i++;
}
-
+
cursor.close();
// test before to advance just before a key value pair where the key
@@ -1306,14 +1306,14 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test after to advance just after the end
cursor = table.cursor();
cursor.after( new Tuple<String, String>( "111", null ) );
assertFalse( cursor.next() );
-
+
cursor.close();
// test after to advance just before a key with a single value
@@ -1344,7 +1344,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test before to advance just before a key & value with multiple
@@ -1381,7 +1381,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test after to advance just before a key & value with multiple
@@ -1418,7 +1418,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
// test after to advance just before a key that does not exist
@@ -1452,7 +1452,7 @@ public class DupsCursorTest
}
i++;
}
-
+
cursor.close();
// test after to advance just before a key and value where the key
@@ -1489,7 +1489,7 @@ public class DupsCursorTest
i++;
}
-
+
cursor.close();
}
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmBrowserBugTest.java Fri Feb 15 12:03:31 2013
@@ -20,25 +20,26 @@
package org.apache.directory.server.core.partition.impl.btree.jdbm;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.After;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
-import java.util.Comparator;
import java.io.File;
import java.io.IOException;
+import java.util.Comparator;
import jdbm.RecordManager;
import jdbm.btree.BTree;
-import jdbm.helper.IntegerSerializer;
import jdbm.helper.IntegerComparator;
-import jdbm.helper.TupleBrowser;
+import jdbm.helper.IntegerSerializer;
import jdbm.helper.Tuple;
+import jdbm.helper.TupleBrowser;
import jdbm.recman.BaseRecordManager;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.assertEquals;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -51,7 +52,7 @@ public class JdbmBrowserBugTest
Comparator<Integer> comparator;
BTree<Integer, Integer> bt;
private static final String TEST_OUTPUT_PATH = "test.output.path";
- private static final Logger LOG = LoggerFactory.getLogger( JdbmBrowserBugTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( JdbmBrowserBugTest.class );
private File dbFile = null;
private RecordManager recman = null;
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java Fri Feb 15 12:03:31 2013
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
*/
public class JdbmMasterTableTest
{
- private static final Logger LOG = LoggerFactory.getLogger( JdbmMasterTableTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( JdbmMasterTableTest.class );
private static final String TEST_OUTPUT_PATH = "test.output.path";
JdbmMasterTable table;
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Fri Feb 15 12:03:31 2013
@@ -81,7 +81,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("unchecked")
public class JdbmStoreTest
{
- private static final Logger LOG = LoggerFactory.getLogger( JdbmStoreTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( JdbmStoreTest.class );
File wkdir;
JdbmPartition store;
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java Fri Feb 15 12:03:31 2013
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
*/
public class JdbmTableNoDuplicatesTest
{
- private static final Logger LOG = LoggerFactory.getLogger( JdbmTableNoDuplicatesTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( JdbmTableNoDuplicatesTest.class );
private static final String TEST_OUTPUT_PATH = "test.output.path";
Table<String, String> table;
@@ -319,7 +319,7 @@ public class JdbmTableNoDuplicatesTest
String istr = Integer.toString( i );
table.put( istr, istr );
}
-
+
assertEquals( SIZE, table.count() );
assertFalse( table.has( "-1" ) );
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Fri Feb 15 12:03:31 2013
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*/
public class JdbmTableWithDuplicatesTest
{
- private static final Logger LOG = LoggerFactory.getLogger( JdbmTableWithDuplicatesTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( JdbmTableWithDuplicatesTest.class );
private static final String TEST_OUTPUT_PATH = "test.output.path";
private static final int SIZE = 15;
private static final int SIZE2 = 30;
@@ -383,7 +383,7 @@ public class JdbmTableWithDuplicatesTest
{
//System.out.println( cursor.get() );
}
-
+
cursor.close();
assertFalse( table.hasLessOrEqual( "1" ) );
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursorTest.java Fri Feb 15 12:03:31 2013
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
*/
public class KeyBTreeCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( KeyBTreeCursorTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( KeyBTreeCursorTest.class );
private static final String TEST_OUTPUT_PATH = "test.output.path";
File dbFile;
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyCursorTest.java Fri Feb 15 12:03:31 2013
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
*/
public class KeyCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( KeyCursorTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( KeyCursorTest.class );
private static final String TEST_OUTPUT_PATH = "test.output.path";
File dbFile;
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Fri Feb 15 12:03:31 2013
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*/
public class NoDupsCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( NoDupsCursorTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( NoDupsCursorTest.class );
private static final String TEST_OUTPUT_PATH = "test.output.path";
Table<String, String> table;
@@ -140,19 +140,19 @@ public class NoDupsCursorTest
assertFalse( cursor.available() );
assertFalse( cursor.isClosed() );
-
+
cursor.close();
cursor = table.cursor();
assertFalse( cursor.previous() );
-
+
cursor.close();
cursor = table.cursor();
assertFalse( cursor.next() );
cursor.after( new Tuple<String, String>( "7", "7" ) );
-
+
try
{
cursor.get();
@@ -179,7 +179,7 @@ public class NoDupsCursorTest
cursor.beforeFirst();
assertFalse( cursor.previous() );
assertTrue( cursor.next() );
-
+
cursor.close();
}
@@ -197,7 +197,7 @@ public class NoDupsCursorTest
cursor.after( new Tuple<String, String>( "2", "2" ) );
assertTrue( cursor.next() );
-
+
Tuple<String, String> tuple = cursor.get();
assertEquals( "3", tuple.getKey() );
assertEquals( "3", tuple.getValue() );
@@ -235,7 +235,7 @@ public class NoDupsCursorTest
tuple = cursor.get();
assertEquals( "1", tuple.getKey() );
assertEquals( "1", tuple.getValue() );
-
+
cursor.close();
}
@@ -296,7 +296,7 @@ public class NoDupsCursorTest
assertTrue( cursor.previous() );
assertEquals( "1", cursor.get().getKey() );
-
+
cursor.close();
}
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=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-client/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/kerberos-client/src/test/resources/log4j.properties Fri Feb 15 12:03:31 2013
@@ -26,8 +26,8 @@ log4j.logger.org.apache.directory.api.ld
log4j.logger.org.apache.directory.api.asn1=WARN
log4j.logger.org.apache.directory.ldap.client.api=WARN
log4j.logger.org.apache.directory.api.util.Strings=FATAL
-log4j.logger.JdbmTable=WARN
-log4j.logger.JdbmIndex=WARN
+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.server.xdbm=WARN
@@ -39,10 +39,10 @@ log4j.logger.ATTRIBUTE_TYPE=FATAL
log4j.logger.SYNTAX_CHECKER=FATAL
log4j.logger.MATCHING_RULE=FATAL
log4j.logger.LDAP_SYNTAX=FATAL
-log4j.logger.BaseRecordManager=FATAL
+log4j.logger.jdbm.recman.BaseRecordManager=FATAL
log4j.logger.LOG_CHANGES=FATAL
log4j.logger.net=FATAL
-log4j.logger.DupsCursor=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
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=1446546&r1=1446545&r2=1446546&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 Fri Feb 15 12:03:31 2013
@@ -26,13 +26,13 @@ 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.JdbmTable=FATAL
-log4j.logger.JdbmIndex=FATAL
-log4j.logger.BaseRecordManager=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.DupsCursor=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
Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/LdifPartitionTest.java Fri Feb 15 12:03:31 2013
@@ -66,7 +66,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.api.normalization.FilterNormalizingVisitor;
-import org.apache.directory.server.core.partition.ldif.LdifPartition;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -83,7 +82,7 @@ import org.slf4j.LoggerFactory;
*/
public class LdifPartitionTest
{
- private static final Logger LOG = LoggerFactory.getLogger( LdifPartitionTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( LdifPartitionTest.class );
private static File wkdir;
private static LdifPartition partition;
@@ -433,7 +432,7 @@ public class LdifPartitionTest
assertEquals( 3, nbRes );
assertEquals( 0, expectedDns.size() );
-
+
cursor.close();
}
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=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/test/resources/log4j.properties Fri Feb 15 12:03:31 2013
@@ -25,13 +25,13 @@ 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.JdbmTable=FATAL
-log4j.logger.JdbmIndex=FATAL
-log4j.logger.BaseRecordManager=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.DupsCursor=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
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?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- 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 Fri Feb 15 12:03:31 2013
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
public class NtpServer extends AbstractProtocolService
{
/** logger for this class */
- private static final Logger LOG = LoggerFactory.getLogger( NtpServer.class.getName() );
+ private static final Logger LOG = LoggerFactory.getLogger( NtpServer.class );
/**
* The default IP port.
@@ -92,7 +92,7 @@ public class NtpServer extends AbstractP
UdpTransport transport = new UdpTransport( IP_PORT_DEFAULT );
setTransports( transport );
- DatagramAcceptor acceptor = ( DatagramAcceptor ) transport.getAcceptor();
+ DatagramAcceptor acceptor = transport.getAcceptor();
// Set the handler
acceptor.setHandler( ntpProtocolHandler );
Modified: directory/apacheds/trunk/server-integ/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/resources/log4j.properties?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/resources/log4j.properties (original)
+++ directory/apacheds/trunk/server-integ/src/test/resources/log4j.properties Fri Feb 15 12:03:31 2013
@@ -33,13 +33,13 @@ log4j.logger.ATTRIBUTE_TYPE=FATAL
log4j.logger.SYNTAX_CHECKER=FATAL
log4j.logger.MATCHING_RULE=FATAL
log4j.logger.LDAP_SYNTAX=FATAL
-log4j.logger.JdbmTable=FATAL
-log4j.logger.JdbmIndex=FATAL
-log4j.logger.BaseRecordManager=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.DupsCursor=FATAL
+log4j.logger.org.apache.directory.server.core.partition.impl.btree.jdbm.DupsCursor=FATAL
log4j.logger.CURSOR=FATAL
log4j.logger.org.apache.directory.api.asn1.ber=FATAL
log4j.logger.org.apache.directory.server.core.partition.ldif=FATAL
@@ -51,4 +51,4 @@ log4j.logger.org.apache.directory.ldap.c
log4j.logger.org.apache.directory.server.ldap.replication.provider=FATAL
log4j.logger.PROVIDER_LOG=FATAL
log4j.logger.CONSUMER_LOG=FATAL
-org.apache.directory.server.replication.MockSyncReplConsumer=FATAL
+log4j.logger.org.apache.directory.server.replication.MockSyncReplConsumer=FATAL
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java Fri Feb 15 12:03:31 2013
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
*/
public class AvlTableDupsCursor<K, V> extends AbstractCursor<Tuple<K, V>>
{
- private static final Logger LOG = LoggerFactory.getLogger( AvlTableDupsCursor.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( AvlTableDupsCursor.class );
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -97,7 +97,7 @@ public class AvlTableDupsCursor<K, V> ex
{
LOG_CURSOR.debug( "Creating AvlTableDupsCursor {}", this );
}
-
+
this.table = table;
this.wrappedCursor = new AvlSingletonOrOrderedSetCursor<K, V>( table.getAvlTreeMap() );
LOG.debug( "Created on table {}", table.getName() );
@@ -129,7 +129,7 @@ public class AvlTableDupsCursor<K, V> ex
{
checkNotClosed( "beforeValue()" );
wrappedCursor.beforeKey( key );
-
+
if ( dupsCursor != null )
{
dupsCursor.close();
@@ -246,7 +246,7 @@ public class AvlTableDupsCursor<K, V> ex
if ( value == null )
{
clearValue();
-
+
return;
}
@@ -362,7 +362,7 @@ public class AvlTableDupsCursor<K, V> ex
valueAvailable = true;
returnedTuple.setKey( wrappedTuple.getKey() );
returnedTuple.setValue( dupsCursor.get() );
-
+
return true;
}
@@ -393,12 +393,12 @@ public class AvlTableDupsCursor<K, V> ex
{
checkNotClosed( "last()" );
clearValue();
-
+
if ( dupsCursor != null )
{
dupsCursor.close();
}
-
+
if ( wrappedCursor.last() )
{
wrappedTuple.setBoth( wrappedCursor.get() );
@@ -422,7 +422,7 @@ public class AvlTableDupsCursor<K, V> ex
valueAvailable = true;
returnedTuple.setKey( wrappedTuple.getKey() );
returnedTuple.setValue( dupsCursor.get() );
-
+
return true;
}
@@ -436,7 +436,7 @@ public class AvlTableDupsCursor<K, V> ex
public boolean next() throws LdapException, CursorException, IOException
{
checkNotClosed( "next()" );
-
+
/*
* If the cursor over the values of the current key is null or is
* extinguished then we need to advance to the next key.
@@ -447,7 +447,7 @@ public class AvlTableDupsCursor<K, V> ex
{
dupsCursor.close();
}
-
+
/*
* If the wrappedCursor cursor has more elements we get the next
* key/AvlTree Tuple to work with and get a cursor over it.
@@ -478,7 +478,7 @@ public class AvlTableDupsCursor<K, V> ex
else
{
dupsCursor = null;
-
+
return false;
}
}
@@ -492,7 +492,7 @@ public class AvlTableDupsCursor<K, V> ex
*/
returnedTuple.setKey( wrappedTuple.getKey() );
returnedTuple.setValue( dupsCursor.get() );
-
+
return valueAvailable = true;
}
@@ -513,7 +513,7 @@ public class AvlTableDupsCursor<K, V> ex
{
dupsCursor.close();
}
-
+
/*
* If the wrappedCursor cursor has more elements we get the previous
* key/AvlTree Tuple to work with and get a cursor over it's
@@ -545,30 +545,30 @@ public class AvlTableDupsCursor<K, V> ex
else
{
dupsCursor = null;
-
+
return false;
}
}
returnedTuple.setKey( wrappedTuple.getKey() );
returnedTuple.setValue( dupsCursor.get() );
-
+
return valueAvailable = true;
}
-
+
public void close()
{
if ( IS_DEBUG )
{
LOG_CURSOR.debug( "Closing AvlTableDupsCursor {}", this );
}
-
+
if ( dupsCursor != null )
{
dupsCursor.close();
}
-
+
wrappedCursor.close();
}
@@ -589,7 +589,6 @@ public class AvlTableDupsCursor<K, V> ex
}
-
/**
* Clears the returned Tuple and makes sure valueAvailable returns false.
*/
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java Fri Feb 15 12:03:31 2013
@@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("unchecked")
public class AvlPartitionTest
{
- private static final Logger LOG = LoggerFactory.getLogger( AvlPartitionTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( AvlPartitionTest.class );
private static AvlPartition partition;
private static SchemaManager schemaManager = null;
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Fri Feb 15 12:03:31 2013
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
*/
public class AndCursorTest extends AbstractCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( AndCursorTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( AndCursorTest.class );
File wkdir;
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/EqualityTest.java Fri Feb 15 12:03:31 2013
@@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory;
*/
public class EqualityTest
{
- private static final Logger LOG = LoggerFactory.getLogger( EqualityTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( EqualityTest.class );
File wkdir;
Store store;
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Fri Feb 15 12:03:31 2013
@@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory;
*/
public class NestedFilterTest extends AbstractCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( NestedFilterTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( NestedFilterTest.class );
File wkdir;
static SchemaManager schemaManager = null;
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Fri Feb 15 12:03:31 2013
@@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory;
*/
public class NotCursorTest extends AbstractCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( NotCursorTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( NotCursorTest.class );
UuidSyntaxChecker uuidSynChecker = new UuidSyntaxChecker();
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Fri Feb 15 12:03:31 2013
@@ -78,7 +78,7 @@ import org.slf4j.LoggerFactory;
*/
public class OrCursorTest extends AbstractCursorTest
{
- private static final Logger LOG = LoggerFactory.getLogger( OrCursorTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( OrCursorTest.class );
File wkdir;
static SchemaManager schemaManager = null;
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Fri Feb 15 12:03:31 2013
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
*/
public class PresenceTest
{
- private static final Logger LOG = LoggerFactory.getLogger( PresenceTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( PresenceTest.class );
File wkdir;
Store store;
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1446546&r1=1446545&r2=1446546&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Fri Feb 15 12:03:31 2013
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
*/
public class SubstringTest
{
- private static final Logger LOG = LoggerFactory.getLogger( SubstringTest.class.getSimpleName() );
+ private static final Logger LOG = LoggerFactory.getLogger( SubstringTest.class );
File wkdir;
Store store;