Spring/spring-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IN PROGRESS - issue LDAP-33: Remove package dependency cycle between ldap.core and ldap.support

Browse Source 
http://opensource.atlassian.com/projects/spring/browse/LDAP-33
Remove package dependency cycle
This commit is contained in:
Ulrik Sandberg
2007-01-12 12:35:39 +00:00
parent 85f1ea0521
commit 86bdd82868
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-ldap/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
View File

@@ -9,12 +9,12 @@
<property name="location" value="classpath:/conf/ldap-openldap.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">

8
spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplateLookupOpenLdapITest.java
View File

@@ -21,9 +21,9 @@ 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.support.DirContextAdapter;
import org.springframework.ldap.support.DistinguishedName;
import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
/**
@@ -42,7 +42,7 @@ public class LdapTemplateLookupOpenLdapITest extends
}
/**
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.support.DefaultDirObjectFactory})
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
* being set in the ContextSource.
*/
public void testLookup_Plain() {
@@ -134,7 +134,7 @@ public class LdapTemplateLookupOpenLdapITest extends
}
/**
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.support.DefaultDirObjectFactory})
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
* being set in the ContextSource.
*/
public void testLookup_ContextMapper() {

6
spring-ldap/src/itest-openldap/java/org/springframework/ldap/LdapTemplatePagedSearchITest.java
View File

@@ -23,12 +23,12 @@ import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import javax.naming.directory.SearchControls;
import org.springframework.ldap.control.PagedResultsCookie;
import org.springframework.ldap.control.PagedResultsRequestControl;
import org.springframework.ldap.core.CollectingNameClassPairCallbackHandler;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapTemplate;
import org.springframework.ldap.core.SearchExecutor;
import org.springframework.ldap.support.DistinguishedName;
import org.springframework.ldap.support.control.PagedResultsCookie;
import org.springframework.ldap.support.control.PagedResultsRequestControl;
import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
/**