commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r1728857 [2/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/...
Date Sat, 06 Feb 2016 17:39:20 GMT
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
Sat Feb  6 17:39:19 2016
@@ -218,7 +218,7 @@ public class CompositeCache<K, V>
      * Put an item into the cache. If it is localOnly, then do no notify remote or lateral
      * auxiliaries.
      * <p>
-     * @param cacheElement the ICacheElement<K, V>
+     * @param cacheElement the ICacheElement&lt;K, V&gt;
      * @param localOnly Whether the operation should be restricted to local auxiliaries.
      * @throws IOException
      */
@@ -627,7 +627,7 @@ public class CompositeCache<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
@@ -641,7 +641,7 @@ public class CompositeCache<K, V>
      * laterally for this data.
      * <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
      */
     public Map<K, ICacheElement<K, V>> localGetMultiple( Set<K> keys )
@@ -816,7 +816,7 @@ public class CompositeCache<K, V>
      * Build a map of all the matching elements in all of the auxiliaries and memory.
      * <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 for any matching keys
      */
     @Override
@@ -830,7 +830,7 @@ public class CompositeCache<K, V>
      * go remote or laterally for this data.
      * <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 for any matching keys
      */
     public Map<K, ICacheElement<K, V>> localGetMatching( String pattern )
@@ -848,7 +848,7 @@ public class CompositeCache<K, V>
      * <p>
      * @param pattern
      * @param localOnly
-     * @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 matching keys
      */
     protected Map<K, ICacheElement<K, V>> getMatching( String pattern, boolean
localOnly )
@@ -878,10 +878,10 @@ public class CompositeCache<K, V>
 
     /**
      * Gets the key array from the memcache. Builds a set of matches. Calls getMultiple with
the
-     * set. Returns a map: key -> result.
+     * set. Returns a map: key -&gt; result.
      * <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 for any matching keys
      * @throws IOException
      */
@@ -906,7 +906,7 @@ public class CompositeCache<K, V>
      * <p>
      * @param pattern
      * @param localOnly
-     * @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 matching keys
      * @throws IOException
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
Sat Feb  6 17:39:19 2016
@@ -45,8 +45,8 @@ import org.apache.commons.logging.LogFac
  * This class configures JCS based on a properties object.
  * <p>
  * This class is based on the log4j class org.apache.log4j.PropertyConfigurator which was
made by:
- * "Luke Blanshard" <Luke@quiq.com>"Mark DONSZELMANN" <Mark.Donszelmann@cern.ch>"Anders
Kristensen"
- * <akristensen@dynamicsoft.com>
+ * "Luke Blanshard" &lt;Luke@quiq.com&gt;"Mark DONSZELMANN" &lt;Mark.Donszelmann@cern.ch&gt;"Anders
Kristensen"
+ * &lt;akristensen@dynamicsoft.com&gt;
  */
 public class CompositeCacheConfigurator
 {

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupId.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupId.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupId.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupId.java
Sat Feb  6 17:39:19 2016
@@ -63,7 +63,7 @@ public class GroupId
 
     /**
      * @param obj
-     * @return cacheName.equals( g.cacheName ) && groupName.equals( g.groupName );
+     * @return cacheName.equals( g.cacheName ) &amp;&amp;groupName.equals( g.groupName
);
      */
     @Override
     public boolean equals( Object obj )

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
Sat Feb  6 17:39:19 2016
@@ -224,7 +224,7 @@ public abstract class AbstractDoubleLink
      *
      * @param key
      *            Identifies item to find
-     * @return ICacheElement<K, V> if found, else null
+     * @return ICacheElement&lt;K, V&gt; if found, else null
      * @throws IOException
      */
     @Override
@@ -327,7 +327,7 @@ public abstract class AbstractDoubleLink
      * This spools the last element in the LRU, if one exists.
      * <p>
      *
-     * @return ICacheElement<K, V> if there was a last element, else null.
+     * @return ICacheElement&lt;K, V&gt; if there was a last element, else null.
      * @throws Error
      */
     private ICacheElement<K, V> spoolLastElement() throws Error

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractMemoryCache.java
Sat Feb  6 17:39:19 2016
@@ -128,7 +128,7 @@ public abstract class AbstractMemoryCach
      * 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/engine/memory/behavior/IMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/behavior/IMemoryCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/behavior/IMemoryCache.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/behavior/IMemoryCache.java
Sat Feb  6 17:39:19 2016
@@ -121,7 +121,7 @@ public interface IMemoryCache<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
+     * @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/engine/memory/lru/LHMLRUMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
Sat Feb  6 17:39:19 2016
@@ -119,7 +119,7 @@ public class LHMLRUMemoryCache<K extends
      * Get an item from the cache
      * <p>
      * @param key Identifies item to find
-     * @return ICacheElement<K, V> if found, else null
+     * @return ICacheElement&lt;K, V&gt; if found, else null
      * @throws IOException
      */
     @Override

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCache.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LRUMemoryCache.java
Sat Feb  6 17:39:19 2016
@@ -34,7 +34,7 @@ import org.apache.commons.jcs.engine.mem
  * might want to find a more efficient memory manager for large cache regions.
  * <p>
  * The LRUMemoryCache is most efficient when the first element is selected. The smaller the
region,
- * the better the chance that this will be the case. < .04 ms per put, p3 866, 1/10 of
that per get
+ * the better the chance that this will be the case. &lt; .04 ms per put, p3 866, 1/10
of that per get
  */
 public class LRUMemoryCache<K, V>
     extends AbstractDoubleLinkedListMemoryCache<K, V>

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/config/OptionConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/config/OptionConverter.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/config/OptionConverter.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/config/OptionConverter.java
Sat Feb  6 17:39:19 2016
@@ -71,7 +71,7 @@ public class OptionConverter
 
     /**
      * Escapes special characters.
-     * <p>
+     * 
      * @param s
      * @return String
      */
@@ -152,7 +152,7 @@ public class OptionConverter
 
     /**
      * Creates an object for the className value of the key.
-     * <p>
+     * 
      * @param props
      * @param key
      * @param defaultValue
@@ -178,7 +178,7 @@ public class OptionConverter
     /**
      * If <code>value</code> is "true", then <code>true</code> is
returned. If <code>value</code> is
      * "false", then <code>true</code> is returned. Otherwise, <code>default</code>
is returned.
-     * <p>
+     * 
      * Case of value is unimportant.
      * @param value
      * @param defaultValue
@@ -204,7 +204,7 @@ public class OptionConverter
 
     /**
      * Converts to int.
-     * <p>
+     * 
      * @param value
      * @param defaultValue
      * @return int
@@ -276,7 +276,7 @@ public class OptionConverter
     /**
      * Find the value corresponding to <code>key</code> in <code>props</code>.
Then perform variable
      * substitution on the found value.
-     * <p>
+     * 
      * @param key
      * @param props
      * @return substituted string
@@ -305,7 +305,7 @@ public class OptionConverter
      * Instantiate an object given a class name. Check that the <code>className</code>
is a subclass
      * of <code>superClass</code>. If that test fails or the object could not
be instantiated, then
      * <code>defaultValue</code> is returned.
-     * <p>
+     * 
      * @param className The fully qualified class name of the object to instantiate.
      * @param defaultValue The object to return in case of non-fulfillment
      * @return instantiated object
@@ -343,9 +343,9 @@ public class OptionConverter
     /**
      * Perform variable substitution in string <code>val</code> from the values
of keys found in the
      * system properties.
-     * <p>
+     * 
      * The variable substitution delimiters are <b>${ </b> and <b>} </b>.
-     * <p>
+     * 
      * For example, if the System properties contains "key=value", then the call
      *
      * <pre>
@@ -353,11 +353,11 @@ public class OptionConverter
      * </pre>
      *
      * will set the variable <code>s</code> to "Value of key is value.".
-     * <p>
+     * 
      * If no value could be found for the specified key, then the <code>props</code>
parameter is
      * searched, if the value could not be found there, then substitution defaults to the
empty
      * string.
-     * <p>
+     * 
      * For example, if system properties contains no value for the key "inexistentKey", then
the call
      *
      * <pre>
@@ -370,7 +370,7 @@ public class OptionConverter
      * delimiter "${" which is not balanced by a stop delimiter "}".
      * </p>
      * <p>
-     * <b>Author </b> Avy Sharell </a>
+     * <b>Author </b> Avy Sharell
      * </p>
      * @param val The string on which variable substitution is performed.
      * @param props

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/net/HostNameUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/net/HostNameUtil.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/net/HostNameUtil.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/net/HostNameUtil.java
Sat Feb  6 17:39:19 2016
@@ -78,9 +78,11 @@ public class HostNameUtil
      * multiple IP addresses, this method will prefer a site-local IP address (e.g. 192.168.x.x
or
      * 10.10.x.x, usually IPv4) if the machine has one (and will return the first site-local
address
      * if the machine has more than one), but if the machine does not hold a site-local address,
-     * this method will return simply the first non-loopback address found (IPv4 or IPv6).
<p/> If
-     * this method cannot find a non-loopback address using this selection algorithm, it
will fall
-     * back to calling and returning the result of JDK method <code>InetAddress.getLocalHost</code>.
+     * this method will return simply the first non-loopback address found (IPv4 or IPv6).</p>
+     * <p>
+     * If this method cannot find a non-loopback address using this selection algorithm,
it will
+     * fall back to calling and returning the result of JDK method
+     * <code>InetAddress.getLocalHost</code>.
      * <p>
      * <a href="http://issues.apache.org/jira/browse/JCS-40">JIR ISSUE JCS-40</a>
      * <p>

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/BoundedQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/BoundedQueue.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/BoundedQueue.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/utils/struct/BoundedQueue.java
Sat Feb  6 17:39:19 2016
@@ -83,9 +83,9 @@ public class BoundedQueue<T>
     }
 
     /**
-     * Return true if the size is <= 0;
+     * Return true if the size is &lt;= 0;
      * <p>
-     * @return true is size <= 0;
+     * @return true is size &lt;= 0;
      */
     public boolean isEmpty()
     {

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/MockAuxiliaryCache.java
Sat Feb  6 17:39:19 2016
@@ -87,7 +87,7 @@ public class MockAuxiliaryCache<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<String, String> element, or an empty
map if there is no
+     * @return a map of K key to ICacheElement&lt;String, String&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/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
Sat Feb  6 17:39:19 2016
@@ -20,9 +20,11 @@ package org.apache.commons.jcs.auxiliary
  */
 
 import junit.framework.TestCase;
+
 import org.apache.commons.jcs.JCS;
 import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.access.TestCacheAccess;
+import org.junit.Test;
 
 /**
  * This is used by other tests to generate a random load on the disk cache.
@@ -39,6 +41,12 @@ public class BlockDiskCacheRandomConcurr
     {
         super( testName );
     }
+    
+    @Test
+    public void test()
+    {
+       
+    }
 
     /**
      * Randomly adds items to cache, gets them, and removes them. The range

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTestAbstract.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTestAbstract.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTestAbstract.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCacheUnitTestAbstract.java
Sat Feb  6 17:39:19 2016
@@ -32,13 +32,6 @@ import org.apache.commons.jcs.utils.seri
 /** Unit tests for the Block Disk Cache */
 public abstract class BlockDiskCacheUnitTestAbstract extends TestCase
 {
-    /**
-     * Test the basic get matching.
-     * <p>
-     *
-     * @throws Exception
-     */
-
     public abstract BlockDiskCacheAttributes getCacheAttributes();
 
     public void testPutGetMatching_SmallWait() throws Exception

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/block/HugeQuantityBlockDiskCacheLoadTest.java
Sat Feb  6 17:39:19 2016
@@ -26,7 +26,7 @@ import org.apache.commons.jcs.utils.timi
 import org.apache.commons.jcs.utils.timing.SleepUtil;
 
 /**
- * Put a few hundred thousand entries in the block disk cache. <p.
+ * Put a few hundred thousand entries in the block disk cache.
  * @author Aaron Smuts
  */
 public class HugeQuantityBlockDiskCacheLoadTest

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheClient.java
Sat Feb  6 17:39:19 2016
@@ -50,7 +50,7 @@ public class MockRemoteCacheClient<K ext
     /** log instance */
     private static final Log log = LogFactory.getLog( MockRemoteCacheClient.class );
 
-    /** List of ICacheElement<K, V> objects passed into update. */
+    /** List of ICacheElement&lt;K, V&gt; objects passed into update. */
     public List<ICacheElement<K, V>> updateList = new LinkedList<ICacheElement<K,V>>();
 
     /** List of key objects passed into remove. */
@@ -59,10 +59,10 @@ public class MockRemoteCacheClient<K ext
     /** status to return. */
     public CacheStatus status = CacheStatus.ALIVE;
 
-    /** Can setup values to return from get. values must be ICacheElement<K, V> */
+    /** Can setup values to return from get. values must be ICacheElement&lt;K, V&gt;
*/
     public Map<K, ICacheElement<K, V>> getSetupMap = new HashMap<K, ICacheElement<K,V>>();
 
-    /** Can setup values to return from get. values must be Map<K, ICacheElement<K,
V>> */
+    /** Can setup values to return from get. values must be Map&lt;K, ICacheElement&lt;K,
V&gt;&gt; */
     public Map<Set<K>, Map<K, ICacheElement<K, V>>> getMultipleSetupMap
=
         new HashMap<Set<K>, Map<K,ICacheElement<K,V>>>();
 
@@ -74,8 +74,6 @@ public class MockRemoteCacheClient<K ext
 
     /**
      * Stores the last argument as fixed.
-     * <p>
-     * @see org.apache.commons.jcs.auxiliary.remote.behavior.IRemoteCacheClient#fixCache(org.apache.commons.jcs.engine.behavior.ICacheServiceNonLocal)
      */
     @Override
     @SuppressWarnings("unchecked") // Don't know how to do this properly
@@ -104,9 +102,6 @@ public class MockRemoteCacheClient<K ext
 
     /**
      * Adds the argument to the updatedList.
-     * <p>
-     * (non-Javadoc)
-     * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#update(org.apache.commons.jcs.engine.behavior.ICacheElement)
      */
     @Override
     public void update( ICacheElement<K, V> ce )
@@ -116,9 +111,6 @@ public class MockRemoteCacheClient<K ext
 
     /**
      * Looks in the getSetupMap for a value.
-     * <p>
-     * (non-Javadoc)
-     * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#get(java.io.Serializable)
      */
     @Override
     public ICacheElement<K, V> get( K key )
@@ -131,7 +123,7 @@ public class MockRemoteCacheClient<K ext
      * 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
@@ -143,9 +135,6 @@ public class MockRemoteCacheClient<K ext
 
     /**
      * Adds the key to the remove list.
-     * <p>
-     * (non-Javadoc)
-     * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#remove(java.io.Serializable)
      */
     @Override
     public boolean remove( K key )
@@ -184,8 +173,7 @@ public class MockRemoteCacheClient<K ext
     }
 
     /**
-     * Returns the status setup variable. (non-Javadoc)
-     * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getStatus()
+     * Returns the status setup variable.
      */
     @Override
     public CacheStatus getStatus()
@@ -224,9 +212,6 @@ public class MockRemoteCacheClient<K ext
 
     /**
      * Returns the setup attributes. By default they are not null.
-     * <p>
-     * (non-Javadoc)
-     * @see org.apache.commons.jcs.auxiliary.AuxiliaryCache#getAuxiliaryCacheAttributes()
      */
     @Override
     public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/remote/MockRemoteCacheService.java
Sat Feb  6 17:39:19 2016
@@ -99,10 +99,6 @@ public class MockRemoteCacheService<K ex
 
     /**
      * Set the lastRemoveAllCacheName to the cacheName.
-     * <p>
-     * (non-Javadoc)
-     * @see org.apache.commons.jcs.auxiliary.remote.behavior.ICacheServiceNonLocal#removeAll(java.lang.String,
-     *      long)
      */
     @Override
     public void removeAll( String cacheName, long requesterId )

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/SystemPropertyUsageUnitTest.java
Sat Feb  6 17:39:19 2016
@@ -20,6 +20,7 @@ package org.apache.commons.jcs.engine;
  */
 
 import junit.framework.TestCase;
+
 import org.apache.commons.jcs.JCS;
 import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.engine.control.CompositeCacheManager;
@@ -37,6 +38,15 @@ public class SystemPropertyUsageUnitTest
     private static final int testValue = 6789;
 
     private CompositeCacheManager manager = null;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+       super.setUp();
+       //First shut down any previously running manager.
+       manager = CompositeCacheManager.getInstance();
+       manager.shutDown();
+    }
 
 	/**
 	 * @see junit.framework.TestCase#tearDown()
@@ -62,14 +72,14 @@ public class SystemPropertyUsageUnitTest
         throws Exception
     {
         System.setProperty( JCS_DEFAULT_CACHEATTRIBUTES_MAX_OBJECTS, String.valueOf(testValue)
);
-
+        
         JCS.setConfigFilename( "/TestSystemPropertyUsage.ccf" );
-
+        
         CacheAccess<String, String> jcs = JCS.getInstance( "someCacheNotInFile" );
 
         manager = CompositeCacheManager.getInstance();
 
-        assertEquals( "System property value is not reflected", testValue, jcs.getCacheAttributes().getMaxObjects());
+        assertEquals( "System property value is not reflected.", testValue, jcs.getCacheAttributes().getMaxObjects());
     }
 
     /**

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
Sat Feb  6 17:39:19 2016
@@ -361,7 +361,7 @@ public class CompositeCacheDiskUsageUnit
          * 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
+         * @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/test/java/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/serialization/CompressingSerializerUnitTest.java
Sat Feb  6 17:39:19 2016
@@ -51,7 +51,7 @@ public class CompressingSerializerUnitTe
     /**
      * Test simple back and forth with a string.
      * <p>
-     * ))<=>((
+     * ))&lt;=&gt;((
      * <p>
      * @throws Exception on error
      */

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
Sat Feb  6 17:39:19 2016
@@ -37,8 +37,7 @@ public class ThreadPoolUnitTest
      * <p>
      * We just want to ensure that we can adjust the max size of an active pool.
      * <p>
-     * http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/PooledExecutor.html#
-     * setMaximumPoolSize(int) p>
+     * http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/PooledExecutor.html#setMaximumPoolSize(int)
      * @throws Exception
      */
     public void testMaxReduction()

Modified: commons/proper/jcs/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/changes/changes.xml?rev=1728857&r1=1728856&r2=1728857&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/changes/changes.xml (original)
+++ commons/proper/jcs/trunk/src/changes/changes.xml Sat Feb  6 17:39:19 2016
@@ -20,6 +20,9 @@
 	</properties>
 	<body>
         <release version="2.0" date="unreleased" description="JDK 1.6 based major release">
+            <action dev="tv" type="fix" due-to="Mat Jaggard">
+                Fix Javadoc for Java 8
+            </action>
             <action issue="JCS-116" dev="tv" type="fix" due-to="Sebb">
                 Fix: CompositeCacheManager is thread-hostile
             </action>



Mime
View raw message