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

Moved DefaultDirObjectFactory from ldap.core to ldap.core.support.

Browse Source
This commit is contained in:
Ulrik Sandberg
2007-04-10 13:12:21 +00:00
parent 2db9ef9989
commit 1cb4441fce
15 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
spring-ldap/src/itest/java/conf/ldapAndJdbcTransactionTestContext.xml
View File

@@ -19,7 +19,7 @@
<property name="base" value="${base}" />
<property name="pooled" value="false" />
<property name="dirObjectFactory"
value="org.springframework.ldap.core.DefaultDirObjectFactory" />
value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
</bean>
<bean id="dataSource"

2
spring-ldap/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
View File

@@ -20,7 +20,7 @@
class="org.springframework.ldap.authentication.AcegiAuthenticationSource" />
</property>
<property name="dirObjectFactory"
value="org.springframework.ldap.core.DefaultDirObjectFactory" />
value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">

2
spring-ldap/src/itest/java/conf/ldapTemplateNoBaseSuffixTestContext.xml
View File

@@ -14,7 +14,7 @@
<property name="urls" value="${urls}" />
<property name="userDn" value="${userDn}" />
<property name="password" value="${password}" />
<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
<property name="dirObjectFactory" value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">

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

@@ -15,7 +15,7 @@
<property name="userDn" value="${userDn}" />
<property name="password" value="${password}" />
<property name="base" value="${base}" />
<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
<property name="dirObjectFactory" value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">

2
spring-ldap/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
View File

@@ -19,7 +19,7 @@
<property name="base" value="${base}" />
<property name="pooled" value="false" />
<property name="dirObjectFactory"
value="org.springframework.ldap.core.DefaultDirObjectFactory" />
value="org.springframework.ldap.core.support.DefaultDirObjectFactory" />
</bean>
<bean id="contextSource"

2
spring-ldap/src/itest/java/org/springframework/ldap/LdapServerManager.java
View File

@@ -34,8 +34,8 @@ import org.apache.directory.server.jndi.ServerContextFactory;
import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.DefaultDirObjectFactory;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.support.DefaultDirObjectFactory;
/**
* Utility class to initialize the apache directory server for use in the

2
spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateContextMapperITest.java
View File

@@ -37,7 +37,7 @@ public class LdapTemplateContextMapperITest extends
}
/**
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
* being set in the ContextSource.
*/
public void testSearch_ContextMapper() {

4
spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateLookupITest.java
View File

@@ -41,7 +41,7 @@ public class LdapTemplateLookupITest extends
}
/**
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
* being set in the ContextSource.
*/
public void testLookup_Plain() {
@@ -133,7 +133,7 @@ public class LdapTemplateLookupITest extends
}
/**
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
* being set in the ContextSource.
*/
public void testLookup_ContextMapper() {

2
spring-ldap/src/itest/java/org/springframework/ldap/LdapTemplateNoBaseSuffixITest.java
View File

@@ -37,7 +37,7 @@ public class LdapTemplateNoBaseSuffixITest extends
}
/**
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.DefaultDirObjectFactory})
* This method depends on a DirObjectFactory ({@link org.springframework.ldap.core.support.DefaultDirObjectFactory})
* being set in the ContextSource.
*/
public void testLookup_Plain() {

2
spring-ldap/src/main/java/org/springframework/ldap/core/ContextMapper.java
View File

@@ -20,6 +20,8 @@ import javax.naming.Binding;
import javax.naming.Name;
import javax.naming.directory.SearchResult;
import org.springframework.ldap.core.support.DefaultDirObjectFactory;
/**
* An interface used by LdapTemplate to map LDAP Contexts to beans. Responsible

2
spring-ldap/src/main/java/org/springframework/ldap/core/DirContextAdapter.java
View File

@@ -51,7 +51,7 @@ import org.springframework.ldap.support.LdapUtils;
/**
* Implements the interesting methods of the DirContext interface. In particular
* it contains utility methods for getting and setting Attributes. Using the
* {@link org.springframework.ldap.core.DefaultDirObjectFactory} in your
* {@link org.springframework.ldap.core.support.DefaultDirObjectFactory} in your
* ContextSource you may receive instances of this class from searches and
* lookups. This can be particularly useful when updating data, since this class
* implements {@link org.springframework.ldap.core.AttributeModificationsAware},

3
spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
View File

@@ -30,7 +30,6 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.JdkVersion;
import org.springframework.ldap.core.AuthenticationSource;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.core.DefaultDirObjectFactory;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.support.LdapUtils;
@@ -53,7 +52,7 @@ import org.springframework.ldap.support.LdapUtils;
* properties are set, in order to finish up initialization.
*
* @see org.springframework.ldap.core.LdapTemplate
* @see org.springframework.ldap.core.DefaultDirObjectFactory
* @see org.springframework.ldap.core.support.DefaultDirObjectFactory
* @see org.springframework.ldap.core.support.LdapContextSource
* @see org.springframework.ldap.core.support.DirContextSource
*

5
spring-ldap/src/main/java/org/springframework/ldap/core/DefaultDirObjectFactory.java → spring-ldap/src/main/java/org/springframework/ldap/core/support/DefaultDirObjectFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.ldap.core;
package org.springframework.ldap.core.support;
import java.util.Hashtable;
@@ -23,6 +23,9 @@ import javax.naming.Name;
import javax.naming.directory.Attributes;
import javax.naming.spi.DirObjectFactory;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DistinguishedName;
/**
* Default implementation of the DirObjectFactory interface. Creates a

1
spring-ldap/src/test/java/org/springframework/ldap/core/support/DefaultDirObjectFactoryTest.java
View File

@@ -24,7 +24,6 @@ import javax.naming.directory.BasicAttributes;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.DefaultDirObjectFactory;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DistinguishedName;