diff --git a/core/pom.xml b/core/pom.xml
index 8ac9c7f24b..61740775a2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-core</artifactId>
-      <version>1.0-RC3</version>
+      <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/core/src/test/java/org/acegisecurity/ldap/AbstractLdapServerTestCase.java b/core/src/test/java/org/acegisecurity/ldap/AbstractLdapServerTestCase.java
index 79b0df4906..84b024ec58 100644
--- a/core/src/test/java/org/acegisecurity/ldap/AbstractLdapServerTestCase.java
+++ b/core/src/test/java/org/acegisecurity/ldap/AbstractLdapServerTestCase.java
@@ -23,8 +23,7 @@ import java.util.Hashtable;
 
 
 /**
- * 
-DOCUMENT ME!
+ *
  *
  * @author Luke Taylor
  * @version $Id$
diff --git a/core/src/test/java/org/acegisecurity/ldap/LdapTestServer.java b/core/src/test/java/org/acegisecurity/ldap/LdapTestServer.java
index dc616bb759..7925b9cd1b 100644
--- a/core/src/test/java/org/acegisecurity/ldap/LdapTestServer.java
+++ b/core/src/test/java/org/acegisecurity/ldap/LdapTestServer.java
@@ -16,10 +16,10 @@
 package org.acegisecurity.ldap;
 
 import org.apache.directory.server.core.configuration.Configuration;
-import org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration;
+import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
 import org.apache.directory.server.core.configuration.MutableStartupConfiguration;
 import org.apache.directory.server.core.jndi.CoreContextFactory;
-import org.apache.directory.server.core.partition.DirectoryPartitionNexus;
+import org.apache.directory.server.core.partition.DefaultPartitionNexus;
 
 import java.io.File;
 
@@ -162,7 +162,7 @@ public class LdapTestServer {
 
     private void initConfiguration() throws NamingException {
         // Create the partition for the acegi tests
-        MutableDirectoryPartitionConfiguration acegiDit = new MutableDirectoryPartitionConfiguration();
+        MutablePartitionConfiguration acegiDit = new MutablePartitionConfiguration();
         acegiDit.setName("acegisecurity");
         acegiDit.setSuffix("dc=acegisecurity,dc=org");
 
@@ -217,8 +217,8 @@ public class LdapTestServer {
         env.setProperty(Context.PROVIDER_URL, "dc=acegisecurity,dc=org");
         env.setProperty(Context.INITIAL_CONTEXT_FACTORY, CoreContextFactory.class.getName());
         env.setProperty(Context.SECURITY_AUTHENTICATION, "simple");
-        env.setProperty(Context.SECURITY_PRINCIPAL, DirectoryPartitionNexus.ADMIN_PRINCIPAL);
-        env.setProperty(Context.SECURITY_CREDENTIALS, DirectoryPartitionNexus.ADMIN_PASSWORD);
+        env.setProperty(Context.SECURITY_PRINCIPAL, DefaultPartitionNexus.ADMIN_PRINCIPAL);
+        env.setProperty(Context.SECURITY_CREDENTIALS, DefaultPartitionNexus.ADMIN_PASSWORD);
 
         try {
             initConfiguration();