From 1abcfbdf52d08e785ee3b7089f6226c5ce567530 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 19 Jan 2022 16:30:51 -0700 Subject: [PATCH] Add samples to build Issue gh-610 --- samples/odm/build.gradle | 7 ++++++- samples/odm/src/main/resources/applicationContext.xml | 2 +- samples/odm/src/test/resources/config/testContext.xml | 6 +++--- samples/plain/build.gradle | 8 +++++++- .../ldap/samples/plain/web/DefaultController.java | 10 ++++++---- .../plain/src/main/resources/applicationContext.xml | 6 +++--- .../plain/src/test/resources/config/testContext.xml | 4 ++-- settings.gradle | 4 ++-- 8 files changed, 30 insertions(+), 17 deletions(-) diff --git a/samples/odm/build.gradle b/samples/odm/build.gradle index a63266c5..abf88c88 100644 --- a/samples/odm/build.gradle +++ b/samples/odm/build.gradle @@ -1,20 +1,25 @@ plugins { + id 'io.spring.convention.spring-module' id "org.gretty" id 'war' } dependencies { + management platform(project(":spring-ldap-dependencies")) + implementation project(':spring-ldap-test'), 'javax.servlet:jstl:1.2', "org.springframework:spring-context", "org.springframework:spring-webmvc", - "org.springframework.data:spring-data-commons", "commons-lang:commons-lang" compileOnly "javax.servlet:servlet-api:2.5" runtimeOnly 'ch.qos.logback:logback-classic:1.0.13' + testImplementation "com.unboundid:unboundid-ldapsdk" + testImplementation platform('org.junit:junit-bom') + testImplementation "org.junit.vintage:junit-vintage-engine" testImplementation "org.springframework:spring-test", "junit:junit", "org.assertj:assertj-core" diff --git a/samples/odm/src/main/resources/applicationContext.xml b/samples/odm/src/main/resources/applicationContext.xml index 002219b3..ed686924 100644 --- a/samples/odm/src/main/resources/applicationContext.xml +++ b/samples/odm/src/main/resources/applicationContext.xml @@ -27,7 +27,7 @@ - + diff --git a/samples/odm/src/test/resources/config/testContext.xml b/samples/odm/src/test/resources/config/testContext.xml index 25307086..a637284d 100644 --- a/samples/odm/src/test/resources/config/testContext.xml +++ b/samples/odm/src/test/resources/config/testContext.xml @@ -16,7 +16,7 @@ - + @@ -28,8 +28,8 @@ This is for test and demo purposes only - EmbeddedLdapServerFactoryBean launches an in-process LDAP server. --> - - + + diff --git a/samples/plain/build.gradle b/samples/plain/build.gradle index e0b13504..abf88c88 100644 --- a/samples/plain/build.gradle +++ b/samples/plain/build.gradle @@ -1,19 +1,25 @@ plugins { + id 'io.spring.convention.spring-module' id "org.gretty" id 'war' } dependencies { + management platform(project(":spring-ldap-dependencies")) + implementation project(':spring-ldap-test'), 'javax.servlet:jstl:1.2', "org.springframework:spring-context", "org.springframework:spring-webmvc", - "org.springframework.data:spring-data-commons" + "commons-lang:commons-lang" compileOnly "javax.servlet:servlet-api:2.5" runtimeOnly 'ch.qos.logback:logback-classic:1.0.13' + testImplementation "com.unboundid:unboundid-ldapsdk" + testImplementation platform('org.junit:junit-bom') + testImplementation "org.junit.vintage:junit-vintage-engine" testImplementation "org.springframework:spring-test", "junit:junit", "org.assertj:assertj-core" diff --git a/samples/plain/src/main/java/org/springframework/ldap/samples/plain/web/DefaultController.java b/samples/plain/src/main/java/org/springframework/ldap/samples/plain/web/DefaultController.java index 8aef5fbf..e02e9f8b 100644 --- a/samples/plain/src/main/java/org/springframework/ldap/samples/plain/web/DefaultController.java +++ b/samples/plain/src/main/java/org/springframework/ldap/samples/plain/web/DefaultController.java @@ -1,6 +1,12 @@ package org.springframework.ldap.samples.plain.web; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; + +import javax.naming.Name; + import org.apache.commons.lang.StringUtils; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ldap.core.DirContextOperations; import org.springframework.ldap.samples.plain.dao.PersonDao; @@ -14,10 +20,6 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.naming.Name; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - /** * Default controller. * diff --git a/samples/plain/src/main/resources/applicationContext.xml b/samples/plain/src/main/resources/applicationContext.xml index 475a7001..e83b3868 100644 --- a/samples/plain/src/main/resources/applicationContext.xml +++ b/samples/plain/src/main/resources/applicationContext.xml @@ -27,7 +27,7 @@ - + @@ -39,8 +39,8 @@ This is for test and demo purposes only - EmbeddedLdapServerFactoryBean launches an in-process LDAP server. --> - - + + diff --git a/samples/plain/src/test/resources/config/testContext.xml b/samples/plain/src/test/resources/config/testContext.xml index a595b5af..fd845cfc 100644 --- a/samples/plain/src/test/resources/config/testContext.xml +++ b/samples/plain/src/test/resources/config/testContext.xml @@ -27,8 +27,8 @@ This is for test and demo purposes only - EmbeddedLdapServerFactoryBean launches an in-process LDAP server. --> - - + + diff --git a/settings.gradle b/settings.gradle index 4bff47c9..db70184c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,8 +36,8 @@ include 'test/integration-tests' include 'test/integration-tests-openldap' include 'test/integration-tests-sunone' include 'test/integration-tests-ad' -//include 'samples/plain' -//include 'samples/odm' +include 'samples/plain' +include 'samples/odm' rootProject.children.each { p->