JBoss Cache SVN: r6351 - benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-21 15:40:17 -0400 (Mon, 21 Jul 2008)
New Revision: 6351
Modified:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java
Log:
added sleep statement as the cache replication is async
Modified: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java 2008-07-21 19:23:00 UTC (rev 6350)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java 2008-07-21 19:40:17 UTC (rev 6351)
@@ -65,6 +65,11 @@
public Object getReplicatedData(List<String> path, String key) throws Exception
{
+ if (!cache.getConfiguration().getCacheMode().isSynchronous())
+ {
+ log.info("Sleeping 5 seconds because the cache is replicated asynchronious!");
+ Thread.sleep(5000);
+ }
Option option = cache.getInvocationContext().getOptionOverrides();
option.setForceDataGravitation(true);
return cache.get(Fqn.fromList((List) path, true), key);
15 years, 10 months
JBoss Cache SVN: r6350 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-21 15:23:00 -0400 (Mon, 21 Jul 2008)
New Revision: 6350
Modified:
benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java
Log:
added new barrier
Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java
===================================================================
--- benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java 2008-07-21 13:04:46 UTC (rev 6349)
+++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/tests/ReplicationOccursTest.java 2008-07-21 19:23:00 UTC (rev 6350)
@@ -37,10 +37,12 @@
public StatisticTestResult doTest(String testName, CacheWrapper cache, String testCaseName, int sampleSize, int numThreads) throws Exception
{
log.trace("TestCase = '" + testCaseName + "', TestName = " + testName);
- barrierBeforeReplicationTest();
+ barrier("BEFORE_REPLICATION_OCCURS_BARRIER");
Integer currentNodeIndex = conf.getClusterConfig().getCurrentNodeIndex();
tryToPut(cache, currentNodeIndex);
+
+ barrier("AFTER_ADDING_LOCAL_ELEMENTS_BARRIER");
Thread.sleep(REPLICATION_TRY_SLEEP);//just to make sure that prev barrier closed its sockets etc
if (conf.getClusterConfig().getClusterSize() == 1)
@@ -82,6 +84,7 @@
tryCount++;
}
}
+ throw new Exception("Couldn't accomplish additiona before replication!");
}
/**
@@ -114,13 +117,12 @@
return receivedValues;
}
- private void barrierBeforeReplicationTest()
- throws Exception
+ private void barrier(String res) throws Exception
{
ClusterBarrier barrier = new ClusterBarrier();
barrier.setAcknowledge(true);
barrier.setConfig(conf.getClusterConfig());
- barrier.barrier("BEFORE_REPLICATION_OCCURS_BARRIER");
+ barrier.barrier(res);
}
private StatisticTestResult allReplicatedFine(Map<SocketAddress, Object> receivedValues)
@@ -216,7 +218,7 @@
//this means SOME replication occurred. This does not mean, though, that all nodes replicated successfuly.
//correct condition would be >= this.conf.getClusterConfig().getClusterSize()
//todo/FIXME - this seem not to work with all the products, so we will accept 'some replication'
- if (totalValue < this.conf.getClusterConfig().getClusterSize())
+ if (totalValue < this.conf.getClusterConfig().getClusterSize() && totalValue != 0)
{
log.warn("The replication was not total, but partial!!");
}
15 years, 10 months
JBoss Cache SVN: r6349 - in core/trunk/src/main/java/org/jboss/cache: config and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-21 09:04:46 -0400 (Mon, 21 Jul 2008)
New Revision: 6349
Modified:
core/trunk/src/main/java/org/jboss/cache/Modification.java
core/trunk/src/main/java/org/jboss/cache/Region.java
core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java
core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java
Log:
enums made static where possible
Modified: core/trunk/src/main/java/org/jboss/cache/Modification.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Modification.java 2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/Modification.java 2008-07-21 13:04:46 UTC (rev 6349)
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 7463314130283897197L;
- public enum ModificationType
+ public static enum ModificationType
{
PUT_KEY_VALUE,
PUT_DATA,
Modified: core/trunk/src/main/java/org/jboss/cache/Region.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Region.java 2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/Region.java 2008-07-21 13:04:46 UTC (rev 6349)
@@ -37,7 +37,7 @@
/**
* Types of regions.
*/
- enum Type
+ static enum Type
{
EVICTION, MARSHALLING, ANY
}
@@ -45,7 +45,7 @@
/**
* Region status
*/
- enum Status
+ static enum Status
{
ACTIVATING, ACTIVE, INACTIVATING, INACTIVE
}
Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-07-21 13:04:46 UTC (rev 6349)
@@ -36,7 +36,7 @@
/**
* Behavior of the JVM shutdown hook registered by the cache
*/
- public enum ShutdownHookBehavior
+ public static enum ShutdownHookBehavior
{
/**
* By default a shutdown hook is registered if no MBean server (apart from the JDK default) is detected.
@@ -55,7 +55,7 @@
/**
* Cache replication mode.
*/
- public enum CacheMode
+ public static enum CacheMode
{
/**
* Data is not replicated.
@@ -120,7 +120,7 @@
/**
* Cache node locking scheme.
*/
- public enum NodeLockingScheme
+ public static enum NodeLockingScheme
{
/**
* Data is locked using the MVCC locking scheme. This is the default locking scheme in JBoss Cache 3.0.0.
@@ -146,7 +146,6 @@
*/
public boolean isVersionedScheme()
{
-// return this == MVCC || this == OPTIMISTIC;
return this == OPTIMISTIC;
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java 2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/Event.java 2008-07-21 13:04:46 UTC (rev 6349)
@@ -10,7 +10,7 @@
*/
public interface Event
{
- enum Type
+ static enum Type
{
CACHE_STARTED, CACHE_STOPPED, CACHE_BLOCKED, CACHE_UNBLOCKED, NODE_ACTIVATED, NODE_PASSIVATED,
NODE_LOADED, NODE_EVICTED, NODE_CREATED, NODE_REMOVED, NODE_MODIFIED, NODE_MOVED, NODE_VISITED,
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java 2008-07-21 13:03:16 UTC (rev 6348)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java 2008-07-21 13:04:46 UTC (rev 6349)
@@ -13,7 +13,7 @@
/**
* Different cache modification types.
*/
- enum ModificationType
+ static enum ModificationType
{
PUT_DATA, REMOVE_DATA, PUT_MAP
}
15 years, 10 months
JBoss Cache SVN: r6348 - in core/trunk/src/main/java/org/jboss/cache: mvcc and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-21 09:03:16 -0400 (Mon, 21 Jul 2008)
New Revision: 6348
Modified:
core/trunk/src/main/java/org/jboss/cache/AbstractNode.java
core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
Log:
fixed bug in unsetting flags
Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-07-21 13:02:58 UTC (rev 6347)
+++ core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-07-21 13:03:16 UTC (rev 6348)
@@ -125,7 +125,7 @@
*/
protected final void unsetFlag(NodeFlags flag)
{
- flags ^= flag.mask;
+ flags &= ~flag.mask;
}
public boolean isDeleted()
Modified: core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-07-21 13:02:58 UTC (rev 6347)
+++ core/trunk/src/main/java/org/jboss/cache/mvcc/ReadCommittedNode.java 2008-07-21 13:03:16 UTC (rev 6348)
@@ -70,7 +70,7 @@
*/
protected final void unsetFlag(Flags flag)
{
- flags ^= flag.mask;
+ flags &= ~flag.mask;
}
public boolean isNullNode()
15 years, 10 months
JBoss Cache SVN: r6347 - core/trunk/src/main/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-21 09:02:58 -0400 (Mon, 21 Jul 2008)
New Revision: 6347
Modified:
core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
Log:
null chk
Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-21 12:14:17 UTC (rev 6346)
+++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-07-21 13:02:58 UTC (rev 6347)
@@ -501,8 +501,11 @@
public void putAllDirect(Map<K, V> data)
{
- if (this.data == null) initDataMap();
- this.data.putAll(data);
+ if (data != null)
+ {
+ if (this.data == null) initDataMap();
+ this.data.putAll(data);
+ }
}
public void removeChildrenDirect()
15 years, 10 months
JBoss Cache SVN: r6346 - in core/branches/2.2.X/src/main/java/org/jboss/cache: config and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-21 08:14:17 -0400 (Mon, 21 Jul 2008)
New Revision: 6346
Modified:
core/branches/2.2.X/src/main/java/org/jboss/cache/Modification.java
core/branches/2.2.X/src/main/java/org/jboss/cache/NodeFactory.java
core/branches/2.2.X/src/main/java/org/jboss/cache/Region.java
core/branches/2.2.X/src/main/java/org/jboss/cache/config/Configuration.java
core/branches/2.2.X/src/main/java/org/jboss/cache/notifications/event/Event.java
core/branches/2.2.X/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java
Log:
Made enums static
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/Modification.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/Modification.java 2008-07-21 12:13:54 UTC (rev 6345)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/Modification.java 2008-07-21 12:14:17 UTC (rev 6346)
@@ -30,7 +30,7 @@
private static final long serialVersionUID = 7463314130283897197L;
- public enum ModificationType
+ public static enum ModificationType
{
PUT_KEY_VALUE,
PUT_DATA,
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/NodeFactory.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/NodeFactory.java 2008-07-21 12:13:54 UTC (rev 6345)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/NodeFactory.java 2008-07-21 12:14:17 UTC (rev 6346)
@@ -42,7 +42,7 @@
throw new UnsupportedOperationException("Should never be called!");
}
- public enum NodeType
+ public static enum NodeType
{
UNVERSIONED_NODE, VERSIONED_NODE, WORKSPACE_NODE
}
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/Region.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/Region.java 2008-07-21 12:13:54 UTC (rev 6345)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/Region.java 2008-07-21 12:14:17 UTC (rev 6346)
@@ -37,7 +37,7 @@
/**
* Types of regions.
*/
- enum Type
+ static enum Type
{
EVICTION, MARSHALLING, ANY
}
@@ -45,7 +45,7 @@
/**
* Region status
*/
- enum Status
+ static enum Status
{
ACTIVATING, ACTIVE, INACTIVATING, INACTIVE
}
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/config/Configuration.java 2008-07-21 12:13:54 UTC (rev 6345)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/config/Configuration.java 2008-07-21 12:14:17 UTC (rev 6346)
@@ -42,7 +42,7 @@
/**
* Behavior of the JVM shutdown hook registered by the cache
*/
- public enum ShutdownHookBehavior
+ public static enum ShutdownHookBehavior
{
/**
* By default a shutdown hook is registered if no MBean server (apart from the JDK default) is detected.
@@ -61,7 +61,7 @@
/**
* Cache replication mode.
*/
- public enum CacheMode
+ public static enum CacheMode
{
/**
* Data is not replicated.
@@ -126,7 +126,7 @@
/**
* Cache node locking scheme.
*/
- public enum NodeLockingScheme
+ public static enum NodeLockingScheme
{
/**
* Data is exclusively locked during modification.
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/notifications/event/Event.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/notifications/event/Event.java 2008-07-21 12:13:54 UTC (rev 6345)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/notifications/event/Event.java 2008-07-21 12:14:17 UTC (rev 6346)
@@ -10,7 +10,7 @@
*/
public interface Event
{
- enum Type
+ static enum Type
{
CACHE_STARTED, CACHE_STOPPED, CACHE_BLOCKED, CACHE_UNBLOCKED, NODE_ACTIVATED, NODE_PASSIVATED,
NODE_LOADED, NODE_EVICTED, NODE_CREATED, NODE_REMOVED, NODE_MODIFIED, NODE_MOVED, NODE_VISITED,
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java 2008-07-21 12:13:54 UTC (rev 6345)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/notifications/event/NodeModifiedEvent.java 2008-07-21 12:14:17 UTC (rev 6346)
@@ -13,7 +13,7 @@
/**
* Different cache modification types.
*/
- enum ModificationType
+ static enum ModificationType
{
PUT_DATA, REMOVE_DATA, PUT_MAP
}
15 years, 10 months
JBoss Cache SVN: r6345 - core/branches/2.2.X/src/main/java/org/jboss/cache.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-07-21 08:13:54 -0400 (Mon, 21 Jul 2008)
New Revision: 6345
Modified:
core/branches/2.2.X/src/main/java/org/jboss/cache/AbstractNode.java
Log:
Fixed bug
Modified: core/branches/2.2.X/src/main/java/org/jboss/cache/AbstractNode.java
===================================================================
--- core/branches/2.2.X/src/main/java/org/jboss/cache/AbstractNode.java 2008-07-21 10:58:40 UTC (rev 6344)
+++ core/branches/2.2.X/src/main/java/org/jboss/cache/AbstractNode.java 2008-07-21 12:13:54 UTC (rev 6345)
@@ -125,7 +125,7 @@
*/
protected final void unsetFlag(NodeFlags flag)
{
- flags ^= flag.mask;
+ flags &= ~flag.mask;
}
public boolean isDeleted()
15 years, 10 months
JBoss Cache SVN: r6344 - in core/trunk/src: main/resources/config-samples and 1 other directories.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-21 06:58:40 -0400 (Mon, 21 Jul 2008)
New Revision: 6344
Added:
core/trunk/src/main/resources/jbosscache-config-3.0.xsd
Removed:
core/trunk/src/main/resources/jbosscache-config-3.0ALPHA1.xsd
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/invalidation-async.xml
core/trunk/src/main/resources/config-samples/local.xml
core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
core/trunk/src/test/resources/configs/buddy-replication-cache.xml
core/trunk/src/test/resources/configs/clonable-config.xml
core/trunk/src/test/resources/configs/local-lru-eviction.xml
core/trunk/src/test/resources/configs/local-passivation.xml
core/trunk/src/test/resources/configs/local-tx.xml
core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
core/trunk/src/test/resources/configs/mux.xml
core/trunk/src/test/resources/configs/parser-test.xml
core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
core/trunk/src/test/resources/configs/replSync.xml
core/trunk/src/test/resources/configs/string-property-replaced.xml
Log:
droped the ALPHA from xml tails
Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/eviction-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/invalidation-async.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/invalidation-async.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/main/resources/config-samples/invalidation-async.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/local.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/local.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/main/resources/config-samples/local.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<!-- By not specifying neither an 'replication' nor an 'invalidation' element, the cache is defaulted to local -->
Modified: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Added: core/trunk/src/main/resources/jbosscache-config-3.0.xsd
===================================================================
--- core/trunk/src/main/resources/jbosscache-config-3.0.xsd (rev 0)
+++ core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-07-21 10:58:40 UTC (rev 6344)
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="jbosscache">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="locking" type="lockingType" minOccurs="0"/>
+ <xs:element name="transaction" type="transactionType" minOccurs="0"/>
+ <xs:element name="startup" type="startupType" minOccurs="0"/>
+ <xs:element name="stateRetrieval" type="stateRetrievalType" minOccurs="0"/>
+ <xs:element name="shutdown" type="shutdownType" minOccurs="0"/>
+ <xs:element name="serialization" type="serializationType" minOccurs="0"/>
+ <xs:element name="replication" type="replicationType" minOccurs="0"/>
+ <xs:element name="invalidation" type="invalidationType" minOccurs="0"/>
+ <xs:element name="jmxStatistics" type="jmxStatisticsType" minOccurs="0"/>
+ <xs:element name="transport" type="transportType" minOccurs="0"/>
+ <xs:element name="eviction" type="evictionType" minOccurs="0"/>
+ <xs:element name="loaders" type="loadersType" minOccurs="0"/>
+ <xs:element name="customInterceptors" type="customInterceptorsType" minOccurs="0"/>
+ </xs:all>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="lockingType">
+ <xs:attribute name="isolationLevel">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="SERIALIZABLE|REPEATABLE_READ|READ_COMMITTED|NONE|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="lockParentForChildInsertRemove" type="booleanType"/>
+ <xs:attribute name="lockAcquisitionTimeout" type="positiveInteger"/>
+ <xs:attribute name="nodeLockingScheme">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="mvcc|optimistic|pessimistic|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="writeSkewCheck" type="booleanType"/>
+ <xs:attribute name="concurrencyLevel" type="xs:integer"/>
+ </xs:complexType>
+
+ <xs:complexType name="transactionType">
+ <xs:attribute name="transactionManagerLookupClass" type="xs:string"/>
+ <xs:attribute name="syncRollbackPhase" type="booleanType"/>
+ <xs:attribute name="syncCommitPhase" type="booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="startupType">
+ <xs:attribute name="regionsInactiveOnStartup" type="booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="stateRetrievalType">
+ <xs:attribute name="fetchInMemoryState" type="booleanType"/>
+ <xs:attribute name="timeout" type="positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="shutdownType">
+ <xs:attribute name="hookBehavior">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="DEFAULT|REGISTER|DONT_REGISTER|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="serializationType">
+ <xs:attribute name="objectInputStreamPoolSize" type="positiveInteger"/>
+ <xs:attribute name="objectOutputStreamPoolSize" type="positiveInteger"/>
+ <xs:attribute name="version" type="xs:string"/>
+ <xs:attribute name="marshallerClass" type="xs:string"/>
+ <xs:attribute name="useLazyDeserialization" type="booleanType"/>
+ <xs:attribute name="useRegionBasedMarshalling" type="booleanType"/>
+ </xs:complexType>
+
+ <xs:simpleType name="booleanType">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="\$\{.*\}|true|false"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="positiveInteger">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="\$\{.*\}|\+?[0-9]*"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="replicationType">
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="sync" type="syncType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="async" type="asyncType" minOccurs="0" maxOccurs="1"/>
+ </xs:choice>
+ <xs:element name="buddy" minOccurs="0">
+ <xs:complexType>
+ <xs:all minOccurs="0">
+ <xs:element name="dataGravitation">
+ <xs:complexType>
+ <xs:attribute name="auto" type="booleanType"/>
+ <xs:attribute name="removeOnFind" type="booleanType"/>
+ <xs:attribute name="searchBackupTrees" type="booleanType"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="locator">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="properties" type="xs:string" maxOccurs="1"/>
+ </xs:all>
+ <xs:attribute name="class" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:all>
+ <xs:attribute name="enabled" type="booleanType"/>
+ <xs:attribute name="poolName" type="xs:string"/>
+ <xs:attribute name="communicationTimeout" type="xs:integer"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="invalidationType">
+ <xs:choice>
+ <xs:element name="sync" type="syncType"/>
+ <xs:element name="async" type="asyncType"/>
+ </xs:choice>
+ </xs:complexType>
+
+ <xs:complexType name="jmxStatisticsType">
+ <xs:attribute name="enabled" type="booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="transportType">
+ <xs:sequence>
+ <xs:element name="jgroupsConfig" type="xs:anyType" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ <xs:attribute name="clusterName" type="xs:string"/>
+ <xs:attribute name="multiplexerStack" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="syncType">
+ <xs:attribute name="replTimeout" type="positiveInteger"/>
+ </xs:complexType>
+
+
+ <xs:complexType name="asyncType">
+ <xs:attribute name="useReplQueue" type="booleanType"/>
+ <xs:attribute name="replQueueInterval" type="positiveInteger"/>
+ <xs:attribute name="replQueueMaxElements" type="positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="evictionType">
+ <xs:sequence>
+ <xs:element name="default" type="evictionRegionType" minOccurs="0"/>
+ <xs:element name="region" minOccurs="0" maxOccurs="unbounded" type="evictionRegionType"/>
+ </xs:sequence>
+ <xs:attribute name="wakeUpInterval" type="positiveInteger" use="required"/>
+ <xs:attribute name="defaultPolicyClass" type="xs:string"/>
+ <xs:attribute name="defaultEventQueueSize" type="positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="evictionRegionType">
+ <xs:sequence>
+ <xs:element name="attribute" maxOccurs="unbounded" type="attributeType"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="policyClass" type="xs:string"/>
+ <xs:attribute name="eventQueueSize" type="positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="loadersType">
+ <xs:sequence>
+ <xs:element name="preload" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="node" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="fqn" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="loader" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="properties"/>
+ <xs:element name="singletonStore" minOccurs="0">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="properties" type="xs:string"/>
+ </xs:all>
+ <xs:attribute name="enabled" type="booleanType"/>
+ <xs:attribute name="class" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:all>
+ <xs:attribute name="class" type="xs:string"/>
+ <xs:attribute name="async" type="booleanType"/>
+ <xs:attribute name="fetchPersistentState" type="booleanType"/>
+ <xs:attribute name="ignoreModifications" type="booleanType"/>
+ <xs:attribute name="purgeOnStartup" type="booleanType"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="passivation" type="booleanType"/>
+ <xs:attribute name="shared" type="booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="customInterceptorsType">
+ <xs:sequence>
+ <xs:element name="interceptor" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="attribute" maxOccurs="unbounded" type="attributeType" minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="class" type="xs:string"/>
+ <xs:attribute name="position">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="first"/>
+ <xs:enumeration value="last"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="before" type="xs:string"/>
+ <xs:attribute name="after" type="xs:string"/>
+ <xs:attribute name="index" type="positiveInteger"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="attributeType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+</xs:schema>
+
Deleted: core/trunk/src/main/resources/jbosscache-config-3.0ALPHA1.xsd
===================================================================
--- core/trunk/src/main/resources/jbosscache-config-3.0ALPHA1.xsd 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/main/resources/jbosscache-config-3.0ALPHA1.xsd 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="jbosscache">
- <xs:complexType>
- <xs:all>
- <xs:element name="locking" type="lockingType" minOccurs="0"/>
- <xs:element name="transaction" type="transactionType" minOccurs="0"/>
- <xs:element name="startup" type="startupType" minOccurs="0"/>
- <xs:element name="stateRetrieval" type="stateRetrievalType" minOccurs="0"/>
- <xs:element name="shutdown" type="shutdownType" minOccurs="0"/>
- <xs:element name="serialization" type="serializationType" minOccurs="0"/>
- <xs:element name="replication" type="replicationType" minOccurs="0"/>
- <xs:element name="invalidation" type="invalidationType" minOccurs="0"/>
- <xs:element name="jmxStatistics" type="jmxStatisticsType" minOccurs="0"/>
- <xs:element name="transport" type="transportType" minOccurs="0"/>
- <xs:element name="eviction" type="evictionType" minOccurs="0"/>
- <xs:element name="loaders" type="loadersType" minOccurs="0"/>
- <xs:element name="customInterceptors" type="customInterceptorsType" minOccurs="0"/>
- </xs:all>
- </xs:complexType>
- </xs:element>
-
- <xs:complexType name="lockingType">
- <xs:attribute name="isolationLevel">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="SERIALIZABLE|REPEATABLE_READ|READ_COMMITTED|NONE|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="lockParentForChildInsertRemove" type="booleanType"/>
- <xs:attribute name="lockAcquisitionTimeout" type="positiveInteger"/>
- <xs:attribute name="nodeLockingScheme">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="mvcc|optimistic|pessimistic|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="writeSkewCheck" type="booleanType"/>
- <xs:attribute name="concurrencyLevel" type="xs:integer"/>
- </xs:complexType>
-
- <xs:complexType name="transactionType">
- <xs:attribute name="transactionManagerLookupClass" type="xs:string"/>
- <xs:attribute name="syncRollbackPhase" type="booleanType"/>
- <xs:attribute name="syncCommitPhase" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="startupType">
- <xs:attribute name="regionsInactiveOnStartup" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="stateRetrievalType">
- <xs:attribute name="fetchInMemoryState" type="booleanType"/>
- <xs:attribute name="timeout" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="shutdownType">
- <xs:attribute name="hookBehavior">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="DEFAULT|REGISTER|DONT_REGISTER|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
-
- <xs:complexType name="serializationType">
- <xs:attribute name="objectInputStreamPoolSize" type="positiveInteger"/>
- <xs:attribute name="objectOutputStreamPoolSize" type="positiveInteger"/>
- <xs:attribute name="version" type="xs:string"/>
- <xs:attribute name="marshallerClass" type="xs:string"/>
- <xs:attribute name="useLazyDeserialization" type="booleanType"/>
- <xs:attribute name="useRegionBasedMarshalling" type="booleanType"/>
- </xs:complexType>
-
- <xs:simpleType name="booleanType">
- <xs:restriction base="xs:string">
- <xs:pattern value="\$\{.*\}|true|false"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="positiveInteger">
- <xs:restriction base="xs:string">
- <xs:pattern value="\$\{.*\}|\+?[0-9]*"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="replicationType">
- <xs:sequence>
- <xs:choice>
- <xs:element name="sync" type="syncType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="async" type="asyncType" minOccurs="0" maxOccurs="1"/>
- </xs:choice>
- <xs:element name="buddy" minOccurs="0">
- <xs:complexType>
- <xs:all minOccurs="0">
- <xs:element name="dataGravitation">
- <xs:complexType>
- <xs:attribute name="auto" type="booleanType"/>
- <xs:attribute name="removeOnFind" type="booleanType"/>
- <xs:attribute name="searchBackupTrees" type="booleanType"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="locator">
- <xs:complexType>
- <xs:all>
- <xs:element name="properties" type="xs:string" maxOccurs="1"/>
- </xs:all>
- <xs:attribute name="class" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:all>
- <xs:attribute name="enabled" type="booleanType"/>
- <xs:attribute name="poolName" type="xs:string"/>
- <xs:attribute name="communicationTimeout" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="invalidationType">
- <xs:choice>
- <xs:element name="sync" type="syncType"/>
- <xs:element name="async" type="asyncType"/>
- </xs:choice>
- </xs:complexType>
-
- <xs:complexType name="jmxStatisticsType">
- <xs:attribute name="enabled" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="transportType">
- <xs:sequence>
- <xs:element name="jgroupsConfig" type="xs:anyType" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- <xs:attribute name="clusterName" type="xs:string"/>
- <xs:attribute name="multiplexerStack" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="syncType">
- <xs:attribute name="replTimeout" type="positiveInteger"/>
- </xs:complexType>
-
-
- <xs:complexType name="asyncType">
- <xs:attribute name="useReplQueue" type="booleanType"/>
- <xs:attribute name="replQueueInterval" type="positiveInteger"/>
- <xs:attribute name="replQueueMaxElements" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="evictionType">
- <xs:sequence>
- <xs:element name="default" type="evictionRegionType" minOccurs="0"/>
- <xs:element name="region" minOccurs="0" maxOccurs="unbounded" type="evictionRegionType"/>
- </xs:sequence>
- <xs:attribute name="wakeUpInterval" type="positiveInteger" use="required"/>
- <xs:attribute name="defaultPolicyClass" type="xs:string"/>
- <xs:attribute name="defaultEventQueueSize" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="evictionRegionType">
- <xs:sequence>
- <xs:element name="attribute" maxOccurs="unbounded" type="attributeType"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="policyClass" type="xs:string"/>
- <xs:attribute name="eventQueueSize" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="loadersType">
- <xs:sequence>
- <xs:element name="preload" maxOccurs="1">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="node" maxOccurs="unbounded">
- <xs:complexType>
- <xs:attribute name="fqn" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="loader" maxOccurs="unbounded">
- <xs:complexType>
- <xs:all>
- <xs:element name="properties"/>
- <xs:element name="singletonStore" minOccurs="0">
- <xs:complexType>
- <xs:all>
- <xs:element name="properties" type="xs:string"/>
- </xs:all>
- <xs:attribute name="enabled" type="booleanType"/>
- <xs:attribute name="class" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:all>
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="async" type="booleanType"/>
- <xs:attribute name="fetchPersistentState" type="booleanType"/>
- <xs:attribute name="ignoreModifications" type="booleanType"/>
- <xs:attribute name="purgeOnStartup" type="booleanType"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="passivation" type="booleanType"/>
- <xs:attribute name="shared" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="customInterceptorsType">
- <xs:sequence>
- <xs:element name="interceptor" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="attribute" maxOccurs="unbounded" type="attributeType" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="position">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="first"/>
- <xs:enumeration value="last"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="before" type="xs:string"/>
- <xs:attribute name="after" type="xs:string"/>
- <xs:attribute name="index" type="positiveInteger"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="attributeType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-</xs:schema>
-
Modified: core/trunk/src/test/resources/configs/buddy-replication-cache.xml
===================================================================
--- core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
Modified: core/trunk/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval fetchInMemoryState="false" timeout="3"/>
Modified: core/trunk/src/test/resources/configs/local-lru-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/local-passivation.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-passivation.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/local-passivation.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/local-tx.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-tx.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/local-tx.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/mux.xml
===================================================================
--- core/trunk/src/test/resources/configs/mux.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/mux.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/parser-test.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/parser-test.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -3,7 +3,7 @@
<!-- file used for functional test of the xml parser -->
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
Modified: core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
Modified: core/trunk/src/test/resources/configs/replSync.xml
===================================================================
--- core/trunk/src/test/resources/configs/replSync.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/replSync.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<serialization useRegionBasedMarshalling="true"/>
Modified: core/trunk/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-07-21 10:15:19 UTC (rev 6343)
+++ core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-07-21 10:58:40 UTC (rev 6344)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0ALPHA1.xsd">
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"
nodeLockingScheme="${test.property.NodeLockingScheme:OPTIMISTIC}"/>
<transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/>
15 years, 10 months
JBoss Cache SVN: r6343 - benchmarks/benchmark-fwk/trunk.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-07-21 06:15:19 -0400 (Mon, 21 Jul 2008)
New Revision: 6343
Modified:
benchmarks/benchmark-fwk/trunk/killNode.sh
Log:
fixed the killnode.sh
Modified: benchmarks/benchmark-fwk/trunk/killNode.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/killNode.sh 2008-07-18 18:02:19 UTC (rev 6342)
+++ benchmarks/benchmark-fwk/trunk/killNode.sh 2008-07-21 10:15:19 UTC (rev 6343)
@@ -6,7 +6,7 @@
#
##################################################################################
-ps -elf | grep cacheBenchFwk.cacheWrapperClassName | grep -v grep | cut -d \ -f 5 | xargs kill -9
-ps -elf | grep allJBossCacheTests.sh | grep -v grep | cut -d \ -f 5 | xargs kill -9
-ps -elf | grep /runNode.sh | grep -v grep | cut -d \ -f 5 | xargs kill -9
+ps -elf | grep cacheBenchFwk.cacheWrapperClassName | grep -v grep | cut -c 14-20 | xargs -r kill -9
+ps -elf | grep allJBossCacheTests.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9
+ps -elf | grep /runNode.sh | grep -v grep | cut -c 14-20 | xargs -r kill -9
exit 0
\ No newline at end of file
15 years, 10 months
