You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2011/07/27 08:45:59 UTC
svn commit: r1151353 [2/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...
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserIndexCursor.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/HBaseUserIndexCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserIndexCursor.java Wed Jul 27 06:45:46 2011
@@ -24,8 +24,8 @@ import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.xdbm.IndexEntry;
-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;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserIndexReverseCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserIndexReverseCursor.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/HBaseUserIndexReverseCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserIndexReverseCursor.java Wed Jul 27 06:45:46 2011
@@ -28,8 +28,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.hadoop.hbase.util.Bytes;
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserRowIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserRowIndexCursor.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/HBaseUserRowIndexCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/cursor/HBaseUserRowIndexCursor.java Wed Jul 27 06:45:46 2011
@@ -28,8 +28,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.hbase.table.HBaseIndexTable;
import org.apache.directory.server.core.partition.hbase.table.HBaseRowIndexTable;
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.Scan;
import org.apache.hadoop.hbase.filter.Filter;
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/AbstractHBaseIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/AbstractHBaseIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/AbstractHBaseIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/AbstractHBaseIndex.java Wed Jul 27 06:45:46 2011
@@ -26,8 +26,8 @@ import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseAliasIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseAliasIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseAliasIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseAliasIndex.java Wed Jul 27 06:45:46 2011
@@ -23,9 +23,9 @@ package org.apache.directory.server.core
import java.util.UUID;
import org.apache.directory.server.constants.ApacheSchemaConstants;
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
+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.entry.Attribute;
/**
@@ -51,7 +51,7 @@ public class HBaseAliasIndex extends HBa
{
return null;
}
- EntryAttribute attribute = entry.get( SchemaConstants.ALIASED_OBJECT_NAME_AT_OID );
+ Attribute attribute = entry.get( SchemaConstants.ALIASED_OBJECT_NAME_AT_OID );
if ( attribute == null )
{
return null;
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseOneLevelIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseOneLevelIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseOneLevelIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseOneLevelIndex.java Wed Jul 27 06:45:46 2011
@@ -25,8 +25,8 @@ import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.core.partition.hbase.cursor.HBaseOneLevelIndexCursor;
import org.apache.directory.server.core.partition.hbase.xdbmext.IndexFilteringExtension;
-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;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBasePresenceIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBasePresenceIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBasePresenceIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBasePresenceIndex.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.core.partition.hbase.cursor.HBasePresenceIndexCursor;
import org.apache.directory.server.core.partition.hbase.table.HBasePresenceIndexTable;
-import org.apache.directory.shared.ldap.entry.Entry;
+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/index/HBaseRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseRdnIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseRdnIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseRdnIndex.java Wed Jul 27 06:45:46 2011
@@ -25,9 +25,9 @@ import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable.MasterTreeInfo;
import org.apache.directory.server.xdbm.ParentIdAndRdn;
-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.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.name.Rdn;
/**
@@ -59,14 +59,14 @@ public class HBaseRdnIndex extends Abstr
@Override
public void add( ParentIdAndRdn<UUID> attrVal, UUID id ) throws Exception
{
- // do nothing, RDN index is maintained by master table
+ // do nothing, Rdn index is maintained by master table
}
@Override
public void drop( UUID id ) throws Exception
{
- // do nothing, RDN index is maintained by master table
+ // do nothing, Rdn index is maintained by master table
}
@@ -74,7 +74,7 @@ public class HBaseRdnIndex extends Abstr
public ParentIdAndRdn<UUID> reverseLookup( UUID id ) throws Exception
{
MasterTreeInfo mti = store.getMasterTable().fetchMasterTreeInfo( id );
- DN dn = new DN( mti.upName );
+ Dn dn = new Dn( mti.upName );
dn.normalize( store.getSchemaManager().getNormalizerMapping() );
ParentIdAndRdn<UUID> piar = new ParentIdAndRdn<UUID>( mti.parentId, dn.getRdns() );
return piar;
@@ -93,7 +93,7 @@ public class HBaseRdnIndex extends Abstr
normName += ",";
upName += ",";
}
- RDN rdn = key.getRdns()[i];
+ Rdn rdn = key.getRdns()[i];
normName += rdn.getNormName();
upName += rdn.getName();
}
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseSubLevelIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseSubLevelIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseSubLevelIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseSubLevelIndex.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.cursor.HBaseSubLevelIndexCursor;
import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable;
import org.apache.directory.server.core.partition.hbase.xdbmext.IndexFilteringExtension;
-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;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserColumnIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserColumnIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserColumnIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserColumnIndex.java Wed Jul 27 06:45:46 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
import org.apache.directory.server.core.partition.hbase.cursor.HBaseUserColumnIndexCursor;
import org.apache.directory.server.core.partition.hbase.table.HBaseColumnIndexTable;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserIndex.java Wed Jul 27 06:45:46 2011
@@ -27,10 +27,10 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.hbase.table.HBaseIndexTable;
import org.apache.directory.server.core.partition.hbase.xdbmext.IndexSubstringExtension;
import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
import org.apache.hadoop.hbase.util.Bytes;
@@ -164,7 +164,7 @@ public abstract class HBaseUserIndex<T e
{
return null;
}
- EntryAttribute attribute = entry.get( attributeId );
+ Attribute attribute = entry.get( attributeId );
if ( attribute == null )
{
return null;
@@ -274,7 +274,7 @@ public abstract class HBaseUserIndex<T e
public void drop( UUID id ) throws Exception
{
Entry entry = store.lookup( id );
- EntryAttribute attribute = entry.get( attributeId );
+ Attribute attribute = entry.get( attributeId );
for ( Value<?> value : attribute )
{
drop( value.get(), id );
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserRowIndex.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserRowIndex.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserRowIndex.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/index/HBaseUserRowIndex.java Wed Jul 27 06:45:46 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
import org.apache.directory.server.core.partition.hbase.cursor.HBaseUserRowIndexCursor;
import org.apache.directory.server.core.partition.hbase.table.HBaseRowIndexTable;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/IndexBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/IndexBuilder.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/IndexBuilder.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/IndexBuilder.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.index.HBaseUserRowIndex;
import org.apache.directory.server.core.partition.hbase.table.HBaseIndexTable;
import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader;
-import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.schema.loader.ldif.JarLdifSchemaLoader;
+import org.apache.directory.shared.ldap.model.schema.manager.impl.DefaultSchemaManager;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.mapreduce.TableMapper;
@@ -77,7 +77,7 @@ public class IndexBuilder extends TableM
SchemaManager schemaManager = new DefaultSchemaManager( schemaLoader );
schemaManager.loadAllEnabled();
- DN suffixDn = new DN( context.getConfiguration().get( SUFFIX ) );
+ Dn suffixDn = new Dn( context.getConfiguration().get( SUFFIX ) );
suffixDn.normalize( schemaManager.getNormalizerMapping() );
store = new HBaseStore();
@@ -150,7 +150,7 @@ public class IndexBuilder extends TableM
Entry entry = store.getMasterTable().convertToServerEntry( id, result );
// write index tables
- for ( EntryAttribute attribute : entry )
+ for ( Attribute attribute : entry )
{
String attr = attribute.getId();
String oid = store.getSchemaManager().getAttributeTypeRegistry().getOidByName( attr );
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/LdifImporter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/LdifImporter.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/LdifImporter.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/LdifImporter.java Wed Jul 27 06:45:46 2011
@@ -25,21 +25,21 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.directory.server.constants.ServerDNConstants;
+import org.apache.directory.server.constants.ServerDnConstants;
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable;
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.csn.CsnFactory;
-import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
+import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.ldif.LdapLdifException;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.loader.ldif.JarLdifSchemaLoader;
-import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.util.DateUtils;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.schema.loader.ldif.JarLdifSchemaLoader;
+import org.apache.directory.shared.ldap.model.schema.manager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.DateUtils;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapreduce.Mapper;
@@ -83,7 +83,7 @@ public class LdifImporter extends Mapper
SchemaManager schemaManager = new DefaultSchemaManager( schemaLoader );
schemaManager.loadAllEnabled();
- DN suffixDn = new DN( context.getConfiguration().get( SUFFIX ) );
+ Dn suffixDn = new Dn( context.getConfiguration().get( SUFFIX ) );
suffixDn.normalize( schemaManager.getNormalizerMapping() );
store = new HBaseStore();
@@ -137,7 +137,7 @@ public class LdifImporter extends Mapper
{
if ( ldifEntry.isEntry() )
{
- DN dn = ldifEntry.getDn();
+ Dn dn = ldifEntry.getDn();
int size = dn.size();
if ( size == count )
{
@@ -165,7 +165,7 @@ public class LdifImporter extends Mapper
// add operational attributes
entry.put( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
entry.put( SchemaConstants.ENTRY_CSN_AT, CSN_FACTORY.newInstance().toString() );
- entry.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN_NORMALIZED );
+ entry.put( SchemaConstants.CREATORS_NAME_AT, ServerDnConstants.ADMIN_SYSTEM_Dn_NORMALIZED );
entry.put( SchemaConstants.CREATE_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
// write to HBase
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/TreeTableBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/TreeTableBuilder.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/TreeTableBuilder.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/mapreduce/TreeTableBuilder.java Wed Jul 27 06:45:46 2011
@@ -27,11 +27,11 @@ import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.core.partition.hbase.Utils;
import org.apache.directory.server.core.partition.hbase.table.HBaseMasterTable;
-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.schema.loader.ldif.JarLdifSchemaLoader;
-import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
+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.directory.shared.ldap.model.schema.loader.ldif.JarLdifSchemaLoader;
+import org.apache.directory.shared.ldap.model.schema.manager.impl.DefaultSchemaManager;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.mapreduce.TableMapper;
@@ -70,7 +70,7 @@ public class TreeTableBuilder extends Ta
SchemaManager schemaManager = new DefaultSchemaManager( schemaLoader );
schemaManager.loadAllEnabled();
- DN suffixDn = new DN( context.getConfiguration().get( SUFFIX ) );
+ Dn suffixDn = new Dn( context.getConfiguration().get( SUFFIX ) );
suffixDn.normalize( schemaManager.getNormalizerMapping() );
store = new HBaseStore();
@@ -124,9 +124,9 @@ public class TreeTableBuilder extends Ta
UUID parentId = Utils.toUUID( result.getValue( HBaseMasterTable.TREE_INFO_FAMILY,
HBaseMasterTable.PARENT_ID_QUALIFIER ) );
String normRdn = Bytes.toString( result.getValue( HBaseMasterTable.TREE_INFO_FAMILY,
- HBaseMasterTable.NORM_RDN_QUALIFIER ) );
+ HBaseMasterTable.NORM_Rdn_QUALIFIER ) );
String upRdn = Bytes.toString( result.getValue( HBaseMasterTable.TREE_INFO_FAMILY,
- HBaseMasterTable.UP_RDN_QUALIFIER ) );
+ HBaseMasterTable.UP_Rdn_QUALIFIER ) );
HBaseMasterTable.MasterTreeInfo mti = new HBaseMasterTable.MasterTreeInfo( parentId, normRdn, upRdn );
store.getMasterTable().putToTree( id, mti, entry, true );
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseColumnIndexTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseColumnIndexTable.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseColumnIndexTable.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseColumnIndexTable.java Wed Jul 27 06:45:46 2011
@@ -29,10 +29,10 @@ import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.Cache;
import org.apache.directory.server.core.partition.hbase.Utils;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.util.Base64;
-import org.apache.directory.shared.ldap.util.ByteBuffer;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.shared.util.Base64;
+import org.apache.directory.shared.util.ByteBuffer;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableBase.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableBase.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableBase.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableBase.java Wed Jul 27 06:45:46 2011
@@ -23,10 +23,10 @@ package org.apache.directory.server.core
import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.Cache;
-import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.entry.BinaryValue;
+import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTable.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTable.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTable.java Wed Jul 27 06:45:46 2011
@@ -31,20 +31,20 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.core.partition.hbase.Utils;
import org.apache.directory.server.xdbm.MasterTable;
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.cursor.Tuple;
-import org.apache.directory.shared.ldap.entry.BinaryValue;
-import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.StringValue;
-import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.name.RDN;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.Tuple;
+import org.apache.directory.shared.ldap.model.entry.BinaryValue;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.StringValue;
+import org.apache.directory.shared.ldap.model.entry.Value;
+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.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Get;
@@ -57,7 +57,7 @@ import org.apache.hadoop.hbase.util.Byte
/**
* The master table stores all relevant information of an entry:
- * its parent, its user provided RDN, and its user provided attributes
+ * its parent, its user provided Rdn, and its user provided attributes
* and values.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -71,8 +71,8 @@ public class HBaseMasterTable implements
public static final byte[] TREE_INFO_FAMILY = Bytes.toBytes( "treeInfo" );
public static final byte[] ID_QUALIFIER = Bytes.toBytes( "id" );
public static final byte[] PARENT_ID_QUALIFIER = Bytes.toBytes( "parentId" );
- public static final byte[] UP_RDN_QUALIFIER = Bytes.toBytes( "upRdn" );
- public static final byte[] NORM_RDN_QUALIFIER = Bytes.toBytes( "normRdn" );
+ public static final byte[] UP_Rdn_QUALIFIER = Bytes.toBytes( "upRdn" );
+ public static final byte[] NORM_Rdn_QUALIFIER = Bytes.toBytes( "normRdn" );
public static final byte[] STATUS_QUALIFIER = Bytes.toBytes( "status" );
public static final byte[] EXISTS =
{ 'e' };
@@ -103,7 +103,7 @@ public class HBaseMasterTable implements
private Configuration configuration;
private boolean maintainCounters;
private SchemaManager schemaManager;
- private DN suffixDn;
+ private Dn suffixDn;
private HBaseTablePool masterTablePool;
private String masterTableName;
@@ -123,8 +123,8 @@ public class HBaseMasterTable implements
/** id -> sub level count */
private Cache<UUID, Long> subLevelCountCache;
- /** id -> DN */
- private Cache<UUID, DN> dnCache;
+ /** id -> Dn */
+ private Cache<UUID, Dn> dnCache;
/** id -> entry */
private Cache<UUID, Entry> entryCache;
@@ -143,7 +143,7 @@ public class HBaseMasterTable implements
this.entryCache = new Cache<UUID, Entry>( store.getCacheSize() );
int dnCacheSize = Math.max( store.getCacheSize(), store.getNdnIndex().getCacheSize() );
- this.dnCache = new Cache<UUID, DN>( dnCacheSize );
+ this.dnCache = new Cache<UUID, Dn>( dnCacheSize );
this.mtiCache = new Cache<UUID, MasterTreeInfo>( dnCacheSize );
this.idCache = new Cache<String, UUID>( dnCacheSize );
@@ -207,9 +207,9 @@ public class HBaseMasterTable implements
Put masterPut = new Put( Utils.toBytes( id ) );
masterPut.add( TREE_INFO_FAMILY, STATUS_QUALIFIER, EXISTS );
masterPut.add( TREE_INFO_FAMILY, PARENT_ID_QUALIFIER, Utils.toBytes( mti.parentId ) );
- masterPut.add( TREE_INFO_FAMILY, UP_RDN_QUALIFIER, Bytes.toBytes( mti.upName ) );
- masterPut.add( TREE_INFO_FAMILY, NORM_RDN_QUALIFIER, Bytes.toBytes( mti.normName ) );
- for ( EntryAttribute attribute : entry )
+ masterPut.add( TREE_INFO_FAMILY, UP_Rdn_QUALIFIER, Bytes.toBytes( mti.upName ) );
+ masterPut.add( TREE_INFO_FAMILY, NORM_Rdn_QUALIFIER, Bytes.toBytes( mti.normName ) );
+ for ( Attribute attribute : entry )
{
String attr = attribute.getUpId();
for ( int i = 0; i < attribute.size(); i++ )
@@ -233,7 +233,7 @@ public class HBaseMasterTable implements
Put treePut = new Put( mti.treeTableKey );
treePut.add( TREE_INFO_FAMILY, STATUS_QUALIFIER, EXISTS );
treePut.add( TREE_INFO_FAMILY, ID_QUALIFIER, Utils.toBytes( id ) );
- for ( EntryAttribute attribute : entry )
+ for ( Attribute attribute : entry )
{
String attrOid = attribute.getAttributeType().getOid();
for ( int i = 0; i < attribute.size(); i++ )
@@ -347,7 +347,7 @@ public class HBaseMasterTable implements
}
- public void move( UUID id, UUID newParentId, RDN newRdn ) throws Exception
+ public void move( UUID id, UUID newParentId, Rdn newRdn ) throws Exception
{
MasterTreeInfo oldMti = fetchMasterTreeInfo( id );
MasterTreeInfo newMti = new MasterTreeInfo( oldMti.parentId, oldMti.normName, oldMti.upName );
@@ -363,8 +363,8 @@ public class HBaseMasterTable implements
// master:treeInfo: set new parentId, upRdn and normRdn
Put masterPut = new Put( Utils.toBytes( id ) );
masterPut.add( TREE_INFO_FAMILY, PARENT_ID_QUALIFIER, Utils.toBytes( newMti.parentId ) );
- masterPut.add( TREE_INFO_FAMILY, UP_RDN_QUALIFIER, Bytes.toBytes( newMti.upName ) );
- masterPut.add( TREE_INFO_FAMILY, NORM_RDN_QUALIFIER, Bytes.toBytes( newMti.normName ) );
+ masterPut.add( TREE_INFO_FAMILY, UP_Rdn_QUALIFIER, Bytes.toBytes( newMti.upName ) );
+ masterPut.add( TREE_INFO_FAMILY, NORM_Rdn_QUALIFIER, Bytes.toBytes( newMti.normName ) );
HBaseTableHelper.put( getMasterTablePool(), masterTableName, masterPut );
// tree: delete old row, add new row
@@ -476,10 +476,10 @@ public class HBaseMasterTable implements
public Entry convertToServerEntry( UUID id, Result result ) throws Exception
{
UUID parentId = Utils.toUUID( result.getValue( TREE_INFO_FAMILY, PARENT_ID_QUALIFIER ) );
- String normRdn = Bytes.toString( result.getValue( TREE_INFO_FAMILY, NORM_RDN_QUALIFIER ) );
- String upRdn = Bytes.toString( result.getValue( TREE_INFO_FAMILY, UP_RDN_QUALIFIER ) );
+ String normRdn = Bytes.toString( result.getValue( TREE_INFO_FAMILY, NORM_Rdn_QUALIFIER ) );
+ String upRdn = Bytes.toString( result.getValue( TREE_INFO_FAMILY, UP_Rdn_QUALIFIER ) );
MasterTreeInfo mti = new MasterTreeInfo( parentId, normRdn, upRdn );
- DN dn = fetchDn( id, mti );
+ Dn dn = fetchDn( id, mti );
NavigableMap<byte[], byte[]> attributesMap = result.getFamilyMap( UP_ATTRIBUTES_FAMILY );
Entry entry = new DefaultEntry( schemaManager, dn );
@@ -493,11 +493,11 @@ public class HBaseMasterTable implements
byte[] qualifier = attributeEntry.getKey();
String attributeDescription = Bytes.toString( attributeEntry.getKey(), 0, qualifier.length - 4 );
- EntryAttribute attribute = entry.get( attributeDescription );
+ Attribute attribute = entry.get( attributeDescription );
AttributeType attributeType = schemaManager.getAttributeTypeRegistry().lookup( attributeDescription );
if ( attribute == null )
{
- attribute = new DefaultEntryAttribute( attributeDescription, attributeType );
+ attribute = new DefaultAttribute( attributeDescription, attributeType );
entry.add( attribute );
}
Value<?> value;
@@ -515,15 +515,15 @@ public class HBaseMasterTable implements
}
- private DN fetchDn( UUID id, MasterTreeInfo mti ) throws Exception
+ private Dn fetchDn( UUID id, MasterTreeInfo mti ) throws Exception
{
- DN dn = dnCache.get( id );
+ Dn dn = dnCache.get( id );
if ( dn != null )
{
return dn;
}
- // build DN, only normalize the RDN part, the parent is already normalized
+ // build Dn, only normalize the Rdn part, the parent is already normalized
StringBuffer sb = new StringBuffer();
do
{
@@ -535,10 +535,10 @@ public class HBaseMasterTable implements
}
}
while ( mti != null );
- dn = new DN( sb.toString() );
+ dn = new Dn( sb.toString() );
dn.normalize( schemaManager.getAttributeTypeRegistry().getNormalizerMapping() );
- // put DN to cache
+ // put Dn to cache
dnCache.put( id, dn );
return dn;
@@ -548,11 +548,11 @@ public class HBaseMasterTable implements
/**
* Gets the ID of the given entry.
*
- * @param id the entry DN
+ * @param id the entry Dn
* @return the entry ID, null if entry doesn't exist.
* @throws Exception
*/
- public UUID fetchId( DN dn ) throws Exception
+ public UUID fetchId( Dn dn ) throws Exception
{
if ( dn == null )
{
@@ -670,7 +670,7 @@ public class HBaseMasterTable implements
}
- private List<UUID> fetchParentIds( DN dn, boolean includeChild ) throws Exception
+ private List<UUID> fetchParentIds( Dn dn, boolean includeChild ) throws Exception
{
if ( !dn.isChildOf( suffixDn ) )
{
@@ -691,7 +691,7 @@ public class HBaseMasterTable implements
int stop = includeChild ? dn.size() : dn.size() - 1;
for ( int i = suffixDn.size(); i < stop; i++ )
{
- RDN rdn = dn.getRdn( i );
+ Rdn rdn = dn.getRdn( i );
MasterTreeInfo mti = new MasterTreeInfo( parentId, rdn.getNormName(), null );
parentId = fetchId( mti );
if ( parentId == null )
@@ -784,8 +784,8 @@ public class HBaseMasterTable implements
return null;
}
UUID parentId = Utils.toUUID( result.getValue( TREE_INFO_FAMILY, PARENT_ID_QUALIFIER ) );
- String normRdn = Bytes.toString( result.getValue( TREE_INFO_FAMILY, NORM_RDN_QUALIFIER ) );
- String upRdn = Bytes.toString( result.getValue( TREE_INFO_FAMILY, UP_RDN_QUALIFIER ) );
+ String normRdn = Bytes.toString( result.getValue( TREE_INFO_FAMILY, NORM_Rdn_QUALIFIER ) );
+ String upRdn = Bytes.toString( result.getValue( TREE_INFO_FAMILY, UP_Rdn_QUALIFIER ) );
mti = new MasterTreeInfo( parentId, normRdn, upRdn );
mtiCache.put( id, mti );
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBasePresenceIndexTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBasePresenceIndexTable.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBasePresenceIndexTable.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBasePresenceIndexTable.java Wed Jul 27 06:45:46 2011
@@ -26,7 +26,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.core.partition.hbase.Utils;
import org.apache.directory.server.core.partition.hbase.cursor.HBasePresenceIndexCursor;
-import org.apache.directory.shared.ldap.util.ByteBuffer;
+import org.apache.directory.shared.util.ByteBuffer;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.ResultScanner;
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseRowIndexTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseRowIndexTable.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseRowIndexTable.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/table/HBaseRowIndexTable.java Wed Jul 27 06:45:46 2011
@@ -26,9 +26,9 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.hbase.Utils;
import org.apache.directory.server.core.partition.hbase.index.HBaseUserIndex;
import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.util.ByteBuffer;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.util.ByteBuffer;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedCursorBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedCursorBuilder.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedCursorBuilder.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedCursorBuilder.java Wed Jul 27 06:45:46 2011
@@ -25,12 +25,12 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.search.impl.CursorBuilder;
import org.apache.directory.server.xdbm.search.impl.OneLevelScopeEvaluator;
import org.apache.directory.server.xdbm.search.impl.SubtreeScopeEvaluator;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.filter.AndNode;
-import org.apache.directory.shared.ldap.filter.AssertionType;
-import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.filter.ScopeNode;
-import org.apache.directory.shared.ldap.filter.SearchScope;
+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.AssertionType;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.ScopeNode;
+import org.apache.directory.shared.ldap.model.message.SearchScope;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedEvaluatorBuilder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedEvaluatorBuilder.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedEvaluatorBuilder.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedEvaluatorBuilder.java Wed Jul 27 06:45:46 2011
@@ -23,11 +23,11 @@ package org.apache.directory.server.core
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.Evaluator;
import org.apache.directory.server.xdbm.search.impl.EvaluatorBuilder;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.filter.AssertionType;
-import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.filter.AssertionType;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java Wed Jul 27 06:45:46 2011
@@ -26,10 +26,10 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.impl.OneLevelScopeEvaluator;
-import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java Wed Jul 27 06:45:46 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.impl.DefaultOptimizer;
-import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java Wed Jul 27 06:45:46 2011
@@ -26,8 +26,8 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+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/xdbmext/ExtendedSubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java Wed Jul 27 06:45:46 2011
@@ -27,16 +27,16 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.Evaluator;
-import org.apache.directory.shared.ldap.cursor.Cursor;
-import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
-import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.schema.MatchingRule;
-import org.apache.directory.shared.ldap.schema.Normalizer;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
+import org.apache.directory.shared.ldap.model.cursor.Cursor;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.schema.normalizers.NoOpNormalizer;
/**
@@ -247,7 +247,7 @@ public class ExtendedSubstringEvaluator<
private boolean evaluateWithoutIndex( Entry entry ) throws Exception
{
// get the attribute
- EntryAttribute attr = entry.get( type );
+ Attribute attr = entry.get( type );
// if the attribute exists and the pattern matches return true
if ( attr != null )
@@ -339,7 +339,7 @@ public class ExtendedSubstringEvaluator<
*/
// get the attribute
- EntryAttribute attr = entry.get( type );
+ Attribute attr = entry.get( type );
// if the attribute exists and the pattern matches return true
if ( attr != null )
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java Wed Jul 27 06:45:46 2011
@@ -27,9 +27,9 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.impl.AllEntriesCursor;
import org.apache.directory.server.xdbm.search.impl.SubtreeScopeEvaluator;
-import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
+import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexFilteringExtension.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexFilteringExtension.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexFilteringExtension.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexFilteringExtension.java Wed Jul 27 06:45:46 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexSubstringExtension.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexSubstringExtension.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexSubstringExtension.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/IndexSubstringExtension.java Wed Jul 27 06:45:46 2011
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexCursor;
-import org.apache.directory.shared.ldap.filter.SubstringNode;
+import org.apache.directory.shared.ldap.model.filter.SubstringNode;
/**
Modified: directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/AbstractHBaseTableTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/AbstractHBaseTableTest.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/AbstractHBaseTableTest.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/AbstractHBaseTableTest.java Wed Jul 27 06:45:46 2011
@@ -26,16 +26,16 @@ import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.shared.ldap.csn.CsnFactory;
-import org.apache.directory.shared.ldap.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
+import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.name.DN;
-import org.apache.directory.shared.ldap.schema.SchemaManager;
-import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
-import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
-import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
-import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.shared.ldap.model.schema.ldif.extractor.SchemaLdifExtractor;
+import org.apache.directory.shared.ldap.model.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.shared.ldap.model.schema.loader.ldif.LdifSchemaLoader;
+import org.apache.directory.shared.ldap.model.schema.manager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.LdapExceptionUtils;
import org.junit.BeforeClass;
@@ -50,7 +50,7 @@ public abstract class AbstractHBaseTable
protected static final String TABLE_PREFIX = "apacheds_test_";
protected static final CsnFactory CSN_FACTORY = new CsnFactory( 0 );
protected static SchemaManager schemaManager;
- protected static DN suffixDn;
+ protected static Dn suffixDn;
protected static String workingDirectory;
protected static final UUID CONTEXT_ENTRY_ID = UUID.fromString( "00000000-0000-0000-0000-000000000001" );
@@ -86,7 +86,7 @@ public abstract class AbstractHBaseTable
fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) );
}
- suffixDn = new DN( "o=Good Times Co." );
+ suffixDn = new Dn( "o=Good Times Co." );
suffixDn.normalize( schemaManager.getNormalizerMapping() );
}
@@ -106,7 +106,7 @@ public abstract class AbstractHBaseTable
protected Entry buildOuSalesEntry() throws LdapException
{
- DN dn = new DN( "ou=Sales \\E6\\97\\A5\\E6\\9C\\AC,o=Good Times Co." );
+ Dn dn = new Dn( "ou=Sales \\E6\\97\\A5\\E6\\9C\\AC,o=Good Times Co." );
dn.normalize( schemaManager.getNormalizerMapping() );
Entry entry = new DefaultEntry( schemaManager, dn );
entry.add( "objectClass", "top", "organizationalUnit" );
@@ -121,7 +121,7 @@ public abstract class AbstractHBaseTable
protected Entry buildCnJohnnyWalkerEntry() throws LdapException
{
- DN dn = new DN(
+ Dn dn = new Dn(
"cn=JOhnny \\E6\\97\\A5\\E6\\9C\\AC WAlkeR,ou=Sales \\E6\\97\\A5\\E6\\9C\\AC,o=Good Times Co." );
dn.normalize( schemaManager.getNormalizerMapping() );
Entry entry = new DefaultEntry( schemaManager, dn );
Modified: directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableTest.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableTest.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseIndexTableTest.java Wed Jul 27 06:45:46 2011
@@ -33,7 +33,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.hbase.Utils;
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.Entry;
+import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HBaseAdmin;
Modified: directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTableTest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTableTest.java?rev=1151353&r1=1151352&r2=1151353&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTableTest.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/test/java/org/apache/directory/server/core/partition/hbase/table/HBaseMasterTableTest.java Wed Jul 27 06:45:46 2011
@@ -30,9 +30,9 @@ import java.util.UUID;
import org.apache.directory.server.core.partition.hbase.HBaseStore;
import org.apache.directory.server.core.partition.hbase.Utils;
-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.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.name.Rdn;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HBaseAdmin;
@@ -102,7 +102,7 @@ public class HBaseMasterTableTest extend
@Test
public void testEmpty() throws Exception
{
- assertNull( masterTable.fetchId( new DN( "a=b" ) ) );
+ assertNull( masterTable.fetchId( new Dn( "a=b" ) ) );
}
@@ -282,7 +282,7 @@ public class HBaseMasterTableTest extend
masterTable.add( entry );
// rename
- RDN rdn = new RDN( "ou=SaLeS-US" );
+ Rdn rdn = new Rdn( "ou=SaLeS-US" );
rdn.normalize( schemaManager.getNormalizerMapping() );
masterTable.move( OU_SALES_ID, null, rdn );
@@ -381,8 +381,8 @@ public class HBaseMasterTableTest extend
assertNull( masterTable.fetchId( ouSalesEntry.getDn() ) );
// fetch entry IDs of non-existing entries
- assertNull( masterTable.fetchId( ( DN ) null ) );
- assertNull( masterTable.fetchId( new DN( "a=b" ) ) );
+ assertNull( masterTable.fetchId( ( Dn ) null ) );
+ assertNull( masterTable.fetchId( new Dn( "a=b" ) ) );
}