You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/05/29 01:53:48 UTC
svn commit: r779799 - in /directory/apacheds/trunk:
bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/
core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
jdbm-store/src/main/java/org/apache/dir...
Author: elecharny
Date: Thu May 28 23:53:47 2009
New Revision: 779799
URL: http://svn.apache.org/viewvc?rev=779799&view=rev
Log:
o Removed the first parameter (DN) in the Store.add( dn, entry ) method, as the DN is already part of the entry. Reflected the change in all the code.
Modified:
directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java (original)
+++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java Thu May 28 23:53:47 2009
@@ -225,7 +225,7 @@
entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC );
entry.get( SchemaConstants.OBJECT_CLASS_AT ).add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
entry.put( SchemaConstants.OU_AT, "schema" );
- store.add( dn, entry );
+ store.add( entry );
}
createSchemasAndContainers();
@@ -387,7 +387,7 @@
ServerEntry entry = attributesFactory.getAttributes( schema, registries );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
dn = ( LdapDN ) dn.clone();
@@ -472,7 +472,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + at.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
}
getLog().info( "" );
@@ -503,7 +503,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + oc.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
}
getLog().info( "" );
@@ -534,7 +534,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + mr.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
}
getLog().info( "" );
@@ -566,7 +566,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + oid );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
}
getLog().info( "" );
}
@@ -597,7 +597,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + oid );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
}
getLog().info( "" );
@@ -627,7 +627,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + syntax.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
}
getLog().info( "" );
}
@@ -657,7 +657,7 @@
dn.add( MetaSchemaConstants.M_OID_AT + "=" + syntaxChecker.getSyntaxOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
}
getLog().info( "" );
@@ -700,7 +700,7 @@
rootEntry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC,
SchemaConstants.ORGANIZATIONAL_UNIT_OC );
rootEntry.put( SchemaConstants.OU_AT, "schema" );
- store.add( dn, rootEntry );
+ store.add( rootEntry );
}
catch ( Exception e )
{
@@ -737,7 +737,7 @@
LdapDN normName = new LdapDN( ServerDNConstants.SCHEMA_TIMESTAMP_ENTRY_DN );
normName.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
entry.setDn( normName );
- store.add( normName, entry );
+ store.add( entry );
}
@@ -857,7 +857,7 @@
ServerEntry entry = new DefaultServerEntry( registries, clonedDn );
entry.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.ORGANIZATIONAL_UNIT_OC );
entry.put( SchemaConstants.OU_AT, ( String ) clonedDn.getRdn().getValue() );
- store.add( clonedDn, entry );
+ store.add( entry );
}
@@ -874,7 +874,7 @@
ServerEntry entry = attributesFactory.getAttributes( schema, registries );
entry.setDn( dn );
- store.add( dn, entry );
+ store.add( entry );
return dn;
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java Thu May 28 23:53:47 2009
@@ -42,7 +42,6 @@
import org.apache.directory.server.xdbm.search.impl.EvaluatorBuilder;
import org.apache.directory.server.xdbm.search.impl.NoOpOptimizer;
import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationNotSupportedException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -473,7 +472,7 @@
public final void add( AddOperationContext addContext ) throws Exception
{
- store.add( addContext.getDn(), (ServerEntry)((ClonedServerEntry)addContext.getEntry()).getClonedEntry() );
+ store.add( (ServerEntry)((ClonedServerEntry)addContext.getEntry()).getClonedEntry() );
}
Modified: directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Thu May 28 23:53:47 2009
@@ -1011,7 +1011,7 @@
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public void add( LdapDN normName, ServerEntry entry ) throws Exception
+ public void add( ServerEntry entry ) throws Exception
{
if ( entry instanceof ClonedServerEntry )
{
@@ -1029,6 +1029,7 @@
// entry sequences start at 1.
//
+ LdapDN normName = entry.getDn();
LdapDN parentDn = null;
if ( normName.getNormName().equals( normSuffix.getNormName() ) )
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Thu May 28 23:53:47 2009
@@ -357,7 +357,7 @@
entry.add( "ou", "Apache" );
entry.add( "commonName", "Jack Daniels");
entry.add( "aliasedObjectName", "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
- store.add( dn, entry );
+ store.add( entry );
store.delete( 12L ); // drops the alias indices
@@ -403,7 +403,7 @@
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Sales" );
entry.add( "cn", "Martin King");
- store.add( martinDn, entry );
+ store.add( entry );
cursor = idx.forwardCursor( 2L);
cursor.afterLast();
@@ -425,7 +425,7 @@
entry = new DefaultServerEntry( registries, marketingDn );
entry.add( "objectClass", "top", "organizationalUnit" );
entry.add( "ou", "Marketing" );
- store.add( marketingDn, entry );
+ store.add( entry );
// dn id 14
LdapDN jimmyDn = new LdapDN( "cn=Jimmy Wales,ou=Marketing, ou=Sales,o=Good Times Co." );
@@ -434,7 +434,7 @@
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Marketing" );
entry.add( "cn", "Jimmy Wales");
- store.add( jimmyDn, entry );
+ store.add( entry );
store.move( marketingDn, newParentDn );
@@ -671,7 +671,7 @@
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "ou", "Not Present" );
entry.add( "cn", "Martin King");
- store.add( dn, entry );
+ store.add( entry );
}
@@ -683,7 +683,7 @@
DefaultServerEntry entry = new DefaultServerEntry( registries, dn );
entry.add( "ou", "Sales" );
entry.add( "cn", "Martin King");
- store.add( dn, entry );
+ store.add( entry );
}
@@ -716,7 +716,7 @@
entry.add( "ou", "Engineering" );
entry.add( "cn", "Private Ryan");
- store.add( dn, entry );
+ store.add( entry );
Rdn rdn = new Rdn("sn=James");
@@ -734,7 +734,7 @@
childEntry.add( "ou", "Engineering" );
childEntry.add( "cn", "Private Ryan");
- store.add( childDn, childEntry );
+ store.add( childEntry );
LdapDN parentDn = new LdapDN( "ou=Sales,o=Good Times Co." );
parentDn.normalize( attributeRegistry.getNormalizerMapping() );
@@ -865,7 +865,7 @@
entry.add( "objectClass", "top", "person", "organizationalPerson" );
entry.add( "cn", "Tim B");
- store.add( dn, entry );
+ store.add( entry );
List<Modification> mods = new ArrayList<Modification>();
ServerAttribute attrib = new DefaultServerAttribute( SchemaConstants.OU_AT,
Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/Store.java Thu May 28 23:53:47 2009
@@ -263,12 +263,11 @@
/**
* Add an entry into the store.
*
- * @param normName TODO: Remove this parameter.
* @param entry The entry to add
*
* @throws Exception If the addition failed.
*/
- void add( LdapDN normName, ServerEntry entry ) throws Exception;
+ void add( ServerEntry entry ) throws Exception;
ServerEntry lookup( Long id ) throws Exception;
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Thu May 28 23:53:47 2009
@@ -589,7 +589,7 @@
attrs.add( "c-street", "3" );
attrs.add( "cn", "jane doe" );
attrs.add( "sn", "doe" );
- store.add( dn, attrs );
+ store.add( attrs );
indexEntry.setId( 12L );
assertTrue( evaluator.evaluate( indexEntry ) );
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Thu May 28 23:53:47 2009
@@ -640,7 +640,7 @@
attrs.add( "c-street", "1" );
attrs.add( "cn", "jane doe" );
attrs.add( "sn", "doe" );
- store.add( dn, attrs );
+ store.add( attrs );
indexEntry.setId( 12L );
assertTrue( evaluator.evaluate( indexEntry ) );
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Thu May 28 23:53:47 2009
@@ -667,7 +667,7 @@
attrs.add( "objectClass", "alias", "extensibleObject" );
attrs.add( "cn", "jd" );
attrs.add( "aliasedObjectName", "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
- store.add( dn, attrs );
+ store.add( attrs );
dn = new LdapDN(
SchemaConstants.CN_AT_OID + "=jdoe," +
@@ -680,7 +680,7 @@
attrs.add( "objectClass", "person" );
attrs.add( "cn", "jdoe" );
attrs.add( "sn", "doe" );
- store.add( dn, attrs );
+ store.add( attrs );
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING,
SchemaConstants.OU_AT_OID + "=board of directors," +
Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Thu May 28 23:53:47 2009
@@ -635,7 +635,7 @@
attrs.add( "objectClass", "alias", "extensibleObject" );
attrs.add( "cn", "jd" );
attrs.add( "aliasedObjectName", "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
- store.add( dn, attrs );
+ store.add( attrs );
dn = new LdapDN(
SchemaConstants.CN_AT_OID + "=jdoe," +
@@ -648,7 +648,7 @@
attrs.add( "objectClass", "person" );
attrs.add( "cn", "jdoe" );
attrs.add( "sn", "doe" );
- store.add( dn, attrs );
+ store.add( attrs );
ScopeNode node = new ScopeNode( AliasDerefMode.DEREF_IN_SEARCHING,
SchemaConstants.OU_AT_OID + "=board of directors," +
Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java?rev=779799&r1=779798&r2=779799&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java (original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java Thu May 28 23:53:47 2009
@@ -76,7 +76,7 @@
entry.add( "o", "Good Times Co." );
entry.add( "postalCode", "1" );
entry.add( "postOfficeBox", "1" );
- store.add( suffixDn, entry );
+ store.add( entry );
// Entry #2
@@ -87,7 +87,7 @@
entry.add( "ou", "Sales" );
entry.add( "postalCode", "1" );
entry.add( "postOfficeBox", "1" );
- store.add( dn, entry );
+ store.add( entry );
// Entry #3
dn = new LdapDN( "ou=Board of Directors,o=Good Times Co." );
@@ -97,7 +97,7 @@
entry.add( "ou", "Board of Directors" );
entry.add( "postalCode", "1" );
entry.add( "postOfficeBox", "1" );
- store.add( dn, entry );
+ store.add( entry );
// Entry #4
dn = new LdapDN( "ou=Engineering,o=Good Times Co." );
@@ -107,7 +107,7 @@
entry.add( "ou", "Engineering" );
entry.add( "postalCode", "2" );
entry.add( "postOfficeBox", "2" );
- store.add( dn, entry );
+ store.add( entry );
// Entry #5
dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
@@ -119,7 +119,7 @@
entry.add( "sn", "WAlkeR");
entry.add( "postalCode", "3" );
entry.add( "postOfficeBox", "3" );
- store.add( dn, entry );
+ store.add( entry );
// Entry #6
dn = new LdapDN( "cn=JIM BEAN,ou=Sales,o=Good Times Co." );
@@ -131,7 +131,7 @@
entry.add( "surName", "BEAN");
entry.add( "postalCode", "4" );
entry.add( "postOfficeBox", "4" );
- store.add( dn, entry );
+ store.add( entry );
// Entry #7
dn = new LdapDN( "ou=Apache,ou=Board of Directors,o=Good Times Co." );
@@ -141,7 +141,7 @@
entry.add( "ou", "Apache" );
entry.add( "postalCode", "5" );
entry.add( "postOfficeBox", "5" );
- store.add( dn, entry );
+ store.add( entry );
// Entry #8
dn = new LdapDN( "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
@@ -153,7 +153,7 @@
entry.add( "SN", "Daniels");
entry.add( "postalCode", "6" );
entry.add( "postOfficeBox", "6" );
- store.add( dn, entry );
+ store.add( entry );
// aliases -------------
@@ -165,7 +165,7 @@
entry.add( "ou", "Apache" );
entry.add( "commonName", "Jim Bean");
entry.add( "aliasedObjectName", "cn=Jim Bean,ou=Sales,o=Good Times Co." );
- store.add( dn, entry );
+ store.add( entry );
// Entry #10
dn = new LdapDN( "commonName=Jim Bean,ou=Board of Directors,o=Good Times Co." );
@@ -174,7 +174,7 @@
entry.add( "objectClass", "top", "alias", "extensibleObject" );
entry.add( "commonName", "Jim Bean");
entry.add( "aliasedObjectName", "cn=Jim Bean,ou=Sales,o=Good Times Co." );
- store.add( dn, entry );
+ store.add( entry );
// Entry #11
dn = new LdapDN( "2.5.4.3=Johnny Walker,ou=Engineering,o=Good Times Co." );
@@ -184,7 +184,7 @@
entry.add( "ou", "Engineering" );
entry.add( "2.5.4.3", "Johnny Walker");
entry.add( "aliasedObjectName", "cn=Johnny Walker,ou=Sales,o=Good Times Co." );
- store.add( dn, entry );
+ store.add( entry );
}