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 2017/02/05 11:19:13 UTC
svn commit: r1781732 - in /commons/proper/jcs/branches/commons-jcs-2.1-RC: ./
auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/
commons-jcs-core/
commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/
commons-jcs-core/...
Author: tv
Date: Sun Feb 5 11:19:13 2017
New Revision: 1781732
URL: http://svn.apache.org/viewvc?rev=1781732&view=rev
Log:
Merge selected bugfixes from trunk into 2.1-RC branch
Removed:
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/MockLateralCache.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapConcurrentTest.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/tasks.xml
Modified:
commons/proper/jcs/branches/commons-jcs-2.1-RC/ (props changed)
commons/proper/jcs/branches/commons-jcs-2.1-RC/NOTICE.txt
commons/proper/jcs/branches/commons-jcs-2.1-RC/README.md
commons/proper/jcs/branches/commons-jcs-2.1-RC/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/DefaultMemoryElementDescriptor.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/MemoryElementDescriptor.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-dist/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-extras/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-openjpa/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/JCSCache.java
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/filecache/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/yajcache/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-tck-tests/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/pom.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/src/changes/changes.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/IndexedDiskAuxCache.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/UpgradingFrom13.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/download_jcs.xml
commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/faq.fml
Propchange: commons/proper/jcs/branches/commons-jcs-2.1-RC/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 5 11:19:13 2017
@@ -1 +1,2 @@
/commons/proper/jcs/branches/generics-interface:1232160-1344358
+/commons/proper/jcs/trunk:1776032-1781727
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/NOTICE.txt
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/NOTICE.txt?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/NOTICE.txt (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/NOTICE.txt Sun Feb 5 11:19:13 2017
@@ -1,5 +1,5 @@
Apache Commons JCS
-Copyright 2001-2016 The Apache Software Foundation.
+Copyright 2001-2017 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/README.md
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/README.md?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/README.md (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/README.md Sun Feb 5 11:19:13 2017
@@ -62,7 +62,7 @@ Alternatively you can pull it from the c
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.1</version>
</dependency>
```
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/javagroups/JavaGroupsCache.java Sun Feb 5 11:19:13 2017
@@ -355,7 +355,7 @@ public class JavaGroupsCache
}
/**
- * TODO speed this up. We don't want to ahve to go through the manager
+ * TODO speed this up. We don't want to have to go through the manager
* everytime.
*
* @return ICompositeCache
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/pom.xml Sun Feb 5 11:19:13 2017
@@ -22,20 +22,20 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>commons-jcs-core</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Commons JCS :: Core</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-core</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-core</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-core</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core</url>
</scm>
<properties>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java Sun Feb 5 11:19:13 2017
@@ -200,7 +200,7 @@ public class CacheEventQueue<K, V>
public void run()
{
- while ( isAlive() )
+ while ( CacheEventQueue.this.isAlive() )
{
AbstractCacheEvent event = null;
@@ -223,7 +223,7 @@ public class CacheEventQueue<K, V>
stopProcessing();
}
- if ( event != null && isWorking() && isAlive() )
+ if ( event != null && isWorking() && CacheEventQueue.this.isAlive() )
{
event.run();
}
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ElementAttributes.java Sun Feb 5 11:19:13 2017
@@ -446,7 +446,9 @@ public class ElementAttributes
{
try
{
- return (IElementAttributes)super.clone();
+ ElementAttributes c = (ElementAttributes) super.clone();
+ c.setCreateTime();
+ return c;
}
catch (CloneNotSupportedException e)
{
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java Sun Feb 5 11:19:13 2017
@@ -1642,7 +1642,7 @@ public class CompositeCache<K, V>
{
if ( log.isDebugEnabled() )
{
- log.info( "Exceeded maxIdle: " + element.getKey() );
+ log.debug( "Exceeded maxIdle: " + element.getKey() );
}
handleElementEvent( element, eventIdle );
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/AbstractDoubleLinkedListMemoryCache.java Sun Feb 5 11:19:13 2017
@@ -32,7 +32,6 @@ import org.apache.commons.jcs.engine.Cac
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.control.CompositeCache;
import org.apache.commons.jcs.engine.control.group.GroupAttrName;
-import org.apache.commons.jcs.engine.memory.util.DefaultMemoryElementDescriptor;
import org.apache.commons.jcs.engine.memory.util.MemoryElementDescriptor;
import org.apache.commons.jcs.engine.stats.StatElement;
import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
@@ -470,7 +469,7 @@ public abstract class AbstractDoubleLink
lock.lock();
try
{
- MemoryElementDescriptor<K, V> me = new DefaultMemoryElementDescriptor<K, V>(ce);
+ MemoryElementDescriptor<K, V> me = new MemoryElementDescriptor<K, V>(ce);
list.addFirst(me);
if ( log.isDebugEnabled() )
{
@@ -497,7 +496,7 @@ public abstract class AbstractDoubleLink
lock.lock();
try
{
- MemoryElementDescriptor<K, V> me = new DefaultMemoryElementDescriptor<K, V>(ce);
+ MemoryElementDescriptor<K, V> me = new MemoryElementDescriptor<K, V>(ce);
list.addLast(me);
if ( log.isDebugEnabled() )
{
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java Sun Feb 5 11:19:13 2017
@@ -31,7 +31,6 @@ import org.apache.commons.jcs.engine.beh
import org.apache.commons.jcs.engine.control.CompositeCache;
import org.apache.commons.jcs.engine.control.group.GroupAttrName;
import org.apache.commons.jcs.engine.memory.AbstractMemoryCache;
-import org.apache.commons.jcs.engine.memory.util.DefaultMemoryElementDescriptor;
import org.apache.commons.jcs.engine.memory.util.MemoryElementDescriptor;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
import org.apache.commons.logging.Log;
@@ -80,7 +79,7 @@ public class LHMLRUMemoryCache<K, V>
throws IOException
{
putCnt.incrementAndGet();
- map.put( ce.getKey(), new DefaultMemoryElementDescriptor<K, V>(ce) );
+ map.put( ce.getKey(), new MemoryElementDescriptor<K, V>(ce) );
}
/**
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/DefaultMemoryElementDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/DefaultMemoryElementDescriptor.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/DefaultMemoryElementDescriptor.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/DefaultMemoryElementDescriptor.java Sun Feb 5 11:19:13 2017
@@ -23,16 +23,16 @@ import org.apache.commons.jcs.engine.beh
/**
* This wrapper is needed for double linked lists.
+ *
+ * @deprecated Use MemoryElementDescriptor directly
*/
+@Deprecated
public class DefaultMemoryElementDescriptor<K, V>
extends MemoryElementDescriptor<K, V>
{
/** Don't change */
private static final long serialVersionUID = -1905161209035522460L;
- /** The CacheElement wrapped by this descriptor */
- private final ICacheElement<K, V> ce;
-
/**
* Constructs a usable MemoryElementDescriptor.
* <p>
@@ -41,15 +41,5 @@ public class DefaultMemoryElementDescrip
public DefaultMemoryElementDescriptor( ICacheElement<K, V> ce )
{
super( ce );
- this.ce = ce;
- }
-
- /**
- * @return the ce
- */
- @Override
- public ICacheElement<K, V> getCacheElement()
- {
- return ce;
}
}
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/MemoryElementDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/MemoryElementDescriptor.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/MemoryElementDescriptor.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/MemoryElementDescriptor.java Sun Feb 5 11:19:13 2017
@@ -25,7 +25,7 @@ import org.apache.commons.jcs.utils.stru
/**
* This wrapper is needed for double linked lists.
*/
-public abstract class MemoryElementDescriptor<K, V>
+public class MemoryElementDescriptor<K, V>
extends DoubleLinkedListNode<ICacheElement<K, V>>
{
/** Don't change */
@@ -42,8 +42,12 @@ public abstract class MemoryElementDescr
}
/**
- * Return the cache element wrapped by this descriptor
- * @return the cache element
+ * Get the cache element
+ *
+ * @return the ce
*/
- public abstract ICacheElement<K, V> getCacheElement();
+ public ICacheElement<K, V> getCacheElement()
+ {
+ return getPayload();
+ }
}
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/memory/util/SoftReferenceElementDescriptor.java Sun Feb 5 11:19:13 2017
@@ -42,7 +42,7 @@ public class SoftReferenceElementDescrip
*/
public SoftReferenceElementDescriptor( ICacheElement<K, V> ce )
{
- super( ce );
+ super( null );
this.srce = new SoftReference<ICacheElement<K, V>>(ce);
}
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java Sun Feb 5 11:19:13 2017
@@ -1,5 +1,12 @@
package org.apache.commons.jcs.engine.control.event;
+import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs.access.CacheAccess;
+import org.apache.commons.jcs.engine.ElementAttributes;
+import org.apache.commons.jcs.engine.behavior.IElementAttributes;
+import org.apache.commons.jcs.engine.control.event.behavior.IElementEvent;
+import org.apache.commons.jcs.engine.control.event.behavior.IElementEventHandler;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,12 +28,6 @@ package org.apache.commons.jcs.engine.co
import junit.framework.TestCase;
-import org.apache.commons.jcs.JCS;
-import org.apache.commons.jcs.access.CacheAccess;
-import org.apache.commons.jcs.engine.behavior.IElementAttributes;
-import org.apache.commons.jcs.engine.control.event.behavior.IElementEvent;
-import org.apache.commons.jcs.engine.control.event.behavior.IElementEventHandler;
-
/**
* This test suite verifies that the basic ElementEvent are called as they should be.
*/
@@ -256,6 +257,24 @@ public class SimpleEventHandlingUnitTest
}
/**
+ * Test that cloned ElementAttributes have different creation times.
+ * @throws Exception
+ */
+ public void testElementAttributesCreationTime()
+ throws Exception
+ {
+ ElementAttributes elem1 = new ElementAttributes();
+ long ctime1 = elem1.getCreateTime();
+
+ Thread.sleep(10);
+
+ IElementAttributes elem2 = elem1.clone();
+ long ctime2 = elem2.getCreateTime();
+
+ assertFalse("Creation times should be different", ctime1 == ctime2);
+ }
+
+ /**
* Simple event counter used to verify test results.
*/
public static class MyEventHandler
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-dist/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-dist/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-dist/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-dist/pom.xml Sun Feb 5 11:19:13 2017
@@ -21,20 +21,20 @@
<parent>
<artifactId>commons-jcs</artifactId>
<groupId>org.apache.commons</groupId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-jcs-dist</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Commons JCS :: Distribution</name>
<description>Creates the Apache Commons JCS multimodule distribution.</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-dist</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-dist</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-dist</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-dist</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-dist</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-dist</url>
</scm>
<!-- NOTE: These dependency declarations are only required to sort this project to the
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-extras/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-extras/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-extras/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-extras/pom.xml Sun Feb 5 11:19:13 2017
@@ -21,18 +21,18 @@
<parent>
<artifactId>commons-jcs</artifactId>
<groupId>org.apache.commons</groupId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-jcs-jcache-extras</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache Extras</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache-extras</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache-extras</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache-extras</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-extras</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-extras</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-extras</url>
</scm>
<dependencies>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-openjpa/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-openjpa/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-openjpa/pom.xml Sun Feb 5 11:19:13 2017
@@ -21,18 +21,18 @@
<parent>
<artifactId>commons-jcs</artifactId>
<groupId>org.apache.commons</groupId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-jcs-jcache-openjpa</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache OpenJPA</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache-openjpa</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache-openjpa</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache-openjpa</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-openjpa</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-openjpa</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache-openjpa</url>
</scm>
<dependencies>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/pom.xml Sun Feb 5 11:19:13 2017
@@ -23,18 +23,18 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>commons-jcs-jcache</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-jcache</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache</url>
</scm>
<dependencies>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/JCSCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/JCSCache.java?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/JCSCache.java (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/JCSCache.java Sun Feb 5 11:19:13 2017
@@ -157,12 +157,13 @@ public class JCSCache<K, V> implements C
statistics.setActive(config.isStatisticsEnabled());
final String mgrStr = manager.getURI().toString().replaceAll(",|:|=|\n", ".");
+ final String cacheStr = name.replaceAll(",|:|=|\n", ".");
try
{
cacheConfigObjectName = new ObjectName("javax.cache:type=CacheConfiguration,"
- + "CacheManager=" + mgrStr + "," + "Cache=" + name);
+ + "CacheManager=" + mgrStr + "," + "Cache=" + cacheStr);
cacheStatsObjectName = new ObjectName("javax.cache:type=CacheStatistics,"
- + "CacheManager=" + mgrStr + "," + "Cache=" + name);
+ + "CacheManager=" + mgrStr + "," + "Cache=" + cacheStr);
}
catch (final Exception e)
{
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/filecache/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/filecache/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/filecache/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/filecache/pom.xml Sun Feb 5 11:19:13 2017
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-sandbox</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>commons-jcs-filecache</artifactId>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/pom.xml Sun Feb 5 11:19:13 2017
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>commons-jcs-sandbox</artifactId>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/yajcache/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/yajcache/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/yajcache/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-sandbox/yajcache/pom.xml Sun Feb 5 11:19:13 2017
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-sandbox</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>commons-jcs-yajcache</artifactId>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-tck-tests/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-tck-tests/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-tck-tests/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-tck-tests/pom.xml Sun Feb 5 11:19:13 2017
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,14 +34,14 @@
-->
<artifactId>commons-jcs-jcache-tck</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<name>Apache Commons JCS :: JCache TCK</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-tck-tests</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-tck-tests</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/jcs/tags/commons-jcs-2.0/commons-jcs-tck-tests</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-tck-tests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-tck-tests</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/commons-jcs-tck-tests</url>
</scm>
<properties>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/pom.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/pom.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/pom.xml Sun Feb 5 11:19:13 2017
@@ -21,12 +21,12 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>40</version>
+ <version>42</version>
</parent>
<artifactId>commons-jcs</artifactId>
<packaging>pom</packaging>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
<!--
* Build with -PjcacheTck to run the JSR-107 TCK
@@ -51,9 +51,9 @@
</issueManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0</developerConnection>
- <url>http://svn.apache.org/viewvc/commons/proper/jcs/tags/commons-jcs-2.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/jcs/branches/commons-jcs-2.1-RC</developerConnection>
+ <url>http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC</url>
</scm>
<mailingLists>
@@ -519,10 +519,11 @@
<maven.compiler.target>1.6</maven.compiler.target>
<commons.componentid>jcs</commons.componentid>
- <commons.release.version>2.0-beta-2</commons.release.version>
+ <commons.release.version>2.1</commons.release.version>
+ <commons.release.name>commons-jcs-dist-2.1</commons.release.name>
<commons.release.desc>(Java 6.0+)</commons.release.desc>
<!-- The RC version used in the staging repository URL. -->
- <commons.rc.version>RC2</commons.rc.version>
+ <commons.rc.version>RC1</commons.rc.version>
<commons.jira.id>JCS</commons.jira.id>
<commons.site.path>commons-jcs</commons.site.path>
<commons.scmPubUrl>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/src/changes/changes.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/src/changes/changes.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/src/changes/changes.xml Sun Feb 5 11:19:13 2017
@@ -20,6 +20,17 @@
</properties>
<body>
<release version="2.1" date="unreleased">
+ <action dev="tv" type="fix">
+ SoftReference cache did not work because of strong references being
+ stored in payload of DoubleLinkedListNode
+ </action>
+ <action issue="JCS-172" dev="tv" type="fix" due-to="Tom Schroeder">
+ ElementAttributes.clone() not updating createTime causes cache elements
+ to expire immediately
+ </action>
+ <action issue="JCS-171" dev="tv" type="fix" due-to="Wiktor Niesiobedzki">
+ Multiple CacheEventQueue.QProcessor spawned for the same cache region
+ </action>
</release>
<release version="2.0" date="2016-12-25" description="JDK 1.6 based major release">
<action issue="JCS-119" dev="tv" type="update">
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/IndexedDiskAuxCache.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/IndexedDiskAuxCache.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/IndexedDiskAuxCache.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/IndexedDiskAuxCache.xml Sun Feb 5 11:19:13 2017
@@ -120,16 +120,14 @@
less than 0, no limit will be placed on the number
of keys. By default, the max key size is 5000.
</p>
- <source>
- <![CDATA[
+ <source><![CDATA[
jcs.auxiliary.DC=
org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.DC.attributes=
org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
jcs.auxiliary.DC.attributes.DiskPath=g:\dev\jakarta-turbine-stratum\raf
jcs.auxiliary.DC.attributes.MaxKeySize=100000
- ]]>
- </source>
+]]></source>
</subsection>
<subsection name="Additional Configuration Options">
@@ -149,11 +147,9 @@ jcs.auxiliary.DC.attributes.MaxKeySize=1
performs better when the key and purgatory sizes are
limited.
</p>
- <source>
- <![CDATA[
+ <source><![CDATA[
jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000
- ]]>
- </source>
+]]></source>
<p>
Slots in the data file become empty when items are
removed from the disk cache. The indexed disk cache
@@ -187,11 +183,9 @@ jcs.auxiliary.DC.attributes.MaxPurgatory
was significantly improved. It now occurs in place,
without the aid of a temporary file.
</p>
- <source>
- <![CDATA[
+ <source><![CDATA[
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=30000
- ]]>
- </source>
+]]></source>
</subsection>
<subsection name="A Complete Configuration Example">
@@ -203,8 +197,7 @@ jcs.auxiliary.DC.attributes.OptimizeAtRe
all of the Indexed Disk Cache configuration
parameters.
</p>
- <source>
- <![CDATA[
+ <source><![CDATA[
##############################################################
##### Default Region Configuration
jcs.default=DC
@@ -230,8 +223,7 @@ jcs.auxiliary.DC.attributes.MaxKeySize=1
jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000
jcs.auxiliary.DC.attributes.OptimizeOnShutdown=true
jcs.auxiliary.DC.attributes.DiskLimitType=COUNT
- ]]>
- </source>
+]]></source>
</subsection>
<subsection name="Using Thread Pools to Reduce Threads">
@@ -252,8 +244,7 @@ jcs.auxiliary.DC.attributes.DiskLimitTyp
disk_cache_event_queue is defined in the bottom of
the file.
</p>
- <source>
- <![CDATA[
+ <source><![CDATA[
##############################################################
################## DEFAULT CACHE REGION #####################
# sets the default aux value for any non configured caches
@@ -281,14 +272,14 @@ jcs.default.elementattributes.IsLateral=
# adding more threads than regions does not help performance.
# If you want to use a separate pool for each disk cache, either use
# the single model or define a different auxiliary for each region and use the Pooled type.
-# SINGLE is generally best unless you ahve a huge # of regions.
+# SINGLE is generally best unless you have a huge # of regions.
jcs.auxiliary.DC2=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory
jcs.auxiliary.DC2.attributes=org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes
jcs.auxiliary.DC2.attributes.DiskPath=target/test-sandbox/raf
jcs.auxiliary.DC2.attributes.MaxPurgatorySize=10000
jcs.auxiliary.DC2.attributes.MaxKeySize=10000
jcs.auxiliary.DC2.attributes.OptimizeAtRemoveCount=300000
-jcs.auxiliary.DC.attributes.OptimizeOnShutdown=true
+jcs.auxiliary.DC2.attributes.OptimizeOnShutdown=true
jcs.auxiliary.DC2.attributes.EventQueueType=POOLED
jcs.auxiliary.DC2.attributes.EventQueuePoolName=disk_cache_event_queue
@@ -297,12 +288,11 @@ jcs.auxiliary.DC2.attributes.EventQueueP
# Disk Cache Event Queue Pool
thread_pool.disk_cache_event_queue.useBoundary=false
-thread_pool.remote_cache_client.maximumPoolSize=15
+thread_pool.disk_cache_event_queue.maximumPoolSize=15
thread_pool.disk_cache_event_queue.minimumPoolSize=1
thread_pool.disk_cache_event_queue.keepAliveTime=3500
thread_pool.disk_cache_event_queue.startUpSize=1
- ]]>
- </source>
+]]></source>
</subsection>
</section>
</body>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/UpgradingFrom13.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/UpgradingFrom13.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/UpgradingFrom13.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/UpgradingFrom13.xml Sun Feb 5 11:19:13 2017
@@ -98,6 +98,10 @@ jcs.default.elementattributes.MaxLifeSec
jcs.default.elementattributes.MaxLife=7
]]></source>
</p>
+ <p>
+ The <code>IndexedDiskCache</code> recycle bin is no longer limited in size.
+ So remove all references to <code>MaxRecycleBinSize</code> from the configuration files.
+ </p>
</subsection>
</section>
</body>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/download_jcs.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/download_jcs.xml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/download_jcs.xml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/download_jcs.xml Sun Feb 5 11:19:13 2017
@@ -111,32 +111,32 @@ limitations under the License.
</p>
</subsection>
</section>
- <section name="Apache Commons JCS 2.0-beta-2 (Java 6.0+)">
+ <section name="Apache Commons JCS 2.0 (Java 6.0+)">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/jcs/binaries/commons-jcs-2.0-beta-2-bin.tar.gz">commons-jcs-2.0-beta-2-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-2.0-beta-2-bin.tar.gz.md5">md5</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-2.0-beta-2-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/jcs/binaries/commons-jcs-dist-2.0-bin.tar.gz">commons-jcs-dist-2.0-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.0-bin.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.0-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/jcs/binaries/commons-jcs-2.0-beta-2-bin.zip">commons-jcs-2.0-beta-2-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-2.0-beta-2-bin.zip.md5">md5</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-2.0-beta-2-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/jcs/binaries/commons-jcs-dist-2.0-bin.zip">commons-jcs-dist-2.0-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.0-bin.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/binaries/commons-jcs-dist-2.0-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/jcs/source/commons-jcs-2.0-beta-2-src.tar.gz">commons-jcs-2.0-beta-2-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-2.0-beta-2-src.tar.gz.md5">md5</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-2.0-beta-2-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/jcs/source/commons-jcs-dist-2.0-src.tar.gz">commons-jcs-dist-2.0-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-src.tar.gz.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/jcs/source/commons-jcs-2.0-beta-2-src.zip">commons-jcs-2.0-beta-2-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-2.0-beta-2-src.zip.md5">md5</a></td>
- <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-2.0-beta-2-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/jcs/source/commons-jcs-dist-2.0-src.zip">commons-jcs-dist-2.0-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-src.zip.md5">md5</a></td>
+ <td><a href="https://www.apache.org/dist/commons/jcs/source/commons-jcs-dist-2.0-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
Modified: commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/faq.fml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/faq.fml?rev=1781732&r1=1781731&r2=1781732&view=diff
==============================================================================
--- commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/faq.fml (original)
+++ commons/proper/jcs/branches/commons-jcs-2.1-RC/xdocs/faq.fml Sun Feb 5 11:19:13 2017
@@ -32,27 +32,6 @@
requires commons-logging.
</p>
<p>
- As of version 1.2.7.0, the core of JCS (the LRU
- memory cache, the indexed disk cache, the TCP
- lateral, and the RMI remote server) requires only
- two other jars.
- </p>
- <p>
- <a
- href="http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html">
- concurrent
- </a>
- </p>
- <p>commons-logging</p>
-
- <p>
- Versions 1.2.6.9 and below also require the
- following two additional jars:
- </p>
-
- <p>commons-collections</p>
- <p>commons-lang</p>
- <p>
All of the other dependencies listed on the project
info page are for optional plugins.
</p>
@@ -64,8 +43,7 @@
<answer>
<p>
By default JCS looks for a cache.ccf file in the
- classpath. You must have a configuration file on the
- classpath to use JCS. The documentation describes
+ classpath. The documentation describes
how to configure the cache.
</p>
</answer>
@@ -82,15 +60,12 @@
classpath; instead you can do the following:
</p>
<code>
- CompositeCacheManager ccm =
- CompositeCacheManager.getUnconfiguredInstance();
-
Properties props = new Properties();
props.load(/* load properties from some location
defined by your app */);
- ccm.configure(props);
+ JCS.setConfigProperties(props);
</code>
</answer>
</faq>
@@ -156,7 +131,7 @@
or get the source code from subversion with <code>svn co
http://svn.apache.org/repos/asf/commons/proper/jcs/trunk</code>.
The tagged releases are available with <code>svn co.</code> ex.
- http://svn.apache.org/repos/asf/commons/proper/jcs/tags/jcs_1_2_7_0
+ https://svn.apache.org/repos/asf/commons/proper/jcs/tags/commons-jcs-2.0
</p>
</answer>
</faq>