directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r518709 - in /directory/apacheds/trunk/core/src: main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
Date Thu, 15 Mar 2007 17:53:56 GMT
Author: elecharny
Date: Thu Mar 15 10:53:55 2007
New Revision: 518709

URL: http://svn.apache.org/viewvc?view=rev&rev=518709
Log:
Moved Attribute(s)Srializer to jdbm-store and shared-ldap projects
Fixed the tests accordingly to the JdbmTable modification

Removed:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializer.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializer.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributeSerializerTest.java
Modified:
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java?view=diff&rev=518709&r1=518708&r2=518709
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/AttributesSerializerTest.java
Thu Mar 15 10:53:55 2007
@@ -25,6 +25,7 @@
 import org.apache.directory.shared.ldap.message.AttributeImpl;
 import org.apache.directory.shared.ldap.message.AttributesImpl;
 import org.apache.directory.shared.ldap.util.ArrayUtils;
+import org.apache.directory.shared.ldap.util.AttributesSerializerUtils;
 
 import junit.framework.TestCase;
 
@@ -58,7 +59,7 @@
         
         attrs.put( attr0 );
         attrs.put( attr1 );
-        AttributesSerializer serializer = new AttributesSerializer();
+        AttributesSerializerUtils serializer = new AttributesSerializerUtils();
         byte[] buf = serializer.serialize( attrs );
         AttributesImpl deserialized = ( AttributesImpl ) serializer.deserialize( buf );
 

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java?view=diff&rev=518709&r1=518708&r2=518709
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsBTreeTest.java
Thu Mar 15 10:53:55 2007
@@ -33,6 +33,7 @@
 import org.apache.directory.shared.ldap.util.LongComparator;
 
 import jdbm.RecordManager;
+import jdbm.helper.LongSerializer;
 import jdbm.recman.BaseRecordManager;
 
 import junit.framework.TestCase;
@@ -107,7 +108,7 @@
         rm = new BaseRecordManager( tempFile.getAbsolutePath() );
 
         // make sure the table never uses a btree for duplicates
-        table = new JdbmTable( "test", true, 1, rm, comparator );
+        table = new JdbmTable( "test", true, 1, rm, comparator, null, null );
 
         for ( Long ii = 0L; ii.intValue() < 3; ii++ )
         {

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java?view=diff&rev=518709&r1=518708&r2=518709
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableDupsTreeSetTest.java
Thu Mar 15 10:53:55 2007
@@ -33,6 +33,7 @@
 import org.apache.directory.shared.ldap.util.LongComparator;
 
 import jdbm.RecordManager;
+import jdbm.helper.LongSerializer;
 import jdbm.recman.BaseRecordManager;
 
 import junit.framework.TestCase;
@@ -107,7 +108,8 @@
         rm = new BaseRecordManager( tempFile.getAbsolutePath() );
 
         // make sure the table never uses a btree for duplicates
-        table = new JdbmTable( "test", true, Integer.MAX_VALUE, rm, comparator );
+        table = new JdbmTable( "test", true, Integer.MAX_VALUE, rm, 
+            comparator, null, null );
 
         for ( Long ii = 0L; ii.intValue() < 3; ii++ )
         {

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java?view=diff&rev=518709&r1=518708&r2=518709
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDupsTest.java
Thu Mar 15 10:53:55 2007
@@ -33,6 +33,8 @@
 import org.apache.directory.shared.ldap.util.LongComparator;
 
 import jdbm.RecordManager;
+import jdbm.helper.LongSerializer;
+import jdbm.helper.Serializer;
 import jdbm.recman.BaseRecordManager;
 
 import junit.framework.TestCase;
@@ -81,7 +83,7 @@
         rm = new BaseRecordManager( tempFile.getAbsolutePath() );
 
         // make sure the table does not use duplicates
-        table = new JdbmTable( "test", rm, serializableComparator );
+        table = new JdbmTable( "test", rm, serializableComparator, LongSerializer.INSTANCE,
LongSerializer.INSTANCE );
 
         table.put( 1L, 1L );
         table.put( 2L, 1L );
@@ -118,7 +120,7 @@
         table.sync();
         table.close();
 
-        table = new JdbmTable( "test", rm, serializableComparator );
+        table = new JdbmTable( "test", rm, serializableComparator, LongSerializer.INSTANCE,
LongSerializer.INSTANCE );
     }
     
 



Mime
View raw message