diff --git a/changelog.txt b/changelog.txt index a5575b0b..1f86e107 100644 --- a/changelog.txt +++ b/changelog.txt @@ -71,7 +71,7 @@ Changes in version 1.3.0.RC1 (Oct 2008) * The hard dependency on LDAP Booster Pack has now been completely removed, preventing NoClassDefFoundErrors when using Paged Results without that - library on the classpath. (LDAP-110, LDAP-118) + library on the classpath. (LDAP-110, LDAP-118) * The dreaded problem with '\' in Distinguished Names is now resolved. (LDAP-50, LDAP-109) @@ -95,7 +95,7 @@ Changes in version 1.3.0.RC1 (Oct 2008) * Added configuration property to AbstractContextSource to specify referral behavior. Setting this property to 'follow' will enable referrals to be - automatically followed, provieded that the name server environment is properly + automatically followed, provided that the name server environment is properly set up. * Now using Maven for building internally. (LDAP-80, LDAP-82, LDAP-95) diff --git a/parent/pom.xml b/parent/pom.xml index 5f9a55ec..0a0f70b8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -194,7 +194,7 @@ - + org.springframework.ldap spring-ldap-core diff --git a/pom.xml b/pom.xml index 98c6376d..5af6f1eb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,45 +1,41 @@ - - + 4.0.0 - org.springframework.ldap spring-ldap 1.3.0.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. - - + 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://opensource.atlassian.com/projects/spring/browse/LDAP + http://jira.springframework.org/browse/LDAP bamboo - http://build.springframework.org/ + http://build.springframework.org/browse/LDAP 2006 @@ -103,16 +99,14 @@ - scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk + scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk - scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk + scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk http://fisheye3.cenqua.com/browse/springframework/spring-ldap/trunk - ${basedir}/src/docbkx - ${basedir}/target/site/guide 2.5.6 @@ -122,121 +116,120 @@ test-support test - - - samples - - samples - - - - release - - - - maven-dependency-plugin - - - copy-dependencies - package - - copy - - - + + + samples + + samples + + + + 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/ - + + 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/ - + + com.sun + ldapbp + 1.0 + ${project.build.directory}/dependency/sun/ + - - commons-lang - commons-lang - 2.3 - ${project.build.directory}/dependency/jakarta-commons/ - - - commons-pool - commons-pool - 1.3 - ${project.build.directory}/dependency/jakarta-commons/ - + + commons-lang + commons-lang + 2.3 + ${project.build.directory}/dependency/jakarta-commons/ + + + commons-pool + commons-pool + 1.3 + ${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-2 - false - - - with-dependencies - package - - single - - - - src/assembly/with-dependencies.xml - - - - - - - - - - + + 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-2 + false + + + with-dependencies + package + + single + + + + src/assembly/with-dependencies.xml + + + + + + + + + maven central repo @@ -252,93 +245,70 @@ - - - org.springframework.aws - spring-aws-maven - 1.2.2 - - - - maven-assembly-plugin - 2.2-beta-2 - false - - - all-jar - package - - single - - - false - - - true - - - ${pom.version} - - - - src/assembly/all.xml - - - - - sources - package - - single - - - - - true - - - ${pom.version} - - - - src/assembly/sources.xml - - - - - minimal-zip - package - - single - - - false - - src/assembly/minimal.xml - - - - - - maven-eclipse-plugin - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.4.2 - - once - + maven-assembly-plugin + 2.2-beta-2 + false + + + all-jar + package + + single + + + + + true + + + ${pom.version} + + + + src/assembly/all.xml + + + + + sources + package + + single + + + + + true + + + ${pom.version} + + + + src/assembly/sources.xml + + + + + minimal-zip + package + + single + + + + src/assembly/minimal.xml + + + + com.agilejava.docbkx docbkx-maven-plugin - 2.0.7 + 2.0.6 @@ -357,16 +327,12 @@ - spring-ldap-reference.xml + index.xml true - true css/html.css - - src/docbkx/resources/xsl/html_chunk.xsl - - - src/docbkx/resources/xsl/fopdf.xsl - + true + src/docbkx/resources/xsl/html_chunk.xsl + src/docbkx/resources/xsl/fopdf.xsl version @@ -380,15 +346,15 @@ - - + + + @@ -396,24 +362,24 @@ - - maven-jxr-plugin - - true - - - - maven-surefire-report-plugin - - true - - + + maven-jxr-plugin + + true + + + + maven-surefire-report-plugin + + true + + maven-javadoc-plugin true true -
Spring LDAP Integration
+
Spring LDAP Framework
true ${basedir}/src/main/javadoc/javadoc.css ${basedir}/src/main/javadoc/overview.html @@ -433,9 +399,16 @@ - - maven-project-info-reports-plugin - + + maven-project-info-reports-plugin + - + + + org.springframework + spring-core + ${spring.version} + + + \ No newline at end of file diff --git a/src/assembly/minimal.xml b/src/assembly/minimal.xml index 3d5ef6ce..0d46b579 100644 --- a/src/assembly/minimal.xml +++ b/src/assembly/minimal.xml @@ -24,7 +24,7 @@ - target/${artifactId}-${version}.jar + target/${artifactId}-${version}-all.jar dist diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml index 2a5fb1d7..0e7343ea 100644 --- a/src/assembly/with-dependencies.xml +++ b/src/assembly/with-dependencies.xml @@ -32,7 +32,7 @@ - target/${artifactId}-${version}.jar + target/${artifactId}-${version}-all.jar dist diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml new file mode 100644 index 00000000..ecd11c27 --- /dev/null +++ b/src/docbkx/index.xml @@ -0,0 +1,47 @@ + + + + + Spring LDAP - Reference Documentation + &version; + + + + Mattias + Arthursson + + + Ulrik + Sandberg + + + Eric + Dalquist + + + + + + Copies of this document may be made for your own use and + for distribution to others, provided that you do not + charge any fee for such copies and further provided that + each copy contains this Copyright Notice, whether + distributed in print or electronically. + + + + + + + + + + + + + + + + + diff --git a/src/docbkx/overview.xml b/src/docbkx/overview.xml index 3ae0cda7..45706a5e 100644 --- a/src/docbkx/overview.xml +++ b/src/docbkx/overview.xml @@ -5,7 +5,7 @@ Overview - Spring-LDAP (Spring LDAP (http://www.springframework.org/ldap) is a library for simpler LDAP programming in Java, built on the same principles as the Spring LDAP package structure - - + + + + + diff --git a/src/docbkx/images/NamingException.png b/src/docbkx/resources/images/NamingException.png similarity index 100% rename from src/docbkx/images/NamingException.png rename to src/docbkx/resources/images/NamingException.png diff --git a/src/docbkx/images/banner4.jpg b/src/docbkx/resources/images/banner4.jpg similarity index 100% rename from src/docbkx/images/banner4.jpg rename to src/docbkx/resources/images/banner4.jpg diff --git a/src/docbkx/images/bannerR.gif b/src/docbkx/resources/images/bannerR.gif similarity index 100% rename from src/docbkx/images/bannerR.gif rename to src/docbkx/resources/images/bannerR.gif diff --git a/src/docbkx/images/logo.png b/src/docbkx/resources/images/logo.png similarity index 100% rename from src/docbkx/images/logo.png rename to src/docbkx/resources/images/logo.png diff --git a/src/docbkx/images/package-dependencies.png b/src/docbkx/resources/images/package-dependencies.png similarity index 100% rename from src/docbkx/images/package-dependencies.png rename to src/docbkx/resources/images/package-dependencies.png diff --git a/src/docbkx/resources/images/s2_box_logo.png b/src/docbkx/resources/images/s2_box_logo.png new file mode 100644 index 00000000..8c778a57 Binary files /dev/null and b/src/docbkx/resources/images/s2_box_logo.png differ diff --git a/src/docbkx/resources/images/xdev-spring_logo.jpg b/src/docbkx/resources/images/xdev-spring_logo.jpg new file mode 100644 index 00000000..622962ee Binary files /dev/null and b/src/docbkx/resources/images/xdev-spring_logo.jpg differ diff --git a/src/docbkx/resources/xsl/html.xsl b/src/docbkx/resources/xsl/html.xsl index aa7930ba..015b02c9 100644 --- a/src/docbkx/resources/xsl/html.xsl +++ b/src/docbkx/resources/xsl/html.xsl @@ -1,7 +1,7 @@ 1 - + @@ -187,8 +187,8 @@ - Sponsored by SpringSource + Sponsored by Jayway diff --git a/src/docbkx/spring-ldap-reference.xml b/src/docbkx/spring-ldap-reference.xml deleted file mode 100644 index cc3fea19..00000000 --- a/src/docbkx/spring-ldap-reference.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - Spring LDAP - Reference Documentation - Version 1.3-RC1 - 2008 - - - Mattias - Arthursson - - - Ulrik - Sandberg - - - Eric - Dalquist - - - - - - Copies of this document may be made for your own use and - for distribution to others, provided that you do not - charge any fee for such copies and further provided that - each copy contains this Copyright Notice, whether - distributed in print or electronically. - - - - - - - - - - - - - - - - - - diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt new file mode 100644 index 00000000..9f1b2d62 --- /dev/null +++ b/src/site/apt/downloads/releases.apt @@ -0,0 +1,15 @@ + --------- + Downloads + --------- + +Downloads + +* Get the latest Spring LDAP releases here + + * <> + + * {{{http://sourceforge.net/project/showfiles.php?group_id=73357&package_id=202038&release_id=560004}Download}} | {{{http://sourceforge.net/project/shownotes.php?group_id=73357&release_id=560004}Changelog}} | {{{http://forum.springframework.org/showthread.php?t=47223}Announcement}} + + * <> + + * {{{snapshots.html}Download nightly snapshots}} diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt new file mode 100644 index 00000000..c25188a8 --- /dev/null +++ b/src/site/apt/downloads/snapshots.apt @@ -0,0 +1,32 @@ + --------- + Snapshots + --------- + +Snapshot Builds + + These builds are provided for testing and development purposes only. They are built by a Bamboo process + automatically using the latest snapshot from Subversion. + + The snapshots are deployed to a Maven2 snapshot repository. To use it, just add the following repository to the POM: + ++--------------- + + spring-s3 + Springframework Maven SNAPSHOT Repository + http://s3.amazonaws.com/maven.springframework.org/snapshot + ++--------------- + + Individual dependencies can then be added like so: + ++--------------- + + org.springframework.ldap + spring-ldap-core + 1.3.0.CI-SNAPSHOT + ++--------------- + + Additionally, there are + {{{http://static.springframework.org/spring-ldap/downloads/1.3-snapshot-download.php}zips}} + available which contain all jars. diff --git a/src/site/apt/reference.apt b/src/site/apt/reference.apt new file mode 100644 index 00000000..dfaf85bf --- /dev/null +++ b/src/site/apt/reference.apt @@ -0,0 +1,11 @@ + ---------------- + Reference Manual + ---------------- + +Reference Manual + + The reference manual is available as HTML, and as PDF. + + * View the {{{reference/html/index.html}HTML version}} + + * Download the {{{reference/pdf/spring-ldap-reference.pdf}PDF version}} diff --git a/src/site/apt/resources.apt b/src/site/apt/resources.apt new file mode 100644 index 00000000..af8b8892 --- /dev/null +++ b/src/site/apt/resources.apt @@ -0,0 +1,28 @@ + ------------------- + Resources and Tools + ------------------- + +Resources + + On this page, we give some general resources related to LDAP. Note that these + resources are generic, and not tied to Spring LDAP. + +* LDAP + + +** RFCs + + * {{{http://www.ietf.org/rfc/rfc2251.txt}RFC 2251}}, LDAPv3 spec + + * {{{http://www.ietf.org/rfc/rfc2252.txt}RFC 2252}}, Attribute Syntax Definitions + + * {{{http://www.ietf.org/rfc/rfc2253.txt}RFC 2253}}, Distinguished Names + + * {{{http://www.ietf.org/rfc/rfc2254.txt}RFC 2254}}, LDAP Search Filters + + * {{{http://www.ietf.org/rfc/rfc2255.txt}RFC 2255}}, LDAP URL Format + + * {{{http://www.ietf.org/rfc/rfc2256.txt}RFC 2256}}, X.500 User Schema for use with LDAPv3 + + * {{{http://www.ietf.org/rfc/rfc2696.txt}RFC 2696}}, LDAP Control Extension for Simple Paged Results + diff --git a/src/site/apt/upgrading.apt b/src/site/apt/upgrading.apt new file mode 100644 index 00000000..0728fbbc --- /dev/null +++ b/src/site/apt/upgrading.apt @@ -0,0 +1,42 @@ + --------- + Upgrading + --------- + +Upgrading from version 1.3.0-RC1 to 1.3.0 + + Some minor changes were made between version 1.3.0-RC1 and 1.3.0. + + * PagedResultsRequestControl has been deprecated in favor of the more appropriately named + PagedResultsDirContextProcessor. + + * The default value of the <<>> property of DirContextSource has been changed + from <<>> to <<>>. + +Upgrading from version 1.2.1 to 1.3.0 + + Some minor changes were made since version 1.2.1. The following +should help most users the project update their applications: + + * NameNotFoundException is no longer silently ignored in searches. It is possible + to use the old behavior by setting the <<>> property + to true in LdapTemplate. + + * Removed AcegiAuthenticationSource - use SpringSecurityAuthenticationSource + (included with Spring Security) instead. + + * Removed deprecated method <<>> in AbstractContextSource. + + * DirContextAdapter#getStringAttributes, getObjectAttributes, and + getAttributeSortedStringSet now all return null if the requested Attribute + is not present, and an empty result (array or set) if present but empty. + + * Probably the most requested feature of all - a plain method for simple + authentication is now provided in the ContextSource interface. + + * DistinguishedName now returns compactly formatted String representations + from toString, e.g.: + <<>> + rather than + <<>> + To keep using the old formatting (for backward compatibility) set the + system property <<>> to <<>>. diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml new file mode 100644 index 00000000..e7ce734b --- /dev/null +++ b/src/site/fml/faq.fml @@ -0,0 +1,80 @@ + + + + diff --git a/src/site/resources/images/external.png b/src/site/resources/images/external.png new file mode 100644 index 00000000..3f999fc8 Binary files /dev/null and b/src/site/resources/images/external.png differ diff --git a/src/site/resources/images/logos/bamboo.png b/src/site/resources/images/logos/bamboo.png new file mode 100644 index 00000000..d4a071fb Binary files /dev/null and b/src/site/resources/images/logos/bamboo.png differ diff --git a/src/site/resources/images/logos/contegix.png b/src/site/resources/images/logos/contegix.png new file mode 100644 index 00000000..dc3841d3 Binary files /dev/null and b/src/site/resources/images/logos/contegix.png differ diff --git a/src/site/resources/images/logos/jira.png b/src/site/resources/images/logos/jira.png new file mode 100644 index 00000000..006aca67 Binary files /dev/null and b/src/site/resources/images/logos/jira.png differ diff --git a/src/site/resources/images/logos/s101d.png b/src/site/resources/images/logos/s101d.png new file mode 100644 index 00000000..4d4939c1 Binary files /dev/null and b/src/site/resources/images/logos/s101d.png differ diff --git a/src/site/resources/images/logos/spring.png b/src/site/resources/images/logos/spring.png new file mode 100644 index 00000000..e773b170 Binary files /dev/null and b/src/site/resources/images/logos/spring.png differ diff --git a/src/site/resources/images/spring-ldap.png b/src/site/resources/images/spring-ldap.png new file mode 100644 index 00000000..31396b8a Binary files /dev/null and b/src/site/resources/images/spring-ldap.png differ diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 00000000..28e90483 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,53 @@ + + + + org.springframework.maven.skins + maven-spring-skin + 1.0.4 + + + + Spring LDAP + images/spring-ldap.png + http://www.springframework.org/ldap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml new file mode 100644 index 00000000..2d72cfbd --- /dev/null +++ b/src/site/xdoc/index.xml @@ -0,0 +1,39 @@ + + + Home + + +

What is Spring LDAP?

+

Spring LDAP is a result of applying the template approach found in + for example JdbcTemplate, in the JNDI world. Spring LDAP aims to + eliminate the need for writing raw JNDI/LDAP applications. +

+

Key Features

+
    +
  • Simplifies Coding: 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.
    • +
  • Pooling Library: The built-in JNDI pooling support is very + limited, and actually has a few deficiencies. Spring LDAP provides a + much more flexible and powerful pooling library.
    • +
  • Reuses your Spring expertise: Spring LDAP uses Spring application + contexts for all configuration, which should help Spring developers get + up-to-speed nice and quickly. Also, the architecture of Spring LDAP + resembles that of Spring JDBC.
    • +
  • Supports Transactions: The LDAP standard does not specify transaction support. + Spring LDAP provides a client-side compensating transaction library to fill the void.
    • +
  • Integrates with Spring Security: The authentication system of Spring LDAP provides + integration with Spring Security. + In fact, Spring Security uses Spring LDAP for its LDAP integration.
    • +
  • Built by Maven: This assists you in effectively reusing the Spring LDAP artifacts + in your own Maven-based projects.
    • +
  • Apache license. You can confidently use Spring LDAP in your project.
    • +
+ + \ No newline at end of file