From 0b2811bfeed9573ebab1592bedd4aa8dce578d4c Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Sun, 13 Jan 2008 23:07:35 +0000
Subject: [PATCH] Fixed up javadoc warnings and source paths. Now using
 BaseLdapPathAware on all LdapServerManagers.

---
 spring-ldap-tiger/.classpath                  | 102 +++++++++---------
 spring-ldap-tiger/ivy.xml                     |   4 +-
 .../src/itest/java/conf/apacheDsContext.xml   |   5 +
 .../ldap/LdapServerManager.java               |  16 +--
 4 files changed, 68 insertions(+), 59 deletions(-)

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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/itest/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/global/commons-lang.jar"/>
-	<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/global/ldapbp.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-beans.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-context.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-core.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-dao.jar"/>
-	<classpathentry kind="lib" path="lib/global/spring-ldap.jar"/>
-	<classpathentry kind="lib" path="lib/test/antlr.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-core-shared.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-core.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-kerberos-shared.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-protocol-changepw.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-protocol-kerberos.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-protocol-ldap.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-protocol-shared.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-server-jndi.jar"/>
-	<classpathentry kind="lib" path="lib/test/apacheds-server-main.jar"/>
-	<classpathentry kind="lib" path="lib/test/backport-util-concurrent.jar"/>
-	<classpathentry kind="lib" path="lib/test/cglib-nodep.jar"/>
-	<classpathentry kind="lib" path="lib/test/clover.jar"/>
-	<classpathentry kind="lib" path="lib/test/commons-collections.jar"/>
-	<classpathentry kind="lib" path="lib/test/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/test/DDSteps.jar"/>
-	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
-	<classpathentry kind="lib" path="lib/test/ehcache-constructs.jar"/>
-	<classpathentry kind="lib" path="lib/test/ehcache.jar"/>
-	<classpathentry kind="lib" path="lib/test/gsbase.jar"/>
-	<classpathentry kind="lib" path="lib/test/jdbm.jar"/>
-	<classpathentry kind="lib" path="lib/test/junit-addons.jar"/>
-	<classpathentry kind="lib" path="lib/test/junit.jar"/>
-	<classpathentry kind="lib" path="lib/test/junitperf.jar"/>
-	<classpathentry kind="lib" path="lib/test/jxl.jar"/>
-	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
-	<classpathentry kind="lib" path="lib/test/mina-core.jar"/>
-	<classpathentry kind="lib" path="lib/test/mina-filter-ssl.jar"/>
-	<classpathentry kind="lib" path="lib/test/shared-asn1-codec.jar"/>
-	<classpathentry kind="lib" path="lib/test/shared-asn1.jar"/>
-	<classpathentry kind="lib" path="lib/test/shared-ldap.jar"/>
-	<classpathentry kind="lib" path="lib/test/slf4j-log4j12.jar"/>
-	<classpathentry kind="lib" path="lib/test/spring-mock.jar"/>
-	<classpathentry kind="lib" path="lib/test/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="lib/test/xmlParserAPIs.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/itest/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/global/commons-lang.jar"/>
+	<classpathentry kind="lib" path="lib/global/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/global/ldapbp.jar"/>
+	<classpathentry kind="lib" path="lib/global/spring-beans.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/spring-context.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/spring-core.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/spring-dao.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/global/spring-ldap.jar" sourcepath="lib/source/spring-ldap-src.zip"/>
+	<classpathentry kind="lib" path="lib/test/antlr.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-core-shared.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-core.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-kerberos-shared.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-protocol-changepw.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-protocol-kerberos.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-protocol-ldap.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-protocol-shared.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-server-jndi.jar"/>
+	<classpathentry kind="lib" path="lib/test/apacheds-server-main.jar"/>
+	<classpathentry kind="lib" path="lib/test/backport-util-concurrent.jar"/>
+	<classpathentry kind="lib" path="lib/test/cglib-nodep.jar"/>
+	<classpathentry kind="lib" path="lib/test/clover.jar"/>
+	<classpathentry kind="lib" path="lib/test/commons-collections.jar"/>
+	<classpathentry kind="lib" path="lib/test/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/test/DDSteps.jar"/>
+	<classpathentry kind="lib" path="lib/test/easymock.jar"/>
+	<classpathentry kind="lib" path="lib/test/ehcache-constructs.jar"/>
+	<classpathentry kind="lib" path="lib/test/ehcache.jar"/>
+	<classpathentry kind="lib" path="lib/test/gsbase.jar"/>
+	<classpathentry kind="lib" path="lib/test/jdbm.jar"/>
+	<classpathentry kind="lib" path="lib/test/junit-addons.jar"/>
+	<classpathentry kind="lib" path="lib/test/junit.jar"/>
+	<classpathentry kind="lib" path="lib/test/junitperf.jar"/>
+	<classpathentry kind="lib" path="lib/test/jxl.jar"/>
+	<classpathentry kind="lib" path="lib/test/log4j.jar"/>
+	<classpathentry kind="lib" path="lib/test/mina-core.jar"/>
+	<classpathentry kind="lib" path="lib/test/mina-filter-ssl.jar"/>
+	<classpathentry kind="lib" path="lib/test/shared-asn1-codec.jar"/>
+	<classpathentry kind="lib" path="lib/test/shared-asn1.jar"/>
+	<classpathentry kind="lib" path="lib/test/shared-ldap.jar"/>
+	<classpathentry kind="lib" path="lib/test/slf4j-log4j12.jar"/>
+	<classpathentry kind="lib" path="lib/test/spring-mock.jar" sourcepath="lib/source/spring-src.zip"/>
+	<classpathentry kind="lib" path="lib/test/xercesImpl.jar"/>
+	<classpathentry kind="lib" path="lib/test/xmlParserAPIs.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
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 @@
 
 	<dependencies defaultconf="global->default">
 		<dependency org="org.springframework" name="spring-ldap"
-			rev="latest.integration" />
-
+			rev="latest.integration" conf="global->default;source->source" />
+		
 		<!-- test time only dependencies -->
 		<dependency org="commons-collections" name="commons-collections"
 			rev="3.1" conf="test->default" />
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">
+
+	<!-- Used mainly to enable injecting base into LdapServerManager -->
+	<bean
+		class="org.springframework.ldap.core.support.BaseLdapPathBeanPostProcessor" />
+
 	<!-- JNDI environment variable -->
 	<bean id="environment"
 		class="org.springframework.beans.factory.config.PropertiesFactoryBean">
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 {