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

LDAP-33: Remove package dependency cycle.

Browse Source
This commit is contained in:
Ulrik Sandberg
2007-01-12 10:39:34 +00:00
parent b126b31e49
commit 91ddabdc4a
9 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-ldap-person/src/main/java/org/springframework/ldap/LdapServerManager.java
View File

@@ -30,8 +30,8 @@ import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.support.DefaultDirObjectFactory;
import org.springframework.ldap.support.DistinguishedName;
import org.springframework.ldap.core.DefaultDirObjectFactory;
import org.springframework.ldap.core.DistinguishedName;
import org.apache.directory.server.core.configuration.ShutdownConfiguration;
import org.apache.directory.server.jndi.ServerContextFactory;

2
spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupContextMapper.java
View File

@@ -20,8 +20,8 @@ import java.util.List;
import java.util.TreeSet;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.samples.person.domain.Group;
import org.springframework.ldap.support.DirContextOperations;
/**
* Maps from DirContextOperations (DirContextAdapters, really) to Group objects.

12
spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/GroupDaoImpl.java
View File

@@ -18,15 +18,15 @@ package org.springframework.ldap.samples.person.dao;
import java.util.List;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.filter.AndFilter;
import org.springframework.ldap.filter.EqualsFilter;
import org.springframework.ldap.filter.WhitespaceWildcardsFilter;
import org.springframework.ldap.samples.person.domain.Group;
import org.springframework.ldap.samples.person.domain.SearchCriteria;
import org.springframework.ldap.support.DirContextAdapter;
import org.springframework.ldap.support.DirContextOperations;
import org.springframework.ldap.support.DistinguishedName;
import org.springframework.ldap.support.filter.AndFilter;
import org.springframework.ldap.support.filter.EqualsFilter;
import org.springframework.ldap.support.filter.WhitespaceWildcardsFilter;
/**
* Default implementation of GroupDao. This implementation uses

4
spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonContextMapper.java
View File

@@ -18,10 +18,10 @@ package org.springframework.ldap.samples.person.dao;
import javax.naming.NamingException;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.samples.person.domain.Person;
import org.springframework.ldap.support.DefaultNamingExceptionTranslator;
import org.springframework.ldap.support.DirContextOperations;
import org.springframework.ldap.support.DistinguishedName;
import org.springframework.ldap.support.NamingExceptionTranslator;
import org.springframework.util.Assert;

12
spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/PersonDaoImpl.java
View File

@@ -18,15 +18,15 @@ package org.springframework.ldap.samples.person.dao;
import java.util.List;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.filter.AndFilter;
import org.springframework.ldap.filter.EqualsFilter;
import org.springframework.ldap.filter.WhitespaceWildcardsFilter;
import org.springframework.ldap.samples.person.domain.Person;
import org.springframework.ldap.samples.person.domain.SearchCriteria;
import org.springframework.ldap.support.DirContextAdapter;
import org.springframework.ldap.support.DirContextOperations;
import org.springframework.ldap.support.DistinguishedName;
import org.springframework.ldap.support.filter.AndFilter;
import org.springframework.ldap.support.filter.EqualsFilter;
import org.springframework.ldap.support.filter.WhitespaceWildcardsFilter;
/**
* Default implementation of PersonDao. This implementation uses

4
spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/TraditionalPersonDaoImpl.java
View File

@@ -30,8 +30,8 @@ import javax.naming.directory.InitialDirContext;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
import org.springframework.ldap.support.DirContextAdapter;
import org.springframework.ldap.support.DirContextOperations;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DirContextOperations;
import org.apache.commons.lang.StringUtils;
import org.springframework.ldap.samples.person.domain.Person;

10
spring-ldap-person/src/main/webapp/WEB-INF/applicationContext.xml
View File

@@ -12,21 +12,21 @@
<!-- Authenticate using a fixed user -->
<!--
<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="base" value="${base}" />
<property name="userDn" value="${userDn}" />
<property name="password" value="${password}" />
<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
</bean>
-->
<!-- Authenticate using the currently logged in user, retrieved by Acegi Security -->
<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="base" value="${base}" />
<property name="authenticationSource" ref="acegiAuthenticationSource" />
<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
<!--
Disable pooling if you want to test changing the password after a user has logged in,
perhaps in order to verify that AcegiAuthenticationSource works correctly.
@@ -35,7 +35,7 @@
-->
</bean>
<bean id="acegiAuthenticationSource" class="org.springframework.ldap.support.authentication.AcegiAuthenticationSource" />
<bean id="acegiAuthenticationSource" class="org.springframework.ldap.authentication.AcegiAuthenticationSource" />
<bean id="ldapOperations" class="org.springframework.ldap.core.LdapTemplate">
<constructor-arg ref="contextSource" />

4
spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/GroupDaoImplTest.java
View File

@@ -24,11 +24,11 @@ import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.samples.person.domain.Group;
import org.springframework.ldap.samples.person.domain.SearchCriteria;
import org.springframework.ldap.support.DirContextOperations;
import org.springframework.ldap.support.DistinguishedName;
/**
* Unit tests for the GroupDaoImpl class.

4
spring-ldap-person/src/test/java/org/springframework/ldap/samples/person/dao/PersonDaoImplTest.java
View File

@@ -24,11 +24,11 @@ import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.ContextMapper;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.samples.person.domain.Person;
import org.springframework.ldap.samples.person.domain.SearchCriteria;
import org.springframework.ldap.support.DirContextOperations;
import org.springframework.ldap.support.DistinguishedName;
/**
* Unit tests for the PersonDaoImpl class.