diff --git a/build.gradle b/build.gradle index e8d29544..4ebd7324 100644 --- a/build.gradle +++ b/build.gradle @@ -31,12 +31,12 @@ allprojects { ext.snapshotBuild = version.endsWith('SNAPSHOT') ext.javadocLinks = [ - "http://download.oracle.com/javase/1.5.0/docs/api", - "http://static.springframework.org/spring/docs/3.0.x/api/", + "http://docs.oracle.com/javase/7/docs/api/", + "http://docs.spring.io/spring/docs/3.2.x/javadoc-api/", "http://logging.apache.org/log4j/1.2/apidocs/", - "http://commons.apache.org/logging/apidocs/", - "http://commons.apache.org/dbcp/apidocs/", - "http://commons.apache.org/pool/apidocs/", + "http://commons.apache.org/proper/commons-logging/apidocs/", + "http://commons.apache.org/proper/commons-dbcp/apidocs/", + "http://commons.apache.org/proper/commons-pool/apidocs/", "http://junit.sourceforge.net/javadoc/", ] as String[] } @@ -111,7 +111,7 @@ task api(type: Javadoc) { options.splitIndex = true options.links(project.ext.javadocLinks) - maxMemory = "1024m" + maxMemory = "1536m" destinationDir = new File(buildDir, "api") source coreModules*.javadoc*.source diff --git a/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java b/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java index f85223fe..3637e784 100644 --- a/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java +++ b/core-tiger/src/main/java/org/springframework/ldap/core/simple/SimpleLdapOperations.java @@ -279,7 +279,7 @@ public interface SimpleLdapOperations { * {@link ContextSource#getContext(String, String)}, thus authenticating the * entry. *

- * Example:
+ * Example:
* * 

 	 * AndFilter filter = new AndFilter();
@@ -304,7 +304,7 @@ public interface SimpleLdapOperations {
 	 * {@link ContextSource#getContext(String, String)}, thus authenticating the
 	 * entry.
 	 * 

-	 * Example:

+	 * Example:

 	 * 
 	 * 
 	 * AndFilter filter = new AndFilter();
diff --git a/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java b/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java
index 41b957dc..b1a50060 100644
--- a/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java
+++ b/core/src/main/java/org/springframework/ldap/control/AbstractFallbackRequestAndResponseControlDirContextProcessor.java
@@ -36,7 +36,7 @@ import java.lang.reflect.Method;
  * needs the constructor arguments to be provided. It also handles most of the
  * work in the post processing of the response control, only delegating to a
  * template method for the actual value retrieval. In short, it makes it easy to
- * implement a custom DirContextProcessor.

+ * implement a custom DirContextProcessor.

  * 
  * 
  * public class SortControlDirContextProcessor extends AbstractFallbackRequestAndResponseControlDirContextProcessor {
diff --git a/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java b/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
index 0fef3cb1..0ab56089 100644
--- a/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
+++ b/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
@@ -60,7 +60,6 @@ import java.util.ListIterator;
  * 
Name[2]

  * 
uid=adam.skogman

  * 
- * 

  * 

  * Name instances, and consequently DistinguishedName
  * instances are naturally mutable, which is useful when constructing
@@ -74,7 +73,6 @@ import java.util.ListIterator;
  * 

  * 
  * will render uid=adam.skogman,ou=People,dc=jayway,dc=se.
- * 

  * 

  * NOTE: The fact that DistinguishedName instances are mutable needs to
  * be taken into careful account, as this means that they may be modified
@@ -83,7 +81,6 @@ import java.util.ListIterator;
  * as a constant, you should consider getting an immutable copy of the instance
  * using {@link #immutableDistinguishedName()} or
  * {@link #immutableDistinguishedName(String)}.
- * 

  * 

  * NB:As of version 1.3 the default toString representation of
  * DistinguishedName now defaults to a compact one, without spaces between the
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapOperations.java b/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
index d94214f0..38d5e87f 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
@@ -1311,7 +1311,7 @@ public interface LdapOperations {
 	 * {@link ContextSource#getContext(String, String)}, thus authenticating the
 	 * entry.
 	 * 

-	 * Example:

+	 * Example:

 	 * 
 	 * 
 	 * AndFilter filter = new AndFilter();
@@ -1337,7 +1337,7 @@ public interface LdapOperations {
 	 * {@link ContextSource#getContext(String, String)}, thus authenticating the
 	 * entry.
 	 * 

-	 * Example:

+	 * Example:

 	 * 
 	 * 
 	 * AndFilter filter = new AndFilter();
@@ -1627,8 +1627,6 @@ public interface LdapOperations {
      *
      * @param query the LDAP query specification.
      * @param callbackHandler the NameClassPairCallbackHandler to supply all found entries to.
-     * @return a List containing all entries received from the
-     * ContextMapper.
      *
      * @throws NamingException if any error occurs.
      * @since 2.0
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
index 9b1f6c96..f149165d 100644
--- a/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
+++ b/core/src/main/java/org/springframework/ldap/core/LdapTemplate.java
@@ -198,12 +198,12 @@ public class LdapTemplate implements LdapOperations, InitializingBean {
 
     /**
      * Set the default scope to be used in searches if not explicitly specified.
-     * Default is {@link SearchControls.SUBTREE_SCOPE}.
+     * Default is {@link javax.naming.directory.SearchControls#SUBTREE_SCOPE}.
      *
      * @param defaultSearchScope the default search scope to use in searches.
-     *                           One of {@link SearchControls.OBJECT_SCOPE},
-     *                           {@link SearchControls.ONELEVEL_SCOPE},
-     *                           or {@link SearchControls.SUBTREE_SCOPE}
+     *                           One of {@link SearchControls#OBJECT_SCOPE},
+     *                           {@link SearchControls#ONELEVEL_SCOPE},
+     *                           or {@link SearchControls#SUBTREE_SCOPE}
      * @since 2.0
      */
     public void setDefaultSearchScope(int defaultSearchScope) {
diff --git a/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
index c97712ed..51169949 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
@@ -47,7 +47,7 @@ import java.util.Map;
 /**
  * Abstract implementation of the {@link ContextSource} interface. By default,
  * returns an authenticated
- * DirContext implementation for both read-only and
+ * DirContext implementation for both read-only and
  * read-write operations. To have an anonymous environment created for read-only
  * operations, set the anonymousReadOnly property to
  * true.
@@ -58,7 +58,7 @@ import java.util.Map;
  * 

  * If an {@link AuthenticationSource} is set, this will be used for getting user
  * principal and password for each new connection, otherwise a default one will
- * be created using the specified userDn and password.
+ * be created using the specified userDn and password.
  * 

  * Note: When using implementations of this class outside of a Spring
  * Context it is necessary to call {@link #afterPropertiesSet()} when all
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 db85f51d..9a13fb48 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
@@ -54,7 +54,6 @@ import java.util.Hashtable;
  * HostnameVerifier is supplied to
  * {@link #setHostnameVerifier(HostnameVerifier)}, that will be applied to the
  * processing.
- * 

  * 

  * For further information regarding TLS, refer to this
@@ -94,7 +93,7 @@ public abstract class AbstractTlsDirContextAuthenticationStrategy implements Dir
 
 	/**
 	 * Set the optional
-	 * HostnameVerifier to use for verifying incoming certificates. Defaults to null
+	 * HostnameVerifier to use for verifying incoming certificates. Defaults to null
 	 * , meaning that the default hostname verification will take place.
 	 * 
 	 * @param hostnameVerifier The HostnameVerifier to use, if any.
diff --git a/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java b/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java
index e95d2d7f..305ac754 100644
--- a/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java
+++ b/core/src/main/java/org/springframework/ldap/core/support/DefaultIncrementalAttributesMapper.java
@@ -42,7 +42,6 @@ import java.util.Set;
 /**
  * Utility class that helps with reading all attribute values from Active Directory using Incremental Retrieval of
  * Multi-valued Properties.
- * 

  * 
Example usage of this attribute mapper:
  * 
  *     List values = DefaultIncrementalAttributeMapper.lookupAttributeValues(ldapTemplate, theDn, "oneAttribute");
@@ -58,13 +57,11 @@ import java.util.Set;
  *
  *      List values = incrementalAttributeMapper.getValues("someAttribute");
  * 

- * 

  * 

  * NOTE: Instances of this class are highly stateful and must not be reused or shared between threads in any way.
- * 

  * 

  * NOTE: Instances of this class can only be used with lookups. No support is given for searches.
- * 

+ * 

  *
  * @author Marius Scurtescu
  * @author Mattias Hellborg Arthursson
diff --git a/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java b/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
index 862baa13..da6fa1bd 100644
--- a/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
@@ -58,7 +58,7 @@ public abstract class BinaryLogicalFilter extends AbstractFilter {
 
 	/**
 	 * Implement this in subclass to return the logical operator, for example
-	 * &qout;&&qout;.
+	 * "&".
 	 * 
 	 * @return the logical operator.
 	 */
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 82bfd16d..cdcf76ae 100644
--- a/core/src/main/java/org/springframework/ldap/filter/Filter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/Filter.java
@@ -21,7 +21,7 @@ package org.springframework.ldap.filter;
  * 
  * @author Adam Skogman
  * @see RFC 1960: A String
- * Representation of LDAP Search Filters< /a>
+ * Representation of LDAP Search Filters
  */
 public interface Filter {
 
diff --git a/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java b/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
index 274b6580..48d3c412 100644
--- a/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/GreaterThanOrEqualsFilter.java
@@ -17,7 +17,7 @@
 package org.springframework.ldap.filter;
 
 /**
- * A filter to compare >=. LDAP RFC does not allow > comparison. The following
+ * A filter to compare >=. LDAP RFC does not allow > comparison. The following
  * code:
  * 
  * 
diff --git a/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java b/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
index 42007d32..87b9143b 100644
--- a/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java
@@ -37,12 +37,11 @@ import org.springframework.util.StringUtils;
  *   <property name="filter" value="(&amp;(objectClass=user)(!(objectClass=computer)))" />
  * </bean>
  * 

- * 

  * 

  * Note 2: There will be no validation to ensure that the supplied filter is
  * valid. Using this implementation to build filters from user input is strongly
  * discouraged.
- * 

+ * 

  * @author Justen Stepka
  * @author Mathieu Larchet
  */
diff --git a/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java b/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
index 062cbd69..38790ace 100644
--- a/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
+++ b/core/src/main/java/org/springframework/ldap/filter/LessThanOrEqualsFilter.java
@@ -17,7 +17,7 @@
 package org.springframework.ldap.filter;
 
 /**
- * A filter to compare <=. LDAP RFC does not allow < comparison. The following
+ * A filter to compare <=. LDAP RFC does not allow < comparison. The following
  * code:
  * 
  * 
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/Attribute.java b/core/src/main/java/org/springframework/ldap/odm/annotations/Attribute.java
index a82e98f0..a82b18cb 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/Attribute.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/Attribute.java
@@ -11,7 +11,7 @@ import java.lang.annotation.Target;
  * 

  * The containing class must be annotated with {@link Entry}.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  * @see Entry
  */
 @Target(ElementType.FIELD)
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/Entry.java b/core/src/main/java/org/springframework/ldap/odm/annotations/Entry.java
index b63832b6..da05808b 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/Entry.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/Entry.java
@@ -9,8 +9,7 @@ import java.lang.annotation.Target;
 /**
  * This annotation marks a Java class to be persisted in an LDAP directory.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
- * 
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/Id.java b/core/src/main/java/org/springframework/ldap/odm/annotations/Id.java
index 0688574f..ca7b0d46 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/Id.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/Id.java
@@ -12,7 +12,7 @@ import java.lang.annotation.Target;
  * The marked field must be of type {@link javax.naming.Name} and must not
  * be annotated {@link Attribute}.
  *
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  * 
  * @see Attribute
  * @see javax.naming.Name
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/Transient.java b/core/src/main/java/org/springframework/ldap/odm/annotations/Transient.java
index 1342d2a8..bf7b17b1 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/Transient.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/Transient.java
@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
  * This annotation identifies a field in an {@link Entry} annotated class that 
  * should not be persisted to LDAP.
  * 
- * @author Paul Harvey 
+ * @author Paul Harvey <paul@pauls-place.me.uk>
  * 
  * @see Entry
  */
diff --git a/core/src/main/java/org/springframework/ldap/odm/annotations/package-info.java b/core/src/main/java/org/springframework/ldap/odm/annotations/package-info.java
index fa3f6f8f..262f3a12 100755
--- a/core/src/main/java/org/springframework/ldap/odm/annotations/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/annotations/package-info.java
@@ -1,9 +1,9 @@
 /**
  * Provides a set of annotations to describe the mapping of a Java class to an LDAP entry.
  * 

- * These annotations are for use with {@link org.springframework.ldap.odm.core.OdmManager}.
+ * These annotations are for use with OdmManager.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */ 
 
 package org.springframework.ldap.odm.annotations;
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/OdmException.java b/core/src/main/java/org/springframework/ldap/odm/core/OdmException.java
index d347c026..5931bbe6 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/OdmException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/OdmException.java
@@ -21,7 +21,7 @@ import org.springframework.ldap.NamingException;
 /**
  * The root of the Spring LDAP ODM exception hierarchy.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  *
  */
 @SuppressWarnings("serial")
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
index a3d4c467..d72c564b 100644
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
@@ -54,7 +54,7 @@ import org.springframework.util.ReflectionUtils;
  * Default implementation of {@link ObjectDirectoryMapper}. Unless you need to explicitly configure
  * converters there is typically no reason to explicitly consider yourself with this class.
  *
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  * @author Mattias Hellborg Arthursson
  * @since 2.0
  */
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/InvalidEntryException.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/InvalidEntryException.java
index 60e9b78d..8c3ba87a 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/InvalidEntryException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/InvalidEntryException.java
@@ -21,7 +21,7 @@ import org.springframework.ldap.odm.core.OdmException;
 /**
  * Thrown to indicate that an instance is not suitable for persisting in the LDAP directory.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  *
  */
 @SuppressWarnings("serial")
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/MetaDataException.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/MetaDataException.java
index 65bd7e16..849121f6 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/MetaDataException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/MetaDataException.java
@@ -21,7 +21,7 @@ import org.springframework.ldap.odm.core.OdmException;
 /**
  * Thrown to indicate an error in the annotated meta-data.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  *
  */
 @SuppressWarnings("serial")
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/UnmanagedClassException.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/UnmanagedClassException.java
index 7e68c8b9..f8eeb9d9 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/UnmanagedClassException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/UnmanagedClassException.java
@@ -22,7 +22,7 @@ import org.springframework.ldap.odm.core.OdmException;
  * Thrown when an OdmManager method is called with a class
  * which is not being managed by the OdmManager.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  *
  */
 @SuppressWarnings("serial")
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/package-info.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/package-info.java
index c58a484f..d6c9acc3 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/impl/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/impl/package-info.java
@@ -1,9 +1,9 @@
 /**
- * Provides a single public class which implements {@link org.springframework.ldap.odm.core.OdmManager}.
+ * Provides a single public class which implements OdmManager.
  * 

  * The OdmManager implementation works in conjunction with {@link org.springframework.ldap.odm.typeconversion} to provide
  * conversion between the representation of attributes in LDAP and in Java. 
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */ 
 package org.springframework.ldap.odm.core.impl;
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/package-info.java b/core/src/main/java/org/springframework/ldap/odm/core/package-info.java
index 39c75036..9022cbce 100755
--- a/core/src/main/java/org/springframework/ldap/odm/core/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/core/package-info.java
@@ -4,7 +4,7 @@
  * Implementations of this interface are intended to be used in conjunction with classes 
  * annotated with {@link org.springframework.ldap.odm.annotations}.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */ 
 
 package org.springframework.ldap.odm.core;
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterException.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterException.java
index 177cb5c4..b3039a9e 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterException.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterException.java
@@ -21,7 +21,7 @@ import org.springframework.ldap.NamingException;
 /**
  * Thrown by the conversion framework to indicate an error condition - typically a failed type conversion.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 @SuppressWarnings("serial")
 public final class ConverterException extends NamingException {
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterManager.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterManager.java
index 4d9ad22c..cf56e1e0 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterManager.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/ConverterManager.java
@@ -19,7 +19,7 @@ package org.springframework.ldap.odm.typeconversion;
 /**
  * A simple interface to be implemented to provide type conversion functionality.
  *
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public interface ConverterManager {
     /**
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/Converter.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/Converter.java
index 5dd37516..5aa8699a 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/Converter.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/Converter.java
@@ -19,7 +19,7 @@ package org.springframework.ldap.odm.typeconversion.impl;
 /**
  * Interface specifying the conversion between two classes
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public interface Converter {
     /**
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java
index 7d3a9dfe..70b821e0 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerFactoryBean.java
@@ -40,55 +40,55 @@ import java.util.Set;
  * Integer, Long, Float, Double, Boolean to String
  * 
  * 
- * <bean id="converterManager" class="org.springframework.ldap.odm.typeconversion.impl.ConverterManagerFactoryBean">
- *   <property name="converterConfig">
- *     <set>
- *       <bean class="org.springframework.ldap.odm.typeconversion.impl.ConverterManagerFactoryBean$ConverterConfig">
- *         <property name="fromClasses">
- *           <set> 
- *             <value>java.lang.String</value>
- *           </set>
- *         </property>
- *         <property name="toClasses">
- *           <set>
- *             <value>java.lang.Byte</value>
- *             <value>java.lang.Short</value>
- *             <value>java.lang.Integer</value>
- *             <value>java.lang.Long</value>
- *             <value>java.lang.Float</value>
- *             <value>java.lang.Double</value>
- *             <value>java.lang.Boolean</value>
- *           </set>
- *         </property>
- *         <property name="converter" ref="fromStringConverter" />
- *       </bean>
- *       <bean class="org.springframework.ldap.odm.typeconversion.impl.ConverterManagerFactoryBean$ConverterConfig">
- *         <property name="fromClasses">
- *           <set>
- *             <value>java.lang.Byte</value>
- *             <value>java.lang.Short</value>
- *             <value>java.lang.Integer</value>
- *             <value>java.lang.Long</value>
- *             <value>java.lang.Float</value>
- *             <value>java.lang.Double</value>
- *             <value>java.lang.Boolean</value>
- *           </set> 
- *         </property>
- *         <property name="toClasses">
- *           <set> 
- *             <value>java.lang.String</value>
- *           </set>
- *         </property>
- *         <property name="converter" ref="toStringConverter" />
- *       </bean>
- *     </set>
- *   </property>
- * </bean>
+ * <bean id="converterManager" class="org.springframework.ldap.odm.typeconversion.impl.ConverterManagerFactoryBean">
+ *   <property name="converterConfig">
+ *     <set>
+ *       <bean class="org.springframework.ldap.odm.typeconversion.impl.ConverterManagerFactoryBean$ConverterConfig">
+ *         <property name="fromClasses">
+ *           <set>
+ *             <value>java.lang.String</value>
+ *           </set>
+ *         </property>
+ *         <property name="toClasses">
+ *           <set>
+ *             <value>java.lang.Byte</value>
+ *             <value>java.lang.Short</value>
+ *             <value>java.lang.Integer</value>
+ *             <value>java.lang.Long</value>
+ *             <value>java.lang.Float</value>
+ *             <value>java.lang.Double</value>
+ *             <value>java.lang.Boolean</value>
+ *           </set>
+ *         </property>
+ *         <property name="converter" ref="fromStringConverter"/>
+ *       </bean>
+ *       <bean class="org.springframework.ldap.odm.typeconversion.impl.ConverterManagerFactoryBean$ConverterConfig">
+ *         <property name="fromClasses">
+ *           <set>
+ *             <value>java.lang.Byte</value>
+ *             <value>java.lang.Short</value>
+ *             <value>java.lang.Integer</value>
+ *             <value>java.lang.Long</value>
+ *             <value>java.lang.Float</value>
+ *             <value>java.lang.Double</value>
+ *             <value>java.lang.Boolean</value>
+ *           </set>
+ *         </property>
+ *         <property name="toClasses">
+ *           <set>
+ *             <value>java.lang.String</value>
+ *           </set>
+ *         </property>
+ *         <property name="converter" ref="toStringConverter"/>
+ *       </bean>
+ *     </set>
+ *   </property>
+ * </bean>
  * 

  * {@link ConverterConfig} has a second constructor which takes an additional parameter to allow 
  * an LDAP syntax to be defined.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public final class ConverterManagerFactoryBean implements FactoryBean {
     private static final Logger LOG = LoggerFactory.getLogger(ConverterManagerFactoryBean.class);
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
index 96a8b300..30cefb1a 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/ConverterManagerImpl.java
@@ -36,7 +36,7 @@ import java.util.Map;
  * 
  • If this fails then throw a {@link org.springframework.ldap.odm.typeconversion.ConverterException}.
    • 
  * 
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public final class ConverterManagerImpl implements ConverterManager {
     /**
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java
index a12f6552..dde16e79 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/FromStringConverter.java
@@ -26,7 +26,7 @@ import java.lang.reflect.Constructor;
  * 
    
  * This should only be used as a fall-back converter, as a last attempt.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public final class FromStringConverter implements Converter {
 
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/ToStringConverter.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/ToStringConverter.java
index 9d8c260a..5b3467e1 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/ToStringConverter.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/ToStringConverter.java
@@ -24,7 +24,7 @@ import org.springframework.ldap.odm.typeconversion.impl.Converter;
  * 
    
  * This should only be used as a fall-back converter, as a last attempt.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public final class ToStringConverter implements Converter {
 
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/package-info.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/package-info.java
index 937bc5cc..795ce9f3 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/converters/package-info.java
@@ -1,7 +1,7 @@
 /**
  * Provides some basic implementations of the {@link org.springframework.ldap.odm.typeconversion.impl.Converter} interface.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 
 package org.springframework.ldap.odm.typeconversion.impl.converters;
\ No newline at end of file
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/package-info.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/package-info.java
index 7ab5faa0..98c794d0 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/impl/package-info.java
@@ -1,7 +1,7 @@
 /**
  * Provides an implementation of the {@link org.springframework.ldap.odm.typeconversion.ConverterManager} interface.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 
 package org.springframework.ldap.odm.typeconversion.impl;
diff --git a/core/src/main/java/org/springframework/ldap/odm/typeconversion/package-info.java b/core/src/main/java/org/springframework/ldap/odm/typeconversion/package-info.java
index b310ba0e..6351ba3a 100755
--- a/core/src/main/java/org/springframework/ldap/odm/typeconversion/package-info.java
+++ b/core/src/main/java/org/springframework/ldap/odm/typeconversion/package-info.java
@@ -3,7 +3,7 @@
  * 
    
  * This is used to convert between the LDAP and Java representations of attributes.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 
 package org.springframework.ldap.odm.typeconversion;
diff --git a/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
index 70ce8a96..0fc9d027 100644
--- a/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
+++ b/core/src/main/java/org/springframework/ldap/pool/factory/PoolingContextSource.java
@@ -41,7 +41,7 @@ import java.util.Collection;
  * 
    
  * 
    
  * Configuration:
- * 
+ * 
    
  * 
  * 
diff --git a/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
index e76b76ae..76c78b24 100644
--- a/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
+++ b/core/src/main/java/org/springframework/ldap/pool/validation/DefaultDirContextValidator.java
@@ -34,7 +34,7 @@ import javax.naming.directory.SearchResult;
  * 
    
  * 
    
  * Configuration:
- * 
    Property Description Required Default
    
+ * 
    
  *     
  *         
  *         
@@ -64,8 +64,8 @@ import javax.naming.directory.SearchResult;
  *         
  *         
  *         
  *     
diff --git a/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java b/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
index 5cd38a50..320b0c08 100644
--- a/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
+++ b/core/src/main/java/org/springframework/ldap/support/LdapEncoder.java
@@ -118,11 +118,11 @@ public final class LdapEncoder {
     /**
      * LDAP Encodes a value for use with a DN. Escapes for LDAP, not JNDI!
      * 
-     * 
    Escapes:
     ' ' [space] - "\ " [if first or last] 
     '#'
-     * [hash] - "\#" 
     ',' [comma] - "\," 
     ';' [semicolon] - "\;" 
     '=
-     * [equals] - "\=" 
     '+' [plus] - "\+" 
     '<' [less than] -
-     * "\<" 
     '>' [greater than] - "\>" 
     '"' [double quote] -
-     * "\"" 
     '\' [backslash] - "\\" 
    
+     * 
    Escapes:
     ' ' [space] - "\ " [if first or last] 
     '#'
+     * [hash] - "\#" 
     ',' [comma] - "\," 
     ';' [semicolon] - "\;" 
     '=
+     * [equals] - "\=" 
     '+' [plus] - "\+" 
     '<' [less than] -
+     * "\<" 
     '>' [greater than] - "\>" 
     '"' [double quote] -
+     * "\"" 
     '\' [backslash] - "\\" 
    
      * 
      * @param value
      *            the value to escape.
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
index d5f80f60..4001f407 100755
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceAndHibernateTransactionManager.java
@@ -27,10 +27,10 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * A Transaction Manager to manage LDAP and Hibernate 3 operations within the same
  * transaction. Note that even though the same logical transaction is used, this
  * is not a JTA XA transaction; no two-phase commit will be performed,
- * and thus commit and rollback may yield unexpected results.
    
+ * and thus commit and rollback may yield unexpected results.
    
  * This Transaction Manager is as good as it gets when you are using in LDAP in 
  * combination with a Hibernate 3 and unable to use XA transactions because LDAP
- * is not transactional by design to begin with.
    
+ * is not transactional by design to begin with.
    
  * 
  * Furthermore, this manager does not support nested transactions
  * @author Hans Westerbeek
diff --git a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
index 6934cff8..dc05eee9 100644
--- a/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
+++ b/core/src/main/java/org/springframework/ldap/transaction/compensating/manager/ContextSourceTransactionManager.java
@@ -52,7 +52,6 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * rolled back, the outcome of this is undetermined, and may in the worst case
  * result in total failure.
  * 
- * 
    
  * 
    
  * While the points above should be noted and considered, the compensating
  * transaction approach will be perfectly sufficient for all but the most
@@ -60,14 +59,12 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * absence of server-side transaction support in the LDAP world, being able to
  * mark operations as transactional in the same way as for relational database
  * operations is surely a step forward.
- * 
    
  * 
    
  * An LDAP transaction is tied to a {@link ContextSource}, to be supplied to
  * the {@link #setContextSource(ContextSource)} method. While the actual
  * ContextSource used by the target LdapTemplate instance needs to be of the
  * type {@link TransactionAwareContextSourceProxy}, the ContextSource supplied
  * to this class should be the actual target ContextSource.
- * 
    
  * 
    
  * Using this TransactionManager along with
  * {@link TransactionAwareContextSourceProxy}, all modifying operations (bind,
@@ -78,7 +75,6 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * {@link CompensatingTransactionOperationExecutor} which is then used to
  * execute the actual operation and is later called for performing the commit or
  * rollback.
- * 
    
  * 
    
  * For several of the operations, performing a rollback is pretty
  * straightforward. For example, in order to roll back a rename operation, it
@@ -96,13 +92,12 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
  * {@link TempEntryRenamingStrategy} (default
  * {@link DefaultTempEntryRenamingStrategy}), specified in
  * {@link #setRenamingStrategy(TempEntryRenamingStrategy)}.
- * 
    
  * 
    
  * The actual work of this Transaction Manager is delegated to a
  * {@link ContextSourceTransactionManagerDelegate}. This is because the exact
  * same logic needs to be used if we want to wrap a JDBC and LDAP transaction in
  * the same logical transaction.
- * 
    
+ * 
    
  *
  * @author Mattias Hellborg Arthursson
  *
diff --git a/core/src/main/javacc/DnParserImpl.jj b/core/src/main/javacc/DnParserImpl.jj
index 77e082cc..71d4a069 100644
--- a/core/src/main/javacc/DnParserImpl.jj
+++ b/core/src/main/javacc/DnParserImpl.jj
@@ -84,14 +84,14 @@ TOKEN: { <#ESCAPEDSTART:  ( | )> }
 }
 
 /**
- * input -> dn
- * dn -> rdn ( ( "," | ";" ) rdn )*
- * rdn -> attributeTypeAndValue ( "+" attributeTypeAndValue )*
- * attributeTypeAndValue ->
- *    (  )* AttributeType SpacedEquals AttributeValue (  )*
- * SpacedEquals -> 
- * AttributeType ->  | 
- * AttributeValue -> 
+ * input -> dn
+ * dn -> rdn ( ( "," | ";" ) rdn )*
+ * rdn -> attributeTypeAndValue ( "+" attributeTypeAndValue )*
+ * attributeTypeAndValue ->
+ *    ( <SPACE> )* AttributeType SpacedEquals AttributeValue ( <SPACE> )*
+ * SpacedEquals -> <SPACED_EQUALS>
+ * AttributeType -> <LDAP_OID> | <ATTRIBUTE_TYPE_STRING>
+ * AttributeValue -> <ATTRVALUE>
  */
 void input() :
 {
diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index b5f1b431..3bdf552c 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -10,7 +10,7 @@ configurations {
 }
 
 dependencies {
-    jacoco group: "org.jacoco", name: "org.jacoco.agent", version: "0.6.2.201302030002", classifier: "runtime"
+    jacoco group: "org.jacoco", name: "org.jacoco.agent", version: "0.7.1.201405082137", classifier: "runtime"
     dependencyManagement {
         springIoTestRuntime {
             imports {
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
index b2c535bb..38eafaee 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
@@ -47,7 +47,7 @@ import java.util.NoSuchElementException;
  * The {@link LdifParser LdifParser} does ignores changetype LDIF entries as their usefulness in the 
  * context of an application has yet to be determined.
  * 
    
- * Design
    
+ * Design
    
  * {@link LdifParser LdifParser} provides the main interface for operation but requires three supporting classes to 
  * enable operation:
  * 
      
@@ -57,7 +57,7 @@ import java.util.NoSuchElementException;
  * 
    
  * Together, these 4 classes read from the resource line by line and translate the data into objects for use.
  * 
    
- * Usage
    
+ * Usage
    
  * {@link #getRecord() getRecord()} reads the next available record from the resource.  Lines are read and 
  * passed to the {@link SeparatorPolicy SeparatorPolicy} for interpretation.  The parser continues to read
  * lines and appends them to the buffer until it encounters the start of a new attribute or an end of record
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/Parser.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/Parser.java
index c0f492a2..146a515c 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/Parser.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/Parser.java
@@ -59,7 +59,7 @@ public interface Parser {
 	/**
 	 * Resets the line read parser.
 	 * 
-	 * @throws Exception if a problem is encountered while trying to reset the resource.
+	 * @throws IOException if a problem is encountered while trying to reset the resource.
 	 */
 	void reset() throws IOException;
 	
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
index 3794dd59..d83121f1 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
@@ -282,7 +282,7 @@ public class DefaultAttributeValidationPolicy implements AttributeValidationPoli
 	 * 
      
 	 * 	
    1. A standard attribute pattern of the form: ATTR_ID[;options]: VALUE
      2. 
 	 * 	
    2. A Base64 attribute pattern of the form: ATTR_ID[;options]:: BASE64_VALUE
      3. 
-	 * 	
    3. A url attribute pattern of the form: ATTR_ID[;options]:< URL_VALUE
      4. 
+	 * 	
    4. A url attribute pattern of the form: ATTR_ID[;options]:< URL_VALUE
      5. 
 	 * 
    
 	 * 
    
 	 * Upon success an LdapAttribute object is returned.  
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 3930f53f..1f314aae 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
@@ -29,7 +29,7 @@ import java.util.List;
  * Each managed Java class must be appropriately annotated using
  * {@link org.springframework.ldap.odm.annotations}. 
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  * @author Mattias Hellborg Arthursson
  * 
  * @see org.springframework.ldap.odm.annotations.Entry
diff --git a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java
index 61cc2659..627fd543 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImpl.java
@@ -36,7 +36,7 @@ import java.util.Set;
  * uses {@link org.springframework.ldap.odm.typeconversion.ConverterManager} to 
  * convert between Java and LDAP representations of attribute values.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  * @author Mattias Hellborg Arthursson
  * @deprecated This functionality is automatically available in LdapTemplate as of version 2.0
  */
diff --git a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java
index 6d38578c..418c7515 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/core/impl/OdmManagerImplFactoryBean.java
@@ -30,19 +30,19 @@ import java.util.Set;
  * 
    
  * Typical configuration would appear as follows:
  * 
    - *   <bean id="odmManager" class="org.springframework.ldap.odm.core.impl.OdmManagerImplFactoryBean">
- *       <property name="converterManager" ref="converterManager" />
- *       <property name="contextSource" ref="contextSource" />
- *       <property name="managedClasses">
- *           <set>
- *               <value>org.myorg.myldapentries.Person</value>
- *               <value>org.myorg.myldapentries.OrganizationalUnit</value>
- *           </set>
- *       </property>
- *   </bean>
+ *   <bean id="odmManager" class="org.springframework.ldap.odm.core.impl.OdmManagerImplFactoryBean">
+ *       <property name="converterManager" ref="converterManager" />
+ *       <property name="contextSource" ref="contextSource" />
+ *       <property name="managedClasses">
+ *           <set>
+ *               <value>org.myorg.myldapentries.Person</value>
+ *               <value>org.myorg.myldapentries.OrganizationalUnit</value>
+ *           </set>
+ *       </property>
+ *   </bean>
  * 
    
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  * @deprecated This functionality is automatically available in LdapTemplate as of version 2.0
  */
 public final class OdmManagerImplFactoryBean implements FactoryBean {
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/AttributeSchema.java b/odm/src/main/java/org/springframework/ldap/odm/tools/AttributeSchema.java
index 1987abac..b899fa8e 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/AttributeSchema.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/AttributeSchema.java
@@ -23,7 +23,7 @@ import org.springframework.util.StringUtils;
  * 
    
  * It is only public to allow Freemarker access.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public final class AttributeSchema {
  
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/ObjectSchema.java b/odm/src/main/java/org/springframework/ldap/odm/tools/ObjectSchema.java
index 85c3d4a9..3e50806b 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/ObjectSchema.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/ObjectSchema.java
@@ -25,7 +25,7 @@ import java.util.Set;
  * 
    
  * It is public only to allow Freemarker access.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public final class ObjectSchema {
     private final Set must = new HashSet();
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
index 96cbdc02..0c1103cd 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
@@ -77,19 +77,18 @@ import java.util.regex.Pattern;
  * Command line flags are as follows:
  * 
    
  * 
      
- * 
    • -c,--class <class name>                      Name of the Java class to create. Mandatory.
      • 
- * 
    • -s,--syntaxmap <map file>                    Configuration file of LDAP syntaxes to Java classes mappings. Optional.
      • 
+ * 
    • -c,--class <class name>                      Name of the Java class to create. Mandatory.
      • 
+ * 
    • -s,--syntaxmap <map file>                    Configuration file of LDAP syntaxes to Java classes mappings. Optional.
      • 
  * 
    • -h,--help                                       Print this help message then exit.
      • 
- * 
    • -k,--package <package name>                  Package to create the Java class in. Mandatory.
      • 
- * 
    • -l,--url <ldap url>                          Ldap url of the directory service to bind to.  Defaults to ldap://127.0.0.1:389. Optional.
      • 
- * 
    • -o,--objectclasses <LDAP object class lists> Comma separated list of LDAP object classes. Mandatory.
      • 
- * 
    • -u,--username <dn>                           DN to bind with.  Defaults to "". Optional.
      • 
- * 
    • -p,--password <password>                     Password to bind with. Defaults to "". Optional.
      • 
- * 
    • -t,--outputdir <output directory>            Base output directory, defaults to ".". Optional.
      • 
+ * 
    • -k,--package <package name>                  Package to create the Java class in. Mandatory.
      • 
+ * 
    • -l,--url <ldap url>                          Ldap url of the directory service to bind to.  Defaults to ldap://127.0.0.1:389. Optional.
      • 
+ * 
    • -o,--objectclasses <LDAP object class lists> Comma separated list of LDAP object classes. Mandatory.
      • 
+ * 
    • -u,--username <dn>                           DN to bind with.  Defaults to "". Optional.
      • 
+ * 
    • -p,--password <password>                     Password to bind with. Defaults to "". Optional.
      • 
+ * 
    • -t,--outputdir <output directory>            Base output directory, defaults to ".". Optional.
      • 
  * 
    
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
- * 
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 public final class SchemaToJava {
     private static final Logger LOG = LoggerFactory.getLogger(SchemaToJava.class);
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java
index 1faba02b..82a14800 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaViewer.java
@@ -27,17 +27,17 @@ import java.util.Hashtable;
  * SchemaViewer takes the following flags:
  * 
      
  * 
    • -h,--help<                Print this help message
      • 
- * 
    • -l,--url <arg>           Ldap url of directory to bind to (defaults to ldap://127.0.0.1:389)
      • 
- * 
    • -u,--username <arg>      DN to bind with (defaults to "")
      • 
- * 
    • -p,--password <arg>      Password to bind with (defaults to "")
      • 
- * 
    • -o,--objectclass <arg>   Object class name or ? for all. Print object class schema
      • 
- * 
    • -a,--attribute <arg>     Attribute name or ? for all. Print attribute schema
      • 
- * 
    • -s,--syntax <arg>        Syntax or ? for all. Print syntax
      • 
+ * 
    • -l,--url <arg>           Ldap url of directory to bind to (defaults to ldap://127.0.0.1:389)
      • 
+ * 
    • -u,--username <arg>      DN to bind with (defaults to "")
      • 
+ * 
    • -p,--password <arg>      Password to bind with (defaults to "")
      • 
+ * 
    • -o,--objectclass <arg>   Object class name or ? for all. Print object class schema
      • 
+ * 
    • -a,--attribute <arg>     Attribute name or ? for all. Print attribute schema
      • 
+ * 
    • -s,--syntax <arg>        Syntax or ? for all. Print syntax
      • 
  * 
    
  * 
  * Only one of -a, -o and -s should be specified.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  *
  */
 public final class SchemaViewer {
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/package-info.java b/odm/src/main/java/org/springframework/ldap/odm/tools/package-info.java
index 66aad68e..570127c9 100755
--- a/odm/src/main/java/org/springframework/ldap/odm/tools/package-info.java
+++ b/odm/src/main/java/org/springframework/ldap/odm/tools/package-info.java
@@ -2,7 +2,7 @@
  * Provides a tool to create a Java class representation of a set of LDAP object classes
  * and a simple tool to view LDAP schema.
  * 
- * @author Paul Harvey <paul.at.pauls-place.me.uk>
+ * @author Paul Harvey <paul.at.pauls-place.me.uk>
  */
 
 package org.springframework.ldap.odm.tools;
\ No newline at end of file
diff --git a/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java b/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java
index e6a0886d..d6b76782 100644
--- a/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java
+++ b/test-support/src/main/java/org/springframework/ldap/test/AbstractEc2InstanceLaunchingFactoryBean.java
@@ -32,7 +32,7 @@ import java.util.Collections;
  * for running integration tests against certain server configurations, enabling integration tests aimed at e.g. a particluar
  * DB server to run transparently at the computer of each individual developer without having to have the actual server software
  * installed on their computers.
- * 
    
+ * 
    
  * Public AMIs will need to be created, bundled and registered for each server setup. A subclass of this FactoryBean
  * is then added to create the actual target object (e.g. a DataSource), implementing the {link #doCreateInstance} method.
  * This method will be supplied the IP address of the instance that was created, enabling the subclass to configure the
diff --git a/test/integration-tests/build.gradle b/test/integration-tests/build.gradle
index 4151fee5..b4bc3ba6 100644
--- a/test/integration-tests/build.gradle
+++ b/test/integration-tests/build.gradle
@@ -94,7 +94,7 @@ idea {
 }
 
 dependencies {
-    jacoco group: "org.jacoco", name: "org.jacoco.agent", version: "0.6.2.201302030002", classifier: "runtime"
+    jacoco group: "org.jacoco", name: "org.jacoco.agent", version: "0.7.1.201405082137", classifier: "runtime"
 }
 
 test {

    PropertyDescriptionNo
- *             {@link SearchControls#setCountLimit(long)} = 1
    
- *             {@link SearchControls#setReturningAttributes(String[])} = new String[] { "objectclass" }
    
+ *             {@link SearchControls#setCountLimit(long)} = 1
    
+ *             {@link SearchControls#setReturningAttributes(String[])} = new String[] { "objectclass" }
    
  *             {@link SearchControls#setTimeLimit(int)} = 500
  *