[jbosscache-commits] JBoss Cache SVN: r6881 - in core/branches/flat/src/test/resources: configs and 1 other directory.

Author: manik.surtani(a)jboss.com Date: 2008-10-08 12:22:40 -0400 (Wed, 08 Oct 2008) New Revision: 6881 Modified: core/branches/flat/src/test/resources/configs/clonable-config.xml core/branches/flat/src/test/resources/configs/local-lru-eviction.xml core/branches/flat/src/test/resources/configs/local-passivation.xml core/branches/flat/src/test/resources/configs/local-tx.xml core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml core/branches/flat/src/test/resources/configs/parser-test-async.xml core/branches/flat/src/test/resources/configs/parser-test.xml core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml core/branches/flat/src/test/resources/configs/string-property-replaced.xml core/branches/flat/src/test/resources/jbc2-registry-configs.xml core/branches/flat/src/test/resources/jbc3-registry-configs.xml core/branches/flat/src/test/resources/unit-test-cache-service.xml Log: Moved stuff Modified: core/branches/flat/src/test/resources/configs/clonable-config.xml =================================================================== --- core/branches/flat/src/test/resources/configs/clonable-config.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/clonable-config.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.0"> <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval fetchInMemoryState="false" timeout="3"/> @@ -45,18 +45,18 @@ </buddy> </replication> <eviction wakeUpInterval="45000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="4"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm" eventQueueSize="4"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000000</attribute> <attribute name="maxAge">15000</attribute> </default> - <region name="/fifo" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"> + <region name="/fifo" algorithmClass="org.jboss.starobrno.eviction.FIFOAlgorithm"> <attribute name="maxNodes">5000</attribute> </region> - <region name="/mru" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm"> + <region name="/mru" algorithmClass="org.jboss.starobrno.eviction.MRUAlgorithm"> <attribute name="maxNodes">10000</attribute> </region> - <region name="/lfu" algorithmClass="org.jboss.cache.eviction.LFUAlgorithm"> + <region name="/lfu" algorithmClass="org.jboss.starobrno.eviction.LFUAlgorithm"> <attribute name="maxNodes">5000</attribute> <attribute name="minNodes">4000</attribute> </region> Modified: core/branches/flat/src/test/resources/configs/local-lru-eviction.xml =================================================================== --- core/branches/flat/src/test/resources/configs/local-lru-eviction.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/local-lru-eviction.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.0"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"/> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm" eventQueueSize="200000"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000000</attribute> </default> Modified: core/branches/flat/src/test/resources/configs/local-passivation.xml =================================================================== --- core/branches/flat/src/test/resources/configs/local-passivation.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/local-passivation.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.0"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"/> <eviction wakeUpInterval="1000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm" eventQueueSize="200000"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000</attribute> </default> Modified: core/branches/flat/src/test/resources/configs/local-tx.xml =================================================================== --- core/branches/flat/src/test/resources/configs/local-tx.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/local-tx.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.0"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> @@ -8,7 +8,7 @@ <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"/> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm" eventQueueSize="200000"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000000</attribute> </default> Modified: core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml =================================================================== --- core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.0"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> @@ -35,14 +35,14 @@ </jgroupsConfig> </transport> <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm" eventQueueSize="200000"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000000</attribute> </default> - <region name="/org/jboss/data" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"> + <region name="/org/jboss/data" algorithmClass="org.jboss.starobrno.eviction.FIFOAlgorithm"> <attribute name="maxNodes">5000</attribute> </region> - <region name="/test/" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm"> + <region name="/test/" algorithmClass="org.jboss.starobrno.eviction.MRUAlgorithm"> <attribute name="maxNodes">10000</attribute> </region> <region name="/maxAgeTest/"> Modified: core/branches/flat/src/test/resources/configs/parser-test-async.xml =================================================================== --- core/branches/flat/src/test/resources/configs/parser-test-async.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/parser-test-async.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -59,14 +59,14 @@ <jmxStatistics enabled="false"/> <eviction wakeUpInterval="5"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm" eventQueueSize="200000"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000</attribute> </default> <region name="/org/jboss/data"> <attribute name="timeToLive">1002</attribute> </region> - <region name="/org/jboss/xyz" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm" eventQueueSize="21"> + <region name="/org/jboss/xyz" algorithmClass="org.jboss.starobrno.eviction.MRUAlgorithm" eventQueueSize="21"> <attribute name="maxNodes">2103</attribute> <attribute name="minTimeToLive">22</attribute> </region> Modified: core/branches/flat/src/test/resources/configs/parser-test.xml =================================================================== --- core/branches/flat/src/test/resources/configs/parser-test.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/parser-test.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -59,14 +59,14 @@ <jmxStatistics enabled="false"/> <eviction wakeUpInterval="5"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm" eventQueueSize="200000"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000</attribute> </default> <region name="/org/jboss/data"> <attribute name="timeToLive">1002</attribute> </region> - <region name="/org/jboss/xyz" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm" eventQueueSize="21"> + <region name="/org/jboss/xyz" algorithmClass="org.jboss.starobrno.eviction.MRUAlgorithm" eventQueueSize="21"> <attribute name="maxNodes">2103</attribute> <attribute name="minTimeToLive">22</attribute> </region> Modified: core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml =================================================================== --- core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.0"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <stateRetrieval timeout="20000"/> @@ -33,23 +33,23 @@ <pbcast.FLUSH timeout="0"/> </jgroupsConfig> </transport> - + <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000000</attribute> </default> - <region name="/org/jboss/data" algorithmClass="org.jboss.cache.eviction.LFUAlgorithm"> + <region name="/org/jboss/data" algorithmClass="org.jboss.starobrno.eviction.LFUAlgorithm"> <attribute name="maxNodes">5000</attribute> <attribute name="minNodes">1000</attribute> </region> - <region name="/org/jboss/test/data" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"> + <region name="/org/jboss/test/data" algorithmClass="org.jboss.starobrno.eviction.FIFOAlgorithm"> <attribute name="maxNodes">5</attribute> </region> - <region name="/test/" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm"> + <region name="/test/" algorithmClass="org.jboss.starobrno.eviction.MRUAlgorithm"> <attribute name="maxNodes">10000</attribute> </region> - <region name="/maxAgeTest/" algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> + <region name="/maxAgeTest/" algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> <attribute name="maxNodes">10000</attribute> <attribute name="timeToLive">8000</attribute> <attribute name="maxAge">10000</attribute> Modified: core/branches/flat/src/test/resources/configs/string-property-replaced.xml =================================================================== --- core/branches/flat/src/test/resources/configs/string-property-replaced.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/configs/string-property-replaced.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -24,7 +24,8 @@ </buddy> </replication> <eviction wakeUpInterval="5000"> - <default algorithmClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.cache.eviction.LRUAlgorithm}"> + <default + algorithmClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.starobrno.eviction.LRUAlgorithm}"> <attribute name="maxNodes">${test.property.EvictionPolicyConfig.maxNodes:5000}</attribute> <attribute name="timeToLive">1000000</attribute> </default> Modified: core/branches/flat/src/test/resources/jbc2-registry-configs.xml =================================================================== (Binary files differ) Modified: core/branches/flat/src/test/resources/jbc3-registry-configs.xml =================================================================== --- core/branches/flat/src/test/resources/jbc3-registry-configs.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/jbc3-registry-configs.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -1,185 +1,185 @@ <?xml version="1.0" encoding="UTF-8"?> -<registry:cache-configs xmlns="urn:jboss:jbosscache-core:config:3.0" xmlns:registry="urn:jboss:jbosscache-core:cache-repo:3.0"> +<registry:cache-configs xmlns="urn:jboss:jbosscache-core:config:3.0" + xmlns:registry="urn:jboss:jbosscache-core:cache-repo:3.0"> - <!-- - Various JBoss Cache configurations, suitable for different caching - uses (e.g. entities vs. queries). + <!-- + Various JBoss Cache configurations, suitable for different caching + uses (e.g. entities vs. queries). - In all cases, TransactionManager configuration not required. - Hibernate will plug in its own transaction manager integration. - --> + In all cases, TransactionManager configuration not required. + Hibernate will plug in its own transaction manager integration. + --> - <!-- A config appropriate for entity/collection caching. --> - <registry:cache-config name="optimistic-entity"> - <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/> - <transaction syncCommitPhase="true" syncRollbackPhase="true" - transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <serialization useRegionBasedMarshalling="true"/> - <startup regionsInactiveOnStartup="true"/> - <stateRetrieval fetchInMemoryState="false" timeout="20000"/> - <transport clusterName="optimistic-entity" multiplexerStack="udp-sync"/> - <invalidation> - <sync replTimeout="20000"/> - </invalidation> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/TS"> - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLive">0</attribute> - </region> - </eviction> - </registry:cache-config> + <!-- A config appropriate for entity/collection caching. --> + <registry:cache-config name="optimistic-entity"> + <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/> + <transaction syncCommitPhase="true" syncRollbackPhase="true" + transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <serialization useRegionBasedMarshalling="true"/> + <startup regionsInactiveOnStartup="true"/> + <stateRetrieval fetchInMemoryState="false" timeout="20000"/> + <transport clusterName="optimistic-entity" multiplexerStack="udp-sync"/> + <invalidation> + <sync replTimeout="20000"/> + </invalidation> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLive">1000</attribute> + </default> + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLive">0</attribute> + </region> + </eviction> + </registry:cache-config> - <!-- A config appropriate for entity/collection caching that - uses pessimistic locking --> - <registry:cache-config name="pessimistic-entity"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/> - <serialization useRegionBasedMarshalling="true"/> - <startup regionsInactiveOnStartup="true"/> - <stateRetrieval fetchInMemoryState="false" timeout="20000"/> - <transport clusterName="pessimistic-entity" multiplexerStack="udp-sync"/> - <invalidation> - <sync replTimeout="20000"/> - </invalidation> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/TS"> - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLive">0</attribute> - </region> - </eviction> - </registry:cache-config> + <!-- A config appropriate for entity/collection caching that +uses pessimistic locking --> + <registry:cache-config name="pessimistic-entity"> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/> + <serialization useRegionBasedMarshalling="true"/> + <startup regionsInactiveOnStartup="true"/> + <stateRetrieval fetchInMemoryState="false" timeout="20000"/> + <transport clusterName="pessimistic-entity" multiplexerStack="udp-sync"/> + <invalidation> + <sync replTimeout="20000"/> + </invalidation> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLive">1000</attribute> + </default> + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLive">0</attribute> + </region> + </eviction> + </registry:cache-config> - <!-- A config appropriate for query caching. Does not replicate - queries. DO NOT STORE TIMESTAMPS IN THIS CACHE. - --> - <registry:cache-config name="local-query"> - <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/TS"> - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLive">0</attribute> - </region> - </eviction> - </registry:cache-config> + <!-- A config appropriate for query caching. Does not replicate + queries. DO NOT STORE TIMESTAMPS IN THIS CACHE. + --> + <registry:cache-config name="local-query"> + <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLive">1000</attribute> + </default> + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLive">0</attribute> + </region> + </eviction> + </registry:cache-config> - <!-- A query cache that replicates queries. Replication is asynchronous. - DO NOT STORE TIMESTAMPS IN THIS CACHE. - --> - <registry:cache-config name="replicated-query"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <serialization useRegionBasedMarshalling="false"/> - <startup regionsInactiveOnStartup="false"/> - <stateRetrieval fetchInMemoryState="false" timeout="20000"/> - <transport clusterName="replicated-query" multiplexerStack="udp"/> - <replication> - <async/> - </replication> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/TS" > - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLive">0</attribute> - </region> - </eviction> - </registry:cache-config> + <!-- A query cache that replicates queries. Replication is asynchronous. + DO NOT STORE TIMESTAMPS IN THIS CACHE. + --> + <registry:cache-config name="replicated-query"> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <serialization useRegionBasedMarshalling="false"/> + <startup regionsInactiveOnStartup="false"/> + <stateRetrieval fetchInMemoryState="false" timeout="20000"/> + <transport clusterName="replicated-query" multiplexerStack="udp"/> + <replication> + <async/> + </replication> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLive">1000</attribute> + </default> + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLive">0</attribute> + </region> + </eviction> + </registry:cache-config> - <!-- Optimized for timestamp caching. A clustered timestamp cache - is required if query caching is used, even if the query cache - itself is configured with CacheMode=LOCAL. - --> - <registry:cache-config name="timestamps-cache"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/> - <serialization useRegionBasedMarshalling="true"/> - <startup regionsInactiveOnStartup="true"/> - <stateRetrieval fetchInMemoryState="true" timeout="20000"/> - <transport clusterName="timestamps-cache" multiplexerStack="udp"/> - <replication> - <async/> - </replication> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/TS"> - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLive">0</attribute> - </region> - </eviction> - </registry:cache-config> + <!-- Optimized for timestamp caching. A clustered timestamp cache + is required if query caching is used, even if the query cache + itself is configured with CacheMode=LOCAL. + --> + <registry:cache-config name="timestamps-cache"> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/> + <serialization useRegionBasedMarshalling="true"/> + <startup regionsInactiveOnStartup="true"/> + <stateRetrieval fetchInMemoryState="true" timeout="20000"/> + <transport clusterName="timestamps-cache" multiplexerStack="udp"/> + <replication> + <async/> + </replication> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLive">1000</attribute> + </default> + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLive">0</attribute> + </region> + </eviction> + </registry:cache-config> - <!-- A config appropriate for a cache that's shared for - entity, collection, query and timestamp caching. Not an advised - configuration, since it requires cache mode REPL_SYNC, which is the - least efficient mode. Also requires a full state transfer at startup, - which can be expensive. Uses optimistic locking. --> - <registry:cache-config name="optimistic-shared"> - <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/> - <transaction syncCommitPhase="true" syncRollbackPhase="true" - transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <serialization useRegionBasedMarshalling="true"/> - <startup regionsInactiveOnStartup="true"/> - <stateRetrieval fetchInMemoryState="true" timeout="20000"/> - <transport clusterName="optimistic-shared" multiplexerStack="udp"/> - <replication> - <sync replTimeout="20000"/> - </replication> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/TS"> - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLive">0</attribute> - </region> - </eviction> - </registry:cache-config> + <!-- A config appropriate for a cache that's shared for +entity, collection, query and timestamp caching. Not an advised +configuration, since it requires cache mode REPL_SYNC, which is the +least efficient mode. Also requires a full state transfer at startup, +which can be expensive. Uses optimistic locking. --> + <registry:cache-config name="optimistic-shared"> + <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/> + <transaction syncCommitPhase="true" syncRollbackPhase="true" + transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <serialization useRegionBasedMarshalling="true"/> + <startup regionsInactiveOnStartup="true"/> + <stateRetrieval fetchInMemoryState="true" timeout="20000"/> + <transport clusterName="optimistic-shared" multiplexerStack="udp"/> + <replication> + <sync replTimeout="20000"/> + </replication> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLive">1000</attribute> + </default> + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLive">0</attribute> + </region> + </eviction> + </registry:cache-config> + <!-- A config appropriate for a cache that's shared for + entity, collection, query and timestamp caching. Not an advised + configuration, since it requires cache mode REPL_SYNC, which is the + least efficient mode. Also requires a full state transfer at startup, + which can be expensive. Uses pessmistic locking. + --> + <registry:cache-config name="pessimistic-shared"> - <!-- A config appropriate for a cache that's shared for - entity, collection, query and timestamp caching. Not an advised - configuration, since it requires cache mode REPL_SYNC, which is the - least efficient mode. Also requires a full state transfer at startup, - which can be expensive. Uses pessmistic locking. - --> - <registry:cache-config name="pessimistic-shared"> - - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/> - <serialization useRegionBasedMarshalling="true"/> - <startup regionsInactiveOnStartup="true"/> - <stateRetrieval fetchInMemoryState="true" timeout="20000"/> - <transport clusterName="pessimistic-shared" multiplexerStack="udp"/> - <replication> - <sync replTimeout="20000"/> - </replication> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/TS"> - <attribute name="maxNodes">0</attribute> - <attribute name="timeToLive">0</attribute> - </region> - </eviction> - </registry:cache-config> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/> + <serialization useRegionBasedMarshalling="true"/> + <startup regionsInactiveOnStartup="true"/> + <stateRetrieval fetchInMemoryState="true" timeout="20000"/> + <transport clusterName="pessimistic-shared" multiplexerStack="udp"/> + <replication> + <sync replTimeout="20000"/> + </replication> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> + <attribute name="maxNodes">5000</attribute> + <attribute name="timeToLive">1000</attribute> + </default> + <region name="/TS"> + <attribute name="maxNodes">0</attribute> + <attribute name="timeToLive">0</attribute> + </region> + </eviction> + </registry:cache-config> </registry:cache-configs> Modified: core/branches/flat/src/test/resources/unit-test-cache-service.xml =================================================================== --- core/branches/flat/src/test/resources/unit-test-cache-service.xml 2008-10-08 16:16:40 UTC (rev 6880) +++ core/branches/flat/src/test/resources/unit-test-cache-service.xml 2008-10-08 16:22:40 UTC (rev 6881) @@ -10,7 +10,7 @@ <sync replTimeout="15000"/> </replication> <eviction wakeUpInterval="2000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> + <default algorithmClass="org.jboss.starobrno.eviction.LRUAlgorithm"> <attribute name="maxNodes">5000</attribute> <attribute name="timeToLive">1000</attribute> </default>