JBoss Cache SVN: r6138 - core/trunk/src/test/java/org/jboss/cache/commands/write.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-01 09:31:16 -0400 (Tue, 01 Jul 2008)
New Revision: 6138
Modified:
core/trunk/src/test/java/org/jboss/cache/commands/write/EvictCommandTest.java
Log:
Eviction code moved to the command
Modified: core/trunk/src/test/java/org/jboss/cache/commands/write/EvictCommandTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/commands/write/EvictCommandTest.java 2008-07-01 06:19:50 UTC (rev 6137)
+++ core/trunk/src/test/java/org/jboss/cache/commands/write/EvictCommandTest.java 2008-07-01 13:31:16 UTC (rev 6138)
@@ -50,10 +50,9 @@
{
expect(container.peek(testFqn, false, true)).andReturn(nodes.abNode);
notifier.notifyNodeEvicted(testFqn, true, ctx);
- expect(container.evict(testFqn)).andReturn(true);
notifier.notifyNodeEvicted(testFqn, false, ctx);
control.replay();
- assert Boolean.TRUE == command.perform(ctx);
+ assert Boolean.FALSE == command.perform(ctx);
control.verify();
}
@@ -68,13 +67,13 @@
expect(container.getNodesForEviction(testFqn, true)).andReturn(nodesToEvict);
control.checkOrder(false);
//evict a
+ expect(container.peek(nodes.a, false, true)).andReturn(nodes.aNode);
notifier.notifyNodeEvicted(nodes.a, true, ctx);
- expect(container.evict(nodes.a)).andReturn(true);
notifier.notifyNodeEvicted(nodes.a, false, ctx);
//evict b
+ expect(container.peek(nodes.ab, false, true)).andReturn(nodes.abNode);
notifier.notifyNodeEvicted(nodes.ab, true, ctx);
- expect(container.evict(nodes.ab)).andReturn(true);
notifier.notifyNodeEvicted(nodes.ab, false, ctx);
control.replay();
15 years, 10 months
JBoss Cache SVN: r6137 - in core/trunk/src: main/release and 4 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-01 02:19:50 -0400 (Tue, 01 Jul 2008)
New Revision: 6137
Added:
core/trunk/src/test/resources/configs/parser-test.xml
Modified:
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
core/trunk/src/main/release/build.xml
core/trunk/src/main/resources/all-elements-file-3.x.xml
core/trunk/src/main/resources/config-samples/buddy-replication.xml
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
Log:
added new locking configs needed by mvcc : concurrencyLevel and allowWriteSkew
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-07-01 05:59:38 UTC (rev 6136)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-07-01 06:19:50 UTC (rev 6137)
@@ -288,6 +288,10 @@
if (existsAttribute(lockAcquisitionTimeout)) config.setLockAcquisitionTimeout(getLong(lockAcquisitionTimeout));
String nodeLockingScheme = getAttributeValue(element, "nodeLockingScheme");
if (existsAttribute(nodeLockingScheme)) config.setNodeLockingScheme(nodeLockingScheme);
+ String allowWriteSkew = getAttributeValue(element, "allowWriteSkew");
+ if (existsAttribute(allowWriteSkew)) config.setAllowWriteSkew(getBoolean(allowWriteSkew));
+ String concurrencyLevel = getAttributeValue(element, "concurrencyLevel");
+ if (existsAttribute(concurrencyLevel)) config.setConcurrencyLevel(getInt(concurrencyLevel));
}
private Element getSingleElement(String elementName)
Modified: core/trunk/src/main/release/build.xml
===================================================================
--- core/trunk/src/main/release/build.xml 2008-07-01 05:59:38 UTC (rev 6136)
+++ core/trunk/src/main/release/build.xml 2008-07-01 06:19:50 UTC (rev 6137)
@@ -129,6 +129,7 @@
</target>
<!-- todo mmarkus add a paragraph in documentation to mntion about this-->
+ <!-- todo mmarkus add an sh and bat file to call this, which should also be present in the dist file -->
<target name="config2to3">
<echo message="${os.name}"/>
<xslt in="${source}" out="${destination}" style="resources/config2to3.xslt"/>
Modified: core/trunk/src/main/resources/all-elements-file-3.x.xml
===================================================================
--- core/trunk/src/main/resources/all-elements-file-3.x.xml 2008-07-01 05:59:38 UTC (rev 6136)
+++ core/trunk/src/main/resources/all-elements-file-3.x.xml 2008-07-01 06:19:50 UTC (rev 6137)
@@ -3,7 +3,7 @@
<jbosscache>
<locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
- nodeLockingScheme="Optimistic"/>
+ nodeLockingScheme="mvcc"allowWriteSkew="true" concurrencyLevel="21"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
syncRollbackPhase="true" syncCommitPhase="true"/>
Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-01 05:59:38 UTC (rev 6136)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-01 06:19:50 UTC (rev 6137)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- todo mmarkus add comments to sample config files (after DTD is written) -->
+ <!-- todo mmarkus include the DTD file in all configs -->
<jbosscache>
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-07-01 05:59:38 UTC (rev 6136)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-07-01 06:19:50 UTC (rev 6137)
@@ -22,7 +22,7 @@
public void setUp()
{
XmlConfigurationParser parser = new XmlConfigurationParser();
- config = parser.parseFile("/configs/parser-test-file-3.x.xml");
+ config = parser.parseFile("configs/parser-test.xml");
}
public void testTransactionManagerLookupClass()
@@ -178,7 +178,7 @@
EvictionConfig evictionConfig = config.getEvictionConfig();
assert "org.jboss.cache.eviction.LRUPolicy".equals(evictionConfig.getDefaultEvictionPolicyClass());
assert 200000 == evictionConfig.getDefaultEventQueueSize();
- assert 5 == evictionConfig.getWakeupIntervalSeconds();
+ assert 5 == evictionConfig.getWakeupInterval();
List<EvictionRegionConfig> regionConfigs = evictionConfig.getEvictionRegionConfigs();
assert regionConfigs.size() == 3;
@@ -235,7 +235,11 @@
assert singlStoreConf.getProperties().size() == 2;
assert singlStoreConf.getProperties().get("pushStateWhenCoordinator").equals("true");
assert singlStoreConf.getProperties().get("pushStateWhenCoordinatorTimeout").equals("20000");
+ }
+ public void testMvccAttributes()
+ {
+ assert config.isAllowWriteSkew();
+ assert config.getConcurrencyLevel() == 21;
}
-
}
Added: core/trunk/src/test/resources/configs/parser-test.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test.xml (rev 0)
+++ core/trunk/src/test/resources/configs/parser-test.xml 2008-07-01 06:19:50 UTC (rev 6137)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- file used for functional test of the xml parser -->
+
+<jbosscache>
+
+ <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
+ nodeLockingScheme="mvcc" allowWriteSkew="true" concurrencyLevel="21"/>
+
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="true" syncCommitPhase="true"/>
+
+ <!-- serialization related configuration, used for replication and cache loading -->
+ <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4"
+ marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/>
+
+ <replication>
+ <sync replTimeout="15421"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </replication>
+
+ <startup fetchInMemoryState="true" stateRetrievalTimeout="15124" inactiveOnStartup="true"/>
+ <shutdown hookBehavior="REGISTER"/>
+
+ <transport clusterName="JBossCache-Cluster" multiplexerStack="file_name">
+ <jgroupsConfig>
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+
+
+ <jmxStatistics enabled="false"/>
+
+ <eviction wakeUpInterval="5">
+ <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
+ <root>
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLive">1000</attribute>
+ </root>
+ <region name="/org/jboss/data">
+ <attribute name="timeToLive">1002</attribute>
+ </region>
+ <region name="/org/jboss/xyz" policyClass="org.jboss.cache.eviction.MRUPolicy" eventQueueSize="21">
+ <attribute name="maxNodes">2103</attribute>
+ <attribute name="minTimeToLive">22</attribute>
+ </region>
+ </eviction>
+
+ <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig-->
+ <loaders passivation="true" shared="true">
+ <preload>
+ <node fqn="/a/b/c"/>
+ <node fqn="/f/r/s"/>
+ </preload>
+
+ <!-- we can now have multiple cache loaders, which get chained -->
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="true" fetchPersistentState="true"
+ ignoreModifications="true" purgeOnStartup="true">
+ <properties>
+ cache.jdbc.table.name=jbosscache
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=true
+ </properties>
+ <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=20000
+ </properties>
+ </singletonStore>
+ </loader>
+ </loaders>
+
+ <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations -->
+ <customInterceptors>
+ <interceptor class="com.myCompany.MyInterceptor1">
+ <properties>
+ x=y
+ i=10
+ </properties>
+ <position first="true"/>
+ </interceptor>
+ <interceptor class="com.myCompany.MyInterceptor2">
+ <position last="true"/>
+ </interceptor>
+ <interceptor class="com.myCompany.MyInterceptor3">
+ <position index="3"/>
+ </interceptor>
+ <interceptor class="com.myCompany.MyInterceptor4">
+ <position before="org.jboss.cache.interceptors.CallInterceptor"/>
+ </interceptor>
+ <interceptor class="com.myCompany.MyInterceptor5">
+ <position after="org.jboss.cache.interceptors.CallInterceptor"/>
+ </interceptor>
+ </customInterceptors>
+</jbosscache>
15 years, 10 months
JBoss Cache SVN: r6136 - in core/trunk/src/test/resources: configs and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-01 01:59:38 -0400 (Tue, 01 Jul 2008)
New Revision: 6136
Modified:
core/trunk/src/test/resources/configs/clonable-config.xml
core/trunk/src/test/resources/jbc2-registry-configs.xml
Log:
nodeLockingScheme attribute is in lower cases
Modified: core/trunk/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-01 05:56:49 UTC (rev 6135)
+++ core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-01 05:59:38 UTC (rev 6136)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="OPTIMISTIC"/>
+ <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<startup fetchInMemoryState="false" stateRetrievalTimeout="3"/>
<transport clusterName="CloneCluster" multiplexerStack="udp">
Modified: core/trunk/src/test/resources/jbc2-registry-configs.xml
===================================================================
(Binary files differ)
15 years, 10 months
JBoss Cache SVN: r6135 - core/trunk/src/main/resources/config-samples.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-01 01:56:49 -0400 (Tue, 01 Jul 2008)
New Revision: 6135
Modified:
core/trunk/src/main/resources/config-samples/buddy-replication.xml
core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
core/trunk/src/main/resources/config-samples/eviction-enabled.xml
core/trunk/src/main/resources/config-samples/local.xml
core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
core/trunk/src/main/resources/config-samples/optimistically-locked.xml
Log:
default isolation level for sample cache files is mvcc
Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-01 05:45:19 UTC (rev 6134)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-01 05:56:49 UTC (rev 6135)
@@ -3,7 +3,7 @@
<!-- todo mmarkus add comments to sample config files (after DTD is written) -->
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<startup stateRetrievalTimeout="20000"/>
<transport clusterName="JBossCache-Cluster">
Modified: core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-01 05:45:19 UTC (rev 6134)
+++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-01 05:56:49 UTC (rev 6135)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<eviction wakeUpInterval="5000">
<defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
Modified: core/trunk/src/main/resources/config-samples/eviction-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-01 05:45:19 UTC (rev 6134)
+++ core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-01 05:56:49 UTC (rev 6135)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<eviction wakeUpInterval="5000">
<defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
Modified: core/trunk/src/main/resources/config-samples/local.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/local.xml 2008-07-01 05:45:19 UTC (rev 6134)
+++ core/trunk/src/main/resources/config-samples/local.xml 2008-07-01 05:56:49 UTC (rev 6135)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
</jbosscache>
Modified: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-01 05:45:19 UTC (rev 6134)
+++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-01 05:56:49 UTC (rev 6135)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<startup stateRetrievalTimeout="20000"/>
<transport clusterName="JBossCache-Cluster" multiplexerStack="fc-fast-minimalthreads">
Modified: core/trunk/src/main/resources/config-samples/optimistically-locked.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/optimistically-locked.xml 2008-07-01 05:45:19 UTC (rev 6134)
+++ core/trunk/src/main/resources/config-samples/optimistically-locked.xml 2008-07-01 05:56:49 UTC (rev 6135)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache>
- <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<startup fetchInMemoryState="false"/>
<eviction wakeUpInterval="1000">
15 years, 10 months
JBoss Cache SVN: r6134 - core/trunk/src/main/resources.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-01 01:45:19 -0400 (Tue, 01 Jul 2008)
New Revision: 6134
Removed:
core/trunk/src/main/resources/dependencies.xml
core/trunk/src/main/resources/jndi.properties
Log:
dropped unused files
Deleted: core/trunk/src/main/resources/dependencies.xml
===================================================================
--- core/trunk/src/main/resources/dependencies.xml 2008-07-01 05:42:22 UTC (rev 6133)
+++ core/trunk/src/main/resources/dependencies.xml 2008-07-01 05:45:19 UTC (rev 6134)
@@ -1,114 +0,0 @@
-<!--
-Describes the version(s) of the libraries JBossCache depends on
-Author: Bela Ban
-Version: $Id$
- -->
-
-<dependencies>
- <jdk>1.4</jdk>
-
- <lib name="beanshell">
- <jar>bsh-2.0b4.jar</jar>
- <version>1.3.0</version>
- <version>2.0b4</version>
- <description>Embeddable Java source interpreter. Used in distribution demo. </description>
- </lib>
-
- <lib name="commons-logging">
- <jar>commons-logging.jar</jar>
- <version>1.0.3</version>
- <description>Apache commons logging. Used in logging now.</description>
- </lib>
-
- <lib name="concurrent">
- <jar>concurrent.jar</jar>
- <version>1.3.4</version>
- <description>Doug Lea's concurrent package.</description>
- </lib>
-
- <lib name="javassist">
- <jar>javassist.jar</jar>
- <version>3.1RC2</version>
- <description>Simple Java bytecode manipulation. Used by Aop.</description>
- </lib>
-
- <lib name="qdox">
- <jar>qdox.jar</jar>
- <version>1.4</version>
- <description>Parser for annotation used in Aop.</description>
- </lib>
-
- <lib name="jboss-aop">
- <jar>jboss-aop.jar</jar>
- <version>1.3.5</version>
- <description>Standalone JBoss Aop.</description>
- </lib>
-
- <lib name="jboss-aop-15">
- <jar>jboss-aop-jdk50.jar</jar>
- <version>1.3.5</version>
- <description>Standalone JBoss Aop for JDK50.</description>
- </lib>
-
- <lib name="jboss-common">
- <jar>jboss-common.jar</jar>
- <version>4.0.3</version>
- <description>JBoss common classes</description>
- </lib>
-
- <lib name="jboss-j2ee">
- <jar>jboss-j2ee.jar</jar>
- <version>4.0.3</version>
- <description>j2ee interfaces</description>
- </lib>
-
- <lib name="jboss-jmx">
- <jar>jboss-jmx.jar</jar>
- <version>4.0.3</version>
- <description>jmx implementaiton</description>
- </lib>
-
- <lib name="jboss-minimal">
- <jar>jboss-minimal.jar</jar>
- <version>4.0.3</version>
- <description></description>
- </lib>
-
- <lib name="jboss-system">
- <jar>jboss-system.jar</jar>
- <version>4.0.3</version>
- <description></description>
- </lib>
-
- <lib name="jgroups">
- <jar>jgroups.jar</jar>
- <version>2.2.7</version>
- <version>2.2.8</version>
- <description>Reliable messaging library. Used in replication.</description>
- </lib>
-
- <lib name="junit">
- <jar>junit.jar</jar>
- <version>3.8.1</version>
- <description>Unit testing framework. Used for examples.</description>
- </lib>
-
- <lib name="sleepycat">
- <jar>sleepycat/je.jar</jar>
- <version>1.7.0</version>
- <version>2.0.54</version>
- <description>Embeded DB. Used for JE cache loader.</description>
- </lib>
-
- <lib name="trove">
- <jar>trove.jar</jar>
- <version>1.0.2</version>
- <description>High performance collections for Java. Used by Aop.</description>
- </lib>
-
-</dependencies>
-
-
-
-
-
Deleted: core/trunk/src/main/resources/jndi.properties
===================================================================
--- core/trunk/src/main/resources/jndi.properties 2008-07-01 05:42:22 UTC (rev 6133)
+++ core/trunk/src/main/resources/jndi.properties 2008-07-01 05:45:19 UTC (rev 6134)
@@ -1,5 +0,0 @@
-# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
-#
-#java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-#java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-#java.naming.provider.url=localhost:1099
\ No newline at end of file
15 years, 10 months
JBoss Cache SVN: r6133 - core/trunk/src/main/resources/config-samples.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-01 01:42:22 -0400 (Tue, 01 Jul 2008)
New Revision: 6133
Added:
core/trunk/src/main/resources/config-samples/buddy-replication.xml
core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
core/trunk/src/main/resources/config-samples/eviction-enabled.xml
core/trunk/src/main/resources/config-samples/local.xml
core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
core/trunk/src/main/resources/config-samples/optimistically-locked.xml
Removed:
core/trunk/src/main/resources/config-samples/buddy-replication-cache-service.xml
core/trunk/src/main/resources/config-samples/cacheloader-enabled-cache-service.xml
core/trunk/src/main/resources/config-samples/eviction-enabled-cache-service.xml
core/trunk/src/main/resources/config-samples/local-cache-service.xml
core/trunk/src/main/resources/config-samples/multiplexer-enabled-cache-service.xml
core/trunk/src/main/resources/config-samples/optimistically-locked-cache-service.xml
Log:
dropped service sufix from sample config files
Deleted: core/trunk/src/main/resources/config-samples/buddy-replication-cache-service.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication-cache-service.xml 2008-07-01 00:21:12 UTC (rev 6132)
+++ core/trunk/src/main/resources/config-samples/buddy-replication-cache-service.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- todo mmarkus add comments to sample config files (after DTD is written) -->
-
-<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup stateRetrievalTimeout="20000"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="true"
- enable_unicast_bundling="true" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD max_tries="5" shun="true" timeout="10000"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- use_mcast_xmit="false"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
-</jbosscache>
Copied: core/trunk/src/main/resources/config-samples/buddy-replication.xml (from rev 6132, core/trunk/src/main/resources/config-samples/buddy-replication-cache-service.xml)
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml (rev 0)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- todo mmarkus add comments to sample config files (after DTD is written) -->
+
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <startup stateRetrievalTimeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="true"
+ enable_unicast_bundling="true" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <sync replTimeout="15000"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </replication>
+</jbosscache>
Deleted: core/trunk/src/main/resources/config-samples/cacheloader-enabled-cache-service.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/cacheloader-enabled-cache-service.xml 2008-07-01 00:21:12 UTC (rev 6132)
+++ core/trunk/src/main/resources/config-samples/cacheloader-enabled-cache-service.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <eviction wakeUpInterval="5000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">3</attribute>
- </root>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">100</attribute>
- <attribute name="timeToLiveSeconds">3</attribute>
- </region>
- </eviction>
- <loaders passivation="false" shared="false">
- <preload>
- <node fqn="/"/>
- </preload>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true"
- ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=jbosscache
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=true
- cache.jdbc.table.primarykey=jbosscache_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=varchar(255)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=blob
- cache.jdbc.parent.column=parent
- cache.jdbc.driver=com.mysql.jdbc.Driver
- cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
- cache.jdbc.user=root
- cache.jdbc.password=
- cache.jdbc.sql-concat=concat(1,2)
- </properties>
- </loader>
- </loaders>
-</jbosscache>
Copied: core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml (from rev 6132, core/trunk/src/main/resources/config-samples/cacheloader-enabled-cache-service.xml)
===================================================================
--- core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml (rev 0)
+++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <eviction wakeUpInterval="5000">
+ <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
+ <root>
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">3</attribute>
+ </root>
+ <region name="/org/jboss/test/data">
+ <attribute name="maxNodes">100</attribute>
+ <attribute name="timeToLiveSeconds">3</attribute>
+ </region>
+ </eviction>
+ <loaders passivation="false" shared="false">
+ <preload>
+ <node fqn="/"/>
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=jbosscache
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=true
+ cache.jdbc.table.primarykey=jbosscache_pk
+ cache.jdbc.fqn.column=fqn
+ cache.jdbc.fqn.type=varchar(255)
+ cache.jdbc.node.column=node
+ cache.jdbc.node.type=blob
+ cache.jdbc.parent.column=parent
+ cache.jdbc.driver=com.mysql.jdbc.Driver
+ cache.jdbc.url=jdbc:mysql://localhost:3306/jbossdb
+ cache.jdbc.user=root
+ cache.jdbc.password=
+ cache.jdbc.sql-concat=concat(1,2)
+ </properties>
+ </loader>
+ </loaders>
+</jbosscache>
Deleted: core/trunk/src/main/resources/config-samples/eviction-enabled-cache-service.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/eviction-enabled-cache-service.xml 2008-07-01 00:21:12 UTC (rev 6132)
+++ core/trunk/src/main/resources/config-samples/eviction-enabled-cache-service.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <eviction wakeUpInterval="5000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
- </root>
- <region name="/org/jboss/data">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLiveSeconds">1000</attribute>
- </region>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">5</attribute>
- <attribute name="timeToLiveSeconds">4</attribute>
- </region>
- <region name="/test">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">4</attribute>
- </region>
- <region name="/maxAgeTest">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLiveSeconds">8</attribute>
- <attribute name="maxAgeSeconds">10</attribute>
- </region>
- </eviction>
-</jbosscache>
Copied: core/trunk/src/main/resources/config-samples/eviction-enabled.xml (from rev 6132, core/trunk/src/main/resources/config-samples/eviction-enabled-cache-service.xml)
===================================================================
--- core/trunk/src/main/resources/config-samples/eviction-enabled.xml (rev 0)
+++ core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <eviction wakeUpInterval="5000">
+ <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
+ <root>
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">1000</attribute>
+ </root>
+ <region name="/org/jboss/data">
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">1000</attribute>
+ </region>
+ <region name="/org/jboss/test/data">
+ <attribute name="maxNodes">5</attribute>
+ <attribute name="timeToLiveSeconds">4</attribute>
+ </region>
+ <region name="/test">
+ <attribute name="maxNodes">10000</attribute>
+ <attribute name="timeToLiveSeconds">4</attribute>
+ </region>
+ <region name="/maxAgeTest">
+ <attribute name="maxNodes">10000</attribute>
+ <attribute name="timeToLiveSeconds">8</attribute>
+ <attribute name="maxAgeSeconds">10</attribute>
+ </region>
+ </eviction>
+</jbosscache>
Deleted: core/trunk/src/main/resources/config-samples/local-cache-service.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/local-cache-service.xml 2008-07-01 00:21:12 UTC (rev 6132)
+++ core/trunk/src/main/resources/config-samples/local-cache-service.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
-</jbosscache>
Copied: core/trunk/src/main/resources/config-samples/local.xml (from rev 6132, core/trunk/src/main/resources/config-samples/local-cache-service.xml)
===================================================================
--- core/trunk/src/main/resources/config-samples/local.xml (rev 0)
+++ core/trunk/src/main/resources/config-samples/local.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+</jbosscache>
Deleted: core/trunk/src/main/resources/config-samples/multiplexer-enabled-cache-service.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/multiplexer-enabled-cache-service.xml 2008-07-01 00:21:12 UTC (rev 6132)
+++ core/trunk/src/main/resources/config-samples/multiplexer-enabled-cache-service.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache>
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup stateRetrievalTimeout="20000"/>
- <transport clusterName="JBossCache-Cluster" multiplexerStack="fc-fast-minimalthreads">
- <jgroupsConfig>
- <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
- max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true"
- enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true"
- thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
- <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
-</jbosscache>
Copied: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml (from rev 6132, core/trunk/src/main/resources/config-samples/multiplexer-enabled-cache-service.xml)
===================================================================
--- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml (rev 0)
+++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <startup stateRetrievalTimeout="20000"/>
+ <transport clusterName="JBossCache-Cluster" multiplexerStack="fc-fast-minimalthreads">
+ <jgroupsConfig>
+ <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
+ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true"
+ enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true"
+ thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <sync replTimeout="15000"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </replication>
+</jbosscache>
Deleted: core/trunk/src/main/resources/config-samples/optimistically-locked-cache-service.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/optimistically-locked-cache-service.xml 2008-07-01 00:21:12 UTC (rev 6132)
+++ core/trunk/src/main/resources/config-samples/optimistically-locked-cache-service.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache>
- <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup fetchInMemoryState="false"/>
- <eviction wakeUpInterval="1000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy"/>
- <root>
- <attribute name="maxNodes">10</attribute>
- <attribute name="timeToLiveSeconds">0</attribute>
- <attribute name="maxAgeSeconds">0</attribute>
- </root>
- <region name="/testingRegion">
- <attribute name="maxNodes">10</attribute>
- <attribute name="timeToLiveSeconds">0</attribute>
- <attribute name="maxAgeSeconds">0</attribute>
- </region>
- <region name="/timeBased">
- <attribute name="maxNodes">10</attribute>
- <attribute name="timeToLiveSeconds">1</attribute>
- <attribute name="maxAgeSeconds">1</attribute>
- </region>
- </eviction>
-</jbosscache>
Copied: core/trunk/src/main/resources/config-samples/optimistically-locked.xml (from rev 6132, core/trunk/src/main/resources/config-samples/optimistically-locked-cache-service.xml)
===================================================================
--- core/trunk/src/main/resources/config-samples/optimistically-locked.xml (rev 0)
+++ core/trunk/src/main/resources/config-samples/optimistically-locked.xml 2008-07-01 05:42:22 UTC (rev 6133)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <startup fetchInMemoryState="false"/>
+ <eviction wakeUpInterval="1000">
+ <defaults policyClass="org.jboss.cache.eviction.LRUPolicy"/>
+ <root>
+ <attribute name="maxNodes">10</attribute>
+ <attribute name="timeToLiveSeconds">0</attribute>
+ <attribute name="maxAgeSeconds">0</attribute>
+ </root>
+ <region name="/testingRegion">
+ <attribute name="maxNodes">10</attribute>
+ <attribute name="timeToLiveSeconds">0</attribute>
+ <attribute name="maxAgeSeconds">0</attribute>
+ </region>
+ <region name="/timeBased">
+ <attribute name="maxNodes">10</attribute>
+ <attribute name="timeToLiveSeconds">1</attribute>
+ <attribute name="maxAgeSeconds">1</attribute>
+ </region>
+ </eviction>
+</jbosscache>
15 years, 10 months
JBoss Cache SVN: r6132 - in core/trunk/src: test/java/org/jboss/cache/buddyreplication and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-06-30 20:21:12 -0400 (Mon, 30 Jun 2008)
New Revision: 6132
Modified:
core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java
Log:
Ported Brian's 2.2.X patch to trunk
Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-06-30 19:22:09 UTC (rev 6131)
+++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-07-01 00:21:12 UTC (rev 6132)
@@ -1,11 +1,11 @@
package org.jboss.cache.buddyreplication;
+import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
-import org.jboss.cache.CacheException;
import org.jgroups.Address;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* Knows how to transform between fqn and buddy-formated fqns.
@@ -145,7 +145,7 @@
*/
public Fqn getBackupRootFromFqn(Fqn fqn)
{
- if (isBackupFqn(fqn))
+ if (isBackupFqn(fqn) && fqn.size() > 1)
{
return fqn.getSubFqn(0, isDeadBackupFqn(fqn) ? 3 : 2);
}
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java 2008-06-30 19:22:09 UTC (rev 6131)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyFqnTransformerTest.java 2008-07-01 00:21:12 UTC (rev 6132)
@@ -34,4 +34,9 @@
{
assert Fqn.ROOT == buddyFqnTransformer.getActualFqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
}
+
+ public void testBackupRootFromFqnOnBuddyBackupRoot()
+ {
+ assert Fqn.ROOT == buddyFqnTransformer.getBackupRootFromFqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
+ }
}
15 years, 10 months
