diff --git a/spring-ldap/.classpath b/spring-ldap/.classpath
index cdaaac28..4a527c2a 100644
--- a/spring-ldap/.classpath
+++ b/spring-ldap/.classpath
@@ -1,50 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" path="target/gen-java-src"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/itest-classes" path="src/itest/java"/>
-	<classpathentry kind="src" output="target/itest-openldap-classes" path="src/itest-openldap/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/global/commons-logging.jar" sourcepath="lib/source/commons-logging-src.zip"/>
-	<classpathentry kind="lib" path="lib/global/spring-beans.jar" sourcepath="lib/source/spring-src.zip"/>
-	<classpathentry kind="lib" path="lib/global/spring-context.jar" sourcepath="lib/source/spring-src.zip"/>
-	<classpathentry kind="lib" path="lib/global/spring-core.jar" sourcepath="lib/source/spring-src.zip"/>
-	<classpathentry kind="lib" path="lib/global/spring-dao.jar" sourcepath="lib/source/spring-src.zip"/>
-	<classpathentry kind="lib" path="lib/test/spring-mock.jar" sourcepath="lib/source/spring-src.zip"/>
-	<classpathentry kind="lib" path="lib/test/gsbase.jar"/>
-	<classpathentry kind="lib" path="lib/global/commons-lang.jar" sourcepath="lib/source/commons-lang-src.zip"/>
-	<classpathentry kind="lib" path="lib/global/commons-collections.jar" sourcepath="lib/source/commons-collections-src.zip"/>
-	<classpathentry kind="lib" path="lib/test/junit.jar" sourcepath="lib/source/junit-src.zip"/>
-	<classpathentry kind="lib" path="lib/test/easymock.jar" sourcepath="lib/source/easymock-src.zip"/>
-	<classpathentry kind="lib" path="lib/test/clover.jar"/>
-	<classpathentry kind="lib" path="lib/test/ehcache.jar"/>
-	<classpathentry kind="lib" path="lib/test/ehcache-constructs.jar"/>
-	<classpathentry kind="lib" path="lib/test/jxl.jar"/>
-	<classpathentry kind="lib" path="lib/test/cglib-nodep.jar"/>
-	<classpathentry kind="lib" path="lib/buildtime/acegi-security.jar" sourcepath="lib/source/acegi-security-src.zip"/>
-	<classpathentry kind="lib" path="lib/test/antlr.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-core.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-core-shared.jar"/>
-	<classpathentry kind="lib" path="lib/test/jdbm.jar"/>
-	<classpathentry kind="lib" path="lib/test/shared-asn1.jar"/>
-	<classpathentry kind="lib" path="lib/test/shared-ldap.jar"/>
-	<classpathentry kind="lib" path="lib/test/slf4j-log4j12.jar"/>
-	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-server-jndi.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-protocol-shared.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-protocol-changepw.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-protocol-kerberos.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-kerberos-shared.jar"/>
-	<classpathentry kind="lib" path="lib/test/mina-core.jar"/>
-	<classpathentry kind="lib" path="lib/test/mina-filter-codec-asn1.jar"/>
-	<classpathentry kind="lib" path="lib/test/mina-filter-ssl.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-server-main.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-protocol-ldap.jar"/>
-	<classpathentry kind="lib" path="lib/test/junit-addons.jar"/>
-	<classpathentry kind="lib" path="lib/test/DDSteps.jar"/>
-	<classpathentry kind="lib" path="lib/global/ldapbp.jar"/>
-	<classpathentry kind="lib" path="lib/test/junitperf.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" path="target/gen-java-src"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/itest-classes" path="src/itest/java"/>
+	<classpathentry kind="src" output="target/itest-openldap-classes" path="src/itest-openldap/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/global/commons-logging.jar" sourcepath="lib/source/commons-logging-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/spring-beans.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/spring-context.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/spring-core.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/spring-dao.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/test/spring-mock.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/test/gsbase.jar"/>
+	<classpathentry kind="lib" path="lib/global/commons-lang.jar" sourcepath="lib/source/commons-lang-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/commons-collections.jar" sourcepath="lib/source/commons-collections-src.zip"/>
+	<classpathentry kind="lib" path="lib/test/junit.jar" sourcepath="lib/source/junit-src.zip"/>
+	<classpathentry kind="lib" path="lib/test/easymock.jar" sourcepath="lib/source/easymock-src.zip"/>
+	<classpathentry kind="lib" path="lib/test/clover.jar"/>
+	<classpathentry kind="lib" path="lib/test/ehcache.jar"/>
+	<classpathentry kind="lib" path="lib/test/ehcache-constructs.jar"/>
+	<classpathentry kind="lib" path="lib/test/jxl.jar"/>
+	<classpathentry kind="lib" path="lib/test/cglib-nodep.jar"/>
+	<classpathentry kind="lib" path="lib/buildtime/acegi-security.jar" sourcepath="lib/source/acegi-security-src.zip"/>
+	<classpathentry kind="lib" path="lib/test/antlr.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-core.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-core-shared.jar"/>
+	<classpathentry kind="lib" path="lib/test/jdbm.jar"/>
+	<classpathentry kind="lib" path="lib/test/shared-asn1.jar"/>
+	<classpathentry kind="lib" path="lib/test/shared-ldap.jar"/>
+	<classpathentry kind="lib" path="lib/test/slf4j-log4j12.jar"/>
+	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-server-jndi.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-protocol-shared.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-protocol-changepw.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-protocol-kerberos.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-kerberos-shared.jar"/>
+	<classpathentry kind="lib" path="lib/test/mina-core.jar"/>
+	<classpathentry kind="lib" path="lib/test/mina-filter-ssl.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-server-main.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-protocol-ldap.jar"/>
+	<classpathentry kind="lib" path="lib/test/junit-addons.jar"/>
+	<classpathentry kind="lib" path="lib/test/DDSteps.jar"/>
+	<classpathentry kind="lib" path="lib/global/ldapbp.jar"/>
+	<classpathentry kind="lib" path="lib/test/junitperf.jar"/>
+	<classpathentry kind="lib" path="lib/test/backport-util-concurrent.jar"/>
+	<classpathentry kind="lib" path="lib/test/mina-filter-codec-asn1.jar"/>
+	<classpathentry kind="lib" path="lib/test/shared-asn1-codec.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/spring-ldap/changelog.txt b/spring-ldap/changelog.txt
index 760efdc3..46467fd8 100644
--- a/spring-ldap/changelog.txt
+++ b/spring-ldap/changelog.txt
@@ -10,6 +10,12 @@ http://www.ietf.org/rfc/rfc2255.txt
 http://www.ietf.org/rfc/rfc2256.txt
 http://www.ietf.org/rfc/rfc2696.txt
 
+Changes in version 1.2 (xx.yy.2007)
+-------------------------------------------
+* Moved the core classes into the package ldap.core.
+
+* Upgraded ApacheDS to 1.0.0.
+
 Changes in version 1.1.2 (1.12.2006)
 -------------------------------------------
 * Fixed problem with DirContextAdapter.getNameInNameSpace. Now it really
diff --git a/spring-ldap/ivy.xml b/spring-ldap/ivy.xml
index c0d1e1d0..c626d6d4 100644
--- a/spring-ldap/ivy.xml
+++ b/spring-ldap/ivy.xml
@@ -64,28 +64,30 @@
 	<dependency org="cglib" name="cglib-nodep" rev="2.1_3" conf="test->default"/>
 	
 	<!-- Test dependencies for Apache Directory Server -->
-	<dependency org="org.apache.directory.server" name="apacheds-core" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-core" rev="1.0.0"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.server" name="apacheds-core-shared" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-core-shared" rev="1.0.0"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.server" name="apacheds-server-jndi" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-server-jndi" rev="1.0.0"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.server" name="apacheds-server-main" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-server-main" rev="1.0.0"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.server" name="apacheds-protocol-shared" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-protocol-shared" rev="1.0.0"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.server" name="apacheds-protocol-changepw" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-protocol-changepw" rev="1.0.0"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.server" name="apacheds-protocol-kerberos" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-protocol-kerberos" rev="1.0.0"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.server" name="apacheds-kerberos-shared" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-kerberos-shared" rev="1.0.0"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.server" name="apacheds-protocol-ldap" rev="1.0-RC3"
+	<dependency org="org.apache.directory.server" name="apacheds-protocol-ldap" rev="1.0.0"
 	            conf="test->default"/>
 
-	<dependency org="org.apache.directory.shared" name="shared-asn1" rev="0.9.5.1"
+	<dependency org="org.apache.directory.shared" name="shared-asn1" rev="0.9.5.3"
 	            conf="test->default"/>
-	<dependency org="org.apache.directory.shared" name="shared-ldap" rev="0.9.5.1"
+	<dependency org="org.apache.directory.shared" name="shared-asn1-codec" rev="0.9.5.3"
+	            conf="test->default"/>
+	<dependency org="org.apache.directory.shared" name="shared-ldap" rev="0.9.5.3"
 	            conf="test->default"/>
 
 	<dependency org="log4j" name="log4j" rev="1.2.9" conf="test->default" />
@@ -93,11 +95,9 @@
 	<dependency org="jdbm" name="jdbm" rev="1.0" conf="test->default" />
 	<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.0"
                 conf="test->default" />
-	<dependency org="org.apache.directory.mina" name="mina-core" rev="0.9.2"
+	<dependency org="org.apache.mina" name="mina-core" rev="1.0.0"
                 conf="test->default"/>
-	<dependency org="org.apache.directory.mina" name="mina-filter-codec-asn1" rev="0.9.2"
-                conf="test->default"/>
-	<dependency org="org.apache.directory.mina" name="mina-filter-ssl" rev="0.9.2"
+	<dependency org="org.apache.mina" name="mina-filter-ssl" rev="1.0.0"
                 conf="test->default"/>
 	<!-- End test dependencies for Apache Directory Server -->
 
diff --git a/spring-ldap/src/itest/java/conf/apacheDsContext.xml b/spring-ldap/src/itest/java/conf/apacheDsContext.xml
index e554e083..28314722 100644
--- a/spring-ldap/src/itest/java/conf/apacheDsContext.xml
+++ b/spring-ldap/src/itest/java/conf/apacheDsContext.xml
@@ -40,7 +40,7 @@
 	</bean>
 
 	<bean id="jaywayPartitionConfiguration"
-		class="org.apache.directory.server.core.configuration.MutableDirectoryPartitionConfiguration">
+		class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
 		<property name="name" value="jayway" />
 		<property name="suffix" value="dc=jayway,dc=se" />
 		<property name="contextEntry">
diff --git a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls
index 576261b9..a7f7e40c 100644
Binary files a/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls and b/spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateSearchCountITest.xls differ