diff --git a/gradle/sample-war.gradle b/gradle/sample-war.gradle
index a7adde3c..64f9548c 100644
--- a/gradle/sample-war.gradle
+++ b/gradle/sample-war.gradle
@@ -7,3 +7,5 @@ apply plugin: 'jetty'
 sonarRunner {
     skipProject = true
 }
+
+build.dependsOn generatePom
\ No newline at end of file
diff --git a/samples/odm/pom.xml b/samples/odm/pom.xml
new file mode 100644
index 00000000..92a56469
--- /dev/null
+++ b/samples/odm/pom.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.ldap</groupId>
+  <artifactId>spring-ldap-odm-sample</artifactId>
+  <version>2.0.0.CI-SNAPSHOT</version>
+  <packaging>war</packaging>
+  <name>spring-ldap-odm-sample</name>
+  <description>spring-ldap-odm-sample</description>
+  <url>http://www.springframework.org/ldap</url>
+  <organization>
+    <name>SpringSource</name>
+    <url>http://springsource.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
+    <developer>
+      <id>marthursson</id>
+      <name>Mattias Hellborg Arthursson</name>
+      <email>mattias@261consulting.com</email>
+      <organization>261 Consulting</organization>
+      <organizationUrl>http://www.261consulting.com</organizationUrl>
+    </developer>
+    <developer>
+      <id>ulsa</id>
+      <name>Ulrik Sandberg</name>
+      <email>ulrik.sandberg@jayway.com</email>
+      <organization>Jayway</organization>
+      <organizationUrl>http://www.jayway.com</organizationUrl>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Eric Dalquist</name>
+    </contributor>
+    <contributor>
+      <name>Marius Scurtescu</name>
+    </contributor>
+    <contributor>
+      <name>Tim Terry</name>
+    </contributor>
+    <contributor>
+      <name>Keith Barlow</name>
+    </contributor>
+    <contributor>
+      <name>Paul Harvey</name>
+    </contributor>
+    <contributor>
+      <name>Marvin S. Addison</name>
+    </contributor>
+  </contributors>
+  <scm>
+    <connection>scm:git:git://github.com/SpringSource/spring-ldap</connection>
+    <developerConnection>scm:git:git://github.com/SpringSource/spring-ldap</developerConnection>
+    <url>https://github.com/SpringSource/spring-ldap</url>
+  </scm>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>8.1.14.v20131031</version>
+        <configuration>
+          <webAppConfig>
+            <contextPath>/spring-ldap-odm-sample</contextPath>
+          </webAppConfig>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>http://repo.springsource.org/libs-snapshot</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.0.13</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.ldap</groupId>
+      <artifactId>spring-ldap-test</artifactId>
+      <version>2.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>3.2.4.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.2.4.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.2.4.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples/plain/build.gradle b/samples/plain/build.gradle
index c1e636d4..87635a77 100644
--- a/samples/plain/build.gradle
+++ b/samples/plain/build.gradle
@@ -2,13 +2,14 @@ apply from: SAMPLE_WAR_GRADLE
 
 dependencies {
     compile project(':spring-ldap-test'),
-            'log4j:log4j:1.2.9',
             'javax.servlet:jstl:1.2',
             "org.springframework:spring-context:$springVersion",
             "org.springframework:spring-webmvc:$springVersion"
 
     provided "javax.servlet:servlet-api:2.5"
 
+    runtime 'ch.qos.logback:logback-classic:1.0.13'
+
     testCompile "org.springframework:spring-test:$springVersion",
                 "junit:junit:$junitVersion"
 }
\ No newline at end of file
diff --git a/samples/plain/pom.xml b/samples/plain/pom.xml
new file mode 100644
index 00000000..3a86f1c7
--- /dev/null
+++ b/samples/plain/pom.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework.ldap</groupId>
+  <artifactId>spring-ldap-plain-sample</artifactId>
+  <version>2.0.0.CI-SNAPSHOT</version>
+  <packaging>war</packaging>
+  <name>spring-ldap-plain-sample</name>
+  <description>spring-ldap-plain-sample</description>
+  <url>http://www.springframework.org/ldap</url>
+  <organization>
+    <name>SpringSource</name>
+    <url>http://springsource.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>rwinch</id>
+      <name>Rob Winch</name>
+      <email>rwinch@gopivotal.com</email>
+    </developer>
+    <developer>
+      <id>marthursson</id>
+      <name>Mattias Hellborg Arthursson</name>
+      <email>mattias@261consulting.com</email>
+      <organization>261 Consulting</organization>
+      <organizationUrl>http://www.261consulting.com</organizationUrl>
+    </developer>
+    <developer>
+      <id>ulsa</id>
+      <name>Ulrik Sandberg</name>
+      <email>ulrik.sandberg@jayway.com</email>
+      <organization>Jayway</organization>
+      <organizationUrl>http://www.jayway.com</organizationUrl>
+    </developer>
+  </developers>
+  <contributors>
+    <contributor>
+      <name>Eric Dalquist</name>
+    </contributor>
+    <contributor>
+      <name>Marius Scurtescu</name>
+    </contributor>
+    <contributor>
+      <name>Tim Terry</name>
+    </contributor>
+    <contributor>
+      <name>Keith Barlow</name>
+    </contributor>
+    <contributor>
+      <name>Paul Harvey</name>
+    </contributor>
+    <contributor>
+      <name>Marvin S. Addison</name>
+    </contributor>
+  </contributors>
+  <scm>
+    <connection>scm:git:git://github.com/SpringSource/spring-ldap</connection>
+    <developerConnection>scm:git:git://github.com/SpringSource/spring-ldap</developerConnection>
+    <url>https://github.com/SpringSource/spring-ldap</url>
+  </scm>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.3</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>8.1.14.v20131031</version>
+        <configuration>
+          <webAppConfig>
+            <contextPath>/spring-ldap-plain-sample</contextPath>
+          </webAppConfig>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>spring-snasphot</id>
+      <url>http://repo.springsource.org/libs-snapshot</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.0.13</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.10</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.ldap</groupId>
+      <artifactId>spring-ldap-test</artifactId>
+      <version>2.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>3.2.4.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>3.2.4.RELEASE</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>3.2.4.RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/samples/plain/src/main/resources/logback.xml b/samples/plain/src/main/resources/logback.xml
new file mode 100644
index 00000000..afaebf8e
--- /dev/null
+++ b/samples/plain/src/main/resources/logback.xml
@@ -0,0 +1,14 @@
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/samples/user-admin/pom.xml b/samples/user-admin/pom.xml
index 55f5dd91..a8bd33aa 100644
--- a/samples/user-admin/pom.xml
+++ b/samples/user-admin/pom.xml
@@ -101,12 +101,6 @@
     </repository>
   </repositories>
   <dependencies>
-    <dependency>
-      <groupId>org.springframework.ldap</groupId>
-      <artifactId>spring-ldap-test</artifactId>
-      <version>2.0.0.CI-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -125,6 +119,12 @@
       <version>15.0</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.ldap</groupId>
+      <artifactId>spring-ldap-test</artifactId>
+      <version>2.0.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jstl</artifactId>