diff --git a/mvn-build/core/notice.txt b/mvn-build/core/notice.txt index 4e701033..eab6e896 100644 --- a/mvn-build/core/notice.txt +++ b/mvn-build/core/notice.txt @@ -1,6 +1,6 @@ ====================================================================== == NOTICE file corresponding to section 4 d of the Apache License, == - == Version 2.0, for the LdapTemplate distribution. == + == Version 2.0, for the Spring LDAP distribution. == ====================================================================== This product includes software developed by @@ -9,8 +9,8 @@ The end-user documentation included with a redistribution, if any, must include the following acknowledgement: - "This product includes software developed by the LdapTemplate - Project (http://ldaptemplate.sourceforge.net)." + "This product includes software developed by the Spring LDAP + Project (http://www.springframework.org/ldap)." Alternately, this acknowledgement may appear in the software itself, if and wherever such third-party acknowledgements normally appear. diff --git a/mvn-build/core/pom.xml b/mvn-build/core/pom.xml index 5919b2ef..55f8a90a 100644 --- a/mvn-build/core/pom.xml +++ b/mvn-build/core/pom.xml @@ -45,7 +45,6 @@ - diff --git a/mvn-build/core/src/assemble/bin-with-dependencies.xml b/mvn-build/core/src/assemble/bin-with-dependencies.xml index f650b647..f251d2df 100644 --- a/mvn-build/core/src/assemble/bin-with-dependencies.xml +++ b/mvn-build/core/src/assemble/bin-with-dependencies.xml @@ -1,5 +1,5 @@ - bin-with-dependencies + assembly dir @@ -12,6 +12,13 @@ dist + + src/main/java + + **/*.java + + src + diff --git a/mvn-build/license.txt b/mvn-build/license.txt new file mode 100644 index 00000000..0c8a028d --- /dev/null +++ b/mvn-build/license.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2006 Mattias Arthursson and Ulrik Sandberg + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/mvn-build/notice.txt b/mvn-build/notice.txt new file mode 100644 index 00000000..eab6e896 --- /dev/null +++ b/mvn-build/notice.txt @@ -0,0 +1,16 @@ + ====================================================================== + == NOTICE file corresponding to section 4 d of the Apache License, == + == Version 2.0, for the Spring LDAP distribution. == + ====================================================================== + + This product includes software developed by + the Apache Software Foundation (http://www.apache.org). + + The end-user documentation included with a redistribution, if any, + must include the following acknowledgement: + + "This product includes software developed by the Spring LDAP + Project (http://www.springframework.org/ldap)." + + Alternately, this acknowledgement may appear in the software itself, + if and wherever such third-party acknowledgements normally appear. diff --git a/mvn-build/pom.xml b/mvn-build/pom.xml index 8ad13f39..0551b6c8 100644 --- a/mvn-build/pom.xml +++ b/mvn-build/pom.xml @@ -24,99 +24,136 @@ ${basedir}/target/site/guide 2.5.4 + + JIRA + + http://opensource.atlassian.com/projects/spring/browse/LDAP + + - - - - maven-eclipse-plugin - - true - - + + + scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-projects/trunk/spring-ldap + + + scm:svn:https://springframework.svn.sourceforge.net/svnroot/springframework/spring-projects/trunk/spring-ldap + + + http://springframework.svn.sourceforge.net/viewcvs.cgi/springframework/spring-projects/trunk/spring-ldap + + - - org.apache.maven.plugins - maven-surefire-plugin - 2.4.2 - - once - - + 2006 - - com.agilejava.docbkx - docbkx-maven-plugin - 2.0.7 - - - - generate-html - generate-pdf - - pre-site - - - - - org.docbook - docbook-xml - 4.4 - runtime - - - - index.xml - true - true - css/html.css - src/docbkx/resources/xsl/html_chunk.xsl - src/docbkx/resources/xsl/fopdf.xsl - - - version - ${pom.version} - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.4 - - true -
Spring LDAP Integration
- - http://java.sun.com/j2se/1.5.0/docs/api - - - http://static.springframework.org/spring/docs/2.5.x/api/ - - - http://commons.apache.org/pool/apidocs/ - - - + + + + maven-eclipse-plugin + + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.4.2 + + once + + + + maven-assembly-plugin + + + + src/assemble/bin-with-dependencies.xml + + + + + + com.agilejava.docbkx + docbkx-maven-plugin + 2.0.7 + + + + generate-html + generate-pdf + + pre-site + + + + + org.docbook + docbook-xml + 4.4 + runtime + + + + index.xml + true + true + css/html.css + + src/docbkx/resources/xsl/html_chunk.xsl + + + src/docbkx/resources/xsl/fopdf.xsl + + + + version + ${pom.version} + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.4 + + true +
Spring LDAP Integration
+ http://java.sun.com/j2se/1.5.0/docs/api + + http://static.springframework.org/spring/docs/2.5.x/api/ + + http://commons.apache.org/pool/apidocs/ + + + + + javadoc + + + + diff --git a/mvn-build/readme.txt b/mvn-build/readme.txt new file mode 100644 index 00000000..b58d4657 --- /dev/null +++ b/mvn-build/readme.txt @@ -0,0 +1,87 @@ +Spring-LDAP 1.2 (Oct 2007) +----------------------------- +http://www.springframework.org/ldap + +1. INTRODUCTION + +Spring-LDAP is a library to simplify LDAP programming in Java, built on the same +principles as Spring Jdbc. + +The LdapTemplate class encapsulates all the plumbing work involved in traditional LDAP +programming, such as creating, 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 Exception translation from NamingExceptions +to an unchecked exception hirearchy, as well as several utilities for working with filters, +LDAP paths and Attributes. + +As of version 1.2, support for client-side compensating transaction is provided, as well as +Java 5 generics support with the SimpleLdapTemplate. + +2. RELEASE INFO + +Spring LDAP requires J2SE 1.4 for running. +J2SE 1.4, and javacc version 4.0 is required for building the Spring LDAP distributables from source code. +J2EE 1.4 (Servlet 2.3, JSP 1.2) is required for running the example. + +The Spring-LDAP release comes in three different distributables: +* spring-ldap-bin-x.x.zip + ** readme.txt - this readme file. + ** license.txt - terms and conditions for use, reproduction and distribution + ** dist/spring-ldap-x.x.jar - the library + ** dist/spring-ldap-src-x.x.zip - the source code of the library + ** dist/ivys - ivy configuration + ** doc/api - api javadoc documentation + ** doc/reference - full project reference documentation + ** doc/upgrade - Upgrade guide from 1.1.2 + +* spring-ldap-bin-with-dependencies-x.x.zip + ** readme.txt - this readme file. + ** license.txt - terms and conditions for use, reproduction and distribution + ** dist/spring-ldap-x.x.jar - the library + ** dist/spring-ldap-src-x.x.zip - the source code of the library + ** dist/ivys - ivy configuration + ** lib - all referenced libraries necessary to use spring-LDAP + ** doc/api - api javadoc documentation + ** doc/reference - full project reference documentation + ** doc/upgrade - Upgrade guide from 1.1.2 + +The sources included in the distributables are for reference use only, however buildable +sources are available in svn on sourceforge on the following URLs: +Sources for this release (1.2 tag): +https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/tags/1.2 +Latest sources (trunk): +https://springframework.svn.sourceforge.net/svnroot/springframework/spring-ldap/trunk + +Nightly builds are available for download from: +http://static.springframework.org/downloads/nightly/snapshot-download.php?project=LDAP + +Spring-LDAP is released under the terms of the Apache Software License (see license.txt). + +3. DISTRIBUTION JAR FILES + +The following distinct jar files are included in the distribution. This list +specifies the respective contents and third-party dependencies. + +* spring-ldap-x.x.jar +- Contents: The Spring-LDAP library +- Dependencies: Commons Logging, Commons Lang, spring-beans, + spring-core, spring-context, spring-dao, ldapbp, commons-pool + +* spring-ldap-tiger-x.x.jar +- Contents: The Spring-LDAP Java 5 support library +- Dependencies: Commons Logging, Commons Lang, spring-beans, + spring-core, spring-context, spring-dao, ldapbp, commons-pool + +4. WHERE TO START + +The distribution contains extensive JavaDoc documentation as well as full reference +documentation and a sample application illustrating different ways to use Spring-LDAP. +The Spring-LDAP homepage can be found at the following URL: + +http://www.springframework.org/ldap + +There you will find resources related to the project. diff --git a/mvn-build/releasebuild.sh b/mvn-build/releasebuild.sh new file mode 100755 index 00000000..7d9b7003 --- /dev/null +++ b/mvn-build/releasebuild.sh @@ -0,0 +1,159 @@ +#! /bin/sh + +# This script must be run from the project root directory +# +# Release Process. +# +# 1. Do clean check out of source from svn and note revision number. +# 2. Switch to JDK 1.4 and run "mvn compile" in core. +# 3. Set the version number in the pom.xml files of all the modules. +# 3a. If doing a release rather than snapshot build, run "find . -name pom.xml | xargs grep SNAPSHOT" and make sure +# there are no important snapshot dependencies. +# 3b. Set the same version number in this script. +# 4. Set the correct spring version number in the pom.xml. +# 4a. Make sure there are no snapshot dependencies in the release. +# 4b. Remove any references to external maven repositories in the parent pom.xml (remove element). +# 4c. Check that all dependencies are downloadable from maven central repo. +# 5. Run this script to generate the artifacts and web site in the 'release' directory. +# 6. Copy the archives and unpack them to check the contents. +# 7. The archives are tar archives. Create zip versions from the contents and check the internal paths are Ok. +# 8. Check the site looks Ok. +# 9. Check the reference guide links in the site are valid and that images are shown and paths in HTML are relative. +# 10. Deploy the contacts and tutorial sample apps in Jetty and Tomcat and check they work. +# 11. Check there have been no further commits since checkout (svn update). If there have, go to 1. +# 12. Commit the source with the changed version numbers and note the revision number (should be 'build revision' + 1). +# 13. Label/tag the source tree with the release version number. +# 14. Update the pom file versions to the appropriate snapshot version, do a grep to make sure none have been missed +# and commit them. +# 15. Upload the site to acegisecurity.org (or wherever). +# 16. scp the release archives to shell.sf.net. Check md5 matches to make sure transfer was OK. +# 17. ftp them to the sourceforge upload server, uploads.sourceforge.net. +# 18. Put the jars, poms and signature files into the acegi repository for synchronization. +# +# (alternatively, the maven release plugin takes care of a lot of this stuff). + +######################################################################################################################## +# +# Edit this release number before running. It is used to check jar names etc. +# +######################################################################################################################## + +RELEASE_VERSION=1.2.2-SNAPSHOT + +# Project Name. Used for creating the archives. +PROJECT_NAME=spring-ldap + +PROJ_DIR=`pwd`; +RELEASE_DIR=$PROJ_DIR/$PROJECT_NAME-$RELEASE_VERSION +DOCS_DIR=$RELEASE_DIR/docs +SITE_DIR=target/site +DIST_DIR=dist + +echo "** Project directory is $PROJ_DIR" + +SVN_REV=`svn info $PROJ_DIR | grep Revision | sed "s/Revision: //"` + +echo "** Building from revision $SVN_REV" + +######################################################################################################################## +# +# Create the release directory +# +######################################################################################################################## + +if [[ -e $RELEASE_DIR ]] +then + echo "Deleting $RELEASE_DIR." + rm -Rf $RELEASE_DIR +fi + +if [[ -e $DIST_DIR ]] +then + echo "Deleting $RELEASE_DIR." + rm -Rf $DIST_DIR +fi + +mkdir $RELEASE_DIR +mkdir $DOCS_DIR +mkdir $DIST_DIR + +######################################################################################################################## +# +# run maven to generate jars +# +######################################################################################################################## + +mvn clean install -DcreateChecksum=true + +if [ "$?" -ne 0 ] +then + echo "mvn install failed" + exit 1; +fi + +######################################################################################################################## +# +# Generate Maven Web Site and Process Docbook Source. +# +######################################################################################################################## + +echo "** Generating site". + +mvn site + +if [ "$?" -ne 0 ] +then + echo "mvn site generation failed" + exit 1; +fi + +cp -r $SITE_DIR/apidocs $SITE_DIR/reference $DOCS_DIR +######################################################################################################################## +# +# Patch the module site files to point to the root css files, change names of oversized menus, +# remove dodgy standard maven text etc. +# +######################################################################################################################## + +pushd $SITE_DIR + +find . -maxdepth 2 -mindepth 2 -name "*.html" | xargs perl -i -p -e 's#"\./css/#"\.\./css/#;' \ + -e 's/Maven Surefire Report/Unit Tests/;' \ + -e 's/Cobertura Test Coverage/Test Coverage/;' \ + -e 's/A successful project.*greatly appreciated\.//;' + +find . -maxdepth 3 -mindepth 3 -name "*.html" | xargs perl -i -p -e 's#"\./css/#"\.\./\.\./css/#;' + +popd + +######################################################################################################################## +# +# Assemble the required jar files, make sure there are the expected number and produce signatures. +# +######################################################################################################################## + +pushd core +mvn assembly:single +popd + +pushd tiger +mvn assembly:single +popd + +cp -r core/target/spring-ldap-${RELEASE_VERSION}-assembly.dir/* $RELEASE_DIR +cp -r tiger/target/spring-ldap-tiger-${RELEASE_VERSION}-assembly.dir/* $RELEASE_DIR + +######################################################################################################################## +# +# Build the release archives. +# +######################################################################################################################## + +# Get rid of mac DS_Store files. + +find . -name .DS_Store -exec rm "{}" ";" + +cp notice.txt readme.txt license.txt $RELEASE_DIR + +zip -r $DIST_DIR/${PROJECT_NAME}-bin-${RELEASE_VERSION}.zip ${PROJECT_NAME}-${RELEASE_VERSION} -x ${PROJECT_NAME}-${RELEASE_VERSION}/lib/ ${PROJECT_NAME}-${RELEASE_VERSION}/lib/* +zip -r $DIST_DIR/${PROJECT_NAME}-bin-with-dependencies-${RELEASE_VERSION}.zip ${PROJECT_NAME}-${RELEASE_VERSION} diff --git a/mvn-build/tiger/pom.xml b/mvn-build/tiger/pom.xml index f85131fe..40559709 100644 --- a/mvn-build/tiger/pom.xml +++ b/mvn-build/tiger/pom.xml @@ -24,6 +24,16 @@ 1.5 + + maven-assembly-plugin + + + + src/assemble/bin-with-source.xml + + + + diff --git a/mvn-build/tiger/src/assemble/bin-with-source.xml b/mvn-build/tiger/src/assemble/bin-with-source.xml new file mode 100644 index 00000000..7aea3312 --- /dev/null +++ b/mvn-build/tiger/src/assemble/bin-with-source.xml @@ -0,0 +1,23 @@ + + assembly + + dir + + false + + + target + + *.jar + + dist + + + src/main/java + + **/*.java + + src + + +