From b126b31e49cdd703e39e17ff78e4cd65d61fb456 Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Fri, 12 Jan 2007 10:39:08 +0000
Subject: [PATCH] LDAP-33: Remove package dependency cycle.

---
 spring-ldap-article/src/itest/java/config/testContext.xml   | 4 ++--
 .../ldap/samples/article/dao/PersonDaoImpl.java             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-ldap-article/src/itest/java/config/testContext.xml b/spring-ldap-article/src/itest/java/config/testContext.xml
index 51b092d8..895c1852 100644
--- a/spring-ldap-article/src/itest/java/config/testContext.xml
+++ b/spring-ldap-article/src/itest/java/config/testContext.xml
@@ -8,12 +8,12 @@
 		<property name="location" value="classpath:/config/ldap.properties" />
 	</bean>
 	
-	<bean id="contextSource" class="org.springframework.ldap.support.LdapContextSource" >
+	<bean id="contextSource" class="org.springframework.ldap.core.support.LdapContextSource" >
 		<property name="urls" value="${urls}" />
 		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="base" value="${base}" />
-		<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
+		<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
 	</bean>
 	
 	<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">
diff --git a/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java b/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
index ddc40842..e6f6132e 100644
--- a/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
+++ b/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
@@ -23,12 +23,12 @@ import javax.naming.directory.Attributes;
 
 import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.ContextMapper;
+import org.springframework.ldap.core.DirContextAdapter;
+import org.springframework.ldap.core.DistinguishedName;
 import org.springframework.ldap.core.LdapTemplate;
+import org.springframework.ldap.filter.EqualsFilter;
 import org.springframework.ldap.samples.article.domain.Person;
 
-import org.springframework.ldap.support.DirContextAdapter;
-import org.springframework.ldap.support.DistinguishedName;
-import org.springframework.ldap.support.filter.EqualsFilter;
 
 /**
  * Default implementation of PersonDao. This implementation uses