directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1151353 [1/2] - in /directory/sandbox/seelmann: hbase-partition-test/ hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/ hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hba...
Date Wed, 27 Jul 2011 06:45:59 GMT
Author: seelmann
Date: Wed Jul 27 06:45:46 2011
New Revision: 1151353

URL: http://svn.apache.org/viewvc?rev=1151353&view=rev
Log:
Started to fix compilation errors due to changes in shared-ldap package structure.

Modified:
    directory/sandbox/seelmann/hbase-partition-test/pom.xml
    directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/AbstractHBasePartitionIT.java
    directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionIT.java
    directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionPT.java
    directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/mapreduce/LdifImportAndIndexIT.java
    directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseDistributedRunner.java
    directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseEmbeddedRunner.java
    directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseRunner.java
    directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/suites/StockServerISuite.java
    directory/sandbox/seelmann/hbase-partition/pom.xml
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseDistributedPartition.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseEmbeddedPartitionFactory.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseStore.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/Utils.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/AbstractHBaseCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/BaseHBaseIndexCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/EmptyIndexCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseOneLevelIndexCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBasePresenceIndexCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseSubLevelIndexCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserColumnIndexCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserIndexCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserIndexReverseCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserRowIndexCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/AbstractHBaseIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseAliasIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseOneLevelIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBasePresenceIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseRdnIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseSubLevelIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserColumnIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserRowIndex.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/IndexBuilder.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/LdifImporter.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/TreeTableBuilder.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseColumnIndexTable.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableBase.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTable.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBasePresenceIndexTable.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseRowIndexTable.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedCursorBuilder.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedEvaluatorBuilder.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexFilteringExtension.java
    directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexSubstringExtension.java
    directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/AbstractHBaseTableTest.java
    directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableTest.java
    directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTableTest.java

Modified: directory/sandbox/seelmann/hbase-partition-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/pom.xml?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/pom.xml (original)
+++ directory/sandbox/seelmann/hbase-partition-test/pom.xml Wed Jul 27 06:45:46 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.8-SNAPSHOT</version>
+    <version>2.0.0-M2-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-hbase-partition-test</artifactId>
   <name>ApacheDS HBase Partition Test</name>
@@ -47,6 +47,7 @@
     </dependency>
     
     <!-- Dependencies to ApacheDS, for partition implementation -->
+<!--
     <dependency>
       <artifactId>apacheds-core</artifactId>
       <groupId>${project.groupId}</groupId>
@@ -58,8 +59,10 @@
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
+-->
 
     <!-- ApacheDS integration test framework -->
+<!--
     <dependency>
       <artifactId>apacheds-core-integ</artifactId>
       <groupId>${project.groupId}</groupId>
@@ -85,8 +88,10 @@
       <version>${project.version}</version>
       <classifier>tests</classifier>
     </dependency>
+-->
 
     <!-- HBase dependencies -->
+<!--
     <dependency>
       <artifactId>hbase</artifactId>
       <groupId>org.apache.hbase</groupId>
@@ -104,6 +109,7 @@
       <version>0.20.3-append-r964955-1240</version>
       <scope>test</scope>
     </dependency>
+-->
 
   </dependencies>
 

Modified: directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/AbstractHBasePartitionIT.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/AbstractHBasePartitionIT.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/AbstractHBasePartitionIT.java (original)
+++ directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/AbstractHBasePartitionIT.java Wed Jul 27 06:45:46 2011
@@ -28,10 +28,10 @@ import org.apache.commons.lang.RandomStr
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.ldap.LdapServer;
-import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.junit.AfterClass;
@@ -87,27 +87,27 @@ public abstract class AbstractHBaseParti
 
         LOG.debug( "Adding basic test data..." );
 
-        if ( !session.exists( new DN( "o=hbase" ) ) )
+        if ( !session.exists( new Dn( "o=hbase" ) ) )
         {
-            Entry entry = new DefaultEntry( schemaManager, new DN( "o=hbase" ) );
+            Entry entry = new DefaultEntry( schemaManager, new Dn( "o=hbase" ) );
             entry.add( "objectClass", "top", "organization" );
             entry.add( "o", "hbase" );
             session.add( entry );
             LOG.debug( "  added " + entry.getDn().getName() );
         }
 
-        if ( !session.exists( new DN( "ou=test-ou,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test-ou,o=hbase" ) ) )
         {
-            Entry entry = new DefaultEntry( schemaManager, new DN( "ou=test-ou,o=hbase" ) );
+            Entry entry = new DefaultEntry( schemaManager, new Dn( "ou=test-ou,o=hbase" ) );
             entry.add( "objectClass", "top", "organizationalUnit" );
             entry.add( "ou", "test-ou" );
             session.add( entry );
             LOG.debug( "  added " + entry.getDn().getName() );
         }
 
-        if ( !session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) )
         {
-            Entry entry = new DefaultEntry( schemaManager, new DN( "cn=test-person,ou=test-ou,o=hbase" ) );
+            Entry entry = new DefaultEntry( schemaManager, new Dn( "cn=test-person,ou=test-ou,o=hbase" ) );
             entry.add( "objectClass", "top", "person" );
             entry.add( "cn", "test-person" );
             entry.add( "Sn", "test-person" );
@@ -134,7 +134,7 @@ public abstract class AbstractHBaseParti
 
         LOG.debug( "Adding test data " + number + "..." );
 
-        DN dn = new DN( "ou=test" + number + ",o=hbase" );
+        Dn dn = new Dn( "ou=test" + number + ",o=hbase" );
         if ( !session.exists( dn ) )
         {
             Entry entry = new DefaultEntry( schemaManager, dn );
@@ -148,7 +148,7 @@ public abstract class AbstractHBaseParti
         {
             String s = df.format( i );
 
-            dn = new DN( "cn=test" + s + ",ou=test" + number + ",o=hbase" );
+            dn = new Dn( "cn=test" + s + ",ou=test" + number + ",o=hbase" );
             if ( session.exists( dn ) )
             {
                 continue;

Modified: directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionIT.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionIT.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionIT.java (original)
+++ directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionIT.java Wed Jul 27 06:45:46 2011
@@ -50,18 +50,18 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserColumnIndex;
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserRowIndex;
 import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable;
-import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.DefaultModification;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.Modification;
-import org.apache.directory.shared.ldap.entry.ModificationOperation;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultModification;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.Modification;
+import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException;
-import org.apache.directory.shared.ldap.filter.FilterParser;
-import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.shared.ldap.model.filter.FilterParser;
+import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.shared.util.String;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Result;
@@ -97,12 +97,12 @@ public class HBasePartitionIT extends Ab
     @Before
     public void initTestData() throws Exception
     {
-        if ( !session.exists( new DN( "o=hbase" ) ) || !session.exists( new DN( "ou=test-ou,o=hbase" ) )
-            || !session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "o=hbase" ) ) || !session.exists( new Dn( "ou=test-ou,o=hbase" ) )
+            || !session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) )
         {
             createBasicTestData( ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test1000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test1000,o=hbase" ) ) )
         {
             createTestData( 1000, "000", ldapServer );
         }
@@ -147,8 +147,8 @@ public class HBasePartitionIT extends Ab
 //            System.out.println( "Filtered scan before delete " + count );
 //        }
 //
-//        session.delete( new DN( "cn=test-person,ou=test-ou,o=hbase" ) );
-//        session.delete( new DN( "ou=test-ou,o=hbase" ) );
+//        session.delete( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) );
+//        session.delete( new Dn( "ou=test-ou,o=hbase" ) );
 //
 //        {
 //            Scan scan = new Scan();
@@ -314,11 +314,11 @@ public class HBasePartitionIT extends Ab
     //@Ignore
     public void testDelete() throws Exception
     {
-        session.delete( new DN( "cn=test-person,ou=test-ou,o=hbase" ) );
-        session.delete( new DN( "ou=test-ou,o=hbase" ) );
+        session.delete( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) );
+        session.delete( new Dn( "ou=test-ou,o=hbase" ) );
 
-        assertFalse( session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) );
-        assertFalse( session.exists( new DN( "ou=test-ou,o=hbase" ) ) );
+        assertFalse( session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) );
+        assertFalse( session.exists( new Dn( "ou=test-ou,o=hbase" ) ) );
 
         // TODO: assert updates in HBase (id2dn, master, index, one-level-count, sub-level-counts)
     }
@@ -329,18 +329,18 @@ public class HBasePartitionIT extends Ab
     {
         // reset initial values
         List<Modification> resetMods = new ArrayList<Modification>();
-        resetMods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+        resetMods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
             "telephoneNumber" ) ) );
-        resetMods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+        resetMods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
             "description", "description1", "description2" ) ) );
-        resetMods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+        resetMods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
             "seeAlso", "uid=admin,ou=system" ) ) );
-        resetMods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+        resetMods.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
             "userPassword", "secret1" ) ) );
-        session.modify( new DN( "cn=test-person,ou=test-ou,o=hbase" ), resetMods );
+        session.modify( new Dn( "cn=test-person,ou=test-ou,o=hbase" ), resetMods );
 
         // assert initial values
-        Entry entry = session.lookup( new DN( "cn=test-person,ou=test-ou,o=hbase" ) );
+        Entry entry = session.lookup( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) );
         assertNotNull( entry );
         assertNull( entry.get( "telephoneNumber" ) );
         assertNotNull( entry.get( "description" ) );
@@ -348,21 +348,21 @@ public class HBasePartitionIT extends Ab
         assertNotNull( entry.get( "seeAlso" ) );
         assertEquals( "uid=admin,ou=system", entry.get( "seeAlso" ).getString() );
         assertNotNull( entry.get( "userPassword" ) );
-        assertEquals( "secret1", StringTools.utf8ToString( entry.get( "userPassword" ).getBytes() ) );
+        assertEquals( "secret1", Strings.utf8ToString( entry.get( "userPassword" ).getBytes() ) );
 
         // apply modifications
         List<Modification> modifications = new ArrayList<Modification>();
-        modifications.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultEntryAttribute(
+        modifications.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, new DefaultAttribute(
             "telephoneNumber", "123", "456" ) ) );
-        modifications.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute(
+        modifications.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultAttribute(
             "description", "description1" ) ) );
-        modifications.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultEntryAttribute(
+        modifications.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, new DefaultAttribute(
             "seeAlso" ) ) );
-        modifications.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultEntryAttribute(
+        modifications.add( new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, new DefaultAttribute(
             "userPassword", "secret2" ) ) );
-        session.modify( new DN( "cn=test-person,ou=test-ou,o=hbase" ), modifications );
+        session.modify( new Dn( "cn=test-person,ou=test-ou,o=hbase" ), modifications );
 
-        entry = session.lookup( new DN( "cn=test-person,ou=test-ou,o=hbase" ) );
+        entry = session.lookup( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) );
         assertNotNull( entry );
         assertNotNull( entry.get( "telephoneNumber" ) );
         assertEquals( 2, entry.get( "telephoneNumber" ).size() );
@@ -370,27 +370,27 @@ public class HBasePartitionIT extends Ab
         assertEquals( "description2", entry.get( "description" ).getString() );
         assertNull( entry.get( "seeAlso" ) );
         assertNotNull( entry.get( "userPassword" ) );
-        assertEquals( "secret2", StringTools.utf8ToString( entry.get( "userPassword" ).getBytes() ) );
+        assertEquals( "secret2", Strings.utf8ToString( entry.get( "userPassword" ).getBytes() ) );
     }
 
 
     @Test
     public void testRenameLeaf() throws Exception
     {
-        session.rename( new DN( "cn=test-person,ou=test-ou,o=hbase" ), new RDN( "cn=Test-Person2" ), false );
-        assertFalse( session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "cn=Test-Person2,ou=test-ou,o=hbase" ) ) );
-        Entry entry = session.lookup( new DN( "cn=Test-Person2,ou=test-ou,o=hbase" ) );
+        session.rename( new Dn( "cn=test-person,ou=test-ou,o=hbase" ), new Rdn( "cn=Test-Person2" ), false );
+        assertFalse( session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "cn=Test-Person2,ou=test-ou,o=hbase" ) ) );
+        Entry entry = session.lookup( new Dn( "cn=Test-Person2,ou=test-ou,o=hbase" ) );
         assertNotNull( entry );
         assertNotNull( entry.get( "cn" ) );
         assertEquals( 2, entry.get( "cn" ).size() );
         assertTrue( entry.get( "cn" ).contains( "test-person" ) );
         assertTrue( entry.get( "cn" ).contains( "Test-Person2" ) );
 
-        session.rename( new DN( "cn=test-person2,ou=test-ou,o=hbase" ), new RDN( "cn=test-person" ), true );
-        assertFalse( session.exists( new DN( "cn=Test-Person2,ou=test-ou,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) );
-        entry = session.lookup( new DN( "cn=test-person,ou=test-ou,o=hbase" ) );
+        session.rename( new Dn( "cn=test-person2,ou=test-ou,o=hbase" ), new Rdn( "cn=test-person" ), true );
+        assertFalse( session.exists( new Dn( "cn=Test-Person2,ou=test-ou,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) );
+        entry = session.lookup( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) );
         assertNotNull( entry );
         assertNotNull( entry.get( "cn" ) );
         assertEquals( 1, entry.get( "cn" ).size() );
@@ -402,28 +402,28 @@ public class HBasePartitionIT extends Ab
     //@Ignore
     public void testRenameBranch() throws Exception
     {
-        session.rename( new DN( "ou=test-ou,o=hbase" ), new RDN( "OU=Test-Ou2" ), false );
-        assertFalse( session.exists( new DN( "ou=test-ou,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "ou=test-ou2,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "cn=test-person,ou=test-ou2,o=hbase" ) ) );
-        Entry entry = session.lookup( new DN( "ou=test-ou2,o=hbase" ) );
+        session.rename( new Dn( "ou=test-ou,o=hbase" ), new Rdn( "OU=Test-Ou2" ), false );
+        assertFalse( session.exists( new Dn( "ou=test-ou,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "ou=test-ou2,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "cn=test-person,ou=test-ou2,o=hbase" ) ) );
+        Entry entry = session.lookup( new Dn( "ou=test-ou2,o=hbase" ) );
         assertNotNull( entry );
         assertNotNull( entry.get( "ou" ) );
         assertEquals( 2, entry.get( "ou" ).size() );
         assertTrue( entry.get( "ou" ).contains( "test-ou" ) );
         assertTrue( entry.get( "ou" ).contains( "Test-Ou2" ) );
 
-        session.rename( new DN( "ou=test-ou2,o=hbase" ), new RDN( "ou=test-ou" ), true );
-        assertFalse( session.exists( new DN( "ou=test-ou2,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "ou=test-ou,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) );
-        entry = session.lookup( new DN( "ou=test-ou,o=hbase" ) );
+        session.rename( new Dn( "ou=test-ou2,o=hbase" ), new Rdn( "ou=test-ou" ), true );
+        assertFalse( session.exists( new Dn( "ou=test-ou2,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "ou=test-ou,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) );
+        entry = session.lookup( new Dn( "ou=test-ou,o=hbase" ) );
         assertNotNull( entry );
         assertNotNull( entry.get( "ou" ) );
         assertEquals( 1, entry.get( "ou" ).size() );
         assertEquals( "test-ou", entry.get( "ou" ).getString() );
         
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(ou=test-ou*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -442,22 +442,22 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testMove() throws Exception
     {
-        session.move( new DN( "cn=test-person,ou=test-ou,o=hbase" ), new DN( "o=hbase" ) );
-        assertFalse( session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "cn=test-person,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "ou=test-ou,o=hbase" ) ) );
-
-        session.move( new DN( "cn=test-person,o=hbase" ), new DN( "ou=test-ou,o=hbase" ) );
-        assertTrue( session.exists( new DN( "ou=test-ou,o=hbase" ) ) );
-        assertTrue( session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) );
-        assertFalse( session.exists( new DN( "cn=test-person,o=hbase" ) ) );
+        session.move( new Dn( "cn=test-person,ou=test-ou,o=hbase" ), new Dn( "o=hbase" ) );
+        assertFalse( session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "cn=test-person,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "ou=test-ou,o=hbase" ) ) );
+
+        session.move( new Dn( "cn=test-person,o=hbase" ), new Dn( "ou=test-ou,o=hbase" ) );
+        assertTrue( session.exists( new Dn( "ou=test-ou,o=hbase" ) ) );
+        assertTrue( session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) );
+        assertFalse( session.exists( new Dn( "cn=test-person,o=hbase" ) ) );
     }
 
 
     @Test
     public void testLookup1() throws Exception
     {
-        Entry entry = session.lookup( new DN( "o=hbase" ) );
+        Entry entry = session.lookup( new Dn( "o=hbase" ) );
         assertNotNull( entry );
         assertEquals( "2.5.4.10=hbase", entry.getDn().getNormName() );
     }
@@ -466,7 +466,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testLookup2() throws Exception
     {
-        Entry entry = session.lookup( new DN( "cn=test-person,ou=test-ou,o=hbase" ) );
+        Entry entry = session.lookup( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) );
         assertNotNull( entry );
         assertEquals( "2.5.4.3=test-person,2.5.4.11=test-ou,2.5.4.10=hbase", entry.getDn().getNormName() );
     }
@@ -475,10 +475,10 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testLookupNonExisting() throws Exception
     {
-        assertFalse( session.exists( new DN( "cn=qwertz,ou=test-ou,o=hbase" ) ) );
+        assertFalse( session.exists( new Dn( "cn=qwertz,ou=test-ou,o=hbase" ) ) );
         try
         {
-            session.lookup( new DN( "cn=qwertz,ou=test-ou,o=hbase" ) );
+            session.lookup( new Dn( "cn=qwertz,ou=test-ou,o=hbase" ) );
             fail();
         }
         catch ( LdapNoSuchObjectException e )
@@ -491,7 +491,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchBaseEqualsFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test-ou,o=hbase" ), SearchScope.OBJECT, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test-ou,o=hbase" ), SearchScope.OBJECT, FilterParser
             .parse( "(objectClass=organizationalUnit)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -510,7 +510,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchBaseNotEqualsFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test-ou,o=hbase" ), SearchScope.OBJECT, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test-ou,o=hbase" ), SearchScope.OBJECT, FilterParser
             .parse( "(!(objectClass=organizationalUnit))" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -522,7 +522,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchBasePresenceFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "cn=test-person,ou=test-ou,o=hbase" ),
+        EntryFilteringCursor cursor = session.search( new Dn( "cn=test-person,ou=test-ou,o=hbase" ),
             SearchScope.OBJECT, FilterParser.parse( "(objectClass=*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -541,7 +541,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchBasePresenceFilter2() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "cn=test-person,ou=test-ou,o=hbase" ),
+        EntryFilteringCursor cursor = session.search( new Dn( "cn=test-person,ou=test-ou,o=hbase" ),
             SearchScope.OBJECT, FilterParser.parse( "(sn=*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -560,7 +560,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchBaseSubstringFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "cn=test-person,ou=test-ou,o=hbase" ),
+        EntryFilteringCursor cursor = session.search( new Dn( "cn=test-person,ou=test-ou,o=hbase" ),
             SearchScope.OBJECT, FilterParser.parse( "(objectClass=per*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -579,7 +579,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelEqualFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(ou=test-OU)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -598,7 +598,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelEqualFilter2() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test-ou,o=hbase" ), SearchScope.ONELEVEL,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test-ou,o=hbase" ), SearchScope.ONELEVEL,
             FilterParser.parse( "(objectClass=person)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -618,7 +618,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelEqualFilter3() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test-ou,o=hbase" ), SearchScope.ONELEVEL,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test-ou,o=hbase" ), SearchScope.ONELEVEL,
             FilterParser.parse( "(cn=test-person)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -638,7 +638,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelNotEqualFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(!(ou=test-ou))" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -658,7 +658,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelPresenceFilterIndexed() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(objectClass=*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -679,7 +679,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelPresenceFilterUnindexed() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test-ou,o=hbase" ), SearchScope.ONELEVEL,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test-ou,o=hbase" ), SearchScope.ONELEVEL,
             FilterParser.parse( "(sn=*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -697,7 +697,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelPresenceFilterIndexed2() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.ONELEVEL,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.ONELEVEL,
             FilterParser.parse( "(objectClass=*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -717,7 +717,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelSubstringInitialFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(ou=test-*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -736,7 +736,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelSubstringAnyFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(ou=*-*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -755,7 +755,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchOneLevelSubstringFinalFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(ou=*-ou)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -776,7 +776,7 @@ public class HBasePartitionIT extends Ab
     {
         // not a good example to use ou for ordering filter...
 
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(ou>=test-)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -799,7 +799,7 @@ public class HBasePartitionIT extends Ab
     {
         // not a good example to use ou for ordering filter...
 
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
             .parse( "(ou<=u)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -820,7 +820,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchSubLevelEqualFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser
             .parse( "(cn=test999)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -839,7 +839,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchSubLevelEqualFilterUnindexed() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser
             .parse( "(sn=test999)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -859,7 +859,7 @@ public class HBasePartitionIT extends Ab
     public void testSearchSubLevelOrEqualFilter() throws Exception
     {
         // 
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test-ou,o=hbase" ), SearchScope.SUBTREE, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test-ou,o=hbase" ), SearchScope.SUBTREE, FilterParser
             .parse( "(|(ou=test-ou)(cn=test-person))" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -887,7 +887,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchSubLevelAndEqualFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
             FilterParser.parse( "(&(cn=test777)(objectClass=person))" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -903,7 +903,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchSubLevelAndEqualFilterNoResult() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test-ou,o=hbase" ), SearchScope.SUBTREE, FilterParser
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test-ou,o=hbase" ), SearchScope.SUBTREE, FilterParser
             .parse( "(&(cn=test777)(objectClass=person))" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -915,7 +915,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchPresenceFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
             FilterParser.parse( "(cn=*)" ), AliasDerefMode.DEREF_ALWAYS, null, 0, 0 );
 
         assertNotNull( cursor );
@@ -938,7 +938,7 @@ public class HBasePartitionIT extends Ab
     public void testSearchSubLevelSubstringInitialFilter() throws Exception
     {
         // uses sub-level index
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
             FilterParser.parse( "(cn=test99*)" ), AliasDerefMode.DEREF_ALWAYS, null, 0, 0 );
 
         assertNotNull( cursor );
@@ -964,7 +964,7 @@ public class HBasePartitionIT extends Ab
         assertTrue( actualDns.contains( "cn=test999,ou=test1000,o=hbase" ) );
 
         // uses cn index
-        cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn=test99*)" ),
+        cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn=test99*)" ),
             AliasDerefMode.DEREF_ALWAYS, null, 0, 0 );
 
         assertNotNull( cursor );
@@ -995,7 +995,7 @@ public class HBasePartitionIT extends Ab
     public void testSearchSubLevelSubstringAnyFilter() throws Exception
     {
         // uses sub-level index
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
             FilterParser.parse( "(cn=*st00*)" ), AliasDerefMode.DEREF_ALWAYS, null, 0, 0 );
 
         assertNotNull( cursor );
@@ -1021,7 +1021,7 @@ public class HBasePartitionIT extends Ab
         assertTrue( actualDns.contains( "cn=test009,ou=test1000,o=hbase" ) );
 
         // uses cn index
-        cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn=*st00*)" ),
+        cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn=*st00*)" ),
             AliasDerefMode.DEREF_ALWAYS, null, 0, 0 );
 
         assertNotNull( cursor );
@@ -1052,7 +1052,7 @@ public class HBasePartitionIT extends Ab
     public void testSearchSubLevelSubstringFinalFilter() throws Exception
     {
         // uses sub-level index
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
             FilterParser.parse( "(cn=*99)" ), AliasDerefMode.DEREF_ALWAYS, null, 0, 0 );
 
         assertNotNull( cursor );
@@ -1078,7 +1078,7 @@ public class HBasePartitionIT extends Ab
         assertTrue( actualDns.contains( "cn=test999,ou=test1000,o=hbase" ) );
 
         // uses cn index
-        cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn=*99)" ),
+        cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn=*99)" ),
             AliasDerefMode.DEREF_ALWAYS, null, 0, 0 );
 
         assertNotNull( cursor );
@@ -1111,7 +1111,7 @@ public class HBasePartitionIT extends Ab
         // not a good example to use cn for ordering filter...
 
         // uses sub-level index
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
             FilterParser.parse( "(cn>=TeSt900)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -1129,7 +1129,7 @@ public class HBasePartitionIT extends Ab
         assertTrue( actualDns.contains( "cn=test999,ou=test1000,o=hbase" ) );
 
         // uses cn index
-        cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn>=TeSt900)" ),
+        cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn>=TeSt900)" ),
             AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -1154,7 +1154,7 @@ public class HBasePartitionIT extends Ab
         // not a good examle to use cn for ordering filter...
 
         // uses sub-level index
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
             FilterParser.parse( "(cn<=test099)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -1173,7 +1173,7 @@ public class HBasePartitionIT extends Ab
         assertFalse( actualDns.contains( "cn=test100,ou=test1000,o=hbase" ) );
 
         // uses cn index
-        cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn<=test099)" ),
+        cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser.parse( "(cn<=test099)" ),
             AliasDerefMode.DEREF_ALWAYS, null );
 
         assertNotNull( cursor );
@@ -1197,7 +1197,7 @@ public class HBasePartitionIT extends Ab
     @Test
     public void testSearchSubLevelMixedOrderingFilter() throws Exception
     {
-        EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
+        EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.SUBTREE,
             FilterParser.parse( "(&(cn>=test200)(!(cn=test200))(!(cn=test250))(!(cn=test300))(cn<=test300))" ),
             AliasDerefMode.DEREF_ALWAYS, null );
 

Modified: directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionPT.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionPT.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionPT.java (original)
+++ directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/HBasePartitionPT.java Wed Jul 27 06:45:46 2011
@@ -39,13 +39,13 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.hbase.HBaseDistributedPartition;
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserColumnIndex;
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserRowIndex;
-import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.filter.FilterParser;
-import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.filter.FilterParser;
+import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -78,16 +78,16 @@ public class HBasePartitionPT extends Ab
     @Before
     public void initTestData() throws Exception
     {
-        if ( !session.exists( new DN( "o=hbase" ) ) || !session.exists( new DN( "ou=test-ou,o=hbase" ) )
-            || !session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "o=hbase" ) ) || !session.exists( new Dn( "ou=test-ou,o=hbase" ) )
+            || !session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) )
         {
             createBasicTestData( ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test1000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test1000,o=hbase" ) ) )
         {
             createTestData( 1000, "000", ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test10000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test10000,o=hbase" ) ) )
         {
             createTestData( 10000, "0000", ldapServer );
 
@@ -104,7 +104,7 @@ public class HBasePartitionPT extends Ab
         long t0 = System.currentTimeMillis();
         SchemaManager schemaManager = ldapServer.getDirectoryService().getSchemaManager();
 
-        DN dn = new DN( "cn=test000,ou=test-ou,o=hbase" );
+        Dn dn = new Dn( "cn=test000,ou=test-ou,o=hbase" );
         Entry entry = new DefaultEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person" );
         entry.add( "cn", "test000" );
@@ -129,7 +129,7 @@ public class HBasePartitionPT extends Ab
         for ( int i = 0; i < 1000; i++ )
         {
             String s = df.format( i );
-            Entry entry = new DefaultEntry( schemaManager, new DN( "cn=test" + s
+            Entry entry = new DefaultEntry( schemaManager, new Dn( "cn=test" + s
                 + ",ou=test-ou,o=hbase" ) );
             entry.add( "objectClass", "top", "person" );
             entry.add( "cn", "test" + s );
@@ -150,7 +150,7 @@ public class HBasePartitionPT extends Ab
         for ( int i = 0; i < 1000; i++ )
         {
             String s = df.format( i );
-            session.delete( new DN( "cn=test" + s + ",ou=test-ou,o=hbase" ) );
+            session.delete( new Dn( "cn=test" + s + ",ou=test-ou,o=hbase" ) );
         }
         long t1 = System.currentTimeMillis();
         long t = t1 - t0;
@@ -164,7 +164,7 @@ public class HBasePartitionPT extends Ab
         long t0 = System.currentTimeMillis();
         for ( int i = 0; i < 1000; i++ )
         {
-            Entry entry = session.lookup( new DN( "cn=test-person,ou=test-ou,o=hbase" ) );
+            Entry entry = session.lookup( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) );
             assertNotNull( entry );
             assertEquals( "2.5.4.3=test-person,2.5.4.11=test-ou,2.5.4.10=hbase", entry.getDn().getNormName() );
         }
@@ -181,7 +181,7 @@ public class HBasePartitionPT extends Ab
         for ( int i = 0; i < 1000; i++ )
         {
             String cn = RandomStringUtils.randomNumeric( 4 );
-            Entry entry = session.lookup( new DN( "cn=test" + cn + ",ou=test10000,o=hbase" ) );
+            Entry entry = session.lookup( new Dn( "cn=test" + cn + ",ou=test10000,o=hbase" ) );
             assertNotNull( entry );
             assertEquals( "2.5.4.3=test" + cn + ",2.5.4.11=test10000,2.5.4.10=hbase", entry.getDn().getNormName() );
         }
@@ -197,7 +197,7 @@ public class HBasePartitionPT extends Ab
         long t0 = System.currentTimeMillis();
         for ( int i = 0; i < 1000; i++ )
         {
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
                 .parse( "(objectClass=organizationalUnit)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -223,7 +223,7 @@ public class HBasePartitionPT extends Ab
         long t0 = System.currentTimeMillis();
         for ( int i = 0; i < 10; i++ )
         {
-            EntryFilteringCursor cursor = session.search( new DN( "ou=test1000,o=hbase" ), SearchScope.ONELEVEL,
+            EntryFilteringCursor cursor = session.search( new Dn( "ou=test1000,o=hbase" ), SearchScope.ONELEVEL,
                 FilterParser.parse( "(objectClass=person)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -251,7 +251,7 @@ public class HBasePartitionPT extends Ab
         {
             String cn = RandomStringUtils.randomNumeric( 4 );
             String filter = "(cn=test" + cn + ")";
-            EntryFilteringCursor cursor = session.search( new DN( "ou=test10000,o=hbase" ), SearchScope.ONELEVEL,
+            EntryFilteringCursor cursor = session.search( new Dn( "ou=test10000,o=hbase" ), SearchScope.ONELEVEL,
                 FilterParser.parse( filter ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -275,7 +275,7 @@ public class HBasePartitionPT extends Ab
         {
             String sn = RandomStringUtils.randomNumeric( 4 );
             String filter = "(sn=test" + sn + ")";
-            EntryFilteringCursor cursor = session.search( new DN( "ou=test10000,o=hbase" ), SearchScope.ONELEVEL,
+            EntryFilteringCursor cursor = session.search( new Dn( "ou=test10000,o=hbase" ), SearchScope.ONELEVEL,
                 FilterParser.parse( filter ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -296,7 +296,7 @@ public class HBasePartitionPT extends Ab
         long t0 = System.currentTimeMillis();
         for ( int i = 0; i < 1000; i++ )
         {
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
                 .parse( "(objectClass=*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -323,7 +323,7 @@ public class HBasePartitionPT extends Ab
         long t0 = System.currentTimeMillis();
         for ( int i = 0; i < 1000; i++ )
         {
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
                 .parse( "(objectClass=org*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -348,7 +348,7 @@ public class HBasePartitionPT extends Ab
         long t0 = System.currentTimeMillis();
         for ( int i = 0; i < 1000; i++ )
         {
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.ONELEVEL, FilterParser
                 .parse( "(objectClass=*org*)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -373,7 +373,7 @@ public class HBasePartitionPT extends Ab
         long t0 = System.currentTimeMillis();
         for ( int i = 0; i < 1000; i++ )
         {
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser
                 .parse( "(objectClass=organizationalUnit)" ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -401,7 +401,7 @@ public class HBasePartitionPT extends Ab
         {
             String cn = df.format( i );
             String filter = "(cn=test" + cn + ")";
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser
                 .parse( filter ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -425,7 +425,7 @@ public class HBasePartitionPT extends Ab
         {
             String cn = RandomStringUtils.randomNumeric( 4 );
             String filter = "(cn=test" + cn + ")";
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser
                 .parse( filter ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -448,7 +448,7 @@ public class HBasePartitionPT extends Ab
         {
             String cn = RandomStringUtils.randomNumeric( 4 );
             String filter = "(cn=test" + cn + "*)";
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser
                 .parse( filter ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -473,7 +473,7 @@ public class HBasePartitionPT extends Ab
             String cn = RandomStringUtils.randomNumeric( 4 );
             //String cn = "9999";
             String filter = "(cn=test" + cn + "*)";
-            EntryFilteringCursor cursor = session.search( new DN( "ou=test10000,o=hbase" ), SearchScope.SUBTREE,
+            EntryFilteringCursor cursor = session.search( new Dn( "ou=test10000,o=hbase" ), SearchScope.SUBTREE,
                 FilterParser.parse( filter ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -498,7 +498,7 @@ public class HBasePartitionPT extends Ab
         {
             String cn = RandomStringUtils.randomNumeric( 4 );
             String filter = "(cn=test*" + cn + "*)";
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser
                 .parse( filter ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();
@@ -524,7 +524,7 @@ public class HBasePartitionPT extends Ab
             //String cn = RandomStringUtils.randomNumeric( 4 );
             String cn = "9999";
             String filter = "(cn=*" + cn + "*)";
-            EntryFilteringCursor cursor = session.search( new DN( "o=hbase" ), SearchScope.SUBTREE, FilterParser
+            EntryFilteringCursor cursor = session.search( new Dn( "o=hbase" ), SearchScope.SUBTREE, FilterParser
                 .parse( filter ), AliasDerefMode.DEREF_ALWAYS, null );
 
             cursor.beforeFirst();

Modified: directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/mapreduce/LdifImportAndIndexIT.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/mapreduce/LdifImportAndIndexIT.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/mapreduce/LdifImportAndIndexIT.java (original)
+++ directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/it/mapreduce/LdifImportAndIndexIT.java Wed Jul 27 06:45:46 2011
@@ -153,7 +153,7 @@ public class LdifImportAndIndexIT extend
 
         //
         //        ClonedServerEntry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
-        //            new DN( "dc=example,dc=com" ) );
+        //            new Dn( "dc=example,dc=com" ) );
         //        assertNotNull( entry );
         //
         //dump();

Modified: directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseDistributedRunner.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseDistributedRunner.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseDistributedRunner.java (original)
+++ directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseDistributedRunner.java Wed Jul 27 06:45:46 2011
@@ -28,7 +28,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.partition.hbase.HBaseDistributedPartition;
 import org.apache.directory.server.core.partition.hbase.it.AbstractHBasePartitionIT;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -73,20 +73,20 @@ public class HBaseDistributedRunner exte
     {
         session = ldapServer.getDirectoryService().getAdminSession();
 
-        if ( !session.exists( new DN( "o=hbase" ) ) || !session.exists( new DN( "ou=test-ou,o=hbase" ) )
-            || !session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "o=hbase" ) ) || !session.exists( new Dn( "ou=test-ou,o=hbase" ) )
+            || !session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) )
         {
             AbstractHBasePartitionIT.createBasicTestData( ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test1000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test1000,o=hbase" ) ) )
         {
             AbstractHBasePartitionIT.createTestData( 1000, "000", ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test10000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test10000,o=hbase" ) ) )
         {
             AbstractHBasePartitionIT.createTestData( 10000, "0000", ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test100000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test100000,o=hbase" ) ) )
         {
             AbstractHBasePartitionIT.createTestData( 100000, "00000", ldapServer );
         }

Modified: directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseEmbeddedRunner.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseEmbeddedRunner.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseEmbeddedRunner.java (original)
+++ directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseEmbeddedRunner.java Wed Jul 27 06:45:46 2011
@@ -31,7 +31,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserColumnIndex;
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserRowIndex;
 import org.apache.directory.server.core.partition.hbase.it.AbstractHBasePartitionIT;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -87,20 +87,20 @@ public class HBaseEmbeddedRunner extends
     {
         session = ldapServer.getDirectoryService().getAdminSession();
 
-        if ( !session.exists( new DN( "o=hbase" ) ) || !session.exists( new DN( "ou=test-ou,o=hbase" ) )
-            || !session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "o=hbase" ) ) || !session.exists( new Dn( "ou=test-ou,o=hbase" ) )
+            || !session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) )
         {
             AbstractHBasePartitionIT.createBasicTestData( ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test1000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test1000,o=hbase" ) ) )
         {
             AbstractHBasePartitionIT.createTestData( 1000, "000", ldapServer );
         }
-//        if ( !session.exists( new DN( "ou=test10000,o=hbase" ) ) )
+//        if ( !session.exists( new Dn( "ou=test10000,o=hbase" ) ) )
 //        {
 //            AbstractHBasePartitionIT.createTestData( 10000, "0000", ldapServer );
 //        }
-//        if ( !session.exists( new DN( "ou=test100000,o=hbase" ) ) )
+//        if ( !session.exists( new Dn( "ou=test100000,o=hbase" ) ) )
 //        {
 //            AbstractHBasePartitionIT.createTestData( 100000, "00000", ldapServer );
 //        }

Modified: directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseRunner.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseRunner.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseRunner.java (original)
+++ directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/runner/HBaseRunner.java Wed Jul 27 06:45:46 2011
@@ -30,7 +30,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserColumnIndex;
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserRowIndex;
 import org.apache.directory.server.core.partition.hbase.it.AbstractHBasePartitionIT;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -75,16 +75,16 @@ public class HBaseRunner extends Abstrac
     @Before
     public void initTestData() throws Exception
     {
-        if ( !session.exists( new DN( "o=hbase" ) ) || !session.exists( new DN( "ou=test-ou,o=hbase" ) )
-            || !session.exists( new DN( "cn=test-person,ou=test-ou,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "o=hbase" ) ) || !session.exists( new Dn( "ou=test-ou,o=hbase" ) )
+            || !session.exists( new Dn( "cn=test-person,ou=test-ou,o=hbase" ) ) )
         {
             createBasicTestData( ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test1000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test1000,o=hbase" ) ) )
         {
             createTestData( 1000, "000", ldapServer );
         }
-        if ( !session.exists( new DN( "ou=test10000,o=hbase" ) ) )
+        if ( !session.exists( new Dn( "ou=test10000,o=hbase" ) ) )
         {
             createTestData( 10000, "0000", ldapServer );
         }

Modified: directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/suites/StockServerISuite.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/suites/StockServerISuite.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/suites/StockServerISuite.java (original)
+++ directory/sandbox/seelmann/hbase-partition-test/src/test/java/org/apache/directory/server/core/partition/hbase/suites/StockServerISuite.java Wed Jul 27 06:45:46 2011
@@ -28,7 +28,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.annotations.CreatePartition;
 import org.apache.directory.server.core.integ.FrameworkSuite;
 import org.apache.directory.server.operations.add.AddIT;
-import org.apache.directory.server.operations.add.AddingEntriesWithSpecialCharactersInRDNIT;
+import org.apache.directory.server.operations.add.AddingEntriesWithSpecialCharactersInRdnIT;
 import org.apache.directory.server.operations.bind.BindIT;
 import org.apache.directory.server.operations.bind.MiscBindIT;
 import org.apache.directory.server.operations.bind.SaslBindIT;
@@ -71,7 +71,7 @@ import org.junit.runners.Suite;
 @RunWith ( FrameworkSuite.class )
 @Ignore
 @Suite.SuiteClasses ( {
-        AddingEntriesWithSpecialCharactersInRDNIT.class,
+        AddingEntriesWithSpecialCharactersInRdnIT.class,
         AddIT.class,
 
         BindIT.class,

Modified: directory/sandbox/seelmann/hbase-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/pom.xml?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/pom.xml (original)
+++ directory/sandbox/seelmann/hbase-partition/pom.xml Wed Jul 27 06:45:46 2011
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>1.5.8-SNAPSHOT</version>
+    <version>2.0.0-M2-SNAPSHOT</version>
   </parent>
 
   <artifactId>apacheds-hbase-partition</artifactId>
@@ -43,6 +43,21 @@
     <!-- Dependencies to ApacheDS, for partition implementation -->
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-model</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-xdbm-partition</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>apacheds-core</artifactId>
+    </dependency>
+<!--
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
       <version>${org.apache.directory.shared.version}</version>
     </dependency>
@@ -64,8 +79,10 @@
       <groupId>${project.groupId}</groupId>
       <version>${project.version}</version>
     </dependency>
+-->
 
     <!-- HBase dependencies -->
+<!--
     <dependency>
       <artifactId>hbase</artifactId>
       <groupId>org.apache.hbase</groupId>
@@ -83,6 +100,7 @@
       <version>0.20.3-append-r964955-1240</version>
       <scope>test</scope>
     </dependency>
+-->
   </dependencies>
 
   <build>

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseDistributedPartition.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseDistributedPartition.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseDistributedPartition.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseDistributedPartition.java Wed Jul 27 06:45:46 2011
@@ -30,8 +30,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.impl.xdbm.AbstractXdbmPartition;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.search.impl.DefaultSearchEngine;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
 
 
 /**

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseEmbeddedPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseEmbeddedPartitionFactory.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseEmbeddedPartitionFactory.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseEmbeddedPartitionFactory.java Wed Jul 27 06:45:46 2011
@@ -27,8 +27,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.hbase.index.HBaseUserRowIndex;
 import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.name.Dn;
 
 
 /**
@@ -46,9 +46,9 @@ public class HBaseEmbeddedPartitionFacto
         HBaseEmbeddedPartition partition = new HBaseEmbeddedPartition();
         partition.setId( id );
         
-        DN suffixDN = new DN( suffix );
+        Dn suffixDn = new Dn( suffix );
         
-        partition.setSuffix( suffixDN );
+        partition.setSuffix( suffixDn );
         partition.setCacheSize( 500 );
         partition.setPartitionDir( workingDirectory );
         return partition;

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseStore.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseStore.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/HBaseStore.java Wed Jul 27 06:45:46 2011
@@ -36,11 +36,11 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.xdbm.AbstractStore;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 
@@ -108,7 +108,7 @@ public class HBaseStore extends Abstract
         {
             hbaseIndex = new HBasePresenceIndex( this );
         }
-        else if ( index.getAttributeId().equals( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
+        else if ( index.getAttributeId().equals( ApacheSchemaConstants.APACHE_Rdn_AT_OID ) )
         {
             hbaseIndex = new HBaseRdnIndex( this );
         }
@@ -190,12 +190,12 @@ public class HBaseStore extends Abstract
     }
 
 
-    public UUID getEntryId( DN dn ) throws Exception
+    public UUID getEntryId( Dn dn ) throws Exception
     {
         if ( !dn.isNormalized() )
         {
             dn.normalize( schemaManager.getNormalizerMapping() );
-            // TODO: force normalized DN
+            // TODO: force normalized Dn
             //throw new IllegalArgumentException( I18n.err( I18n.ERR_218, suffixDn.getName() ) );
         }
 
@@ -219,7 +219,7 @@ public class HBaseStore extends Abstract
 
 
     @Override
-    public void rename( DN dn, RDN newRdn, boolean deleteOldRdn, Entry entry ) throws Exception
+    public void rename( Dn dn, Rdn newRdn, boolean deleteOldRdn, Entry entry ) throws Exception
     {
         super.rename( dn, newRdn, deleteOldRdn, entry );
 
@@ -229,7 +229,7 @@ public class HBaseStore extends Abstract
 
 
     @Override
-    public void moveAndRename( DN oldChildDn, DN newParentDn, RDN newRdn, Entry entry, boolean deleteOldRdn )
+    public void moveAndRename( Dn oldChildDn, Dn newParentDn, Rdn newRdn, Entry entry, boolean deleteOldRdn )
         throws Exception
     {
         UUID id = getEntryId( oldChildDn );
@@ -242,7 +242,7 @@ public class HBaseStore extends Abstract
 
 
     @Override
-    public void move( DN oldChildDn, DN newParentDn, DN newDn, Entry entry ) throws Exception
+    public void move( Dn oldChildDn, Dn newParentDn, Dn newDn, Entry entry ) throws Exception
     {
         super.move( oldChildDn, newParentDn, newDn, entry );
 

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/Utils.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/Utils.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/Utils.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/Utils.java Wed Jul 27 06:45:46 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import java.util.UUID;
 
 import org.apache.directory.server.xdbm.search.impl.SubstringEvaluator;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
-import org.apache.directory.shared.ldap.util.StringTools;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
+import org.apache.directory.shared.util.Strings;
 import org.apache.hadoop.hbase.util.Bytes;
 
 
@@ -51,7 +51,7 @@ public class Utils
             else
             {
                 sb.append( "0x" );
-                sb.append( StringTools.toHexString( new byte[]
+                sb.append( Strings.toHexString( new byte[]
                     { b } ) );
                 sb.append( "" );
             }

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/AbstractHBaseCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/AbstractHBaseCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/AbstractHBaseCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/AbstractHBaseCursor.java Wed Jul 27 06:45:46 2011
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
 
 import java.util.Iterator;
 
-import org.apache.directory.shared.ldap.cursor.AbstractCursor;
-import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
+import org.apache.directory.shared.ldap.model.cursor.Cursor;
 
 
 /**

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/BaseHBaseIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/BaseHBaseIndexCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/BaseHBaseIndexCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/BaseHBaseIndexCursor.java Wed Jul 27 06:45:46 2011
@@ -27,7 +27,7 @@ import java.util.UUID;
 import org.apache.directory.server.core.partition.hbase.HBaseStore;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/EmptyIndexCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/EmptyIndexCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/EmptyIndexCursor.java Wed Jul 27 06:45:46 2011
@@ -25,8 +25,8 @@ import java.util.UUID;
 
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
-import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 
 
 /**

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseOneLevelIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseOneLevelIndexCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseOneLevelIndexCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseOneLevelIndexCursor.java Wed Jul 27 06:45:46 2011
@@ -26,8 +26,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.hbase.Utils;
 import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.filter.Filter;

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBasePresenceIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBasePresenceIndexCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBasePresenceIndexCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBasePresenceIndexCursor.java Wed Jul 27 06:45:46 2011
@@ -25,7 +25,7 @@ import java.util.UUID;
 import org.apache.directory.server.core.partition.hbase.Utils;
 import org.apache.directory.server.core.partition.hbase.table.HBasePresenceIndexTable;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseSubLevelIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseSubLevelIndexCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseSubLevelIndexCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseSubLevelIndexCursor.java Wed Jul 27 06:45:46 2011
@@ -31,13 +31,13 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.hbase.Utils;
 import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.filter.AndNode;
-import org.apache.directory.shared.ldap.filter.EqualityNode;
-import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.filter.LeafNode;
-import org.apache.directory.shared.ldap.filter.OrNode;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.filter.AndNode;
+import org.apache.directory.shared.ldap.model.filter.EqualityNode;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.LeafNode;
+import org.apache.directory.shared.ldap.model.filter.OrNode;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.filter.BinaryComparator;

Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserColumnIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserColumnIndexCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserColumnIndexCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserColumnIndexCursor.java Wed Jul 27 06:45:46 2011
@@ -31,8 +31,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.hbase.table.HBaseColumnIndexTable;
 import org.apache.directory.server.core.partition.hbase.table.HBaseIndexTable;
 import org.apache.directory.server.xdbm.ForwardIndexEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Scan;



Mime
View raw message