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

samples/simple-odm/build.gradle

@@ -7,7 +7,11 @@ dependencies {
             "org.springframework:spring-context:$springVersion",
             "commons-pool:commons-pool:$commonsPoolVersion"
 
-    runtime "log4j:log4j:$log4jVersion"
+    runtime ("log4j:log4j:$log4jVersion") {
+        exclude group: 'javax.jms'
+        exclude group: 'com.sun.jdmk'
+        exclude group: 'com.sun.jmx'
+    }
 
     testCompile project(":spring-ldap-test"),
                 "junit:junit:$junitVersion"

samples/simple-odm/src/test/java/org/springframework/ldap/odm/sample/test/TestSearchForPeople.java

@@ -1,10 +1,5 @@
 package org.springframework.ldap.odm.sample.test;
 
-import static org.junit.Assert.assertEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -17,6 +12,11 @@ import org.springframework.ldap.core.support.LdapContextSource;
 import org.springframework.ldap.odm.sample.SearchForPeople;
 import org.springframework.ldap.test.LdapTestUtils;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import static org.junit.Assert.assertEquals;
+
 public class TestSearchForPeople {
     // Base DN for test data
     private static final DistinguishedName baseName = new DistinguishedName("o=Whoniverse");
@@ -30,12 +30,12 @@ public class TestSearchForPeople {
     @BeforeClass
     public static void setUpClass() throws Exception {
         // Start an LDAP server and import test data
-        LdapTestUtils.startApacheDirectoryServer(PORT, baseName.toString(), "odm-test", PRINCIPAL, CREDENTIALS, null);
+        LdapTestUtils.startEmbeddedServer(PORT, baseName.toString(), "odm-test");
     }
    
     @AfterClass
     public static void tearDownClass() throws Exception {
-        LdapTestUtils.destroyApacheDirectoryServer(PRINCIPAL, CREDENTIALS);
+        LdapTestUtils.shutdownEmbeddedServer();
     }
     
     @Before

samples/simple-odm/src/test/resources/testdata.ldif

@@ -81,7 +81,7 @@ telephonenumber: 11
 dn: cn=Bramble Harvey,ou=Doctors,o=Whoniverse
 objectClass: person
 objectClass: top
-cn: Bramble
+cn: Bramble Harvey
 description: Really not a Doctor
 sn: Harvey
 telephonenumber: 22