From 63692ed30a11414ae3b03678c29a453f3c70b35d Mon Sep 17 00:00:00 2001 From: Mattias Hellborg Arthursson Date: Fri, 16 Aug 2013 08:44:22 +0200 Subject: [PATCH] LDAP-251: Some additional tweaks to the gradle build - Made sure Main-Class is specified in odm jar - Fixed source inclusions/exclusions for idea and eclipse plugins - Made sure idea and eclipse plugins depend on javacc task - Removed pom files from build. --- .gitignore | 1 + build.gradle | 2 +- core-tiger/pom.xml | 49 -- core/build.gradle | 8 + core/javacc.gradle | 4 +- core/pom.xml | 105 ---- gradle/java-module.gradle | 2 +- ldif/ldif-batch/pom.xml | 45 -- ldif/ldif-core/pom.xml | 39 -- ldif/pom.xml | 19 - odm/build.gradle | 3 + odm/pom.xml | 161 ------- parent/pom.xml | 611 ------------------------ parent/tiger/pom.xml | 24 - pom.xml | 515 -------------------- samples/article-spring20/pom.xml | 190 -------- samples/article-spring30/pom.xml | 107 ----- samples/article/pom.xml | 75 --- samples/demos/demo-tiger/pom.xml | 58 --- samples/demos/demo/pom.xml | 52 -- samples/demos/pom.xml | 36 -- samples/pom.xml | 54 --- samples/samples-utils/pom.xml | 47 -- samples/simple-odm/pom.xml | 104 ---- sandbox/pom.xml | 61 --- test-support/pom.xml | 105 ---- test/integration-tests-openldap/pom.xml | 121 ----- test/integration-tests-sunone/pom.xml | 86 ---- test/integration-tests/pom.xml | 93 ---- test/pom.xml | 61 --- 30 files changed, 17 insertions(+), 2821 deletions(-) delete mode 100644 core-tiger/pom.xml delete mode 100644 core/pom.xml delete mode 100644 ldif/ldif-batch/pom.xml delete mode 100644 ldif/ldif-core/pom.xml delete mode 100644 ldif/pom.xml delete mode 100644 odm/pom.xml delete mode 100644 parent/pom.xml delete mode 100644 parent/tiger/pom.xml delete mode 100644 pom.xml delete mode 100644 samples/article-spring20/pom.xml delete mode 100644 samples/article-spring30/pom.xml delete mode 100644 samples/article/pom.xml delete mode 100644 samples/demos/demo-tiger/pom.xml delete mode 100644 samples/demos/demo/pom.xml delete mode 100644 samples/demos/pom.xml delete mode 100644 samples/pom.xml delete mode 100644 samples/samples-utils/pom.xml delete mode 100644 samples/simple-odm/pom.xml delete mode 100644 sandbox/pom.xml delete mode 100644 test-support/pom.xml delete mode 100644 test/integration-tests-openldap/pom.xml delete mode 100644 test/integration-tests-sunone/pom.xml delete mode 100644 test/integration-tests/pom.xml delete mode 100644 test/pom.xml diff --git a/.gitignore b/.gitignore index a41b34ac..6865286e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ build *.ipr .idea *.iws +pom.xml diff --git a/build.gradle b/build.gradle index f311b9bb..3ed9f5c0 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ ext.JAVA_MODULE_SCRIPT = "${GRADLE_SCRIPT_DIR}/java-module.gradle" ext.MAVEN_DEPLOYMENT_SCRIPT = "${GRADLE_SCRIPT_DIR}/maven-deployment.gradle" ext.JAVA_SCRIPT = "${GRADLE_SCRIPT_DIR}/java.gradle" -ext.coreModules = subprojects.findAll { p-> (!p.name.contains("test") && !p.name.contains("sample")) || p.name == "spring-ldap-test" } +ext.coreModules = subprojects.findAll { p-> (!p.name.contains("test") && !p.name.contains("sample") && !p.name.contains("sandbox")) || p.name == "spring-ldap-test" } configure(allprojects) { apply plugin: 'propdeps' diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml deleted file mode 100644 index 58b9befb..00000000 --- a/core-tiger/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../parent - - 4.0.0 - spring-ldap-core-tiger - jar - Spring LDAP Java 5 support - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - - - org.springframework.ldap - spring-ldap-core - - - org.springframework - spring-tx - - - junit - junit - - - org.easymock - easymock - 2.5.1 - test - - - diff --git a/core/build.gradle b/core/build.gradle index 94de9876..b77dc958 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -3,6 +3,14 @@ targetCompatibility = '1.4' apply from: 'javacc.gradle' +idea.module.excludeDirs = [ + file('.gradle'), + file('build/javacc'), + file('build/classes'), + file('build/tmp'), + file('build/dependency-cache'), + file('build/libs')] + dependencies { compile "commons-logging:commons-logging:$commonsLoggingVersion", "commons-lang:commons-lang:$commonsLangVersion", diff --git a/core/javacc.gradle b/core/javacc.gradle index 1dc885dc..15a83ec4 100644 --- a/core/javacc.gradle +++ b/core/javacc.gradle @@ -60,4 +60,6 @@ sourcesJar { } sourcesJar.dependsOn javacc -compileJava.dependsOn javacc \ No newline at end of file +compileJava.dependsOn javacc +ideaModule.dependsOn javacc +eclipseClasspath.dependsOn javacc \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml deleted file mode 100644 index efc8bea7..00000000 --- a/core/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../parent - - 4.0.0 - spring-ldap-core - jar - Spring LDAP Core - - - - - maven-compiler-plugin - - 1.4 - 1.4 - - - - org.codehaus.mojo - javacc-maven-plugin - 2.5 - - - - javacc - - - - - - - - - - - commons-logging - commons-logging - - - commons-lang - commons-lang - - - commons-pool - commons-pool - provided - - - com.sun - ldapbp - 1.0 - provided - - - - org.springframework - spring-core - - - org.springframework - spring-beans - - - org.springframework - spring-tx - - - org.springframework - spring-context - provided - - - org.springframework - spring-jdbc - provided - - - org.springframework - spring-orm - provided - - - - junit - junit - test - - - easymock - easymock - test - - - gsbase - gsbase - test - - - diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle index 625b2d77..8cfbce65 100644 --- a/gradle/java-module.gradle +++ b/gradle/java-module.gradle @@ -19,7 +19,7 @@ jar { manifest.attributes["Implementation-Title"] = project.name manifest.attributes["Implementation-Version"] = project.version - from("${rootProject.projectDir}/src/dist") { + from("${rootProject.projectDir}") { include "license.txt" include "notice.txt" into "META-INF" diff --git a/ldif/ldif-batch/pom.xml b/ldif/ldif-batch/pom.xml deleted file mode 100644 index 307ae18b..00000000 --- a/ldif/ldif-batch/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - org.springframework.ldap - spring-ldap-parent-tiger - 1.3.2.CI-SNAPSHOT - ../../parent/tiger/pom.xml - - 4.0.0 - spring-ldap-ldif-batch - Spring LDAP LDIF Batch - Classes for integration with the Spring Batch Framework - - 2.0.3.RELEASE - - - - org.springframework.batch - spring-batch-core - ${spring-batch.version} - compile - - - org.springframework.batch - spring-batch-infrastructure - ${spring-batch.version} - compile - - - org.springframework.batch - spring-batch-test - ${spring-batch.version} - test - - - org.springframework.ldap - spring-ldap-ldif-core - ${project.version} - compile - - - junit - junit - - - diff --git a/ldif/ldif-core/pom.xml b/ldif/ldif-core/pom.xml deleted file mode 100644 index 3d1f8f8e..00000000 --- a/ldif/ldif-core/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - org.springframework.ldap - spring-ldap-parent-tiger - 1.3.2.CI-SNAPSHOT - ../../parent/tiger - - 4.0.0 - spring-ldap-ldif-core - Spring LDAP LDIF Core - LDIFParser and supporting classes. - - - commons-lang - commons-lang - compile - - - junit - junit - - - log4j - log4j - test - - - org.springframework - spring-beans - compile - - - org.springframework.ldap - spring-ldap-core - ${project.version} - compile - - - diff --git a/ldif/pom.xml b/ldif/pom.xml deleted file mode 100644 index d510ab02..00000000 --- a/ldif/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../parent - - - 4.0.0 - org.springframework.ldap.ldif - spring-ldap-ldif - pom - Spring LDAP LDIF - This packages provides an LDIF Parser for use with the Spring LDAP suite of utilities. - - ldif-core - ldif-batch - - diff --git a/odm/build.gradle b/odm/build.gradle index 89ef6958..e3526bd2 100644 --- a/odm/build.gradle +++ b/odm/build.gradle @@ -1,3 +1,6 @@ +jar { + manifest.attributes["Main-Class"] = "org.springframework.ldap.odm.tools.SchemaToJava" +} dependencies { compile project(":spring-ldap-core"), diff --git a/odm/pom.xml b/odm/pom.xml deleted file mode 100644 index 85b03c89..00000000 --- a/odm/pom.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../parent - - 4.0.0 - org.springframework.ldap - spring-ldap-odm - jar - Spring LDAP ODM - Object Directory Mapping framework - http://springframework.org/ldap - 2009 - - - Paul Harvey - paul@pauls-place.me.uk - - Developer - - 0 - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.springframework.ldap.odm.tools.SchemaToJava - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 2.4 - - 1.5 - - - - - - - - - - - org.springframework - spring-context - runtime - - - org.springframework - spring-core - compile - - - org.freemarker - freemarker - - - org.springframework.ldap - spring-ldap-core - ${project.version} - compile - - - org.springframework.ldap - spring-ldap-core-tiger - ${project.version} - compile - - - commons-pool - commons-pool - jar - runtime - - - commons-cli - commons-cli - compile - - - org.springframework.ldap - spring-ldap-test - ${project.version} - test - - - log4j - log4j - 1.2.15 - jar - runtime - - - jmxri - com.sun.jmx - - - jms - javax.jms - - - jmxtools - com.sun.jdmk - - - - - jdepend - jdepend - jar - test - - - junit - junit - - - commons-logging - commons-logging - - - commons-codec - commons-codec - jar - test - - - commons-lang - commons-lang - jar - test - - - - diff --git a/parent/pom.xml b/parent/pom.xml deleted file mode 100644 index 07252408..00000000 --- a/parent/pom.xml +++ /dev/null @@ -1,611 +0,0 @@ - - - 4.0.0 - org.springframework.ldap - spring-ldap-parent - pom - 1.3.2.CI-SNAPSHOT - Spring LDAP - Parent - - tiger - - - http://static.springframework.org/spring-ldap/site/downloads/releases.html - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - static.springframework.org - scp://spring02.managed.contegix.com/opt/www/domains/springframework.org/www/htdocs/spring-ldap/sites/1.3 - - - - scm:svn:https://src.springframework.org/svn/spring-ldap/trunk - scm:svn:https://src.springframework.org/svn/spring-ldap/trunk - https://fisheye.springsource.org/changelog/~br=trunk/spring-ldap - - - UTF-8 - 3.0.5.RELEASE - 4.8.2 - - - - maven central repo - http://repo1.maven.org/maven2/ - - - java.net repo - http://download.java.net/maven/2/ - - - spring release - http://maven.springframework.org/release/ - - - spring external - http://maven.springframework.org/external/ - - - Codehaus - http://repository.codehaus.org/ - - false - - - true - - - - - - Codehaus - http://repository.codehaus.org/ - - false - - - true - - - - spring release - http://maven.springframework.org/release/ - - - - - - - maven-jxr-plugin - 2.2 - - true - - - - maven-surefire-report-plugin - 2.6 - - true - - - - maven-surefire-plugin - 2.6 - - once - false - - - - maven-resources-plugin - 2.4.1 - - - maven-project-info-reports-plugin - 2.2 - - - maven-site-plugin - 2.1.1 - - - maven-install-plugin - 2.3 - - - maven-deploy-plugin - 2.5 - - - maven-dependency-plugin - 2.1 - - - maven-clean-plugin - 2.4 - - - maven-assembly-plugin - 2.2-beta-5 - - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.7 - - - maven-javadoc-plugin - 2.7 - - ${project.build.sourceEncoding} - true - true -
Spring LDAP Framework
- true - ${basedir}/src/main/javadoc/javadoc.css - ${basedir}/src/main/javadoc/overview.html - ${basedir}/src/main/javadoc - org.springframework.ldap.samples:org.springframework.ldap.itest - - http://download.oracle.com/javase/1.4.2/docs/api - http://download.oracle.com/javase/1.5.0/docs/api - http://static.springframework.org/spring/docs/2.5.x/api/ - http://logging.apache.org/log4j/1.2/apidocs/ - http://commons.apache.org/logging/apidocs/ - http://commons.apache.org/dbcp/apidocs/ - http://commons.apache.org/pool/apidocs/ - http://junit.sourceforge.net/javadoc/ - - - - - maven-eclipse-plugin - 2.7 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - - package.html - - - - - maven-idea-plugin - 2.2 - - true - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.21 - - - org.apache.maven.plugins - maven-war-plugin - 2.1-beta-1 - - - maven-jar-plugin - 2.3 - - - maven-compiler-plugin - 2.1 - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 3.1.0.RELEASE - - - - - - maven-compiler-plugin - - - maven-surefire-plugin - - - maven-jar-plugin - - - - true - - - ${project.version} - - - - - - - maven-eclipse-plugin - - - maven-idea-plugin - - - org.codehaus.mojo - cobertura-maven-plugin - - - - clean - - - - - - - **/*.class - - - **/DnParserImpl*.class - **/TokenMgrError.class - **/ParseException.class - **/Token.class - **/SimpleCharStream.class - - - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.1 - - - maven-jxr-plugin - 2.2 - - - maven-surefire-report-plugin - 2.6 - - - maven-project-info-reports-plugin - 2.2 - - - maven-javadoc-plugin - 2.5 - - - - javadoc - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.4 - - - - - - - - org.springframework.ldap - spring-ldap-core - ${project.version} - - - org.springframework.ldap - spring-ldap-core-tiger - ${project.version} - - - org.springframework.ldap - spring-ldap-test - ${project.version} - - - org.springframework.ldap - spring-ldap-samples-utils - ${project.version} - - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - struts - struts - - - - - org.springframework - spring-orm - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - test - - - - org.acegisecurity - acegi-security - 1.0.7 - - - aspectj - aspectj - - - cas - casclient - - - commons-codec - commons-codec - - - commons-collections - commons-collections - - - commons-lang - commons-lang - - - commons-logging - commons-logging - - - hsqldb - hsqldb - - - javax.servlet - jsp-api - - - javax.servlet - servlet-api - - - jmock - jmock - - - log4j - log4j - - - net.sj.ehcache - ehcache - - - org.apache.directory.server - apacheds-core - - - org.slf4j - slf4j-log4j12 - - - org.springframework - spring-core - - - org.springframework - spring-jdbc - - - org.springframework - spring-ldap - - - org.springframework - spring-mock - - - org.springframework - spring-remoting - - - org.springframework - spring-support - - - org.springframework - spring-web - - - oro - oro - - - taglibs - standard - - - - - - org.springframework.security - spring-security-core - 2.0.2 - - - org.springframework.security - spring-security-core-tiger - 2.0.2 - - - - javax.servlet - servlet-api - 2.5 - provided - - - - commons-lang - commons-lang - 2.5 - - - commons-pool - commons-pool - 1.5.4 - - - commons-cli - commons-cli - 1.2 - - - commons-codec - commons-codec - 1.4 - - - org.freemarker - freemarker - 2.3.9 - - - - commons-logging - commons-logging - 1.0.4 - - - log4j - log4j - 1.2.9 - true - - - - junit - junit - ${junit.version} - test - - - easymock - easymock - 1.2_Java1.3 - test - - - gsbase - gsbase - 2.0.1 - test - - - jdepend - jdepend - 2.9.1 - jar - test - - - - - - commons-logging - commons-logging - - - org.springframework - spring-core - - - org.springframework - spring-beans - - - junit - junit - test - - - log4j - log4j - test - - - diff --git a/parent/tiger/pom.xml b/parent/tiger/pom.xml deleted file mode 100644 index 1da60601..00000000 --- a/parent/tiger/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - - 4.0.0 - spring-ldap-parent-tiger - pom - Spring LDAP - Parent Tiger - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - diff --git a/pom.xml b/pom.xml deleted file mode 100644 index e1d589e6..00000000 --- a/pom.xml +++ /dev/null @@ -1,515 +0,0 @@ - - - 4.0.0 - org.springframework.ldap - spring-ldap - 1.3.2.CI-SNAPSHOT - pom - Spring LDAP - Spring LDAP is a Java library for simplifying LDAP - operations, based on the pattern of Spring's JdbcTemplate. The - framework relieves the user of common chores, such as looking up and - closing contexts, looping through results, encoding/decoding values - and filters, and more. The LdapTemplate class encapsulates all the - plumbing work involved in traditional LDAP programming, such as - creating a DirContext, looping through NamingEnumerations, handling - exceptions and cleaning up resources. This leaves the programmer to - handle the important stuff - where to find data (DNs and Filters) and - what do do with it (map to and from domain objects, bind, modify, - unbind, etc.), in the same way that JdbcTemplate relieves the - programmer of all but the actual SQL and how the data maps to the - domain model. In addition to this, Spring LDAP provides transaction - support, a pooling library, exception translation from - NamingExceptions to a mirrored unchecked Exception hierarchy, as well - as several utilities for working with filters, LDAP paths and - Attributes. - http://springframework.org/ldap - - JIRA - http://jira.springframework.org/browse/LDAP - - - bamboo - http://build.springframework.org/browse/LDAP - - 2005 - - - marthursson - Mattias Hellborg Arthursson - mattias.arthursson@jayway.com - Jayway - http://www.jayway.com - - Project Admin - Developer - - +1 - - - ulsa - Ulrik Sandberg - ulrik.sandberg@jayway.com - Jayway - http://www.jayway.com - - Project Admin - Developer - - +1 - - - - - Eric Dalquist - - - Marius Scurtescu - - - Tim Terry - - - Keith Barlow - - - Paul Harvey - - - Marvin S. Addison - - - - The Spring LDAP Framework - http://www.springframework.org/ldap - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - http://static.springframework.org/spring-ldap/site/downloads/releases.html - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - static.springframework.org - scp://spring02.managed.contegix.com/opt/www/domains/springframework.org/www/htdocs/spring-ldap/sites/1.3 - - - - - scm:svn:https://src.springframework.org/svn/spring-ldap/trunk - - - scm:svn:https://src.springframework.org/svn/spring-ldap/trunk/ - - https://fisheye.springsource.org/changelog/~br=trunk/spring-ldap - - - UTF-8 - 3.0.5.RELEASE - - - parent - core - core-tiger - test-support - test - ldif - odm - - - - samples - - samples - - - - sandbox - - sandbox - - - - release - - - - maven-dependency-plugin - - - copy-dependencies - package - - copy - - - - - - org.springframework - spring-core - ${spring.version} - ${project.build.directory}/dependency/spring/ - - - org.springframework - spring-beans - ${spring.version} - ${project.build.directory}/dependency/spring/ - - - org.springframework - spring-context - ${spring.version} - ${project.build.directory}/dependency/spring/ - - - org.springframework - spring-jdbc - ${spring.version} - ${project.build.directory}/dependency/spring/ - - - org.springframework - spring-tx - ${spring.version} - ${project.build.directory}/dependency/spring/ - - - - com.sun - ldapbp - 1.0 - ${project.build.directory}/dependency/sun/ - - - - commons-lang - commons-lang - 2.5 - ${project.build.directory}/dependency/jakarta-commons/ - - - commons-pool - commons-pool - 1.5.4 - ${project.build.directory}/dependency/jakarta-commons/ - - - - commons-logging - commons-logging - 1.0.4 - ${project.build.directory}/dependency/jakarta-commons/ - - - log4j - log4j - 1.2.9 - ${project.build.directory}/dependency/log4j/ - - - - - - - - maven-assembly-plugin - 2.2-beta-5 - false - - - with-dependencies - package - - single - - - - src/assembly/with-dependencies.xml - - - - - - - - - - - - maven central repo - http://repo1.maven.org/maven2/ - - - java.net repo - http://download.java.net/maven/2/ - - - spring external - http://maven.springframework.org/external/ - - - - - spring release - http://maven.springframework.org/release/ - - - - - - - maven-jxr-plugin - 2.2 - - true - - - - maven-surefire-report-plugin - 2.6 - - true - - - - maven-project-info-reports-plugin - 2.2 - - - maven-site-plugin - 2.1.1 - - - maven-install-plugin - 2.3 - - - maven-deploy-plugin - 2.5 - - - maven-dependency-plugin - 2.1 - - - maven-clean-plugin - 2.4 - - - maven-assembly-plugin - 2.2-beta-5 - - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.7 - - - org.codehaus.mojo - versions-maven-plugin - 1.2 - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 3.1.0.RELEASE - - - - - maven-assembly-plugin - 2.2-beta-5 - false - - - all-jar - package - - single - - - - - true - - - ${project.version} - - - - src/assembly/all.xml - - - - - sources - package - - single - - - - - true - - - ${project.version} - - - - src/assembly/sources.xml - - - - - minimal-zip - package - - single - - - - src/assembly/minimal.xml - - - - - - - com.agilejava.docbkx - docbkx-maven-plugin - - - - generate-html - generate-pdf - - pre-site - - - - - org.docbook - docbook-xml - 4.4 - runtime - - - - index.xml - true - css/html.css - true - src/docbkx/resources/xsl/html_chunk.xsl - src/docbkx/resources/xsl/fopdf.xsl - - - version - ${project.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - versions-maven-plugin - 1.2 - - - - dependency-updates-report - plugin-updates-report - property-updates-report - - - - - - maven-jxr-plugin - 2.2 - - - maven-javadoc-plugin - 2.7 - - - - ${project.build.sourceEncoding} - true - true -
Spring LDAP Framework
- true - ${basedir}/src/main/javadoc/javadoc.css - ${basedir}/src/main/javadoc/overview.html - ${basedir}/src/main/javadoc - org.springframework.ldap.samples:org.springframework.ldap.itest - - http://download.oracle.com/javase/1.4.2/docs/api - http://download.oracle.com/javase/1.5.0/docs/api - http://static.springframework.org/spring/docs/2.5.x/api/ - http://logging.apache.org/log4j/1.2/apidocs/ - http://commons.apache.org/logging/apidocs/ - http://commons.apache.org/dbcp/apidocs/ - http://commons.apache.org/pool/apidocs/ - http://junit.sourceforge.net/javadoc/ - - - - aggregate - - - - - - maven-project-info-reports-plugin - 2.2 - - - - - - org.springframework - spring-core - ${spring.version} - - - diff --git a/samples/article-spring20/pom.xml b/samples/article-spring20/pom.xml deleted file mode 100644 index 41068cb6..00000000 --- a/samples/article-spring20/pom.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../parent/pom.xml - - 4.0.0 - spring-ldap-article-spring20 - Spring LDAP Article Sample (Spring 2.0) - war - Example code that matches the article published on - java.net on April 18, 2006. Uses Spring 2.0, rather than 2.5 - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.mortbay.jetty - maven-jetty-plugin - - - - - - - org.springframework.ldap - spring-ldap-test - - - log4j - log4j - 1.2.9 - - - javax.servlet - jstl - 1.2 - - - org.springframework.ldap - spring-ldap-samples-utils - - - org.springframework - spring-test - - - - - org.springframework - spring-beans - 2.0.8 - - - org.springframework - spring-core - 2.0.8 - - - org.springframework - spring-dao - 2.0.8 - - - org.springframework - spring-beans - - - org.springframework - spring-core - - - - - org.springframework - spring-jdbc - 2.0.8 - - - org.springframework - spring-beans - - - org.springframework - spring-core - - - - - org.springframework - spring-context - 2.0.8 - - - org.springframework - spring-beans - - - org.springframework - spring-core - - - - - org.springframework - spring-web - 2.0.8 - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-core - - - - - org.springframework - spring-support - 2.0.8 - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-core - - - - - org.springframework - spring-webmvc - 2.0.8 - - - org.springframework - spring-web - - - org.springframework - spring-support - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-core - - - - - javax.servlet - servlet-api - provided - - - - org.springframework - spring-mock - 2.0.8 - test - - - diff --git a/samples/article-spring30/pom.xml b/samples/article-spring30/pom.xml deleted file mode 100644 index 671d319d..00000000 --- a/samples/article-spring30/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../parent/pom.xml - - 4.0.0 - spring-ldap-article-spring30 - Spring LDAP Article Sample (Spring 3.0) - war - Example code that matches the article published on - java.net on April 18, 2006. - - 3.0.3.RELEASE - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.mortbay.jetty - maven-jetty-plugin - - - - - - - org.springframework.ldap - spring-ldap-test - - - log4j - log4j - 1.2.9 - - - javax.servlet - jstl - 1.2 - - - org.springframework.ldap - spring-ldap-samples-utils - - - org.springframework - spring-core - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - - - javax.servlet - servlet-api - provided - - - - org.springframework - spring-test - ${org.springframework.version} - test - - - diff --git a/samples/article/pom.xml b/samples/article/pom.xml deleted file mode 100644 index 78202a77..00000000 --- a/samples/article/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../parent/pom.xml - - 4.0.0 - spring-ldap-article - Spring LDAP Article Sample - war - Example code that matches the article published on - java.net on April 18, 2006. - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.mortbay.jetty - maven-jetty-plugin - - - - - - - org.springframework.ldap - spring-ldap-test - - - log4j - log4j - 1.2.9 - - - javax.servlet - jstl - 1.2 - - - org.springframework.ldap - spring-ldap-samples-utils - - - org.springframework - spring-jdbc - - - org.springframework - spring-context - - - org.springframework - spring-webmvc - - - javax.servlet - servlet-api - provided - - - - org.springframework - spring-test - test - - - \ No newline at end of file diff --git a/samples/demos/demo-tiger/pom.xml b/samples/demos/demo-tiger/pom.xml deleted file mode 100644 index 4948070b..00000000 --- a/samples/demos/demo-tiger/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../../parent/pom.xml - - 4.0.0 - org.springframework.ldap - spring-ldap-demo-tiger - Spring LDAP Demo (Java5) - jar - Example code for demonstrating the process of - refactoring from plain JNDI to Spring LDAP (Java 5). - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - maven-eclipse-plugin - - - - - - - org.springframework.ldap - spring-ldap-test - - - org.springframework.ldap - spring-ldap-core-tiger - - - org.springframework - spring-context - - - - org.springframework - spring-test - test - - - junit - junit - 4.5 - test - - - diff --git a/samples/demos/demo/pom.xml b/samples/demos/demo/pom.xml deleted file mode 100644 index 74eb2834..00000000 --- a/samples/demos/demo/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../../parent/pom.xml - - 4.0.0 - org.springframework.ldap - spring-ldap-demo - Spring LDAP Demo - jar - Example code for demonstrating the process of - refactoring from plain JNDI to Spring LDAP (Java 1.4). - - - - maven-compiler-plugin - - 1.4 - 1.4 - - - - maven-eclipse-plugin - - - - - - - org.springframework.ldap - spring-ldap-test - - - org.springframework.ldap - spring-ldap-core - - - org.springframework - spring-context - - - - org.springframework - spring-test - test - - - diff --git a/samples/demos/pom.xml b/samples/demos/pom.xml deleted file mode 100644 index fad694d1..00000000 --- a/samples/demos/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../parent/pom.xml - - 4.0.0 - spring-ldap-demos - pom - Spring LDAP Demos - - demo - demo-tiger - - - - spring-milestone - Spring Milestone Repository - http://maven.springframework.org/milestone - - - - - - log4j - log4j - runtime - - - diff --git a/samples/pom.xml b/samples/pom.xml deleted file mode 100644 index 2544920e..00000000 --- a/samples/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../parent - - 4.0.0 - spring-ldap-samples - pom - Spring LDAP Samples - - samples-utils - article - article-spring20 - article-spring30 - demos - - - - spring-milestone - Spring Milestone Repository - http://maven.springframework.org/milestone - - - - - - org.mortbay.jetty - maven-jetty-plugin - - - org.apache.maven.plugins - maven-war-plugin - - ${pom.artifactId} - - - - - - - - log4j - log4j - runtime - - - diff --git a/samples/samples-utils/pom.xml b/samples/samples-utils/pom.xml deleted file mode 100644 index b44e5fdc..00000000 --- a/samples/samples-utils/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../parent - - 4.0.0 - spring-ldap-samples-utils - jar - Spring LDAP Samples Utilities - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - org.springframework.ldap - spring-ldap-core-tiger - - - org.springframework.ldap - spring-ldap-test - - - org.springframework - spring-test - - - junit - junit - - - diff --git a/samples/simple-odm/pom.xml b/samples/simple-odm/pom.xml deleted file mode 100644 index 4c372bb7..00000000 --- a/samples/simple-odm/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.1.CI-SNAPSHOT - - 4.0.0 - org.springframework.ldap - spring-ldap-odm-sample - Simple Spring LDAP ODM Sample - A very simple example of using the the Spring LDAP ODM - - - Paul Harvey - paul@pauls-place.me.uk - - Developer - - 0 - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.springframework.ldap.odm.sample.SearchForPeople - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-report-plugin - - always - - - - - - - log4j - log4j - runtime - - - org.springframework.ldap - spring-ldap-odm - ${version} - - - junit - junit - jar - 4.4 - test - - - org.springframework.ldap - spring-ldap-test - ${version} - test - - - org.springframework - spring-core - - - org.springframework - spring-context - - - commons-logging - commons-logging - - - org.springframework.ldap - spring-ldap-core - ${version} - - - commons-lang - commons-lang - jar - - - diff --git a/sandbox/pom.xml b/sandbox/pom.xml deleted file mode 100644 index d0845119..00000000 --- a/sandbox/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../parent - - 4.0.0 - spring-ldap-sandbox - jar - Spring LDAP Sandbox - - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - - - com.sun - ldapbp - 1.0 - provided - - - - org.springframework.ldap - spring-ldap-core - ${project.version} - - - - junit - junit - test - - - easymock - easymock - test - - - gsbase - gsbase - test - - - diff --git a/test-support/pom.xml b/test-support/pom.xml deleted file mode 100644 index 4e4a8734..00000000 --- a/test-support/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../parent/pom.xml - - 4.0.0 - spring-ldap-test - jar - Spring LDAP Automated Test Support - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - org.springframework.ldap - spring-ldap-core - - - - com.google.code.typica - typica - 1.3 - - - commons-io - commons-io - 1.4 - - - javax.xml - jsr173 - 1.0 - - - javax.activation - activation - 1.1 - - - javax.xml.bind - jaxb-api - 2.1 - - - javax.xml - jaxb-impl - 2.1 - - - org.apache.directory.server - - apacheds-server-main - 1.0.2 - - - org.slf4j - nlog4j - - - - - org.slf4j - slf4j-log4j12 - 1.0.1 - - - - org.springframework - spring-core - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-test - - - log4j - log4j - - - junit - junit - provided - - - \ No newline at end of file diff --git a/test/integration-tests-openldap/pom.xml b/test/integration-tests-openldap/pom.xml deleted file mode 100644 index 651dee7e..00000000 --- a/test/integration-tests-openldap/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../parent/pom.xml - - 4.0.0 - spring-ldap-openldap-integration-tests - jar - Spring LDAP Integration Tests (OpenLDAP) - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - org.springframework.ldap - spring-ldap-test - - - org.springframework.ldap - spring-ldap-core-tiger - - - commons-logging - commons-logging - 1.1.1 - - - avalon-framework - avalon-framework - - - javax.servlet - servlet-api - - - junit - junit - - - log4j - log4j - - - logkit - logkit - - - junit - junit - - - - - commons-httpclient - commons-httpclient - 3.1 - - - commons-logging - commons-logging - - - junit - junit - - - - - commons-codec - commons-codec - 1.3 - - - - - org.springframework - spring-jdbc - provided - - - org.springframework - spring-aop - test - - - gsbase - gsbase - test - - - junit - junit - - - org.springframework - spring-test - test - - - com.sun - ldapbp - 1.0 - test - - - diff --git a/test/integration-tests-sunone/pom.xml b/test/integration-tests-sunone/pom.xml deleted file mode 100644 index 98d8b54c..00000000 --- a/test/integration-tests-sunone/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../parent/pom.xml - - 4.0.0 - spring-ldap-sunone-integration-tests - jar - Spring LDAP Integration Tests (SunONE) - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - org.springframework.ldap - spring-ldap-test - - - - org.springframework.ldap - spring-ldap-integration-tests - ${project.version} - - - org.springframework.ldap - spring-ldap-sandbox - ${project.version} - - - org.springframework.ldap - spring-ldap-core-tiger - - - - org.springframework - spring-jdbc - provided - - - org.springframework - spring-aop - test - - - - com.sun - ldapbp - 1.0 - provided - - - commons-pool - commons-pool - 1.4 - - - gsbase - gsbase - test - - - junit - junit - - - org.springframework - spring-test - test - - - diff --git a/test/integration-tests/pom.xml b/test/integration-tests/pom.xml deleted file mode 100644 index 1895368d..00000000 --- a/test/integration-tests/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../../parent/pom.xml - - 4.0.0 - spring-ldap-integration-tests - jar - Spring LDAP Integration Tests (Generic) - - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - - - - org.springframework.ldap - spring-ldap-test - - - org.springframework.ldap - spring-ldap-core-tiger - - - commons-pool - commons-pool - provided - - - - org.springframework - spring-jdbc - provided - - - org.springframework - spring-aop - test - - - org.springframework - spring-orm - provided - - - org.hibernate - hibernate - 3.2.6.ga - test - - - aspectj - aspectjrt - 1.5.3 - test - - - aspectj - aspectjweaver - 1.5.3 - test - - - gsbase - gsbase - test - - - hsqldb - hsqldb - 1.8.0.7 - test - - - junit - junit - - - org.springframework - spring-test - test - - - diff --git a/test/pom.xml b/test/pom.xml deleted file mode 100644 index 6b871f08..00000000 --- a/test/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - org.springframework.ldap - spring-ldap-parent - 1.3.2.CI-SNAPSHOT - ../parent/pom.xml - - 4.0.0 - spring-ldap-integration-tests-parent - pom - Spring LDAP Integration Tests - - integration-tests - - - - openldap - - integration-tests-openldap - - - - sunone - - integration-tests-sunone - - - - - - spring-milestone - Spring Milestone Repository - http://maven.springframework.org/milestone - - - - - - org.mortbay.jetty - maven-jetty-plugin - - - org.apache.maven.plugins - maven-war-plugin - - ${project.artifactId} - - - - - - - - log4j - log4j - runtime - - -