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:38:27 +00:00
parent e4c9a36eaf
commit 1690853dc3
23 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,11 +9,11 @@
<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="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">

6
sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
View File

@@ -12,15 +12,15 @@
</bean>
<bean id="contextSource"
class="org.springframework.ldap.support.LdapContextSource">
class="org.springframework.ldap.core.support.LdapContextSource">
<property name="urls" value="${urls}" />
<property name="authenticationSource">
<bean
class="org.springframework.ldap.support.authentication.AcegiAuthenticationSource" />
class="org.springframework.ldap.authentication.AcegiAuthenticationSource" />
</property>
<property name="dirObjectFactory"
value="org.springframework.ldap.support.DefaultDirObjectFactory" />
value="org.springframework.ldap.core.DefaultDirObjectFactory" />
</bean>
<bean id="ldapTemplate" class="org.springframework.ldap.core.LdapTemplate">

4
sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml
View File

@@ -10,11 +10,11 @@
<property name="location" value="classpath:/conf/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="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
<property name="dirObjectFactory" value="org.springframework.ldap.core.DefaultDirObjectFactory" />
<property name="base" value="${base}" />
</bean>

4
sandbox/src/itest/java/conf/ldapTemplateTestContext.xml
View File

@@ -10,11 +10,11 @@
<property name="location" value="classpath:/conf/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="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">

4
sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
View File

@@ -12,14 +12,14 @@
</bean>
<bean id="contextSourceTarget"
class="org.springframework.ldap.support.LdapContextSource">
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="pooled" value="false" />
<property name="dirObjectFactory"
value="org.springframework.ldap.support.DefaultDirObjectFactory" />
value="org.springframework.ldap.core.DefaultDirObjectFactory" />
</bean>
<bean id="contextSource"

4
sandbox/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.support.DefaultDirObjectFactory;
import org.springframework.ldap.support.DistinguishedName;
import org.springframework.ldap.core.DefaultDirObjectFactory;
import org.springframework.ldap.core.DistinguishedName;
/**
* Utility class to initialize the apache directory server for use in the

4
sandbox/src/itest/java/org/springframework/ldap/support/transaction/DummyDaoImpl.java
View File

@@ -1,8 +1,8 @@
package org.springframework.ldap.support.transaction;
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;
public class DummyDaoImpl {
private LdapTemplate ldapTemplate;

2
sandbox/src/main/java/org/springframework/ldap/support/TlsContextSource.java
View File

@@ -12,7 +12,7 @@ import javax.naming.ldap.StartTlsResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.ldap.support.LdapContextSource;
import org.springframework.ldap.core.support.LdapContextSource;
/**
* ContextSource implementation which overrides setupAuthenticatedEnvironment to

2
sandbox/src/main/java/org/springframework/ldap/support/control/VirtualListViewRequestControl.java
View File

@@ -143,7 +143,7 @@ public class VirtualListViewRequestControl implements DirContextProcessor {
}
/*
* @see org.springframework.ldap.support.control.AbstractRequestControlDirContextProcessor#createRequestControl()
* @see org.springframework.ldap.control.AbstractRequestControlDirContextProcessor#createRequestControl()
*/
public Control createRequestControl() {
try {

2
sandbox/src/main/java/org/springframework/ldap/support/transaction/BindRollbackOperation.java
View File

@@ -19,8 +19,8 @@ import javax.naming.Name;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DirContextOperations;
/**
* A {@link CompensatingTransactionRollbackOperation} to rollback an unbind

2
sandbox/src/main/java/org/springframework/ldap/support/transaction/LdapUtils.java
View File

@@ -26,7 +26,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.ldap.core.ContextSource;
import org.springframework.ldap.support.DistinguishedName;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.Assert;

2
sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRecordingOperation.java
View File

@@ -19,8 +19,8 @@ import javax.naming.Name;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DirContextAdapter;
/**
* A {@link CompensatingTransactionRecordingOperation} keeping track of a rebind

2
sandbox/src/main/java/org/springframework/ldap/support/transaction/RebindRollbackOperation.java
View File

@@ -19,8 +19,8 @@ import javax.naming.Name;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DirContextOperations;
/**
* A {@link CompensatingTransactionRollbackOperation} to rollback a rebind

2
sandbox/src/main/java/org/springframework/ldap/support/transaction/UnbindRecordingOperation.java
View File

@@ -17,8 +17,8 @@ package org.springframework.ldap.support.transaction;
import javax.naming.Name;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DirContextAdapter;
/**
* {@link CompensatingTransactionRecordingOperation} to keep track of unbind

2
sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRecordingOperationTest.java
View File

@@ -3,8 +3,8 @@ package org.springframework.ldap.support.transaction;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DistinguishedName;
public class BindRecordingOperationTest extends TestCase {
private MockControl ldapOperationsControl;

4
sandbox/src/test/java/org/springframework/ldap/support/transaction/BindRollbackOperationTest.java
View File

@@ -3,9 +3,9 @@ package org.springframework.ldap.support.transaction;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DirContextOperations;
import org.springframework.ldap.support.DistinguishedName;
public class BindRollbackOperationTest extends TestCase {
private MockControl ldapOperationsControl;

2
sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRecordingOperationTest.java
View File

@@ -12,8 +12,8 @@ import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.AttributesMapper;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DistinguishedName;
public class ModifyAttributesRecordingOperationTest extends TestCase {
private MockControl ldapOperationsControl;

2
sandbox/src/test/java/org/springframework/ldap/support/transaction/ModifyAttributesRollbackOperationTest.java
View File

@@ -4,8 +4,8 @@ import javax.naming.Name;
import javax.naming.directory.ModificationItem;
import org.easymock.MockControl;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DistinguishedName;
import junit.framework.TestCase;

4
sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRecordingOperationTest.java
View File

@@ -3,9 +3,9 @@ package org.springframework.ldap.support.transaction;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DirContextAdapter;
import org.springframework.ldap.support.DistinguishedName;
public class RebindRecordingOperationTest extends TestCase {
private MockControl ldapOperationsControl;

4
sandbox/src/test/java/org/springframework/ldap/support/transaction/RebindRollbackOperationTest.java
View File

@@ -3,9 +3,9 @@ package org.springframework.ldap.support.transaction;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.DirContextOperations;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DirContextOperations;
import org.springframework.ldap.support.DistinguishedName;
public class RebindRollbackOperationTest extends TestCase {

2
sandbox/src/test/java/org/springframework/ldap/support/transaction/RenameRollbackOperationTest.java
View File

@@ -1,8 +1,8 @@
package org.springframework.ldap.support.transaction;
import org.easymock.MockControl;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DistinguishedName;
import junit.framework.TestCase;

4
sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRecordingOperationTest.java
View File

@@ -1,9 +1,9 @@
package org.springframework.ldap.support.transaction;
import org.easymock.MockControl;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DirContextAdapter;
import org.springframework.ldap.support.DistinguishedName;
import junit.framework.TestCase;

2
sandbox/src/test/java/org/springframework/ldap/support/transaction/UnbindRollbackOperationTest.java
View File

@@ -3,8 +3,8 @@ package org.springframework.ldap.support.transaction;
import junit.framework.TestCase;
import org.easymock.MockControl;
import org.springframework.ldap.core.DistinguishedName;
import org.springframework.ldap.core.LdapOperations;
import org.springframework.ldap.support.DistinguishedName;
public class UnbindRollbackOperationTest extends TestCase {
private MockControl ldapOperationsControl;