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

Changed version to 1.3-SNAPSHOT.

Browse Source 
Now using same pom structure and release package creation mechanism as Spring WS.
Changed some artifactIds: root is now spring-ldap, core is now spring-ldap-core, tiger is now spring-ldap-core-tiger.
Added samples to build structure, but under own profile (-P samples).
This commit is contained in:
Ulrik Sandberg
2008-08-06 21:19:53 +00:00
parent 61f20dd374
commit 21bf36e838
51 changed files with 1001 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
mvn-build/acegi-support/pom.xml
View File

@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-acegi-support</artifactId>
<name>Spring LDAP Acegi Support</name>
<version>1.2.2-SNAPSHOT</version>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>master</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-acegi-support</artifactId>
<packaging>jar</packaging>
<name>Spring LDAP Acegi Support</name>
<build>
<plugins>
@@ -20,153 +22,36 @@
<target>1.4</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>
src/assemble/bin-with-dependencies.xml
</descriptor>
</descriptors>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-core</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.acegisecurity</groupId>
<artifactId>acegi-security</artifactId>
<version>1.0.7</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>aspectj</groupId>
<artifactId>aspectj</artifactId>
</exclusion>
<exclusion>
<groupId>cas</groupId>
<artifactId>casclient</artifactId>
</exclusion>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>net.sj.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-ldap</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-remoting</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</exclusion>
<exclusion>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

27
mvn-build/tiger/pom.xml → mvn-build/core-tiger/pom.xml
View File

@@ -2,17 +2,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-tiger</artifactId>
<name>Spring LDAP Java 5 support</name>
<version>1.2.2-SNAPSHOT</version>
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>master</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-core-tiger</artifactId>
<packaging>jar</packaging>
<name>Spring LDAP Java 5 support</name>
<build>
<plugins>
@@ -24,16 +23,6 @@
<target>1.5</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>
src/assemble/bin-with-source.xml
</descriptor>
</descriptors>
</configuration>
</plugin>
</plugins>
</build>
@@ -41,13 +30,11 @@
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-core</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>

0
mvn-build/tiger/src/assemble/bin-with-source.xml → mvn-build/core-tiger/src/assemble/bin-with-source.xml
View File

0
mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java → mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/AbstractParameterizedContextMapper.java
View File

0
mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java → mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/ParameterizedContextMapper.java
View File

0
mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java → mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java
View File

0
mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java → mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapTemplate.java
View File

0
mvn-build/tiger/src/main/java/org/springframework/ldap/core/simple/package.html → mvn-build/core-tiger/src/main/java/org/springframework/ldap/core/simple/package.html
View File

0
mvn-build/tiger/src/main/java/overview.html → mvn-build/core-tiger/src/main/java/overview.html
View File

4
mvn-build/core/docs/reference/src/simple.xml
View File

@@ -6,7 +6,7 @@
<sect1 id="simple-ldap-template">
<title>SimpleLdapTemplate</title>
<para>As of version 1.2 Spring LDAP includes the spring-ldap-tiger.jar distributable, which adds
<para>As of version 1.3 Spring LDAP includes the spring-ldap-core-tiger.jar distributable, which adds
a thin layer of Java 5 functionality on top of Spring LDAP.</para>
<para>The <literal>SimpleLdapTemplate</literal> class adds search and lookup methods that take a
@@ -32,4 +32,4 @@
</example>
</para>
</sect1>
</chapter>
</chapter>

40
mvn-build/core/pom.xml
View File

@@ -3,16 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
<name>Spring LDAP Core</name>
<version>1.2.2-SNAPSHOT</version>
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>master</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-core</artifactId>
<packaging>jar</packaging>
<name>Spring LDAP Core</name>
<build>
<plugins>
@@ -35,16 +34,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>
src/assemble/bin-with-dependencies.xml
</descriptor>
</descriptors>
</configuration>
</plugin>
</plugins>
</build>
@@ -53,23 +42,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun</groupId>
<artifactId>ldapbp</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -82,48 +62,40 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>gsbase</groupId>
<artifactId>gsbase</artifactId>
<version>2.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>

30
mvn-build/core/src/assemble/bin-with-dependencies.xml
View File

@@ -1,30 +0,0 @@
<assembly>
<id>assembly</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>target</directory>
<includes>
<include>*.jar</include>
</includes>
<outputDirectory>dist</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/java</directory>
<includes>
<include>**/*.java</include>
</includes>
<outputDirectory>src</outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
<scope>provided</scope>
</dependencySet>
</dependencySets>
</assembly>

32
mvn-build/integration-tests/pom.xml
View File

@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-integration-tests</artifactId>
<name>Spring LDAP Integration Tests</name>
<version>1.2.2-SNAPSHOT</version>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>master</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-integration-tests</artifactId>
<packaging>jar</packaging>
<name>Spring LDAP Integration Tests</name>
<build>
<plugins>
@@ -27,36 +28,30 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId>
<version>1.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-tiger</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-core-tiger</artifactId>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
<scope>provided</scope>
</dependency>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -68,7 +63,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -86,7 +80,6 @@
<dependency>
<groupId>gsbase</groupId>
<artifactId>gsbase</artifactId>
<version>2.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -101,5 +94,10 @@
<version>4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

412
mvn-build/parent/pom.xml Normal file
View File

@@ -0,0 +1,412 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<packaging>pom</packaging>
<version>1.3-SNAPSHOT</version>
<name>Spring LDAP - Parent</name>
<distributionManagement>
<downloadUrl>http://static.springframework.org/spring-ldap/site/downloads/releases.html</downloadUrl>
<snapshotRepository>
<id>spring-s3</id>
<name>Spring Snapshot Repository</name>
<url>s3://maven.springframework.org/snapshot</url>
</snapshotRepository>
<site>
<id>static.springframework.org</id>
<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-ldap/sites/1.5</url>
</site>
</distributionManagement>
<scm>
<connection>
scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk
</connection>
<developerConnection>
scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk
</developerConnection>
<url>http://fisheye3.cenqua.com/browse/springframework/spring-ldap/trunk</url>
</scm>
<properties>
<spring.version>2.5.4</spring.version>
</properties>
<repositories>
<repository>
<id>maven central repo</id>
<url>http://repo1.maven.org/maven2/</url>
</repository>
<repository>
<id>java.net repo</id>
<url>http://download.java.net/maven/2/</url>
</repository>
<repository>
<id>spring release</id>
<url>http://maven.springframework.org/release/</url>
</repository>
<repository>
<id>spring external</id>
<url>http://maven.springframework.org/external/</url>
</repository>
</repositories>
<build>
<extensions>
<extension>
<groupId>org.springframework.aws</groupId>
<artifactId>spring-aws-maven</artifactId>
<version>1.2.2</version>
</extension>
</extensions>
<plugins>
<!-- Building -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.3</source>
<target>1.4</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.2</version>
<configuration>
<forkMode>once</forkMode>
<childDelegation>false</childDelegation>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
</manifestEntries>
</archive>
</configuration>
</plugin>
<!-- IDEs -->
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs>
</configuration>
</plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<quiet>true</quiet>
</configuration>
<reportSets>
<reportSet>
<reports>
<report>javadoc</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
<dependencyManagement>
<dependencies>
<!-- Spring-LDAP dependencies -->
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core-tiger</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-acegi-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Spring dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>struts</groupId>
<artifactId>struts</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<!-- Acegi -->
<dependency>
<groupId>org.acegisecurity</groupId>
<artifactId>acegi-security</artifactId>
<version>1.0.7</version>
<exclusions>
<exclusion>
<groupId>aspectj</groupId>
<artifactId>aspectj</artifactId>
</exclusion>
<exclusion>
<groupId>cas</groupId>
<artifactId>casclient</artifactId>
</exclusion>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</exclusion>
<exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>net.sj.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-ldap</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-remoting</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-support</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</exclusion>
<exclusion>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Spring Security -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core-tiger</artifactId>
<version>2.0.2</version>
</dependency>
<!-- JEE dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<!-- Commons dependencies -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
</dependency>
<!-- Logging dependencies -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
<optional>true</optional>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>gsbase</groupId>
<artifactId>gsbase</artifactId>
<version>2.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

227
mvn-build/pom.xml
View File

@@ -5,8 +5,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>master</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap</artifactId>
<version>1.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring LDAP</name>
@@ -109,12 +109,128 @@
<spring.version>2.5.4</spring.version>
</properties>
<modules>
<module>parent</module>
<module>core</module>
<module>tiger</module>
<module>core-tiger</module>
<module>acegi-support</module>
<module>test-support</module>
<module>integration-tests</module>
</modules>
<profiles>
<profile>
<id>samples</id>
<modules>
<module>samples</module>
</modules>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<!--Spring-->
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
<outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
<outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
<outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
<outputDirectory>${project.build.directory}/dependency/spring/</outputDirectory>
</artifactItem>
<!--Java EE-->
<artifactItem>
<groupId>com.sun</groupId>
<artifactId>ldapbp</artifactId>
<version>1.0</version>
<outputDirectory>${project.build.directory}/dependency/sun/</outputDirectory>
</artifactItem>
<!-- Commons dependendencies -->
<artifactItem>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.3</version>
<outputDirectory>${project.build.directory}/dependency/jakarta-commons/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.3</version>
<outputDirectory>${project.build.directory}/dependency/jakarta-commons/</outputDirectory>
</artifactItem>
<!-- Logging dependencies -->
<artifactItem>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<outputDirectory>${project.build.directory}/dependency/jakarta-commons/</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
<outputDirectory>${project.build.directory}/dependency/log4j/</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<inherited>false</inherited>
<executions>
<execution>
<id>with-dependencies</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/assembly/with-dependencies.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<repositories>
<repository>
<id>maven central repo</id>
@@ -138,13 +254,73 @@
</extension>
</extensions>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
<inherited>false</inherited>
<executions>
<execution>
<id>all-jar</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
</manifestEntries>
</archive>
<descriptors>
<descriptor>src/assembly/all.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>sources</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Spring-LDAP-Version>${pom.version}</Spring-LDAP-Version>
</manifestEntries>
</archive>
<descriptors>
<descriptor>src/assembly/sources.xml</descriptor>
</descriptors>
</configuration>
</execution>
<execution>
<id>minimal-zip</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/minimal.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
<downloadSources>true</downloadSources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -153,16 +329,6 @@
<forkMode>once</forkMode>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>
src/assemble/bin-with-dependencies.xml
</descriptor>
</descriptors>
</configuration>
</plugin>
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
@@ -224,18 +390,34 @@
</build>
<reporting>
<plugins>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.4</version>
<configuration>
<aggregate>true</aggregate>
<breakiterator>true</breakiterator>
<header>Spring LDAP Integration</header>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>
http://static.springframework.org/spring/docs/2.5.x/api/
</link>
<link>http://commons.apache.org/pool/apidocs/</link>
<quiet>true</quiet>
<stylesheetfile>${basedir}/src/main/javadoc/javadoc.css</stylesheetfile>
<overview>${basedir}/src/main/javadoc/overview.html</overview>
<javadocDirectory>${basedir}/src/main/javadoc</javadocDirectory>
<excludePackageNames>org.springframework.ldap.samples</excludePackageNames>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
<link>http://commons.apache.org/pool/apidocs/</link>
</links>
</configuration>
<reportSets>
<reportSet>
@@ -245,6 +427,9 @@
</reportSet>
</reportSets>
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
</plugins>
</reporting>
</project>

0
mvn-build/samples/spring-ldap-article/.springBeans → mvn-build/samples/article/.springBeans
View File

23
mvn-build/samples/spring-ldap-article/pom.xml → mvn-build/samples/article/pom.xml
View File

@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>master</artifactId>
<groupId>org.springframework.ldap</groupId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework</groupId>
<artifactId>spring-ldap-person-article</artifactId>
<name>Spring LDAP Article Source Code Sample</name>
<version>1.2</version>
<artifactId>spring-ldap-article</artifactId>
<name>Spring LDAP Article Sample</name>
<packaging>war</packaging>
<description>
Example code that matches the article published on java.net on
@@ -32,45 +33,37 @@
</plugins>
</build>
<dependencies>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId>
<version>1.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-samples-utils</artifactId>
<version>1.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

0
mvn-build/samples/spring-ldap-article/readme.txt → mvn-build/samples/article/readme.txt
View File

0
mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java → mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/AbstractPersonDaoIntegrationTest.java
View File

0
mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java → mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/PersonDaoImplIntegrationTest.java
View File

0
mvn-build/samples/spring-ldap-article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java → mvn-build/samples/article/src/itest/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImplIntegrationTest.java
View File

0
mvn-build/samples/spring-ldap-article/src/main/java/log4j.properties → mvn-build/samples/article/src/main/java/log4j.properties
View File

0
mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java → mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDao.java
View File

0
mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java → mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/PersonDaoImpl.java
View File

0
mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java → mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/dao/TraditionalPersonDaoImpl.java
View File

0
mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java → mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/domain/Person.java
View File

0
mvn-build/samples/spring-ldap-article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java → mvn-build/samples/article/src/main/java/org/springframework/ldap/samples/article/web/DefaultController.java
View File

0
mvn-build/samples/spring-ldap-article/src/main/java/overview.html → mvn-build/samples/article/src/main/java/overview.html
View File

0
mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/applicationContext.xml → mvn-build/samples/article/src/main/webapp/WEB-INF/applicationContext.xml
View File

0
mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/basic-servlet.xml → mvn-build/samples/article/src/main/webapp/WEB-INF/basic-servlet.xml
View File

0
mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/jsp/showPerson.jsp → mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showPerson.jsp
View File

0
mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/jsp/showTree.jsp → mvn-build/samples/article/src/main/webapp/WEB-INF/jsp/showTree.jsp
View File

0
mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/ldap.properties → mvn-build/samples/article/src/main/webapp/WEB-INF/ldap.properties
View File

0
mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/setup_data.ldif → mvn-build/samples/article/src/main/webapp/WEB-INF/setup_data.ldif
View File

0
mvn-build/samples/spring-ldap-article/src/main/webapp/WEB-INF/web.xml → mvn-build/samples/article/src/main/webapp/WEB-INF/web.xml
View File

0
mvn-build/samples/spring-ldap-article/src/main/webapp/index.htm → mvn-build/samples/article/src/main/webapp/index.htm
View File

0
mvn-build/samples/spring-ldap-article/src/test/java/.dummy → mvn-build/samples/article/src/test/java/.dummy
View File

0
mvn-build/samples/spring-ldap-article/src/test/resources/config/ldap.properties → mvn-build/samples/article/src/test/resources/config/ldap.properties
View File

0
mvn-build/samples/spring-ldap-article/src/test/resources/config/testContext.xml → mvn-build/samples/article/src/test/resources/config/testContext.xml
View File

49
mvn-build/samples/pom.xml Normal file
View File

@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-samples</artifactId>
<packaging>pom</packaging>
<name>Spring LDAP Samples</name>
<modules>
<module>samples-utils</module>
<module>article</module>
</modules>
<repositories>
<repository>
<id>spring-milestone</id>
<name>Spring Milestone Repository</name>
<url>http://maven.springframework.org/milestone</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>${pom.artifactId}</warName>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<!-- Logging dependencies -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

21
mvn-build/samples/samples-utils/pom.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-samples-utils</artifactId>
<packaging>jar</packaging>
<version>1.2.2-SNAPSHOT</version>
<name>Spring LDAP utilities for samples</name>
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>master</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-samples-utils</artifactId>
<packaging>jar</packaging>
<name>Spring LDAP Samples Utilities</name>
<build>
<plugins>
@@ -27,18 +27,15 @@
<dependencies>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-tiger</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-core-tiger</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId>
<version>1.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>

34
mvn-build/src/assembly/all.xml Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>all</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<moduleSets>
<moduleSet>
<includes>
<include>org.springframework.ldap:spring-ldap-core</include>
<include>org.springframework.ldap:spring-ldap-core-tiger</include>
<include>org.springframework.ldap:spring-ldap-acegi-support</include>
</includes>
<binaries>
<outputDirectory/>
<includeDependencies>false</includeDependencies>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>**/spring.handlers</exclude>
<exclude>**/spring.schemas</exclude>
</excludes>
</unpackOptions>
</binaries>
</moduleSet>
</moduleSets>
<fileSets>
<fileSet>
<directory>src/main/resources/META-INF</directory>
<outputDirectory>META-INF</outputDirectory>
</fileSet>
</fileSets>
</assembly>

15
mvn-build/src/assembly/docs.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<component>
<fileSets>
<fileSet>
<directory>.</directory>
<includes>
<include>readme.txt</include>
<include>license.txt</include>
<include>notice.txt</include>
</includes>
<outputDirectory/>
<lineEnding>dos</lineEnding>
</fileSet>
</fileSets>
</component>

32
mvn-build/src/assembly/minimal.xml Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>minimal</id>
<formats>
<format>zip</format>
</formats>
<componentDescriptors>
<componentDescriptor>src/assembly/docs.xml</componentDescriptor>
</componentDescriptors>
<includeBaseDirectory>true</includeBaseDirectory>
<moduleSets>
<moduleSet>
<includes>
<include>org.springframework.ldap:spring-ldap-core</include>
<include>org.springframework.ldap:spring-ldap-core-tiger</include>
<include>org.springframework.ldap:spring-ldap-test</include>
<include>org.springframework.ldap:spring-ldap-acegi-support</include>
</includes>
<binaries>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
<outputFileNameMapping>dist/modules/${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
</binaries>
</moduleSet>
</moduleSets>
<files>
<file>
<source>target/${artifactId}-${version}.jar</source>
<outputDirectory>dist</outputDirectory>
</file>
</files>
</assembly>

26
mvn-build/src/assembly/sources.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>sources</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>core/src/main/java</directory>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>core-tiger/src/main/java</directory>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>test-support/src/main/java</directory>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>acegi-support/src/main/java</directory>
<outputDirectory/>
</fileSet>
</fileSets>
</assembly>

88
mvn-build/src/assembly/with-dependencies.xml Normal file
View File

@@ -0,0 +1,88 @@
<assembly>
<id>with-dependencies</id>
<formats>
<format>zip</format>
</formats>
<componentDescriptors>
<componentDescriptor>src/assembly/docs.xml</componentDescriptor>
</componentDescriptors>
<includeBaseDirectory>true</includeBaseDirectory>
<moduleSets>
<moduleSet>
<includes>
<include>org.springframework.ldap:spring-ldap-parent</include>
<include>org.springframework.ldap:spring-ldap-core</include>
<include>org.springframework.ldap:spring-ldap-core-tiger</include>
<include>org.springframework.ldap:spring-ldap-test</include>
<include>org.springframework.ldap:spring-ldap-acegi-support</include>
</includes>
<binaries>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
<outputFileNameMapping>dist/modules/${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
</binaries>
<sources>
<fileSets>
<fileSet>
<directory>src/main/java</directory>
</fileSet>
</fileSets>
<outputDirectoryMapping>dist/module-sources/${module.artifactId}</outputDirectoryMapping>
</sources>
</moduleSet>
</moduleSets>
<files>
<file>
<source>target/${artifactId}-${version}.jar</source>
<outputDirectory>dist</outputDirectory>
</file>
<file>
<source>target/${artifactId}-${version}-sources.jar</source>
<outputDirectory>dist</outputDirectory>
</file>
</files>
<fileSets>
<!-- Documentation -->
<fileSet>
<directory>target/site/apidocs</directory>
<outputDirectory>docs/api</outputDirectory>
</fileSet>
<fileSet>
<directory>target/site/reference</directory>
<outputDirectory>docs/reference</outputDirectory>
</fileSet>
<!-- Dependencies -->
<fileSet>
<directory>target/dependency</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>**/*.jar</include>
</includes>
</fileSet>
<!-- Samples -->
<fileSet>
<directory>samples</directory>
<outputDirectory>samples</outputDirectory>
<includes>
<include>**/readme.txt</include>
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
<fileSet>
<directory>samples</directory>
<outputDirectory>samples</outputDirectory>
<includes>
<include>**/src/**</include>
<include>**/build*.xml</include>
<include>**/*.bat</include>
<include>**/pom.xml</include>
</includes>
<excludes>
<exclude>**/target</exclude>
<exclude>**/target/**</exclude>
<exclude>**/bin</exclude>
<exclude>**/bin/**</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>

4
mvn-build/src/docbkx/simple.xml
View File

@@ -6,7 +6,7 @@
<sect1 id="simple-ldap-template">
<title>SimpleLdapTemplate</title>
<para>As of version 1.2 Spring LDAP includes the spring-ldap-tiger.jar distributable, which adds
<para>As of version 1.3 Spring LDAP includes the spring-ldap-core-tiger.jar distributable, which adds
a thin layer of Java 5 functionality on top of Spring LDAP.</para>
<para>The <literal>SimpleLdapTemplate</literal> class adds search and lookup methods that take a
@@ -32,4 +32,4 @@
</example>
</para>
</sect1>
</chapter>
</chapter>

48
mvn-build/src/main/javadoc/javadoc.css Normal file
View File

@@ -0,0 +1,48 @@
/* Spring-specific Javadoc style sheet rules */
#overviewBody {
}
.code {
border: 1px solid black;
background-color: #F4F4F4;
padding: 5px;
}
/* Vanilla Javadoc style sheet rules */
body {
font-family: Helvetica, Arial, sans-serif;
background-color: white;
font-size: 10pt;
}
td { font-size: 10pt; font-family: Helvetica, Arial, sans-serif }/* Javadoc style sheet */
/* Define colors, fonts and other style attributes here to override the defaults */
/* Page background color */
body { background-color: #FFFFFF }
/* Headings */
h1 { font-size: 145% }
/* Table colors */
.TableHeadingColor { background: #CCCCFF } /* Dark mauve */
.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */
.TableRowColor { background: #FFFFFF } /* White */
/* Font used in left-hand frame lists */
.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif }
.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif }
/* Navigation bar fonts and colors */
.NavBarCell1 { background-color:#EEEEFF;} /* Light mauve */
.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;}
.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}

16
mvn-build/src/main/javadoc/overview.html Normal file
View File

@@ -0,0 +1,16 @@
<html>
<body>
This document is the API specification for the Spring LDAP Framework
<hr/>
<div id="overviewBody">
<p>
For further API reference and developer documentation, see the
<a href="http://static.springframework.org/spring-ldap/site/reference.html" target="_top">Spring
LDAP reference documentation</a>.
That documentation contains more detailed, developer-targeted
descriptions, with conceptual overviews, definitions of terms,
workarounds, and working code examples.
</p>
</div>
</body>
</html>

34
mvn-build/test-support/pom.xml
View File

@@ -3,19 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-test</artifactId>
<name>Spring LDAP Automated Test Support</name>
<version>1.2.2-SNAPSHOT</version>
<parent>
<groupId>org.springframework.ldap</groupId>
<artifactId>master</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-parent</artifactId>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-ldap-test</artifactId>
<packaging>jar</packaging>
<name>Spring LDAP Automated Test Support</name>
<build>
<plugins>
@@ -31,8 +27,7 @@
<dependencies>
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap</artifactId>
<version>1.2.2-SNAPSHOT</version>
<artifactId>spring-ldap-core</artifactId>
</dependency>
<!-- External Dependencies -->
<dependency>
@@ -70,32 +65,27 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

3
mvn-build/with-dependencies.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/sh
export MAVEN_OPTS=-Xmx512m
mvn -Dmaven.test.skip=true -P release clean javadoc:javadoc docbkx:generate-html docbkx:generate-pdf install