Author: rmannibucau
Date: Sun May 25 15:16:18 2014
New Revision: 1597436
URL: http://svn.apache.org/r1597436
Log:
updating configuration in xdocs + reflecting change in the configuration in
changes.xml
Modified:
commons/proper/jcs/trunk/src/changes/changes.xml
commons/proper/jcs/trunk/xdocs/BasicJCSConfiguration.xml
commons/proper/jcs/trunk/xdocs/ElementAttributes.xml
commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml
commons/proper/jcs/trunk/xdocs/JDBCDiskCache.xml
commons/proper/jcs/trunk/xdocs/JDBCDiskCacheProperties.xml
commons/proper/jcs/trunk/xdocs/RegionProperties.xml
commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml
commons/proper/jcs/trunk/xdocs/getting_started/intro.xml
Modified: commons/proper/jcs/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/changes/changes.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/changes/changes.xml (original)
+++ commons/proper/jcs/trunk/src/changes/changes.xml Sun May 25 15:16:18 2014
@@ -20,6 +20,11 @@
</properties>
<body>
<release version="2.0" date="unreleased" description="JDK 1.6
based major release">
+ <action dev="rmannibucau" type="update">
+ Allow configuration to set its TimeFactorForMilliseconds and
+ use second by default.
+ This has as impact to remove "Seconds" suffix from
corresponding configurations.
+ </action>
<action issue="JCS-115" dev="tv" type="fix" due-to="Sebastian
Bazley">
JDBCDiskCachePoolAccessManager is thread hostile
</action>
Modified: commons/proper/jcs/trunk/xdocs/BasicJCSConfiguration.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/BasicJCSConfiguration.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/BasicJCSConfiguration.xml (original)
+++ commons/proper/jcs/trunk/xdocs/BasicJCSConfiguration.xml Sun May 25
15:16:18 2014
@@ -57,8 +57,8 @@ jcs.default.cacheattributes.MemoryCacheN
</p>
<source><![CDATA[
jcs.default.cacheattributes.UseMemoryShrinker=true
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.cacheattributes.MaxMemoryIdleTime=3600
+jcs.default.cacheattributes.ShrinkerInterval=60
jcs.default.cacheattributes.MaxSpoolPerRun=500
jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.default.elementattributes.IsEternal=false
@@ -95,8 +95,8 @@ jcs.region.testCache1.cacheattributes.Ma
jcs.region.testCache1.cacheattributes.MemoryCacheName=
org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true
-jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.region.testCache1.cacheattributes.MaxMemoryIdleTime=3600
+jcs.region.testCache1.cacheattributes.ShrinkerInterval=60
jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=500
jcs.region.testCache1.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.region.testCache1.elementattributes.IsEternal=false
@@ -164,8 +164,8 @@ jcs.region.testCache1.cacheattributes.Ma
jcs.region.testCache1.cacheattributes.MemoryCacheName=
org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true
-jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.region.testCache1.cacheattributes.MaxMemoryIdleTime=3600
+jcs.region.testCache1.cacheattributes.ShrinkerInterval=60
jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=500
jcs.region.testCache1.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.region.testCache1.elementattributes.IsEternal=false
Modified: commons/proper/jcs/trunk/xdocs/ElementAttributes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/ElementAttributes.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/ElementAttributes.xml (original)
+++ commons/proper/jcs/trunk/xdocs/ElementAttributes.xml Sun May 25 15:16:18
2014
@@ -54,11 +54,11 @@ jcs.default.cacheattributes.MaxObjects=1
jcs.default.cacheattributes.MemoryCacheName=
org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.cacheattributes.UseMemoryShrinker=true
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.cacheattributes.MaxMemoryIdleTime=3600
+jcs.default.cacheattributes.ShrinkerInterval=60
jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=700
+jcs.default.elementattributes.MaxLife=700
jcs.default.elementattributes.IdleTime=1800
jcs.default.elementattributes.IsSpool=true
jcs.default.elementattributes.IsRemote=true
@@ -88,7 +88,7 @@ jcs.default.elementattributes.IsLateral=
<p>
You can define the maximum life of an
item by
setting the
- <code>MaxLifeSeconds</code>
+ <code>MaxLife</code>
parameter. If an item has been in the
cache for
longer than the set number of seconds
it will not be
retrieved on a get request. If you use
the memory
@@ -106,7 +106,7 @@ jcs.default.elementattributes.IsLateral=
without being accessed by setting the
<code>IdleTime</code>
parameter. This is different than the
- <code>MaxMemoryIdleTimeSeconds</code>
+ <code>MaxMemoryIdleTime</code>
parameter, which just specifies how
long an object
can be in memory before it is subjected
to removal
or being spooled to a disk cache if it
is available.
Modified: commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml (original)
+++ commons/proper/jcs/trunk/xdocs/IndexedDiskAuxCache.xml Sun May 25 15:16:18
2014
@@ -259,11 +259,11 @@ jcs.default.cacheattributes=org.apache.c
jcs.default.cacheattributes.MaxObjects=200001
jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.cacheattributes.UseMemoryShrinker=false
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.cacheattributes.MaxMemoryIdleTime=3600
+jcs.default.cacheattributes.ShrinkerInterval=60
jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=700
+jcs.default.elementattributes.MaxLife=700
jcs.default.elementattributes.IdleTime=1800
jcs.default.elementattributes.IsSpool=true
jcs.default.elementattributes.IsRemote=true
Modified: commons/proper/jcs/trunk/xdocs/JDBCDiskCache.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/JDBCDiskCache.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/JDBCDiskCache.xml (original)
+++ commons/proper/jcs/trunk/xdocs/JDBCDiskCache.xml Sun May 25 15:16:18 2014
@@ -42,11 +42,11 @@ jcs.default.cacheattributes=org.apache.c
jcs.default.cacheattributes.MaxObjects=5000
jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.cacheattributes.UseMemoryShrinker=true
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=7200
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.cacheattributes.MaxMemoryIdleTime=7200
+jcs.default.cacheattributes.ShrinkerInterval=60
jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=14400
+jcs.default.elementattributes.MaxLife=14400
jcs.default.elementattributes.IdleTime=14400
jcs.default.elementattributes.IsSpool=true
jcs.default.elementattributes.IsRemote=true
@@ -69,7 +69,7 @@ jcs.auxiliary.MYSQL.attributes.testBefor
jcs.auxiliary.MYSQL.attributes.maxActive=100
jcs.auxiliary.MYSQL.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.MYSQL.attributes.UseDiskShrinker=true
-jcs.auxiliary.MYSQL.attributes.ShrinkerIntervalSeconds=1800
+jcs.auxiliary.MYSQL.attributes.ShrinkerInterval=1800
jcs.auxiliary.MYSQL.attributes.allowRemoveAll=false
jcs.auxiliary.MYSQL.attributes.EventQueueType=POOLED
jcs.auxiliary.MYSQL.attributes.EventQueuePoolName=disk_cache_event_queue
@@ -99,11 +99,11 @@ jcs.default.cacheattributes=org.apache.c
jcs.default.cacheattributes.MaxObjects=100
jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.cacheattributes.UseMemoryShrinker=false
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.cacheattributes.MaxMemoryIdleTime=3600
+jcs.default.cacheattributes.ShrinkerInterval=60
jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=700
+jcs.default.elementattributes.MaxLife=700
jcs.default.elementattributes.IdleTime=1800
jcs.default.elementattributes.IsSpool=true
jcs.default.elementattributes.IsRemote=true
Modified: commons/proper/jcs/trunk/xdocs/JDBCDiskCacheProperties.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/JDBCDiskCacheProperties.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/JDBCDiskCacheProperties.xml (original)
+++ commons/proper/jcs/trunk/xdocs/JDBCDiskCacheProperties.xml Sun May 25
15:16:18 2014
@@ -130,7 +130,7 @@
</tr>
<tr>
- <td>ShrinkerIntervalSeconds</td>
+ <td>ShrinkerInterval</td>
<td>How often should the disk
shrinker run.</td>
<td>N</td>
<td>300</td>
@@ -158,7 +158,7 @@ jcs.auxiliary.JDBC.attributes.maxActive=
jcs.auxiliary.JDBC.attributes.allowRemoveAll=true
jcs.auxiliary.JDBC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.JDBC.attributes.UseDiskShrinker=true
-jcs.auxiliary.JDBC.attributes.ShrinkerIntervalSeconds=300
+jcs.auxiliary.JDBC.attributes.ShrinkerInterval=300
]]>
</source>
</subsection>
@@ -227,7 +227,7 @@ jcs.auxiliary.JDBC.attributes.maxActive=
jcs.auxiliary.JDBC.attributes.allowRemoveAll=true
jcs.auxiliary.JDBC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.JDBC.attributes.UseDiskShrinker=true
-jcs.auxiliary.JDBC.attributes.ShrinkerIntervalSeconds=300
+jcs.auxiliary.JDBC.attributes.ShrinkerInterval=300
jcs.auxiliary.JDBC.attributes.EventQueueType=POOLED
jcs.auxiliary.JDBC.attributes.EventQueuePoolName=disk_cache_event_queueue
Modified: commons/proper/jcs/trunk/xdocs/RegionProperties.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/RegionProperties.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/RegionProperties.xml (original)
+++ commons/proper/jcs/trunk/xdocs/RegionProperties.xml Sun May 25 15:16:18 2014
@@ -112,7 +112,7 @@
<td>false</td>
</tr>
<tr>
-
<td>MaxMemoryIdleTimeSeconds</td>
+ <td>MaxMemoryIdleTime</td>
<td>
This is only used if
you are using the
memory shrinker. If
this value is set above
@@ -125,7 +125,7 @@
<td>7200</td>
</tr>
<tr>
- <td>ShrinkerIntervalSeconds</td>
+ <td>ShrinkerInterval</td>
<td>
This specifies how
often the shrinker should
run, if it has been
activated. If you set
@@ -184,7 +184,7 @@
<td>true</td>
</tr>
<tr>
- <td>MaxLifeSeconds</td>
+ <td>MaxLife</td>
<td>
If you specify that
elements within a region
are not eternal, then
you can set the max
@@ -235,11 +235,11 @@ jcs.default.cacheattributes=org.apache.c
jcs.default.cacheattributes.MaxObjects=200001
jcs.default.cacheattributes.MemoryCacheName=org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.cacheattributes.UseMemoryShrinker=true
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.cacheattributes.MaxMemoryIdleTime=3600
+jcs.default.cacheattributes.ShrinkerInterval=60
jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=700
+jcs.default.elementattributes.MaxLife=700
jcs.default.elementattributes.IsSpool=true
jcs.default.elementattributes.IsRemote=true
jcs.default.elementattributes.IsLateral=true
@@ -250,12 +250,12 @@ jcs.region.testCache1.cacheattributes=or
jcs.region.testCache1.cacheattributes.MaxObjects=123456
jcs.region.testCache1.cacheattributes.MemoryCacheName=org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.region.testCache1.cacheattributes.UseMemoryShrinker=true
-jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=30
-jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=300
+jcs.region.testCache1.cacheattributes.ShrinkerInterval=30
+jcs.region.testCache1.cacheattributes.MaxMemoryIdleTime=300
jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=100
jcs.region.testCache1.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.region.testCache1.elementattributes.IsEternal=false
-jcs.region.testCache1.elementattributes.MaxLifeSeconds=60000
+jcs.region.testCache1.elementattributes.MaxLife=60000
jcs.region.testCache1.elementattributes.IsSpool=true
jcs.region.testCache1.elementattributes.IsLateral=true
jcs.region.testCache1.elementattributes.IsRemote=true
Modified: commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml (original)
+++ commons/proper/jcs/trunk/xdocs/UsingJCSBasicWeb.xml Sun May 25 15:16:18 2014
@@ -372,7 +372,7 @@ jcs.default.cacheattributes.MaxObjects=1
jcs.default.cacheattributes.MemoryCacheName=
org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=3600
+jcs.default.elementattributes.MaxLife=3600
jcs.default.elementattributes.IdleTime=1800
jcs.default.elementattributes.IsSpool=true
jcs.default.elementattributes.IsRemote=true
@@ -389,7 +389,7 @@ jcs.region.bookCache.cacheattributes.Max
jcs.region.bookCache.cacheattributes.MemoryCacheName=
org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.region.bookCache.elementattributes.IsEternal=false
-jcs.region.bookCache.elementattributes.MaxLifeSeconds=7200
+jcs.region.bookCache.elementattributes.MaxLife=7200
jcs.region.bookCache.elementattributes.IdleTime=1800
jcs.region.bookCache.elementattributes.IsSpool=true
jcs.region.bookCache.elementattributes.IsRemote=true
Modified: commons/proper/jcs/trunk/xdocs/getting_started/intro.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/xdocs/getting_started/intro.xml?rev=1597436&r1=1597435&r2=1597436&view=diff
==============================================================================
--- commons/proper/jcs/trunk/xdocs/getting_started/intro.xml (original)
+++ commons/proper/jcs/trunk/xdocs/getting_started/intro.xml Sun May 25
15:16:18 2014
@@ -157,11 +157,11 @@ jcs.default.cacheattributes.MaxObjects=1
jcs.default.cacheattributes.MemoryCacheName=
org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.default.cacheattributes.UseMemoryShrinker=false
-jcs.default.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.default.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.default.cacheattributes.MaxMemoryIdleTime=3600
+jcs.default.cacheattributes.ShrinkerInterval=60
jcs.default.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.default.elementattributes.IsEternal=false
-jcs.default.elementattributes.MaxLifeSeconds=21600
+jcs.default.elementattributes.MaxLife=21600
jcs.default.elementattributes.IdleTime=1800
jcs.default.elementattributes.IsSpool=true
jcs.default.elementattributes.IsRemote=true
@@ -175,8 +175,8 @@ jcs.region.testCache1.cacheattributes.Ma
jcs.region.testCache1.cacheattributes.MemoryCacheName=
org.apache.commons.jcs.engine.memory.lru.LRUMemoryCache
jcs.region.testCache1.cacheattributes.UseMemoryShrinker=false
-jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=3600
-jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=60
+jcs.region.testCache1.cacheattributes.MaxMemoryIdleTime=3600
+jcs.region.testCache1.cacheattributes.ShrinkerInterval=60
jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=500
jcs.region.testCache1.elementattributes=org.apache.commons.jcs.engine.ElementAttributes
jcs.region.testCache1.elementattributes.IsEternal=false
