You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/09/30 03:27:11 UTC
svn commit: r580666 [2/2] - in /directory/apacheds/branches/bigbang:
bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/
btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/
core-unit/src/m...
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java?rev=580666&r1=580665&r2=580666&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/PasswordPolicyServiceITest.java Sat Sep 29 18:27:08 2007
@@ -20,25 +20,27 @@
package org.apache.directory.server;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-
import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.kerberos.PasswordPolicyService;
+import org.apache.directory.server.core.partition.impl.btree.Index;
+import org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.unit.AbstractServerTest;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
+
/**
* An {@link AbstractServerTest} testing the (@link {@link PasswordPolicyService}.
@@ -63,17 +65,17 @@
Attributes attrs;
Set<PartitionConfiguration> pcfgs = new HashSet<PartitionConfiguration>();
- MutablePartitionConfiguration pcfg;
+ MutableBTreePartitionConfiguration pcfg;
// Add partition 'example'
- pcfg = new MutablePartitionConfiguration();
+ pcfg = new MutableBTreePartitionConfiguration();
pcfg.setName( "example" );
pcfg.setSuffix( "dc=example,dc=com" );
- Set<Object> indexedAttrs = new HashSet<Object>();
- indexedAttrs.add( "ou" );
- indexedAttrs.add( "dc" );
- indexedAttrs.add( "objectClass" );
+ Set<Index> indexedAttrs = new HashSet<Index>();
+ indexedAttrs.add( new JdbmIndex( "ou" ) );
+ indexedAttrs.add( new JdbmIndex( "dc" ) );
+ indexedAttrs.add( new JdbmIndex( "objectClass" ) );
pcfg.setIndexedAttributes( indexedAttrs );
attrs = new AttributesImpl( true );
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java?rev=580666&r1=580665&r2=580666&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java Sat Sep 29 18:27:08 2007
@@ -20,9 +20,14 @@
package org.apache.directory.server;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
+import org.apache.directory.server.core.configuration.PartitionConfiguration;
+import org.apache.directory.server.core.partition.impl.btree.Index;
+import org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
+import org.apache.directory.server.unit.AbstractServerTest;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import javax.naming.Context;
import javax.naming.NamingEnumeration;
@@ -31,12 +36,9 @@
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
-
-import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
-import org.apache.directory.server.core.configuration.PartitionConfiguration;
-import org.apache.directory.server.unit.AbstractServerTest;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
/**
@@ -63,17 +65,17 @@
Attributes attrs;
Set<PartitionConfiguration> pcfgs = new HashSet<PartitionConfiguration>();
- MutablePartitionConfiguration pcfg;
+ MutableBTreePartitionConfiguration pcfg;
// Add partition 'example'
- pcfg = new MutablePartitionConfiguration();
+ pcfg = new MutableBTreePartitionConfiguration();
pcfg.setName( "example" );
pcfg.setSuffix( "dc=example,dc=com" );
- Set<Object> indexedAttrs = new HashSet<Object>();
- indexedAttrs.add( "ou" );
- indexedAttrs.add( "dc" );
- indexedAttrs.add( "objectClass" );
+ Set<Index> indexedAttrs = new HashSet<Index>();
+ indexedAttrs.add( new JdbmIndex( "ou" ) );
+ indexedAttrs.add( new JdbmIndex( "dc" ) );
+ indexedAttrs.add( new JdbmIndex( "objectClass" ) );
pcfg.setIndexedAttributes( indexedAttrs );
attrs = new AttributesImpl( true );
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java?rev=580666&r1=580665&r2=580666&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/SaslGssapiBindITest.java Sat Sep 29 18:27:08 2007
@@ -20,21 +20,13 @@
package org.apache.directory.server;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-
import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
import org.apache.directory.server.core.configuration.PartitionConfiguration;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.kerberos.KeyDerivationService;
+import org.apache.directory.server.core.partition.impl.btree.Index;
+import org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
import org.apache.directory.server.kerberos.shared.store.KerberosAttribute;
import org.apache.directory.server.ldap.LdapConfiguration;
@@ -44,6 +36,16 @@
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.mina.util.AvailablePortFinder;
+import javax.naming.Context;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
+
/**
* An {@link AbstractServerTest} testing SASL GSSAPI authentication
@@ -93,17 +95,17 @@
Attributes attrs;
Set<PartitionConfiguration> pcfgs = new HashSet<PartitionConfiguration>();
- MutablePartitionConfiguration pcfg;
+ MutableBTreePartitionConfiguration pcfg;
// Add partition 'example'
- pcfg = new MutablePartitionConfiguration();
+ pcfg = new MutableBTreePartitionConfiguration();
pcfg.setName( "example" );
pcfg.setSuffix( "dc=example,dc=com" );
- Set<Object> indexedAttrs = new HashSet<Object>();
- indexedAttrs.add( "ou" );
- indexedAttrs.add( "dc" );
- indexedAttrs.add( "objectClass" );
+ Set<Index> indexedAttrs = new HashSet<Index>();
+ indexedAttrs.add( new JdbmIndex( "ou" ) );
+ indexedAttrs.add( new JdbmIndex( "dc" ) );
+ indexedAttrs.add( new JdbmIndex( "objectClass" ) );
pcfg.setIndexedAttributes( indexedAttrs );
attrs = new AttributesImpl( true );
Modified: directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java?rev=580666&r1=580665&r2=580666&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java (original)
+++ directory/apacheds/branches/bigbang/server-unit/src/test/java/org/apache/directory/server/jndi/ServerContextFactoryTest.java Sat Sep 29 18:27:08 2007
@@ -20,9 +20,14 @@
package org.apache.directory.server.jndi;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
+import org.apache.directory.server.core.partition.impl.btree.Index;
+import org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
+import org.apache.directory.server.core.unit.AbstractAdminTestCase;
+import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
+import org.apache.directory.shared.ldap.message.AttributeImpl;
+import org.apache.directory.shared.ldap.message.AttributesImpl;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -30,12 +35,9 @@
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext;
-
-import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
-import org.apache.directory.server.core.unit.AbstractAdminTestCase;
-import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
-import org.apache.directory.shared.ldap.message.AttributeImpl;
-import org.apache.directory.shared.ldap.message.AttributesImpl;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
/**
@@ -54,19 +56,19 @@
public void setUp() throws Exception
{
Attributes attrs;
- Set indexedAttrs;
+ Set<Index> indexedAttrs;
Set pcfgs = new HashSet();
- MutablePartitionConfiguration pcfg;
+ MutableBTreePartitionConfiguration pcfg;
// Add partition 'testing'
- pcfg = new MutablePartitionConfiguration();
+ pcfg = new MutableBTreePartitionConfiguration();
pcfg.setName( "testing" );
pcfg.setSuffix( "ou=testing" );
- indexedAttrs = new HashSet();
- indexedAttrs.add( "ou" );
- indexedAttrs.add( "objectClass" );
+ indexedAttrs = new HashSet<Index>();
+ indexedAttrs.add( new JdbmIndex( "ou" ) );
+ indexedAttrs.add( new JdbmIndex( "objectClass" ) );
pcfg.setIndexedAttributes( indexedAttrs );
attrs = new AttributesImpl( true );
@@ -83,14 +85,14 @@
pcfgs.add( pcfg );
// Add partition 'example'
- pcfg = new MutablePartitionConfiguration();
+ pcfg = new MutableBTreePartitionConfiguration();
pcfg.setName( "example" );
pcfg.setSuffix( "dc=example" );
- indexedAttrs = new HashSet();
- indexedAttrs.add( "ou" );
- indexedAttrs.add( "dc" );
- indexedAttrs.add( "objectClass" );
+ indexedAttrs = new HashSet<Index>();
+ indexedAttrs.add( new JdbmIndex( "ou" ) );
+ indexedAttrs.add( new JdbmIndex( "dc" ) );
+ indexedAttrs.add( new JdbmIndex( "objectClass" ) );
pcfg.setIndexedAttributes( indexedAttrs );
attrs = new AttributesImpl( true );
@@ -107,13 +109,13 @@
pcfgs.add( pcfg );
// Add partition 'MixedCase'
- pcfg = new MutablePartitionConfiguration();
+ pcfg = new MutableBTreePartitionConfiguration();
pcfg.setName( "mixedcase" );
pcfg.setSuffix( "dc=MixedCase" );
- indexedAttrs = new HashSet();
- indexedAttrs.add( "dc" );
- indexedAttrs.add( "objectClass" );
+ indexedAttrs = new HashSet<Index>();
+ indexedAttrs.add( new JdbmIndex( "dc" ) );
+ indexedAttrs.add( new JdbmIndex( "objectClass" ) );
pcfg.setIndexedAttributes( indexedAttrs );
attrs = new AttributesImpl( true );