diff --git a/spring-ldap-tiger/.classpath b/spring-ldap-tiger/.classpath
index b4efd0bf..5e93d314 100644
--- a/spring-ldap-tiger/.classpath
+++ b/spring-ldap-tiger/.classpath
@@ -1,51 +1,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spring-ldap-tiger/ivy.xml b/spring-ldap-tiger/ivy.xml
index 17f84f80..9b7f720d 100644
--- a/spring-ldap-tiger/ivy.xml
+++ b/spring-ldap-tiger/ivy.xml
@@ -20,8 +20,8 @@
-
+ rev="latest.integration" conf="global->default;source->source" />
+
diff --git a/spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml b/spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml
index a5fafb40..d5651f9c 100644
--- a/spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml
+++ b/spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml
@@ -8,6 +8,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+
+
+
diff --git a/spring-ldap-tiger/src/itest/java/org/springframework/ldap/LdapServerManager.java b/spring-ldap-tiger/src/itest/java/org/springframework/ldap/LdapServerManager.java
index 937e14fe..58951783 100644
--- a/spring-ldap-tiger/src/itest/java/org/springframework/ldap/LdapServerManager.java
+++ b/spring-ldap-tiger/src/itest/java/org/springframework/ldap/LdapServerManager.java
@@ -35,24 +35,29 @@ 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.DistinguishedName;
-import org.springframework.ldap.core.support.DefaultDirObjectFactory;
+import org.springframework.ldap.core.support.BaseLdapPathAware;
/**
* Utility class to initialize the apache directory server for use in the
* integration tests.
*
* @author Mattias Arthursson
- *
*/
-public class LdapServerManager implements DisposableBean {
+public class LdapServerManager implements DisposableBean, BaseLdapPathAware {
private static Log log = LogFactory.getLog(LdapServerManager.class);
private ContextSource contextSource;
+ private DistinguishedName baseLdapPath;
+
public void setContextSource(ContextSource contextSource) {
this.contextSource = contextSource;
}
+ public void setBaseLdapPath(DistinguishedName baseLdapPath) {
+ this.baseLdapPath = baseLdapPath;
+ }
+
public void destroy() throws Exception {
Properties env = new Properties();
env.setProperty(Context.INITIAL_CONTEXT_FACTORY,
@@ -75,11 +80,10 @@ public class LdapServerManager implements DisposableBean {
// Different test cases have different base paths. This means that the
// starting point will be different.
- if (ctx.getEnvironment().get(
- DefaultDirObjectFactory.JNDI_ENV_BASE_PATH_KEY) != null) {
+ if (baseLdapPath.size() != 0) {
startingPoint = DistinguishedName.EMPTY_PATH;
} else {
- startingPoint = new DistinguishedName("dc=jayway,dc=se");
+ startingPoint = new DistinguishedName(baseLdapPath);
}
try {