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

LDAP-232: Finalized migration to ApacheDS 1.5.5 for integration tests.

Browse Source
This commit is contained in:
Mattias Hellborg Arthursson
2013-08-14 10:36:46 +02:00
parent 2b2cbf0f38
commit 837bc489ef
11 changed files with 78 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test-support/build.gradle
View File

@@ -3,7 +3,7 @@ dependencies {
compile project(":spring-ldap-core"),
project(":spring-ldap-ldif-core"),
"com.google.code.typica:typica:1.3",
"commons-io:commons-io:1.4",
"commons-io:commons-io:2.4",
"javax.xml:jsr173:1.0",
"javax.activation:activation:1.1",
"javax.xml.bind:jaxb-api:2.1",
@@ -12,11 +12,13 @@ dependencies {
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-test:$springVersion",
"log4j:log4j:$log4jVersion",
"org.slf4j:slf4j-log4j12:1.0.1"
"org.apache.directory.server:apacheds-all:1.5.5"
compile "org.apache.directory.server:apacheds-all:1.5.5",
"org.slf4j:slf4j-log4j12:1.5.6"
compile ("org.slf4j:slf4j-log4j12:1.5.6") {
exclude group: 'javax.jms'
exclude group: 'com.sun.jdmk'
exclude group: 'com.sun.jmx'
}
provided "junit:junit:$junitVersion"
}

6
test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
View File

@@ -88,7 +88,7 @@ public class LdapTestUtils {
}
/**
* Start an embedded Apache Directory Server.
* Start an embedded Apache Directory Server. Only one embedded server will be permitted in the same JVM.
*
* @param port the port on which the server will be listening.
* @param defaultPartitionSuffix The default base suffix that will be used
@@ -96,6 +96,7 @@ public class LdapTestUtils {
* @param defaultPartitionName The name to use in the directory server
* configuration for the default base suffix.
*
* @throws IllegalStateException if an embedded server is already started.
* @since 1.3.2
*/
public static void startEmbeddedServer(int port, String defaultPartitionSuffix, String defaultPartitionName) {
@@ -110,6 +111,9 @@ public class LdapTestUtils {
}
}
/**
* @deprecated use {@link #startEmbeddedServer(int, String, String)} instead.
*/
public static DirContext startApacheDirectoryServer(int port, String defaultPartitionSuffix,
String defaultPartitionName, String principal, String credentials) throws NamingException {
return LdapTestUtils.startApacheDirectoryServer(port, defaultPartitionSuffix, defaultPartitionName, principal,