You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2016/02/06 18:39:20 UTC

svn commit: r1728857 [1/2] - in /commons/proper/jcs/trunk: commons-jcs-core/src/main/java/org/apache/commons/jcs/access/ commons-jcs-core/src/main/java/org/apache/commons/jcs/access/behavior/ commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/...

Author: tv
Date: Sat Feb  6 17:39:19 2016
New Revision: 1728857

URL: http://svn.apache.org/viewvc?rev=1728857&view=rev
Log:
Fix Javadoc for Java 8. Thanks to Mat Jaggard for the patch.

Modified:
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/behavior/ICacheAccess.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSJMXBean.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheFactory.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralElementDescriptor.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheResponse.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupId.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/behavior/IMemoryCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/config/OptionConverter.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/net/HostNameUtil.java
    commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/BoundedQueue.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTestAbstract.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java
    commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
    commons/proper/jcs/trunk/src/changes/changes.xml

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/CacheAccess.java Sat Feb  6 17:39:19 2016
@@ -105,7 +105,7 @@ public class CacheAccess<K, V>
     }
 
     /**
-     * This method returns the ICacheElement<K, V> wrapper which provides access to element info and other
+     * This method returns the ICacheElement&lt;K, V&gt; wrapper which provides access to element info and other
      * attributes.
      * <p>
      * This returns a reference to the wrapper. Any modifications will be reflected in the cache. No
@@ -117,7 +117,7 @@ public class CacheAccess<K, V>
      * The last access time in the ElementAttributes should be current.
      * <p>
      * @param name Key the Serializable is stored as
-     * @return The ICacheElement<K, V> if the object is found or null
+     * @return The ICacheElement&lt;K, V&gt; if the object is found or null
      */
     @Override
     public ICacheElement<K, V> getCacheElement( K name )
@@ -128,7 +128,7 @@ public class CacheAccess<K, V>
     /**
      * Get multiple elements from the cache based on a set of cache keys.
      * <p>
-     * This method returns the ICacheElement<K, V> wrapper which provides access to element info and other
+     * This method returns the ICacheElement&lt;K, V&gt; wrapper which provides access to element info and other
      * attributes.
      * <p>
      * This returns a reference to the wrapper. Any modifications will be reflected in the cache. No
@@ -140,7 +140,7 @@ public class CacheAccess<K, V>
      * The last access time in the ElementAttributes should be current.
      * <p>
      * @param names set of Serializable cache keys
-     * @return a map of K key to ICacheElement<K, V> element, or empty map if none of the keys are present
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or empty map if none of the keys are present
      */
     @Override
     public Map<K, ICacheElement<K, V>> getCacheElements( Set<K> names )
@@ -151,7 +151,7 @@ public class CacheAccess<K, V>
     /**
      * Get multiple elements from the cache based on a set of cache keys.
      * <p>
-     * This method returns the ICacheElement<K, V> wrapper which provides access to element info and other
+     * This method returns the ICacheElement&lt;K, V&gt; wrapper which provides access to element info and other
      * attributes.
      * <p>
      * This returns a reference to the wrapper. Any modifications will be reflected in the cache. No
@@ -163,7 +163,7 @@ public class CacheAccess<K, V>
      * The last access time in the ElementAttributes should be current.
      * <p>
      * @param pattern key search pattern
-     * @return a map of K key to ICacheElement<K, V> element, or empty map if no keys match the pattern
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or empty map if no keys match the pattern
      */
     @Override
     public Map<K, ICacheElement<K, V>> getMatchingCacheElements( String pattern )

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/PartitionedCacheAccess.java Sat Feb  6 17:39:19 2016
@@ -206,7 +206,7 @@ public class PartitionedCacheAccess<K ex
     }
 
     /**
-     * Gets the ICacheElement<K, V> (the wrapped object) for the key from the desired partition.
+     * Gets the ICacheElement&lt;K, V&gt; (the wrapped object) for the key from the desired partition.
      * <p>
      * @param key key
      * @return result, null if not found.

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/behavior/ICacheAccess.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/behavior/ICacheAccess.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/behavior/ICacheAccess.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/access/behavior/ICacheAccess.java Sat Feb  6 17:39:19 2016
@@ -80,7 +80,7 @@ public interface ICacheAccess<K, V>
         throws CacheException;
 
     /**
-     * This method returns the ICacheElement<K, V> wrapper which provides access to element info and other
+     * This method returns the ICacheElement&lt;K, V&gt; wrapper which provides access to element info and other
      * attributes.
      * <p>
      * This returns a reference to the wrapper. Any modifications will be reflected in the cache. No
@@ -92,14 +92,14 @@ public interface ICacheAccess<K, V>
      * The last access time in the ElementAttributes should be current.
      * <p>
      * @param name Key the object is stored as
-     * @return The ICacheElement<K, V> if the object is found or null
+     * @return The ICacheElement&lt;K, V&gt; if the object is found or null
      */
     ICacheElement<K, V> getCacheElement( K name );
 
     /**
      * Get multiple elements from the cache based on a set of cache keys.
      * <p>
-     * This method returns the ICacheElement<K, V> wrapper which provides access to element info and other
+     * This method returns the ICacheElement&lt;K, V&gt; wrapper which provides access to element info and other
      * attributes.
      * <p>
      * This returns a reference to the wrapper. Any modifications will be reflected in the cache. No
@@ -111,7 +111,7 @@ public interface ICacheAccess<K, V>
      * The last access time in the ElementAttributes should be current.
      * <p>
      * @param names set of Object cache keys
-     * @return a map of Object key to ICacheElement<K, V> element, or empty map if none of the keys are
+     * @return a map of Object key to ICacheElement&lt;K, V&gt; element, or empty map if none of the keys are
      *         present
      */
     Map<K, ICacheElement<K, V>> getCacheElements( Set<K> names );
@@ -119,7 +119,7 @@ public interface ICacheAccess<K, V>
     /**
      * Get multiple elements from the cache based on a set of cache keys.
      * <p>
-     * This method returns the ICacheElement<K, V> wrapper which provides access to element info and other
+     * This method returns the ICacheElement&lt;K, V&gt; wrapper which provides access to element info and other
      * attributes.
      * <p>
      * This returns a reference to the wrapper. Any modifications will be reflected in the cache. No
@@ -131,7 +131,7 @@ public interface ICacheAccess<K, V>
      * The last access time in the ElementAttributes should be current.
      * <p>
      * @param pattern key search pattern
-     * @return a map of Object key to ICacheElement<K, V> element, or empty map if no keys match the
+     * @return a map of Object key to ICacheElement&lt;K, V&gt; element, or empty map if no keys match the
      *         pattern
      */
     Map<K, ICacheElement<K, V>> getMatchingCacheElements( String pattern );

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSAdminBean.java Sat Feb  6 17:39:19 2016
@@ -177,7 +177,7 @@ public class JCSAdminBean implements JCS
 	/**
      * Tries to estimate how much data is in a region. This is expensive. If there are any non serializable objects in
      * the region or an error occurs, suppresses exceptions and returns 0.
-     * <p/>
+     * <p>
      *
      * @return int The size of the region in bytes.
      */
@@ -190,7 +190,7 @@ public class JCSAdminBean implements JCS
 	/**
      * Tries to estimate how much data is in a region. This is expensive. If there are any non serializable objects in
      * the region or an error occurs, suppresses exceptions and returns 0.
-     * <p/>
+     * <p>
      *
      * @return int The size of the region in bytes.
      */
@@ -279,7 +279,7 @@ public class JCSAdminBean implements JCS
 
     /**
      * Clears all regions in the cache.
-     * <p/>
+     * <p>
      * If this class is running within a remote cache server, clears all regions via the <code>RemoteCacheServer</code>
      * API, so that removes will be broadcast to client machines. Otherwise clears all regions in the cache directly via
      * the usual cache API.
@@ -324,7 +324,7 @@ public class JCSAdminBean implements JCS
 
     /**
      * Clears a particular cache region.
-     * <p/>
+     * <p>
      * If this class is running within a remote cache server, clears the region via the <code>RemoteCacheServer</code>
      * API, so that removes will be broadcast to client machines. Otherwise clears the region directly via the usual
      * cache API.
@@ -361,7 +361,7 @@ public class JCSAdminBean implements JCS
 
     /**
      * Removes a particular item from a particular region.
-     * <p/>
+     * <p>
      * If this class is running within a remote cache server, removes the item via the <code>RemoteCacheServer</code>
      * API, so that removes will be broadcast to client machines. Otherwise clears the region directly via the usual
      * cache API.

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSJMXBean.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSJMXBean.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSJMXBean.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/JCSJMXBean.java Sat Feb  6 17:39:19 2016
@@ -50,7 +50,7 @@ public interface JCSJMXBean
     /**
      * Tries to estimate how much data is in a region. This is expensive. If there are any non serializable objects in
      * the region or an error occurs, suppresses exceptions and returns 0.
-     * <p/>
+     * <p>
      *
      * @return int The size of the region in bytes.
      */
@@ -58,7 +58,7 @@ public interface JCSJMXBean
 
     /**
      * Clears all regions in the cache.
-     * <p/>
+     * <p>
      * If this class is running within a remote cache server, clears all regions via the <code>RemoteCacheServer</code>
      * API, so that removes will be broadcast to client machines. Otherwise clears all regions in the cache directly via
      * the usual cache API.
@@ -67,7 +67,7 @@ public interface JCSJMXBean
 
     /**
      * Clears a particular cache region.
-     * <p/>
+     * <p>
      * If this class is running within a remote cache server, clears the region via the <code>RemoteCacheServer</code>
      * API, so that removes will be broadcast to client machines. Otherwise clears the region directly via the usual
      * cache API.
@@ -76,7 +76,7 @@ public interface JCSJMXBean
 
     /**
      * Removes a particular item from a particular region.
-     * <p/>
+     * <p>
      * If this class is running within a remote cache server, removes the item via the <code>RemoteCacheServer</code>
      * API, so that removes will be broadcast to client machines. Otherwise clears the region directly via the usual
      * cache API.

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/admin/servlet/JCSAdminServlet.java Sat Feb  6 17:39:19 2016
@@ -95,7 +95,6 @@ public class JCSAdminServlet
      * @param response
      * @param context
      * @return Template
-     * @throws Exception
      *
      */
     @Override

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheEventLogging.java Sat Feb  6 17:39:19 2016
@@ -31,7 +31,7 @@ import java.util.Set;
 /**
  * All ICacheEvents are defined as final. Children must implement process events. These are wrapped
  * in event log parent calls.
- * <p>
+ * 
  * You can override the public method, but if you don't, the default will call getWithTiming.
  */
 public abstract class AbstractAuxiliaryCacheEventLogging<K, V>
@@ -39,7 +39,7 @@ public abstract class AbstractAuxiliaryC
 {
     /**
      * Puts an item into the cache.
-     * <p>
+     * 
      * @param cacheElement
      * @throws IOException
      */
@@ -52,7 +52,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Puts an item into the cache. Wrapped in logging.
-     * <p>
+     * 
      * @param cacheElement
      * @throws IOException
      */
@@ -72,7 +72,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Implementation of put.
-     * <p>
+     * 
      * @param cacheElement
      * @throws IOException
      */
@@ -81,7 +81,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Gets the item from the cache.
-     * <p>
+     * 
      * @param key
      * @return ICacheElement, a wrapper around the key, value, and attributes
      * @throws IOException
@@ -95,7 +95,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Gets the item from the cache. Wrapped in logging.
-     * <p>
+     * 
      * @param key
      * @return ICacheElement, a wrapper around the key, value, and attributes
      * @throws IOException
@@ -116,7 +116,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Implementation of get.
-     * <p>
+     * 
      * @param key
      * @return ICacheElement, a wrapper around the key, value, and attributes
      * @throws IOException
@@ -126,9 +126,9 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Gets multiple items from the cache based on the given set of keys.
-     * <p>
+     * 
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -141,9 +141,9 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Gets multiple items from the cache based on the given set of keys.
-     * <p>
+     * 
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -164,9 +164,9 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Implementation of getMultiple.
-     * <p>
+     * 
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -176,14 +176,14 @@ public abstract class AbstractAuxiliaryC
     /**
      * Gets items from the cache matching the given pattern. Items from memory will replace those
      * from remote sources.
-     * <p>
+     * 
      * This only works with string keys. It's too expensive to do a toString on every key.
-     * <p>
+     * 
      * Auxiliaries will do their best to handle simple expressions. For instance, the JDBC disk
      * cache will convert * to % and . to _
-     * <p>
+     * 
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data matching the pattern.
      * @throws IOException
      */
@@ -196,9 +196,9 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Gets mmatching items from the cache based on the given pattern.
-     * <p>
+     * 
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data matching the pattern.
      * @throws IOException
      */
@@ -218,9 +218,9 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Implementation of getMatching.
-     * <p>
+     * 
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data matching the pattern.
      * @throws IOException
      */
@@ -229,7 +229,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Removes the item from the cache. Wraps the remove in event logs.
-     * <p>
+     * 
      * @param key
      * @return boolean, whether or not the item was removed
      * @throws IOException
@@ -243,7 +243,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Removes the item from the cache. Wraps the remove in event logs.
-     * <p>
+     * 
      * @param key
      * @return boolean, whether or not the item was removed
      * @throws IOException
@@ -264,7 +264,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Specific implementation of remove.
-     * <p>
+     * 
      * @param key
      * @return boolean, whether or not the item was removed
      * @throws IOException
@@ -274,7 +274,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Removes all from the region. Wraps the removeAll in event logs.
-     * <p>
+     * 
      * @throws IOException
      */
     @Override
@@ -286,7 +286,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Removes all from the region. Wraps the removeAll in event logs.
-     * <p>
+     * 
      * @throws IOException
      */
     protected final void removeAllWithEventLogging()
@@ -305,7 +305,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Specific implementation of removeAll.
-     * <p>
+     * 
      * @throws IOException
      */
     protected abstract void processRemoveAll()
@@ -313,7 +313,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Synchronously dispose the remote cache; if failed, replace the remote handle with a zombie.
-     * <p>
+     * 
      * @throws IOException
      */
     @Override
@@ -326,7 +326,7 @@ public abstract class AbstractAuxiliaryC
     /**
      * Synchronously dispose the remote cache; if failed, replace the remote handle with a zombie.
      * Wraps the removeAll in event logs.
-     * <p>
+     * 
      * @throws IOException
      */
     protected final void disposeWithEventLogging()
@@ -345,7 +345,7 @@ public abstract class AbstractAuxiliaryC
 
     /**
      * Specific implementation of dispose.
-     * <p>
+     * 
      * @throws IOException
      */
     protected abstract void processDispose()

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheFactory.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheFactory.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/AuxiliaryCacheFactory.java Sat Feb  6 17:39:19 2016
@@ -30,7 +30,7 @@ public interface AuxiliaryCacheFactory
 {
     /**
      * Creates an auxiliary using the supplied attributes. Adds it to the composite cache manager.
-     * <p>
+     * 
      * @param attr
      * @param cacheMgr This allows auxiliaries to reference the manager without assuming that it is
      *            a singleton. This will allow JCS to be a non-singleton. Also, it makes it easier to
@@ -57,14 +57,14 @@ public interface AuxiliaryCacheFactory
 
     /**
      * Sets the name attribute of the AuxiliaryCacheFactory object
-     * <p>
+     * 
      * @param s The new name value
      */
     void setName( String s );
 
     /**
      * Gets the name attribute of the AuxiliaryCacheFactory object
-     * <p>
+     * 
      * @return The name value
      */
     String getName();

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java Sat Feb  6 17:39:19 2016
@@ -47,11 +47,11 @@ import org.apache.commons.logging.LogFac
 /**
  * Abstract class providing a base implementation of a disk cache, which can be easily extended to
  * implement a disk cache for a specific persistence mechanism.
- * <p>
+ * 
  * When implementing the abstract methods note that while this base class handles most things, it
  * does not acquire or release any locks. Implementations should do so as necessary. This is mainly
  * done to minimize the time spent in critical sections.
- * <p>
+ * 
  * Error handling in this class needs to be addressed. Currently if an exception is thrown by the
  * persistence mechanism, this class destroys the event queue. Should it also destroy purgatory?
  * Should it dispose itself?
@@ -69,7 +69,7 @@ public abstract class AbstractDiskCache<
      * Map where elements are stored between being added to this cache and actually spooled to disk.
      * This allows puts to the disk cache to return quickly, and the more expensive operation of
      * serializing the elements to persistent storage queued for later.
-     * <p>
+     * 
      * If the elements are pulled into the memory cache while the are still in purgatory, writing to
      * disk can be canceled.
      */
@@ -104,7 +104,7 @@ public abstract class AbstractDiskCache<
     /**
      * Construct the abstract disk cache, create event queues and purgatory. Child classes should
      * set the alive flag to true after they are initialized.
-     * <p>
+     * 
      * @param attr
      */
     protected AbstractDiskCache( IDiskCacheAttributes attr )
@@ -141,7 +141,7 @@ public abstract class AbstractDiskCache<
     /**
      * Purgatory size of -1 means to use a HashMap with no size limit. Anything greater will use an
      * LRU map of some sort.
-     * <p>
+     * 
      * TODO Currently setting this to 0 will cause nothing to be put to disk, since it will assume
      *       that if an item is not in purgatory, then it must have been plucked. We should make 0
      *       work, a way to not use purgatory.
@@ -177,10 +177,10 @@ public abstract class AbstractDiskCache<
     /**
      * Adds the provided element to the cache. Element will be added to purgatory, and then queued
      * for later writing to the serialized storage mechanism.
-     * <p>
+     * 
      * An update results in a put event being created. The put event will call the handlePut method
      * defined here. The handlePut method calls the implemented doPut on the child.
-     * <p>
+     * 
      * @param cacheElement
      * @throws IOException
      * @see org.apache.commons.jcs.engine.behavior.ICache#update
@@ -224,9 +224,9 @@ public abstract class AbstractDiskCache<
     /**
      * Check to see if the item is in purgatory. If so, return it. If not, check to see if we have
      * it on disk.
-     * <p>
+     * 
      * @param key
-     * @return ICacheElement<K, V> or null
+     * @return ICacheElement&lt;K, V&gt; or null
      * @see AuxiliaryCache#get
      */
     @Override
@@ -302,14 +302,14 @@ public abstract class AbstractDiskCache<
     /**
      * Gets items from the cache matching the given pattern. Items from memory will replace those
      * from remote sources.
-     * <p>
+     * 
      * This only works with string keys. It's too expensive to do a toString on every key.
-     * <p>
+     * 
      * Auxiliaries will do their best to handle simple expressions. For instance, the JDBC disk
      * cache will convert * to % and . to _
-     * <p>
+     * 
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data matching the pattern.
      * @throws IOException
      */
@@ -341,9 +341,9 @@ public abstract class AbstractDiskCache<
 
     /**
      * Gets multiple items from the cache based on the given set of keys.
-     * <p>
+     * 
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      */
     @Override
@@ -369,7 +369,7 @@ public abstract class AbstractDiskCache<
 
     /**
      * The keys in the cache.
-     * <p>
+     * 
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getKeySet()
      */
     @Override
@@ -377,7 +377,7 @@ public abstract class AbstractDiskCache<
 
     /**
      * Removes are not queued. A call to remove is immediate.
-     * <p>
+     * 
      * @param key
      * @return whether the item was present to be removed.
      * @throws IOException
@@ -449,14 +449,14 @@ public abstract class AbstractDiskCache<
 
     /**
      * Adds a dispose request to the disk cache.
-     * <p>
+     * 
      * Disposal proceeds in several steps.
      * <ol>
      * <li>Prior to this call the Composite cache dumped the memory into the disk cache. If it is
-     * large then we need to wait for the event queue to finish.
+     * large then we need to wait for the event queue to finish.</li>
      * <li>Wait until the event queue is empty of until the configured ShutdownSpoolTimeLimit is
-     * reached.
-     * <li>Call doDispose on the concrete impl.
+     * reached.</li>
+     * <li>Call doDispose on the concrete impl.</li>
      * </ol>
      * @throws IOException
      */
@@ -524,7 +524,7 @@ public abstract class AbstractDiskCache<
 
     /**
      * Gets basic stats for the abstract disk cache.
-     * <p>
+     * 
      * @return String
      */
     @Override
@@ -535,7 +535,7 @@ public abstract class AbstractDiskCache<
 
     /**
      * Returns semi-structured data.
-     * <p>
+     * 
      * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getStatistics()
      */
     @Override
@@ -571,7 +571,7 @@ public abstract class AbstractDiskCache<
     /**
      * Size cannot be determined without knowledge of the cache implementation, so subclasses will
      * need to implement this method.
-     * <p>
+     * 
      * @return the number of items.
      * @see ICache#getSize
      */
@@ -761,17 +761,17 @@ public abstract class AbstractDiskCache<
      * Before the event logging layer, the subclasses implemented the do* methods. Now the do*
      * methods call the *WithEventLogging method on the super. The *WithEventLogging methods call
      * the abstract process* methods. The children implement the process methods.
-     * <p>
+     * 
      * ex. doGet calls getWithEventLogging, which calls processGet
      */
 
     /**
      * Get a value from the persistent store.
-     * <p>
+     * 
      * Before the event logging layer, the subclasses implemented the do* methods. Now the do*
      * methods call the *EventLogging method on the super. The *WithEventLogging methods call the
      * abstract process* methods. The children implement the process methods.
-     * <p>
+     * 
      * @param key Key to locate value for.
      * @return An object matching key, or null.
      * @throws IOException
@@ -784,11 +784,11 @@ public abstract class AbstractDiskCache<
 
     /**
      * Get a value from the persistent store.
-     * <p>
+     * 
      * Before the event logging layer, the subclasses implemented the do* methods. Now the do*
      * methods call the *EventLogging method on the super. The *WithEventLogging methods call the
      * abstract process* methods. The children implement the process methods.
-     * <p>
+     * 
      * @param pattern Used to match keys.
      * @return A map of matches..
      * @throws IOException
@@ -801,11 +801,11 @@ public abstract class AbstractDiskCache<
 
     /**
      * Add a cache element to the persistent store.
-     * <p>
+     * 
      * Before the event logging layer, the subclasses implemented the do* methods. Now the do*
      * methods call the *EventLogging method on the super. The *WithEventLogging methods call the
      * abstract process* methods. The children implement the process methods.
-     * <p>
+     * 
      * @param cacheElement
      * @throws IOException
      */
@@ -817,11 +817,11 @@ public abstract class AbstractDiskCache<
 
     /**
      * Remove an object from the persistent store if found.
-     * <p>
+     * 
      * Before the event logging layer, the subclasses implemented the do* methods. Now the do*
      * methods call the *EventLogging method on the super. The *WithEventLogging methods call the
      * abstract process* methods. The children implement the process methods.
-     * <p>
+     * 
      * @param key Key of object to remove.
      * @return whether or no the item was present when removed
      * @throws IOException
@@ -834,11 +834,11 @@ public abstract class AbstractDiskCache<
 
     /**
      * Remove all objects from the persistent store.
-     * <p>
+     * 
      * Before the event logging layer, the subclasses implemented the do* methods. Now the do*
      * methods call the *EventLogging method on the super. The *WithEventLogging methods call the
      * abstract process* methods. The children implement the process methods.
-     * <p>
+     * 
      * @throws IOException
      */
     protected final void doRemoveAll()
@@ -850,11 +850,11 @@ public abstract class AbstractDiskCache<
     /**
      * Dispose of the persistent store. Note that disposal of purgatory and setting alive to false
      * does NOT need to be done by this method.
-     * <p>
+     * 
      * Before the event logging layer, the subclasses implemented the do* methods. Now the do*
      * methods call the *EventLogging method on the super. The *WithEventLogging methods call the
      * abstract process* methods. The children implement the process methods.
-     * <p>
+     * 
      * @throws IOException
      */
     protected final void doDispose()
@@ -865,7 +865,7 @@ public abstract class AbstractDiskCache<
 
     /**
      * Gets the extra info for the event log.
-     * <p>
+     * 
      * @return disk location
      */
     @Override
@@ -876,7 +876,7 @@ public abstract class AbstractDiskCache<
 
     /**
      * This is used by the event logging.
-     * <p>
+     * 
      * @return the location of the disk, either path or ip.
      */
     protected abstract String getDiskLocation();

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/PurgatoryElement.java Sat Feb  6 17:39:19 2016
@@ -25,7 +25,7 @@ import org.apache.commons.jcs.engine.beh
 
 /**
  * Implementation of cache elements in purgatory.
- * <p>
+ * 
  * Elements are stored in purgatory when they are spooled to the auxiliary cache, but have not yet
  * been written to disk.
  */
@@ -42,8 +42,8 @@ public class PurgatoryElement<K, V>
     private ICacheElement<K, V> cacheElement;
 
     /**
-     * Constructor for the PurgatoryElement<K, V> object
-     * <p>
+     * Constructor for the PurgatoryElement&lt;K, V&gt; object
+     * 
      * @param cacheElement CacheElement
      */
     public PurgatoryElement( ICacheElement<K, V> cacheElement )
@@ -56,7 +56,7 @@ public class PurgatoryElement<K, V>
 
     /**
      * Gets the spoolable property.
-     * <p>
+     * 
      * @return The spoolable value
      */
     public boolean isSpoolable()
@@ -66,7 +66,7 @@ public class PurgatoryElement<K, V>
 
     /**
      * Sets the spoolable property.
-     * <p>
+     * 
      * @param spoolable The new spoolable value
      */
     public void setSpoolable( boolean spoolable )
@@ -76,7 +76,7 @@ public class PurgatoryElement<K, V>
 
     /**
      * Get the wrapped cache element.
-     * <p>
+     * 
      * @return ICacheElement
      */
     public ICacheElement<K, V> getCacheElement()

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java Sat Feb  6 17:39:19 2016
@@ -254,7 +254,7 @@ public class BlockDiskCache<K, V>
      * Gets matching items from the cache.
      * <p>
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache matching keys
      */
     @Override
@@ -300,7 +300,7 @@ public class BlockDiskCache<K, V>
     }
 
     /**
-     * Gets the ICacheElement<K, V> for the key if it is in the cache. The program flow is as follows:
+     * Gets the ICacheElement&lt;K, V&gt; for the key if it is in the cache. The program flow is as follows:
      * <ol>
      * <li>Make sure the disk cache is alive.</li> <li>Get a read lock.</li> <li>See if the key is
      * in the key store.</li> <li>If we found a key, ask the BlockDisk for the object at the

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java Sat Feb  6 17:39:19 2016
@@ -496,7 +496,7 @@ public class IndexedDiskCache<K, V> exte
      * <p>
      *
      * @param ce
-     *            The ICacheElement<K, V> to put to disk.
+     *            The ICacheElement&lt;K, V&gt; to put to disk.
      */
     @Override
     protected void processUpdate(ICacheElement<K, V> ce)
@@ -611,7 +611,7 @@ public class IndexedDiskCache<K, V> exte
      * <p>
      *
      * @param key
-     * @return ICacheElement<K, V> or null
+     * @return ICacheElement&lt;K, V&gt; or null
      * @see AbstractDiskCache#doGet
      */
     @Override
@@ -663,7 +663,7 @@ public class IndexedDiskCache<K, V> exte
      * <p>
      *
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache matching keys
      */
     @Override

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCache.java Sat Feb  6 17:39:19 2016
@@ -71,7 +71,7 @@ import org.apache.commons.logging.LogFac
  *                       );
  * </pre>
  * <p>
- * The cleanup thread will delete non eternal items where (now - create time) > max life seconds *
+ * The cleanup thread will delete non eternal items where (now - create time) &gt; max life seconds *
  * 1000
  * <p>
  * To speed up the deletion the SYSTEM_EXPIRE_TIME_SECONDS is used instead. It is recommended that
@@ -807,7 +807,7 @@ public class JDBCDiskCache<K, V>
     }
 
     /**
-     * Removed the expired. (now - create time) > max life seconds * 1000
+     * Removed the expired. (now - create time) &gt; max life seconds * 1000
      * <p>
      * @return the number deleted
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java Sat Feb  6 17:39:19 2016
@@ -148,7 +148,7 @@ public class MySQLDiskCache<K, V>
     }
 
     /**
-     * Removed the expired. (now - create time) > max life seconds * 1000
+     * Removed the expired. (now - create time) &gt; max life seconds * 1000
      * <p>
      * If we are currently optimizing, then this method will balk and do nothing.
      * <p>

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCache.java Sat Feb  6 17:39:19 2016
@@ -118,7 +118,7 @@ public class LateralCache<K, V>
      * The performance costs are too great. It is not recommended that you enable lateral gets.
      * <p>
      * @param key
-     * @return ICacheElement<K, V> or null
+     * @return ICacheElement&lt;K, V&gt; or null
      * @throws IOException
      */
     @Override
@@ -145,7 +145,7 @@ public class LateralCache<K, V>
 
     /**
      * @param pattern
-     * @return A map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return A map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -173,7 +173,7 @@ public class LateralCache<K, V>
      * Gets multiple items from the cache based on the given set of keys.
      * <p>
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWait.java Sat Feb  6 17:39:19 2016
@@ -124,7 +124,7 @@ public class LateralCacheNoWait<K, V>
      * Synchronously reads from the lateral cache.
      * <p>
      * @param key
-     * @return ICacheElement<K, V> if found, else null
+     * @return ICacheElement&lt;K, V&gt; if found, else null
      */
     @Override
     public ICacheElement<K, V> get( K key )
@@ -161,7 +161,7 @@ public class LateralCacheNoWait<K, V>
      * Gets multiple items from the cache based on the given set of keys.
      * <p>
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      */
     @Override
@@ -189,7 +189,7 @@ public class LateralCacheNoWait<K, V>
      * Synchronously reads from the lateral cache.
      * <p>
      * @param pattern
-     * @return ICacheElement<K, V> if found, else empty
+     * @return ICacheElement&lt;K, V&gt; if found, else empty
      */
     @Override
     public Map<K, ICacheElement<K, V>> getMatching(String pattern)

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralCacheNoWaitFacade.java Sat Feb  6 17:39:19 2016
@@ -241,7 +241,7 @@ public class LateralCacheNoWaitFacade<K,
      * Gets multiple items from the cache based on the given set of keys.
      * <p>
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      */
     @Override

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralElementDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralElementDescriptor.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralElementDescriptor.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/LateralElementDescriptor.java Sat Feb  6 17:39:19 2016
@@ -60,7 +60,7 @@ public class LateralElementDescriptor<K,
     /**
      * Constructor for the LateralElementDescriptor object
      * <p>
-     * @param ce ICacheElement<K, V> payload
+     * @param ce ICacheElement&lt;K, V&gt; payload
      */
     public LateralElementDescriptor( ICacheElement<K, V> ce )
     {

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java Sat Feb  6 17:39:19 2016
@@ -226,7 +226,7 @@ public class LateralTCPCacheFactory
      * <p>
      * @param lca configuration for the creation of a new service instance
      *
-     * @return ICacheServiceNonLocal<K, V>
+     * @return ICacheServiceNonLocal&lt;K, V&gt;
      */
     // Need to cast because of common map for all cache services
     @SuppressWarnings("unchecked")

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java Sat Feb  6 17:39:19 2016
@@ -88,7 +88,7 @@ public class LateralTCPDiscoveryListener
      * not configured to use the lateral cache, and no facade will be created.
      * <p>
      * @param cacheName - the region name
-     * @param facade - facade (for region) => multiple lateral clients.
+     * @param facade - facade (for region) =&gt; multiple lateral clients.
      * @return true if the facade was not already registered.
      */
     public synchronized boolean addNoWaitFacade( String cacheName, LateralCacheNoWaitFacade<?, ?> facade )

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java Sat Feb  6 17:39:19 2016
@@ -204,7 +204,7 @@ public class LateralTCPService<K, V>
     /**
      * @param cacheName
      * @param key
-     * @return ICacheElement<K, V> if found.
+     * @return ICacheElement&lt;K, V&gt; if found.
      * @throws IOException
      */
     @Override
@@ -220,7 +220,7 @@ public class LateralTCPService<K, V>
      * @param cacheName
      * @param key
      * @param requesterId
-     * @return ICacheElement<K, V> if found.
+     * @return ICacheElement&lt;K, V&gt; if found.
      * @throws IOException
      */
     @Override
@@ -254,7 +254,7 @@ public class LateralTCPService<K, V>
      * <p>
      * @param cacheName
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache matching the pattern.
      * @throws IOException
      */
@@ -271,7 +271,7 @@ public class LateralTCPService<K, V>
      * @param cacheName
      * @param pattern
      * @param requesterId - our identity
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache matching the pattern.
      * @throws IOException
      */
@@ -307,7 +307,7 @@ public class LateralTCPService<K, V>
      * <p>
      * @param cacheName
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -326,7 +326,7 @@ public class LateralTCPService<K, V>
      * @param cacheName
      * @param keys
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java Sat Feb  6 17:39:19 2016
@@ -316,7 +316,7 @@ public abstract class AbstractRemoteAuxi
      * Gets multiple items from the cache based on the given set of keys.
      * <p>
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java Sat Feb  6 17:39:19 2016
@@ -127,7 +127,8 @@ public abstract class AbstractRemoteCach
     }
 
     /**
-     * Gets the remoteType attribute of the RemoteCacheListener object <p.
+     * Gets the remoteType attribute of the RemoteCacheListener object
+     * <p>
      * @return The remoteType value
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java Sat Feb  6 17:39:19 2016
@@ -142,7 +142,7 @@ public abstract class AbstractRemoteCach
      * Synchronously reads from the remote cache.
      * <p>
      * @param key
-     * @return Either an ICacheElement<K, V> or null if it is not found.
+     * @return Either an ICacheElement&lt;K, V&gt; or null if it is not found.
      */
     @Override
     public ICacheElement<K, V> get( K key )
@@ -195,7 +195,7 @@ public abstract class AbstractRemoteCach
      * Gets multiple items from the cache based on the given set of keys.
      * <p>
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      */
     @Override

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java Sat Feb  6 17:39:19 2016
@@ -233,7 +233,7 @@ public class RemoteCacheNoWait<K, V>
      * request on to the server rather than looping through the requested keys.
      * <p>
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java Sat Feb  6 17:39:19 2016
@@ -143,7 +143,7 @@ public class RemoteHttpCacheClient<K, V>
      * <p>
      * @param cacheName
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache matching the pattern.
      * @throws IOException
      */
@@ -160,7 +160,7 @@ public class RemoteHttpCacheClient<K, V>
      * @param cacheName
      * @param pattern
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache matching the pattern.
      * @throws IOException
      */
@@ -194,7 +194,7 @@ public class RemoteHttpCacheClient<K, V>
      * <p>
      * @param cacheName
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -211,7 +211,7 @@ public class RemoteHttpCacheClient<K, V>
      * @param cacheName
      * @param keys
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/server/AbstractRemoteCacheService.java Sat Feb  6 17:39:19 2016
@@ -256,7 +256,7 @@ public abstract class AbstractRemoteCach
      * <p>
      * @param cacheName
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -275,7 +275,7 @@ public abstract class AbstractRemoteCach
      * @param cacheName
      * @param keys
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -301,7 +301,7 @@ public abstract class AbstractRemoteCach
      * @param cacheName
      * @param keys
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java Sat Feb  6 17:39:19 2016
@@ -204,8 +204,8 @@ public class RemoteCacheServer<K, V>
     /**
      * Puts a cache bean to the remote cache and notifies all listeners which <br>
      * <ol>
-     * <li>have a different listener id than the originating host; <li>are currently subscribed to
-     * the related cache.
+     * <li>have a different listener id than the originating host;</li>
+     * <li>are currently subscribed to the related cache.</li>
      * </ol>
      * <p>
      * @param item
@@ -679,7 +679,7 @@ public class RemoteCacheServer<K, V>
      * <p>
      * @param cacheName
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -698,7 +698,7 @@ public class RemoteCacheServer<K, V>
      * @param cacheName
      * @param keys
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -724,7 +724,7 @@ public class RemoteCacheServer<K, V>
      * @param cacheName
      * @param keys
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      */
     private Map<K, ICacheElement<K, V>> processGetMultiple( String cacheName, Set<K> keys, long requesterId )

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java Sat Feb  6 17:39:19 2016
@@ -40,19 +40,19 @@ import java.util.Properties;
  * in a tomcat base. This give you an easy way to monitor its activity.
  * <p>
  * <code>
- *  <servlet>
-        <servlet-name>JCSRemoteCacheStartupServlet</servlet-name>
-        <servlet-class>
+ *  servlet&gt;
+        &lt;servlet-name&gt;JCSRemoteCacheStartupServlet&lt;/servlet-name&gt;
+        &lt;servlet-class&gt;
              org.apache.commons.jcs.auxiliary.remote.server.RemoteCacheStartupServlet
-        </servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
+        &lt;/servlet-class&gt;
+        &lt;load-on-startup&gt;1&lt;/load-on-startup&gt;
+    &lt;/servlet&gt;
 
 
-    <servlet-mapping>
-        <servlet-name>JCSRemoteCacheStartupServlet</servlet-name>
-        <url-pattern>/jcs</url-pattern>
-    </servlet-mapping>
+    &lt;servlet-mapping&gt;
+        &lt;servlet-name&gt;JCSRemoteCacheStartupServlet&lt;/servlet-name&gt;
+        &lt;url-pattern&gt;/jcs&lt;/url-pattern&gt;
+    &lt;/servlet-mapping&gt;
  * </code>
  * @author Aaron Smuts
  */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheResponse.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheResponse.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheResponse.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheResponse.java Sat Feb  6 17:39:19 2016
@@ -38,7 +38,7 @@ public class RemoteCacheResponse<T>
     private String errorMessage;
 
     /**
-     * The payload. Typically a key / ICacheElement<K, V> map. A normal get will return a map with one
+     * The payload. Typically a key / ICacheElement&lt;K, V&gt; map. A normal get will return a map with one
      * record.
      */
     private T payload;

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java Sat Feb  6 17:39:19 2016
@@ -29,7 +29,7 @@ import java.util.Set;
 /**
  * This is the top level interface for all cache like structures. It defines the methods used
  * internally by JCS to access, modify, and instrument such structures.
- * <p>
+ * 
  * This allows for a suite of reusable components for accessing such structures, for example
  * asynchronous access via an event queue.
  */
@@ -38,7 +38,7 @@ public interface ICache<K, V>
 {
     /**
      * Puts an item to the cache.
-     * <p>
+     * 
      * @param element
      * @throws IOException
      */
@@ -47,7 +47,7 @@ public interface ICache<K, V>
 
     /**
      * Gets an item from the cache.
-     * <p>
+     * 
      * @param key
      * @return a cache element, or null if there is no data in cache for this key
      * @throws IOException
@@ -57,9 +57,9 @@ public interface ICache<K, V>
 
     /**
      * Gets multiple items from the cache based on the given set of keys.
-     * <p>
+     * 
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no data in cache for any of these keys
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no data in cache for any of these keys
      * @throws IOException
      */
     Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys)
@@ -67,13 +67,13 @@ public interface ICache<K, V>
 
     /**
      * Gets items from the cache matching the given pattern.  Items from memory will replace those from remote sources.
-     * <p>
+     * 
      * This only works with string keys.  It's too expensive to do a toString on every key.
-     * <p>
+     * 
      * Auxiliaries will do their best to handle simple expressions.  For instance, the JDBC disk cache will convert * to % and . to _
-     * <p>
+     * 
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no data matching the pattern.
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no data matching the pattern.
      * @throws IOException
      */
     Map<K, ICacheElement<K, V>> getMatching(String pattern)
@@ -81,7 +81,7 @@ public interface ICache<K, V>
 
     /**
      * Removes an item from the cache.
-     * <p>
+     * 
      * @param key
      * @return false if there was an error in removal
      * @throws IOException
@@ -91,7 +91,7 @@ public interface ICache<K, V>
 
     /**
      * Removes all cached items from the cache.
-     * <p>
+     * 
      * @throws IOException
      */
     void removeAll()
@@ -106,35 +106,35 @@ public interface ICache<K, V>
 
     /**
      * Returns the current cache size in number of elements.
-     * <p>
+     * 
      * @return number of elements
      */
     int getSize();
 
     /**
      * Returns the cache status.
-     * <p>
+     * 
      * @return Alive or Error
      */
     CacheStatus getStatus();
 
     /**
      * Returns the cache stats.
-     * <p>
+     * 
      * @return String of important historical information.
      */
     String getStats();
 
     /**
      * Returns the cache name.
-     * <p>
+     * 
      * @return usually the region name.
      */
     String getCacheName();
 
     /**
      * Sets the key matcher used by get matching.
-     * <p>
+     * 
      * @param keyMatcher
      */
     void setKeyMatcher( IKeyMatcher<K> keyMatcher );

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java Sat Feb  6 17:39:19 2016
@@ -36,7 +36,7 @@ public interface ICacheElement<K, V>
 {
 
     /**
-     * Gets the cacheName attribute of the ICacheElement<K, V> object. The cacheName
+     * Gets the cacheName attribute of the ICacheElement&lt;K, V&gt; object. The cacheName
      * is also known as the region name.
      *
      * @return The cacheName value
@@ -44,28 +44,28 @@ public interface ICacheElement<K, V>
     String getCacheName();
 
     /**
-     * Gets the key attribute of the ICacheElement<K, V> object
+     * Gets the key attribute of the ICacheElement&lt;K, V&gt; object
      *
      * @return The key value
      */
     K getKey();
 
     /**
-     * Gets the val attribute of the ICacheElement<K, V> object
+     * Gets the val attribute of the ICacheElement&lt;K, V&gt; object
      *
      * @return The val value
      */
     V getVal();
 
     /**
-     * Gets the attributes attribute of the ICacheElement<K, V> object
+     * Gets the attributes attribute of the ICacheElement&lt;K, V&gt; object
      *
      * @return The attributes value
      */
     IElementAttributes getElementAttributes();
 
     /**
-     * Sets the attributes attribute of the ICacheElement<K, V> object
+     * Sets the attributes attribute of the ICacheElement&lt;K, V&gt; object
      *
      * @param attr
      *            The new attributes value

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java Sat Feb  6 17:39:19 2016
@@ -24,7 +24,7 @@ package org.apache.commons.jcs.engine.be
  * <p>
  * The value is stored as a byte array. This should allow for a variety of serialization mechanisms.
  * <p>
- * This currently extends ICacheElement<K, V> for backward compatibility.
+ * This currently extends ICacheElement&lt;K, V&gt; for backward compatibility.
  *<p>
  * @author Aaron Smuts
  */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java Sat Feb  6 17:39:19 2016
@@ -40,7 +40,7 @@ public interface ICacheEventQueue<K, V>
 
     /**
      * Initializes the queue.
-     * <,p>
+     * <p>
      * @param listener
      * @param listenerId
      * @param cacheName

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java Sat Feb  6 17:39:19 2016
@@ -49,7 +49,7 @@ public interface ICacheService<K, V>
      * <p>
      * @param cacheName
      * @param key
-     * @return the ICacheElement<K, V> or null if not found
+     * @return the ICacheElement&lt;K, V&gt; or null if not found
      * @throws ObjectNotFoundException
      * @throws IOException
      */
@@ -61,7 +61,7 @@ public interface ICacheService<K, V>
      * <p>
      * @param cacheName
      * @param keys
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws ObjectNotFoundException
      * @throws IOException
@@ -74,7 +74,7 @@ public interface ICacheService<K, V>
      * <p>
      * @param cacheName
      * @param pattern
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache matching the pattern.
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java Sat Feb  6 17:39:19 2016
@@ -85,7 +85,7 @@ public interface ICacheServiceNonLocal<K
      * @param cacheName
      * @param keys
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache for any of these keys
      * @throws IOException
      */
@@ -98,7 +98,7 @@ public interface ICacheServiceNonLocal<K
      * @param cacheName
      * @param pattern
      * @param requesterId
-     * @return a map of K key to ICacheElement<K, V> element, or an empty map if there is no
+     * @return a map of K key to ICacheElement&lt;K, V&gt; element, or an empty map if there is no
      *         data in cache matching the pattern.
      * @throws IOException
      */