diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc index f013d6f3..17783c7c 100644 --- a/CODE_OF_CONDUCT.adoc +++ b/CODE_OF_CONDUCT.adoc @@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden with regard to the reporter of an incident. This Code of Conduct is adapted from the -http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at -http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] +https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at +https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dbe81fc1..f347a830 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -157,7 +157,7 @@ public class Spr8954Tests { Use `git rebase --interactive`, `git add --patch` and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. -Here is one: http://book.git-scm.com/4_interactive_rebasing.html. +Here is one: https://book.git-scm.com/4_interactive_rebasing.html. ## Use real name in git commits @@ -282,8 +282,8 @@ Note that you can always force push (`git push -f`) reworked / rebased commits against the branch used to submit your pull request. i.e. you do not need to issue a new pull request when asked to make changes. -[help documentation]: http://help.github.com/send-pull-requests +[help documentation]: https://help.github.com/send-pull-requests [JIRA issue tracker]: https://jira.springsource.org/browse/LDAP [SpringSource CLA form]: https://support.springsource.com/spring_committer_signup [fork-and-edit]: https://github.com/blog/844-forking-with-the-edit-button -[commit guidelines section of Pro Git]: http://progit.org/book/ch5-2.html#commit_guidelines +[commit guidelines section of Pro Git]: https://progit.org/book/ch5-2.html#commit_guidelines diff --git a/changelog.txt b/changelog.txt index 2984eaf6..cb67e16e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,16 +1,16 @@ Spring LDAP CHANGELOG ===================== -http://www.springframework.org/ldap +https://www.springframework.org/ldap -http://www.ietf.org/rfc/rfc1960.txt -http://www.ietf.org/rfc/rfc2251.txt -http://www.ietf.org/rfc/rfc2252.txt -http://www.ietf.org/rfc/rfc2253.txt -http://www.ietf.org/rfc/rfc2254.txt -http://www.ietf.org/rfc/rfc2255.txt -http://www.ietf.org/rfc/rfc2256.txt -http://www.ietf.org/rfc/rfc2696.txt -http://www.ietf.org/rfc/rfc2829.txt +https://www.ietf.org/rfc/rfc1960.txt +https://www.ietf.org/rfc/rfc2251.txt +https://www.ietf.org/rfc/rfc2252.txt +https://www.ietf.org/rfc/rfc2253.txt +https://www.ietf.org/rfc/rfc2254.txt +https://www.ietf.org/rfc/rfc2255.txt +https://www.ietf.org/rfc/rfc2256.txt +https://www.ietf.org/rfc/rfc2696.txt +https://www.ietf.org/rfc/rfc2829.txt Changes in version 1.3.2 (Not released yet) ------------------------------------------- @@ -39,7 +39,7 @@ Changes in version 1.3.1 (November 2010) * Added utility methods for converting a Windows security identifier (SID) between a binary format and a slightly more readable string format. - http://msdn.microsoft.com/en-us/library/aa379571%28VS.85%29.aspx + https://msdn.microsoft.com/en-us/library/aa379571%28VS.85%29.aspx (LDAP-187) * Added authentication methods that provide a possible authentication @@ -57,7 +57,7 @@ Changes in version 1.3.1 (November 2010) "none". (LDAP-188) * DIGEST-MD5 SASL authentication mechanism is now supported, as specified by - RFC 2829 (see http://www.ietf.org/rfc/rfc2829.txt, section 4). (LDAP-173) + RFC 2829 (see https://www.ietf.org/rfc/rfc2829.txt, section 4). (LDAP-173) Contributed by Marvin S. Addison. * DefaultDirObjectFactory calls a Java5 version of the IllegalArgumentException diff --git a/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java index c032b5b5..1ecb5a04 100755 --- a/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java +++ b/core/src/main/java/org/springframework/ldap/core/support/AbstractTlsDirContextAuthenticationStrategy.java @@ -56,7 +56,7 @@ import java.util.Hashtable; * processing. *

* For further information regarding TLS, refer to this + * href="https://java.sun.com/products/jndi/tutorial/ldap/ext/starttls.html">this * page. *

* NB: TLS negotiation is an expensive process, which is why you will diff --git a/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java b/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java index 7be2d716..72a228e4 100755 --- a/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java +++ b/core/src/main/java/org/springframework/ldap/core/support/ExternalTlsDirContextAuthenticationStrategy.java @@ -24,7 +24,7 @@ import javax.naming.ldap.LdapContext; * {@link DirContextAuthenticationStrategy} for using TLS and external (SASL) * authentication. This implementation requires a client certificate to be * pointed out using system variables, as described here. Refer to {@link AbstractTlsDirContextAuthenticationStrategy} for * other configuration options. * diff --git a/core/src/main/java/org/springframework/ldap/filter/AbsoluteFalseFilter.java b/core/src/main/java/org/springframework/ldap/filter/AbsoluteFalseFilter.java index 8ce2fe1b..0a76a978 100644 --- a/core/src/main/java/org/springframework/ldap/filter/AbsoluteFalseFilter.java +++ b/core/src/main/java/org/springframework/ldap/filter/AbsoluteFalseFilter.java @@ -20,7 +20,7 @@ package org.springframework.ldap.filter; * A filter that will always evaluate to false, as specified in RFC4526. * * @author Mattias Hellborg Arthursson - * @see RFC4526 + * @see RFC4526 * @since 1.3.2 */ public class AbsoluteFalseFilter extends AbstractFilter { diff --git a/core/src/main/java/org/springframework/ldap/filter/AbsoluteTrueFilter.java b/core/src/main/java/org/springframework/ldap/filter/AbsoluteTrueFilter.java index e1a4a7f7..86c76c54 100644 --- a/core/src/main/java/org/springframework/ldap/filter/AbsoluteTrueFilter.java +++ b/core/src/main/java/org/springframework/ldap/filter/AbsoluteTrueFilter.java @@ -20,7 +20,7 @@ package org.springframework.ldap.filter; * A filter that will always evaluate to true, as specified in RFC4526. * * @author Mattias Hellborg Arthursson - * @see RFC4526 + * @see RFC4526 * @since 1.3.2 */ public class AbsoluteTrueFilter extends AbstractFilter { diff --git a/core/src/main/java/org/springframework/ldap/filter/Filter.java b/core/src/main/java/org/springframework/ldap/filter/Filter.java index 665aee62..10fd1538 100644 --- a/core/src/main/java/org/springframework/ldap/filter/Filter.java +++ b/core/src/main/java/org/springframework/ldap/filter/Filter.java @@ -20,7 +20,7 @@ package org.springframework.ldap.filter; * Common interface for LDAP filters. * * @author Adam Skogman - * @see RFC 1960: A String + * @see RFC 1960: A String * Representation of LDAP Search Filters */ public interface Filter { diff --git a/core/src/main/java/org/springframework/ldap/support/LdapUtils.java b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java index 564af799..d9181e4c 100644 --- a/core/src/main/java/org/springframework/ldap/support/LdapUtils.java +++ b/core/src/main/java/org/springframework/ldap/support/LdapUtils.java @@ -602,9 +602,9 @@ public final class LdapUtils { /** * Converts a binary SID to its String representation, according to the * algorithm described here. Thanks to Eyal + * "https://www.jroller.com/eyallupu/entry/java_jndi_how_to_convert">Eyal * Lupu for algorithmic inspiration. * * 

@@ -684,7 +684,7 @@ public final class LdapUtils {
 	/**
 	 * Converts a String SID to its binary representation, according to the
 	 * algorithm described here. 
 	 * 
 	 * @param string SID in readable format
diff --git a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.0.xsd b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.0.xsd
index d65d7809..30fbec70 100644
--- a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.0.xsd
+++ b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.0.xsd
@@ -6,7 +6,7 @@
            targetNamespace="http://www.springframework.org/schema/ldap">
 
     
+                schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd" />
 
     
         
@@ -66,7 +66,7 @@
         
             
                 
-                    Defines the strategy to handle referrals, as described on http://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html.
+                    Defines the strategy to handle referrals, as described on https://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html.
                     Default is null.
                 
             
diff --git a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.1.xsd b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.1.xsd
index 80e038c7..cf90c507 100644
--- a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.1.xsd
+++ b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.1.xsd
@@ -6,7 +6,7 @@
            targetNamespace="http://www.springframework.org/schema/ldap">
 
     
+                schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd" />
 
     
         
@@ -66,7 +66,7 @@
         
             
                 
-                    Defines the strategy to handle referrals, as described on http://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html.
+                    Defines the strategy to handle referrals, as described on https://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html.
                     Default is null.
                 
             
diff --git a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.2.xsd b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.2.xsd
index dfcf18ba..142b29b6 100644
--- a/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.2.xsd
+++ b/core/src/main/resources/org/springframework/ldap/config/spring-ldap-2.2.xsd
@@ -6,7 +6,7 @@
            targetNamespace="http://www.springframework.org/schema/ldap">
 
     
+                schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd" />
 
     
         
@@ -66,7 +66,7 @@
         
             
                 
-                    Defines the strategy to handle referrals, as described on http://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html.
+                    Defines the strategy to handle referrals, as described on https://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html.
                     Default is null.
                 
             
diff --git a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java
index 2d98f5c7..13f46f6a 100644
--- a/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java
+++ b/core/src/test/java/org/springframework/ldap/core/DirContextAdapterTest.java
@@ -834,7 +834,7 @@ public class DirContextAdapterTest {
 
 	/**
 	 * Test case corresponding to LDAP-96 in Spring Jira.
-	 * http://jira.springframework.org/browse/LDAP-96
+	 * https://jira.springframework.org/browse/LDAP-96
 	 */
     @Test
 	public void testChangeMultiAttributeOrderDoesMatterLDAP96()
diff --git a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java
index f46038da..c4c229d7 100644
--- a/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java
+++ b/core/src/test/java/org/springframework/ldap/core/DistinguishedNameTest.java
@@ -581,7 +581,7 @@ public class DistinguishedNameTest {
 	}
 
 	/**
-	 * Test for http://forum.springsource.org/showthread.php?t=86640.
+	 * Test for https://forum.spring.io/showthread.php?t=86640.
 	 */
     @Test
 	public void testDistinguishedNameWithDotParsesProperly() {
diff --git a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTest.java b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTest.java
index ec0171af..030becbe 100644
--- a/core/src/test/java/org/springframework/ldap/support/LdapUtilsTest.java
+++ b/core/src/test/java/org/springframework/ldap/support/LdapUtilsTest.java
@@ -101,7 +101,7 @@ public class LdapUtilsTest {
     }
 
     /**
-     * Example SID from "http://www.pcreview.co.uk/forums/thread-1458615.php".
+     * Example SID from "https://www.pcreview.co.uk/forums/thread-1458615.php".
      */
     @Test
     public void testConvertBinarySidToString() throws Exception {
@@ -117,7 +117,7 @@ public class LdapUtilsTest {
     }
 
     /**
-     * Example SID from "http://blogs.msdn.com/oldnewthing/archive/2004/03/15/89753.aspx".
+     * Example SID from "https://blogs.msdn.com/oldnewthing/archive/2004/03/15/89753.aspx".
      */
     @Test
     public void testConvertAnotherBinarySidToString() throws Exception {
@@ -212,7 +212,7 @@ public class LdapUtilsTest {
     }
 
     /**
-     * Example SID from "http://www.pcreview.co.uk/forums/thread-1458615.php".
+     * Example SID from "https://www.pcreview.co.uk/forums/thread-1458615.php".
      */
     @Test
     public void testConvertStringSidToBinary() throws Exception {
diff --git a/etc/snapshotzipbuilds/1.3-snapshot-download.php b/etc/snapshotzipbuilds/1.3-snapshot-download.php
index 60d83aea..9f8ef0c8 100644
--- a/etc/snapshotzipbuilds/1.3-snapshot-download.php
+++ b/etc/snapshotzipbuilds/1.3-snapshot-download.php
@@ -1,5 +1,5 @@
 
 
 	
 
@@ -25,7 +25,7 @@
 			
 				
 					
-						
+						
 							

 						
 					
diff --git a/ldif/ldif-core/src/main/java/overview.html b/ldif/ldif-core/src/main/java/overview.html
index d5045446..adf39cd2 100644
--- a/ldif/ldif-core/src/main/java/overview.html
+++ b/ldif/ldif-core/src/main/java/overview.html
@@ -1,4 +1,4 @@
-
+
 
 
 
diff --git a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTest.java b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTest.java
index 2832f55f..2987dd20 100644
--- a/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTest.java
+++ b/ldif/ldif-core/src/test/java/org/springframework/ldap/ldif/DefaultAttributeValidationPolicyTest.java
@@ -61,7 +61,7 @@ public class DefaultAttributeValidationPolicyTest {
 	private List exceptions = Arrays.asList(new String[] {
 			"description: :A big sailing fan.",
 			"cn;lang-ja:: 5bCP56yg5Y6fIO.ODreODieODi+ODvA==",
-			"url:< http://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28"
+			"url:< https://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28"
 	});
 	
 	/**
@@ -92,8 +92,8 @@ public class DefaultAttributeValidationPolicyTest {
 				{ "cn;lang-ja:: 5bCP56yg5Y6fIO.ODreODieODi+ODvA==", "cn", ";lang-ja", "5bCP56yg5Y6fIO.ODreODieODi+ODvA==", AttributeType.BASE64 },
 				
 				//Url
-				{ "url:< http://www.oracle.com/", "url", "", "http://www.oracle.com/", AttributeType.URL},
-				{ "url:< http://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html", "url", "", "http://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html", AttributeType.URL},
+				{ "url:< https://www.oracle.com/", "url", "", "https://www.oracle.com/", AttributeType.URL},
+				{ "url:< https://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html", "url", "", "https://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html", AttributeType.URL},
 				{ "url:< ftp://kbarlow:test@ftp.is.co.za/rfc/rfc1808.txt", "url", "", "ftp://kbarlow:test@ftp.is.co.za/rfc/rfc1808.txt", AttributeType.URL},
 				{ "url;option:< ftp://ftp.is.co.za:2100/rfc/rfc1808.txt;type=a", "url", ";option", "ftp://ftp.is.co.za:2100/rfc/rfc1808.txt;type=a", AttributeType.URL},
 				{ "url:< telnet://kbarlow@melvyl.ucop.edu/", "url", "", "telnet://kbarlow@melvyl.ucop.edu/", AttributeType.URL},
@@ -105,7 +105,7 @@ public class DefaultAttributeValidationPolicyTest {
 				{ "url:< prospero://host.dom:1525//pros/name;key=value", "url", "", "prospero://host.dom:1525//pros/name;key=value", AttributeType.URL},
 				{ "url:< nntp://news.cs.hut.fi/alt.html/239157", "url", "", "nntp://news.cs.hut.fi/alt.html/239157", AttributeType.URL},
 				{ "url:< wais://vega.lib.ncsu.edu/alawon.src?nren", "url", "", "wais://vega.lib.ncsu.edu/alawon.src?nren", AttributeType.URL},
-				{ "url:< http://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28", "url", "", "http://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28", AttributeType.URL},
+				{ "url:< https://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28", "url", "", "https://java.sun.com/j2se/1.3/docs/guide/collections/designfaq.html#28", AttributeType.URL},
 				
 				//UTF8
 				{ "company: Østfold Akershus", "company", "", "Østfold Akershus", AttributeType.STRING }
diff --git a/notice.txt b/notice.txt
index eab6e896..d00d4bf6 100644
--- a/notice.txt
+++ b/notice.txt
@@ -4,13 +4,13 @@
    ======================================================================
 
    This product includes software developed by
-   the Apache Software Foundation (http://www.apache.org).
+   the Apache Software Foundation (https://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)."
+      Project (https://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/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java b/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java
index f9da429a..97461f53 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/core/OdmManager.java
@@ -109,8 +109,8 @@ public interface OdmManager {
      * 
      * @throws org.springframework.ldap.NamingException on error.
      * 
-     * @see Sun's JNDI tutorial description of search filters.
-     * @see LDAP: String Representation of Search Filters RFC.
+     * @see Sun's JNDI tutorial description of search filters.
+     * @see LDAP: String Representation of Search Filters RFC.
      */
      List search(Class clazz, Name base, String filter, SearchControls searchControls);
 
diff --git a/odm/src/main/resources/org/springframework/ldap/odm/tools/binary-attributes.txt b/odm/src/main/resources/org/springframework/ldap/odm/tools/binary-attributes.txt
index 1e5e3ba4..562207be 100755
--- a/odm/src/main/resources/org/springframework/ldap/odm/tools/binary-attributes.txt
+++ b/odm/src/main/resources/org/springframework/ldap/odm/tools/binary-attributes.txt
@@ -1,6 +1,6 @@
 # List of syntaxes that will be returned by the JNDI provider as byte[], taken from
-# http://java.sun.com/products/jndi/tutorial/ldap/misc/attrs.html
-# See all http://www.ietf.org/rfc/rfc2256.txt for attribute names with ;binary suffix
+# https://java.sun.com/products/jndi/tutorial/ldap/misc/attrs.html
+# See all https://www.ietf.org/rfc/rfc2256.txt for attribute names with ;binary suffix
 
 # Syntax                       Used by Attributes
 # ------                       ------------------
diff --git a/odm/src/test/java/org/springframework/ldap/odm/test/TestConverterManager.java b/odm/src/test/java/org/springframework/ldap/odm/test/TestConverterManager.java
index 633a2691..7f88c1a3 100755
--- a/odm/src/test/java/org/springframework/ldap/odm/test/TestConverterManager.java
+++ b/odm/src/test/java/org/springframework/ldap/odm/test/TestConverterManager.java
@@ -101,12 +101,12 @@ public final class TestConverterManager {
                 new ConverterTestData((byte)66, String.class, "66"),
                 new ConverterTestData((int)1234, String.class, "1234"),
                 new ConverterTestData((int)-9876, String.class, "-9876"),
-                new ConverterTestData("http://google.com/", URI.class, new URI("http://google.com/")),
-                new ConverterTestData("http://apache.org/index.html", URI.class, new URI(
-                        "http://apache.org/index.html")),
-                new ConverterTestData(new URI("http://google.com/"), String.class, "http://google.com/"),
-                new ConverterTestData(new URI("http://apache.org/index.html"), String.class,
-                        "http://apache.org/index.html") };
+                new ConverterTestData("https://google.com/", URI.class, new URI("https://google.com/")),
+                new ConverterTestData("https://apache.org/index.html", URI.class, new URI(
+                        "https://apache.org/index.html")),
+                new ConverterTestData(new URI("https://google.com/"), String.class, "https://google.com/"),
+                new ConverterTestData(new URI("https://apache.org/index.html"), String.class,
+                        "https://apache.org/index.html") };
 
         new ExecuteRunnable>().runTests(new RunnableTest>() {
             public void runTest(ConverterTestData testData) {
diff --git a/readme.md b/readme.md
index da2e0604..8d2c7524 100644
--- a/readme.md
+++ b/readme.md
@@ -53,7 +53,7 @@ framework milestone repo:
     
       spring-milestone
       Spring Portfolio Milestone Repository
-      http://maven.springframework.org/milestone
+      https://maven.springframework.org/milestone
     
 
 Snapshot builds produced by the CI builds are available from the Spring framework snapshot repo:
@@ -61,7 +61,7 @@ Snapshot builds produced by the CI builds are available from the Spring framewor
     
       spring-milestone
       Spring Portfolio Milestone Repository
-      http://maven.springframework.org/snapshot
+      https://maven.springframework.org/snapshot
     
 
 In order to e.g. try out the latest build snapshot of the core module, include the repository above and
diff --git a/samples/user-admin/src/main/webapp/WEB-INF/jsp/header.jsp b/samples/user-admin/src/main/webapp/WEB-INF/jsp/header.jsp
index 14558d8e..a4497e66 100644
--- a/samples/user-admin/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/samples/user-admin/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -30,7 +30,7 @@
                 
                 
             
-            Spring LDAP
+            Spring LDAP
         
         

             
    
diff --git a/samples/user-admin/src/main/webapp/resources/bootstrap/js/bootstrap.js b/samples/user-admin/src/main/webapp/resources/bootstrap/js/bootstrap.js
index 12a45969..283ea60b 100644
--- a/samples/user-admin/src/main/webapp/resources/bootstrap/js/bootstrap.js
+++ b/samples/user-admin/src/main/webapp/resources/bootstrap/js/bootstrap.js
@@ -10,7 +10,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: transition.js v3.0.0
- * http://getbootstrap.com/javascript/#transitions
+ * https://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -30,7 +30,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 +function ($) { "use strict";
 
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+  // CSS TRANSITION SUPPORT (Shoutout: https://www.modernizr.com/)
   // ============================================================
 
   function transitionEnd() {
@@ -50,7 +50,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     }
   }
 
-  // http://blog.alexmaccaw.com/css-transitions
+  // https://blog.alexmaccaw.com/css-transitions
   $.fn.emulateTransitionEnd = function (duration) {
     var called = false, $el = this
     $(this).one($.support.transition.end, function () { called = true })
@@ -67,7 +67,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: alert.js v3.0.0
- * http://getbootstrap.com/javascript/#alerts
+ * https://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -166,7 +166,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: button.js v3.0.0
- * http://getbootstrap.com/javascript/#buttons
+ * https://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -276,7 +276,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: carousel.js v3.0.0
- * http://getbootstrap.com/javascript/#carousel
+ * https://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -494,7 +494,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: collapse.js v3.0.0
- * http://getbootstrap.com/javascript/#collapse
+ * https://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -674,7 +674,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: dropdown.js v3.0.0
- * http://getbootstrap.com/javascript/#dropdowns
+ * https://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -829,7 +829,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: modal.js v3.0.0
- * http://getbootstrap.com/javascript/#modals
+ * https://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -1076,7 +1076,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: tooltip.js v3.0.0
- * http://getbootstrap.com/javascript/#tooltip
+ * https://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -1463,7 +1463,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: popover.js v3.0.0
- * http://getbootstrap.com/javascript/#popovers
+ * https://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -1581,7 +1581,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: scrollspy.js v3.0.0
- * http://getbootstrap.com/javascript/#scrollspy
+ * https://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -1740,7 +1740,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: tab.js v3.0.0
- * http://getbootstrap.com/javascript/#tabs
+ * https://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -1876,7 +1876,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
 /* ========================================================================
  * Bootstrap: affix.js v3.0.0
- * http://getbootstrap.com/javascript/#affix
+ * https://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
diff --git a/samples/user-admin/src/main/webapp/resources/underscore/underscore.min.js b/samples/user-admin/src/main/webapp/resources/underscore/underscore.min.js
index d22f881b..061b8aa4 100644
--- a/samples/user-admin/src/main/webapp/resources/underscore/underscore.min.js
+++ b/samples/user-admin/src/main/webapp/resources/underscore/underscore.min.js
@@ -1,5 +1,5 @@
 //     Underscore.js 1.5.2
-//     http://underscorejs.org
+//     https://underscorejs.org
 //     (c) 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Underscore may be freely distributed under the MIT license.
 (function(){var n=this,t=n._,r={},e=Array.prototype,u=Object.prototype,i=Function.prototype,a=e.push,o=e.slice,c=e.concat,l=u.toString,f=u.hasOwnProperty,s=e.forEach,p=e.map,h=e.reduce,v=e.reduceRight,g=e.filter,d=e.every,m=e.some,y=e.indexOf,b=e.lastIndexOf,x=Array.isArray,w=Object.keys,_=i.bind,j=function(n){return n instanceof j?n:this instanceof j?(this._wrapped=n,void 0):new j(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=j),exports._=j):n._=j,j.VERSION="1.5.2";var A=j.each=j.forEach=function(n,t,e){if(null!=n)if(s&&n.forEach===s)n.forEach(t,e);else if(n.length===+n.length){for(var u=0,i=n.length;i>u;u++)if(t.call(e,n[u],u,n)===r)return}else for(var a=j.keys(n),u=0,i=a.length;i>u;u++)if(t.call(e,n[a[u]],a[u],n)===r)return};j.map=j.collect=function(n,t,r){var e=[];return null==n?e:p&&n.map===p?n.map(t,r):(A(n,function(n,u,i){e.push(t.call(r,n,u,i))}),e)};var E="Reduce of empty array with no initial value";j.reduce=j.foldl=j.inject=function(n,t,r,e){var u=arguments.length>2;if(null==n&&(n=[]),h&&n.reduce===h)return e&&(t=j.bind(t,e)),u?n.reduce(t,r):n.reduce(t);if(A(n,function(n,i,a){u?r=t.call(e,r,n,i,a):(r=n,u=!0)}),!u)throw new TypeError(E);return r},j.reduceRight=j.foldr=function(n,t,r,e){var u=arguments.length>2;if(null==n&&(n=[]),v&&n.reduceRight===v)return e&&(t=j.bind(t,e)),u?n.reduceRight(t,r):n.reduceRight(t);var i=n.length;if(i!==+i){var a=j.keys(n);i=a.length}if(A(n,function(o,c,l){c=a?a[--i]:--i,u?r=t.call(e,r,n[c],c,l):(r=n[c],u=!0)}),!u)throw new TypeError(E);return r},j.find=j.detect=function(n,t,r){var e;return O(n,function(n,u,i){return t.call(r,n,u,i)?(e=n,!0):void 0}),e},j.filter=j.select=function(n,t,r){var e=[];return null==n?e:g&&n.filter===g?n.filter(t,r):(A(n,function(n,u,i){t.call(r,n,u,i)&&e.push(n)}),e)},j.reject=function(n,t,r){return j.filter(n,function(n,e,u){return!t.call(r,n,e,u)},r)},j.every=j.all=function(n,t,e){t||(t=j.identity);var u=!0;return null==n?u:d&&n.every===d?n.every(t,e):(A(n,function(n,i,a){return(u=u&&t.call(e,n,i,a))?void 0:r}),!!u)};var O=j.some=j.any=function(n,t,e){t||(t=j.identity);var u=!1;return null==n?u:m&&n.some===m?n.some(t,e):(A(n,function(n,i,a){return u||(u=t.call(e,n,i,a))?r:void 0}),!!u)};j.contains=j.include=function(n,t){return null==n?!1:y&&n.indexOf===y?n.indexOf(t)!=-1:O(n,function(n){return n===t})},j.invoke=function(n,t){var r=o.call(arguments,2),e=j.isFunction(t);return j.map(n,function(n){return(e?t:n[t]).apply(n,r)})},j.pluck=function(n,t){return j.map(n,function(n){return n[t]})},j.where=function(n,t,r){return j.isEmpty(t)?r?void 0:[]:j[r?"find":"filter"](n,function(n){for(var r in t)if(t[r]!==n[r])return!1;return!0})},j.findWhere=function(n,t){return j.where(n,t,!0)},j.max=function(n,t,r){if(!t&&j.isArray(n)&&n[0]===+n[0]&&n.length<65535)return Math.max.apply(Math,n);if(!t&&j.isEmpty(n))return-1/0;var e={computed:-1/0,value:-1/0};return A(n,function(n,u,i){var a=t?t.call(r,n,u,i):n;a>e.computed&&(e={value:n,computed:a})}),e.value},j.min=function(n,t,r){if(!t&&j.isArray(n)&&n[0]===+n[0]&&n.length<65535)return Math.min.apply(Math,n);if(!t&&j.isEmpty(n))return 1/0;var e={computed:1/0,value:1/0};return A(n,function(n,u,i){var a=t?t.call(r,n,u,i):n;ae||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var F=function(n){return function(t,r,e){var u={},i=null==r?j.identity:k(r);return A(t,function(r,a){var o=i.call(e,r,a,t);n(u,o,r)}),u}};j.groupBy=F(function(n,t,r){(j.has(n,t)?n[t]:n[t]=[]).push(r)}),j.indexBy=F(function(n,t,r){n[t]=r}),j.countBy=F(function(n,t){j.has(n,t)?n[t]++:n[t]=1}),j.sortedIndex=function(n,t,r,e){r=null==r?j.identity:k(r);for(var u=r.call(e,t),i=0,a=n.length;a>i;){var o=i+a>>>1;r.call(e,n[o])=0})})},j.difference=function(n){var t=c.apply(e,o.call(arguments,1));return j.filter(n,function(n){return!j.contains(t,n)})},j.zip=function(){for(var n=j.max(j.pluck(arguments,"length").concat(0)),t=new Array(n),r=0;n>r;r++)t[r]=j.pluck(arguments,""+r);return t},j.object=function(n,t){if(null==n)return{};for(var r={},e=0,u=n.length;u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},j.indexOf=function(n,t,r){if(null==n)return-1;var e=0,u=n.length;if(r){if("number"!=typeof r)return e=j.sortedIndex(n,t),n[e]===t?e:-1;e=0>r?Math.max(0,u+r):r}if(y&&n.indexOf===y)return n.indexOf(t,r);for(;u>e;e++)if(n[e]===t)return e;return-1},j.lastIndexOf=function(n,t,r){if(null==n)return-1;var e=null!=r;if(b&&n.lastIndexOf===b)return e?n.lastIndexOf(t,r):n.lastIndexOf(t);for(var u=e?r:n.length;u--;)if(n[u]===t)return u;return-1},j.range=function(n,t,r){arguments.length<=1&&(t=n||0,n=0),r=arguments[2]||1;for(var e=Math.max(Math.ceil((t-n)/r),0),u=0,i=new Array(e);e>u;)i[u++]=n,n+=r;return i};var R=function(){};j.bind=function(n,t){var r,e;if(_&&n.bind===_)return _.apply(n,o.call(arguments,1));if(!j.isFunction(n))throw new TypeError;return r=o.call(arguments,2),e=function(){if(!(this instanceof e))return n.apply(t,r.concat(o.call(arguments)));R.prototype=n.prototype;var u=new R;R.prototype=null;var i=n.apply(u,r.concat(o.call(arguments)));return Object(i)===i?i:u}},j.partial=function(n){var t=o.call(arguments,1);return function(){return n.apply(this,t.concat(o.call(arguments)))}},j.bindAll=function(n){var t=o.call(arguments,1);if(0===t.length)throw new Error("bindAll must be passed function names");return A(t,function(t){n[t]=j.bind(n[t],n)}),n},j.memoize=function(n,t){var r={};return t||(t=j.identity),function(){var e=t.apply(this,arguments);return j.has(r,e)?r[e]:r[e]=n.apply(this,arguments)}},j.delay=function(n,t){var r=o.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},j.defer=function(n){return j.delay.apply(j,[n,1].concat(o.call(arguments,1)))},j.throttle=function(n,t,r){var e,u,i,a=null,o=0;r||(r={});var c=function(){o=r.leading===!1?0:new Date,a=null,i=n.apply(e,u)};return function(){var l=new Date;o||r.leading!==!1||(o=l);var f=t-(l-o);return e=this,u=arguments,0>=f?(clearTimeout(a),a=null,o=l,i=n.apply(e,u)):a||r.trailing===!1||(a=setTimeout(c,f)),i}},j.debounce=function(n,t,r){var e,u,i,a,o;return function(){i=this,u=arguments,a=new Date;var c=function(){var l=new Date-a;t>l?e=setTimeout(c,t-l):(e=null,r||(o=n.apply(i,u)))},l=r&&!e;return e||(e=setTimeout(c,t)),l&&(o=n.apply(i,u)),o}},j.once=function(n){var t,r=!1;return function(){return r?t:(r=!0,t=n.apply(this,arguments),n=null,t)}},j.wrap=function(n,t){return function(){var r=[n];return a.apply(r,arguments),t.apply(this,r)}},j.compose=function(){var n=arguments;return function(){for(var t=arguments,r=n.length-1;r>=0;r--)t=[n[r].apply(this,t)];return t[0]}},j.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},j.keys=w||function(n){if(n!==Object(n))throw new TypeError("Invalid object");var t=[];for(var r in n)j.has(n,r)&&t.push(r);return t},j.values=function(n){for(var t=j.keys(n),r=t.length,e=new Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},j.pairs=function(n){for(var t=j.keys(n),r=t.length,e=new Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},j.invert=function(n){for(var t={},r=j.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},j.functions=j.methods=function(n){var t=[];for(var r in n)j.isFunction(n[r])&&t.push(r);return t.sort()},j.extend=function(n){return A(o.call(arguments,1),function(t){if(t)for(var r in t)n[r]=t[r]}),n},j.pick=function(n){var t={},r=c.apply(e,o.call(arguments,1));return A(r,function(r){r in n&&(t[r]=n[r])}),t},j.omit=function(n){var t={},r=c.apply(e,o.call(arguments,1));for(var u in n)j.contains(r,u)||(t[u]=n[u]);return t},j.defaults=function(n){return A(o.call(arguments,1),function(t){if(t)for(var r in t)n[r]===void 0&&(n[r]=t[r])}),n},j.clone=function(n){return j.isObject(n)?j.isArray(n)?n.slice():j.extend({},n):n},j.tap=function(n,t){return t(n),n};var S=function(n,t,r,e){if(n===t)return 0!==n||1/n==1/t;if(null==n||null==t)return n===t;n instanceof j&&(n=n._wrapped),t instanceof j&&(t=t._wrapped);var u=l.call(n);if(u!=l.call(t))return!1;switch(u){case"[object String]":return n==String(t);case"[object Number]":return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case"[object Date]":case"[object Boolean]":return+n==+t;case"[object RegExp]":return n.source==t.source&&n.global==t.global&&n.multiline==t.multiline&&n.ignoreCase==t.ignoreCase}if("object"!=typeof n||"object"!=typeof t)return!1;for(var i=r.length;i--;)if(r[i]==n)return e[i]==t;var a=n.constructor,o=t.constructor;if(a!==o&&!(j.isFunction(a)&&a instanceof a&&j.isFunction(o)&&o instanceof o))return!1;r.push(n),e.push(t);var c=0,f=!0;if("[object Array]"==u){if(c=n.length,f=c==t.length)for(;c--&&(f=S(n[c],t[c],r,e)););}else{for(var s in n)if(j.has(n,s)&&(c++,!(f=j.has(t,s)&&S(n[s],t[s],r,e))))break;if(f){for(s in t)if(j.has(t,s)&&!c--)break;f=!c}}return r.pop(),e.pop(),f};j.isEqual=function(n,t){return S(n,t,[],[])},j.isEmpty=function(n){if(null==n)return!0;if(j.isArray(n)||j.isString(n))return 0===n.length;for(var t in n)if(j.has(n,t))return!1;return!0},j.isElement=function(n){return!(!n||1!==n.nodeType)},j.isArray=x||function(n){return"[object Array]"==l.call(n)},j.isObject=function(n){return n===Object(n)},A(["Arguments","Function","String","Number","Date","RegExp"],function(n){j["is"+n]=function(t){return l.call(t)=="[object "+n+"]"}}),j.isArguments(arguments)||(j.isArguments=function(n){return!(!n||!j.has(n,"callee"))}),"function"!=typeof/./&&(j.isFunction=function(n){return"function"==typeof n}),j.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},j.isNaN=function(n){return j.isNumber(n)&&n!=+n},j.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"==l.call(n)},j.isNull=function(n){return null===n},j.isUndefined=function(n){return n===void 0},j.has=function(n,t){return f.call(n,t)},j.noConflict=function(){return n._=t,this},j.identity=function(n){return n},j.times=function(n,t,r){for(var e=Array(Math.max(0,n)),u=0;n>u;u++)e[u]=t.call(r,u);return e},j.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))};var I={escape:{"&":"&","<":"<",">":">",'"':""","'":"'"}};I.unescape=j.invert(I.escape);var T={escape:new RegExp("["+j.keys(I.escape).join("")+"]","g"),unescape:new RegExp("("+j.keys(I.unescape).join("|")+")","g")};j.each(["escape","unescape"],function(n){j[n]=function(t){return null==t?"":(""+t).replace(T[n],function(t){return I[n][t]})}}),j.result=function(n,t){if(null==n)return void 0;var r=n[t];return j.isFunction(r)?r.call(n):r},j.mixin=function(n){A(j.functions(n),function(t){var r=j[t]=n[t];j.prototype[t]=function(){var n=[this._wrapped];return a.apply(n,arguments),z.call(this,r.apply(j,n))}})};var N=0;j.uniqueId=function(n){var t=++N+"";return n?n+t:t},j.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var q=/(.)^/,B={"'":"'","\\":"\\","\r":"r","\n":"n","	":"t","\u2028":"u2028","\u2029":"u2029"},D=/\\|'|\r|\n|\t|\u2028|\u2029/g;j.template=function(n,t,r){var e;r=j.defaults({},r,j.templateSettings);var u=new RegExp([(r.escape||q).source,(r.interpolate||q).source,(r.evaluate||q).source].join("|")+"|$","g"),i=0,a="__p+='";n.replace(u,function(t,r,e,u,o){return a+=n.slice(i,o).replace(D,function(n){return"\\"+B[n]}),r&&(a+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'"),e&&(a+="'+\n((__t=("+e+"))==null?'':__t)+\n'"),u&&(a+="';\n"+u+"\n__p+='"),i=o+t.length,t}),a+="';\n",r.variable||(a="with(obj||{}){\n"+a+"}\n"),a="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+a+"return __p;\n";try{e=new Function(r.variable||"obj","_",a)}catch(o){throw o.source=a,o}if(t)return e(t,j);var c=function(n){return e.call(this,n,j)};return c.source="function("+(r.variable||"obj")+"){\n"+a+"}",c},j.chain=function(n){return j(n).chain()};var z=function(n){return this._chain?j(n).chain():n};j.mixin(j),A(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=e[n];j.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!=n&&"splice"!=n||0!==r.length||delete r[0],z.call(this,r)}}),A(["concat","join","slice"],function(n){var t=e[n];j.prototype[n]=function(){return z.call(this,t.apply(this._wrapped,arguments))}}),j.extend(j.prototype,{chain:function(){return this._chain=!0,this},value:function(){return this._wrapped}})}).call(this);
diff --git a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
index 1049768b..e7b7376f 100644
--- a/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
+++ b/sandbox/src/main/java/org/springframework/ldap/control/VirtualListViewControlDirContextProcessor.java
@@ -65,7 +65,7 @@ import java.lang.reflect.Method;
  *
  * @author Ulrik Sandberg
  * @author Marius Scurtescu
- * @see LDAP Extensions for Scrolling View Browsing of Search Results
+ * @see LDAP Extensions for Scrolling View Browsing of Search Results
  */
 public class VirtualListViewControlDirContextProcessor extends AbstractFallbackRequestAndResponseControlDirContextProcessor
 {
diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc
index 70d0c37b..29737cc6 100644
--- a/src/docs/asciidoc/index.adoc
+++ b/src/docs/asciidoc/index.adoc
@@ -36,7 +36,7 @@ This section offers a relatively quick introduction to Spring LDAP. It includes
 === Overview
 Spring LDAP is designed to simplify LDAP programming in Java. Some of the features provided by the library are:
 
-* http://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/jdbc/core/JdbcTemplate.html[`JdbcTemplate`]-style template simplifications to LDAP programming.
+* https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/jdbc/core/JdbcTemplate.html[`JdbcTemplate`]-style template simplifications to LDAP programming.
 * JPA- or Hibernate-style annotation-based object and directory mapping.
 * Spring Data repository support, including support for QueryDSL.
 * Utilities to simplify building LDAP queries and distinguished names.
@@ -158,8 +158,8 @@ Naturally, this being a Spring Framework sub-project, we use Spring to configure
 
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/ldap https://www.springframework.org/schema/ldap/spring-ldap.xsd">
 
    >.
 [[ldap-names]]
 === Dynamically Building Distinguished Names
 
-The standard Java implementation of Distinguished Name (http://docs.oracle.com/javase/6/docs/api/javax/naming/ldap/LdapName.html[`LdapName`])
+The standard Java implementation of Distinguished Name (https://docs.oracle.com/javase/6/docs/api/javax/naming/ldap/LdapName.html[`LdapName`])
 performs well when it comes to parsing Distinguished Names. However, in practical use, this implementation has a number of shortcomings:
 
 *  The `LdapName` implementation is mutable, which is badly suited for an object representing identity.
@@ -439,8 +439,8 @@ performs well when it comes to parsing Distinguished Names. However, in practica
    Extracting values of indexed or (particularly) named components is also a little bit awkward.
 *  Many of the operations on `LdapName` throw checked exceptions, requiring try-catch statements for situations where the error is typically fatal and cannot be repaired in a meaningful manner.
 
-To simplify working with Distinguished Names, Spring LDAP provides an http://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/support/LdapNameBuilder.html[`LdapNameBuilder`],
-as well as a number of utility methods in http://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/support/LdapUtils.html[`LdapUtils`] that help when working with `LdapName`.
+To simplify working with Distinguished Names, Spring LDAP provides an https://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/support/LdapNameBuilder.html[`LdapNameBuilder`],
+as well as a number of utility methods in https://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/support/LdapUtils.html[`LdapUtils`] that help when working with `LdapName`.
 
 [[spring-ldap-basic-usage-examples]]
 ==== Examples
@@ -649,14 +649,14 @@ Spring LDAP provides more help for simplifying these operations.
 == Simplifying Attribute Access and Manipulation with `DirContextAdapter`
 
 A little-known -- and probably underestimated -- feature of the Java LDAP API is the ability to register a `DirObjectFactory` to automatically create objects from found LDAP entries.
-Spring LDAP makes use of this feature to return http://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/DirContextAdapter.html[`DirContextAdapter`] instances in certain search and lookup operations.
+Spring LDAP makes use of this feature to return https://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/DirContextAdapter.html[`DirContextAdapter`] instances in certain search and lookup operations.
 
 `DirContextAdapter` is a useful tool for working with LDAP attributes, particularly when adding or modifying data.
 
 === Search and Lookup Using `ContextMapper`
 
 Whenever an entry is found in the LDAP tree, its attributes and Distinguished Name (DN) are used by Spring LDAP to construct a `DirContextAdapter`.
-This lets us use a http://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/ContextMapper.html[`ContextMapper`] instead of an `AttributesMapper`
+This lets us use a https://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/ContextMapper.html[`ContextMapper`] instead of an `AttributesMapper`
 to transform found values, as the following example shows:
 
 .Searching using a ContextMapper
@@ -692,8 +692,8 @@ A shown in the preceding example, we can retrieve the attribute values directly
 This is particularly useful when working with multi-value attributes.
 Extracting values from multi-value attributes normally requires looping through a `NamingEnumeration` of attribute values returned from the `Attributes` implementation.
 `DirContextAdapter` does this for you
-in the http://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/DirContextAdapter.html#getStringAttributes(java.lang.String)[`getStringAttributes()`]
-or http://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/DirContextAdapter.html#getObjectAttributes(java.lang.String)[`getObjectAttributes()`] methods.
+in the https://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/DirContextAdapter.html#getStringAttributes(java.lang.String)[`getStringAttributes()`]
+or https://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/DirContextAdapter.html#getObjectAttributes(java.lang.String)[`getObjectAttributes()`] methods.
 The following example uses the `getStringAttributes` method:
 
 .Getting multi-value attribute values using `getStringAttributes()`
@@ -718,7 +718,7 @@ private static class PersonContextMapper implements ContextMapper {
 
 ==== Using the `AbstractContextMapper`
 
-Spring LDAP provides an abstract base implementation of `ContextMapper`, http://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/support/AbstractContextMapper.html[`AbstractContextMapper`].
+Spring LDAP provides an abstract base implementation of `ContextMapper`, https://docs.spring.io/spring-ldap/docs/current/apidocs/org/springframework/ldap/core/support/AbstractContextMapper.html[`AbstractContextMapper`].
 This implementation automatically takes care of the casting of the supplied `Object` parameter to `DirContexOperations`.
 Using `AbstractContextMapper`, the `PersonContextMapper` shown earleir can thus be re-written as follows:
 
@@ -1348,8 +1348,8 @@ The recommended way of configuring Spring LDAP is to use the custom XML configur
 
+       xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+       **http://www.springframework.org/schema/ldap https://www.springframework.org/schema/ldap/spring-ldap.xsd**">
 ----
 ====
 
@@ -1412,7 +1412,7 @@ The configurable attributes on context-source are as follows (required attribute
 
 | `referral`
 | `null`
-a|  Defines the strategy with which to handle referrals, as described http://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html[here]. The valid values are:
+a|  Defines the strategy with which to handle referrals, as described https://docs.oracle.com/javase/jndi/tutorial/ldap/referral/jndi.html[here]. The valid values are:
 
 * `ignore`
 * `follow`
@@ -1472,7 +1472,7 @@ NOTE: When working with TLS connections, you need to make sure that the native L
 
 While the user name (that is, the user DN) and password used for creating an authenticated `Context` are statically defined by default (the ones defined in the `context-source` element configuration are used throughout the lifetime of the `ContextSource`), there are several cases where this is not the desired behavior. A common scenario is that the principal and credentials of the current user should be used when executing LDAP operations for that user. You can modify the default behavior by supplying a reference to an `AuthenticationSource` implementation to the `context-source` element by using the `authentication-source-ref` element, instead of explicitly specifying the `username` and `password`. The `AuthenticationSource` is queried by the `ContextSource` for principal and credentials each time an authenticated `Context` is to be created.
 
-If you use http://spring.io/spring-security[Spring Security], you can make sure the principal and credentials of the currently logged in user is used at all times by configuring your `ContextSource` with an instance of the `SpringSecurityAuthenticationSource` shipped with Spring Security. The following example shows how to do so:
+If you use https://spring.io/spring-security[Spring Security], you can make sure the principal and credentials of the currently logged in user is used at all times by configuring your `ContextSource` with an instance of the `SpringSecurityAuthenticationSource` shipped with Spring Security. The following example shows how to do so:
 
 
 .Using the SpringSecurityAuthenticationSource
@@ -1500,7 +1500,7 @@ NOTE: When using the `SpringSecurityAuthenticationSource`, you need to use Sprin
 
 ==== Native Java LDAP Pooling
 
-The internal Java LDAP provider provides some very basic pooling capabilities. You can turn this LDAP connection pooling on or off by using the `pooled` flag on `AbstractContextSource`.  The default value is `false` (since release 1.3) -- that is, the native Java LDAP pooling is turned off. The configuration of LDAP connection pooling is managed by using `System` properties, so you need to handle this manually, outside of the Spring Context configuration. You can find details of the native pooling configuration http://java.sun.com/products/jndi/tutorial/ldap/connect/config.html[here].
+The internal Java LDAP provider provides some very basic pooling capabilities. You can turn this LDAP connection pooling on or off by using the `pooled` flag on `AbstractContextSource`.  The default value is `false` (since release 1.3) -- that is, the native Java LDAP pooling is turned off. The configuration of LDAP connection pooling is managed by using `System` properties, so you need to handle this manually, outside of the Spring Context configuration. You can find details of the native pooling configuration https://java.sun.com/products/jndi/tutorial/ldap/connect/config.html[here].
 
 NOTE: There are several serious deficiencies in the built-in LDAP connection pooling, which is why Spring LDAP provides a more sophisticated approach to LDAP connection pooling, described in <>. If you need pooling functionality, this is the recommended approach.
 
@@ -1634,7 +1634,7 @@ The default behaviour of the `BaseLdapPathBeanPostProcessor` is to use the base
 [[repositories]]
 == Spring LDAP Repositories
 
-Spring LDAP has built-in support for Spring Data repositories. The basic functionality and configuration is described http://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html[here]. When working with Spring LDAP repositories, you should remember the following:
+Spring LDAP has built-in support for Spring Data repositories. The basic functionality and configuration is described https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html[here]. When working with Spring LDAP repositories, you should remember the following:
 
 *  You can enable Spring LDAP repositories by using an `` element in your XML configuration or by using an `@EnableLdapRepositories` annotation on a configuration class.
 *  To include support for `LdapQuery` parameters in automatically generated repositories, have your interface extend `LdapRepository` rather than `CrudRepository`.
@@ -1653,9 +1653,9 @@ Basic QueryDSL support is included in Spring LDAP. This support includes the fol
 [[pooling]]
 == Pooling Support
 
-Pooling LDAP connections helps mitigate the overhead of creating a new LDAP connection for each LDAP interaction. While http://java.sun.com/products/jndi/tutorial/ldap/connect/pool.html[Java LDAP pooling support] exists, it is limited in its configuration options and features, such as connection validation and pool maintenance. Spring LDAP provides support for detailed pool configuration on a per-`ContextSource` basis.
+Pooling LDAP connections helps mitigate the overhead of creating a new LDAP connection for each LDAP interaction. While https://java.sun.com/products/jndi/tutorial/ldap/connect/pool.html[Java LDAP pooling support] exists, it is limited in its configuration options and features, such as connection validation and pool maintenance. Spring LDAP provides support for detailed pool configuration on a per-`ContextSource` basis.
 
-Pooling support is provided by supplying a `` child element to the `` element in the application context configuration. Read-only and read-write `DirContext` objects are pooled separately (if `anonymous-read-only` is specified). http://commons.apache.org/pool/index.html[Jakarta Commons-Pool] is used to provide the underlying pool implementation.
+Pooling support is provided by supplying a `` child element to the `` element in the application context configuration. Read-only and read-write `DirContext` objects are pooled separately (if `anonymous-read-only` is specified). https://commons.apache.org/pool/index.html[Jakarta Commons-Pool] is used to provide the underlying pool implementation.
 
 === `DirContext` Validation
 
@@ -2162,7 +2162,7 @@ public class MyCoolRequestControl extends AbstractRequestControlDirContextProces
 ----
 ====
 
-NOTE: Make sure you use `LdapContextSource` when you use Controls. The http://download.oracle.com/javase/1.5.0/docs/api/javax/naming/ldap/Control.html[`Control`] interface is specific for LDAPv3 and requires that `LdapContext` is used instead of `DirContext`. If an `AbstractRequestControlDirContextProcessor` subclass is called with an argument that is not an `LdapContext`, it will throw an `IllegalArgumentException`.
+NOTE: Make sure you use `LdapContextSource` when you use Controls. The https://download.oracle.com/javase/1.5.0/docs/api/javax/naming/ldap/Control.html[`Control`] interface is specific for LDAPv3 and requires that `LdapContext` is used instead of `DirContext`. If an `AbstractRequestControlDirContextProcessor` subclass is called with an argument that is not an `LdapContext`, it will throw an `IllegalArgumentException`.
 
 === Paged Search Results
 
@@ -2499,7 +2499,7 @@ In addition to the `authenticate` methods described in the preceding sections, y
 [[spring-ldap-using-spring-security]]
 === Using Spring Security
 
-While the approach described in the preceding sections may be sufficient for simple authentication scenarios, requirements in this area commonly expand rapidly. A multitude of aspects apply, including authentication, authorization, web integration, user context management, and others. If you suspect that the requirements might expand beyond just simple authentication, you should definitely consider using http://spring.io/spring-security[Spring Security] for your security purposes instead. It is a full-featured, mature security framework that addresses the aforementioned aspects as well as several others.
+While the approach described in the preceding sections may be sufficient for simple authentication scenarios, requirements in this area commonly expand rapidly. A multitude of aspects apply, including authentication, authorization, web integration, user context management, and others. If you suspect that the requirements might expand beyond just simple authentication, you should definitely consider using https://spring.io/spring-security[Spring Security] for your security purposes instead. It is a full-featured, mature security framework that addresses the aforementioned aspects as well as several others.
 
 == LDIF Parsing
 
diff --git a/src/main/javadoc/overview.html b/src/main/javadoc/overview.html
index ace359ea..21fc1898 100644
--- a/src/main/javadoc/overview.html
+++ b/src/main/javadoc/overview.html
@@ -5,7 +5,7 @@ This document is the API specification for the Spring LDAP Framework
 
    
     
    
         For further API reference and developer documentation, see the
-        Spring
+        Spring
             LDAP reference documentation.
         That documentation contains more detailed, developer-targeted
         descriptions, with conceptual overviews, definitions of terms,
diff --git a/src/site/apt/downloads/releases.apt b/src/site/apt/downloads/releases.apt
index cd633b0d..2bea48c8 100644
--- a/src/site/apt/downloads/releases.apt
+++ b/src/site/apt/downloads/releases.apt
@@ -8,7 +8,7 @@ Downloads
 
 	* <>
 
-		* {{{http://www.springsource.com/download/community?project=Spring%20LDAP}Download}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/changelog.txt}Changelog}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/reference/html/}Documentation (HTML)}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/reference/pdf/spring-ldap-reference.pdf}Documentation (PDF)}} | {{{http://static.springframework.org/spring-ldap/docs/1.3.x/apidocs/}API}}
+		* {{{https://www.springsource.com/download/community?project=Spring%20LDAP}Download}} | {{{https://docs.spring.io/spring-ldap/docs/1.3.x/changelog.txt}Changelog}} | {{{https://docs.spring.io/spring-ldap/docs/1.3.x/reference/html/}Documentation (HTML)}} | {{{https://docs.spring.io/spring-ldap/docs/1.3.x/reference/pdf/spring-ldap-reference.pdf}Documentation (PDF)}} | {{{https://docs.spring.io/spring-ldap/docs/1.3.x/apidocs/}API}}
 	
 	* <>
 
@@ -18,9 +18,9 @@ Sources
 
 	Sources are available in the Spring Framework Subversion repository:
 
-	* http://src.springframework.org/svn/spring-ldap/trunk (latest sources)
+	* https://src.springframework.org/svn/spring-ldap/trunk (latest sources)
 
-	* http://src.springframework.org/svn/spring-ldap/tags/spring-ldap-1.3.1.RELEASE (1.3.1 release sources)
+	* https://src.springframework.org/svn/spring-ldap/tags/spring-ldap-1.3.1.RELEASE (1.3.1 release sources)
 
 Maven Users
 
@@ -66,7 +66,7 @@ Maven Users
 	
 		spring-milestone
 		Spring Portfolio Milestone Repository
-		http://s3.amazonaws.com/maven.springframework.org/milestone
+		https://s3.amazonaws.com/maven.springframework.org/milestone
 	
 
 +--------------------------------------------------+
diff --git a/src/site/apt/downloads/snapshots.apt b/src/site/apt/downloads/snapshots.apt
index c784b436..ae0727fe 100644
--- a/src/site/apt/downloads/snapshots.apt
+++ b/src/site/apt/downloads/snapshots.apt
@@ -13,7 +13,7 @@ Snapshot Builds
 
     spring-s3
     Spring Portfolio Maven SNAPSHOT Repository
-    http://s3.amazonaws.com/maven.springframework.org/snapshot
+    https://s3.amazonaws.com/maven.springframework.org/snapshot
 
 +---------------
 
@@ -33,5 +33,5 @@ Snapshot Builds
 +---------------
 
 	Additionally, there are
-    {{{http://static.springframework.org/spring-ldap/downloads/1.3-snapshot-download.php}zips}}
+    {{{https://docs.spring.io/spring-ldap/downloads/1.3-snapshot-download.php}zips}}
     available which contain all jars.
diff --git a/src/site/apt/resources.apt b/src/site/apt/resources.apt
index af8b8892..53edd18d 100644
--- a/src/site/apt/resources.apt
+++ b/src/site/apt/resources.apt
@@ -12,17 +12,17 @@ Resources
 
 ** RFCs
 
-	* {{{http://www.ietf.org/rfc/rfc2251.txt}RFC 2251}}, LDAPv3 spec
+	* {{{https://www.ietf.org/rfc/rfc2251.txt}RFC 2251}}, LDAPv3 spec
 	
-	* {{{http://www.ietf.org/rfc/rfc2252.txt}RFC 2252}}, Attribute Syntax Definitions
+	* {{{https://www.ietf.org/rfc/rfc2252.txt}RFC 2252}}, Attribute Syntax Definitions
 	
-	* {{{http://www.ietf.org/rfc/rfc2253.txt}RFC 2253}}, Distinguished Names
+	* {{{https://www.ietf.org/rfc/rfc2253.txt}RFC 2253}}, Distinguished Names
 	
-	* {{{http://www.ietf.org/rfc/rfc2254.txt}RFC 2254}}, LDAP Search Filters
+	* {{{https://www.ietf.org/rfc/rfc2254.txt}RFC 2254}}, LDAP Search Filters
 	
-	* {{{http://www.ietf.org/rfc/rfc2255.txt}RFC 2255}}, LDAP URL Format
+	* {{{https://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
+	* {{{https://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
+	* {{{https://www.ietf.org/rfc/rfc2696.txt}RFC 2696}}, LDAP Control Extension for Simple Paged Results
 
diff --git a/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITest.java b/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITest.java
index 62e7a883..108954f9 100644
--- a/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITest.java
+++ b/test/integration-tests-sunone/src/test/java/org/springframework/ldap/itest/core/LdapTemplateVirtualListViewSearchITest.java
@@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * Integration tests for the virtual list view search result capability of
  * LdapTemplate. The test should reflect the example in Chapter 7 of the Virtual
+ * "https://www3.tools.ietf.org/html/draft-ietf-ldapext-ldapv3-vlv-09">Virtual
  * List View RFC draft.
  *
  * 
     Here we walk through the client-server interaction for a