From 2b6036cba2ec84a76464e42989b5ff59ce58f153 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Jun 18 2015 12:30:34 +0000
Subject: disable doclint in javadoc


---

diff --git a/ehcache-core-2.6.7-java8doc.patch b/ehcache-core-2.6.7-java8doc.patch
deleted file mode 100644
index 1d34802..0000000
--- a/ehcache-core-2.6.7-java8doc.patch
+++ /dev/null
@@ -1,6109 +0,0 @@
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/CacheEntry.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/CacheEntry.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/CacheEntry.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/CacheEntry.java	2015-06-17 11:42:51.352340551 +0200
-@@ -18,7 +18,7 @@
- 
- /**
-  * Helper class to tie a key to an element.
-- * <p/>
-+ * 
-  * This is used for operations that are identified by a key but that could benefit from additional information that's
-  * available in an element when it can be found in the cache. If the element isn't available, it will be {@code null}.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/CacheException.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/CacheException.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/CacheException.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/CacheException.java	2015-06-17 11:43:24.703738748 +0200
-@@ -19,11 +19,11 @@
- 
- /**
-  * A runtime Cache Exception.
-- * <p/>
-+ * 
-  * These exceptions may be handled by a <code>CacheExceptionHandler</code> registered with a Cache.
-  * The handler provides a key if it is available. A convention that should be followed in exception messages is
-  * to include in the message "key keyValue" e.g. "key 1234" so that keys can be parsed out of exception messages. 
-- * <p/>
-+ * 
-  * Updated in version 1.5 to remove <code>getInitialCause</code> which was a left over from the pre-JDK1.4
-  * days. It breaks JAXB.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Cache.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Cache.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Cache.java	2013-03-05 17:58:11.000000000 +0100
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Cache.java	2015-06-17 11:22:04.842759306 +0200
-@@ -143,16 +143,16 @@
-  * Cache is the central class in ehcache. Caches have {@link Element}s and are managed
-  * by the {@link CacheManager}. The Cache performs logical actions. It delegates physical
-  * implementations to its {@link net.sf.ehcache.store.Store}s.
-- * <p/>
-+ * 
-  * A reference to a Cache can be obtained through the {@link CacheManager}. A Cache thus obtained
-  * is guaranteed to have status {@link Status#STATUS_ALIVE}. This status is checked for any method which
-  * throws {@link IllegalStateException} and the same thrown if it is not alive. This would normally
-  * happen if a call is made after {@link CacheManager#shutdown} is invoked.
-- * <p/>
-+ * 
-  * Cache is threadsafe.
-- * <p/>
-+ * 
-  * Statistics on cache usage are collected and made available through the {@link #getStatistics()} methods.
-- * <p/>
-+ * 
-  * Various decorators are available for Cache, such as BlockingCache, SelfPopulatingCache and the dynamic proxy
-  * ExceptionHandlingDynamicCacheProxy. See each class for details.
-  *
-@@ -170,9 +170,9 @@
- 
-     /**
-      * System Property based method of disabling ehcache. If disabled no elements will be added to a cache.
--     * <p/>
-+     * 
-      * Set the property "net.sf.ehcache.disabled=true" to disable ehcache.
--     * <p/>
-+     * 
-      * This can easily be done using <code>java -Dnet.sf.ehcache.disabled=true</code> in the command line.
-      */
-     public static final String NET_SF_EHCACHE_DISABLED = "net.sf.ehcache.disabled";
-@@ -180,10 +180,10 @@
-     /**
-      * System Property based method of selecting the LruMemoryStore in use up to ehcache 1.5. This is provided
-      * for ease of migration.
--     * <p/>
-+     * 
-      * Set the property "net.sf.ehcache.use.classic.lru=true" to use the older LruMemoryStore implementation
-      * when LRU is selected as the eviction policy.
--     * <p/>
-+     * 
-      * This can easily be done using <code>java -Dnet.sf.ehcache.use.classic.lru=true</code> in the command line.
-      */
-     public static final String NET_SF_EHCACHE_USE_CLASSIC_LRU = "net.sf.ehcache.use.classic.lru";
-@@ -259,14 +259,14 @@
- 
-     /**
-      * A ThreadPoolExecutor which uses a thread pool to schedule loads in the order in which they are requested.
--     * <p/>
-+     * 
-      * Each cache has its own one of these, if required. Because the Core Thread Pool is zero, no threads
-      * are used until actually needed. Threads are added to the pool up to a maximum of 10. The keep alive
-      * time is 60 seconds, after which, if they are not required they will be stopped and collected.
--     * <p/>
-+     * 
-      * The executorService is only used for cache loading, and is created lazily on demand to avoid unnecessary resource
-      * usage.
--     * <p/>
-+     * 
-      * Use {@link #getExecutorService()} to ensure that it is initialised.
-      */
-     private volatile ExecutorService executorService;
-@@ -289,12 +289,12 @@
- 
-     /**
-      * 2.0 and higher Constructor
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param cacheConfiguration the configuration that should be used to create the cache with
-@@ -305,14 +305,14 @@
- 
-     /**
-      * 2.0 and higher Constructor
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory}
-      * and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache}
-      * object into {@link CacheManager#addCache} to specify parameters other
-      * than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param cacheConfiguration the configuration that should be used to create the cache with
-@@ -361,16 +361,16 @@
- 
-     /**
-      * 1.0 Constructor.
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
--     * <p/>
-+     * 
-      * This constructor creates disk stores, if specified, that do not persist between restarts.
--     * <p/>
-+     * 
-      * The default expiry thread interval of 120 seconds is used. This is the interval between runs
-      * of the expiry thread, where it checks the disk store for expired elements. It is not the
-      * the timeToLiveSeconds.
-@@ -398,12 +398,12 @@
- 
-     /**
-      * 1.1 Constructor.
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param name                the name of the cache. Note that "default" is a reserved name for the defaultCache.
-@@ -444,12 +444,12 @@
- 
-     /**
-      * 1.2 Constructor
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param name                      the name of the cache. Note that "default" is a reserved name for the defaultCache.
-@@ -496,12 +496,12 @@
- 
-     /**
-      * 1.2.1 Constructor
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param name                      the name of the cache. Note that "default" is a reserved name for the defaultCache.
-@@ -548,12 +548,12 @@
- 
-     /**
-      * 1.2.4 Constructor
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param name                      the name of the cache. Note that "default" is a reserved name for the defaultCache.
-@@ -603,12 +603,12 @@
- 
-     /**
-      * 1.3 Constructor
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param name                      the name of the cache. Note that "default" is a reserved name for the defaultCache.
-@@ -661,12 +661,12 @@
- 
-     /**
-      * 1.6.0 Constructor
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param name                      the name of the cache. Note that "default" is a reserved name for the defaultCache.
-@@ -722,12 +722,12 @@
- 
-     /**
-      * 1.7.0 Constructor
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * 
-      * A client can specify their own settings here and pass the {@link Cache} object
-      * into {@link CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * 
-      * Only the CacheManager can initialise them.
-      *
-      * @param name                      the name of the cache. Note that "default" is a reserved name for the defaultCache.
-@@ -985,7 +985,7 @@
- 
-     /**
-      * Newly created caches do not have a {@link net.sf.ehcache.store.Store}.
--     * <p/>
-+     * 
-      * This method creates the store and makes the cache ready to accept elements
-      */
-     public void initialise() {
-@@ -1243,7 +1243,7 @@
- 
-     /**
-      * The CacheWriterManager's initialisation can be deferred until an actual CacheWriter has been registered.
--     * <p/>
-+     * 
-      * This allows users to register a cache through XML in the cache manager and still specify the CacheWriter manually through Java code, possibly referencing local resources.
-      *
-      * @param imperative indicates whether it's imperative for the cache writer manager to be initialised before operations can continue
-@@ -1324,17 +1324,17 @@
- 
-     /**
-      * Put an element in the cache.
--     * <p/>
-+     * 
-      * Resets the access statistics on the element, which would be the case if it has previously been
-      * gotten from a cache, and is now being put back.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener that:
-      * <ul>
-      * <li>the element was put, but only if the Element was actually put.
-      * <li>if the element exists in the cache, that an update has occurred, even if the element would be expired
-      * if it was requested
-      * </ul>
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails.
-      * This exception should be caught in those circumstances.
-      *
-@@ -1358,10 +1358,10 @@
- 
-     /**
-      * Put an element in the cache.
--     * <p/>
-+     * 
-      * Resets the access statistics on the element, which would be the case if it has previously been
-      * gotten from a cache, and is now being put back.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener that:
-      * <ul>
-      * <li>the element was put, but only if the Element was actually put.
-@@ -1512,10 +1512,10 @@
-      * Put an element in the cache, without updating statistics, or updating listeners. This is meant to be used
-      * in conjunction with {@link #getQuiet}.
-      * Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails.
-      * This exception should be caught in those circumstances.
--     * <p/>
-+     * 
-      *
-      * @param element A cache Element. If Serializable it can fully participate in replication and the DiskStore. If it is
-      *                <code>null</code> or the key is <code>null</code>, it is ignored as a NOOP.
-@@ -1542,10 +1542,10 @@
- 
-     /**
-      * Gets an element from the cache. Updates Element Statistics
--     * <p/>
-+     * 
-      * Note that the Element's lastAccessTime is always the time of this get.
-      * Use {@link #getQuiet(Object)} to peak into the Element to see its last access time with get
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
-      *
-      * @param key a serializable value. Null keys are not stored so get(null) always returns null
-@@ -1560,10 +1560,10 @@
- 
-     /**
-      * Gets an element from the cache. Updates Element Statistics
--     * <p/>
-+     * 
-      * Note that the Element's lastAccessTime is always the time of this get.
-      * Use {@link #getQuiet(Object)} to peak into the Element to see its last access time with get
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
-      *
-      * @param key an Object value
-@@ -1618,12 +1618,12 @@
- 
-     /**
-      * This method will return, from the cache, the Element associated with the argument "key".
--     * <p/>
-+     * 
-      * If the Element is not in the cache, the associated cache loader will be called. That is either the CacheLoader passed in, or if null,
-      * the one associated with the cache. If both are null, no load is performed and null is returned.
--     * <p/>
-+     * 
-      * If the loader decides to assign a null value to the Element, an Element with a null value is created and stored in the cache.
--     * <p/>
-+     * 
-      * Because this method may take a long time to complete, it is not synchronized. The underlying cache operations
-      * are synchronized.
-      *
-@@ -1680,7 +1680,7 @@
-      * If no "arg" value is provided a null will be passed to the load method. The storing of null values in the cache
-      * is permitted, however, the get method will not distinguish returning a null stored in the cache and not finding
-      * the object in the cache. In both cases a null is returned.
--     * <p/>
-+     * 
-      * The Ehcache native API provides similar functionality to loaders using the
-      * decorator {@link net.sf.ehcache.constructs.blocking.SelfPopulatingCache}
-      *
-@@ -1712,13 +1712,13 @@
-      * the object. If no "arg" value is provided a null will be passed to the loadAll method. The storing of null values in the cache
-      * is permitted, however, the get method will not distinguish returning a null stored in the cache and not finding the object in
-      * the cache. In both cases a null is returned.
--     * <p/>
--     * <p/>
-+     * 
-+     * 
-      * Note. If the getAll exceeds the maximum cache size, the returned map will necessarily be less than the number specified.
--     * <p/>
-+     * 
-      * Because this method may take a long time to complete, it is not synchronized. The underlying cache operations
-      * are synchronized.
--     * <p/>
-+     * 
-      * The constructs package provides similar functionality using the
-      * decorator {@link net.sf.ehcache.constructs.blocking.SelfPopulatingCache}
-      *
-@@ -1807,10 +1807,10 @@
-      * retrieving or loading of the objects, an exception (to be defined) will be thrown. If the "arg" argument is set,
-      * the arg object will be passed to the CacheLoader.loadAll method. The cache will not dereference the object.
-      * If no "arg" value is provided a null will be passed to the loadAll method.
--     * <p/>
-+     * 
-      * keys - collection of the keys whose associated values to be loaded into this cache by using the associated
-      * CacheLoader if this cache doesn't contain them.
--     * <p/>
-+     * 
-      * The Ehcache native API provides similar functionality to loaders using the
-      * decorator {@link net.sf.ehcache.constructs.blocking.SelfPopulatingCache}
-      */
-@@ -1830,7 +1830,7 @@
-     /**
-      * Gets an element from the cache, without updating Element statistics. Cache statistics are
-      * still updated. Listeners are not called.
--     * <p/>
-+     * 
-      *
-      * @param key a serializable value
-      * @return the element, or null, if it does not exist.
-@@ -1844,7 +1844,7 @@
-     /**
-      * Gets an element from the cache, without updating Element statistics. Cache statistics are
-      * not updated.
--     * <p/>
-+     * 
-      * Listeners are not called.
-      *
-      * @param key a serializable value
-@@ -1860,12 +1860,12 @@
- 
-     /**
-      * Returns a list of all element keys in the cache, whether or not they are expired.
--     * <p/>
-+     * 
-      * The returned keys are unique and can almost be considered a set. See {@link net.sf.ehcache.store.CacheKeySet CacheKeySet} for
-      * more details.
--     * <p/>
-+     * 
-      * The List returned is not live. It is a copy.
--     * <p/>
-+     * 
-      * The time taken is O(n). On a single CPU 1.8Ghz P4, approximately 8ms is required
-      * for each 1000 entries.
-      *
-@@ -1881,17 +1881,17 @@
-     /**
-      * Returns a list of all element keys in the cache. Only keys of non-expired
-      * elements are returned.
--     * <p/>
-+     * 
-      * The returned keys are unique and can be considered a set.
--     * <p/>
-+     * 
-      * The List returned is not live. It is a copy.
--     * <p/>
-+     * 
-      * The time taken is O(n), where n is the number of elements in the cache. On
-      * a 1.8Ghz P4, the time taken is approximately 200ms per 1000 entries. This method
-      * is not synchronized, because it relies on a non-live list returned from {@link #getKeys()}
-      * , which is synchronised, and which takes 8ms per 1000 entries. This way
-      * cache liveness is preserved, even if this method is very slow to return.
--     * <p/>
-+     * 
-      * Consider whether your usage requires checking for expired keys. Because
-      * this method takes so long, depending on cache settings, the list could be
-      * quite out of date by the time you get it.
-@@ -1917,16 +1917,16 @@
- 
-     /**
-      * Returns a list of all elements in the cache, whether or not they are expired.
--     * <p/>
-+     * 
-      * The returned keys are not unique and may contain duplicates. If the cache is only
-      * using the memory store, the list will be unique. If the disk store is being used
-      * as well, it will likely contain duplicates, because of the internal store design.
--     * <p/>
-+     * 
-      * The List returned is not live. It is a copy.
--     * <p/>
-+     * 
-      * The time taken is O(log n). On a single CPU 1.8Ghz P4, approximately 6ms is required
-      * for 1000 entries and 36 for 50000.
--     * <p/>
-+     * 
-      * This is the fastest getKeys method
-      *
-      * @return a list of {@link Object} keys
-@@ -2134,11 +2134,11 @@
-     /**
-      * Removes an {@link Element} from the Cache. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed.
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails.
-      * This exception should be caught in those circumstances.
-      *
-@@ -2153,15 +2153,15 @@
-     /**
-      * Removes an {@link Element} from the Cache. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed, but only if an Element
-      * with the key actually existed.
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails.
-      * This exception should be caught in those circumstances.
--     * <p/>
-+     * 
-      *
-      * @param key the element key to operate on
-      * @return true if the element was removed, false if it was not found in the cache
-@@ -2175,14 +2175,14 @@
-     /**
-      * Removes an {@link Element} from the Cache and returns it. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed, but only if an Element with the key actually existed.
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails. This exception
-      * should be caught in those circumstances.
--     * <p/>
-+     * 
-      *
-      * @param key the element key to operate on
-      * @return element the removed element associated with the key, null if no mapping exists
-@@ -2209,12 +2209,12 @@
-     /**
-      * Removes an {@link Element} from the Cache. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed, but only if an Element
-      * with the key actually existed.
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails.
-      * This exception should be caught in those circumstances.
-      *
-@@ -2231,10 +2231,10 @@
-     /**
-      * Removes an {@link Element} from the Cache. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed, but only if an Element
-      * with the key actually existed.
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
-      *
-      * @param key                         the element key to operate on
-@@ -2250,7 +2250,7 @@
-     /**
-      * Removes an {@link Element} from the Cache, without notifying listeners. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Listeners are not called.
-      *
-      * @param key the element key to operate on
-@@ -2264,9 +2264,9 @@
-     /**
-      * Removes an {@link Element} from the Cache, without notifying listeners. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Listeners are not called.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails. This exception
-      * should be caught in those circumstances.
-      *
-@@ -2289,15 +2289,15 @@
-     /**
-      * Removes or expires an {@link Element} from the Cache after an attempt to get it determined that it should be expired.
-      * This also removes it from any stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element has expired.
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * If a remove was called, listeners are notified, regardless of whether the element existed or not.
-      * This allows distributed cache listeners to remove elements from a cluster regardless of whether they
-      * existed locally.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails.
-      * This exception should be caught in those circumstances.
-      *
-@@ -2369,14 +2369,14 @@
-     /**
-      * Removes or expires a collection of {@link Element}s from the Cache after an attempt to get it determined that it should be expired.
-      * This also removes it from any stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element has expired.
--     * <p/>
-+     * 
-      * Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * If a removeAll was called, listeners are notified, regardless of whether the element existed or not. This allows distributed cache
-      * listeners to remove elements from a cluster regardless of whether they existed locally.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails. This exception
-      * should be caught in those circumstances.
-      *
-@@ -2405,7 +2405,7 @@
-     /**
-      * Removes all cached items.
-      * Terracotta clustered caches may require more time to execute this operation because cached items must also be removed from the Terracotta Server Array. Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails.
-      * This exception should be caught in those circumstances.
-      *
-@@ -2419,7 +2419,7 @@
-     /**
-      * Removes all cached items.
-      * Synchronization is handled within the method.
--     * <p/>
-+     * 
-      * Caches which use synchronous replication can throw RemoteCacheException here if the replication to the cluster fails.
-      * This exception should be caught in those circumstances.
-      *
-@@ -2529,7 +2529,7 @@
- 
-     /**
-      * Gets the cache configuration this cache was created with.
--     * <p/>
-+     * 
-      * Things like listeners that are added dynamically are excluded.
-      */
-     public CacheConfiguration getCacheConfiguration() {
-@@ -2554,24 +2554,24 @@
- 
-     /**
-      * Gets the size of the cache. This is a subtle concept. See below.
--     * <p/>
-+     * 
-      * This number is the actual number of elements, including expired elements
-      * that have not been removed.
--     * <p/>
-+     * 
-      * Expired elements are removed from the the memory store when getting an
-      * expired element, or when attempting to spool an expired element to disk.
--     * <p/>
-+     * 
-      * Expired elements are removed from the disk store when getting an expired
-      * element, or when the expiry thread runs, which is once every five
-      * minutes.
--     * <p/>
-+     * 
-      * To get an exact size, which would exclude expired elements, use
-      * {@link #getKeysWithExpiryCheck()}.size(), although see that method for
-      * the approximate time that would take.
--     * <p/>
-+     * 
-      * To get a very fast result, use {@link #getKeysNoDuplicateCheck()}.size().
-      * If the disk store is being used, there will be some duplicates.
--     * <p/>
-+     * 
-      * Note:getSize() is a very expensive operation in off-heap, disk and Terracotta implementations.
-      *
-      * @return The size value
-@@ -2606,11 +2606,11 @@
-     /**
-      * Gets the size of the memory store for this cache. This method relies on calculating
-      * Serialized sizes. If the Element values are not Serializable they will show as zero.
--     * <p/>
-+     * 
-      * Warning: This method can be very expensive to run. Allow approximately 1 second
-      * per 1MB of entries. Running this method could create liveness problems
-      * because the object lock is held for a long period
--     * <p/>
-+     * 
-      *
-      * @return the approximate size of the memory store in bytes
-      * @throws IllegalStateException
-@@ -2767,7 +2767,7 @@
- 
-     /**
-      * Checks whether this cache element has expired.
--     * <p/>
-+     * 
-      * The element is expired if:
-      * <ol>
-      * <li> the idle time is non-zero and has elapsed, unless the cache is eternal; or
-@@ -2790,9 +2790,9 @@
-      * Clones a cache. This is only legal if the cache has not been
-      * initialized. At that point only primitives have been set and no
-      * stores have been created.
--     * <p/>
-+     * 
-      * A new, empty, RegisteredEventListeners is created on clone.
--     * <p/>
-+     * 
-      *
-      * @return an object of type {@link Cache}
-      * @throws CloneNotSupportedException
-@@ -3018,7 +3018,7 @@
- 
-     /**
-      * An inexpensive check to see if the key exists in the cache.
--     * <p/>
-+     * 
-      * This method is not synchronized. It is possible that an element may exist in the cache and be removed
-      * before the check gets to it, or vice versa.  Since no assertions are made about the state of the Element
-      * it is possible that the Element is expired, but this method still returns true.
-@@ -3037,7 +3037,7 @@
-     /**
-      * An extremely expensive check to see if the value exists in the cache. This implementation is O(n). Ehcache
-      * is not designed for efficient access in this manner.
--     * <p/>
-+     * 
-      * This method is not synchronized. It is possible that an element may exist in the cache and be removed
-      * before the check gets to it, or vice versa. Because it is slow to execute the probability of that this will
-      * have happened.
-@@ -3066,7 +3066,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * 
-      * Note, the {@link #getSize} method will have the same value as the size
-      * reported by Statistics for the statistics accuracy of
-      * {@link Statistics#STATISTICS_ACCURACY_BEST_EFFORT}.
-@@ -3143,7 +3143,7 @@
- 
-     /**
-      * An equals method which follows the contract of {@link Object#equals(Object)}
--     * <p/>
-+     * 
-      * An Cache is equal to another one if it implements Ehcache and has the same GUID.
-      *
-      * @param object the reference object with which to compare.
-@@ -3168,7 +3168,7 @@
-      * Returns a hash code value for the object. This method is
-      * supported for the benefit of hashtables such as those provided by
-      * <code>java.util.Hashtable</code>.
--     * <p/>
-+     * 
-      * The general contract of <code>hashCode</code> is:
-      * <ul>
-      * <li>Whenever it is invoked on the same object more than once during
-@@ -3187,14 +3187,14 @@
-      * programmer should be aware that producing distinct integer results
-      * for unequal objects may improve the performance of hashtables.
-      * </ul>
--     * <p/>
-+     * 
-      * As much as is reasonably practical, the hashCode method defined by
-      * class <tt>Object</tt> does return distinct integers for distinct
-      * objects. (This is typically implemented by converting the internal
-      * address of the object into an integer, but this implementation
-      * technique is not required by the
-      * Java(TM) programming language.)
--     * <p/>
-+     * 
-      * This implementation use the GUID of the cache.
-      *
-      * @return a hash code value for this object.
-@@ -3217,7 +3217,7 @@
- 
-     /**
-      * Register a {@link CacheExtension} with the cache. It will then be tied into the cache lifecycle.
--     * <p/>
-+     * 
-      * If the CacheExtension is not initialised, initialise it.
-      */
-     public void registerCacheExtension(CacheExtension cacheExtension) {
-@@ -3250,7 +3250,7 @@
- 
-     /**
-      * Sets an ExceptionHandler on the Cache. If one is already set, it is overwritten.
--     * <p/>
-+     * 
-      * The ExceptionHandler is only used if this Cache's methods are accessed using
-      * {@link net.sf.ehcache.exceptionhandler.ExceptionHandlingDynamicCacheProxy}.
-      *
-@@ -3264,7 +3264,7 @@
- 
-     /**
-      * Gets the ExceptionHandler on this Cache, or null if there isn't one.
--     * <p/>
-+     * 
-      * The ExceptionHandler is only used if this Cache's methods are accessed using
-      * {@link net.sf.ehcache.exceptionhandler.ExceptionHandlingDynamicCacheProxy}.
-      *
-@@ -3568,9 +3568,9 @@
-      * <li>gets return null</li>
-      * </ol>
-      * In all other respects the cache continues as it is.
--     * <p/>
-+     * 
-      * You can disable and enable a cache programmatically through the {@link #setDisabled(boolean)} method.
--     * <p/>
-+     * 
-      * By default caches are enabled on creation, unless the <code>net.sf.ehcache.disabled</code> system
-      * property is set.
-      *
-@@ -3584,7 +3584,7 @@
-     /**
-      * Disables or enables this cache. This call overrides the previous value of disabled, even if the
-      * <code>net.sf.ehcache.disabled</code> system property is set
--     * <p/>
-+     * 
-      *
-      * @param disabled true if you wish to disable, false to enable
-      * @see #isDisabled()
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/CacheManager.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/CacheManager.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/CacheManager.java	2012-10-01 20:19:11.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/CacheManager.java	2015-06-17 11:45:11.328617764 +0200
-@@ -96,10 +96,10 @@
- 
- /**
-  * A container for {@link Ehcache}s that maintain all aspects of their lifecycle.
-- * <p/>
-+ * 
-  * CacheManager may be either be a singleton if created with factory methods, or multiple instances may exist, in which case resources
-  * required by each must be unique.
-- * <p/>
-+ * 
-  * A CacheManager holds references to Caches and Ehcaches and manages their creation and lifecycle.
-  *
-  * @author Greg Luck
-@@ -184,9 +184,9 @@
-     /**
-      * The shutdown hook thread for CacheManager. This ensures that the CacheManager and Caches are left in a
-      * consistent state on a CTRL-C or kill.
--     * <p/>
-+     * 
-      * This thread must be unregistered as a shutdown hook, when the CacheManager is disposed. Otherwise the CacheManager is not GC-able.
--     * <p/>
-+     * 
-      * Of course kill -9 or abrupt termination will not run the shutdown hook. In this case, various sanity checks are made at start up.
-      */
-     protected Thread shutdownHook;
-@@ -237,12 +237,12 @@
-     /**
-      * An constructor for CacheManager, which takes a configuration object, rather than one created by parsing
-      * an ehcache.xml file. This constructor gives complete control over the creation of the CacheManager.
--     * <p/>
-+     * 
-      * Care should be taken to ensure that, if multiple CacheManages are created, they do now overwrite each others disk store files, as
-      * would happend if two were created which used the same diskStore path.
--     * <p/>
-+     * 
-      * This method does not act as a singleton. Callers must maintain their own reference to it.
--     * <p/>
-+     * 
-      * Note that if one of the {@link #create()} methods are called, a new singleton instance will be created, separate from any instances
-      * created in this method.
-      *
-@@ -294,7 +294,7 @@
-      * It is recommended to use one of the {@link #newInstance()} methods to instantiate new CacheManagers as those methods return the same instance
-      * of CacheManager for same names (or unnamed). Shutting down the CacheManager will deregister it and new ones can be created again.
-      *
--     * <p/>
-+     * 
-      * This method can be used to specify a configuration resource in the classpath other than the default of \"/ehcache.xml\":
-      *
-      * <pre>
-@@ -303,7 +303,7 @@
-      *
-      * Note that {@link Class#getResource(String)} will look for resources in the same package unless a leading "/" is used, in which case it will
-      * look in the root of the classpath.
--     * <p/>
-+     * 
-      * You can also load a resource using other class loaders. e.g. {@link Thread#getContextClassLoader()}
-      *
-      * @param configurationURL
-@@ -655,7 +655,7 @@
-     /**
-      * Loads configuration, either from the supplied {@link ConfigurationHelper} or by creating a new Configuration instance
-      * from the configuration file referred to by file, inputstream or URL.
--     * <p/>
-+     * 
-      * Should only be called once.
-      *
-      * @param configurationFileName
-@@ -781,7 +781,7 @@
- 
-     /**
-      * A factory method to create a singleton CacheManager with default config, or return it if it exists.
--     * <p/>
-+     * 
-      * The configuration will be read, {@link Ehcache}s created and required stores initialized. When the {@link CacheManager} is no longer
-      * required, call shutdown to free resources.
-      *
-@@ -806,7 +806,7 @@
- 
-     /**
-      * A factory method to create a CacheManager with default config, or return it if it exists.
--     * <p/>
-+     * 
-      * The configuration will be read, {@link Ehcache}s created and required stores initialized. When the {@link CacheManager} is no longer
-      * required, call shutdown to free resources.
-      *
-@@ -820,9 +820,9 @@
- 
-     /**
-      * A factory method to create a singleton CacheManager with default config, or return it if it exists.
--     * <p/>
-+     * 
-      * This has the same effect as {@link CacheManager#create}
--     * <p/>
-+     * 
-      * Same as {@link #create()}
-      *
-      * @return the singleton CacheManager
-@@ -838,7 +838,7 @@
-      *
-      * @param configurationFileName
-      *            an xml file compliant with the ehcache.xsd schema
--     *            <p/>
-+     *            
-      *            The configuration will be read, {@link Ehcache}s created and required stores initialized. When the {@link CacheManager} is
-      *            no longer required, call shutdown to free resources.
-      */
-@@ -864,7 +864,7 @@
-      *
-      * @param configurationFileName
-      *            an xml file compliant with the ehcache.xsd schema
--     *            <p/>
-+     *            
-      *            The configuration will be read, {@link Ehcache}s created and required stores initialized. When the {@link CacheManager} is
-      *            no longer required, call shutdown to free resources.
-      */
-@@ -875,7 +875,7 @@
- 
-     /**
-      * A factory method to create a singleton CacheManager from an URL.
--     * <p/>
-+     * 
-      * This method can be used to specify a configuration resource in the classpath other than the default of \"/ehcache.xml\": This method
-      * can be used to specify a configuration resource in the classpath other than the default of \"/ehcache.xml\":
-      *
-@@ -885,12 +885,12 @@
-      *
-      * Note that {@link Class#getResource(String)} will look for resources in the same package unless a leading "/" is used, in which case it will
-      * look in the root of the classpath.
--     * <p/>
-+     * 
-      * You can also load a resource using other class loaders. e.g. {@link Thread#getContextClassLoader()}
-      *
-      * @param configurationFileURL
-      *            an URL to an xml file compliant with the ehcache.xsd schema
--     *            <p/>
-+     *            
-      *            The configuration will be read, {@link Ehcache}s created and required stores initialized. When the {@link CacheManager} is
-      *            no longer required, call shutdown to free resources.
-      */
-@@ -911,7 +911,7 @@
- 
-     /**
-      * A factory method to create a CacheManager from an URL.
--     * <p/>
-+     * 
-      * This method can be used to specify a configuration resource in the classpath other than the default of \"/ehcache.xml\": This method
-      * can be used to specify a configuration resource in the classpath other than the default of \"/ehcache.xml\":
-      *
-@@ -921,14 +921,14 @@
-      *
-      * Note that {@link Class#getResource(String)} will look for resources in the same package unless a leading "/" is used, in which case it will
-      * look in the root of the classpath.
--     * <p/>
-+     * 
-      * You can also load a resource using other class loaders. e.g. {@link Thread#getContextClassLoader()}
-      *
-      * If the specified configuration has different names for the CacheManager, it will return a new one for each unique name or return already created one.
-      *
-      * @param configurationFileURL
-      *            an URL to an xml file compliant with the ehcache.xsd schema
--     *            <p/>
-+     *            
-      *            The configuration will be read, {@link Ehcache}s created and required stores initialized. When the {@link CacheManager} is
-      *            no longer required, call shutdown to free resources.
-      */
-@@ -939,13 +939,13 @@
- 
-     /**
-      * A factory method to create a singleton CacheManager from a java.io.InputStream.
--     * <p/>
-+     * 
-      * This method makes it possible to use an inputstream for configuration. Note: it is the clients responsibility to close the
-      * inputstream.
-      *
-      * @param inputStream
-      *            InputStream of xml compliant with the ehcache.xsd schema
--     *            <p/>
-+     *            
-      *            The configuration will be read, {@link Ehcache}s created and required stores initialized. When the {@link CacheManager} is
-      *            no longer required, call shutdown to free resources.
-      */
-@@ -966,16 +966,16 @@
- 
-     /**
-      * A factory method to create a CacheManager from a java.io.InputStream.
--     * <p/>
-+     * 
-      * This method makes it possible to use an inputstream for configuration. Note: it is the clients responsibility to close the
-      * inputstream.
--     * <p/>
-+     * 
-      *
-      * If the specified configuration has different names for the CacheManager, it will return a new one for each unique name or return already created one.
-      *
-      * @param inputStream
-      *            InputStream of xml compliant with the ehcache.xsd schema
--     *            <p/>
-+     *            
-      *            The configuration will be read, {@link Ehcache}s created and required stores initialized. When the {@link CacheManager} is
-      *            no longer required, call shutdown to free resources.
-      */
-@@ -1005,7 +1005,7 @@
- 
-     /**
-      * A factory method to create a CacheManager from a net.sf.ehcache.config.Configuration.
--     * <p/>
-+     * 
-      * If the specified configuration has different names for the CacheManager, it will return a new one for each unique name or return already created one.
-      * @param config
-      */
-@@ -1061,7 +1061,7 @@
-     /**
-      * Returns a concrete implementation of Cache, it it is available in the CacheManager.
-      * Consider using getEhcache(String name) instead, which will return decorated caches that are registered.
--     * <p/>
-+     * 
-      * If a decorated ehcache is registered in CacheManager, an undecorated Cache with the same name may also exist.
-      *
-      * Since version ehcache-core-2.1.0, when an {@link Ehcache} decorator is present in the CacheManager, its not necessary that a
-@@ -1080,7 +1080,7 @@
- 
-     /**
-      * Gets an Ehcache
--     * <p/>
-+     * 
-      *
-      * @return a Cache, if an object of type Cache exists by that name, else null
-      * @throws IllegalStateException
-@@ -1145,11 +1145,11 @@
- 
-     /**
-      * Adds a {@link Ehcache} based on the defaultCache with the given name.
--     * <p/>
-+     * 
-      * Memory and Disk stores will be configured for it and it will be added to the map of caches.
--     * <p/>
-+     * 
-      * Also notifies the CacheManagerEventListener after the cache was initialised and added.
--     * <p/>
-+     * 
-      * It will be created with the defaultCache attributes specified in ehcache.xml
-      *
-      * @param cacheName
-@@ -1182,7 +1182,7 @@
- 
-     /**
-      * Adds a {@link Cache} to the CacheManager.
--     * <p/>
-+     * 
-      * Memory and Disk stores will be configured for it and it will be added to the map of caches. Also notifies the
-      * CacheManagerEventListener after the cache was initialised and added.
-      *
-@@ -1204,7 +1204,7 @@
- 
-     /**
-      * Adds an {@link Ehcache} to the CacheManager.
--     * <p/>
-+     * 
-      * Memory and Disk stores will be configured for it and it will be added to the map of caches. Also notifies the
-      * CacheManagerEventListener after the cache was initialised and added.
-      *
-@@ -1239,14 +1239,14 @@
-      * Adds a decorated {@link Ehcache} to the CacheManager. This method neither creates the memory/disk store
-      * nor initializes the cache. It only adds the cache reference to the map of caches held by this
-      * cacheManager.
--     * <p/>
-+     * 
-      * It is generally required that a decorated cache, once constructed, is made available to other execution threads. The simplest way of
-      * doing this is to either add it to the cacheManager with a different name or substitute the original cache with the decorated one.
--     * <p/>
-+     * 
-      * This method adds the decorated cache assuming it has a different name. If another cache (decorated or not) with the same name already
-      * exists, it will throw {@link ObjectExistsException}. For replacing existing cache with another decorated cache having same name,
-      * please use {@link #replaceCacheWithDecoratedCache(Ehcache, Ehcache)}
--     * <p/>
-+     * 
-      * Note that any overridden Ehcache methods by the decorator will take on new behaviours without casting. Casting is only required for
-      * new methods that the decorator introduces. For more information see the well known Gang of Four Decorator pattern.
-      *
-@@ -1351,7 +1351,7 @@
- 
-     /**
-      * Checks whether a cache of type ehcache exists.
--     * <p/>
-+     * 
-      *
-      * @param cacheName
-      *            the cache name to check for
-@@ -1399,12 +1399,12 @@
- 
-     /**
-      * Shuts down the CacheManager.
--     * <p/>
-+     * 
-      * If the shutdown occurs on the singleton, then the singleton is removed, so that if a singleton access method is called, a new
-      * singleton will be created.
--     * <p/>
-+     * 
-      * By default there is no shutdown hook (ehcache-1.3-beta2 and higher).
--     * <p/>
-+     * 
-      * Set the system property net.sf.ehcache.enableShutdownHook=true to turn it on.
-      */
-     public void shutdown() {
-@@ -1518,7 +1518,7 @@
-     /**
-      * Clears the contents of all caches in the CacheManager, but without
-      * removing any caches.
--     * <p/>
-+     * 
-      * This method is not synchronized. It only guarantees to clear those elements in a cache at the time that the
-      * {@link Ehcache#removeAll()} mehod on each cache is called.
-      */
-@@ -1535,7 +1535,7 @@
-     /**
-      * Clears the contents of all caches in the CacheManager with a name starting with the prefix,
-      * but without removing them.
--     * <p/>
-+     * 
-      * This method is not synchronized. It only guarantees to clear those elements in a cache at the time that the
-      * {@link Ehcache#removeAll()} method on each cache is called.
-      *
-@@ -1626,7 +1626,7 @@
-     /**
-      * Replaces in the map of Caches managed by this CacheManager an Ehcache with a decorated version of the same
-      * Ehcache. CacheManager can operate fully with a decorated Ehcache.
--     * <p/>
-+     * 
-      * Ehcache Decorators can be used to obtain different behaviour from an Ehcache in a very flexible way. Some examples in ehcache are:
-      * <ol>
-      * <li>{@link net.sf.ehcache.constructs.blocking.BlockingCache} - A cache that blocks other threads from getting a null element until
-@@ -1635,10 +1635,10 @@
-      * to load its own entries.
-      * </ol>
-      * Many other kinds are possible.
--     * <p/>
-+     * 
-      * It is generally required that a decorated cache, once constructed, is made available to other execution threads. The simplest way of
-      * doing this is to substitute the original cache for the decorated one here.
--     * <p/>
-+     * 
-      * Note that any overwritten Ehcache methods will take on new behaviours without casting. Casting is only required for new methods that
-      * the decorator introduces. For more information see the well known Gang of Four Decorator pattern.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/cluster/ClusterTopologyListener.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/cluster/ClusterTopologyListener.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/cluster/ClusterTopologyListener.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/cluster/ClusterTopologyListener.java	2015-06-17 12:24:31.482836748 +0200
-@@ -54,7 +54,7 @@
- 
-     /**
-      * This node lost contact and rejoined the cluster again.
--     * <p />
-+     * 
-      * This event is only fired in the node which rejoined and not to all the connected nodes
-      * @param oldNode The old node which got disconnected
-      * @param newNode The new node after rejoin
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/concurrent/CacheLockProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/concurrent/CacheLockProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/concurrent/CacheLockProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/concurrent/CacheLockProvider.java	2015-06-17 13:16:54.233090108 +0200
-@@ -22,9 +22,9 @@
- 
-     /**
-      * Gets the Sync Stripe to use for a given key.
--     * <p/>
-+     * 
-      * This lookup must always return the same Sync for a given key.
--     * <p/>
-+     * 
-      * @param key the key
-      * @return one of a limited number of Sync's.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/concurrent/ConcurrencyUtil.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/concurrent/ConcurrencyUtil.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/concurrent/ConcurrencyUtil.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/concurrent/ConcurrencyUtil.java	2015-06-17 13:59:57.605189578 +0200
-@@ -41,7 +41,7 @@
- 
-     /**
-      * Returns a hash code for non-null Object x.
--     * <p/>
-+     * <p>
-      * This function ensures that hashCodes that differ only by
-      * constant multiples at each bit position have a bounded
-      * number of collisions. (Doug Lea)
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/concurrent/StripedReadWriteLockSync.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/concurrent/StripedReadWriteLockSync.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/concurrent/StripedReadWriteLockSync.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/concurrent/StripedReadWriteLockSync.java	2015-06-17 14:00:40.793057231 +0200
-@@ -26,13 +26,13 @@
-  * Provides a number of Sync which allow fine-grained concurrency. Rather than locking a cache or a store,
-  * the individual elements or constituent objects can be locked. This dramatically increases
-  * the possible concurrency.
-- * <p/>
-+ * <p>
-  * The more stripes, the higher the concurrency. To be threadsafe, the instance of CacheLockProvider needs to be
-  * maintained for the entire life of the cache or store, so there is some added memory use.
-- * <p/>
-+ * <p>
-  * Though a new class, this code has been refactored from <code>BlockingCache</code>, where it has been in use
-  * in highly concurrent production environments for years.
-- * <p/>
-+ * <p>
-  * Based on the lock striping concept from Brian Goetz. See Java Concurrency in Practice 11.4.3
-  * @author Alex Snaps
-  */
-@@ -40,7 +40,7 @@
- 
-     /**
-      * The default number of locks to use. Must be a power of 2.
--     * <p/>
-+     * <p>
-      * The choice of 2048 enables 2048 concurrent operations per cache or cache store, which should be enough for most
-      * uses.
-      */
-@@ -57,7 +57,7 @@
- 
-     /**
-      * Constructs a striped mutex with the default 2048 stripes.
--     * <p/>
-+     * <p>
-      * The number of stripes determines the number of concurrent operations per cache or cache store.
-      * @param numberOfStripes - must be a factor of two
-      */
-@@ -79,9 +79,9 @@
- 
-     /**
-      * Gets the Sync Stripe to use for a given key.
--     * <p/>
-+     * <p>
-      * This lookup must always return the same Sync for a given key.
--     * <p/>
-+     * <p>
-      * @param key the key
-      * @return one of a limited number of Sync's.
-      */
-@@ -92,9 +92,9 @@
- 
-     /**
-      * Gets the RWL Stripe to use for a given key.
--     * <p/>
-+     * <p>
-      * This lookup must always return the same RWL for a given key.
--     * <p/>
-+     * <p>
-      * @param key the key
-      * @return one of a limited number of RWLs.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/concurrent/Sync.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/concurrent/Sync.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/concurrent/Sync.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/concurrent/Sync.java	2015-06-17 14:58:32.563883158 +0200
-@@ -20,7 +20,7 @@
-  * @version $Id: Sync.java 5631 2012-05-10 08:31:33Z teck $
-  * @author Doug Lea
-  * Main interface for locks, gates, and conditions.
-- * <p/>
-+ * <p>
-  * Sync objects isolate waiting and notification for particular
-  * logical states, resource availability, events, and the like that are
-  * shared across multiple threads. Use of Syncs sometimes
-@@ -28,15 +28,15 @@
-  * compared to the use of plain java monitor methods
-  * and locking, and are sometimes (but by no means always)
-  * simpler to program with.
-- * <p/>
-- * <p/>
-+ * <p>
-+ * <p>
-  * Most Syncs are intended to be used primarily (although
-  * not exclusively) in  before/after constructions such as:
-  * <pre>
-  * class X {
-  *   Sync gate;
-  *   // ...
-- * <p/>
-+ *
-  *   public void m() {
-  *     try {
-  *       gate.acquire();  // block until condition holds
-@@ -51,7 +51,7 @@
-  *       // ... evasive action
-  *     }
-  *   }
-- * <p/>
-+ * 
-  *   public void m2(Sync cond) { // use supplied condition
-  *     try {
-  *       if (cond.attempt(10)) {         // try the condition for 10 ms
-@@ -76,7 +76,7 @@
-  *   private double state_ = 0.0;
-  *   private final Sync lock;  // use lock type supplied in constructor
-  *   public HandSynched(Sync l) { lock = l; }
-- * <p/>
-+ * 
-  *   public void changeState(double d) {
-  *     try {
-  *       lock.acquire();
-@@ -85,7 +85,7 @@
-  *     }
-  *     catch(InterruptedException ex) { }
-  *   }
-- * <p/>
-+ * 
-  *   public double getState() {
-  *     double d = 0.0;
-  *     try {
-@@ -109,7 +109,7 @@
-  *   private double state_ = 0.0;
-  *   private final Sync lock;  // use lock type supplied in constructor
-  *   public HandSynchedV2(Sync l) { lock = l; }
-- * <p/>
-+ * 
-  *   protected void runSafely(Runnable r) {
-  *     try {
-  *       lock.acquire();
-@@ -120,7 +120,7 @@
-  *       Thread.currentThread().interrupt();
-  *     }
-  *   }
-- * <p/>
-+ * 
-  *   public void changeState(double d) {
-  *     runSafely(new Runnable() {
-  *       public void run() { state_ = updateFunction(d); }
-@@ -129,7 +129,7 @@
-  *   // ...
-  * }
-  * </pre>
-- * <p/>
-+ * <p>
-  * One reason to bother with such constructions is to use deadlock-
-  * avoiding back-offs when dealing with locks involving multiple objects.
-  * For example, here is a Cell class that uses attempt to back-off
-@@ -161,7 +161,7 @@
-  *   }
-  * }
-  * </pre>
-- * <p/>
-+ * <p>
-  * Here is an even fancier version, that uses lock re-ordering
-  * upon conflict:
-  * <pre>
-@@ -184,10 +184,10 @@
-  *     finally { lock.release(); }
-  *     return false;
-  *   }
-- * <p/>
-+ * 
-  *  void swapValue(Cell other) {
-  *    try {
-- *      while (!trySwap(this, other) &&
-+ *      while (!trySwap(this, other) &amp;&amp;
-  *            !tryswap(other, this))
-  *        Thread.sleep(1);
-  *    }
-@@ -195,34 +195,34 @@
-  *  }
-  * }
-  * </pre>
-- * <p/>
-+ * <p>
-  * Interruptions are in general handled as early as possible.
-  * Normally, InterruptionExceptions are thrown
-  * in acquire and attempt(msec) if interruption
-  * is detected upon entry to the method, as well as in any
-  * later context surrounding waits.
-  * However, interruption status is ignored in release();
-- * <p/>
-+ * <p>
-  * Timed versions of attempt report failure via return value.
-  * If so desired, you can transform such constructions to use exception
-  * throws via
-  * <pre>
-  *   if (!c.attempt(timeval)) throw new TimeoutException(timeval);
-  * </pre>
-- * <p/>
-+ * <p>
-  * The TimoutSync wrapper class can be used to automate such usages.
-- * <p/>
-+ * <p>
-  * All time values are expressed in milliseconds as longs, which have a maximum
-  * value of Long.MAX_VALUE, or almost 300,000 centuries. It is not
-  * known whether JVMs actually deal correctly with such extreme values.
-  * For convenience, some useful time values are defined as static constants.
-- * <p/>
-+ * <p>
-  * All implementations of the three Sync methods guarantee to
-  * somehow employ Java <code>synchronized</code> methods or blocks,
-  * and so entail the memory operations described in JLS
-  * chapter 17 which ensure that variables are loaded and flushed
-  * within before/after constructions.
-- * <p/>
-+ * <p>
-  * Syncs may also be used in spinlock constructions. Although
-  * it is normally best to just use acquire(), various forms
-  * of busy waits can be implemented. For a simple example
-@@ -234,7 +234,7 @@
-  *     // Two phase.
-  *     // First spin without pausing.
-  *     int purespins = 10;
-- *     for (int i = 0; i < purespins; ++i) {
-+ *     for (int i = 0; i &lt; purespins; ++i) {
-  *       if (lock.attempt(0))
-  *         return true;
-  *     }
-@@ -249,14 +249,14 @@
-  *   }
-  * }
-  * </pre>
-- * <p/>
-+ * <p>
-  * In addition pure synchronization control, Syncs
-  * may be useful in any context requiring before/after methods.
-  * For example, you can use an ObservableSync
-  * (perhaps as part of a LayeredSync) in order to obtain callbacks
-  * before and after each method invocation for a given class.
-- * <p/>
-- * <p/>
-+ * <p>
-+ * <p>
-  * <p>[<a href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html"> Introduction to this package. </a>]
-  */
- public interface Sync {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/CacheConfiguration.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/CacheConfiguration.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/CacheConfiguration.java	2015-06-17 16:00:39.938102236 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/CacheConfiguration.java	2015-06-17 13:39:07.988887821 +0200
-@@ -42,17 +42,17 @@
- 
- /**
-  * A value object used to represent cache configuration.
-- * <h4>Construction Patterns</h4>
-+ * <h3>Construction Patterns</h3>
-  * The recommended way of creating a <code>Cache</code> in Ehcache 2.0 and above is to create a <code>CacheConfiguration</code> object
-  * and pass it to the <code>Cache</code> constructor. See {@link net.sf.ehcache.Cache#Cache(CacheConfiguration)}.
-- * <p/>
-+ * 
-  * This class supports setter injection and also the fluent builder pattern.
-  * e.g.
-  * <code>Cache cache = new Cache(new CacheConfiguration("test2", 1000).eternal(true).memoryStoreEvictionPolicy(MemoryStoreEvictionPolicy.FIFO));</code>
-- * <p/>
-+ * 
-  * Rather than proliferation of new constructors as new versions of Ehcache come out, it intended to add the new configuration to this
-  * class.
-- * <p/>
-+ * 
-  * Another way to set configuration is declaratively in the <code>ehcache.xml</code> configuration file.
-  * e.g.
-  * <pre>{@code
-@@ -67,7 +67,7 @@
-  *   maxEntriesLocalDisk="10000"
-  * />
-  * }</pre>
-- * <p/>
-+ * 
-  * <h4>Dynamic Configuration</h4>
-  * CacheConfiguration instances retrieved from Cache instances allow the dynamic
-  * modification of certain configuration properties.  Currently the dynamic
-@@ -208,14 +208,14 @@
- 
-     /**
-      * the maximum objects to be held in the {@link net.sf.ehcache.store.MemoryStore}.
--     * <p/>
-+     * 
-      * <code>0</code> translates to no-limit.
-      */
-     protected volatile Integer maxEntriesLocalHeap;
- 
-     /**
-      * the maximum objects to be held in the {@link net.sf.ehcache.store.disk.DiskStore}.
--     * <p/>
-+     * 
-      * <code>0</code> translates to no-limit.
-      */
-     protected volatile int maxElementsOnDisk = DEFAULT_MAX_ELEMENTS_ON_DISK;
-@@ -288,7 +288,7 @@
- 
-     /**
-      * The interval in seconds between runs of the disk expiry thread.
--     * <p/>
-+     * 
-      * 2 minutes is the default.
-      * This is not the same thing as time to live or time to idle. When the thread runs it checks
-      * these things. So this value is how often we check for expiry.
-@@ -393,7 +393,7 @@
- 
-     /**
-      * Default constructor.
--     * <p/>
-+     * 
-      * Note that an empty Cache is not valid and must have extra configuration added which can be done
-      * through the fluent methods in this class. Call <code>validateConfiguration()</code> to check your configuration.
-      *
-@@ -405,7 +405,7 @@
- 
-     /**
-      * Create a new cache configuration.
--     * <p/>
-+     * 
-      * Extra configuration can added after construction via the fluent methods in this class.
-      * Call <code>validateConfiguration()</code> to check your configuration.
-      *
-@@ -533,7 +533,7 @@
- 
-     /**
-      * Enables or disables logging for the cache
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      * Only used when cache is clustered with Terracotta
-      *
-@@ -644,7 +644,7 @@
- 
-     /**
-      * Builder to enable or disable logging for the cache
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      * Only used when cache is clustered with Terracotta
-      *
-@@ -659,7 +659,7 @@
- 
-     /**
-      * Sets the maximum objects to be held in memory (0 = no limit).
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param maxElementsInMemory The maximum number of elements in memory, before they are evicted (0 == no limit)
-@@ -672,7 +672,7 @@
- 
-     /**
-      * Sets the maximum objects to be held in local heap memory (0 = no limit).
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param maxEntriesInMemory The maximum number of elements in memory, before they are evicted (0 == no limit)
-@@ -698,7 +698,7 @@
- 
-     /**
-      * Builder that sets the maximum objects to be held in memory (0 = no limit).
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param maxElementsInMemory The maximum number of elements in memory, before they are evicted (0 == no limit)
-@@ -713,7 +713,7 @@
- 
-     /**
-      * Builder that sets the maximum objects to be held in memory (0 = no limit).
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param maxElementsInMemory The maximum number of elements in memory, before they are evicted (0 == no limit)
-@@ -861,7 +861,7 @@
-     /**
-      * Sets the time to idle for an element before it expires. Is only used if the element is not eternal. This can be overidden in
-      * {@link net.sf.ehcache.Element}
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param timeToIdleSeconds the default amount of time to live for an element from its last accessed or modified date
-@@ -879,7 +879,7 @@
-     /**
-      * Builder which sets the time to idle for an element before it expires. Is only used if the element is not eternal.
-      * This default can be overridden in {@link net.sf.ehcache.Element}
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param timeToIdleSeconds the default amount of time to live for an element from its last accessed or modified date
-@@ -894,7 +894,7 @@
-     /**
-      * Sets the time to idle for an element before it expires. Is only used if the element is not eternal.
-      * This default can be overridden in {@link net.sf.ehcache.Element}
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param timeToLiveSeconds the default amount of time to live for an element from its creation date
-@@ -912,7 +912,7 @@
-     /**
-      * Builder which sets the time to idle for an element before it expires. Is only used if the element is not eternal.
-      * This default can be overridden in {@link net.sf.ehcache.Element}
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param timeToLiveSeconds the default amount of time to live for an element from its creation date
-@@ -1041,7 +1041,7 @@
- 
-     /**
-      * Sets the maximum number elements on Disk. 0 means unlimited.
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param maxElementsOnDisk the maximum number of Elements to allow on the disk. 0 means unlimited.
-@@ -1059,7 +1059,7 @@
- 
-     /**
-      * Sets the maximum number elements on Disk. 0 means unlimited.
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param maxEntriesOnDisk the maximum number of Elements to allow on the disk. 0 means unlimited.
-@@ -1081,7 +1081,7 @@
- 
-     /**
-      * Builder which sets the maximum number elements on Disk. 0 means unlimited.
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param maxElementsOnDisk the maximum number of Elements to allow on the disk. 0 means unlimited.
-@@ -1095,7 +1095,7 @@
- 
-     /**
-      * Builder which sets the maximum number elements on Disk. 0 means unlimited.
--     * <p/>
-+     * 
-      * This property can be modified dynamically while the cache is operating.
-      *
-      * @param maxElementsOnDisk the maximum number of Elements to allow on the disk. 0 means unlimited.
-@@ -1109,7 +1109,7 @@
- 
-     /**
-      * Sets the interval in seconds between runs of the disk expiry thread.
--     * <p/>
-+     * 
-      * 2 minutes is the default.
-      * This is not the same thing as time to live or time to idle. When the thread runs it checks
-      * these things. So this value is how often we check for expiry.
-@@ -1125,7 +1125,7 @@
- 
-     /**
-      * Builder which sets the interval in seconds between runs of the disk expiry thread.
--     * <p/>
-+     * 
-      * 2 minutes is the default.
-      * This is not the same thing as time to live or time to idle. When the thread runs it checks
-      * these things. So this value is how often we check for expiry.
-@@ -2086,7 +2086,7 @@
- 
-     /**
-      * Add the CacheExceptionHandlerFactory to the configuration.
--     * <p/>
-+     * 
-      * Note that this will not have any effect when creating a cache solely through its constructed. The exception
-      * handler will only be taken into account when {@link ConfigurationHelper} is used, for example through
-      * {@link net.sf.ehcache.CacheManager}.
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/CacheWriterConfiguration.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/CacheWriterConfiguration.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/CacheWriterConfiguration.java	2012-10-27 06:33:18.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/CacheWriterConfiguration.java	2015-06-17 13:40:06.554996192 +0200
-@@ -195,9 +195,9 @@
- 
-     /**
-      * Sets whether to notify listeners when an exception occurs on a writer operation.
--     * <p/>
-+     * 
-      * This is only applicable to write through mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_NOTIFY_LISTENERS_ON_EXCEPTION}.
-      *
-      * @param notifyListenersOnException {@code true} if listeners should be notified when an exception occurs on a writer operation; {@code false} otherwise
-@@ -228,9 +228,9 @@
-      * amount of time, work is always being built up. If the minimum write delay is set to zero and the {@code CacheWriter}
-      * performs its work very quickly, the overhead of processing the write behind queue items becomes very noticeable
-      * in a cluster since all the operations might be done for individual items instead of for a collection of them.
--     * <p/>
-+     * 
-      * This is only applicable to write behind mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_MIN_WRITE_DELAY}).
-      *
-      * @param minWriteDelay the minimum number of seconds to wait before writing behind
-@@ -262,9 +262,9 @@
-     /**
-      * Set the maximum number of seconds to wait before writing behind. If set to a value greater than 0, it permits
-      * operations to build up in the queue to enable effective coalescing and batching optimisations.
--     * <p/>
-+     * 
-      * This is only applicable to write behind mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_MAX_WRITE_DELAY}).
-      *
-      * @param maxWriteDelay the maximum number of seconds to wait before writing behind
-@@ -295,9 +295,9 @@
- 
-     /**
-      * Sets the maximum number of write operations to allow per second when {@link #writeBatching} is enabled.
--     * <p/>
-+     * 
-      * This is only applicable to write behind mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_RATE_LIMIT_PER_SECOND}.
-      *
-      * @param rateLimitPerSecond the number of write operations to allow; use a number {@code &lt;=0} to disable rate limiting.
-@@ -330,9 +330,9 @@
-      * Sets whether to use write coalescing. If set to {@code true} and multiple operations on the same key are present
-      * in the write-behind queue, only the latest write is done, as the others are redundant. This can dramatically
-      * reduce load on the underlying resource.
--     * <p/>
-+     * 
-      * This is only applicable to write behind mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_WRITE_COALESCING}.
-      *
-      * @param writeCoalescing {@code true} to enable write coalescing; or {@code false} to disable it
-@@ -362,9 +362,9 @@
-      * Sets whether to batch write operations. If set to {@code true}, {@link net.sf.ehcache.writer.CacheWriter#writeAll} and {@code CacheWriter#deleteAll}
-      * will be called rather than {@link net.sf.ehcache.writer.CacheWriter#write} and {@link net.sf.ehcache.writer.CacheWriter#delete} being called for each key. Resources such
-      * as databases can perform more efficiently if updates are batched, thus reducing load.
--     * <p/>
-+     * 
-      * This is only applicable to write behind mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_WRITE_BATCHING}.
-      *
-      * @param writeBatching {@code true} if write operations should be batched; {@code false} otherwise
-@@ -392,9 +392,9 @@
-     /**
-      * Sets the number of operations to include in each batch when {@link #writeBatching} is enabled. If there are less
-      * entries in the write-behind queue than the batch size, the queue length size is used.
--     * <p/>
-+     * 
-      * This is only applicable to write behind mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_WRITE_BATCH_SIZE}.
-      *
-      * @param writeBatchSize the number of operations to include in each batch; numbers smaller than {@code 1} will cause
-@@ -427,9 +427,9 @@
-     /**
-      * Sets the number of times the operation is retried in the {@code CacheWriter}, this happens after the
-      * original operation.
--     * <p/>
-+     * 
-      * This is only applicable to write behind mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_RETRY_ATTEMPTS}.
-      *
-      * @param retryAttempts the number of retries for a particular element
-@@ -460,9 +460,9 @@
- 
-     /**
-      * Sets the number of seconds to wait before retrying an failed operation.
--     * <p/>
-+     * 
-      * This is only applicable to write behind mode.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_RETRY_ATTEMPT_DELAY_SECONDS}.
-      *
-      * @param retryAttemptDelaySeconds the number of seconds to wait before retrying an operation
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/ConfigurationHelper.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/ConfigurationHelper.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/ConfigurationHelper.java	2012-05-31 17:56:57.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/ConfigurationHelper.java	2015-06-17 13:41:33.193718514 +0200
-@@ -48,7 +48,7 @@
- 
- /**
-  * The configuration for ehcache.
-- * <p/>
-+ * 
-  * This class can be populated through:
-  * <ul>
-  * <li>introspection by {@link ConfigurationFactory} or
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/Configuration.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/Configuration.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/Configuration.java	2012-08-18 03:07:15.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/Configuration.java	2015-06-17 13:41:08.486938380 +0200
-@@ -199,7 +199,7 @@
- 
-     /**
-      * Empty constructor, which is used by {@link ConfigurationFactory}, and can be also used programmatically.
--     * <p/>
-+     * 
-      * If you are using it programmtically you need to call the relevant add and setter methods in this class to populate everything.
-      */
-     public Configuration() {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/DiskStoreConfiguration.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/DiskStoreConfiguration.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/DiskStoreConfiguration.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/DiskStoreConfiguration.java	2015-06-17 13:42:31.286850238 +0200
-@@ -25,7 +25,7 @@
- 
- /**
-  * A class to represent DiskStore configuration
-- * e.g. <diskStore path="${java.io.tmpdir}" />
-+ * e.g. diskStore path="${java.io.tmpdir}"
-  *
-  * @author <a href="mailto:gluck@thoughtworks.com">Greg Luck</a>
-  * @version $Id: DiskStoreConfiguration.java 5631 2012-05-10 08:31:33Z teck $
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/generator/ConfigurationGenerator.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/generator/ConfigurationGenerator.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/generator/ConfigurationGenerator.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/generator/ConfigurationGenerator.java	2015-06-17 14:35:55.236265420 +0200
-@@ -24,11 +24,11 @@
- /**
-  * Utility class for generating configuration texts.
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @deprecated Use {@link ConfigurationUtil#generateCacheManagerConfigurationText(Configuration)} or
-- *             {@link ConfigurationUtil#generateCacheConfigurationText(CacheConfiguration)} instead
-+ *             ConfigurationUtil#generateCacheConfigurationText(CacheConfiguration) instead
-  */
- @Deprecated
- public class ConfigurationGenerator {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/generator/ConfigurationSource.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/generator/ConfigurationSource.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/generator/ConfigurationSource.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/generator/ConfigurationSource.java	2015-06-17 13:45:46.310221203 +0200
-@@ -28,7 +28,7 @@
- /**
-  * Class encapsulating the source of configuration for a cache manager
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/generator/ConfigurationUtil.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/generator/ConfigurationUtil.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/generator/ConfigurationUtil.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/generator/ConfigurationUtil.java	2015-06-17 13:46:01.503471055 +0200
-@@ -31,7 +31,7 @@
- /**
-  * Utility class with static methods for generating configuration texts in different ways based on input
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/ManagementRESTServiceConfiguration.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/ManagementRESTServiceConfiguration.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/ManagementRESTServiceConfiguration.java	2012-09-10 11:55:28.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/ManagementRESTServiceConfiguration.java	2015-06-17 13:42:58.514505906 +0200
-@@ -75,7 +75,7 @@
-     /**
-      * Returns the security service location required for trusted identity assertion to the embedded REST management
-      * service.  This feature is only available with an enterprise license.
--     * <p/>
-+     * 
-      * If this value is set, then this service will require secure dialog with the TMS or other 3rd party REST client
-      * implementations. The service furnished by the enterprise version of the TMC is located is provided at /api/assertIdentity.
-      *
-@@ -89,7 +89,7 @@
-     /**
-      * Sets the security service location required for trusted identity assertion to the embedded REST management
-      * service.  This feature is only available with an enterprise license.
--     * <p/>
-+     * 
-      * If this value is set, then this service will require secure dialog with the TMS or other 3rd party REST client
-      * implementations. The service furnished by the enterprise version of the TMC is located is provided at /api/assertIdentity.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/TerracottaClientConfiguration.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/TerracottaClientConfiguration.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/TerracottaClientConfiguration.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/TerracottaClientConfiguration.java	2015-06-17 14:34:49.695388020 +0200
-@@ -92,8 +92,8 @@
-     }
- 
-     /**
--     * Tell the BeanHandler to extract the entire subtree xml as text at element <tc-config/>. Expects
--     * to receive the contents of the <tc-config/> tag and will wrap it in a proper tc-config header / footer.
-+     * Tell the BeanHandler to extract the entire subtree xml as text at element tc-config. Expects
-+     * to receive the contents of the tc-config tag and will wrap it in a proper tc-config header / footer.
-      */
-     public final void extractTcconfig(String text) {
-         this.embeddedConfig = text;
-@@ -101,7 +101,7 @@
-     }
- 
-     /**
--     * Get the embedded config read as <tc-config/>
-+     * Get the embedded config read as tc-config
-      */
-     public final String getEmbeddedConfig() {
-         return TC_CONFIG_HEADER + embeddedConfig + TC_CONFIG_FOOTER;
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/TerracottaConfiguration.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/TerracottaConfiguration.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/config/TerracottaConfiguration.java	2012-10-16 21:12:53.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/config/TerracottaConfiguration.java	2015-06-17 13:44:46.105193751 +0200
-@@ -168,7 +168,7 @@
- 
-     /**
-      * Indicates whether to cluster this cache with Terracotta.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_CLUSTERED}.
-      *
-      * @param clustered
-@@ -277,7 +277,7 @@
-     /**
-      * Sets whether this cache should use coherent reads (usually should be {@value #DEFAULT_COHERENT_READS} unless optimizing for
-      * read-only).
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_COHERENT_READS}.
-      *
-      * @param coherentReads
-@@ -343,10 +343,10 @@
- 
-     /**
-      * Sets whether this cache should perform orphan eviction (usually should be {@value #DEFAULT_ORPHAN_EVICTION}).
--     * <p/>
-+     * 
-      * Orphans are elements that are not present on any node in the cluster anymore and hence need additional routines to be detected since
-      * they're not locally available anywhere.
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_ORPHAN_EVICTION}.
-      *
-      * @param orphanEviction
-@@ -374,7 +374,7 @@
- 
-     /**
-      * Set how often this cache should perform orphan eviction (measured in regular eviction periods).
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_ORPHAN_EVICTION_PERIOD}).
-      *
-      * @param orphanEvictionPeriod
-@@ -403,7 +403,7 @@
-     /**
-      * Sets whether this cache should use an unclustered local key cache (usually should be {@value #DEFAULT_LOCAL_KEY_CACHE} unless
-      * optimizing for a small read-only cache)
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_LOCAL_KEY_CACHE}.
-      *
-      * @param localKeyCache
-@@ -431,7 +431,7 @@
- 
-     /**
-      * Sets maximum size of the local key cache (usually the size of the key set of the cache or cache partition).
--     * <p/>
-+     * 
-      * Defaults to {@value #DEFAULT_LOCAL_KEY_CACHE_SIZE}.
-      *
-      * @param localKeyCacheSize
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/BlockingCache.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/BlockingCache.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/BlockingCache.java	2012-06-29 20:12:01.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/BlockingCache.java	2015-06-17 13:09:59.316321277 +0200
-@@ -33,31 +33,31 @@
- 
- /**
-  * A blocking decorator for an Ehcache, backed by a {@link Ehcache}.
-- * <p/>
-+ * 
-  * It allows concurrent read access to elements already in the cache. If the element is null, other
-  * reads will block until an element with the same key is put into the cache.
-- * <p/>
-+ * 
-  * This is useful for constructing read-through or self-populating caches.
-- * <p/>
-+ * 
-  * This implementation uses the {@link net.sf.ehcache.concurrent.ReadWriteLockSync} class. If you wish to use
-  * this class, you will need the concurrent package in your class path.
-- * <p/>
-+ * 
-  * It features:
-  * <ul>
-  * <li>Excellent liveness.
-  * <li>Fine-grained locking on each element, rather than the cache as a whole.
-  * <li>Scalability to a large number of threads.
-  * </ul>
-- * <p/>
-+ * 
-  * "Hashtable / synchronizedMap uses the "one big fat lock" approach to guard the mutable state of the map.
-  * That works, but is a big concurrency bottleneck, as you've observed.  You went to the opposite extreme, one lock per key.
-  * That works (as long as you've got sufficient synchronization in the cache itself to protect its own data structures.)
-- * <p/>
-+ * 
-  * Lock striping is a middle ground, partitioning keys into a fixed number of subsets, like the trick used at large
-  * theaters for will-call ticket pickup -- there are separate lines for "A-F, G-M, N-R, and S-Z".
-  * This way, there are a fixed number of locks, each guarding (hopefully) 1/Nth of the keys."
-  * - Brian Goetz
-- * <p/>
-+ * 
-  * Further improvements to hashing suggested by Joe Bowbeer.
-  *
-  * @author Greg Luck
-@@ -129,13 +129,13 @@
-     /**
-      * Looks up an entry.  Blocks if the entry is null until a call to {@link #put} is done
-      * to put an Element in.
--     * <p/>
-+     * 
-      * If a put is not done, the lock is never released.
--     * <p/>
-+     * 
-      * If this method throws an exception, it is the responsibility of the caller to catch that exception and call
-      * <code>put(new Element(key, null));</code> to release the lock acquired. See {@link net.sf.ehcache.constructs.blocking.SelfPopulatingCache}
-      * for an example.
--     * <p/>
-+     * 
-      * Note. If a LockTimeoutException is thrown while doing a <code>get</code> it means the lock was never acquired,
-      * therefore it is a threading error to call {@link #put}
-      *
-@@ -294,7 +294,7 @@
- 
-     /**
-      * Gets an element from the cache. Updates Element Statistics
--     * <p/>
-+     * 
-      * Note that the Element's lastAccessTime is always the time of this get.
-      * Use {@link #getQuiet(Object)} to peak into the Element to see its last access time with get
-      *
-@@ -310,7 +310,7 @@
- 
-     /**
-      * Synchronized version of getName to test liveness of the object lock.
--     * <p/>
-+     * 
-      * The time taken for this method to return is a useful measure of runtime contention on the cache.
-      *
-      * @return the name of the cache.
-@@ -321,7 +321,7 @@
- 
-     /**
-      * Sets the time to wait to acquire a lock. This may be modified at any time.
--     * <p/>
-+     * 
-      * The consequences of setting a timeout are:
-      * <ol>
-      * <li>if a lock cannot be acquired in the given time a LockTimeoutException is thrown.
-@@ -361,7 +361,7 @@
- 
-     /**
-      * Register a {@link CacheLoader} with the cache. It will then be tied into the cache lifecycle.
--     * <p/>
-+     * 
-      * If the CacheLoader is not initialised, initialise it.
-      *
-      * @param cacheLoader A Cache Loader to register
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/LockTimeoutException.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/LockTimeoutException.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/LockTimeoutException.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/LockTimeoutException.java	2015-06-17 13:10:42.850305747 +0200
-@@ -22,11 +22,11 @@
- /**
-  * Indicates that a timeout has occured while attempting to obtain a lock using
-  * {@link net.sf.ehcache.concurrent.ReadWriteLockSync#tryLock(net.sf.ehcache.concurrent.LockType, long)}
-- * <p/>
-+ * 
-  * This is a normal runtime exception which should be handled by calling code.
-  * It is possible that simply reattempting to obtain the lock may succeed.
-  * Timeouts are often caused by overloaded resources.
-- * <p/>
-+ * 
-  * The frequency of these Exceptions may be reduced by increasing the timeout
-  * if appropriate.
-  * @author Greg Luck
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java	2015-06-17 13:11:02.434399045 +0200
-@@ -29,13 +29,13 @@
- 
- /**
-  * A selfpopulating decorator for {@link Ehcache} that creates entries on demand.
-- * <p/>
-+ * 
-  * Clients of the cache simply call it without needing knowledge of whether
-  * the entry exists in the cache.
-- * <p/>
-+ * 
-  * The cache is designed to be refreshed. Refreshes operate on the backing cache, and do not
-  * degrade performance of {@link #get(java.io.Serializable)} calls.
-- * <p/>
-+ * 
-  * Thread safety depends on the factory being used. The UpdatingCacheEntryFactory should be made
-  * thread safe. In addition users of returned values should not modify their contents.
-  *
-@@ -86,14 +86,14 @@
- 
-     /**
-      * Refresh the elements of this cache.
--     * <p/>
-+     * 
-      * Refreshes bypass the {@link BlockingCache} and act directly on the backing {@link Ehcache}.
-      * This way, {@link BlockingCache} gets can continue to return stale data while the refresh, which
-      * might be expensive, takes place.
--     * <p/>
-+     * 
-      * Quiet methods are used, so that statistics are not affected.
-      * Note that the refreshed elements will not be replicated to any cache peers.
--     * <p/>
-+     * 
-      * Configure ehcache.xml to stop elements from being refreshed forever:
-      * <ul>
-      * <li>use timeToIdle to discard elements unused for a period of time
-@@ -108,14 +108,14 @@
- 
-     /**
-      * Refresh the elements of this cache.
--     * <p/>
-+     * 
-      * Refreshes bypass the {@link BlockingCache} and act directly on the backing {@link Ehcache}.
-      * This way, {@link BlockingCache} gets can continue to return stale data while the refresh, which
-      * might be expensive, takes place.
--     * <p/>
-+     * 
-      * Quiet methods are used if argument 0 is true, so that statistics are not affected,
-      * but note that replication will then not occur
--     * <p/>
-+     * 
-      * Configure ehcache.xml to stop elements from being refreshed forever:
-      * <ul>
-      * <li>use timeToIdle to discard elements unused for a period of time
-@@ -168,13 +168,13 @@
- 
-     /**
-      * Refresh a single element.
--     * <p/>
-+     * 
-      * Refreshes bypass the {@link BlockingCache} and act directly on the backing {@link Ehcache}.
-      * This way, {@link BlockingCache} gets can continue to return stale data while the refresh, which
-      * might be expensive, takes place.
--     * <p/>
-+     * 
-      * If the element is absent it is created
--     * <p/>
-+     * 
-      * Quiet methods are used, so that statistics are not affected.
-      * Note that the refreshed element will not be replicated to any cache peers.
-      *
-@@ -189,13 +189,13 @@
- 
-     /**
-      * Refresh a single element.
--     * <p/>
-+     * 
-      * Refreshes bypass the {@link BlockingCache} and act directly on the backing {@link Ehcache}.
-      * This way, {@link BlockingCache} gets can continue to return stale data while the refresh, which
-      * might be expensive, takes place.
--     * <p/>
-+     * 
-      * If the element is absent it is created
--     * <p/>
-+     * 
-      * Quiet methods are used if argument 1 is true, so that statistics are not affected,
-      * but note that replication will then not occur
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/UpdatingCacheEntryFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/UpdatingCacheEntryFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/UpdatingCacheEntryFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/UpdatingCacheEntryFactory.java	2015-06-17 13:11:30.054120311 +0200
-@@ -34,7 +34,7 @@
-      * Perform an incremental update of data within a CacheEntry.
-      * Based on identification of dirty values within a CacheEntry
-      * Insert Update or Delete those entries based on the existing value.
--     * <p/>
-+     * 
-      * This method does not return a modified value, because it modifies the value passed into it, relying
-      * on the pass by reference feature of Java.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java	2015-06-17 13:11:51.083146713 +0200
-@@ -30,11 +30,11 @@
- 
- /**
-  * A {@link net.sf.ehcache.Cache} backed cache that creates entries on demand.
-- * <p/>
-+ * 
-  * Clients of the cache simply call it without needing knowledge of whether
-  * the entry exists in the cache, or whether it needs updating before use.
-- * <p/>
-- * <p/>
-+ * 
-+ * 
-  * Thread safety depends on the factory being used. The UpdatingCacheEntryFactory should be made
-  * thread safe. In addition users of returned values should not modify their contents.
-  *
-@@ -55,10 +55,10 @@
- 
-     /**
-      * Looks up an object.
--     * <p/>
-+     * 
-      * If null, it creates it. If not null, it updates it. For performance this method should only be
-      * used with {@link UpdatingCacheEntryFactory}'s
--     * <p/>
-+     * 
-      * It is expected that
-      * gets, which update as part of the get, might take considerable time. Access to the cache cannot be blocked
-      * while that is happening. This method is therefore not synchronized. Sync's are used for thread safety based on key
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/CacheDecoratorFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/CacheDecoratorFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/CacheDecoratorFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/CacheDecoratorFactory.java	2015-06-17 13:08:53.054389062 +0200
-@@ -35,7 +35,7 @@
- 
-     /**
-      * Creates a decorated {@link Ehcache} using the properties specified for configuring the decorator.
--     * <p />
-+     * 
-      * If the returned decorated cache has the same name as the underlying cache, then the original cache will be replaced by this new
-      * decorated cache in the CacheManager.
-      * 
-@@ -51,7 +51,7 @@
-     /**
-      * This method is called when the factory is specified for the defaultCache in the config.
-      * Create the decorated {@link Ehcache} using the properties specified.
--     * <p />
-+     * 
-      * If the returned decorated cache has the same name as the underlying cache, then the original cache will be replaced by this new
-      * decorated cache in the CacheManager.
-      * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/nonstop/concurrency/NonStopCacheKeySet.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/nonstop/concurrency/NonStopCacheKeySet.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/nonstop/concurrency/NonStopCacheKeySet.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/nonstop/concurrency/NonStopCacheKeySet.java	2015-06-17 13:16:08.566225800 +0200
-@@ -39,7 +39,7 @@
-     /**
-      * Non stop store to iterate over key set
-      * @param nonstopActiveDelegateHolder
--     * @param list
-+     * param list
-      */
-     public NonStopCacheKeySet(NonstopActiveDelegateHolder nonstopActiveDelegateHolder, List keys) {
-         this.nonstopStore = nonstopActiveDelegateHolder.getNonstopStore();
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/nonstop/store/ExecutorServiceStore.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/nonstop/store/ExecutorServiceStore.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/nonstop/store/ExecutorServiceStore.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/nonstop/store/ExecutorServiceStore.java	2015-06-17 13:12:19.846815017 +0200
-@@ -54,7 +54,7 @@
-  * This implementation executes all operations using a NonstopExecutorService. On Timeout, uses the
-  * {@link NonstopTimeoutBehaviorStoreResolver} to
-  * resolve the timeout behavior store and execute it.
-- * <p/>
-+ * 
-  *
-  * @author Abhishek Sanoujam
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/nonstop/store/RejoinAwareBlockingOperation.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/nonstop/store/RejoinAwareBlockingOperation.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/nonstop/store/RejoinAwareBlockingOperation.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/nonstop/store/RejoinAwareBlockingOperation.java	2015-06-17 13:14:52.301756681 +0200
-@@ -57,7 +57,7 @@
- 
-     /**
-      * {@inheritDoc}.
--     * <p />
-+     * 
-      * Throws {@link InterruptedException} if the executing thread is interrupted before the call returns
-      */
-     public V call() throws Exception {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/nonstop/store/TransactionalExecutorServiceStore.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/nonstop/store/TransactionalExecutorServiceStore.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/nonstop/store/TransactionalExecutorServiceStore.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/nonstop/store/TransactionalExecutorServiceStore.java	2015-06-17 13:15:17.627584149 +0200
-@@ -39,7 +39,7 @@
- /**
-  * This implementation is identical to TransactionalExecutorServiceStore except that it ensures the transactional context
-  * gets propagated to the executor thread.
-- * <p/>
-+ * 
-  *
-  * @see ExecutorServiceStore
-  * @author Ludovic Orban
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/web/ShutdownListener.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/web/ShutdownListener.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/constructs/web/ShutdownListener.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/constructs/web/ShutdownListener.java	2015-06-17 13:09:17.433260372 +0200
-@@ -31,7 +31,7 @@
- /**
-  * A ServletContextListener that shutsdown CacheManager. Use this when you want to shutdown
-  * ehcache automatically when the web application is shutdown.
-- * <p/>
-+ * 
-  * To receive notification events, this class must be configured in the deployment
-  * descriptor for the web application.
-  *
-@@ -40,7 +40,7 @@
-  * &lt;listener&gt;
-  *      &lt;listener-class&gt;net.sf.ehcache.constructs.web.ShutdownListener&lt;/listener-class&gt;
-  * &lt;/listener&gt;
-- * <p/>
-+ * 
-  * </pre>
-  *
-  * @author Daniel Wiell
-@@ -62,7 +62,7 @@
- 
-     /**
-      * Notification that the servlet context is about to be shut down.
--     * <p/>
-+     * 
-      * Shuts down all cache managers known to {@link CacheManager#ALL_CACHE_MANAGERS}
-      *
-      * @param servletContextEvent
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/DiskStorePathManager.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/DiskStorePathManager.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/DiskStorePathManager.java	2012-07-12 01:48:18.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/DiskStorePathManager.java	2015-06-17 11:45:53.563589301 +0200
-@@ -72,7 +72,7 @@
-     /**
-      * Create a diskstore path manager with provided initial path.
-      *
--     * @param path
-+     * param path
-      */
-     public DiskStorePathManager(String initialPath) {
-         this.initialPath = new File(initialPath);
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerListenerFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerListenerFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerListenerFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerListenerFactory.java	2015-06-17 12:37:54.092054418 +0200
-@@ -23,7 +23,7 @@
- /**
-  * An abstract factory for creating cache manager peer listeners. Implementers should provide their own
-  * concrete factory extending this factory. It can then be configured in ehcache.xml
-- * <p/>
-+ * 
-  * This enables listener plugins.
-  * @author Greg Luck
-  * @version $Id: CacheManagerPeerListenerFactory.java 5631 2012-05-10 08:31:33Z teck $
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/CacheManagerPeerProvider.java	2015-06-17 12:38:16.843983557 +0200
-@@ -71,7 +71,7 @@
-      * the scheme for replication and bootstrap purposes. Each <code>CacheReplicator</code> should lookup
-      * the provider for its scheme type during replication. Similarly a <code>BootstrapCacheLoader</code>
-      * should also look up the provider for its scheme.
--     * <p/>
-+     * 
-      * @since 1.6 introduced to permit multiple distribution schemes to be used in the same CacheManager
-      * @return the well-known scheme name, which is determined by the replication provider author.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/CachePeer.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/CachePeer.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/CachePeer.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/CachePeer.java	2015-06-17 12:38:46.862570677 +0200
-@@ -27,10 +27,10 @@
-  * An interface for a cache peer to which updates are made remotely. The distribution mechanism
-  * is meant to be pluggable. The requirements of RMI force this interface to exten Remote and
-  * throw RemoteException.
-- * <p/>
-+ * 
-  * It is acknowledged that not all implementations will use Remote. Remote is just a marker interface like Serializable,
-  * so nothing specific is required.
-- * <p/>
-+ * 
-  * Non-RMI implementations should be able to use this interface.
-  * Implementations not using RMI should
-  *
-@@ -42,7 +42,7 @@
- 
-     /**
-      * Put an element in the cache.
--     * <p/>
-+     * 
-      * Resets the access statistics on the element, which would be the case if it has previously been
-      * gotten from a cache, and is now being put back.
-      *
-@@ -72,7 +72,7 @@
- 
-     /**
-      * Send the cache peer with an ordered list of {@link EventMessage}s.
--     * <p/>
-+     * 
-      * This enables multiple messages to be delivered in one network invocation.
-      * @param eventMessages a list of type {@link EventMessage}
-      */
-@@ -93,7 +93,7 @@
-     /**
-      * The URL for the remote replicator to connect. The value will only have meaning
-      * for a specific implementation of replicator and remote peer.
--     * <p/>
-+     * 
-      * This method is not meant to be used remotely. The replicator already needs to know this. It has
-      * to throw RemoteException to comply with RMI requirements
-      * @return the URL as a string
-@@ -110,11 +110,11 @@
- 
-     /**
-      * Returns a list of all elements in the cache, whether or not they are expired.
--     * <p/>
-+     * 
-      * The returned keys are unique and can be considered a set.
--     * <p/>
-+     * 
-      * The List returned is not live. It is a copy.
--     * <p/>
-+     * 
-      * The time taken is O(n). On a single cpu 1.8Ghz P4, approximately 8ms is required
-      * for each 1000 entries.
-      *
-@@ -134,7 +134,7 @@
-     /**
-      * Gets a list of elements from the cache, for a list of keys, without updating Element statistics. Time to
-      * idle lifetimes are therefore not affected.
--     * <p/>
-+     * 
-      * Cache statistics are still updated.
-      * @param keys a list of serializable values which represent keys
-      * @return a list of Elements. If an element was not found or null, it will not be in the list.
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/ConfigurableRMIClientSocketFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/ConfigurableRMIClientSocketFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/ConfigurableRMIClientSocketFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/ConfigurableRMIClientSocketFactory.java	2015-06-17 12:39:12.764351563 +0200
-@@ -25,7 +25,7 @@
- /**
-  * Default socket timeouts are unlikely to be suitable for cache replication. Sockets should
-  * fail fast.
-- * <p/>
-+ * 
-  * This class decorates the RMIClientSocketFactory so as to enable customisations to be placed
-  * on newly created sockets.
-  *
-@@ -57,7 +57,7 @@
- 
-     /**
-      * Create a client socket connected to the specified host and port.
--     * <p/>
-+     * 
-      * If necessary this implementation can be changed to specify the outbound address to use
-      * e.g. <code>Socket socket = new Socket(host, port, localInterface , 0);</code>
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/EventMessage.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/EventMessage.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/EventMessage.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/EventMessage.java	2015-06-17 13:22:12.743731434 +0200
-@@ -22,9 +22,9 @@
- 
- /**
-  * An Event Message, in respect of a particular cache.
-- * <p/>
-+ * 
-  * The message is Serializable, so that it can be sent across the network.
-- * <p/>
-+ * 
-  * The value of an Element is referenced with a SoftReference, so that a
-  * value will fail to be delivered in preference to an OutOfMemory error.
-  *
-@@ -66,7 +66,7 @@
-     }
- 
-     /**
--     * @return the key component of the message. null if a {@link #PUT} event
-+     * return the key component of the message. null if a link #PUT event
-      */
-     public final Serializable getSerializableKey() {
-         return key;
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/LegacyEventMessage.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/LegacyEventMessage.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/LegacyEventMessage.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/LegacyEventMessage.java	2015-06-17 12:40:59.162343747 +0200
-@@ -24,9 +24,9 @@
- 
- /**
-  * An Event Message, in respect of a particular cache.
-- * <p/>
-+ * 
-  * The message is Serializable, so that it can be sent across the network.
-- * <p/>
-+ * 
-  * The value of an Element is referenced with a SoftReference, so that a
-  * value will fail to be delivered in preference to an OutOfMemory error.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java	2015-06-17 12:41:24.272161908 +0200
-@@ -30,10 +30,10 @@
- 
- /**
-  * A provider of Peer RMI addresses based off manual configuration.
-- * <p/>
-+ * 
-  * Because there is no monitoring of whether a peer is actually there, the list of peers is dynamically
-  * looked up and verified each time a lookup request is made.
-- * <p/>
-+ * 
-  *
-  * @author Greg Luck
-  * @version $Id: ManualRMICacheManagerPeerProvider.java 5631 2012-05-10 08:31:33Z teck $
-@@ -119,7 +119,7 @@
- 
-     /**
-      * Whether the entry should be considered stale.
--     * <p/>
-+     * 
-      * Manual RMICacheManagerProviders use a static list of urls and are therefore never stale.
-      *
-      * @param date the date the entry was created
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java	2015-06-17 13:20:05.141884431 +0200
-@@ -37,7 +37,7 @@
- 
- /**
-  * Receives heartbeats from any {@link MulticastKeepaliveHeartbeatSender}s out there.
-- * <p/>
-+ * 
-  * Our own multicast heartbeats are ignored.
-  *
-  * @author Greg Luck
-@@ -152,7 +152,7 @@
-         /**
-          * This method forks a new executor to process the received heartbeat in a thread pool.
-          * That way each remote cache manager cannot interfere with others.
--         * <p/>
-+         * 
-          * In the worst case, we have as many concurrent threads as remote cache managers.
-          *
-          * @param rmiUrls
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java	2012-10-30 19:21:49.000000000 +0100
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java	2015-06-17 12:44:11.994314161 +0200
-@@ -31,7 +31,7 @@
- 
- /**
-  * Sends heartbeats to a multicast group containing a compressed list of URLs.
-- * <p/>
-+ * 
-  * You can control how far the multicast packets propagate by setting the badly misnamed "TTL".
-  * Using the multicast IP protocol, the TTL value indicates the scope or range in which a packet may be forwarded.
-  * By convention:
-@@ -172,7 +172,7 @@
- 
-         /**
-          * Creates a gzipped payload.
--         * <p/>
-+         * 
-          * The last gzipped payload is retained and only recalculated if the list of cache peers
-          * has changed.
-          *
-@@ -198,12 +198,12 @@
- 
-         /**
-          * Interrupts this thread.
--         * <p/>
-+         * 
-          * <p> Unless the current thread is interrupting itself, which is
-          * always permitted, the {@link #checkAccess() checkAccess} method
-          * of this thread is invoked, which may cause a {@link
-          * SecurityException} to be thrown.
--         * <p/>
-+         * 
-          * <p> If this thread is blocked in an invocation of the {@link
-          * Object#wait() wait()}, {@link Object#wait(long) wait(long)}, or {@link
-          * Object#wait(long,int) wait(long, int)} methods of the {@link Object}
-@@ -211,19 +211,19 @@
-          * #join(long,int)}, {@link #sleep(long)}, or {@link #sleep(long,int)},
-          * methods of this class, then its interrupt status will be cleared and it
-          * will receive an {@link InterruptedException}.
--         * <p/>
-+         * 
-          * <p> If this thread is blocked in an I/O operation upon an {@link
-          * java.nio.channels.InterruptibleChannel </code>interruptible
-          * channel<code>} then the channel will be closed, the thread's interrupt
-          * status will be set, and the thread will receive a {@link
-          * java.nio.channels.ClosedByInterruptException}.
--         * <p/>
-+         * 
-          * <p> If this thread is blocked in a {@link java.nio.channels.Selector}
-          * then the thread's interrupt status will be set and it will return
-          * immediately from the selection operation, possibly with a non-zero
-          * value, just as if the selector's {@link
-          * java.nio.channels.Selector#wakeup wakeup} method were invoked.
--         * <p/>
-+         * 
-          * <p> If none of the previous conditions hold then this thread's interrupt
-          * status will be set. </p>
-          *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java	2012-10-30 19:21:49.000000000 +0100
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java	2015-06-17 14:20:55.751120089 +0200
-@@ -33,7 +33,7 @@
- 
- /**
-  * A peer provider which discovers peers using Multicast.
-- * <p/>
-+ * <p>
-  * Hosts can be in three different levels of conformance with the Multicast specification (RFC1112), according to the requirements they meet.
-  * <ol>
-  * <li>Level 0 is the "no support for IP Multicasting" level. Lots of hosts and routers in the Internet are in this state,
-@@ -48,7 +48,7 @@
-  * They must know the way to join and leave multicast groups and to propagate this information to multicast routers.
-  * Thus, they must include an Internet Group Management Protocol (IGMP) implementation in their TCP/IP stack.
-  * </ol>
-- * <p/>
-+ * <p>
-  * The list of CachePeers is maintained via heartbeats. rmiUrls are looked up using RMI and converted to CachePeers on
-  * registration. On lookup any stale references are removed.
-  *
-@@ -102,7 +102,7 @@
- 
-     /**
-      * Register a new peer, but only if the peer is new, otherwise the last seen timestamp is updated.
--     * <p/>
-+     * <p>
-      * This method is thread-safe. It relies on peerUrls being a synchronizedMap
-      *
-      * @param rmiUrl
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RemoteCacheException.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RemoteCacheException.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RemoteCacheException.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RemoteCacheException.java	2015-06-17 12:44:49.282573458 +0200
-@@ -20,7 +20,7 @@
- 
- /**
-  * A Cache Exception in the distribution mechanism.
-- * <p/>
-+ * 
-  * A RemoteCacheException may not always matter to an application, which may want to ignore it.
-  *
-  * @author Greg Luck
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java	2015-06-17 14:22:46.607838481 +0200
-@@ -35,16 +35,16 @@
- /**
-  * Listens to {@link net.sf.ehcache.CacheManager} and {@link net.sf.ehcache.Cache} events and propagates those to
-  * {@link CachePeer} peers of the Cache asynchronously.
-- * <p/>
-+ * 
-  * Updates are guaranteed to be replicated in the order in which they are received.
-- * <p/>
-+ * 
-  * While much faster in operation than {@link RMISynchronousCacheReplicator}, it does suffer from a number
-  * of problems. Elements, which may be being spooled to DiskStore may stay around in memory because references
-  * are being held to them from {@link EventMessage}s which are queued up. The replication thread runs once
-  * per second, limiting the build up. However a lot of elements can be put into a cache in that time. We do not want
-  * to get an {@link OutOfMemoryError} using distribution in circumstances when it would not happen if we were
-  * just using the DiskStore.
-- * <p/>
-+ * 
-  * Accordingly, the Element values in {@link EventMessage}s are held by {@link java.lang.ref.SoftReference} in the queue,
-  * so that they can be discarded if required by the GC to avoid an {@link OutOfMemoryError}. A log message
-  * will be issued on each flush of the queue if there were any forced discards. One problem with GC collection
-@@ -106,7 +106,7 @@
- 
-     /**
-      * RemoteDebugger method for the replicationQueue thread.
--     * <p/>
-+     * 
-      * Note that the replicationQueue thread locks the cache for the entire time it is writing elements to the disk.
-      */
-     private void replicationThreadMain() {
-@@ -134,7 +134,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * 
-      * This implementation queues the put notification for in-order replication to peers.
-      *
-      * @param cache   the cache emitting the notification
-@@ -173,10 +173,10 @@
-     /**
-      * Called immediately after an element has been put into the cache and the element already
-      * existed in the cache. This is thus an update.
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.Cache#put(net.sf.ehcache.Element)} method
-      * will block until this method returns.
--     * <p/>
-+     * 
-      * Implementers may wish to have access to the Element's fields, including value, so the element is provided.
-      * Implementers should be careful not to modify the element. The effect of any modifications is undefined.
-      *
-@@ -214,11 +214,11 @@
-     /**
-      * Called immediately after an attempt to remove an element. The remove method will block until
-      * this method returns.
--     * <p/>
-+     * 
-      * This notification is received regardless of whether the cache had an element matching
-      * the removal key or not. If an element was removed, the element is passed to this method,
-      * otherwise a synthetic element, with only the key set is passed in.
--     * <p/>
-+     * 
-      *
-      * @param cache   the cache emitting the notification
-      * @param element the element just deleted, or a synthetic element with just the key set if
-@@ -248,7 +248,7 @@
-      * elements have been removed from the cache in a bulk operation. The usual
-      * {@link #notifyElementRemoved(net.sf.ehcache.Ehcache,net.sf.ehcache.Element)}
-      * is not called.
--     * <p/>
-+     * 
-      * This notification exists because clearing a cache is a special case. It is often
-      * not practical to serially process notifications where potentially millions of elements
-      * have been bulk deleted.
-@@ -270,11 +270,11 @@
- 
-     /**
-      * Adds a message to the queue.
--     * <p/>
-+     * 
-      * This method checks the state of the replication thread and warns
-      * if it has stopped and then discards the message.
-      *
--     * @param cacheEventMessage
-+     * param cacheEventMessage
-      */
-     protected void addToReplicationQueue(RmiEventMessage eventMessage) {
-         if (!replicationThread.isAlive()) {
-@@ -294,15 +294,15 @@
- 
-     /**
-      * Gets called once per {@link #replicationInterval}.
--     * <p/>
-+     * 
-      * Sends accumulated messages in bulk to each peer. i.e. if ther are 100 messages and 1 peer,
-      * 1 RMI invocation results, not 100. Also, if a peer is unavailable this is discovered in only 1 try.
--     * <p/>
-+     * 
-      * Makes a copy of the queue so as not to hold up the enqueue operations.
--     * <p/>
-+     * 
-      * Any exceptions are caught so that the replication thread does not die, and because errors are expected,
-      * due to peers becoming unavailable.
--     * <p/>
-+     * 
-      * This method issues warnings for problems that can be fixed with configuration changes.
-      */
-     private void writeReplicationQueue() {
-@@ -336,7 +336,7 @@
- 
-     /**
-      * Extracts CacheEventMessages and attempts to get a hard reference to the underlying EventMessage
--     * <p/>
-+     * 
-      * If an EventMessage has been invalidated due to SoftReference collection of the Element, it is not
-      * propagated. This only affects puts and updates via copy.
-      *
-@@ -401,7 +401,7 @@
- 
-     /**
-      * Creates a clone of this listener. This method will only be called by ehcache before a cache is initialized.
--     * <p/>
-+     * 
-      * This may not be possible for listeners after they have been initialized. Implementations should throw
-      * CloneNotSupportedException if they do not support clone.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java	2015-06-17 14:24:24.858157487 +0200
-@@ -119,7 +119,7 @@
-     /**
-      * Bootstraps the cache from a random CachePeer. Requests are done in chunks estimated at 5MB Serializable
-      * size. This balances memory use on each end and network performance.
--     * <p/>
-+     * <p>
-      * Bootstrapping requires the establishment of a cluster. This can be instantaneous for manually configued
-      * clusters or may take a number of seconds for multicast ones. This method waits up to 11 seconds for a cluster
-      * to form.
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerListenerFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerListenerFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerListenerFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerListenerFactory.java	2015-06-17 15:56:58.979332152 +0200
-@@ -25,9 +25,9 @@
- 
- /**
-  * Builds a listener based on RMI.
-- * <p/>
-+ * <p>
-  * Expected configuration line:
-- * <p/>
-+ * <p>
-  * <code>
-  * &lt;cachePeerListenerFactory class="net.sf.ehcache.distribution.RMICacheManagerPeerListenerFactory"
-  * properties="hostName=localhost, port=5000" /&gt;
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java	2015-06-17 15:58:09.605062332 +0200
-@@ -46,9 +46,9 @@
- 
- /**
-  * A cache server which exposes available cache operations remotely through RMI.
-- * <p/>
-+ * <p>
-  * It acts as a Decorator to a Cache. It holds an instance of cache, which is a local cache it talks to.
-- * <p/>
-+ * <p>
-  * This class could specify a security manager with code like:
-  * <pre>
-  * if (System.getSecurityManager() == null) {
-@@ -56,12 +56,12 @@
-  * }
-  * </pre>
-  * Doing so would require the addition of <code>grant</code> statements in the <code>java.policy</code> file.
-- * <p/>
-+ * <p>
-  * Per the JDK documentation: "If no security manager is specified no class loading, by RMI clients or servers, is allowed,
-  * aside from what can be found in the local CLASSPATH." The classpath of each instance of this class should have
-  * all required classes to enable distribution, so no remote classloading is required or desirable. Accordingly,
-  * no security manager is set and there are no special JVM configuration requirements.
-- * <p/>
-+ * <p>
-  * This class opens a ServerSocket. The dispose method should be called for orderly closure of that socket. This class
-  * has a shutdown hook which calls dispose() as a convenience feature for developers.
-  *
-@@ -236,7 +236,7 @@
- 
-     /**
-      * Returns a list of bound objects.
--     * <p/>
-+     * <p>
-      * This should match the list of cachePeers i.e. they should always be bound
-      *
-      * @return a list of String representations of <code>RMICachePeer</code> objects
-@@ -307,9 +307,9 @@
- 
-     /**
-      * Start the rmiregistry.
--     * <p/>
-+     * <p>
-      * The alternative is to use the <code>rmiregistry</code> binary, in which case:
--     * <ol/>
-+     * <ol>
-      * <li>rmiregistry running
-      * <li>-Djava.rmi.server.codebase="file:///Users/gluck/work/ehcache/build/classes/ file:///Users/gluck/work/ehcache/lib/commons-logging-1.0.4.jar"
-      * </ol>
-@@ -395,11 +395,11 @@
- 
-     /**
-      * Unbinds an RMICachePeer and unexports it.
--     * <p/>
-+     * <p>
-      * We unbind from the registry first before unexporting.
-      * Unbinding first removes the very small possibility of a client
-      * getting the object from the registry while we are trying to unexport it.
--     * <p/>
-+     * <p>
-      * This method may take up to 4 seconds to complete, if we are having trouble
-      * unexporting the peer.
-      *
-@@ -490,10 +490,10 @@
- 
-     /**
-      * Called immediately after a cache has been added and activated.
--     * <p/>
-+     * <p>
-      * Note that the CacheManager calls this method from a synchronized method. Any attempt to call a synchronized
-      * method on CacheManager from this method will cause a deadlock.
--     * <p/>
-+     * <p>
-      * Note that activation will also cause a CacheEventListener status change notification from
-      * {@link net.sf.ehcache.Status#STATUS_UNINITIALISED} to {@link net.sf.ehcache.Status#STATUS_ALIVE}. Care should be
-      * taken on processing that notification because:
-@@ -503,7 +503,7 @@
-      * {@link net.sf.ehcache.CacheManager#getCache(String)} will cause a deadlock.
-      * </ul>
-      * The calling method will block until this method returns.
--     * <p/>
-+     * <p>
-      * Repopulates the list of cache peers and rebinds the list.
-      * This method should be called if a cache is dynamically added
-      *
-@@ -552,10 +552,10 @@
-     /**
-      * Called immediately after a cache has been disposed and removed. The calling method will block until
-      * this method returns.
--     * <p/>
-+     * <p>
-      * Note that the CacheManager calls this method from a synchronized method. Any attempt to call a synchronized
-      * method on CacheManager from this method will cause a deadlock.
--     * <p/>
-+     * <p>
-      * Note that a {@link net.sf.ehcache.event.CacheEventListener} status changed will also be triggered. Any attempt from that notification
-      * to access CacheManager will also result in a deadlock.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java	2015-06-17 12:42:03.243327659 +0200
-@@ -111,7 +111,7 @@
- 
-     /**
-      * Whether the entry should be considered stale. This will depend on the type of RMICacheManagerPeerProvider.
--     * <p/>
-+     * 
-      * @param date the date the entry was created
-      * @return true if stale
-      */
-@@ -149,7 +149,7 @@
-      * the scheme for replication and bootstrap purposes. Each <code>CacheReplicator</code> should lookup
-      * the provider for its scheme type during replication. Similarly a <code>BootstrapCacheLoader</code>
-      * should also look up the provider for its scheme.
--     * <p/>
-+     * 
-      * @since 1.6 introduced to permit multiple distribution schemes to be used in the same CacheManager
-      * @return the well-known scheme name, which is determined by the replication provider author.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICachePeer.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICachePeer.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICachePeer.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICachePeer.java	2015-06-17 14:26:16.432841672 +0200
-@@ -32,7 +32,7 @@
- 
- /**
-  * An RMI based implementation of <code>CachePeer</code>.
-- * <p/>
-+ * <p>
-  * This class features a customised RMIClientSocketFactory which enables socket timeouts to be configured.
-  *
-  * @author Greg Luck
-@@ -74,7 +74,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * This implementation gives an URL which has meaning to the RMI remoting system.
-      *
-      * @return the URL, without the scheme, as a string e.g. //hostname:port/cacheName
-@@ -92,7 +92,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * This implementation gives an URL which has meaning to the RMI remoting system.
-      *
-      * @return the URL, without the scheme, as a string e.g. //hostname:port
-@@ -108,11 +108,11 @@
- 
-     /**
-      * Returns a list of all elements in the cache, whether or not they are expired.
--     * <p/>
-+     * <p>
-      * The returned keys are unique and can be considered a set.
--     * <p/>
-+     * <p>
-      * The List returned is not live. It is a copy.
--     * <p/>
-+     * <p>
-      * The time taken is O(n). On a single cpu 1.8Ghz P4, approximately 8ms is required
-      * for each 1000 entries.
-      *
-@@ -140,9 +140,9 @@
-     /**
-      * Gets a list of elements from the cache, for a list of keys, without updating Element statistics. Time to
-      * idle lifetimes are therefore not affected.
--     * <p/>
-+     * <p>
-      * Cache statistics are still updated.
--     * <p/>
-+     * <p>
-      * Callers should ideally first call this method with a small list of keys to gauge the size of a typical Element.
-      * Then a calculation can be made of the right number to request each time so as to optimise network performance and
-      * not cause an OutOfMemory error on this Cache.
-@@ -211,7 +211,7 @@
- 
-     /**
-      * Send the cache peer with an ordered list of {@link EventMessage}s
--     * <p/>
-+     * <p>
-      * This enables multiple messages to be delivered in one network invocation.
-      */
-     public void send(List eventMessages) throws RemoteException {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java	2015-06-17 14:26:58.657829924 +0200
-@@ -66,7 +66,7 @@
- 
-     /**
-      * Create a <code>CacheEventListener</code> which is also a CacheReplicator.
--     * <p/>
-+     * <p>
-      * The defaults if properties are not specified are:
-      * <ul>
-      * <li>replicatePuts=true
-@@ -80,7 +80,7 @@
-      *
-      * @param properties implementation specific properties. These are configured as comma
-      *                   separated name value pairs in ehcache.xml e.g.
--     *                   <p/>
-+     *                   <p>
-      *                   <code>
-      *                   &lt;cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
-      *                   properties="
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RmiEventMessage.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RmiEventMessage.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RmiEventMessage.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RmiEventMessage.java	2015-06-17 14:29:26.422789876 +0200
-@@ -74,14 +74,14 @@
-     /**
-      * Gets the event.
-      *
--     * @return either {@link #PUT} or {@link #REMOVE}
-+     * @return either #PUT or #REMOVE
-      */
-     public final RmiEventType getType() {
-         return type;
-     }
- 
-     /**
--     * @return the element component of the message. null if a {@link #REMOVE} event
-+     * return the element component of the message. null if a #REMOVE event
-      */
-     public final Element getElement() {
-         return element;
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java	2015-06-17 14:23:51.386752184 +0200
-@@ -51,11 +51,11 @@
- 
-     /**
-      * Whether a put should replicated by copy or by invalidation, (a remove).
--     * <p/>
-+     * <p>
-      * By copy is best when the entry is expensive to produce. By invalidation is best when
-      * we are really trying to force other caches to sync back to a canonical source like a database.
-      * An example of a latter usage would be a read/write cache being used in Hibernate.
--     * <p/>
-+     * <p>
-      * This setting only has effect if <code>#replicateUpdates</code> is true.
-      */
-     protected boolean replicatePutsViaCopy;
-@@ -67,11 +67,11 @@
- 
-     /**
-      * Whether an update (a put) should be by copy or by invalidation, (a remove).
--     * <p/>
-+     * <p>
-      * By copy is best when the entry is expensive to produce. By invalidation is best when
-      * we are really trying to force other caches to sync back to a canonical source like a database.
-      * An example of a latter usage would be a read/write cache being used in Hibernate.
--     * <p/>
-+     * <p>
-      * This setting only has effect if <code>#replicateUpdates</code> is true.
-      */
-     protected final boolean replicateUpdatesViaCopy;
-@@ -105,7 +105,7 @@
-     /**
-      * Called immediately after an element has been put into the cache. The {@link net.sf.ehcache.Cache#put(net.sf.ehcache.Element)} method
-      * will block until this method returns.
--     * <p/>
-+     * <p>
-      * Implementers may wish to have access to the Element's fields, including value, so the element is provided.
-      * Implementers should be careful not to modify the element. The effect of any modifications is undefined.
-      *
-@@ -137,7 +137,7 @@
- 
-     /**
-      * Does the actual RMI remote call.
--     * <p/>
-+     * <p>
-      * If a Throwable occurs a SEVERE log message will be logged, but attempts to replicate to the other
-      * peers will continue.
-      */
-@@ -157,10 +157,10 @@
-     /**
-      * Called immediately after an element has been put into the cache and the element already
-      * existed in the cache. This is thus an update.
--     * <p/>
-+     * <p>
-      * The {@link net.sf.ehcache.Cache#put(net.sf.ehcache.Element)} method
-      * will block until this method returns.
--     * <p/>
-+     * <p>
-      * Implementers may wish to have access to the Element's fields, including value, so the element is provided.
-      * Implementers should be careful not to modify the element. The effect of any modifications is undefined.
-      *
-@@ -200,11 +200,11 @@
-     /**
-      * Called immediately after an attempt to remove an element. The remove method will block until
-      * this method returns.
--     * <p/>
-+     * <p>
-      * This notification is received regardless of whether the cache had an element matching
-      * the removal key or not. If an element was removed, the element is passed to this method,
-      * otherwise a synthetic element, with only the key set is passed in.
--     * <p/>
-+     * <p>
-      *
-      * @param cache   the cache emitting the notification
-      * @param element the element just deleted, or a synthetic element with just the key set if
-@@ -231,7 +231,7 @@
- 
-     /**
-      * Does the actual RMI remote call.
--     * <p/>
-+     * <p>
-      * If a Throwable occurs a SEVERE log message will be logged, but attempts to replicate to the other
-      * peers will continue.
-      */
-@@ -250,7 +250,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * This implementation does not propagate expiries. It does not need to do anything because the element will
-      * expire in the remote cache at the same time. If the remote peer is not configured the same way they should
-      * not be in an cache cluster.
-@@ -265,10 +265,10 @@
-      * Called immediately after an element is evicted from the cache. Evicted in this sense
-      * means evicted from one store and not moved to another, so that it exists nowhere in the
-      * local cache.
--     * <p/>
-+     * <p>
-      * In a sense the Element has been <i>removed</i> from the cache, but it is different,
-      * thus the separate notification.
--     * <p/>
-+     * <p>
-      * This replicator does not propagate these events
-      *
-      * @param cache   the cache emitting the notification
-@@ -286,7 +286,7 @@
-      * elements have been removed from the cache in a bulk operation. The usual
-      * {@link #notifyElementRemoved(net.sf.ehcache.Ehcache,net.sf.ehcache.Element)}
-      * is not called.
--     * <p/>
-+     * <p>
-      * This notification exists because clearing a cache is a special case. It is often
-      * not practical to serially process notifications where potentially millions of elements
-      * have been bulk deleted.
-@@ -372,7 +372,7 @@
- 
-     /**
-      * Creates a clone of this listener. This method will only be called by ehcache before a cache is initialized.
--     * <p/>
-+     * <p>
-      * This may not be possible for listeners after they have been initialized. Implementations should throw
-      * CloneNotSupportedException if they do not support clone.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Ehcache.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Ehcache.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Ehcache.java	2013-01-17 08:54:30.000000000 +0100
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Ehcache.java	2015-06-17 11:41:56.687965973 +0200
-@@ -43,16 +43,16 @@
- 
- /**
-  * An interface for Ehcache.
-- * <p/>
-+ * 
-  * Ehcache is the central interface. Caches have {@link Element}s and are managed
-  * by the {@link CacheManager}. The Cache performs logical actions. It delegates physical
-  * implementations to its {@link net.sf.ehcache.store.Store}s.
-- * <p/>
-+ * 
-  * A reference to an EhCache can be obtained through the {@link CacheManager}. An Ehcache thus obtained
-  * is guaranteed to have status {@link Status#STATUS_ALIVE}. This status is checked for any method which
-  * throws {@link IllegalStateException} and the same thrown if it is not alive. This would normally
-  * happen if a call is made after {@link CacheManager#shutdown} is invoked.
-- * <p/>
-+ * 
-  * Statistics on cache usage are collected and made available through public methods.
-  *
-  * @author Greg Luck
-@@ -83,10 +83,10 @@
- 
-     /**
-      * Put an element in the cache.
--     * <p/>
-+     * 
-      * Resets the access statistics on the element, which would be the case if it has previously been
-      * gotten from a cache, and is now being put back.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener that:
-      * <ul>
-      * <li>the element was put, but only if the Element was actually put.
-@@ -122,10 +122,10 @@
- 
-     /**
-      * Put an element in the cache.
--     * <p/>
-+     * 
-      * Resets the access statistics on the element, which would be the case if it has previously been
-      * gotten from a cache, and is now being put back.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener that:
-      * <ul>
-      * <li>the element was put, but only if the Element was actually put.
-@@ -157,10 +157,10 @@
-     /**
-      * Put an element in the cache writing through a CacheWriter. If no CacheWriter has been registered for the cache,
-      * then this method throws an exception.
--     * <p/>
-+     * 
-      * Resets the access statistics on the element, which would be the case if it has previously been
-      * gotten from a cache, and is now being put back.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener, if the writer operation succeeds, that:
-      * <ul>
-      * <li>the element was put, but only if the Element was actually put.
-@@ -233,7 +233,7 @@
- 
-     /**
-      * Gets an element from the cache. Updates Element Statistics
--     * <p/>
-+     * 
-      * Note that the Element's lastAccessTime is always the time of this get.
-      * Use {@link #getQuiet(Object)} to peak into the Element to see its last access time with get
-      *
-@@ -246,7 +246,7 @@
- 
-     /**
-      * Gets an element from the cache. Updates Element Statistics
--     * <p/>
-+     * 
-      * Note that the Element's lastAccessTime is always the time of this get.
-      * Use {@link #getQuiet(Object)} to peek into the Element to see its last access time with get
-      *
-@@ -262,7 +262,7 @@
-      * Gets all the elements from the cache for the keys provided. Updates Element Statistics.
-      * Returned Map may contain less or more keys if collection is modified before call completes.
-      * Throws a NullPointerException if any key in the collection is null
--     * <p/>
-+     * 
-      * Note that the Element's lastAccessTime is always the time of this get.
-      * Use {@link #getQuiet(Object)} to peek into the Element to see its last access time with get
-      *
-@@ -277,7 +277,7 @@
-     /**
-      * Gets an element from the cache, without updating Element statistics. Cache statistics are
-      * still updated.
--     * <p/>
-+     * 
-      *
-      * @param key a serializable value
-      * @return the element, or null, if it does not exist.
-@@ -290,7 +290,7 @@
-     /**
-      * Gets an element from the cache, without updating Element statistics. Cache statistics are
-      * also not updated.
--     * <p/>
-+     * 
-      *
-      * @param key a serializable value
-      * @return the element, or null, if it does not exist.
-@@ -302,11 +302,11 @@
- 
-     /**
-      * Returns a list of all elements in the cache, whether or not they are expired.
--     * <p/>
-+     * 
-      * The returned keys are unique and can be considered a set.
--     * <p/>
-+     * 
-      * The List returned is not live. It is a copy.
--     * <p/>
-+     * 
-      * The time taken is O(n). On a single cpu 1.8Ghz P4, approximately 8ms is required
-      * for each 1000 entries.
-      *
-@@ -318,17 +318,17 @@
-     /**
-      * Returns a list of all elements in the cache. Only keys of non-expired
-      * elements are returned.
--     * <p/>
-+     * 
-      * The returned keys are unique and can be considered a set.
--     * <p/>
-+     * 
-      * The List returned is not live. It is a copy.
--     * <p/>
-+     * 
-      * The time taken is O(n), where n is the number of elements in the cache. On
-      * a 1.8Ghz P4, the time taken is approximately 200ms per 1000 entries. This method
-      * is not synchronized, because it relies on a non-live list returned from {@link #getKeys()}
-      * , which is synchronised, and which takes 8ms per 1000 entries. This way
-      * cache liveness is preserved, even if this method is very slow to return.
--     * <p/>
-+     * 
-      * Consider whether your usage requires checking for expired keys. Because
-      * this method takes so long, depending on cache settings, the list could be
-      * quite out of date by the time you get it.
-@@ -340,16 +340,16 @@
- 
-     /**
-      * Returns a list of all elements in the cache, whether or not they are expired.
--     * <p/>
-+     * 
-      * The returned keys are not unique and may contain duplicates. If the cache is only
-      * using the memory store, the list will be unique. If the disk store is being used
-      * as well, it will likely contain duplicates, because of the internal store design.
--     * <p/>
-+     * 
-      * The List returned is not live. It is a copy.
--     * <p/>
-+     * 
-      * The time taken is O(log n). On a single cpu 1.8Ghz P4, approximately 6ms is required
-      * for 1000 entries and 36 for 50000.
--     * <p/>
-+     * 
-      * This is the fastest getKeys method
-      *
-      * @return a list of {@link Object} keys
-@@ -362,7 +362,7 @@
-     /**
-      * Removes an {@link net.sf.ehcache.Element} from the Cache. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed.
-      *
-      * @param key
-@@ -374,7 +374,7 @@
-     /**
-      * Removes an {@link net.sf.ehcache.Element} from the Cache. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed, but only if an Element
-      * with the key actually existed.
-      *
-@@ -388,7 +388,7 @@
-     /**
-      * Removes given set of {@link net.sf.ehcache.Element} from the Cache. This also removes them from any
-      * stores it may be in. Throws a NullPointerException if any key in the collection is null
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the elements were removed.
-      * Notification is sent for every key irrespective of whether the key was present in the cache or not
-      * This operation is partially completed if any element or any key is null
-@@ -400,7 +400,7 @@
- 
-     /**
-      * Removes all cached items.
--     * <p />
-+     * 
-      * When using Terracotta clustered caches with nonstop enabled, the timeout used by this method is
-      * {@link NonstopConfiguration#getBulkOpsTimeoutMultiplyFactor()} times the timeout value in the nonstop config.
-      *
-@@ -413,7 +413,7 @@
-     /**
-      * Removes an {@link net.sf.ehcache.Element} from the Cache. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed, but only if an Element
-      * with the key actually existed.
-      *
-@@ -428,7 +428,7 @@
-     /**
-      * Removes an {@link net.sf.ehcache.Element} from the Cache. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed, but only if an Element
-      * with the key actually existed.
-      *
-@@ -443,7 +443,7 @@
-     /**
-      * Removes an {@link net.sf.ehcache.Element} from the Cache, without notifying listeners. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      *
-      * @param key
-      * @return true if the element was removed, false if it was not found in the cache
-@@ -454,7 +454,7 @@
-     /**
-      * Removes an {@link net.sf.ehcache.Element} from the Cache, without notifying listeners. This also removes it from any
-      * stores it may be in.
--     * <p/>
-+     * 
-      *
-      * @param key
-      * @return true if the element was removed, false if it was not found in the cache
-@@ -466,7 +466,7 @@
-     /**
-      * Removes an {@link net.sf.ehcache.Element} from the Cache and any stores it might be in. This also removes through
-      * to a CacheWriter. If no CacheWriter has been registered for the cache, then this method throws an exception.
--     * <p/>
-+     * 
-      * Also notifies the CacheEventListener after the element was removed, but only if an Element
-      * with the key actually existed.
-      *
-@@ -480,7 +480,7 @@
- 
-     /**
-      * Removes all cached items.
--     * <p />
-+     * 
-      * When using Terracotta clustered caches with nonstop enabled, the timeout used by this method is
-      * {@link NonstopConfiguration#getBulkOpsTimeoutMultiplyFactor()} times the timeout value in the nonstop config.
-      *
-@@ -490,7 +490,7 @@
- 
-     /**
-      * Removes all cached items.
--     * <p />
-+     * 
-      * When using Terracotta clustered caches with nonstop enabled, the timeout used by this method is
-      * {@link NonstopConfiguration#getBulkOpsTimeoutMultiplyFactor()} times the timeout value in the nonstop config.
-      *
-@@ -509,26 +509,26 @@
- 
-     /**
-      * Gets the size of the cache. This is a subtle concept. See below.
--     * <p/>
-+     * 
-      * The size is the number of {@link net.sf.ehcache.Element}s in the {@link net.sf.ehcache.store.MemoryStore} plus
-      * the number of {@link net.sf.ehcache.Element}s in the {@link net.sf.ehcache.store.disk.DiskStore}.
--     * <p/>
-+     * 
-      * This number is the actual number of elements, including expired elements that have
-      * not been removed.
--     * <p/>
-+     * 
-      * Expired elements are removed from the the memory store when
-      * getting an expired element, or when attempting to spool an expired element to
-      * disk.
--     * <p/>
-+     * 
-      * Expired elements are removed from the disk store when getting an expired element,
-      * or when the expiry thread runs, which is once every five minutes.
--     * <p/>
-+     * 
-      * To get an exact size, which would exclude expired elements, use {@link #getKeysWithExpiryCheck()}.size(),
-      * although see that method for the approximate time that would take.
--     * <p/>
-+     * 
-      * To get a very fast result, use {@link #getKeysNoDuplicateCheck()}.size(). If the disk store
-      * is being used, there will be some duplicates.
--     * <p/>
-+     * 
-      * Note:getSize() is a very expensive operation in off-heap, disk and Terracotta implementations.
-      *
-      * @return The size value
-@@ -557,11 +557,11 @@
- 
-     /**
-      * Gets the size of the memory store for this cache
--     * <p/>
-+     * 
-      * Warning: This method can be very expensive to run. Allow approximately 1 second
-      * per 1MB of entries. Running this method could create liveness problems
-      * because the object lock is held for a long period
--     * <p/>
-+     * 
-      *
-      * @return the approximate size of the memory store in bytes
-      * @throws IllegalStateException
-@@ -641,7 +641,7 @@
- 
-     /**
-      * Checks whether this cache element has expired.
--     * <p/>
-+     * 
-      * The element is expired if:
-      * <ol>
-      * <li> the idle time is non-zero and has elapsed, unless the cache is eternal; or
-@@ -660,9 +660,9 @@
-      * Clones a cache. This is only legal if the cache has not been
-      * initialized. At that point only primitives have been set and no
-      * {@link net.sf.ehcache.store.MemoryStore} or {@link net.sf.ehcache.store.disk.DiskStore} has been created.
--     * <p/>
-+     * 
-      * A new, empty, RegisteredEventListeners is created on clone.
--     * <p/>
-+     * 
-      *
-      * @return an object of type {@link net.sf.ehcache.Cache}
-      * @throws CloneNotSupportedException
-@@ -787,28 +787,28 @@
-      * object size. How that is calculated is discussed below.
-      * <h3>Best Effort Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link Statistics#STATISTICS_ACCURACY_BEST_EFFORT}.
--     * <p/>
-+     * 
-      * The size is the number of {@link Element}s in the {@link net.sf.ehcache.store.MemoryStore} plus
-      * the number of {@link Element}s in the {@link net.sf.ehcache.store.disk.DiskStore}.
--     * <p/>
-+     * 
-      * This number is the actual number of elements, including expired elements that have
-      * not been removed. Any duplicates between stores are accounted for.
--     * <p/>
-+     * 
-      * Expired elements are removed from the the memory store when
-      * getting an expired element, or when attempting to spool an expired element to
-      * disk.
--     * <p/>
-+     * 
-      * Expired elements are removed from the disk store when getting an expired element,
-      * or when the expiry thread runs, which is once every five minutes.
--     * <p/>
-+     * 
-      * <h3>Guaranteed Accuracy Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link Statistics#STATISTICS_ACCURACY_GUARANTEED}.
--     * <p/>
-+     * 
-      * This method accounts for elements which might be expired or duplicated between stores. It take approximately
-      * 200ms per 1000 elements to execute.
-      * <h3>Fast but non-accurate Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link Statistics#STATISTICS_ACCURACY_NONE}.
--     * <p/>
-+     * 
-      * The number given may contain expired elements. In addition if the DiskStore is used it may contain some double
-      * counting of elements. It takes 6ms for 1000 elements to execute. Time to execute is O(log n). 50,000 elements take
-      * 36ms.
-@@ -879,7 +879,7 @@
- 
-     /**
-      * Newly created caches do not have a {@link net.sf.ehcache.store.MemoryStore} or a {@link net.sf.ehcache.store.disk.DiskStore}.
--     * <p/>
-+     * 
-      * This method creates those and makes the cache ready to accept elements
-      */
-     void initialise();
-@@ -893,7 +893,7 @@
- 
-     /**
-      * Flushes all cache items from memory to auxilliary caches and close the auxilliary caches.
--     * <p/>
-+     * 
-      * Should be invoked only by CacheManager.
-      *
-      * @throws IllegalStateException if the cache is not {@link Status#STATUS_ALIVE}
-@@ -902,14 +902,14 @@
- 
-     /**
-      * Gets the cache configuration this cache was created with.
--     * <p/>
-+     * 
-      * Things like listeners that are added dynamically are excluded.
-      */
-     CacheConfiguration getCacheConfiguration();
- 
-     /**
-      * Register a {@link CacheExtension} with the cache. It will then be tied into the cache lifecycle.
--     * <p/>
-+     * 
-      * If the CacheExtension is not initialised, initialise it.
-      */
-     public void registerCacheExtension(CacheExtension cacheExtension);
-@@ -942,7 +942,7 @@
- 
-     /**
-      * Register a {@link CacheLoader} with the cache. It will then be tied into the cache lifecycle.
--     * <p/>
-+     * 
-      * The CacheLoader instance will be initialized when the cache itself is being initialized.
-      * Should the cache already be initialized, {@link net.sf.ehcache.loader.CacheLoader#init CacheLoader.init()} will not be invoked.
-      * If the loader requires initialization, the user will have to call it manually before registering it with a Cache instance
-@@ -977,7 +977,7 @@
- 
-     /**
-      * Register the {@link CacheWriter} for this cache. It will then be tied into the cache lifecycle.
--     * <p/>
-+     * 
-      * If the {@code CacheWriter} is not initialised, initialise it.
-      *
-      * @param cacheWriter A CacheWriter to register
-@@ -986,7 +986,7 @@
- 
-     /**
-      * Unregister the {@link CacheWriter} from the cache. It will then be detached from the cache lifecycle.
--     * <p/>
-+     * 
-      * If not {@code CacheWriter} was registered beforehand this operation has no effect.
-      */
-     public void unregisterCacheWriter();
-@@ -1001,11 +1001,11 @@
-     /**
-      * This method will return, from the cache, the object associated with
-      * the argument "key".
--     * <p/>
-+     * 
-      * If the object is not in the cache, the associated
-      * cache loader will be called. That is either the CacheLoader passed in, or if null, the one associated with the cache.
-      * If both are null, no load is performed and null is returned.
--     * <p/>
-+     * 
-      * Because this method may take a long time to complete, it is not synchronized. The underlying cache operations
-      * are synchronized.
-      *
-@@ -1025,13 +1025,13 @@
-      * the object. If no "arg" value is provided a null will be passed to the loadAll method. The storing of null values in the cache
-      * is permitted, however, the get method will not distinguish returning a null stored in the cache and not finding the object in
-      * the cache. In both cases a null is returned.
--     * <p/>
--     * <p/>
-+     * 
-+     * 
-      * Note. If the getAll exceeds the maximum cache size, the returned map will necessarily be less than the number specified.
--     * <p/>
-+     * 
-      * Because this method may take a long time to complete, it is not synchronized. The underlying cache operations
-      * are synchronized.
--     * <p/>
-+     * 
-      * The constructs package provides similar functionality using the
-      * decorator {@link net.sf.ehcache.constructs.blocking.SelfPopulatingCache}
-      * @param keys a collection of keys to be returned/loaded
-@@ -1051,7 +1051,7 @@
-      * If no "arg" value is provided a null will be passed to the load method. The storing of null values in the cache
-      * is permitted, however, the get method will not distinguish returning a null stored in the cache and not finding
-      * the object in the cache. In both cases a null is returned.
--     * <p/>
-+     * 
-      * The Ehcache native API provides similar functionality to loaders using the
-      * decorator {@link net.sf.ehcache.constructs.blocking.SelfPopulatingCache}
-      *
-@@ -1072,10 +1072,10 @@
-      * retrieving or loading of the objects, an exception (to be defined) will be thrown. If the "arg" argument is set,
-      * the arg object will be passed to the CacheLoader.loadAll method. The cache will not dereference the object.
-      * If no "arg" value is provided a null will be passed to the loadAll method.
--     * <p/>
-+     * 
-      * keys - collection of the keys whose associated values to be loaded into this cache by using the associated
-      * cacheloader if this cache doesn't contain them.
--     * <p/>
-+     * 
-      * The Ehcache native API provides similar functionality to loaders using the
-      * decorator {@link net.sf.ehcache.constructs.blocking.SelfPopulatingCache}
-      */
-@@ -1091,16 +1091,16 @@
-      * <li>putQuites are discarded
-      * </ol>
-      * In all other respects the cache continues as it is.
--     * <p/>
-+     * 
-      * You can disable and enable a cache programmatically through the {@link #setDisabled(boolean)} method.
--     * <p/>
-+     * 
-      * @return true if the cache is disabled.
-      */
-     public boolean isDisabled();
- 
-     /**
-      * Disables or enables this cache. This call overrides the previous value of disabled.
--     * <p/>
-+     * 
-      * @param disabled true if you wish to disable, false to enable
-      * @see #isDisabled()
-      */
-@@ -1172,7 +1172,7 @@
- 
-     /**
-      * Returns true if the cache is in coherent mode cluster-wide. Returns false otherwise.
--     * <p />
-+     * 
-      * It applies to coherent clustering mechanisms only e.g. Terracotta
-      *
-      * @return true if the cache is in coherent mode cluster-wide, false otherwise
-@@ -1183,7 +1183,7 @@
- 
-     /**
-      * Returns true if the cache is in coherent mode for the current node. Returns false otherwise.
--     * <p />
-+     * 
-      * It applies to coherent clustering mechanisms only e.g. Terracotta
-      *
-      * @return true if the cache is in coherent mode cluster-wide, false otherwise
-@@ -1196,9 +1196,9 @@
-      * Sets the cache in coherent or incoherent mode depending on the parameter on this node.
-      * Calling {@code setNodeCoherent(true)} when the cache is already in coherent mode or
-      * calling {@code setNodeCoherent(false)} when already in incoherent mode will be a no-op.
--     * <p />
-+     * 
-      * It applies to coherent clustering mechanisms only e.g. Terracotta
--     * <p />
-+     * 
-      * When using Terracotta clustered caches with nonstop enabled, the timeout used by this method is
-      * {@link NonstopConfiguration#getBulkOpsTimeoutMultiplyFactor()} times the timeout value in the config.
-      *
-@@ -1213,7 +1213,7 @@
-     /**
-      * This method waits until the cache is in coherent mode in all the connected nodes.
-      * If the cache is already in coherent mode it returns immediately
--     * <p />
-+     * 
-      * It applies to coherent clustering mechanisms only e.g. Terracotta
-      * @throws UnsupportedOperationException if this cache does not support coherence, like RMI replication
-      * @deprecated Use {@link #waitUntilClusterBulkLoadComplete()} instead
-@@ -1348,7 +1348,7 @@
- 
-     /**
-      * Returns true if at least one node in the cluster is in bulk-load mode. Returns false otherwise.
--     * <p />
-+     * 
-      * NOTE: if {@link #isNodeBulkLoadEnabled()} returns true, this method will always return true.
-      * Applies to caches clustered with Terracotta only.
-      *
-@@ -1359,7 +1359,7 @@
- 
-     /**
-      * Returns true if the current node is in bulk-load mode. Returns false otherwise.
--     * <p />
-+     * 
-      * NOTE: if this method returns true, {@link #isClusterBulkLoadEnabled()} method will always return true.
-      * Applies to caches clustered with Terracotta only.
-      *
-@@ -1372,9 +1372,9 @@
-      * Enable/disable bulk-load mode in this node for this cache.
-      * Calling {@code setBulkLoadEnabled(true)} when the cache is already in bulk-load mode or
-      * calling {@code setBulkLoadEnabled(false)} when already NOT in bulk-load mode will be a no-op.
--     * <p />
-+     * 
-      * Applies to caches clustered with Terracotta only.
--     * <p />
-+     * 
-      * When using Terracotta clustered caches with nonstop enabled, the timeout used by this method is
-      * {@link NonstopConfiguration#getBulkOpsTimeoutMultiplyFactor()} times the timeout value in the nonstop config.
-      *
-@@ -1388,7 +1388,7 @@
-      * This method waits until all the connected nodes have disabled bulk-load. Or in other words, calling this method
-      * will block until all connected nodes in the cluster disables bulk-load. If none of the nodes did not enable bulk-load
-      * this method will return immediately
--     * <p />
-+     * 
-      * Applies to caches clustered with Terracotta only.
-      * @throws UnsupportedOperationException if the cache is not clustered with Terracotta
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Element.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Element.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Element.java	2012-09-04 16:13:29.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Element.java	2015-06-17 11:46:21.296257355 +0200
-@@ -36,7 +36,7 @@
- 
- /**
-  * A Cache Element, consisting of a key, value and attributes.
-- * <p/>
-+ * 
-  * From ehcache-1.2, Elements can have keys and values that are Serializable or Objects. To preserve backward
-  * compatibility, special accessor methods for Object keys and values are provided: {@link #getObjectKey()} and
-  * {@link #getObjectValue()}. If placing Objects in ehcache, developers must use the new getObject... methods to
-@@ -117,7 +117,7 @@
- 
-     /**
-      * A full constructor.
--     * <p/>
-+     * 
-      * Creation time is set to the current time. Last Access Time is not set.
-      *
-      * @since .4
-@@ -129,7 +129,7 @@
- 
-     /**
-      * A full constructor.
--     * <p/>
-+     * 
-      * Creation time is set to the current time. Last Access Time and Previous To Last Access Time
-      * are not set.
-      *
-@@ -259,7 +259,7 @@
- 
-     /**
-      * Gets the key attribute of the Element object.
--     * <p/>
-+     * 
-      * This method is provided for those wishing to use ehcache as a memory only cache
-      * and enables retrieval of non-Serializable values from elements.
-      *
-@@ -289,7 +289,7 @@
- 
-     /**
-      * Gets the value attribute of the Element object as an Object.
--     * <p/>
-+     * 
-      * This method is provided for those wishing to use ehcache as a memory only cache
-      * and enables retrieval of non-Serializable values from elements.
-      *
-@@ -534,9 +534,9 @@
-     /**
-      * Clones an Element. A completely new object is created, with no common references with the
-      * existing one.
--     * <p/>
-+     * 
-      * This method will not work unless the Object is Serializable
--     * <p/>
-+     * 
-      * Warning: This can be very slow on large object graphs. If you use this method
-      * you should write a performance test to verify suitability.
-      *
-@@ -594,9 +594,9 @@
-      * The size of this object in serialized form. This is not the same
-      * thing as the memory size, which is JVM dependent. Relative values should be meaningful,
-      * however.
--     * <p/>
-+     * 
-      * Warning: This method can be <b>very slow</b> for values which contain large object graphs.
--     * <p/>
-+     * 
-      * If the key or value of the Element is not Serializable, an error will be logged and 0 will be returned.
-      *
-      * @return The serialized size in bytes
-@@ -631,11 +631,11 @@
- 
-     /**
-      * Whether the element may be Serialized.
--     * <p/>
-+     * 
-      * While Element implements Serializable, it is possible to create non Serializable elements
-      * for use in MemoryStores. This method checks that an instance of Element really is Serializable
-      * and will not throw a NonSerializableException if Serialized.
--     * <p/>
-+     * 
-      * This method was tweaked in 1.6 as it has been shown that Serializable classes can be serializaed as can
-      * null, regardless of what class it is a null of. ObjectOutputStream.write(null) works and ObjectInputStream.read()
-      * will read null back.
-@@ -651,10 +651,10 @@
- 
-     /**
-      * Whether the element's key may be Serialized.
--     * <p/>
-+     * 
-      * While Element implements Serializable, it is possible to create non Serializable elements and/or
-      * non Serializable keys for use in MemoryStores.
--     * <p/>
-+     * 
-      * This method checks that an instance of an Element's key really is Serializable
-      * and will not throw a NonSerializableException if Serialized.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/event/CacheEventListener.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/event/CacheEventListener.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/event/CacheEventListener.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/event/CacheEventListener.java	2015-06-17 12:21:26.996555397 +0200
-@@ -32,11 +32,11 @@
-  * <li>an Element expires, either because timeToLive or timeToIdle has been reached.
-  * <li>removeAll, which causes all elements to be cleared from the cache
-  * </ol>
-- * <p/>
-+ * 
-  * Callbacks to these methods are synchronous and unsynchronized. It is the responsibility of
-  * the implementer to safely handle the potential performance and thread safety issues
-  * depending on what their listener is doing.
-- * <p/>
-+ * 
-  * Cache also has putQuiet and removeQuiet methods which do not notify listeners.
-  *
-  * @author Greg Luck
-@@ -49,11 +49,11 @@
-     /**
-      * Called immediately after an attempt to remove an element. The remove method will block until
-      * this method returns.
--     * <p/>
-+     * 
-      * This notification is received regardless of whether the cache had an element matching
-      * the removal key or not. If an element was removed, the element is passed to this method,
-      * otherwise a synthetic element, with only the key set is passed in.
--     * <p/>
-+     * 
-      * This notification is not called for the following special cases:
-      * <ol>
-      * <li>removeAll was called. See {@link #notifyRemoveAll(net.sf.ehcache.Ehcache)}
-@@ -71,7 +71,7 @@
-      * Called immediately after an element has been put into the cache. The
-      * {@link net.sf.ehcache.Cache#put(net.sf.ehcache.Element)} method
-      * will block until this method returns.
--     * <p/>
-+     * 
-      * Implementers may wish to have access to the Element's fields, including value, so the
-      * element is provided. Implementers should be careful not to modify the element. The
-      * effect of any modifications is undefined.
-@@ -84,10 +84,10 @@
-     /**
-      * Called immediately after an element has been put into the cache and the element already
-      * existed in the cache. This is thus an update.
--     * <p/>
-+     * 
-      * The {@link net.sf.ehcache.Cache#put(net.sf.ehcache.Element)} method
-      * will block until this method returns.
--     * <p/>
-+     * 
-      * Implementers may wish to have access to the Element's fields, including value, so the
-      * element is provided. Implementers should be careful not to modify the element. The
-      * effect of any modifications is undefined.
-@@ -101,9 +101,9 @@
-     /**
-      * Called immediately after an element is <i>found</i> to be expired. The
-      * {@link net.sf.ehcache.Cache#remove(Object)} method will block until this method returns.
--     * <p/>
-+     * 
-      * As the {@link Element} has been expired, only what was the key of the element is known.
--     * <p/>
-+     * 
-      * Elements are checked for expiry in ehcache at the following times:
-      * <ul>
-      * <li>When a get request is made
-@@ -116,7 +116,7 @@
-      *
-      * @param cache   the cache emitting the notification
-      * @param element the element that has just expired
--     *                <p/>
-+     *                
-      *                Deadlock Warning: expiry will often come from the <code>DiskStore</code>
-      *                expiry thread. It holds a lock to the DiskStorea the time the
-      *                notification is sent. If the implementation of this method calls into a
-@@ -130,7 +130,7 @@
-      * Called immediately after an element is evicted from the cache. Evicted in this sense
-      * means evicted from one store and not moved to another, so that it exists nowhere in the
-      * local cache.
--     * <p/>
-+     * 
-      * In a sense the Element has been <i>removed</i> from the cache, but it is different,
-      * thus the separate notification.
-      *
-@@ -144,7 +144,7 @@
-      * elements have been removed from the cache in a bulk operation. The usual
-      * {@link #notifyElementRemoved(net.sf.ehcache.Ehcache, net.sf.ehcache.Element)}
-      * is not called.
--     * <p/>
-+     * 
-      * This notification exists because clearing a cache is a special case. It is often
-      * not practical to serially process notifications where potentially millions of elements
-      * have been bulk deleted.
-@@ -162,7 +162,7 @@
-     /**
-      * Creates a clone of this listener. This method will only be called by ehcache before a
-      * cache is initialized.
--     * <p/>
-+     * 
-      * This may not be possible for listeners after they have been initialized. Implementations
-      * should throw CloneNotSupportedException if they do not support clone.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/event/CacheManagerEventListener.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/event/CacheManagerEventListener.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/event/CacheManagerEventListener.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/event/CacheManagerEventListener.java	2015-06-17 12:37:15.953849462 +0200
-@@ -71,10 +71,10 @@
- 
-     /**
-      * Called immediately after a cache has been added and activated.
--     * <p/>
-+     * 
-      * Note that the CacheManager calls this method from a synchronized method. Any attempt to
-      * call a synchronized method on CacheManager from this method will cause a deadlock.
--     * <p/>
-+     * 
-      * Note that activation will also cause a CacheEventListener status change notification
-      * from {@link net.sf.ehcache.Status#STATUS_UNINITIALISED} to
-      * {@link net.sf.ehcache.Status#STATUS_ALIVE}. Care should be taken on processing that
-@@ -86,7 +86,7 @@
-      * will cause a deadlock.
-      * </ul>
-      * The calling method will block until this method returns.
--     * <p/>
-+     * 
-      * @param cacheName the name of the <code>Cache</code> the operation relates to
-      * @see CacheEventListener
-      */
-@@ -95,10 +95,10 @@
-     /**
-      * Called immediately after a cache has been disposed and removed. The calling method will
-      * block until this method returns.
--     * <p/>
-+     * 
-      * Note that the CacheManager calls this method from a synchronized method. Any attempt to
-      * call a synchronized method on CacheManager from this method will cause a deadlock.
--     * <p/>
-+     * 
-      * Note that a {@link CacheEventListener} status changed will also be triggered. Any
-      * attempt from that notification to access CacheManager will also result in a deadlock.
-      * @param cacheName the name of the <code>Cache</code> the operation relates to
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/event/CacheManagerEventListenerRegistry.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/event/CacheManagerEventListenerRegistry.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/event/CacheManagerEventListenerRegistry.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/event/CacheManagerEventListenerRegistry.java	2015-06-17 15:54:47.035440870 +0200
-@@ -24,7 +24,7 @@
- 
- /**
-  * Registered listeners for registering and unregistering CacheManagerEventListeners and sending notifications to registrants.
-- * <p/>
-+ * <p>
-  * There is one of these per CacheManager. It is a composite listener.
-  *
-  * @author Greg Luck
-@@ -132,10 +132,10 @@
- 
-     /**
-      * Called immediately after a cache has been added and activated.
--     * <p/>
-+     * <p>
-      * Note that the CacheManager calls this method from a synchronized method. Any attempt to
-      * call a synchronized method on CacheManager from this method will cause a deadlock.
--     * <p/>
-+     * <p>
-      * Note that activation will also cause a CacheEventListener status change notification
-      * from {@link net.sf.ehcache.Status#STATUS_UNINITIALISED} to
-      * {@link net.sf.ehcache.Status#STATUS_ALIVE}. Care should be taken on processing that
-@@ -147,7 +147,7 @@
-      * will cause a deadlock.
-      * </ul>
-      * The calling method will block until this method returns.
--     * <p/>
-+     * <p>
-      *
-      * @param cacheName the name of the <code>Cache</code> the operation relates to
-      * @see CacheEventListener
-@@ -163,10 +163,10 @@
-     /**
-      * Called immediately after a cache has been disposed and removed. The calling method will
-      * block until this method returns.
--     * <p/>
-+     * <p>
-      * Note that the CacheManager calls this method from a synchronized method. Any attempt to
-      * call a synchronized method on CacheManager from this method will cause a deadlock.
--     * <p/>
-+     * <p>
-      * Note that a {@link CacheEventListener} status changed will also be triggered. Any
-      * attempt from that notification to access CacheManager will also result in a deadlock.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/event/RegisteredEventListeners.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/event/RegisteredEventListeners.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/event/RegisteredEventListeners.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/event/RegisteredEventListeners.java	2015-06-17 15:55:49.974526926 +0200
-@@ -35,9 +35,9 @@
- 
- /**
-  * Registered listeners for registering and unregistering CacheEventListeners and multicasting notifications to registrants.
-- * <p/>
-+ * <p>
-  * There is one of these per Cache.
-- * <p/>
-+ * <p>
-  * This class also has counters to accumulate the numbers of each type of event for statistics purposes.
-  *
-  * @author Greg Luck
-@@ -359,7 +359,7 @@
-     /**
-      * Adds a listener to the notification service. No guarantee is made that listeners will be
-      * notified in the order they were added.
--     * <p/>
-+     * <p>
-      * If a cache is configured in a cluster, listeners in each node will get triggered by an event
-      * depending on the value of the <pre>listenFor</pre> parameter.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandlerFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandlerFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandlerFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandlerFactory.java	2015-06-17 13:35:48.293747519 +0200
-@@ -20,7 +20,7 @@
- 
- /**
-  * An abstract factory for creating <code>CacheExceptionHandler</code>s at configuration time, in ehcache.xml.
-- * <p/>
-+ * 
-  * Extend to create a concrete factory
-  *
-  * @author <a href="mailto:gluck@gregluck.com">Greg Luck</a>
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandler.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandler.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandler.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/exceptionhandler/CacheExceptionHandler.java	2015-06-17 13:35:33.133496037 +0200
-@@ -20,14 +20,14 @@
- 
- /**
-  * A handler which may be registered with an Ehcache, to handle exceptions on Cache operations.
-- * <p/>
-+ * 
-  * Handlers may be registered at configuration time in ehcache.xml, using a CacheExceptionHandlerFactory, or
-  *  set at runtime (a strategy).
-- * <p/>
-+ * 
-  * If an exception handler is registered, the default behaviour of throwing the exception will not occur. The handler
-  * method <code>onException</code> will be called. Of course, if the handler decides to throw the exception, it will
-  * propagate up through the call stack. If the handler does not, it won't.
-- * <p/>
-+ * 
-  * Some common Exceptions thrown, and which therefore should be considered when implementing this class are listed below:
-  * <ul>
-  * <li>{@link IllegalStateException} if the cache is not {@link net.sf.ehcache.Status#STATUS_ALIVE}
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java	2015-06-17 13:36:14.111472801 +0200
-@@ -28,23 +28,23 @@
- 
- /**
-  * A dynamic proxy which provides CacheException handling.
-- * <p/>
-+ * 
-  * The ehcache configuration will create and register in the <code>CacheManager</code> {@link Ehcache}s decorated
-  * with this dynamic proxy. See following for programmatic use.
-- * <p/>
-+ * 
-  * The createProxy factory method may be used to simply create a proxy. Otherwise the calling client
-  * will need code similar to:
-  * <pre>
-  * (Ehcache) Proxy.newProxyInstance(ehcache.getClass().getClassLoader(), new Class[]{ Ehcache.class },
-  * new ExceptionHandlingDynamicCacheProxy(ehcache));</pre>
-- * <p/>
-+ * 
-  * A common usage is to create a proxy and then register the proxy in <code>CacheManager</code> in place of the
-  * underlying cache. To do that create a proxy and then call
-  * <pre>
-  * cacheManager.replaceCacheWithDecoratedCache(Ehcache cache, Ehcache decoratedCache);
-  * </pre>
-  * All clients accessing the cache through<code>cacheManager.getEhcache()</code> will then receive proxy references.
-- * <p/>
-+ * 
-  * See CacheTest for a perf test.
-  *
-  * @author <a href="mailto:gluck@gregluck.com">Greg Luck</a>
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/extension/CacheExtension.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/extension/CacheExtension.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/extension/CacheExtension.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/extension/CacheExtension.java	2015-06-17 15:00:03.288630474 +0200
-@@ -22,20 +22,20 @@
- 
- /**
-  * This is a general purpose mechanism to allow generic extensions to a Cache.
-- * <p/>
-+ * <p>
-  * CacheExtensions are tied into the Cache lifecycle. For that reason this interface has the
-  *  lifecycle methods.
-- * <p/>
-+ * <p>
-  * CacheExtensions are created using the CacheExtensionFactory which has a
-  * <code>createCacheCacheExtension()</code> method which takes as a parameter a Cache and
-  * properties. It can thus call back into any public method on Cache, including, of course,
-  *  the load methods.
-- * <p/>
-+ * <p>
-  * CacheExtensions are suitable for timing services, where you want to create a timer to
-  * perform cache operations. The other way of adding Cache behaviour is to decorate a cache.
-  * See {@link net.sf.ehcache.constructs.blocking.BlockingCache} for an example of how to do
-  * this.
-- * <p/>
-+ * <p>
-  * Because a CacheExtension holds a reference to a Cache, the CacheExtension can do things
-  * such as registering a CacheEventListener or even a CacheManagerEventListener, all from
-  * within a CacheExtension, creating more opportunities for customisation.
-@@ -47,7 +47,7 @@
- 
-     /**
-      * Notifies providers to initialise themselves.
--     * <p/>
-+     * <p>
-      * This method is called during the Cache's initialise method after it has changed it's
-      * status to alive. Cache operations are legal in this method.
-      *
-@@ -58,7 +58,7 @@
-     /**
-      * Providers may be doing all sorts of exotic things and need to be able to clean up on
-      * dispose.
--     * <p/>
-+     * <p>
-      * Cache operations are illegal when this method is called. The cache itself is partly
-      * disposed when this method is called.
-      *
-@@ -69,7 +69,7 @@
-     /**
-      * Creates a clone of this extension. This method will only be called by ehcache before a
-      * cache is initialized.
--     * <p/>
-+     * <p>
-      * Implementations should throw CloneNotSupportedException if they do not support clone
-      * but that will stop them from being used with defaultCache.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/AbstractEhcacheProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/AbstractEhcacheProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/AbstractEhcacheProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/AbstractEhcacheProvider.java	2015-06-17 13:01:23.274212917 +0200
-@@ -46,7 +46,7 @@
- 
-     /**
-      * Builds a Cache.
--     * <p/>
-+     * 
-      * Even though this method provides properties, they are not used.
-      * Properties for EHCache are specified in the ehcache.xml file.
-      * Configuration will be read from ehcache.xml for a cache declaration
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/AbstractEhcacheRegionFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/AbstractEhcacheRegionFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/AbstractEhcacheRegionFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/AbstractEhcacheRegionFactory.java	2015-06-17 13:01:58.163597613 +0200
-@@ -56,16 +56,16 @@
- 
-     /**
-      * The Hibernate system property specifying the location of the ehcache configuration file name.
--     * <p/>
-+     * 
-      * If not set, ehcache.xml will be looked for in the root of the classpath.
--     * <p/>
-+     * 
-      * If set to say ehcache-1.xml, ehcache-1.xml will be looked for in the root of the classpath.
-      */
-     public static final String NET_SF_EHCACHE_CONFIGURATION_RESOURCE_NAME = "net.sf.ehcache.configurationResourceName";
- 
-     /**
-      * The Hibernate system property specifying the name of the CacheManager being created.
--     * <p/>
-+     * 
-      * If not set, it will either use the ehcache.xml to name the CacheManager, or fallback to default CacheManager naming.
-      */
-     public static final String NET_SF_EHCACHE_CACHE_MANAGER_NAME = "net.sf.ehcache.cacheManagerName";
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/EhCache.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/EhCache.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/EhCache.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/EhCache.java	2015-06-17 12:59:49.133571426 +0200
-@@ -32,14 +32,14 @@
- 
- /**
-  * EHCache plugin for Hibernate.
-- * <p/>
-+ * 
-  * EHCache uses a {@link net.sf.ehcache.store.MemoryStore} and a
-  * {@link net.sf.ehcache.store.disk.DiskStore}.
-- * <p/>
-+ * 
-  * The {@link net.sf.ehcache.store.disk.DiskStore} requires that both keys and values be {@link java.io.Serializable}.
-  * However the MemoryStore does not and in ehcache-1.2 nonSerializable Objects are permitted. They are discarded
-  * if an attempt it made to overflow them to Disk or to replicate them to remote cache peers.
-- * <p/>
-+ * 
-  *
-  * @author Greg Luck
-  * @author Emmanuel Bernard
-@@ -58,7 +58,7 @@
-     
-     /**
-      * Creates a new Hibernate pluggable cache by name.
--     * <p/>
-+     * 
-      * ehcache will look in ehcache.xml to load the configuration for the cache.
-      * If the cache is not there, it will use the defaultCache settings. It is
-      * always a good idea to specifically configure each cache.
-@@ -149,7 +149,7 @@
- 
-     /**
-      * Removes the element which matches the key.
--     * <p/>
-+     * 
-      * If no element matches, nothing is removed and no Exception is thrown.
-      *
-      * @param key the key of the element to remove
-@@ -180,7 +180,7 @@
- 
-     /**
-      * Remove the cache and make it unuseable.
--     * <p/>
-+     * 
-      *
-      * @throws CacheException
-      */
-@@ -241,7 +241,7 @@
-      * Warning: This method can be very expensive to run. Allow approximately 1 second
-      * per 1MB of entries. Running this method could create liveness problems
-      * because the object lock is held for a long period
--     * <p/>
-+     * 
-      *
-      * @return the approximate size of memory ehcache is using for the MemoryStore for this cache
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/EhCacheProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/EhCacheProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/EhCacheProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/EhCacheProvider.java	2015-06-17 13:01:04.141098739 +0200
-@@ -34,21 +34,21 @@
-  * Hibernate session factories, each with its own ehcache configuration, and non Serializable keys and values.
-  * Ehcache-1.2 also has many other features such as cluster support and listeners, which can be used seamlessly simply
-  * by configurion in ehcache.xml.
-- * <p/>
-+ * 
-  * Use <code>hibernate.cache.provider_class=net.sf.ehcache.hibernate.EhCacheProvider</code> in the Hibernate configuration
-  * to enable this provider for Hibernate's second level cache.
-- * <p/>
-+ * 
-  * When configuring multiple ehcache CacheManagers, as you would where you have multiple Hibernate Configurations and
-  * multiple SessionFactories, specify in each Hibernate configuration the ehcache configuration using
-  * the property <code>net.sf.ehcache.configurationResourceName</code> An example to set an ehcach configuration
-  * called ehcache-2.xml would be <code>net.sf.ehcache.configurationResourceName=/ehcache-2.xml</code>. If the leading
-  * slash is not there one will be added. The configuration file will be looked for in the root of the classpath.
-- * <p/>
-+ * 
-  * Updated for ehcache-1.2. Note this provider requires ehcache-1.2.jar. Make sure ehcache-1.1.jar or earlier
-  * is not in the classpath or it will not work.
-- * <p/>
-+ * 
-  * See http://ehcache.org for documentation on ehcache
-- * <p/>
-+ * 
-  *
-  * @author Greg Luck
-  * @author Emmanuel Bernard
-@@ -59,9 +59,9 @@
- 
-     /**
-      * The Hibernate system property specifying the location of the ehcache configuration file name.
--     * <p/>
-+     * 
-      * If not set, ehcache.xml will be looked for in the root of the classpath.
--     * <p/>
-+     * 
-      * If set to say ehcache-1.xml, ehcache-1.xml will be looked for in the root of the classpath.
-      */
-     public static final String NET_SF_EHCACHE_CONFIGURATION_RESOURCE_NAME = "net.sf.ehcache.configurationResourceName";
-@@ -73,7 +73,7 @@
-     /**
-      * Callback to perform any necessary initialization of the underlying cache implementation
-      * during SessionFactory construction.
--     * <p/>
-+     * 
-      *
-      * @param properties current configuration settings.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/api/EhcacheHibernateMBean.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/api/EhcacheHibernateMBean.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/api/EhcacheHibernateMBean.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/api/EhcacheHibernateMBean.java	2015-06-17 13:05:01.572106194 +0200
-@@ -19,7 +19,7 @@
- /**
-  * MBean interface for hibernate statistics of session-factories
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * 
-@@ -27,7 +27,7 @@
- public interface EhcacheHibernateMBean extends EhcacheStats, HibernateStats {
-     /**
-      * Returns true if hibernate statistics is supported.
--     * <p />
-+     * 
-      * It depends on whether the property <tt>hibernate.session_factory_name</tt> has been specified in the hibernate configuration for the
-      * hibernate statistics to be enabled
-      * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/api/EhcacheStats.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/api/EhcacheStats.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/api/EhcacheStats.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/api/EhcacheStats.java	2015-06-17 13:08:09.914386351 +0200
-@@ -23,7 +23,7 @@
- /**
-  * Interface for ehcache related statistics of hibernate second level cache
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/api/HibernateStats.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/api/HibernateStats.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/api/HibernateStats.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/api/HibernateStats.java	2015-06-17 13:08:23.854740942 +0200
-@@ -22,7 +22,7 @@
- /**
-  * Interface for hibernate related statistics of hibernate second level cache
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernate.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernate.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernate.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernate.java	2015-06-17 13:05:28.936839265 +0200
-@@ -34,7 +34,7 @@
- /**
-  * Implementation of the {@link EhcacheHibernateMBean}
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMbeanNames.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMbeanNames.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMbeanNames.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMbeanNames.java	2015-06-17 13:05:46.726015665 +0200
-@@ -22,7 +22,7 @@
- /**
-  * Utility class used for getting {@link ObjectName}'s for ehcache hibernate MBeans
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMBeanRegistrationImpl.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMBeanRegistrationImpl.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMBeanRegistrationImpl.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMBeanRegistrationImpl.java	2015-06-17 13:06:31.017965043 +0200
-@@ -37,7 +37,7 @@
-  * Implementation of {@link EhcacheHibernateMBeanRegistration}.
-  * Also implements {@link CacheManagerEventListener}. Deregisters mbeans when the associated cachemanager is shutdown.
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMBeanRegistration.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMBeanRegistration.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMBeanRegistration.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheHibernateMBeanRegistration.java	2015-06-17 13:06:07.730043223 +0200
-@@ -25,7 +25,7 @@
- /**
-  * Interface for helping registering mbeans for ehcache backed hibernate second-level cache
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * 
-@@ -34,7 +34,7 @@
- 
-     /**
-      * Registers MBean for the input manager and session factory properties.
--     * <p />
-+     * 
-      * MBeans will be registered based on the input session factory name. If the input name is null or blank, the name of the cache-manager
-      * is used
-      * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheStatsImpl.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheStatsImpl.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheStatsImpl.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/EhcacheStatsImpl.java	2015-06-17 13:06:53.125941491 +0200
-@@ -32,7 +32,7 @@
- /**
-  * Implementation of {@link EhcacheStats}
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/HibernateStatsImpl.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/HibernateStatsImpl.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/HibernateStatsImpl.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/HibernateStatsImpl.java	2015-06-17 16:00:17.305150093 +0200
-@@ -33,7 +33,7 @@
- /**
-  * Implementation of {@link HibernateStats}
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/NullHibernateStats.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/NullHibernateStats.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/NullHibernateStats.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/NullHibernateStats.java	2015-06-17 13:07:13.423001781 +0200
-@@ -27,7 +27,7 @@
- /**
-  * Implementation of {@link HibernateStats} that does nothing
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/ProviderMBeanRegistrationHelper.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/ProviderMBeanRegistrationHelper.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/management/impl/ProviderMBeanRegistrationHelper.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/management/impl/ProviderMBeanRegistrationHelper.java	2015-06-17 13:07:31.482165680 +0200
-@@ -35,7 +35,7 @@
- /**
-  * Helper class for registering mbeans for ehcache backed hibernate second level cache
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/SingletonEhCacheProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/SingletonEhCacheProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/hibernate/SingletonEhCacheProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/hibernate/SingletonEhCacheProvider.java	2015-06-17 13:02:53.768023248 +0200
-@@ -35,18 +35,18 @@
-  * Singleton cache Provider plugin for Hibernate 3.2 and ehcache-1.2. New in this provider is support for
-  * non Serializable keys and values. This provider works as a Singleton. No matter how many Hibernate Configurations
-  * you have, only one ehcache CacheManager is used. See EhCacheProvider for a non-singleton implementation.
-- * <p/>
-+ * 
-  * Ehcache-1.2 also has many other features such as cluster support and listeners, which can be used seamlessly simply
-  * by configurion in ehcache.xml.
-- * <p/>
-+ * 
-  * Use <code>hibernate.cache.provider_class=net.sf.ehcache.hibernate.SingletonEhCacheProvider</code> in the Hibernate configuration
-  * to enable this provider for Hibernate's second level cache.
-- * <p/>
-+ * 
-  * Updated for ehcache-1.2. Note this provider requires ehcache-1.2.jar. Make sure ehcache-1.1.jar or earlier
-  * is not in the classpath or it will not work.
-- * <p/>
-+ * 
-  * See http://ehcache.org for documentation on ehcache
-- * <p/>
-+ * 
-  *
-  * @author Greg Luck
-  * @author Emmanuel Bernard
-@@ -57,9 +57,9 @@
- 
-     /**
-      * The Hibernate system property specifying the location of the ehcache configuration file name.
--     * <p/
-+     * 
-      * If not set, ehcache.xml will be looked for in the root of the classpath.
--     * <p/>
-+     * 
-      * If set to say ehcache-1.xml, ehcache-1.xml will be looked for in the root of the classpath.
-      */
-     public static final String NET_SF_EHCACHE_CONFIGURATION_RESOURCE_NAME = "net.sf.ehcache.configurationResourceName";
-@@ -77,7 +77,7 @@
-     /**
-      * Callback to perform any necessary initialization of the underlying cache implementation
-      * during SessionFactory construction.
--     * <p/>
-+     * 
-      *
-      * @param properties current configuration settings.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/loader/CacheLoaderFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/loader/CacheLoaderFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/loader/CacheLoaderFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/loader/CacheLoaderFactory.java	2015-06-17 13:17:53.589227938 +0200
-@@ -23,7 +23,7 @@
- /**
-  * An abstract factory for creating cache loaders. Implementers should provide their own
-  * concrete factory extending this factory.
-- * <p/>
-+ * 
-  * Note that Ehcache API also allows the CacheLoader to be set programmatically.
-  * @author Greg Luck
-  * @version $Id: CacheLoaderFactory.java 5631 2012-05-10 08:31:33Z teck $
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/loader/CacheLoader.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/loader/CacheLoader.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/loader/CacheLoader.java	2012-10-27 06:43:47.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/loader/CacheLoader.java	2015-06-17 13:17:31.400297895 +0200
-@@ -65,7 +65,7 @@
- 
-     /**
-      * Load using both a key and an argument.
--     * <p/>
-+     * 
-      * JCache will call through to the load(key) method, rather than this method, where the argument is null.
-      *
-      * @param key      the key to load the object for
-@@ -77,7 +77,7 @@
- 
-     /**
-      * Load using both a key and an argument.
--     * <p/>
-+     * 
-      * JCache will use the loadAll(key) method where the argument is null.
-      *
-      * @param keys     the keys to load objects for
-@@ -97,7 +97,7 @@
-     /**
-      * Creates a clone of this extension. This method will only be called by ehcache before a
-      * cache is initialized.
--     * <p/>
-+     * 
-      * Implementations should throw CloneNotSupportedException if they do not support clone
-      * but that will stop them from being used with defaultCache.
-      *
-@@ -109,7 +109,7 @@
- 
-     /**
-      * Notifies providers to initialise themselves.
--     * <p/>
-+     * 
-      * This method is called during the Cache's initialise method after it has changed it's
-      * status to alive. Cache operations are legal in this method.
-      *
-@@ -122,10 +122,10 @@
-      * CacheLoader instances may be doing all sorts of exotic things and need to be able to clean up
-      * on dispose. This method will be invoked when {@link net.sf.ehcache.Cache#dispose() Cache.dispose()} is invoked
-      * if this CacheLoader is registered with the cache at disposal time, allowing for any necessary cleanup.
--     * <p/>
-+     * 
-      * No operations may be performed on the cache this CacheLoader is registered with. The
-      * cache itself is partly disposed when this method is called, and should not be accessed.
--     * <p/>
-+     * 
-      *
-      * @throws net.sf.ehcache.CacheException
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/Cache.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/Cache.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/Cache.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/Cache.java	2015-06-17 15:14:34.504232911 +0200
-@@ -48,12 +48,12 @@
-      * A constructor for JCache.
-      *
-      * JCache is an adaptor for an Ehcache, and therefore requires an Ehcace in its constructor.
--     * <p/>
-+     * <p>
-      * The {@link net.sf.ehcache.config.ConfigurationFactory} and clients can create these.
--     * <p/>
-+     * <p>
-      * A client can specify their own settings here and pass the {@link Ehcache} object
-      * into {@link net.sf.ehcache.CacheManager#addCache} to specify parameters other than the defaults.
--     * <p/>
-+     * <p>
-      * Only the CacheManager can initialise them.
-      *
-      * @param cache An ehcache
-@@ -65,7 +65,7 @@
-     }
- 
-     /**
--     * Creates an object name using the scheme "net.sf.ehcache:type=Cache,CacheManager=<cacheManagerName>,name=<cacheName>"
-+     * Creates an object name using the scheme "net.sf.ehcache:type=Cache,CacheManager&le;cacheManagerName&gt;,name&le;cacheName&gt;"
-      */
-     static ObjectName createObjectName(String cacheManagerName, String cacheName) {
-         ObjectName objectName;
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/CacheManager.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/CacheManager.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/CacheManager.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/CacheManager.java	2015-06-17 15:13:41.194475573 +0200
-@@ -48,7 +48,7 @@
-     }
- 
-     /**
--     * Creates an object name using the scheme "net.sf.ehcache:type=CacheManager,name=<cacheManagerName>"
-+     * Creates an object name using the scheme "net.sf.ehcache:type=CacheManager,name&le;cacheManagerName&gt;"
-      */
-     static ObjectName createObjectName(net.sf.ehcache.CacheManager cacheManager) {
-         ObjectName objectName;
-@@ -81,7 +81,7 @@
- 
-     /**
-      * Shuts down the CacheManager.
--    * <p/>
-+    * <p>
-     * If the shutdown occurs on the singleton, then the singleton is removed, so that if a singleton access method
-     * is called, a new singleton will be created.
-     */
-@@ -92,7 +92,7 @@
-     /**
-      * Clears  the contents of all caches in the CacheManager, but without
-      * removing any caches.
--     * <p/>
-+     * <p>
-      * This method is not synchronized. It only guarantees to clear those elements in a cache
-      * at the time that the {@link net.sf.ehcache.Ehcache#removeAll()} mehod  on each cache is called.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/CacheManagerMBean.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/CacheManagerMBean.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/CacheManagerMBean.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/CacheManagerMBean.java	2015-06-17 15:59:45.693613639 +0200
-@@ -42,7 +42,7 @@
- 
-      /**
-      * Shuts down the CacheManager.
--     * <p/>
-+     * <p>
-      * If the shutdown occurs on the singleton, then the singleton is removed, so that if a singleton access method
-      * is called, a new singleton will be created.
-      */
-@@ -52,7 +52,7 @@
-     /**
-      * Clears  the contents of all caches in the CacheManager, but without
-      * removing any caches.
--     * <p/>
-+     * <p>
-      * This method is not synchronized. It only guarantees to clear those elements in a cache
-      * at the time that the {@link net.sf.ehcache.Ehcache#removeAll()} mehod  on each cache is called.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/CacheStatistics.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/CacheStatistics.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/CacheStatistics.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/CacheStatistics.java	2015-06-17 15:11:37.822665643 +0200
-@@ -30,16 +30,16 @@
- 
- /**
-  * A JMX CacheStatistics decorator for an ehcache Statistics class.
-- * <p/>
-+ * <p>
-  * An immutable Cache statistics implementation}
-- * <p/>
-+ * <p>
-  * This is like a value object, with the added ability to clear cache statistics on the cache.
-  * That ability does not survive any Serialization of this class. On deserialization the cache
-  * can be considered disconnected.
-- * <p/>
-+ * <p>
-  * The accuracy of these statistics are determined by the value of {#getStatisticsAccuracy()}
-  * at the time the statistic was computed. This can be changed by setting {@link net.sf.ehcache.Cache#setStatisticsAccuracy}.
-- * <p/>
-+ * <p>
-  * Because this class maintains a reference to an Ehcache, any references held to this class will precent the Ehcache
-  * from getting garbage collected.
-  *
-@@ -81,7 +81,7 @@
-     }
- 
-     /**
--     * Creates an object name using the scheme "net.sf.ehcache:type=CacheStatistics,CacheManager=<cacheManagerName>,name=<cacheName>"
-+     * Creates an object name using the scheme "net.sf.ehcache:type=CacheStatistics,CacheManager&le;cacheManagerName&gt;,name&le;cacheName&gt;"
-      */
-     static ObjectName createObjectName(String cacheManagerName, String cacheName) {
-         ObjectName objectName;
-@@ -143,7 +143,7 @@
- 
-     /**
-      * The number of times a requested item was found in the cache.
--     * <p/>
-+     * <p>
-      * Warning. This statistic is recorded as a long. If the statistic is large than Integer#MAX_VALUE
-      * precision will be lost.
-      *
-@@ -218,28 +218,28 @@
-      * this method will return three different values, depending on the statistics accuracy setting.
-      * <h3>Best Effort Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link net.sf.ehcache.Statistics#STATISTICS_ACCURACY_BEST_EFFORT}.
--     * <p/>
-+     * <p>
-      * The size is the number of {@link net.sf.ehcache.Element}s in the {@link net.sf.ehcache.store.MemoryStore} plus
-      * the number of {@link net.sf.ehcache.Element}s in the {@link net.sf.ehcache.store.disk.DiskStore}.
--     * <p/>
-+     * <p>
-      * This number is the actual number of elements, including expired elements that have
-      * not been removed. Any duplicates between stores are accounted for.
--     * <p/>
-+     * <p>
-      * Expired elements are removed from the the memory store when
-      * getting an expired element, or when attempting to spool an expired element to
-      * disk.
--     * <p/>
-+     * <p>
-      * Expired elements are removed from the disk store when getting an expired element,
-      * or when the expiry thread runs, which is once every five minutes.
--     * <p/>
-+     * <p>
-      * <h3>Guaranteed Accuracy Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link net.sf.ehcache.Statistics#STATISTICS_ACCURACY_GUARANTEED}.
--     * <p/>
-+     * <p>
-      * This method accounts for elements which might be expired or duplicated between stores. It take approximately
-      * 200ms per 1000 elements to execute.
-      * <h3>Fast but non-accurate Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link Statistics#STATISTICS_ACCURACY_NONE}.
--     * <p/>
-+     * <p>
-      * The number given may contain expired elements. In addition if the DiskStore is used it may contain some double
-      * counting of elements. It takes 6ms for 1000 elements to execute. Time to execute is O(log n). 50,000 elements take
-      * 36ms.
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/CacheStatisticsMBean.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/CacheStatisticsMBean.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/CacheStatisticsMBean.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/CacheStatisticsMBean.java	2015-06-17 15:12:09.093350131 +0200
-@@ -81,28 +81,28 @@
-      * this method will return three different values, depending on the statistics accuracy setting.
-      * <h3>Best Effort Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link net.sf.ehcache.Statistics#STATISTICS_ACCURACY_BEST_EFFORT}.
--     * <p/>
-+     * <p>
-      * The size is the number of {@link net.sf.ehcache.Element}s in the {@link net.sf.ehcache.store.MemoryStore} plus
-      * the number of {@link net.sf.ehcache.Element}s in the {@link net.sf.ehcache.store.disk.DiskStore}.
--     * <p/>
-+     * <p>
-      * This number is the actual number of elements, including expired elements that have
-      * not been removed. Any duplicates between stores are accounted for.
--     * <p/>
-+     * <p>
-      * Expired elements are removed from the the memory store when
-      * getting an expired element, or when attempting to spool an expired element to
-      * disk.
--     * <p/>
-+     * <p>
-      * Expired elements are removed from the disk store when getting an expired element,
-      * or when the expiry thread runs, which is once every five minutes.
--     * <p/>
-+     * <p>
-      * <h3>Guaranteed Accuracy Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link net.sf.ehcache.Statistics#STATISTICS_ACCURACY_GUARANTEED}.
--     * <p/>
-+     * <p>
-      * This method accounts for elements which might be expired or duplicated between stores. It take approximately
-      * 200ms per 1000 elements to execute.
-      * <h3>Fast but non-accurate Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link net.sf.ehcache.Statistics#STATISTICS_ACCURACY_NONE}.
--     * <p/>
-+     * <p>
-      * The number given may contain expired elements. In addition if the DiskStore is used it may contain some double
-      * counting of elements. It takes 6ms for 1000 elements to execute. Time to execute is O(log n). 50,000 elements take
-      * 36ms.
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/ManagementService.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/ManagementService.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/ManagementService.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/ManagementService.java	2015-06-17 15:08:59.109514095 +0200
-@@ -42,16 +42,16 @@
-  * in Java EE environments, applications are often undeployed and then redeployed. A
-  * servlet listener available in the web module, <code>net.sf.ehcache.constructs.web.ShutdownListener</code>}
-  * enables this to be detected and the CacheManager shutdown.
-- * <p/>
-+ * <p>
-  * When a CacheManager is shut down we need to ensure there is no memory, resource or
-  * thread leakage. An MBeanServer, particularly a platform MBeanServer, can be expected
-  * to exist for the lifespan of the JVM. Accordingly, we need to deregister them when
-  * needed without creating a leakage.
-- * <p/>
-+ * <p>
-  * The second purpose of this class (and this package) is to keep management concerns away
-  * from the core ehcache packages. That way, JMX is not a required dependency, but rather
-  * an optional one.
-- * <p/>
-+ * <p>
-  * This class is constructable as of 1.5 to support injection via IoC containers.
-  *
-  * @author Greg Luck
-@@ -76,11 +76,11 @@
- 
-     /**
-      * A constructor for a management service for a range of possible MBeans.
--     * <p/>
-+     * <p>
-      * The {@link #init()} method needs to be called after construction which causes
-      * the selected monitoring options to be be registered
-      * with the provided MBeanServer for caches in the given CacheManager.
--     * <p/>
-+     * <p>
-      * While registering the CacheManager enables traversal to all of the other
-      * items,
-      * this requires programmatic traversal. The other options allow entry points closer
-@@ -88,7 +88,7 @@
-      * Moreover CacheManager and Cache are not serializable, so remote monitoring is not possible
-      * for CacheManager or Cache, while CacheStatistics and CacheConfiguration are. Finally
-      * CacheManager and Cache enable management operations to be performed.
--     * <p/>
-+     * <p>
-      * Once monitoring is enabled caches will automatically added and removed from the MBeanServer
-      * as they are added and disposed of from the CacheManager. When the CacheManager itself
-      * shutsdown all registered MBeans will be unregistered.
-@@ -122,11 +122,11 @@
- 
-     /**
-          * A constructor for a management service for a range of possible MBeans.
--         * <p/>
-+         * <p>
-          * The {@link #init()} method needs to be called after construction which causes
-          * the selected monitoring options to be be registered
-          * with the provided MBeanServer for caches in the given CacheManager.
--         * <p/>
-+         * <p>
-          * While registering the CacheManager enables traversal to all of the other
-          * items,
-          * this requires programmatic traversal. The other options allow entry points closer
-@@ -134,7 +134,7 @@
-          * Moreover CacheManager and Cache are not serializable, so remote monitoring is not possible
-          * for CacheManager or Cache, while CacheStatistics and CacheConfiguration are. Finally
-          * CacheManager and Cache enable management operations to be performed.
--         * <p/>
-+         * <p>
-          * Once monitoring is enabled caches will automatically added and removed from the MBeanServer
-          * as they are added and disposed of from the CacheManager. When the CacheManager itself
-          * shutsdown all registered MBeans will be unregistered.
-@@ -195,7 +195,7 @@
-     /**
-      * A convenience static method which creates a ManagementService and initialises it with the
-      * supplied parameters.
--     * <p/>
-+     * <p>
-      * This one is provided for backward compatibility
-      *
-      * @param cacheManager                the CacheManager to listen to
-@@ -339,10 +339,10 @@
- 
-     /**
-      * Called immediately after a cache has been added and activated.
--     * <p/>
-+     * <p>
-      * Note that the CacheManager calls this method from a synchronized method. Any attempt to
-      * call a synchronized method on CacheManager from this method will cause a deadlock.
--     * <p/>
-+     * <p>
-      * Note that activation will also cause a CacheEventListener status change notification
-      * from {@link net.sf.ehcache.Status#STATUS_UNINITIALISED} to
-      * {@link net.sf.ehcache.Status#STATUS_ALIVE}. Care should be taken on processing that
-@@ -354,7 +354,7 @@
-      * will cause a deadlock.
-      * </ul>
-      * The calling method will block until this method returns.
--     * <p/>
-+     * <p>
-      *
-      * @param cacheName the name of the <code>Cache</code> the operation relates to
-      * @see net.sf.ehcache.event.CacheEventListener
-@@ -377,10 +377,10 @@
-     /**
-      * Called immediately after a cache has been disposed and removed. The calling method will
-      * block until this method returns.
--     * <p/>
-+     * <p>
-      * Note that the CacheManager calls this method from a synchronized method. Any attempt to
-      * call a synchronized method on CacheManager from this method will cause a deadlock.
--     * <p/>
-+     * <p>
-      * Note that a {@link net.sf.ehcache.event.CacheEventListener} status changed will also be triggered. Any
-      * attempt from that notification to access CacheManager will also result in a deadlock.
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderException.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderException.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderException.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderException.java	2015-06-17 15:06:41.533962891 +0200
-@@ -18,7 +18,7 @@
- /**
-  * Exception thrown from {@link MBeanRegistrationProvider}
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderFactoryImpl.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderFactoryImpl.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderFactoryImpl.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderFactoryImpl.java	2015-06-17 15:06:19.115013770 +0200
-@@ -20,7 +20,7 @@
- /**
-  * Defult implementation of {@link MBeanRegistrationProvider}
-  * 
-- * <p />
-+ * 
-  * 
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderFactory.java	2015-06-17 15:06:33.213352916 +0200
-@@ -20,7 +20,7 @@
- /**
-  * Factory interface to create {@link MBeanRegistrationProvider}
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderImpl.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderImpl.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderImpl.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProviderImpl.java	2015-06-17 15:05:44.733625383 +0200
-@@ -25,7 +25,7 @@
- 
- /**
-  * Implementation of {@link MBeanRegistrationProvider}
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7.1
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/MBeanRegistrationProvider.java	2015-06-17 15:06:49.632583272 +0200
-@@ -23,7 +23,7 @@
-  * the passed CacheManager.
-  * This is in addition to the ManagementService and has nothing to do
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/NullMBeanRegistrationProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/NullMBeanRegistrationProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/provider/NullMBeanRegistrationProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/provider/NullMBeanRegistrationProvider.java	2015-06-17 15:06:05.343659296 +0200
-@@ -20,7 +20,7 @@
- 
- /**
-  * A Null implementation of {@link MBeanRegistrationProvider} which does nothing
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/ResourceClassLoader.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/ResourceClassLoader.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/ResourceClassLoader.java	2013-01-04 18:05:37.000000000 +0100
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/ResourceClassLoader.java	2015-06-17 15:07:31.966598882 +0200
-@@ -58,7 +58,7 @@
-      *
-      * @param prefix
-      * @param parent
--     * @throws IOException
-+     * throws IOException
-      */
-     public ResourceClassLoader(String prefix, ClassLoader parent) {
-         super(parent);
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/CacheManagerSampler.java	2015-06-17 15:05:12.155152485 +0200
-@@ -59,7 +59,7 @@
- 
-     /**
-      * Shuts down the CacheManager.
--     * <p/>
-+     * <p>
-      * If the shutdown occurs on the singleton, then the singleton is removed, so that if a singleton access method is called, a new
-      * singleton will be created.
-      */
-@@ -68,7 +68,7 @@
-     /**
-      * Clears the contents of all caches in the CacheManager, but without
-      * removing any caches.
--     * <p/>
-+     * <p>
-      * This method is not synchronized. It only guarantees to clear those elements in a cache at the time that the
-      * {@link net.sf.ehcache.Ehcache#removeAll()} mehod on each cache is called.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/SampledCache.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/SampledCache.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/SampledCache.java	2012-07-07 20:46:31.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/SampledCache.java	2015-06-17 15:04:37.277787347 +0200
-@@ -1173,7 +1173,7 @@
-     /**
-      * getCacheAttributes
-      *
--     * @return map of attribute name -> value
-+     * @return map of attribute name -&gt; value
-      */
-     public Map<String, Object> getCacheAttributes() {
-         Map<String, Object> result = new HashMap<String, Object>();
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/SampledCacheMBean.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/SampledCacheMBean.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/SampledCacheMBean.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/SampledCacheMBean.java	2015-06-17 15:59:16.362971584 +0200
-@@ -19,8 +19,8 @@
- /**
-  * An MBean for Cache exposing cache statistics.
-  * Extends from both {@link CacheSampler}
-- * <p/>
-- * <p/>
-+ * 
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  */
-@@ -92,7 +92,7 @@
-      * setMaxElementsInMemory
-      *
-      * @param maxElements
--     * @deprecated use {@link #setMaxEntriesLocalHeap()} instead
-+     * deprecated use setMaxEntriesLocalHeap() instead
-      */
-     @Deprecated
-     void setMaxElementsInMemory(int maxElements);
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/SampledEhcacheMBeans.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/SampledEhcacheMBeans.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/SampledEhcacheMBeans.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/SampledEhcacheMBeans.java	2015-06-17 15:02:59.231383231 +0200
-@@ -24,7 +24,7 @@
- /**
-  * Utility class used for getting {@link ObjectName}'s for sampled MBeans
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java	2015-06-17 15:02:36.998425392 +0200
-@@ -47,7 +47,7 @@
-  * This also implements {@link CacheManagerEventListener} to add/remove/cleanup
-  * MBeans for new caches added or removed
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/MimeTypeByteArray.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/MimeTypeByteArray.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/MimeTypeByteArray.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/MimeTypeByteArray.java	2015-06-17 11:46:48.344958259 +0200
-@@ -20,7 +20,7 @@
- 
- /**
-  * A bean used to wrap byte[] values to be placed in an Element so as to preserve MIME type information.
-- * <p/>
-+ * 
-  * This class provides the means to bypass Java's serialization mechanism to as to store anything that can be turned
-  * into bytes. It opens the way to non Java uses of ehcache.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/pool/sizeof/filter/AnnotationProxyFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/pool/sizeof/filter/AnnotationProxyFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/pool/sizeof/filter/AnnotationProxyFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/pool/sizeof/filter/AnnotationProxyFactory.java	2015-06-17 12:19:46.774291808 +0200
-@@ -33,12 +33,12 @@
-  *  ehcache.Annotation annotation = AnnotationProxyFactory.getAnnotationProxy(customAnnotation, ehcache.Annotation.class);
-  *
-  *  //so my library can apply the behavior when the default annotation is used
-- *  @ehcache.Annotation(action="true")
-+ *  ehcache.Annotation(action="true")
-  *  public class UserClass {}
-  *
-  *  //or when a custom one is used, since all calls to action() will be caught and redirected to the custom annotation action method, if it exists,
-  *  //or fall back to the reference action method
-- *  @my.Annotation(action="true")
-+ *  my.Annotation(action="true")
-  *  public class UserClass {}
-  *
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/aggregator/Average.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/aggregator/Average.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/aggregator/Average.java	2012-05-11 05:35:28.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/aggregator/Average.java	2015-06-17 13:51:44.794521488 +0200
-@@ -45,7 +45,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * NOTE: Null values are ignored and not included in the computation
-      */
-     public void accept(Object input) throws AggregatorException {
-@@ -66,7 +66,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * NOTE: null is returned if there was no input supplied to this function
-      */
-     public Number aggregateResult() {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/aggregator/Max.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/aggregator/Max.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/aggregator/Max.java	2012-05-11 05:35:28.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/aggregator/Max.java	2015-06-17 15:00:47.303567292 +0200
-@@ -22,7 +22,7 @@
-  * Determine the maximum value
-  *
-  * @author teck
-- * @param <T>
-+ * param &lt;T&gt;
-  */
- public class Max<T> implements AggregatorInstance<T> {
- 
-@@ -44,7 +44,7 @@
-     }
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * NOTE: May return null if no input provided
-      */
-     public T aggregateResult() {
-@@ -54,7 +54,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * NOTE: null input values are ignored
-      */
-     public void accept(Object input) throws AggregatorException {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/aggregator/Min.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/aggregator/Min.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/aggregator/Min.java	2012-05-11 05:35:28.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/aggregator/Min.java	2015-06-17 15:01:06.633661202 +0200
-@@ -22,7 +22,7 @@
-  * Determine the minimum value
-  *
-  * @author teck
-- * @param <T>
-+ * param &lt;T&gt;
-  */
- public class Min<T> implements AggregatorInstance<T> {
- 
-@@ -45,7 +45,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * NOTE: May return null if no input provided
-      */
-     public T aggregateResult() {
-@@ -55,7 +55,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * NOTE: null input values are ignored
-      */
-     public void accept(Object input) throws AggregatorException {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/aggregator/Sum.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/aggregator/Sum.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/aggregator/Sum.java	2012-05-11 05:35:28.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/aggregator/Sum.java	2015-06-17 13:54:02.695712789 +0200
-@@ -20,7 +20,7 @@
- 
- /**
-  * Sums the results
-- * <p/>
-+ * <p>
-  * Sum can be used with most numeric types
-  *
-  * @author Greg Luck
-@@ -46,7 +46,7 @@
-     }
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * NOTE: null inputs are ignored
-      */
-     public void accept(Object input) throws AggregatorException {
-@@ -67,7 +67,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * <p>
-      * NOTE: May return null if no input supplied
-      */
-     public Number aggregateResult() {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/attribute/AttributeExtractorException.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/attribute/AttributeExtractorException.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/attribute/AttributeExtractorException.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/attribute/AttributeExtractorException.java	2015-06-17 13:58:01.973898728 +0200
-@@ -22,7 +22,7 @@
- 
- /**
-  * An exception to indicate that an attribute extractor was unable to be processed.
-- * <p/>
-+ * <p>
-  * Attributes are extracted on put or update, so this exception will be thrown to the calling
-  * thread.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/attribute/AttributeExtractor.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/attribute/AttributeExtractor.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/attribute/AttributeExtractor.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/attribute/AttributeExtractor.java	2015-06-17 13:18:28.673536163 +0200
-@@ -47,7 +47,7 @@
-      * <li>java.sql.Date
-      * <li>java.lang.Enum
-      * </ul>
--     * <p/>
-+     * 
-      * NOTE: null is a legal return here as well indicating that this attribute will not be available for the given element
-      *
-      * @param element the cache element to inspect
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/attribute/DynamicAttributesExtractor.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/attribute/DynamicAttributesExtractor.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/attribute/DynamicAttributesExtractor.java	2013-01-17 08:54:30.000000000 +0100
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/attribute/DynamicAttributesExtractor.java	2015-06-17 13:58:42.023921308 +0200
-@@ -26,7 +26,7 @@
- public interface DynamicAttributesExtractor {
-   /**
-    * Given a particular cache element, returns a map from attribute names, to their respective values to use for indexing.
--   * This method will be called once for every {@link Ehcache#put(Element)} and {@link Ehcache#replace(Element)} call.
-+   * This method will be called once for every Ehcache#put(Element) and Ehcache#replace(Element) call.
-    * @param element
-    * @return
-    */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/expression/ILike.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/expression/ILike.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/expression/ILike.java	2012-10-04 02:59:11.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/expression/ILike.java	2015-06-17 15:01:53.924444466 +0200
-@@ -37,7 +37,7 @@
-  * The supported wildcard characters can be escaped with a backslash '\', and a literal backslash can be included with '\\'<br>
-  * <br>
-  * WARN: Expressions starting with a leading wildcard character are potentially very expensive (ie. full scan) for indexed caches
-- * <p/>
-+ * 
-  *
-  * @author teck
-  */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/expression/InCollection.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/expression/InCollection.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/expression/InCollection.java	2012-10-04 02:59:11.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/expression/InCollection.java	2015-06-17 13:50:53.231067370 +0200
-@@ -70,7 +70,7 @@
-     /**
-      * Return values.
-      *
--     * @return Collection<?> values
-+     * @return Collection&lt;?&gt; values
-      */
-     public Collection<?> values() {
-         return Collections.unmodifiableCollection(this.values);
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/Query.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/Query.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/Query.java	2012-05-15 00:06:07.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/Query.java	2015-06-17 13:46:57.553703645 +0200
-@@ -22,26 +22,26 @@
- 
- /**
-  * Creates queries for performing cache searches.
-- * <p/>
-+ * 
-  * Queries are created using our search DSL implemented using Java.
-- * <p/>
-+ * 
-  * A fluent interface provides a compact and yet easy-to-read representation. Fluent interfaces are implemented using method chaining.
-  * Static factory methods and imports are a great aid in creating a compact, yet readable DSL.
-- * <p/>
-+ * 
-  * Out API has the following features:
-- * <p/>
-+ * 
-  * Method Chaining - we return <code>this</code>.
-- * <p/>
-- * <p/>
-+ * 
-+ * 
-  * See http://www.infoq.com/articles/internal-dsls-java for a description of these conventions.
-- * <p/>
-+ * 
-  * A query can be executed and then modified and re-executed. If {@link #end} is called the query is made immutable.
-- * <p/>
-+ * 
-  * Both Element keys and attributes of Element can be queried. Attributes must be pre-defined for a cache. They are populated by extraction
-  * from an Element's value using an {@link net.sf.ehcache.search.attribute.AttributeExtractor} .
-- * <p/>
-+ * 
-  * Search results can either be Element keys (the default), values, or the result of an {@link Aggregator} function.
-- * <p/>
-+ * 
-  * A {@link Query} instance can be used by multiple threads
-  *
-  * @author teck
-@@ -81,7 +81,7 @@
-      * Request that the given attribute(s) should be present in the result for
-      * this query. This call can be made multiple times to add to the set of
-      * selected attributes.
--     * <p/>
-+     * 
-      * Note that in a distributed cache attributes may need to come over the network. To prevent very large network transfers, consider
-      * limiting the results size with {@link #maxResults(int)} or by using {@link Results#range} rathern than {@link Results#all()}
-      *
-@@ -92,7 +92,7 @@
- 
-     /**
-      * Request this query to aggregate the results by the given Aggregator(s)
--     * <p/>
-+     * 
-      * This method may be called multiple times to request multiple aggregations
-      *
-      * @param aggregators
-@@ -124,7 +124,7 @@
- 
-     /**
-      * Restrict the number of results returned from the search.
--     * <p/>
-+     * 
-      * By default an unlimited number of results can be returned. This could cause an OutOfMemoryError to be thrown. It is therefore
-      * recommended to add an <code>maxResults</code> clause to your query to limit the size.
-      *
-@@ -141,7 +141,7 @@
-     /**
-      * Execute this query. Every call to this method will re-execute the query
-      * and return a distinct results object.
--     * <p/>
-+     * 
-      * An empty results object will be returned (on timeout) for non-stop enabled caches with {@link net.sf.ehcache.config.TimeoutBehaviorConfiguration.TimeoutBehaviorType#NOOP} and
-      * {@link net.sf.ehcache.config.TimeoutBehaviorConfiguration.TimeoutBehaviorType#LOCAL_READS} behavior
-      *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/Result.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/Result.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/Result.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/Result.java	2015-06-17 13:47:17.672710294 +0200
-@@ -20,7 +20,7 @@
- 
- /**
-  * Represents a single cache entry that has been selected by a cache query.
-- * <p/>
-+ * 
-  *
-  * @author teck
-  * @author Greg Luck
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/Results.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/Results.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/search/Results.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/search/Results.java	2015-06-17 13:46:39.566591736 +0200
-@@ -31,7 +31,7 @@
-      * Discard this query result. This call is not mandatory but is recommended after
-      * the caller is done with results. It can allow the cache, which may be distributed,
-      * to immediately free any resources associated with this result.
--     * <p/>
-+     * 
-      * Multiple calls are ignored. Attempting to read results from this instance after this method has been called will produce
-      * {@link SearchException}
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/CacheUsageListener.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/CacheUsageListener.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/CacheUsageListener.java	2012-06-28 20:50:53.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/CacheUsageListener.java	2015-06-17 12:20:22.080623264 +0200
-@@ -19,10 +19,10 @@
-  * Interface for listeners to any change in usage statistics of an
-  * Ehcache.
-  *
-- * <p />
-+ * 
-  * Implementations of this interface should implement the {@link Object#equals(Object)} and the {@link Object#hashCode()} as registering and
-  * removing listeners depends on these
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/LiveCacheStatistics.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/LiveCacheStatistics.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/LiveCacheStatistics.java	2012-06-28 20:50:53.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/LiveCacheStatistics.java	2015-06-17 12:20:55.970021682 +0200
-@@ -18,11 +18,11 @@
- /**
-  * Interface for usage statistics of a Cache.
-  *
-- * <p />
-+ * 
-  * Implementations of this interface is different from {@link net.sf.ehcache.Statistics} in the way that values returned from this interface
-  * implementations will reflect the current state of the cache and not a snapshot of the cache when the api's were called (which is the
-  * behavior of {@link net.sf.ehcache.Statistics})
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/LiveCacheStatisticsWrapper.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/LiveCacheStatisticsWrapper.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/LiveCacheStatisticsWrapper.java	2012-06-28 20:50:53.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/LiveCacheStatisticsWrapper.java	2015-06-17 12:22:22.091951640 +0200
-@@ -24,7 +24,7 @@
-  * An implementation of {@link LiveCacheStatistics} and also implements {@link LiveCacheStatisticsData}. Uses separate delegates depending
-  * on whether
-  * statistics is enabled or not.
-- * <p />
-+ * 
-  * To collect statistics element put/update/remove/expired data, instances of this class must be registered as a CacheEventListener to a
-  * Cache
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/sampled/NullSampledCacheStatistics.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/sampled/NullSampledCacheStatistics.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/sampled/NullSampledCacheStatistics.java	2012-06-28 20:50:53.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/sampled/NullSampledCacheStatistics.java	2015-06-17 12:22:59.669175776 +0200
-@@ -21,7 +21,7 @@
- 
- /**
-  * A no-op implementation of {@link SampledCacheStatistics}
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatisticsImpl.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatisticsImpl.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatisticsImpl.java	2012-10-16 20:29:13.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatisticsImpl.java	2015-06-17 12:24:03.827143730 +0200
-@@ -35,7 +35,7 @@
-  * the notification
-  * received from
-  * these to update the stats
-- * <p/>
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatistics.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatistics.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatistics.java	2012-06-28 20:50:53.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatistics.java	2015-06-17 12:23:25.915935378 +0200
-@@ -18,7 +18,7 @@
- /**
-  * Interface for <strong>sampled</strong> usage statistics of a Cache
-  *
-- * <p />
-+ * 
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-  * @since 1.7
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatisticsWrapper.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatisticsWrapper.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatisticsWrapper.java	2012-06-28 20:50:53.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/statistics/sampled/SampledCacheStatisticsWrapper.java	2015-06-17 13:59:30.073548918 +0200
-@@ -28,7 +28,7 @@
-  * received from
-  * these to update the stats. Uses separate delegates depending on whether
-  * sampled statistics is enabled or not.
-- * <p />
-+ * <p>
-  * To collect statistics data, instances of this class should be registered as a {@link CacheUsageListener} to a Cache
-  *
-  * @author <a href="mailto:asanoujam@terracottatech.com">Abhishek Sanoujam</a>
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Statistics.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Statistics.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Statistics.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Statistics.java	2015-06-17 11:47:03.743218711 +0200
-@@ -20,17 +20,17 @@
- 
- /**
-  * An immutable Cache statistics implementation
-- * <p/>
-+ * 
-  * This is like a value object, with the added ability to clear cache statistics on the cache.
-  * That ability does not survive any Serialization of this class. On deserialization the cache
-  * can be considered disconnected.
-- * <p/>
-+ * 
-  * The accuracy of these statistics are determined by the value of {@link Cache#getStatisticsAccuracy()}
-  * at the time the statistic was computed. This can be changed by setting {@link Cache#setStatisticsAccuracy}.
-- * <p/>
-+ * 
-  * Because this class maintains a reference to an Ehcache, any references held to this class will prevent the Ehcache
-  * from getting garbage collected.
-- * <p/>
-+ * 
-  * todo Add missCountExpired. Request from user.
-  *
-  * @author Greg Luck
-@@ -222,28 +222,28 @@
-      * this method will return three different values, depending on the statistics accuracy setting.
-      * <h3>Best Effort Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link Statistics#STATISTICS_ACCURACY_BEST_EFFORT}.
--     * <p/>
-+     * 
-      * The size is the number of {@link Element}s in the {@link net.sf.ehcache.store.MemoryStore} plus
-      * the number of {@link Element}s in the {@link net.sf.ehcache.store.disk.DiskStore}.
--     * <p/>
-+     * 
-      * This number is the actual number of elements, including expired elements that have
-      * not been removed. Any duplicates between stores are accounted for.
--     * <p/>
-+     * 
-      * Expired elements are removed from the the memory store when
-      * getting an expired element, or when attempting to spool an expired element to
-      * disk.
--     * <p/>
-+     * 
-      * Expired elements are removed from the disk store when getting an expired element,
-      * or when the expiry thread runs, which is once every five minutes.
--     * <p/>
-+     * 
-      * <h3>Guaranteed Accuracy Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link Statistics#STATISTICS_ACCURACY_GUARANTEED}.
--     * <p/>
-+     * 
-      * This method accounts for elements which might be expired or duplicated between stores. It take approximately
-      * 200ms per 1000 elements to execute.
-      * <h3>Fast but non-accurate Size</h3>
-      * This result is returned when the statistics accuracy setting is {@link #STATISTICS_ACCURACY_NONE}.
--     * <p/>
-+     * 
-      * The number given may contain expired elements. In addition if the DiskStore is used it may contain some double
-      * counting of elements. It takes 6ms for 1000 elements to execute. Time to execute is O(log n). 50,000 elements take
-      * 36ms.
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Status.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Status.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/Status.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/Status.java	2015-06-17 11:47:26.083145768 +0200
-@@ -20,7 +20,7 @@
- 
- /**
-  * A pre JDK1.5 compatible enum class to indicate the status of a {@link CacheManager} or {@link Cache}.
-- * <p/>
-+ * 
-  * ehcache historically used int values for status. This is unsuitable for third party use thus this class.
-  * Methods are provided to convert from the int status values to enum values and vice versa.
-  *
-@@ -62,7 +62,7 @@
-      * be a concise but informative representation that is easy for a
-      * person to read.
-      * It is recommended that all subclasses override this method.
--     * <p/>
-+     * 
-      * The <code>toString</code> method for class <code>Object</code>
-      * returns a string consisting of the name of the class of which the
-      * object is an instance, the at-sign character `<code>@</code>', and
-@@ -102,7 +102,7 @@
- 
-     /**
-      * Indicates whether some other object is "equal to" this one.
--     * <p/>
-+     * 
-      * The <code>equals</code> method implements an equivalence relation
-      * on non-null object references:
-      * <ul>
-@@ -127,14 +127,14 @@
-      * <li>For any non-null reference value <code>x</code>,
-      * <code>x.equals(null)</code> should return <code>false</code>.
-      * </ul>
--     * <p/>
-+     * 
-      * The <tt>equals</tt> method for class <code>Object</code> implements
-      * the most discriminating possible equivalence relation on objects;
-      * that is, for any non-null reference values <code>x</code> and
-      * <code>y</code>, this method returns <code>true</code> if and only
-      * if <code>x</code> and <code>y</code> refer to the same object
-      * (<code>x == y</code> has the value <code>true</code>).
--     * <p/>
-+     * 
-      * Note that it is generally necessary to override the <tt>hashCode</tt>
-      * method whenever this method is overridden, so as to maintain the
-      * general contract for the <tt>hashCode</tt> method, which states
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/compound/ImmutableValueElementCopyStrategy.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/compound/ImmutableValueElementCopyStrategy.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/compound/ImmutableValueElementCopyStrategy.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/compound/ImmutableValueElementCopyStrategy.java	2015-06-17 12:16:46.856794541 +0200
-@@ -26,7 +26,7 @@
-     private final ReadWriteSerializationCopyStrategy copyStrategy = new ReadWriteSerializationCopyStrategy();
- 
-     /**
--     * @inheritDoc
-+     * {@inheritDoc}
-      */
-     public Element copyForWrite(Element value) {
-         if (value == null) {
-@@ -36,7 +36,7 @@
-     }
- 
-     /**
--     * @inheritDoc
-+     * {@inheritDoc}
-      */
-     public Element copyForRead(Element storedValue) {
-         if (storedValue == null) {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/compound/ReadWriteSerializationCopyStrategy.java	2015-06-17 12:17:38.014376882 +0200
-@@ -34,7 +34,7 @@
- public class ReadWriteSerializationCopyStrategy implements ReadWriteCopyStrategy<Element> {
- 
-     /**
--     * @inheritDoc
-+     * {@inheritDoc}
-      */
-     public Element copyForWrite(Element value) {
-         if (value == null) {
-@@ -67,7 +67,7 @@
-     }
- 
-     /**
--     * @inheritDoc
-+     * {@inheritDoc}
-      */
-     public Element copyForRead(Element storedValue) {
-         if (storedValue == null) {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/compound/SerializationCopyStrategy.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/compound/SerializationCopyStrategy.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/compound/SerializationCopyStrategy.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/compound/SerializationCopyStrategy.java	2015-06-17 12:17:59.654354196 +0200
-@@ -29,14 +29,14 @@
-     private final ReadWriteSerializationCopyStrategy copyStrategy = new ReadWriteSerializationCopyStrategy();
- 
-     /**
--     * @inheritDoc
-+     * {@inheritDoc}
-      */
-     public Element copyForWrite(Element value) {
-         return copyStrategy.copyForRead(copyStrategy.copyForWrite(value));
-     }
- 
-     /**
--     * @inheritDoc
-+     * {@inheritDoc}
-      */
-     public Element copyForRead(Element storedValue) {
-         return copyStrategy.copyForRead(copyStrategy.copyForWrite(storedValue));
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/LegacyStoreWrapper.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/LegacyStoreWrapper.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/LegacyStoreWrapper.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/LegacyStoreWrapper.java	2015-06-17 12:09:13.217233124 +0200
-@@ -326,7 +326,7 @@
- 
-     /**
-      * {@inheritDoc}
--     * <p/>
-+     * 
-      * The size is the number of {@link Element}s in the memory store
-      * plus the number of {@link Element}s in the disk store.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/LruMemoryStore.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/LruMemoryStore.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/LruMemoryStore.java	2012-07-09 21:49:09.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/LruMemoryStore.java	2015-06-17 12:10:47.507777041 +0200
-@@ -40,7 +40,7 @@
- 
- /**
-  * An implementation of a LruMemoryStore.
-- * <p/>
-+ * 
-  * This uses {@link java.util.LinkedHashMap} as its backing map. It uses the {@link java.util.LinkedHashMap} LRU
-  * feature. LRU for this implementation means least recently accessed.
-  *
-@@ -176,7 +176,7 @@
- 
-     /**
-      * Gets an item from the cache.
--     * <p/>
-+     * 
-      * The last access time in {@link net.sf.ehcache.Element} is updated.
-      *
-      * @param key the cache key
-@@ -275,7 +275,7 @@
- 
-     /**
-      * Spools all elements to disk, in preparation for shutdown.
--     * <p/>
-+     * 
-      * This revised implementation is a little slower but avoids using increased memory during the method.
-      */
-     protected final void spoolAllToDisk() {
-@@ -303,7 +303,7 @@
-     /**
-      * Puts the element in the DiskStore.
-      * Should only be called if isOverflowToDisk is true
--     * <p/>
-+     * 
-      * Relies on being called from a synchronized method
-      *
-      * @param element The Element
-@@ -324,7 +324,7 @@
- 
-     /**
-      * Gets an Array of the keys for all elements in the memory cache.
--     * <p/>
-+     * 
-      * Does not check for expired entries
-      *
-      * @return An Object[]
-@@ -366,7 +366,7 @@
- 
-     /**
-      * Measures the size of the memory store by using the sizeof engine.
--     * <p/>
-+     * 
-      * Warning: This method can be very expensive to run. Allow approximately 1 second
-      * per 1MB of entries. Running this method could create liveness problems
-      * because the object lock is held for a long period
-@@ -393,7 +393,7 @@
- 
-     /**
-      * Evict the <code>Element</code>.
--     * <p/>
-+     * 
-      * Evict means that the <code>Element</code> is:
-      * <ul>
-      * <li>if, the store is diskPersistent, the <code>Element</code> is spooled to the DiskStore
-@@ -440,7 +440,7 @@
- 
-     /**
-      * Expire all elsments.
--     * <p/>
-+     * 
-      * This is a default implementation which does nothing. Expiry on demand is only
-      * implemented for disk stores.
-      */
-@@ -473,7 +473,7 @@
-     /**
-      * An extension of LinkedHashMap which overrides {@link #removeEldestEntry}
-      * to persist cache entries to the auxiliary cache before they are removed.
--     * <p/>
-+     * 
-      * This implementation also provides LRU by access order.
-      */
-     public final class SpoolingLinkedHashMap extends java.util.LinkedHashMap {
-@@ -522,7 +522,7 @@
-          * with the opportunity to remove the eldest entry each time a new one
-          * is added.  This is useful if the map represents a cache: it allows
-          * the map to reduce memory consumption by deleting stale entries.
--         * <p/>
-+         * 
-          * Will return true if:
-          * <ol>
-          * <li> the element has expired
-@@ -539,7 +539,7 @@
-          *               inserted; in other words, if the map contains a single
-          *               entry, the eldest entry is also the newest.
-          * @return true if the eldest entry should be removed
--         *         from the map; <tt>false</t> if it should be retained.
-+         *         from the map; <tt>false</tt> if it should be retained.
-          */
-         @Override
-         protected final boolean removeEldestEntry(Map.Entry eldest) {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/MemoryStore.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/MemoryStore.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/MemoryStore.java	2013-04-10 19:49:29.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/MemoryStore.java	2015-06-17 12:11:52.416709505 +0200
-@@ -290,7 +290,7 @@
- 
-     /**
-      * Gets an item from the cache.
--     * <p/>
-+     * 
-      * The last access time in {@link net.sf.ehcache.Element} is updated.
-      *
-      * @param key the key of the Element
-@@ -390,7 +390,7 @@
- 
-     /**
-      * Expire all elements.
--     * <p/>
-+     * 
-      * This is a default implementation which does nothing. Expiration on demand is only implemented for disk stores.
-      */
-     public void expireElements() {
-@@ -462,7 +462,7 @@
- 
-     /**
-      * Gets an Array of the keys for all elements in the memory cache.
--     * <p/>
-+     * 
-      * Does not check for expired entries
-      *
-      * @return An List
-@@ -610,7 +610,7 @@
- 
-     /**
-      * Uses random numbers to sample the entire map.
--     * <p/>
-+     * 
-      * This implemenation uses a key array.
-      *
-      * @param keyHint a key used as a hint indicating where the just added element is
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/Policy.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/Policy.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/Policy.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/Policy.java	2015-06-17 12:12:20.999358716 +0200
-@@ -20,7 +20,7 @@
- 
- /**
-  * An eviction policy.
-- * <p/>
-+ * 
-  * The Cache will use a policy at startup. There are three policy implementations provided in ehcache:
-  * LRU, LFU and FIFO. However many other policies are possible. That the policy
-  * has access to the whole element enables policies based on the key, value, metadata, statistics, or a combination of
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/Store.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/Store.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/Store.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/Store.java	2015-06-17 12:08:12.564099534 +0200
-@@ -137,7 +137,7 @@
- 
-     /**
-      * Remove all of the elements from the store.
--     * <p/>
-+     * 
-      * If there are registered <code>CacheEventListener</code>s they are notified of the expiry or removal
-      * of the <code>Element</code> as each is removed.
-      */
-@@ -225,7 +225,7 @@
- 
-     /**
-      * Gets the size of the in-memory portion of the store, in bytes.
--     * <p/>
-+     * 
-      * This method may be expensive to run, depending on implementation. Implementers may choose to return
-      * an approximate size.
-      *
-@@ -350,7 +350,7 @@
- 
-     /**
-      * Returns true if the cache is in coherent mode cluster-wide. Returns false otherwise.
--     * <p />
-+     * 
-      * It applies to coherent clustering mechanisms only e.g. Terracotta
-      *
-      * @return true if the cache is in coherent mode cluster-wide, false otherwise
-@@ -360,7 +360,7 @@
- 
-     /**
-      * Returns true if the cache is in coherent mode for the current node. Returns false otherwise.
--     * <p />
-+     * 
-      * It applies to coherent clustering mechanisms only e.g. Terracotta
-      *
-      * @return true if the cache is in coherent mode cluster-wide, false otherwise
-@@ -372,7 +372,7 @@
-      * Sets the cache in coherent or incoherent mode for the current node depending on the parameter.
-      * Calling {@code setNodeCoherent(true)} when the cache is already in coherent mode or
-      * calling {@code setNodeCoherent(false)} when already in incoherent mode will be a no-op.
--     * <p />
-+     * 
-      * It applies to coherent clustering mechanisms only e.g. Terracotta
-      *
-      * @param coherent
-@@ -385,7 +385,7 @@
-     /**
-      * This method waits until the cache is in coherent mode in all the connected nodes. If the cache is already in coherent mode it returns
-      * immediately
--     * <p />
-+     * 
-      * It applies to coherent clustering mechanisms only e.g. Terracotta
-      * @throws UnsupportedOperationException if this store does not support cache coherence, like RMI replication
-      * @throws InterruptedException
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/TerracottaStore.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/TerracottaStore.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/store/TerracottaStore.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/store/TerracottaStore.java	2015-06-17 12:13:03.526348930 +0200
-@@ -32,7 +32,7 @@
-     /**
-      * Returns the local value associated with the key. Local value means that the object mapped to the key is present in the VM locally. In
-      * case its not, will return null. Note that even when returning null, the value may be present in the Terracotta server array.
--     * <p/>
-+     * 
-      * This operation does not acquire any locks when doing the operation and may return stale values.
-      * 
-      * @param key
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/transaction/TransactionIDSerializedForm.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/transaction/TransactionIDSerializedForm.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/transaction/TransactionIDSerializedForm.java	2012-06-28 18:49:32.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/transaction/TransactionIDSerializedForm.java	2015-06-17 13:19:00.254013343 +0200
-@@ -23,7 +23,7 @@
-  * A replacement serialized form for transaction IDs. It can be used by transaction ID factories
-  * to create IDs that serialize to this form (using writeReplace()) if they don't want or cannot
-  * provide directly serializable IDs.
-- * <p/>
-+ * 
-  * During deserialization, objects of this class will be replaced by the result of the
-  * CacheManager.restoreTransactionID() call.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/transaction/XidTransactionIDSerializedForm.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/transaction/XidTransactionIDSerializedForm.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/transaction/XidTransactionIDSerializedForm.java	2012-06-28 18:49:32.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/transaction/XidTransactionIDSerializedForm.java	2015-06-17 13:19:16.684221074 +0200
-@@ -25,7 +25,7 @@
-  * A replacement serialized form for XID transaction IDs. It can be used by transaction ID factories
-  * to create XID-based IDs that serialize to this form (using writeReplace()) if they don't want or
-  * cannot provide directly serializable IDs.
-- * <p/>
-+ * 
-  * During deserialization, objects of this class will be replaced by the result of the
-  * CacheManager.restoreXidTransactionID() call.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/TransactionController.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/TransactionController.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/TransactionController.java	2012-06-28 18:49:32.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/TransactionController.java	2015-06-17 11:51:58.669037622 +0200
-@@ -70,7 +70,7 @@
-     }
- 
-     /**
--     * Set the default transaction timeout in seconds, it must be > 0
-+     * Set the default transaction timeout in seconds, it must be &gt; 0
-      * @param defaultTransactionTimeoutSeconds the default transaction timeout
-      */
-     public void setDefaultTransactionTimeout(int defaultTransactionTimeoutSeconds) {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/FailSafeTimer.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/FailSafeTimer.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/FailSafeTimer.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/FailSafeTimer.java	2015-06-17 12:25:09.491041759 +0200
-@@ -26,7 +26,7 @@
-  * scheduled will run at least once (inline when they are scheduled) if creating
-  * threads is not allowed.
-  * For example, Google App Engine does not allow creation of new threads.
-- * <p/>
-+ * 
-  * Clients should not use this as a general purpose timing service. To do so could
-  * interfere with the running of the Cache.
-  * 
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/lang/VicariousThreadLocal.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/lang/VicariousThreadLocal.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/lang/VicariousThreadLocal.java	2011-05-19 14:04:15.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/lang/VicariousThreadLocal.java	2015-06-17 12:31:18.705663999 +0200
-@@ -23,7 +23,7 @@
-  * A drop-in replacement {@code ThreadLocal} implementation that does not leak
-  * when thread-local values reference the {@code ThreadLocal} object.
-  * The code is optimised to cope with frequently changing values.
-- * <p/>
-+ * 
-  * In comparison to plain {@code ThreadLocal}, this implementation:<ul>
-  * <li>from the point of view of a single thread,
-  * each thread-local
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/LargeCollection.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/LargeCollection.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/LargeCollection.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/LargeCollection.java	2015-06-17 12:26:44.286580034 +0200
-@@ -86,7 +86,7 @@
- 
-     /**
-      * Iterator for addSet.
--     * @return Iterator < E >
-+     * @return Iterator &lt; E &gt;
-      */
-     private Iterator < E > additionalIterator() {
-       return addSet.iterator();
-@@ -111,7 +111,7 @@
- 
-     /**
-      * Iterator of initial set of entries.
--     * @return Iterator < E >
-+     * @return Iterator &lt; E &gt;
-      */
-     public abstract Iterator < E > sourceIterator();
- 
-@@ -121,4 +121,4 @@
-      */
-     public abstract int sourceSize();
- 
--}
-+}
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/ProductInfo.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/ProductInfo.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/ProductInfo.java	2012-09-11 20:01:31.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/ProductInfo.java	2015-06-17 12:28:15.366293201 +0200
-@@ -58,7 +58,7 @@
-      * Construct product info object from a resource input stream
-      *
-      * @param resource
--     * @throws java.io.IOException
-+     * throws java.io.IOException
-      */
-     public ProductInfo(InputStream resource) {
-         try {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/Timestamper.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/Timestamper.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/Timestamper.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/Timestamper.java	2015-06-17 12:29:39.238345610 +0200
-@@ -55,7 +55,7 @@
-      * with some additional reserved space for a counter.
-      *
-      * @see net.sf.ehcache.util.Timestamper#BIN_DIGITS
--     * @return uniquely & increasing value
-+     * return uniquely &amp; increasing value
-      */
-     public static long next() {
-         int runs = 0;
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/TimeUtil.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/TimeUtil.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/util/TimeUtil.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/util/TimeUtil.java	2015-06-17 12:30:37.837587530 +0200
-@@ -52,7 +52,7 @@
-      * Converts a long seconds value to an int seconds value and takes into account overflow
-      * from the downcast by switching to Integer.MAX_VALUE.
-      * @param seconds Long value
--     * @return Same int value unless long > Integer.MAX_VALUE in which case MAX_VALUE is returned
-+     * @return Same int value unless long &gt; Integer.MAX_VALUE in which case MAX_VALUE is returned
-      */
-     public static int convertTimeToInt(long seconds) {
-         if (seconds > Integer.MAX_VALUE) {
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/AbstractCacheWriter.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/AbstractCacheWriter.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/AbstractCacheWriter.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/AbstractCacheWriter.java	2015-06-17 14:32:15.546732210 +0200
-@@ -25,7 +25,7 @@
- 
- /**
-  * A convenience abstract base class that implements all {@code CacheWriter} methods.
-- * <p/>
-+ * <p>
-  * The {@link #write}, {@link #writeAll}, {@link #delete} and {@link #deleteAll} methods throw
-  * {@code UnsupportedOperationException} unless they're overridden by the class that is extending
-  * {@code AbstractCacheWriter}. Classes that are extending this abstract base class should make sure that the
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/CacheWriterFactory.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/CacheWriterFactory.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/CacheWriterFactory.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/CacheWriterFactory.java	2015-06-17 14:32:38.913618929 +0200
-@@ -23,7 +23,7 @@
- /**
-  * An abstract factory for creating cache writers. Implementers should provide their own
-  * concrete factory extending this factory.
-- * <p/>
-+ * <p>
-  * Note that Ehcache API also allows the CacheWriter to be set programmatically.
-  *
-  * @author Greg Luck
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/CacheWriter.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/CacheWriter.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/CacheWriter.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/CacheWriter.java	2015-06-17 14:31:39.624443676 +0200
-@@ -25,34 +25,34 @@
- 
- /**
-  * A CacheWriter is an interface used for write-through and write-behind caching to a underlying resource.
-- * <p/>
-+ * <p>
-  * If configured for a cache, CacheWriter's methods will be called on a cache operation. A cache put will cause a CacheWriter write
-  * and a cache remove will cause a writer delete.
-- * <p/>
-+ * <p>
-  * Implementers should create an implementation which handles storing and deleting to an underlying resource.
-- * <p/>
-- * <h4>Write-Through</h4>
-+ * <p>
-+ * <h3>Write-Through</h3>
-  * In write-through mode, the cache operation will occur and the writer operation will occur before CacheEventListeners are notified. If
-  * the write operation fails an exception will be thrown. This can result in a cache which is inconsistent with the underlying resource.
-  * To avoid this, the cache and the underlying resource should be configured to participate in a transaction. In the event of a failure
-  * a rollback can return all components to a consistent state.
-- * <p/>
-- * <h4>Write-Behind</h4>
-+ * <p>
-+ * <h3>Write-Behind</h3>
-  * In write-behind mode, writes are written to a write-behind queue. They are written by a separate execution thread in a configurable
-  * way. When used with Terracotta Server Array, the queue is highly available. In addition any node in the cluster may perform the
-  * write-behind operations.
-- * <p/>
-+ * <p>
-  * It's important to note that the operations that are handled by the {@code CacheWriter} don't have any guaranteed ordering in write-behind mode.
-  * The processing ordering can be different than the scheduling ordering, so your application needs to be written with this
-  * in mind. More information in the CacheWriter chapter of the documentation.
-- * <p/>
-- * <h4>Creation and Configuration</h4>
-+ * <p>
-+ * <h3>Creation and Configuration</h3>
-  * CacheWriters can be created using the CacheWriterFactory or explicitly by instantiating them through Java code, giving
-  * you access to local resources.
-- * <p/>
-+ * <p>
-  * The manner upon which a CacheWriter is actually called is determined by the {@link net.sf.ehcache.config.CacheWriterConfiguration} that is set up for cache
-  * that is using the CacheWriter.
-- * <p/>
-+ * <p>
-  * See the CacheWriter chapter in the documentation for more information on how to use writers.
-  *
-  * @author Greg Luck
-@@ -64,7 +64,7 @@
-     /**
-      * Creates a clone of this writer. This method will only be called by ehcache before a
-      * cache is initialized.
--     * <p/>
-+     * <p>
-      * Implementations should throw CloneNotSupportedException if they do not support clone
-      * but that will stop them from being used with defaultCache.
-      *
-@@ -76,12 +76,12 @@
- 
-     /**
-      * Notifies writer to initialise themselves.
--     * <p/>
-+     * <p>
-      * This method is called during the Cache's initialise method after it has changed it's
-      * status to alive. Cache operations are legal in this method. If you register a cache writer
-      * manually after a cache has been initialised already, this method will be called on the
-      * cache writer as soon as it has been registered.
--     * <p/>
-+     * <p>
-      * Note that if you reuse cache writer instances or create a factory that returns the
-      * same cache writer instance as a singleton, your <code>init</code> method should be able
-      * to handle that situation. Unless you perform this multiple usage of a cache writer yourself,
-@@ -95,7 +95,7 @@
-     /**
-      * Providers may be doing all sorts of exotic things and need to be able to clean up on
-      * dispose.
--     * <p/>
-+     * <p>
-      * Cache operations are illegal when this method is called. The cache itself is partly
-      * disposed when this method is called.
-      */
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/CacheWriterManager.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/CacheWriterManager.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/CacheWriterManager.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/CacheWriterManager.java	2015-06-17 14:32:53.102942899 +0200
-@@ -22,7 +22,7 @@
- 
- /**
-  * A {@code CacheWriterManager} coordinates how element are written to a back-end store.
-- * <p/>
-+ * <p>
-  * The {@code CacheWriterManager} will in its turn call the {@code CacheWriter} that belongs to the relevant cache to perform
-  * the actual write logic as it's implemented by the user.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/writebehind/operations/SingleOperation.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/writebehind/operations/SingleOperation.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/writebehind/operations/SingleOperation.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/writebehind/operations/SingleOperation.java	2015-06-17 14:33:36.994851732 +0200
-@@ -35,7 +35,7 @@
- 
-     /**
-      * Creates a batch operation that corresponds to the operation type of this single operation.
--     * <p/>
-+     * <p>
-      * This batch operation will not be stored in the queue anymore and is solely used for structuring.
-      * The data from the single operation will already be processed in the final form that will be expected by the
-      * {@code CacheWriter} that will be used to execute the batch operation.
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/writebehind/operations/SingleOperationType.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/writebehind/operations/SingleOperationType.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/writebehind/operations/SingleOperationType.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/writebehind/operations/SingleOperationType.java	2015-06-17 14:33:45.534444876 +0200
-@@ -17,7 +17,7 @@
- 
- /**
-  * Enum class to provide distinct operation types for each single operation.
-- * <p/>
-+ * <p>
-  * The order of the entries in the enum is important since it is used to determine the order of execution of
-  * batched operations.
-  *
-diff -Nru ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/writebehind/WriteBehind.java ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/writebehind/WriteBehind.java
---- ehcache-core-2.6.7/src/main/java/net/sf/ehcache/writer/writebehind/WriteBehind.java	2012-05-10 10:31:33.000000000 +0200
-+++ ehcache-core-2.6.7.javadoc/src/main/java/net/sf/ehcache/writer/writebehind/WriteBehind.java	2015-06-17 14:33:15.711865729 +0200
-@@ -58,7 +58,7 @@
- 
-     /**
-      * Stop the coordinator and all the internal data structures.
--     * <p/>
-+     * <p>
-      * This stops as quickly as possible without losing any previously added items. However, no guarantees are made
-      * towards the processing of these items. It's highly likely that items are still inside the internal data structures
-      * and not processed.
diff --git a/ehcache-core.spec b/ehcache-core.spec
index faae255..f279f07 100644
--- a/ehcache-core.spec
+++ b/ehcache-core.spec
@@ -1,6 +1,6 @@
 Name:          ehcache-core
 Version:       2.6.7
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Easy Hibernate Cache
 License:       ASL 2.0
 URL:           http://ehcache.org/
@@ -12,7 +12,6 @@ URL:           http://ehcache.org/
 # tar czf ehcache-core-2.6.7-clean-src-svn.tar.gz ehcache-core-2.6.7
 Source0:       %{name}-%{version}-clean-src-svn.tar.gz
 Patch0:        %{name}-2.6.7-java8.patch
-Patch1:        %{name}-2.6.7-java8doc.patch
 
 BuildRequires: maven-local
 BuildRequires: mvn(javax.servlet:javax.servlet-api)
@@ -59,7 +58,6 @@ This package contains javadoc for %{name}.
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1
 
 %pom_remove_plugin org.codehaus.gmaven:gmaven-plugin
 %pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
@@ -90,6 +88,9 @@ This package contains javadoc for %{name}.
 # disable embedded ehcache-sizeof-agent.jar copy
 %pom_remove_plugin :maven-dependency-plugin
 
+# disable doclint in javadoc
+%pom_remove_plugin :maven-javadoc-plugin
+
 %mvn_file :%{name} %{name}
 %mvn_alias :%{name} net.sf.ehcache:ehcache
 
@@ -108,6 +109,9 @@ This package contains javadoc for %{name}.
 %license src/assemble/EHCACHE-CORE-LICENSE.txt
 
 %changelog
+* Thu Jun 18 2015 gil cattaneo <puntogil@libero.it> 2.6.7-9
+- disable doclint in javadoc
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.7-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild