This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit 046254190dbce0d7ffec3ac32c616b417dd58986 Author: Thomas Vandahl <[email protected]> AuthorDate: Tue Feb 17 18:56:03 2026 +0100 Update site, move documentation to Maven standard location. --- {xdocs => src/site/fml}/faq.fml | 0 src/site/site.xml | 11 +++++------ {xdocs => src/site/xdoc}/BasicJCSConfiguration.xml | 13 ------------- {xdocs => src/site/xdoc}/BlockDiskCache.xml | 1 - {xdocs => src/site/xdoc}/CacheEventLogging.xml | 1 - {xdocs => src/site/xdoc}/ElementAttributes.xml | 0 {xdocs => src/site/xdoc}/ElementEventHandling.xml | 0 {xdocs => src/site/xdoc}/ElementSerializers.xml | 3 --- {xdocs => src/site/xdoc}/IndexedDiskAuxCache.xml | 4 ---- .../site/xdoc}/IndexedDiskCacheProperties.xml | 2 -- {xdocs => src/site/xdoc}/JCSPlugins.xml | 21 ++++++--------------- {xdocs => src/site/xdoc}/JCSShortDescription.xml | 0 {xdocs => src/site/xdoc}/JCSandJCACHE.xml | 0 {xdocs => src/site/xdoc}/JCSvsEHCache.xml | 0 {xdocs => src/site/xdoc}/JDBCDiskCache.xml | 5 ----- .../site/xdoc}/JDBCDiskCacheProperties.xml | 2 -- {xdocs => src/site/xdoc}/LateralTCPAuxCache.xml | 2 -- {xdocs => src/site/xdoc}/LateralTCPProperties.xml | 1 - {xdocs => src/site/xdoc}/LateralUDPDiscovery.xml | 2 -- {xdocs => src/site/xdoc}/LocalCacheConfig.xml | 10 +--------- .../site/xdoc}/MySQLDiskCacheProperties.xml | 2 -- {xdocs => src/site/xdoc}/ProjectHistory.xml | 0 {xdocs => src/site/xdoc}/RegionProperties.xml | 0 {xdocs => src/site/xdoc}/RemoteAuxCache.xml | 12 ------------ {xdocs => src/site/xdoc}/RemoteCacheProperties.xml | 1 - .../site/xdoc}/RemoteHttpCacheProperties.xml | 1 - {xdocs => src/site/xdoc}/UpgradingFrom13.xml | 0 {xdocs => src/site/xdoc}/UpgradingFrom2x.xml | 0 {xdocs => src/site/xdoc}/UpgradingFrom3x.xml | 4 ++-- {xdocs => src/site/xdoc}/UsingJCSBasicWeb.xml | 12 ------------ {xdocs => src/site/xdoc}/download_jcs.xml | 0 {xdocs => src/site/xdoc}/getting_started/intro.xml | 1 - {xdocs => src/site/xdoc}/index.xml | 0 {xdocs => src/site/xdoc}/issue-tracking.xml | 0 {xdocs => src/site/xdoc}/mail-lists.xml | 0 35 files changed, 14 insertions(+), 97 deletions(-) diff --git a/xdocs/faq.fml b/src/site/fml/faq.fml similarity index 100% rename from xdocs/faq.fml rename to src/site/fml/faq.fml diff --git a/src/site/site.xml b/src/site/site.xml index ada2fa3c..9a3df6ea 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -15,11 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project name="JCS"> - <bannerRight> - <name>Commons JCS™</name> - <href>/index.html</href> - </bannerRight> +<site xmlns="http://maven.apache.org/SITE/2.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"; + name="JCS"> + <bannerRight name="Commons JCS™" href="/index.html" /> <body> <menu name="JCS"> @@ -78,4 +77,4 @@ </body> -</project> +</site> diff --git a/xdocs/BasicJCSConfiguration.xml b/src/site/xdoc/BasicJCSConfiguration.xml similarity index 90% rename from xdocs/BasicJCSConfiguration.xml rename to src/site/xdoc/BasicJCSConfiguration.xml index 9357f193..6dfe109a 100644 --- a/xdocs/BasicJCSConfiguration.xml +++ b/src/site/xdoc/BasicJCSConfiguration.xml @@ -46,8 +46,6 @@ jcs.default= jcs.default.cacheattributes.MaxObjects=1000 -jcs.default.cacheattributes.MemoryCacheName= - org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache ]]></source> <p> If you want to add memory shrinking then you can add these @@ -70,8 +68,6 @@ jcs.default.elementattributes.IsEternal=false <source><![CDATA[ jcs.auxiliary.DC= org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes= - org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheAttributes jcs.auxiliary.DC.attributes.DiskPath=g:/dev/jcs/raf ]]></source> <p> @@ -92,7 +88,6 @@ jcs.region.testCache1.cacheattributes.MaxMemoryIdleTimeSeconds=3600 jcs.region.testCache1.cacheattributes.ShrinkerIntervalSeconds=60 jcs.region.testCache1.cacheattributes.MaxSpoolPerRun=500 jcs.region.testCache1.elementattributes.IsEternal=false - ]]></source> <p> If you want to add a lateral cache for distribution (the <a @@ -103,9 +98,6 @@ jcs.region.testCache1.elementattributes.IsEternal=false <source><![CDATA[ jcs.auxiliary.LTCP= org.apache.commons.jcs4.auxiliary.lateral.LateralCacheFactory -jcs.auxiliary.LTCP.attributes= - org.apache.commons.jcs4.auxiliary.lateral.LateralCacheAttributes -jcs.auxiliary.LTCP.attributes.TransmissionTypeName=TCP jcs.auxiliary.LTCP.attributes.TcpServers=localhost:1111 jcs.auxiliary.LTCP.attributes.TcpListenerPort=1110 jcs.auxiliary.LTCP.attributes.PutOnlyMode=false @@ -157,16 +149,11 @@ jcs.region.testCache1.elementattributes.IsEternal=false # AVAILABLE AUXILIARY CACHES jcs.auxiliary.DC= org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes= - org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheAttributes jcs.auxiliary.DC.attributes.DiskPath=g:/dev/jcs/raf jcs.auxiliary.DC.attributes.maxKeySize=100000 jcs.auxiliary.LTCP= org.apache.commons.jcs4.auxiliary.lateral.LateralCacheFactory -jcs.auxiliary.LTCP.attributes= - org.apache.commons.jcs4.auxiliary.lateral.LateralCacheAttributes -jcs.auxiliary.LTCP.attributes.TransmissionTypeName=TCP jcs.auxiliary.LTCP.attributes.TcpServers=localhost:1111 jcs.auxiliary.LTCP.attributes.TcpListenerPort=1110 jcs.auxiliary.LTCP.attributes.PutOnlyMode=false diff --git a/xdocs/BlockDiskCache.xml b/src/site/xdoc/BlockDiskCache.xml similarity index 97% rename from xdocs/BlockDiskCache.xml rename to src/site/xdoc/BlockDiskCache.xml index 0d0eaaf1..05951233 100644 --- a/xdocs/BlockDiskCache.xml +++ b/src/site/xdoc/BlockDiskCache.xml @@ -71,7 +71,6 @@ jcs.default.cacheattributes.MaxObjects=0 # Block Disk Cache jcs.auxiliary.blockDiskCache=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheFactory -jcs.auxiliary.blockDiskCache.attributes=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheAttributes jcs.auxiliary.blockDiskCache.attributes.DiskPath=target/test-sandbox/block-disk-cache-huge jcs.auxiliary.blockDiskCache.attributes.MaxPurgatorySize=300000 jcs.auxiliary.blockDiskCache.attributes.MaxKeySize=1000000 diff --git a/xdocs/CacheEventLogging.xml b/src/site/xdoc/CacheEventLogging.xml similarity index 96% rename from xdocs/CacheEventLogging.xml rename to src/site/xdoc/CacheEventLogging.xml index bc1af6d0..f0f55cea 100644 --- a/xdocs/CacheEventLogging.xml +++ b/src/site/xdoc/CacheEventLogging.xml @@ -39,7 +39,6 @@ <source><![CDATA[ . . . jcs.auxiliary.RC=org.apache.commons.jcs4.auxiliary.remote.RemoteCacheFactory -jcs.auxiliary.RC.attributes=org.apache.commons.jcs4.auxiliary.remote.RemoteCacheAttributes jcs.auxiliary.RC.attributes.FailoverServers=localhost:1101,localhost:1102 jcs.auxiliary.RC.attributes.LocalPort=1201 jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false diff --git a/xdocs/ElementAttributes.xml b/src/site/xdoc/ElementAttributes.xml similarity index 100% rename from xdocs/ElementAttributes.xml rename to src/site/xdoc/ElementAttributes.xml diff --git a/xdocs/ElementEventHandling.xml b/src/site/xdoc/ElementEventHandling.xml similarity index 100% rename from xdocs/ElementEventHandling.xml rename to src/site/xdoc/ElementEventHandling.xml diff --git a/xdocs/ElementSerializers.xml b/src/site/xdoc/ElementSerializers.xml similarity index 95% rename from xdocs/ElementSerializers.xml rename to src/site/xdoc/ElementSerializers.xml index f3a19770..fb5b7fee 100644 --- a/xdocs/ElementSerializers.xml +++ b/src/site/xdoc/ElementSerializers.xml @@ -61,7 +61,6 @@ <![CDATA[ # Block Disk Cache jcs.auxiliary.blockDiskCache=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheFactory -jcs.auxiliary.blockDiskCache.attributes=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheAttributes jcs.auxiliary.blockDiskCache.attributes.DiskPath=target/test-sandbox/block-disk-cache jcs.auxiliary.blockDiskCache.serializer=org.apache.commons.jcs4.utils.serialization.CompressingSerializer ]]> @@ -84,7 +83,6 @@ jcs.auxiliary.blockDiskCache.serializer=org.apache.commons.jcs4.utils.serializat <![CDATA[ # Block Disk Cache jcs.auxiliary.blockDiskCache2=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheFactory -jcs.auxiliary.blockDiskCache2.attributes=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheAttributes jcs.auxiliary.blockDiskCache2.attributes.DiskPath=target/test-sandbox/block-disk-cache2 jcs.auxiliary.blockDiskCache2.serializer=org.apache.commons.jcs4.utils.serialization.EncryptingSerializer jcs.auxiliary.blockDiskCache2.serializer.attributes.preSharedKey=my_secret @@ -128,7 +126,6 @@ opens your.package to com.fasterxml.jackson.databind; <![CDATA[ # Block Disk Cache jcs.auxiliary.blockDiskCache3=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheFactory -jcs.auxiliary.blockDiskCache3.attributes=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheAttributes jcs.auxiliary.blockDiskCache3.attributes.DiskPath=target/test-sandbox/block-disk-cache3 jcs.auxiliary.blockDiskCache3.serializer=org.apache.commons.jcs4.utils.serialization.JSONSerializer ]]> diff --git a/xdocs/IndexedDiskAuxCache.xml b/src/site/xdoc/IndexedDiskAuxCache.xml similarity index 97% rename from xdocs/IndexedDiskAuxCache.xml rename to src/site/xdoc/IndexedDiskAuxCache.xml index 7eaeb897..a30f66de 100644 --- a/xdocs/IndexedDiskAuxCache.xml +++ b/src/site/xdoc/IndexedDiskAuxCache.xml @@ -123,8 +123,6 @@ <source><![CDATA[ jcs.auxiliary.DC= org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes= - org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheAttributes jcs.auxiliary.DC.attributes.DiskPath=g:\dev\jakarta-turbine-stratum\raf jcs.auxiliary.DC.attributes.MaxKeySize=100000 ]]></source> @@ -211,7 +209,6 @@ jcs.region.myRegion1.cacheattributes.MaxObjects=1000 ##### AUXILIARY CACHES # Indexed Disk Cache jcs.auxiliary.DC=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheAttributes jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/indexed-disk-cache jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000 jcs.auxiliary.DC.attributes.MaxKeySize=10000 @@ -263,7 +260,6 @@ jcs.default.elementattributes.MaxIdleTime=1800 # the single model or define a different auxiliary for each region and use the Pooled type. # SINGLE is generally best unless you have a huge # of regions. jcs.auxiliary.DC2=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC2.attributes=org.apache.commons.jcs4.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 diff --git a/xdocs/IndexedDiskCacheProperties.xml b/src/site/xdoc/IndexedDiskCacheProperties.xml similarity index 96% rename from xdocs/IndexedDiskCacheProperties.xml rename to src/site/xdoc/IndexedDiskCacheProperties.xml index 5d9dab9a..e1fbb067 100644 --- a/xdocs/IndexedDiskCacheProperties.xml +++ b/src/site/xdoc/IndexedDiskCacheProperties.xml @@ -85,7 +85,6 @@ <source> <![CDATA[ jcs.auxiliary.DC=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheAttributes jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/indexed-disk-cache jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000 jcs.auxiliary.DC.attributes.MaxKeySize=10000 @@ -131,7 +130,6 @@ jcs.auxiliary.DC.attributes.ClearDiskOnStartup=false <source> <![CDATA[ jcs.auxiliary.DC=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheAttributes jcs.auxiliary.DC.attributes.DiskPath=target/test-sandbox/indexed-disk-cache jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000 jcs.auxiliary.DC.attributes.MaxKeySize=10000 diff --git a/xdocs/JCSPlugins.xml b/src/site/xdoc/JCSPlugins.xml similarity index 77% rename from xdocs/JCSPlugins.xml rename to src/site/xdoc/JCSPlugins.xml index 4fa0c13c..6c398299 100644 --- a/xdocs/JCSPlugins.xml +++ b/src/site/xdoc/JCSPlugins.xml @@ -34,8 +34,8 @@ </section> <section name="Memory Plugins"> <p> Currently, JCS provides five memory management options: (1) - LRUMemoryCache, (2) LHMLRUMemoryCache, (3) MRUMemoryCache, (5) - FIFOMemoryCache, and (5) ARCMemoryCache. All memory caches restrict + LRUMemoryCache, (2) LHMLRUMemoryCache, (3) MRUMemoryCache, (4) + FIFOMemoryCache, and (5) SoftReferenceMemoryCache. All memory caches restrict the number of items that can be stored in memory per region. If a disk cache is configured for the region, the items will be spooled to disk when the memory capacity is reached. JCS enforces @@ -46,28 +46,19 @@ <p> The LRUMemoryCache is the currently recommended plugin. Upon misconfiguration it is used as the default. The LRUMemoryCache removes the least recently used items when the cache is full.</p> - <p> The ARCMemoryCache is currently experimental. It implements an - adaptive replacement caching algorithm that combines an LRU and an - LFU that adapt to usage patterns.</p> </section> <section name="Disk Plugins"> - <p> JCS provides several disk swap options: indexed disk, HSQL, JISP, - and Berkeley DB JE. The IndexedDiskCache is the recommended disk + <p> JCS provides several disk swap options: Indexed Disk, Block Disk, + HSQL, and MySQL. The IndexedDiskCache is the recommended disk cache. It maintains the cached data on disk and the keys in memory for the fastest possible lookup times. Writing to disk is done asynchronously. Items are typically put in purgatory and queued for background disk writing. While in purgatory, the items remain available.</p> - <p> In addition, JCS provides a disk auxiliary that uses the Berkeley - DB Java Edition for disk storage. JCS can effectively function as an - expiration manager and distribution mechanism on top of a Berkeley - DB JE.</p> </section> <section name="Lateral Plugins"> - <p> JCS provides two recommended lateral distribution options: TCP - socket server distribution and JGroups (or JavaGroups). There are - also several other experimental lateral distribution auxiliaries - using servlets, UDP, and xmlrpc.</p> + <p> JCS provides a TCP socket server distribution as the recommended lateral + distribution options.</p> </section> <section name="Remote Plugins"> <p> JCS provides both an RMI and HTTP remote servers to manage diff --git a/xdocs/JCSShortDescription.xml b/src/site/xdoc/JCSShortDescription.xml similarity index 100% rename from xdocs/JCSShortDescription.xml rename to src/site/xdoc/JCSShortDescription.xml diff --git a/xdocs/JCSandJCACHE.xml b/src/site/xdoc/JCSandJCACHE.xml similarity index 100% rename from xdocs/JCSandJCACHE.xml rename to src/site/xdoc/JCSandJCACHE.xml diff --git a/xdocs/JCSvsEHCache.xml b/src/site/xdoc/JCSvsEHCache.xml similarity index 100% rename from xdocs/JCSvsEHCache.xml rename to src/site/xdoc/JCSvsEHCache.xml diff --git a/xdocs/JDBCDiskCache.xml b/src/site/xdoc/JDBCDiskCache.xml similarity index 95% rename from xdocs/JDBCDiskCache.xml rename to src/site/xdoc/JDBCDiskCache.xml index 5f24e50f..eb073da1 100644 --- a/xdocs/JDBCDiskCache.xml +++ b/src/site/xdoc/JDBCDiskCache.xml @@ -53,7 +53,6 @@ jcs.default.elementattributes.MaxIdleTime=14400 ################## AUXILIARY CACHES AVAILABLE ################ # MYSQL disk cache used for flight options jcs.auxiliary.MYSQL=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheFactory -jcs.auxiliary.MYSQL.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheAttributes jcs.auxiliary.MYSQL.attributes.userName=myUsername jcs.auxiliary.MYSQL.attributes.password=myPassword jcs.auxiliary.MYSQL.attributes.url=jdbc:mysql://localhost:3306/YOURDBNAME?autoReconnect=true @@ -106,7 +105,6 @@ jcs.region.testCache1.cacheattributes.MaxObjects=10000 # ################# AUXILIARY CACHES AVAILABLE ################ # JDBC disk cache jcs.auxiliary.JDBC_0=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheFactory -jcs.auxiliary.JDBC_0.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheAttributes jcs.auxiliary.JDBC_0.attributes.tableName=JCS_STORE_0 jcs.auxiliary.JDBC_0.attributes.testBeforeInsert=false jcs.auxiliary.JDBC_0.attributes.allowRemoveAll=true @@ -116,7 +114,6 @@ jcs.auxiliary.JDBC_0.attributes.EventQueueType=POOLED jcs.auxiliary.JDBC_0.attributes.EventQueuePoolName=disk_cache_event_queue jcs.auxiliary.JDBC_1=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheFactory -jcs.auxiliary.JDBC_1.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheAttributes jcs.auxiliary.JDBC_1.attributes.tableName=JCS_STORE_1 jcs.auxiliary.JDBC_1.attributes.testBeforeInsert=false jcs.auxiliary.JDBC_1.attributes.allowRemoveAll=true @@ -173,7 +170,6 @@ jcs.region.testCache1.cacheattributes.MaxObjects=10000 # ################# AUXILIARY CACHES AVAILABLE ################ # JDBC disk cache jcs.auxiliary.JDBC_0=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheFactory -jcs.auxiliary.JDBC_0.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheAttributes jcs.auxiliary.JDBC_0.attributes.tableName=JCS_STORE_0 jcs.auxiliary.JDBC_0.attributes.testBeforeInsert=false jcs.auxiliary.JDBC_0.attributes.allowRemoveAll=true @@ -183,7 +179,6 @@ jcs.auxiliary.JDBC_0.attributes.EventQueueType=POOLED jcs.auxiliary.JDBC_0.attributes.EventQueuePoolName=disk_cache_event_queue jcs.auxiliary.JDBC_1=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheFactory -jcs.auxiliary.JDBC_1.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheAttributes jcs.auxiliary.JDBC_1.attributes.tableName=JCS_STORE_1 jcs.auxiliary.JDBC_1.attributes.testBeforeInsert=false jcs.auxiliary.JDBC_1.attributes.allowRemoveAll=true diff --git a/xdocs/JDBCDiskCacheProperties.xml b/src/site/xdoc/JDBCDiskCacheProperties.xml similarity index 97% rename from xdocs/JDBCDiskCacheProperties.xml rename to src/site/xdoc/JDBCDiskCacheProperties.xml index 591f6ea2..5f9396dd 100644 --- a/xdocs/JDBCDiskCacheProperties.xml +++ b/src/site/xdoc/JDBCDiskCacheProperties.xml @@ -171,7 +171,6 @@ ################## AUXILIARY CACHES AVAILABLE ################ # JDBC disk cache jcs.auxiliary.JDBC=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheFactory -jcs.auxiliary.JDBC.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheAttributes jcs.auxiliary.JDBC.attributes.userName=sa jcs.auxiliary.JDBC.attributes.password= jcs.auxiliary.JDBC.attributes.url=jdbc:hsqldb: @@ -239,7 +238,6 @@ jcs.auxiliary.JDBC.attributes.ShrinkerInterval=300 ################## AUXILIARY CACHES AVAILABLE ################ # JDBC disk cache jcs.auxiliary.JDBC=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheFactory -jcs.auxiliary.JDBC.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.JDBCDiskCacheAttributes jcs.auxiliary.JDBC.attributes.userName=sa jcs.auxiliary.JDBC.attributes.password= jcs.auxiliary.JDBC.attributes.url=jdbc:hsqldb: diff --git a/xdocs/LateralTCPAuxCache.xml b/src/site/xdoc/LateralTCPAuxCache.xml similarity index 97% rename from xdocs/LateralTCPAuxCache.xml rename to src/site/xdoc/LateralTCPAuxCache.xml index feab5d66..6236c89d 100644 --- a/xdocs/LateralTCPAuxCache.xml +++ b/src/site/xdoc/LateralTCPAuxCache.xml @@ -69,7 +69,6 @@ </p> <source><![CDATA[ jcs.auxiliary.LTCP=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.LateralTCPCacheFactory -jcs.auxiliary.LTCP.attributes=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes jcs.auxiliary.LTCP.attributes.TcpServers=localhost:1111,localhost:1112 jcs.auxiliary.LTCP.attributes.TcpListenerPort=1110 jcs.auxiliary.LTCP.attributes.AllowGet=true @@ -102,7 +101,6 @@ jcs.auxiliary.LTCP.attributes.AllowGet=true </p> <source><![CDATA[ jcs.auxiliary.LTCP=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.LateralTCPCacheFactory -jcs.auxiliary.LTCP.attributes=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes #jcs.auxiliary.LTCP.attributes.TcpServers= jcs.auxiliary.LTCP.attributes.TcpListenerPort=1118 jcs.auxiliary.LTCP.attributes.UdpDiscoveryAddr=228.5.6.8 diff --git a/xdocs/LateralTCPProperties.xml b/src/site/xdoc/LateralTCPProperties.xml similarity index 98% rename from xdocs/LateralTCPProperties.xml rename to src/site/xdoc/LateralTCPProperties.xml index 3571b1de..04ffd8c3 100644 --- a/xdocs/LateralTCPProperties.xml +++ b/src/site/xdoc/LateralTCPProperties.xml @@ -148,7 +148,6 @@ <subsection name="Example Configuration"> <source><![CDATA[ jcs.auxiliary.LTCP=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.LateralTCPCacheFactory -jcs.auxiliary.LTCP.attributes=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes #jcs.auxiliary.LTCP.attributes.TcpServers= jcs.auxiliary.LTCP.attributes.TcpListenerPort=1118 jcs.auxiliary.LTCP.attributes.UdpDiscoveryAddr=228.5.6.8 diff --git a/xdocs/LateralUDPDiscovery.xml b/src/site/xdoc/LateralUDPDiscovery.xml similarity index 95% rename from xdocs/LateralUDPDiscovery.xml rename to src/site/xdoc/LateralUDPDiscovery.xml index 63ae06d8..46788409 100644 --- a/xdocs/LateralUDPDiscovery.xml +++ b/src/site/xdoc/LateralUDPDiscovery.xml @@ -70,7 +70,6 @@ </p> <source><![CDATA[ jcs.auxiliary.LTCP=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.LateralTCPCacheFactory -jcs.auxiliary.LTCP.attributes=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes jcs.auxiliary.LTCP.attributes.TcpListenerPort=1110 jcs.auxiliary.LTCP.attributes.PutOnlyMode=true jcs.auxiliary.LTCP.attributes.UdpDiscoveryAddr=228.5.6.8 @@ -93,7 +92,6 @@ jcs.auxiliary.LTCP.attributes.UdpTTL=4 </p> <source><![CDATA[ jcs.auxiliary.LTCP=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.LateralTCPCacheFactory -jcs.auxiliary.LTCP.attributes=org.apache.commons.jcs4.auxiliary.lateral.socket.tcp.TCPLateralCacheAttributes jcs.auxiliary.LTCP.attributes.TcpListenerPort=1110 jcs.auxiliary.LTCP.attributes.PutOnlyMode=true jcs.auxiliary.LTCP.attributes.UdpDiscoveryInterface=en0 diff --git a/xdocs/LocalCacheConfig.xml b/src/site/xdoc/LocalCacheConfig.xml similarity index 93% rename from xdocs/LocalCacheConfig.xml rename to src/site/xdoc/LocalCacheConfig.xml index 01fdaf5f..969deec2 100644 --- a/xdocs/LocalCacheConfig.xml +++ b/src/site/xdoc/LocalCacheConfig.xml @@ -75,8 +75,6 @@ # sets the default aux value for any non configured caches jcs.default=DC,RFailover -jcs.default.cacheattributes= - org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=1000 ]]></source> <p> @@ -99,8 +97,6 @@ jcs.default.cacheattributes.MaxObjects=1000 </p> <source><![CDATA[ jcs.region.testCache=DC,RFailover -jcs.region.testCache.cacheattributes= - org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.testCache.cacheattributes.MaxObjects=1000 ]]></source> <p> @@ -135,9 +131,7 @@ jcs.region.testCache.cacheattributes.MaxObjects=1000 </p> <source><![CDATA[ jcs.auxiliary.DC= - org.apache.commons.jcs4.auxiliary.disk.DiskCacheFactory -jcs.auxiliary.DC.attributes= - org.apache.commons.jcs4.auxiliary.disk.DiskCacheAttributes + org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory jcs.auxiliary.DC.attributes.DiskPath=c:/dev/cache/raf ]]></source> <p> @@ -153,8 +147,6 @@ jcs.auxiliary.DC.attributes.DiskPath=c:/dev/cache/raf <source><![CDATA[ jcs.auxiliary.RFailover= org.apache.commons.jcs4.auxiliary.remote.RemoteCacheFactory -jcs.auxiliary.RFailover.attributes= - org.apache.commons.jcs4.auxiliary.remote.RemoteCacheAttributes jcs.auxiliary.RFailover.attributes.RemoteTypeName=LOCAL jcs.auxiliary.RFailover.attributes.FailoverServers= localhost:1102,localhost:1101 diff --git a/xdocs/MySQLDiskCacheProperties.xml b/src/site/xdoc/MySQLDiskCacheProperties.xml similarity index 96% rename from xdocs/MySQLDiskCacheProperties.xml rename to src/site/xdoc/MySQLDiskCacheProperties.xml index 5926cc21..37f12406 100644 --- a/xdocs/MySQLDiskCacheProperties.xml +++ b/src/site/xdoc/MySQLDiskCacheProperties.xml @@ -93,7 +93,6 @@ ################## AUXILIARY CACHES AVAILABLE ################ # MYSQL disk cache jcs.auxiliary.MYSQL=org.apache.commons.jcs4.auxiliary.disk.jdbc.mysql.MySQLDiskCacheFactory -jcs.auxiliary.MYSQL.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.mysql.MySQLDiskCacheAttributes jcs.auxiliary.MYSQL.attributes.userName=sa jcs.auxiliary.MYSQL.attributes.password= jcs.auxiliary.MYSQL.attributes.url=jdbc:hsqldb:target/cache_hsql_db @@ -161,7 +160,6 @@ jcs.auxiliary.MYSQL.attributes.balkDuringOptimization=true ################## AUXILIARY CACHES AVAILABLE ################ # MYSQL disk cache jcs.auxiliary.MYSQL=org.apache.commons.jcs4.auxiliary.disk.jdbc.mysql.MySQLDiskCacheFactory -jcs.auxiliary.MYSQL.attributes=org.apache.commons.jcs4.auxiliary.disk.jdbc.mysql.MySQLDiskCacheAttributes jcs.auxiliary.MYSQL.attributes.userName=sa jcs.auxiliary.MYSQL.attributes.password= jcs.auxiliary.MYSQL.attributes.url=jdbc:hsqldb:target/cache_hsql_db diff --git a/xdocs/ProjectHistory.xml b/src/site/xdoc/ProjectHistory.xml similarity index 100% rename from xdocs/ProjectHistory.xml rename to src/site/xdoc/ProjectHistory.xml diff --git a/xdocs/RegionProperties.xml b/src/site/xdoc/RegionProperties.xml similarity index 100% rename from xdocs/RegionProperties.xml rename to src/site/xdoc/RegionProperties.xml diff --git a/xdocs/RemoteAuxCache.xml b/src/site/xdoc/RemoteAuxCache.xml similarity index 95% rename from xdocs/RemoteAuxCache.xml rename to src/site/xdoc/RemoteAuxCache.xml index d1a00e71..3e11ed62 100644 --- a/xdocs/RemoteAuxCache.xml +++ b/src/site/xdoc/RemoteAuxCache.xml @@ -151,8 +151,6 @@ # Remote RMI Cache set up to failover jcs.auxiliary.RFailover= org.apache.commons.jcs4.auxiliary.remote.RemoteCacheFactory -jcs.auxiliary.RFailover.attributes= - org.apache.commons.jcs4.auxiliary.remote.RemoteCacheAttributes jcs.auxiliary.RFailover.attributes.FailoverServers= localhost:1102,localhost:1103 jcs.auxiliary.RFailover.attributes.RemoveUponRemotePut=true @@ -167,11 +165,7 @@ jcs.auxiliary.RFailover.attributes.GetOnly=false <![CDATA[ #Regions preconfigured for caching jcs.region.testCache1=DC,RFailover -jcs.region.testCache1.cacheattributes= - org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.testCache1.cacheattributes.MaxObjects=1000 -jcs.region.testCache1.cacheattributes.MemoryCacheName= - org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache ]]> </source> </subsection> @@ -248,14 +242,10 @@ jcs.remotecache.serverattributes.AllowClusterGet=true <![CDATA[ # sets the default aux value for any non configured caches jcs.default=DC,RCluster1 -jcs.default.cacheattributes= - org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=1000 jcs.auxiliary.RCluster1= org.apache.commons.jcs4.auxiliary.remote.RemoteCacheFactory -jcs.auxiliary.RCluster1.attributes= - org.apache.commons.jcs4.auxiliary.remote.RemoteCacheAttributes jcs.auxiliary.RCluster1.attributes.RemoteTypeName=CLUSTER jcs.auxiliary.RCluster1.attributes.RemoveUponRemotePut=false jcs.auxiliary.RCluster1.attributes.ClusterServers=localhost:1103 @@ -305,8 +295,6 @@ jcs.auxiliary.RCluster1.attributes.GetOnly=false # Remote RMI Cache set up to failover jcs.auxiliary.RFailover= org.apache.commons.jcs4.auxiliary.remote.RemoteCacheFactory - jcs.auxiliary.RFailover.attributes= - org.apache.commons.jcs4.auxiliary.remote.RemoteCacheAttributes jcs.auxiliary.RFailover.attributes.FailoverServers= localhost:1102,localhost:1103 jcs.auxiliary.RC.attributes.RemoveUponRemotePut=true diff --git a/xdocs/RemoteCacheProperties.xml b/src/site/xdoc/RemoteCacheProperties.xml similarity index 98% rename from xdocs/RemoteCacheProperties.xml rename to src/site/xdoc/RemoteCacheProperties.xml index 2e53498a..a495b632 100644 --- a/xdocs/RemoteCacheProperties.xml +++ b/src/site/xdoc/RemoteCacheProperties.xml @@ -151,7 +151,6 @@ <![CDATA[ # This remote client does not receive jcs.auxiliary.RC=org.apache.commons.jcs4.auxiliary.remote.RemoteCacheFactory -jcs.auxiliary.RC.attributes=org.apache.commons.jcs4.auxiliary.remote.RemoteCacheAttributes jcs.auxiliary.RC.attributes.FailoverServers=localhost:1101,localhost:1102 jcs.auxiliary.RC.attributes.LocalPort=1201 jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false diff --git a/xdocs/RemoteHttpCacheProperties.xml b/src/site/xdoc/RemoteHttpCacheProperties.xml similarity index 97% rename from xdocs/RemoteHttpCacheProperties.xml rename to src/site/xdoc/RemoteHttpCacheProperties.xml index efcdbe0d..be44daa7 100644 --- a/xdocs/RemoteHttpCacheProperties.xml +++ b/src/site/xdoc/RemoteHttpCacheProperties.xml @@ -101,7 +101,6 @@ <![CDATA[ # This remote client does not receive jcs.auxiliary.RC=org.apache.commons.jcs4.auxiliary.remote.http.client.RemoteCacheFactory -jcs.auxiliary.RC.attributes=org.apache.commons.jcs4.auxiliary.remote.RemoteCacheAttributes jcs.auxiliary.RC.attributes.FailoverServers=localhost:1101,localhost:1102 jcs.auxiliary.RC.attributes.LocalPort=1201 jcs.auxiliary.RC.attributes.RemoveUponRemotePut=false diff --git a/xdocs/UpgradingFrom13.xml b/src/site/xdoc/UpgradingFrom13.xml similarity index 100% rename from xdocs/UpgradingFrom13.xml rename to src/site/xdoc/UpgradingFrom13.xml diff --git a/xdocs/UpgradingFrom2x.xml b/src/site/xdoc/UpgradingFrom2x.xml similarity index 100% rename from xdocs/UpgradingFrom2x.xml rename to src/site/xdoc/UpgradingFrom2x.xml diff --git a/xdocs/UpgradingFrom3x.xml b/src/site/xdoc/UpgradingFrom3x.xml similarity index 96% rename from xdocs/UpgradingFrom3x.xml rename to src/site/xdoc/UpgradingFrom3x.xml index 2fd40476..3c8f21ef 100644 --- a/xdocs/UpgradingFrom3x.xml +++ b/src/site/xdoc/UpgradingFrom3x.xml @@ -70,11 +70,11 @@ import org.apache.commons.jcs4.*; Here again, change all package names in configuration entries from e.g. <source><![CDATA[ -jcs.default.cacheattributes=org.apache.commons.jcs3.engine.CompositeCacheAttributes +jcs.auxiliary.blockDiskCache=org.apache.commons.jcs3.auxiliary.disk.block.BlockDiskCacheFactory ]]></source> to <source><![CDATA[ -jcs.default.cacheattributes=org.apache.commons.jcs4.engine.CompositeCacheAttributes +jcs.auxiliary.blockDiskCache=org.apache.commons.jcs4.auxiliary.disk.block.BlockDiskCacheFactory ]]></source> </p> </subsection> diff --git a/xdocs/UsingJCSBasicWeb.xml b/src/site/xdoc/UsingJCSBasicWeb.xml similarity index 96% rename from xdocs/UsingJCSBasicWeb.xml rename to src/site/xdoc/UsingJCSBasicWeb.xml index 2f7faf1d..a831b7cc 100644 --- a/xdocs/UsingJCSBasicWeb.xml +++ b/src/site/xdoc/UsingJCSBasicWeb.xml @@ -362,11 +362,7 @@ public class BookVObjManager # sets the default aux value for any non configured caches jcs.default=DC,RFailover -jcs.default.cacheattributes= - org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.default.cacheattributes.MaxObjects=1000 -jcs.default.cacheattributes.MemoryCacheName= - org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.default.elementattributes.IsEternal=false jcs.default.elementattributes.MaxLife=3600 jcs.default.elementattributes.MaxIdleTime=1800 @@ -376,11 +372,7 @@ jcs.default.elementattributes.MaxIdleTime=1800 # Regions preconfigured for caching jcs.region.bookCache=DC,RFailover -jcs.region.bookCache.cacheattributes= - org.apache.commons.jcs4.engine.CompositeCacheAttributes jcs.region.bookCache.cacheattributes.MaxObjects=1200 -jcs.region.bookCache.cacheattributes.MemoryCacheName= - org.apache.commons.jcs4.engine.memory.lru.LRUMemoryCache jcs.region.bookCache.elementattributes.IsEternal=false jcs.region.bookCache.elementattributes.MaxLife=7200 jcs.region.bookCache.elementattributes.MaxIdleTime=1800 @@ -393,8 +385,6 @@ jcs.region.bookCache.elementattributes.IsLateral=true # Primary Disk Cache -- faster than the rest because of memory key storage jcs.auxiliary.DC= org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes= - org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheAttributes jcs.auxiliary.DC.attributes.DiskPath=/usr/opt/bookstore/raf jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000 jcs.auxiliary.DC.attributes.MaxKeySize=10000 @@ -403,8 +393,6 @@ jcs.auxiliary.DC.attributes.OptimizeAtRemoveCount=300000 # Remote RMI Cache set up to failover jcs.auxiliary.RFailover= org.apache.commons.jcs4.auxiliary.remote.RemoteCacheFactory -jcs.auxiliary.RFailover.attributes= - org.apache.commons.jcs4.auxiliary.remote.RemoteCacheAttributes jcs.auxiliary.RFailover.attributes.RemoteTypeName=LOCAL jcs.auxiliary.RFailover.attributes.FailoverServers=scriptserver:1102 jcs.auxiliary.RFailover.attributes.GetOnly=false diff --git a/xdocs/download_jcs.xml b/src/site/xdoc/download_jcs.xml similarity index 100% rename from xdocs/download_jcs.xml rename to src/site/xdoc/download_jcs.xml diff --git a/xdocs/getting_started/intro.xml b/src/site/xdoc/getting_started/intro.xml similarity index 99% rename from xdocs/getting_started/intro.xml rename to src/site/xdoc/getting_started/intro.xml index 74c27fc8..277f323c 100644 --- a/xdocs/getting_started/intro.xml +++ b/src/site/xdoc/getting_started/intro.xml @@ -167,7 +167,6 @@ jcs.region.testCache1.elementattributes.IsEternal=false # AVAILABLE AUXILIARY CACHES jcs.auxiliary.DC=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheFactory -jcs.auxiliary.DC.attributes=org.apache.commons.jcs4.auxiliary.disk.indexed.IndexedDiskCacheAttributes jcs.auxiliary.DC.attributes.DiskPath=${user.dir}/jcs_swap jcs.auxiliary.DC.attributes.MaxPurgatorySize=10000000 jcs.auxiliary.DC.attributes.MaxKeySize=1000000 diff --git a/xdocs/index.xml b/src/site/xdoc/index.xml similarity index 100% rename from xdocs/index.xml rename to src/site/xdoc/index.xml diff --git a/xdocs/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml similarity index 100% rename from xdocs/issue-tracking.xml rename to src/site/xdoc/issue-tracking.xml diff --git a/xdocs/mail-lists.xml b/src/site/xdoc/mail-lists.xml similarity index 100% rename from xdocs/mail-lists.xml rename to src/site/xdoc/mail-lists.xml
