From f4c66734ace96b104257685f0b6cb2b27a281103 Mon Sep 17 00:00:00 2001
From: Mattias Arthursson <mattias.arthursson@gmail.com>
Date: Tue, 23 Oct 2007 18:09:51 +0000
Subject: [PATCH] Made spring-ldap-tiger tests run with different LDAP server
 port to avoid collision with port used in spring-ldap.

---
 spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml       | 2 +-
 spring-ldap-tiger/src/itest/java/conf/ldap.properties           | 2 +-
 .../ldap/core/simple/SimpleLdapTemplateITest.java               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml b/spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml
index 52694704..a5fafb40 100644
--- a/spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml
+++ b/spring-ldap-tiger/src/itest/java/conf/apacheDsContext.xml
@@ -31,7 +31,7 @@
 		making it easier for the integration tests requiring OpenLDAP.
 	-->
 	<bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
-    	<property name="ldapPort" value="3900" />
+    	<property name="ldapPort" value="3901" />
     	<property name="contextPartitionConfigurations">
       		<set>
         		<ref bean="jaywayPartitionConfiguration"/>
diff --git a/spring-ldap-tiger/src/itest/java/conf/ldap.properties b/spring-ldap-tiger/src/itest/java/conf/ldap.properties
index 8843f1f1..6789a99b 100644
--- a/spring-ldap-tiger/src/itest/java/conf/ldap.properties
+++ b/spring-ldap-tiger/src/itest/java/conf/ldap.properties
@@ -1,4 +1,4 @@
-urls=ldap://127.0.0.1:3900
+urls=ldap://127.0.0.1:3901
 userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/spring-ldap-tiger/src/itest/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java b/spring-ldap-tiger/src/itest/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java
index a8a9115b..6593d119 100644
--- a/spring-ldap-tiger/src/itest/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java
+++ b/spring-ldap-tiger/src/itest/java/org/springframework/ldap/core/simple/SimpleLdapTemplateITest.java
@@ -21,7 +21,7 @@ import org.springframework.ldap.AbstractLdapTemplateIntegrationTest;
 import org.springframework.ldap.core.DirContextAdapter;
 import org.springframework.ldap.core.DirContextOperations;
 
-public abstract class SimpleLdapTemplateITest extends AbstractLdapTemplateIntegrationTest {
+public class SimpleLdapTemplateITest extends AbstractLdapTemplateIntegrationTest {
 
 	private SimpleLdapTemplate ldapTemplate;