Author: mircea.markus Date: 2008-07-08 11:36:34 -0400 (Tue, 08 Jul 2008) New Revision: 6213 Added: core/trunk/src/main/resources/jbosscache-config-3.0.xsd Removed: core/trunk/src/main/resources/jbosscache-config.xsd Modified: core/trunk/src/main/resources/all-elements-file-3.x.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/local.xml core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml core/trunk/src/main/resources/config-samples/optimistically-locked.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: renamed schema Modified: core/trunk/src/main/resources/all-elements-file-3.x.xml =================================================================== --- core/trunk/src/main/resources/all-elements-file-3.x.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/main/resources/all-elements-file-3.x.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="jbosscache-config-3.0.xsd"> <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234" nodeLockingScheme="mvcc" allowWriteSkew="true" concurrencyLevel="21"/> Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml =================================================================== --- core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -3,8 +3,7 @@ <!-- todo mmarkus add comments to sample config files (after DTD is written) --> <!-- todo mmarkus include the DTD file in all configs --> -<jbosscache xmlns="http://www.jboss.org/jbosscache" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbosscache ../jbosscache-config.xsd"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../jbosscache-config-3.0.xsd"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <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 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../jbosscache-config-3.0.xsd"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <eviction wakeUpInterval="5000"> Modified: core/trunk/src/main/resources/config-samples/eviction-enabled.xml =================================================================== --- core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../jbosscache-config-3.0.xsd"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <eviction wakeUpInterval="5000"> Modified: core/trunk/src/main/resources/config-samples/local.xml =================================================================== --- core/trunk/src/main/resources/config-samples/local.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/main/resources/config-samples/local.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../jbosscache-config-3.0.xsd"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> </jbosscache> Modified: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml =================================================================== --- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../jbosscache-config-3.0.xsd"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <startup stateRetrievalTimeout="20000"/> Modified: core/trunk/src/main/resources/config-samples/optimistically-locked.xml =================================================================== --- core/trunk/src/main/resources/config-samples/optimistically-locked.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/main/resources/config-samples/optimistically-locked.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../jbosscache-config-3.0.xsd"> <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <startup fetchInMemoryState="false"/> Copied: core/trunk/src/main/resources/jbosscache-config-3.0.xsd (from rev 6211, core/trunk/src/main/resources/jbosscache-config.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-08 15:36:34 UTC (rev 6213) @@ -0,0 +1,242 @@ +<?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="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="allowWriteSkew" 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="fetchInMemoryState" type="booleanType"/> + <xs:attribute name="inactiveOnStartup" type="booleanType"/> + <xs:attribute name="stateRetrievalTimeout" 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="defaults" minOccurs="0"> + <xs:complexType> + <xs:attribute name="policyClass" type="xs:string"/> + <xs:attribute name="eventQueueSize" type="positiveInteger"/> + </xs:complexType> + </xs:element> + <xs:element name="root" type="evictionRegionType" minOccurs="0"/> + <xs:element name="region" minOccurs="0" maxOccurs="unbounded" type="evictionRegionType"/> + </xs:sequence> + <xs:attribute name="wakeUpInterval" type="positiveInteger"/> + </xs:complexType> + + <xs:complexType name="evictionRegionType"> + <xs:sequence> + <xs:element name="attribute" maxOccurs="unbounded"> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute name="name" type="xs:string"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + </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:all> + <xs:element name="properties" minOccurs="0" maxOccurs="1"/> + <xs:element name="position" minOccurs="0" maxOccurs="1"> + <xs:complexType> + <xs:attribute name="first" type="booleanType"/> + <xs:attribute name="last" type="booleanType"/> + <xs:attribute name="index" type="positiveInteger"/> + <xs:attribute name="before" type="xs:string"/> + <xs:attribute name="after" type="xs:string"/> + </xs:complexType> + </xs:element> + </xs:all> + <xs:attribute name="class" type="xs:string"/> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> +</xs:schema> + Deleted: core/trunk/src/main/resources/jbosscache-config.xsd =================================================================== --- core/trunk/src/main/resources/jbosscache-config.xsd 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/main/resources/jbosscache-config.xsd 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,242 +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="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="allowWriteSkew" 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="fetchInMemoryState" type="booleanType"/> - <xs:attribute name="inactiveOnStartup" type="booleanType"/> - <xs:attribute name="stateRetrievalTimeout" 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="defaults" minOccurs="0"> - <xs:complexType> - <xs:attribute name="policyClass" type="xs:string"/> - <xs:attribute name="eventQueueSize" type="positiveInteger"/> - </xs:complexType> - </xs:element> - <xs:element name="root" type="evictionRegionType" minOccurs="0"/> - <xs:element name="region" minOccurs="0" maxOccurs="unbounded" type="evictionRegionType"/> - </xs:sequence> - <xs:attribute name="wakeUpInterval" type="positiveInteger"/> - </xs:complexType> - - <xs:complexType name="evictionRegionType"> - <xs:sequence> - <xs:element name="attribute" maxOccurs="unbounded"> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute name="name" type="xs:string"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - </xs:element> - </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:all> - <xs:element name="properties" minOccurs="0" maxOccurs="1"/> - <xs:element name="position" minOccurs="0" maxOccurs="1"> - <xs:complexType> - <xs:attribute name="first" type="booleanType"/> - <xs:attribute name="last" type="booleanType"/> - <xs:attribute name="index" type="positiveInteger"/> - <xs:attribute name="before" type="xs:string"/> - <xs:attribute name="after" type="xs:string"/> - </xs:complexType> - </xs:element> - </xs:all> - <xs:attribute name="class" type="xs:string"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </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-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> + <!-- todo mmarkus upload the schema on the jbosscache website --> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config-3.0.xsd"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <startup stateRetrievalTimeout="20000"/> Modified: core/trunk/src/test/resources/configs/clonable-config.xml =================================================================== --- core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config-3.0.xsd"> <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <startup fetchInMemoryState="false" stateRetrievalTimeout="3"/> Modified: core/trunk/src/test/resources/configs/local-lru-eviction.xml =================================================================== --- core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/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-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/local-passivation.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/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-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/local-tx.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/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-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/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-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/mux.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/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-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/parser-test.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -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="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/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-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config-3.0.xsd"> <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <startup stateRetrievalTimeout="20000"/> Modified: core/trunk/src/test/resources/configs/replSync.xml =================================================================== --- core/trunk/src/test/resources/configs/replSync.xml 2008-07-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/replSync.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/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-08 15:34:39 UTC (rev 6212) +++ core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-07-08 15:36:34 UTC (rev 6213) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config.xsd"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="file:///C:/projects/cache/branches/za_trunk/src/main/resources/jbosscache-config-3.0.xsd"> <locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}" nodeLockingScheme="${test.property.NodeLockingScheme:OPTIMISTIC}"/> <transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/>