Author: manik.surtani(a)jboss.com
Date: 2009-02-18 11:06:10 -0500 (Wed, 18 Feb 2009)
New Revision: 7723
Added:
core/trunk/src/main/resources/config-samples/non-blocking-state-transfer.xml
core/trunk/src/main/resources/schema/jbosscache-config-3.1.xsd
core/trunk/src/main/resources/schema/jbosscache-registry-3.1.xsd
Removed:
core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd
core/trunk/src/main/resources/schema/jbosscache-registry-3.0.xsd
Modified:
core/trunk/src/main/docbook/userguide/en/modules/configuration.xml
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/RootElementBuilder.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
core/trunk/src/main/resources/config-samples/all.xml
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/external-jgroups-file.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/main/resources/config-samples/string-property-replaced.xml
core/trunk/src/main/resources/config-samples/total-replication.xml
core/trunk/src/main/resources/config2to3.xslt
core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java
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/mvcc-repl-sync-br.xml
core/trunk/src/test/resources/configs/parser-test-async.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
core/trunk/src/test/resources/jbc3-registry-configs.xml
core/trunk/src/test/resources/unit-test-cache-service.xml
Log:
1. Added XML element for non-blocking state transfer
2. Updated XML parser
3. Updated schema from version 3.0 to version 3.1
Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/configuration.xml 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/main/docbook/userguide/en/modules/configuration.xml 2009-02-18 16:06:10
UTC (rev 7723)
@@ -51,7 +51,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
</jbosscache>
Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
===================================================================
---
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2009-02-18
12:05:26 UTC (rev 7722)
+++
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2009-02-18
16:06:10 UTC (rev 7723)
@@ -10,7 +10,7 @@
<programlisting role="XML"><![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!--
@@ -334,8 +334,8 @@
<row>
<entry><emphasis
role="bold">xmlns</emphasis></entry>
<entry> - </entry>
- <entry>urn:jboss:jbosscache-core:config:3.0</entry>
- <entry>urn:jboss:jbosscache-core:config:3.0</entry>
+ <entry>urn:jboss:jbosscache-core:config:3.1</entry>
+ <entry>urn:jboss:jbosscache-core:config:3.1</entry>
<entry>Defines the XML namespace for all configuration
entries.</entry>
</row>
<row>
Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2009-02-18 16:06:10
UTC (rev 7723)
@@ -1149,6 +1149,7 @@
public void setNonBlockingStateTransfer(boolean nonBlockingStateTransfer)
{
+ testImmutability("nonBlockingStateTransfer");
this.nonBlockingStateTransfer = nonBlockingStateTransfer;
}
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/RootElementBuilder.java
===================================================================
---
core/trunk/src/main/java/org/jboss/cache/config/parsing/RootElementBuilder.java 2009-02-18
12:05:26 UTC (rev 7722)
+++
core/trunk/src/main/java/org/jboss/cache/config/parsing/RootElementBuilder.java 2009-02-18
16:06:10 UTC (rev 7723)
@@ -47,14 +47,14 @@
private static final JBossEntityResolver resolver = new JBossEntityResolver();
- public static final String JBOSSCACHE_CORE_NS =
"urn:jboss:jbosscache-core:config:3.0";
- public static final String JBOSSCACHE_REPO_NS =
"urn:jboss:jbosscache-core:cache-repo:3.0";
+ public static final String JBOSSCACHE_CORE_NS =
"urn:jboss:jbosscache-core:config:3.1";
+ public static final String JBOSSCACHE_REPO_NS =
"urn:jboss:jbosscache-core:cache-repo:3.1";
static
{
// Globally register this namespace
- JBossEntityResolver.registerEntity(JBOSSCACHE_CORE_NS,
"jbosscache-config-3.0.xsd");
- JBossEntityResolver.registerEntity(JBOSSCACHE_REPO_NS,
"jbosscache-registry-3.0.xsd");
+ JBossEntityResolver.registerEntity(JBOSSCACHE_CORE_NS,
"jbosscache-config-3.1.xsd");
+ JBossEntityResolver.registerEntity(JBOSSCACHE_REPO_NS,
"jbosscache-registry-3.1.xsd");
}
private static final Log log = LogFactory.getLog(RootElementBuilder.class);
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 2009-02-18
12:05:26 UTC (rev 7722)
+++
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2009-02-18
16:06:10 UTC (rev 7723)
@@ -206,11 +206,12 @@
private void configureStateRetrieval(Element element)
{
if (element == null) return; //we might not have this configured
- String fetchInMemoryState = getAttributeValue(element,
"fetchInMemoryState");
- if (existsAttribute(fetchInMemoryState))
config.setFetchInMemoryState(getBoolean(fetchInMemoryState));
- String stateRetrievalTimeout = getAttributeValue(element, "timeout");
- if (existsAttribute(stateRetrievalTimeout))
config.setStateRetrievalTimeout(getLong(stateRetrievalTimeout));
-
+ String tmp = getAttributeValue(element, "fetchInMemoryState");
+ if (existsAttribute(tmp)) config.setFetchInMemoryState(getBoolean(tmp));
+ tmp = getAttributeValue(element, "timeout");
+ if (existsAttribute(tmp)) config.setStateRetrievalTimeout(getLong(tmp));
+ tmp = getAttributeValue(element, "nonBlocking");
+ if (existsAttribute(tmp)) config.setNonBlockingStateTransfer(getBoolean(tmp));
}
private void configureTransaction(Element element)
Modified: core/trunk/src/main/resources/config-samples/all.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/all.xml 2009-02-18 12:05:26 UTC (rev
7722)
+++ core/trunk/src/main/resources/config-samples/all.xml 2009-02-18 16:06:10 UTC (rev
7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!--
Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2009-02-18 16:06:10
UTC (rev 7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2009-02-18
12:05:26 UTC (rev 7722)
+++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2009-02-18
16:06:10 UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- Configure the TransactionManager -->
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/main/resources/config-samples/eviction-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2009-02-18 16:06:10
UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- Configure the TransactionManager -->
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/main/resources/config-samples/external-jgroups-file.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/external-jgroups-file.xml 2009-02-18
12:05:26 UTC (rev 7722)
+++ core/trunk/src/main/resources/config-samples/external-jgroups-file.xml 2009-02-18
16:06:10 UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- Configure the TransactionManager -->
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/main/resources/config-samples/invalidation-async.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/invalidation-async.xml 2009-02-18
12:05:26 UTC (rev 7722)
+++ core/trunk/src/main/resources/config-samples/invalidation-async.xml 2009-02-18
16:06:10 UTC (rev 7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- Configure the TransactionManager -->
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/main/resources/config-samples/local.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/local.xml 2009-02-18 12:05:26 UTC (rev
7722)
+++ core/trunk/src/main/resources/config-samples/local.xml 2009-02-18 16:06:10 UTC (rev
7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- By not specifying the 'clustering' element, the cache runs in LOCAL
mode. -->
<!-- Configure the TransactionManager -->
Modified: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2009-02-18
12:05:26 UTC (rev 7722)
+++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2009-02-18
16:06:10 UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- Configure the TransactionManager -->
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Copied: core/trunk/src/main/resources/config-samples/non-blocking-state-transfer.xml (from
rev 7684, core/trunk/src/main/resources/config-samples/total-replication.xml)
===================================================================
--- core/trunk/src/main/resources/config-samples/non-blocking-state-transfer.xml
(rev 0)
+++
core/trunk/src/main/resources/config-samples/non-blocking-state-transfer.xml 2009-02-18
16:06:10 UTC (rev 7723)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
+ <clustering mode="replication">
+ <sync />
+ <stateRetrieval fetchInMemoryState="true" nonBlocking="true"
timeout="60000" />
+ </clustering>
+</jbosscache>
Modified: core/trunk/src/main/resources/config-samples/string-property-replaced.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/string-property-replaced.xml 2009-02-18
12:05:26 UTC (rev 7722)
+++ core/trunk/src/main/resources/config-samples/string-property-replaced.xml 2009-02-18
16:06:10 UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking
lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"
nodeLockingScheme="${test.property.NodeLockingScheme:MVCC}"/>
Modified: core/trunk/src/main/resources/config-samples/total-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/total-replication.xml 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/main/resources/config-samples/total-replication.xml 2009-02-18 16:06:10
UTC (rev 7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- Configure the TransactionManager -->
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/main/resources/config2to3.xslt
===================================================================
--- core/trunk/src/main/resources/config2to3.xslt 2009-02-18 12:05:26 UTC (rev 7722)
+++ core/trunk/src/main/resources/config2to3.xslt 2009-02-18 16:06:10 UTC (rev 7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="urn:jboss:jbosscache-core:config:3.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns="urn:jboss:jbosscache-core:config:3.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="xml" indent="yes" version="1.0"
encoding="UTF-8" omit-xml-declaration="no"/>
<xsl:template match="/">
<xsl:element name="jbosscache">
Deleted: core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd
===================================================================
--- core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd 2009-02-18 12:05:26 UTC
(rev 7722)
+++ core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd 2009-02-18 16:06:10 UTC
(rev 7723)
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified"
- xmlns:tns="urn:jboss:jbosscache-core:config:3.0"
targetNamespace="urn:jboss:jbosscache-core:config:3.0"
-
xmlns:xs="http://www.w3.org/2001/XMLSchema"
version="1.0">
-
- <xs:element name="jbosscache"
type="tns:cacheConfigurationType"/>
-
- <xs:complexType name="cacheConfigurationType">
- <xs:all>
- <xs:element name="locking" type="tns:lockingType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="transaction" type="tns:transactionType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="startup" type="tns:startupType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="shutdown" type="tns:shutdownType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="serialization"
type="tns:serializationType" minOccurs="0"
maxOccurs="1"/>
- <xs:element name="jmxStatistics"
type="tns:jmxStatisticsType" minOccurs="0"
maxOccurs="1"/>
- <xs:element name="listeners" type="tns:listenersType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="invocationBatching"
type="tns:invocationBatchingType" minOccurs="0"
maxOccurs="1"/>
- <xs:element name="eviction" type="tns:evictionType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="loaders" type="tns:loadersType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="customInterceptors"
type="tns:customInterceptorsType" minOccurs="0"
maxOccurs="1"/>
- <xs:element name="clustering" type="tns:clusteringType"
minOccurs="0" maxOccurs="1"/>
- </xs:all>
- </xs:complexType>
-
- <xs:complexType name="clusteringType">
- <xs:all>
- <xs:element name="sync" type="tns:syncType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="async" type="tns:asyncType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="stateRetrieval"
type="tns:stateRetrievalType" minOccurs="0"
maxOccurs="1"/>
- <xs:element name="buddy" minOccurs="0"
maxOccurs="1">
- <xs:complexType>
- <xs:all minOccurs="0">
- <xs:element name="dataGravitation"
maxOccurs="1">
- <xs:complexType>
- <xs:attribute name="auto"
type="tns:booleanType"/>
- <xs:attribute name="removeOnFind"
type="tns:booleanType"/>
- <xs:attribute name="searchBackupTrees"
type="tns:booleanType"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="locator" maxOccurs="1">
- <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="tns:booleanType"/>
- <xs:attribute name="poolName"
type="xs:string"/>
- <xs:attribute name="communicationTimeout"
type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="jgroupsConfig"
type="tns:jgroupsConfigType" minOccurs="0"
maxOccurs="1"/>
- </xs:all>
- <xs:attribute name="mode">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
-
value="[Rr][Ee][Pp][Ll][Ii][Cc][Aa][Tt][Ii][Oo][Nn]|[Ii][Nn][Vv][Aa][Ll][Ii][Dd][Aa][Tt][Ii][Oo][Nn]|[Rr]|[Ii]|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="clusterName" type="xs:string" />
-
-
- </xs:complexType>
-
- <xs:complexType name="lockingType">
- <xs:attribute name="isolationLevel">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
-
value="[Ss][Ee][Rr][Ii][Aa][Ll][Ii][Zz][Aa][Bb][Ll][Ee]|[Rr][Ee][Pp][Ee][Aa][Tt][Aa][Bb][Ll][Ee]_[Rr][Ee][Aa][Dd]|[Rr][Ee][Aa][Dd]_[Cc][Oo][Mm][Mm][Ii][Tt][Tt][Ee][Dd]|[Nn][Oo][Nn][Ee]|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="lockParentForChildInsertRemove"
type="tns:booleanType"/>
- <xs:attribute name="lockAcquisitionTimeout"
type="tns:positiveInteger"/>
- <xs:attribute name="nodeLockingScheme">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
-
value="[Mm][Vv][Cc][Cc]|[Oo][Pp][Tt][Ii][Mm][Ii][Ss][Tt][Ii][Cc]|[Pp][Ee][Ss][Ss][Ii][Mm][Ii][Ss][Tt][Ii][Cc]|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="writeSkewCheck"
type="tns: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="tns:booleanType"/>
- <xs:attribute name="syncCommitPhase"
type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="startupType">
- <xs:attribute name="regionsInactiveOnStartup"
type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="stateRetrievalType">
- <xs:attribute name="fetchInMemoryState"
type="tns:booleanType"/>
- <xs:attribute name="timeout"
type="tns:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="shutdownType">
- <xs:attribute name="hookBehavior">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
-
value="[Dd][Ee][Ff][Aa][Uu][Ll][Tt]|[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|[Dd][Oo][Nn][Tt]_[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
-
- <xs:complexType name="serializationType">
- <xs:attribute name="objectInputStreamPoolSize"
type="tns:positiveInteger"/>
- <xs:attribute name="objectOutputStreamPoolSize"
type="tns:positiveInteger"/>
- <xs:attribute name="version" type="xs:string"/>
- <xs:attribute name="marshallerClass" type="xs:string"/>
- <xs:attribute name="useLazyDeserialization"
type="tns:booleanType"/>
- <xs:attribute name="useRegionBasedMarshalling"
type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:simpleType name="booleanType">
- <xs:restriction base="xs:string">
- <xs:pattern
value="\$\{.*\}|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]"/>
- </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="jmxStatisticsType">
- <xs:attribute name="enabled" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="listenersType">
- <xs:attribute name="asyncPoolSize"
type="tns:positiveInteger"/>
- <xs:attribute name="asyncQueueSize"
type="tns:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="invocationBatchingType">
- <xs:attribute name="enabled" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="jgroupsConfigType">
- <xs:sequence>
- <xs:any processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="configFile" type="xs:string"/>
- <xs:attribute name="multiplexerStack" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="syncType">
- <xs:attribute name="replTimeout"
type="tns:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="asyncType">
- <xs:attribute name="useReplQueue"
type="tns:booleanType"/>
- <xs:attribute name="replQueueInterval"
type="tns:positiveInteger"/>
- <xs:attribute name="replQueueMaxElements"
type="tns:positiveInteger"/>
- <xs:attribute name="serializationExecutorPoolSize"
type="tns:positiveInteger"/>
- <xs:attribute name="serializationExecutorQueueSize"
type="tns:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="evictionType">
- <xs:sequence>
- <xs:element name="default" type="tns:evictionRegionType"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="region" minOccurs="0"
maxOccurs="unbounded" type="tns:evictionRegionType"/>
- </xs:sequence>
- <xs:attribute name="wakeUpInterval"
type="tns:positiveInteger" use="required"/>
- </xs:complexType>
-
- <xs:complexType name="evictionRegionType">
- <xs:sequence>
- <xs:element name="property" minOccurs="0"
maxOccurs="unbounded" type="tns:propertyType"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="algorithmClass" type="xs:string"/>
- <xs:attribute name="actionPolicyClass"
type="xs:string"/>
- <xs:attribute name="eventQueueSize"
type="tns:positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="loadersType">
- <xs:sequence>
- <xs:element name="preload" minOccurs="0"
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"
maxOccurs="1">
- <xs:complexType>
- <xs:all>
- <xs:element name="properties"
type="xs:string" minOccurs="0" maxOccurs="1"/>
- </xs:all>
- <xs:attribute name="enabled"
type="tns: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="tns:booleanType"/>
- <xs:attribute name="fetchPersistentState"
type="tns:booleanType"/>
- <xs:attribute name="ignoreModifications"
type="tns:booleanType"/>
- <xs:attribute name="purgeOnStartup"
type="tns:booleanType"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="passivation"
type="tns:booleanType"/>
- <xs:attribute name="shared" type="tns:booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="customInterceptorsType">
- <xs:sequence>
- <xs:element name="interceptor" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="property"
maxOccurs="unbounded" type="tns:propertyType"
minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="position">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern
value="[Ff][Ii][Rr][Ss][Tt]|[Ll][Aa][Ss][Tt]"/>
- </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="tns:positiveInteger"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="propertyType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="value" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-</xs:schema>
-
Copied: core/trunk/src/main/resources/schema/jbosscache-config-3.1.xsd (from rev 7684,
core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd)
===================================================================
--- core/trunk/src/main/resources/schema/jbosscache-config-3.1.xsd
(rev 0)
+++ core/trunk/src/main/resources/schema/jbosscache-config-3.1.xsd 2009-02-18 16:06:10 UTC
(rev 7723)
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified"
+ xmlns:tns="urn:jboss:jbosscache-core:config:3.1"
targetNamespace="urn:jboss:jbosscache-core:config:3.1"
+
xmlns:xs="http://www.w3.org/2001/XMLSchema"
version="1.0">
+
+ <xs:element name="jbosscache"
type="tns:cacheConfigurationType"/>
+
+ <xs:complexType name="cacheConfigurationType">
+ <xs:all>
+ <xs:element name="locking" type="tns:lockingType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="transaction" type="tns:transactionType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="startup" type="tns:startupType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="shutdown" type="tns:shutdownType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="serialization"
type="tns:serializationType" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="jmxStatistics"
type="tns:jmxStatisticsType" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="listeners" type="tns:listenersType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="invocationBatching"
type="tns:invocationBatchingType" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="eviction" type="tns:evictionType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="loaders" type="tns:loadersType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="customInterceptors"
type="tns:customInterceptorsType" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="clustering" type="tns:clusteringType"
minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ </xs:complexType>
+
+ <xs:complexType name="clusteringType">
+ <xs:all>
+ <xs:element name="sync" type="tns:syncType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="async" type="tns:asyncType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="stateRetrieval"
type="tns:stateRetrievalType" minOccurs="0"
maxOccurs="1"/>
+ <xs:element name="buddy" minOccurs="0"
maxOccurs="1">
+ <xs:complexType>
+ <xs:all minOccurs="0">
+ <xs:element name="dataGravitation"
maxOccurs="1">
+ <xs:complexType>
+ <xs:attribute name="auto"
type="tns:booleanType"/>
+ <xs:attribute name="removeOnFind"
type="tns:booleanType"/>
+ <xs:attribute name="searchBackupTrees"
type="tns:booleanType"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="locator" maxOccurs="1">
+ <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="tns:booleanType"/>
+ <xs:attribute name="poolName"
type="xs:string"/>
+ <xs:attribute name="communicationTimeout"
type="xs:integer"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="jgroupsConfig"
type="tns:jgroupsConfigType" minOccurs="0"
maxOccurs="1"/>
+ </xs:all>
+ <xs:attribute name="mode">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
+
value="[Rr][Ee][Pp][Ll][Ii][Cc][Aa][Tt][Ii][Oo][Nn]|[Ii][Nn][Vv][Aa][Ll][Ii][Dd][Aa][Tt][Ii][Oo][Nn]|[Rr]|[Ii]|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="clusterName" type="xs:string" />
+
+
+ </xs:complexType>
+
+ <xs:complexType name="lockingType">
+ <xs:attribute name="isolationLevel">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
+
value="[Ss][Ee][Rr][Ii][Aa][Ll][Ii][Zz][Aa][Bb][Ll][Ee]|[Rr][Ee][Pp][Ee][Aa][Tt][Aa][Bb][Ll][Ee]_[Rr][Ee][Aa][Dd]|[Rr][Ee][Aa][Dd]_[Cc][Oo][Mm][Mm][Ii][Tt][Tt][Ee][Dd]|[Nn][Oo][Nn][Ee]|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="lockParentForChildInsertRemove"
type="tns:booleanType"/>
+ <xs:attribute name="lockAcquisitionTimeout"
type="tns:positiveInteger"/>
+ <xs:attribute name="nodeLockingScheme">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
+
value="[Mm][Vv][Cc][Cc]|[Oo][Pp][Tt][Ii][Mm][Ii][Ss][Tt][Ii][Cc]|[Pp][Ee][Ss][Ss][Ii][Mm][Ii][Ss][Tt][Ii][Cc]|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="writeSkewCheck"
type="tns: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="tns:booleanType"/>
+ <xs:attribute name="syncCommitPhase"
type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="startupType">
+ <xs:attribute name="regionsInactiveOnStartup"
type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="stateRetrievalType">
+ <xs:attribute name="fetchInMemoryState"
type="tns:booleanType"/>
+ <xs:attribute name="timeout"
type="tns:positiveInteger"/>
+ <xs:attribute name="nonBlocking" type="tns:booleanType"
/>
+ </xs:complexType>
+
+ <xs:complexType name="shutdownType">
+ <xs:attribute name="hookBehavior">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
+
value="[Dd][Ee][Ff][Aa][Uu][Ll][Tt]|[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|[Dd][Oo][Nn][Tt]_[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="serializationType">
+ <xs:attribute name="objectInputStreamPoolSize"
type="tns:positiveInteger"/>
+ <xs:attribute name="objectOutputStreamPoolSize"
type="tns:positiveInteger"/>
+ <xs:attribute name="version" type="xs:string"/>
+ <xs:attribute name="marshallerClass" type="xs:string"/>
+ <xs:attribute name="useLazyDeserialization"
type="tns:booleanType"/>
+ <xs:attribute name="useRegionBasedMarshalling"
type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:simpleType name="booleanType">
+ <xs:restriction base="xs:string">
+ <xs:pattern
value="\$\{.*\}|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]"/>
+ </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="jmxStatisticsType">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="listenersType">
+ <xs:attribute name="asyncPoolSize"
type="tns:positiveInteger"/>
+ <xs:attribute name="asyncQueueSize"
type="tns:positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="invocationBatchingType">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="jgroupsConfigType">
+ <xs:sequence>
+ <xs:any processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="configFile" type="xs:string"/>
+ <xs:attribute name="multiplexerStack" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="syncType">
+ <xs:attribute name="replTimeout"
type="tns:positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="asyncType">
+ <xs:attribute name="useReplQueue"
type="tns:booleanType"/>
+ <xs:attribute name="replQueueInterval"
type="tns:positiveInteger"/>
+ <xs:attribute name="replQueueMaxElements"
type="tns:positiveInteger"/>
+ <xs:attribute name="serializationExecutorPoolSize"
type="tns:positiveInteger"/>
+ <xs:attribute name="serializationExecutorQueueSize"
type="tns:positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="evictionType">
+ <xs:sequence>
+ <xs:element name="default" type="tns:evictionRegionType"
minOccurs="0" maxOccurs="1"/>
+ <xs:element name="region" minOccurs="0"
maxOccurs="unbounded" type="tns:evictionRegionType"/>
+ </xs:sequence>
+ <xs:attribute name="wakeUpInterval"
type="tns:positiveInteger" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="evictionRegionType">
+ <xs:sequence>
+ <xs:element name="property" minOccurs="0"
maxOccurs="unbounded" type="tns:propertyType"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="algorithmClass" type="xs:string"/>
+ <xs:attribute name="actionPolicyClass"
type="xs:string"/>
+ <xs:attribute name="eventQueueSize"
type="tns:positiveInteger"/>
+ </xs:complexType>
+
+ <xs:complexType name="loadersType">
+ <xs:sequence>
+ <xs:element name="preload" minOccurs="0"
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"
maxOccurs="1">
+ <xs:complexType>
+ <xs:all>
+ <xs:element name="properties"
type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:all>
+ <xs:attribute name="enabled"
type="tns: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="tns:booleanType"/>
+ <xs:attribute name="fetchPersistentState"
type="tns:booleanType"/>
+ <xs:attribute name="ignoreModifications"
type="tns:booleanType"/>
+ <xs:attribute name="purgeOnStartup"
type="tns:booleanType"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="passivation"
type="tns:booleanType"/>
+ <xs:attribute name="shared" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="customInterceptorsType">
+ <xs:sequence>
+ <xs:element name="interceptor" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="property"
maxOccurs="unbounded" type="tns:propertyType"
minOccurs="0"/>
+ </xs:sequence>
+ <xs:attribute name="class" type="xs:string"/>
+ <xs:attribute name="position">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern
value="[Ff][Ii][Rr][Ss][Tt]|[Ll][Aa][Ss][Tt]"/>
+ </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="tns:positiveInteger"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertyType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="value" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+</xs:schema>
+
Property changes on: core/trunk/src/main/resources/schema/jbosscache-config-3.1.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: core/trunk/src/main/resources/schema/jbosscache-registry-3.0.xsd
===================================================================
--- core/trunk/src/main/resources/schema/jbosscache-registry-3.0.xsd 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/main/resources/schema/jbosscache-registry-3.0.xsd 2009-02-18 16:06:10
UTC (rev 7723)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified"
- xmlns:tns="urn:jboss:jbosscache-core:config:3.0"
- xmlns:repo="urn:jboss:jbosscache-core:cache-repo:3.0"
- targetNamespace="urn:jboss:jbosscache-core:cache-repo:3.0"
-
xmlns:xs="http://www.w3.org/2001/XMLSchema"
version="1.0">
- <xs:import schemaLocation="jbosscache-config-3.0.xsd"
namespace="urn:jboss:jbosscache-core:config:3.0"/>
-
- <xs:element name="cache-configs">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="cache-config"
type="repo:cacheConfig" minOccurs="1"
maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:complexType name="cacheConfig">
- <xs:complexContent>
- <xs:extension base="tns:cacheConfigurationType"
xml:space="default">
- <xs:attribute name="name" type="xs:string"/>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-</xs:schema>
Copied: core/trunk/src/main/resources/schema/jbosscache-registry-3.1.xsd (from rev 7684,
core/trunk/src/main/resources/schema/jbosscache-registry-3.0.xsd)
===================================================================
--- core/trunk/src/main/resources/schema/jbosscache-registry-3.1.xsd
(rev 0)
+++ core/trunk/src/main/resources/schema/jbosscache-registry-3.1.xsd 2009-02-18 16:06:10
UTC (rev 7723)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified"
elementFormDefault="qualified"
+ xmlns:tns="urn:jboss:jbosscache-core:config:3.1"
+ xmlns:repo="urn:jboss:jbosscache-core:cache-repo:3.1"
+ targetNamespace="urn:jboss:jbosscache-core:cache-repo:3.1"
+
xmlns:xs="http://www.w3.org/2001/XMLSchema"
version="1.0">
+ <xs:import schemaLocation="jbosscache-config-3.1.xsd"
namespace="urn:jboss:jbosscache-core:config:3.1"/>
+
+ <xs:element name="cache-configs">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="cache-config"
type="repo:cacheConfig" minOccurs="1"
maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="cacheConfig">
+ <xs:complexContent>
+ <xs:extension base="tns:cacheConfigurationType"
xml:space="default">
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+</xs:schema>
Property changes on: core/trunk/src/main/resources/schema/jbosscache-registry-3.1.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java 2009-02-18
12:05:26 UTC (rev 7722)
+++
core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheConfigsTest.java 2009-02-18
16:06:10 UTC (rev 7723)
@@ -23,7 +23,7 @@
String xml = "<cache-configs>\n" +
" <cache-config name=\"A\">\n" +
" <jbosscache
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
- "
xmlns=\"urn:jboss:jbosscache-core:config:3.0\">\n" +
+ "
xmlns=\"urn:jboss:jbosscache-core:config:3.1\">\n" +
" <locking isolationLevel=\"REPEATABLE_READ\"
lockAcquisitionTimeout=\"15000\"/>\n" +
" <transaction
transactionManagerLookupClass=\"org.jboss.cache.transaction.GenericTransactionManagerLookup\"/>\n"
+
" <clustering><stateRetrieval
timeout=\"20000\"/></clustering>\n" +
@@ -32,7 +32,7 @@
"\n" +
" <cache-config name=\"B\">\n" +
" <jbosscache
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
- "
xmlns=\"urn:jboss:jbosscache-core:config:3.0\">\n" +
+ "
xmlns=\"urn:jboss:jbosscache-core:config:3.1\">\n" +
" <locking isolationLevel=\"READ_COMMITTED\"
lockAcquisitionTimeout=\"15000\"/>\n" +
" <transaction
transactionManagerLookupClass=\"org.jboss.cache.transaction.GenericTransactionManagerLookup\"/>\n"
+
" <clustering><stateRetrieval
timeout=\"20000\"/></clustering>\n" +
@@ -41,7 +41,7 @@
"\n" +
" <cache-config name=\"C\">\n" +
" <jbosscache
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
- "
xmlns=\"urn:jboss:jbosscache-core:config:3.0\">\n" +
+ "
xmlns=\"urn:jboss:jbosscache-core:config:3.1\">\n" +
" <locking isolationLevel=\"READ_COMMITTED\"
lockAcquisitionTimeout=\"100\"/>\n" +
" <clustering><stateRetrieval
timeout=\"100\"/></clustering>\n" +
" </jbosscache>\n" +
Modified:
core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java 2009-02-18
12:05:26 UTC (rev 7722)
+++
core/trunk/src/test/java/org/jboss/cache/config/parsing/SampleConfigFilesCorrectnessTest.java 2009-02-18
16:06:10 UTC (rev 7723)
@@ -47,7 +47,7 @@
public class SampleConfigFilesCorrectnessTest
{
public static final String CONFIG_ROOT =
"src/main/resources/config-samples";
- public static final String XSD_FILE =
"src/main/resources/jbosscache-config-3.0.xsd";
+ public static final String XSD_FILE =
"src/main/resources/jbosscache-config-3.1.xsd";
private InMemoryAppender appender;
private Level oldLevel;
@@ -116,6 +116,7 @@
String[] TOLERABLE_WARNINGS =
{
"DummyTransactionManager",
+ "not recommended for sync replication",
"could not bind to /", //this is a binding excpetion that
might appear on some linuxes...
"failed to join /" //this might appear on linux + jdk6
};
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 2009-02-18
12:05:26 UTC (rev 7722)
+++
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2009-02-18
16:06:10 UTC (rev 7723)
@@ -103,6 +103,12 @@
assert syncConfig.getStateRetrievalTimeout() == 15124;
}
+ public void testNonBlockingStateTransfer()
+ {
+ assert syncConfig.isNonBlockingStateTransfer();
+ assert !asyncConfig.isNonBlockingStateTransfer();
+ }
+
public void testSyncReplTimeout()
{
assert syncConfig.getSyncReplTimeout() == 15421;
Modified:
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java
===================================================================
---
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java 2009-02-18
12:05:26 UTC (rev 7722)
+++
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationSchemaTest.java 2009-02-18
16:06:10 UTC (rev 7723)
@@ -43,7 +43,7 @@
public void testSimpleFile()
{
ExceptionCountingErrorHandler handler = new ExceptionCountingErrorHandler();
- System.setProperty("jbosscache.config.schemaLocation",
"src/main/resources/jbosscache-config-3.0.xsd");
+ System.setProperty("jbosscache.config.schemaLocation",
"src/main/resources/jbosscache-config-3.1.xsd");
XmlConfigurationParser parser = new XmlConfigurationParser(handler);
for (String file : testFiles)
{
Modified: core/trunk/src/test/resources/configs/buddy-replication-cache.xml
===================================================================
--- core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2009-02-18 16:06:10
UTC (rev 7723)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking isolationLevel="REPEATABLE_READ"
lockAcquisitionTimeout="10000"/>
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering clusterName="JBossCache-Cluster">
Modified: core/trunk/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/trunk/src/test/resources/configs/clonable-config.xml 2009-02-18 12:05:26 UTC (rev
7722)
+++ core/trunk/src/test/resources/configs/clonable-config.xml 2009-02-18 16:06:10 UTC (rev
7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking isolationLevel="SERIALIZABLE"
lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/>
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering clusterName="CloneCluster">
Modified: core/trunk/src/test/resources/configs/local-lru-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-lru-eviction.xml 2009-02-18 12:05:26 UTC
(rev 7722)
+++ core/trunk/src/test/resources/configs/local-lru-eviction.xml 2009-02-18 16:06:10 UTC
(rev 7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
<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 2009-02-18 12:05:26 UTC
(rev 7722)
+++ core/trunk/src/test/resources/configs/local-passivation.xml 2009-02-18 16:06:10 UTC
(rev 7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
<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 2009-02-18 12:05:26 UTC (rev 7722)
+++ core/trunk/src/test/resources/configs/local-tx.xml 2009-02-18 16:06:10 UTC (rev 7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
<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 2009-02-18 12:05:26 UTC
(rev 7722)
+++ core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2009-02-18 16:06:10 UTC
(rev 7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
<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 2009-02-18 12:05:26 UTC (rev 7722)
+++ core/trunk/src/test/resources/configs/mux.xml 2009-02-18 16:06:10 UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering>
<stateRetrieval timeout="20000"/>
Modified: core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml
===================================================================
--- core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml 2009-02-18 12:05:26 UTC
(rev 7722)
+++ core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml 2009-02-18 16:06:10 UTC
(rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.1">
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering>
<stateRetrieval fetchInMemoryState="false"/>
Modified: core/trunk/src/test/resources/configs/parser-test-async.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test-async.xml 2009-02-18 12:05:26 UTC
(rev 7722)
+++ core/trunk/src/test/resources/configs/parser-test-async.xml 2009-02-18 16:06:10 UTC
(rev 7723)
@@ -3,7 +3,7 @@
<!-- file used for functional test of the xml parser -->
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking isolationLevel="REPEATABLE_READ"
lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
@@ -25,7 +25,7 @@
<clustering mode="replication"
clusterName="JBossCache-cluster">
<async useReplQueue="false"
serializationExecutorPoolSize="250"
serializationExecutorQueueSize="5000000"/>
- <stateRetrieval timeout="15124"
fetchInMemoryState="true"/>
+ <stateRetrieval timeout="15124" fetchInMemoryState="true"
nonBlocking="false"/>
<buddy enabled="true" poolName="myBuddyPoolReplicationGroup"
communicationTimeout="2000">
<dataGravitation auto="true" removeOnFind="true"
searchBackupTrees="true"/>
<locator
class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
Modified: core/trunk/src/test/resources/configs/parser-test.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test.xml 2009-02-18 12:05:26 UTC (rev
7722)
+++ core/trunk/src/test/resources/configs/parser-test.xml 2009-02-18 16:06:10 UTC (rev
7723)
@@ -3,7 +3,7 @@
<!-- file used for functional test of the xml parser -->
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+ xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- perCache -> differrent EntryFactory-->
<locking isolationLevel="REPEATABLE_READ"
lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
@@ -28,7 +28,7 @@
<!-- per Cache -->
<clustering mode="replication"
clusterName="JBossCache-cluster">
- <stateRetrieval timeout="15124"
fetchInMemoryState="true"/>
+ <stateRetrieval timeout="15124" fetchInMemoryState="true"
nonBlocking="true"/>
<buddy enabled="true" poolName="myBuddyPoolReplicationGroup"
communicationTimeout="2000">
<dataGravitation auto="true" removeOnFind="true"
searchBackupTrees="true"/>
<locator
class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
Modified: core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2009-02-18 16:06:10
UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering clusterName="JBossCache-Cluster123" />
<eviction wakeUpInterval="5000">
Modified: core/trunk/src/test/resources/configs/replSync.xml
===================================================================
--- core/trunk/src/test/resources/configs/replSync.xml 2009-02-18 12:05:26 UTC (rev 7722)
+++ core/trunk/src/test/resources/configs/replSync.xml 2009-02-18 16:06:10 UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<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 2009-02-18 12:05:26
UTC (rev 7722)
+++ core/trunk/src/test/resources/configs/string-property-replaced.xml 2009-02-18 16:06:10
UTC (rev 7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking
lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"
nodeLockingScheme="${test.property.NodeLockingScheme:MVCC}"/>
Modified: core/trunk/src/test/resources/jbc3-registry-configs.xml
===================================================================
--- core/trunk/src/test/resources/jbc3-registry-configs.xml 2009-02-18 12:05:26 UTC (rev
7722)
+++ core/trunk/src/test/resources/jbc3-registry-configs.xml 2009-02-18 16:06:10 UTC (rev
7723)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<registry:cache-configs xmlns="urn:jboss:jbosscache-core:config:3.0"
xmlns:registry="urn:jboss:jbosscache-core:cache-repo:3.0">
+<registry:cache-configs xmlns="urn:jboss:jbosscache-core:config:3.1"
xmlns:registry="urn:jboss:jbosscache-core:cache-repo:3.1">
<!--
Various JBoss Cache configurations, suitable for different caching
Modified: core/trunk/src/test/resources/unit-test-cache-service.xml
===================================================================
--- core/trunk/src/test/resources/unit-test-cache-service.xml 2009-02-18 12:05:26 UTC (rev
7722)
+++ core/trunk/src/test/resources/unit-test-cache-service.xml 2009-02-18 16:06:10 UTC (rev
7723)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.1">
<locking isolationLevel="REPEATABLE_READ"
lockAcquisitionTimeout="10000"/>
<transaction
transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<serialization useRegionBasedMarshalling="false"/>