[jbosscache-commits] JBoss Cache SVN: r7134 - in core/branches/flat/src: main/java/org/jboss/starobrno/config/parsing and 5 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Nov 13 13:30:29 EST 2008
Author: manik.surtani at jboss.com
Date: 2008-11-13 13:30:28 -0500 (Thu, 13 Nov 2008)
New Revision: 7134
Added:
core/branches/flat/src/main/resources/config-samples/all.xml
core/branches/flat/src/main/resources/config-samples/external-jgroups-file.xml
core/branches/flat/src/main/resources/config-samples/string-property-replaced.xml
core/branches/flat/src/main/resources/schema/starobrno-config-1.0.xsd
core/branches/flat/src/main/resources/schema/starobrno-registry-1.0.xsd
Removed:
core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd
core/branches/flat/src/main/resources/schema/jbosscache-registry-3.0.xsd
Modified:
core/branches/flat/src/main/java/org/jboss/cache/util/FileLookup.java
core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/RootElementBuilder.java
core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigHelper.java
core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java
core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/element/CustomInterceptorsElementParser.java
core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/element/EvictionElementParser.java
core/branches/flat/src/main/resources/config-samples/buddy-replication.xml
core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml
core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml
core/branches/flat/src/main/resources/config-samples/invalidation-async.xml
core/branches/flat/src/main/resources/config-samples/local.xml
core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml
core/branches/flat/src/main/resources/config-samples/total-replication.xml
core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml
core/branches/flat/src/test/resources/configs/clonable-config.xml
core/branches/flat/src/test/resources/configs/local-lru-eviction.xml
core/branches/flat/src/test/resources/configs/local-passivation.xml
core/branches/flat/src/test/resources/configs/local-tx.xml
core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml
core/branches/flat/src/test/resources/configs/mux.xml
core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml
core/branches/flat/src/test/resources/configs/parser-test-async.xml
core/branches/flat/src/test/resources/configs/parser-test.xml
core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml
core/branches/flat/src/test/resources/configs/replSync.xml
core/branches/flat/src/test/resources/configs/string-property-replaced.xml
core/branches/flat/src/test/resources/unit-test-cache-service.xml
Log:
Brought configs in line with trunk
Modified: core/branches/flat/src/main/java/org/jboss/cache/util/FileLookup.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/util/FileLookup.java 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/java/org/jboss/cache/util/FileLookup.java 2008-11-13 18:30:28 UTC (rev 7134)
@@ -24,9 +24,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
/**
* Holds the logic of looking up a file, in the following sequence:
@@ -79,4 +82,28 @@
}
return is;
}
+
+ public URL lookupFileLocation(String filename)
+ {
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ URL u = cl == null ? null : cl.getResource(filename);
+ if (u == null)
+ {
+ // check system class loader
+ u = getClass().getClassLoader().getResource(filename);
+ }
+ if (u == null)
+ {
+ File f = new File(filename);
+ if (f.exists()) try
+ {
+ u = f.toURL();
+ }
+ catch (MalformedURLException e)
+ {
+ // what do we do here?
+ }
+ }
+ return u;
+ }
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/RootElementBuilder.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/RootElementBuilder.java 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/RootElementBuilder.java 2008-11-13 18:30:28 UTC (rev 7134)
@@ -53,8 +53,8 @@
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, "starobrno-config-1.0.xsd");
+ JBossEntityResolver.registerEntity(JBOSSCACHE_REPO_NS, "starobrno-registry-1.0.xsd");
}
private static final Log log = LogFactory.getLog(RootElementBuilder.class);
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigHelper.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigHelper.java 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigHelper.java 2008-11-13 18:30:28 UTC (rev 7134)
@@ -596,6 +596,32 @@
return new ParsedAttributes(stringAttribs, xmlAttribs);
}
+ public static Properties extractProperties(Element source)
+ {
+ Properties p = new Properties();
+ NodeList list = source.getElementsByTagName("property");
+
+ // loop through attributes
+ for (int loop = 0; loop < list.getLength(); loop++)
+ {
+ Node node = list.item(loop);
+ if (node.getNodeType() != Node.ELEMENT_NODE) continue;
+
+ // for each element (attribute) ...
+ Element element = (Element) node;
+ String name = element.getAttribute(NAME);
+ String valueStr = element.getAttribute("value");
+
+ if (valueStr.length() > 0)
+ {
+ valueStr = valueStr.trim();
+ valueStr = StringPropertyReplacer.replaceProperties(valueStr);
+ p.put(name, valueStr);
+ }
+ }
+ return p;
+ }
+
public static String toString(Element e)
{
try
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java 2008-11-13 18:30:28 UTC (rev 7134)
@@ -19,17 +19,19 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.starobrno.config.parsing;
+package org.jboss.cache.config.parsing;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.util.FileLookup;
import org.jboss.starobrno.config.BuddyReplicationConfig;
import org.jboss.starobrno.config.CacheLoaderConfig;
import org.jboss.starobrno.config.Configuration;
+import org.jboss.starobrno.config.Configuration.CacheMode;
import org.jboss.starobrno.config.ConfigurationException;
import org.jboss.starobrno.config.CustomInterceptorConfig;
+import org.jboss.starobrno.config.parsing.JGroupsStackParser;
+import org.jboss.starobrno.config.parsing.RootElementBuilder;
+import org.jboss.starobrno.config.parsing.XmlParserBase;
import org.jboss.starobrno.config.parsing.element.BuddyElementParser;
import org.jboss.starobrno.config.parsing.element.CustomInterceptorsElementParser;
import org.jboss.starobrno.config.parsing.element.EvictionElementParser;
@@ -39,6 +41,7 @@
import org.xml.sax.ErrorHandler;
import java.io.InputStream;
+import java.net.URL;
import java.util.List;
/**
@@ -58,8 +61,6 @@
*/
public class XmlConfigurationParser extends XmlParserBase
{
-
- private static final Log log = LogFactory.getLog(XmlConfigurationParser.class);
private RootElementBuilder rootElementBuilder;
/**
@@ -144,22 +145,20 @@
private Configuration processElements(boolean ignoreRoot)
{
- if (!ignoreRoot)
+ if (!ignoreRoot &&
+ (!"jbosscache".equals(root.getLocalName()) || !RootElementBuilder.JBOSSCACHE_CORE_NS.equals(root.getNamespaceURI())))
{
- if (!"jbosscache".equals(root.getLocalName()) || !RootElementBuilder.JBOSSCACHE_CORE_NS.equals(root.getNamespaceURI()))
- throw new ConfigurationException("Expected root element {" + RootElementBuilder.JBOSSCACHE_CORE_NS + "}" + "jbosscache");
+ throw new ConfigurationException("Expected root element {" + RootElementBuilder.JBOSSCACHE_CORE_NS + "}" + "jbosscache");
}
try
{
configureLocking(getSingleElement("locking"));
configureTransaction(getSingleElement("transaction"));
- configureReplication(getSingleElement("replication"));
+ configureClustering(getSingleElement("clustering"));
configureSerialization(getSingleElement("serialization"));
configureInvalidation(getSingleElement("invalidation"));
configureStartup(getSingleElement("startup"));
- configureStateRetrieval(getSingleElement("stateRetrieval"));
- configureTransport(getSingleElement("transport"));
configureShutdown(getSingleElement("shutdown"));
configureJmxStatistics(getSingleElement("jmxStatistics"));
configureEviction(getSingleElement("eviction"));
@@ -175,6 +174,39 @@
return config;
}
+ private void configureClustering(Element e)
+ {
+ if (e == null) return; //we might not have this configured
+ // there are 2 attribs - mode and clusterName
+ boolean repl = true;
+ String mode = getAttributeValue(e, "mode").toUpperCase();
+ if (mode.startsWith("R"))
+ repl = true;
+ else if (mode.startsWith("I"))
+ repl = false;
+
+ Element asyncEl = getSingleElementInCoreNS("async", e);
+ Element syncEl = getSingleElementInCoreNS("sync", e);
+ if (syncEl != null && asyncEl != null)
+ throw new ConfigurationException("Cannot have sync and async elements within the same cluster element!");
+ boolean sync = asyncEl == null; // even if both are null, we default to sync
+ if (sync)
+ {
+ config.setCacheMode(repl ? CacheMode.REPL_SYNC : CacheMode.INVALIDATION_SYNC);
+ configureSyncMode(syncEl);
+ }
+ else
+ {
+ config.setCacheMode(repl ? CacheMode.REPL_ASYNC : CacheMode.INVALIDATION_ASYNC);
+ configureAsyncMode(asyncEl);
+ }
+ String cn = getAttributeValue(e, "clusterName");
+ if (existsAttribute(cn)) config.setClusterName(cn);
+ configureBuddyReplication(getSingleElementInCoreNS("buddy", e));
+ configureStateRetrieval(getSingleElementInCoreNS("stateRetrieval", e));
+ configureTransport(getSingleElementInCoreNS("jgroupsConfig", e));
+ }
+
private void configureStateRetrieval(Element element)
{
if (element == null) return; //we might not have this configured
@@ -282,18 +314,30 @@
private void configureTransport(Element element)
{
if (element == null) return; //transport might be missing
- String clusterName = getAttributeValue(element, "clusterName");
- if (existsAttribute(clusterName)) config.setClusterName(clusterName);
- String multiplexerStack = getAttributeValue(element, "multiplexerStack");
- if (existsAttribute(multiplexerStack)) config.setMultiplexerStack(multiplexerStack);
- Element clusterConfig = getSingleElementInCoreNS("jgroupsConfig", element);
- if (clusterConfig != null)
+
+ // first see if a configFile is provided
+ String cfgFile = getAttributeValue(element, "configFile");
+ if (existsAttribute(cfgFile))
{
- JGroupsStackParser stackParser = new JGroupsStackParser();
- String clusterConfigStr = stackParser.parseClusterConfigXml(clusterConfig);
- if (clusterConfigStr != null && clusterConfigStr.trim().length() > 0)
- config.setClusterConfig(clusterConfigStr);
+ // try and load this file
+ URL u = new FileLookup().lookupFileLocation(cfgFile);
+ config.setJgroupsConfigFile(u);
}
+ else
+ {
+ String multiplexerStack = getAttributeValue(element, "multiplexerStack");
+ if (existsAttribute(multiplexerStack))
+ {
+ config.setMultiplexerStack(multiplexerStack);
+ }
+ else
+ {
+ JGroupsStackParser stackParser = new JGroupsStackParser();
+ String clusterConfigStr = stackParser.parseClusterConfigXml(element);
+ if (clusterConfigStr != null && clusterConfigStr.trim().length() > 0)
+ config.setClusterConfig(clusterConfigStr);
+ }
+ }
}
private void configureStartup(Element element)
@@ -320,24 +364,6 @@
}
}
- private void configureReplication(Element element)
- {
- if (element == null) return; //might be we do not have a replication enabled
- Element async = getSingleElement("async");
- if (async != null)
- {
- config.setCacheMode(Configuration.CacheMode.REPL_ASYNC);
- configureAsyncMode(getSingleElementInCoreNS("async", element));
- }
- Element sync = getSingleElement("sync");
- if (sync != null)
- {
- config.setCacheMode(Configuration.CacheMode.REPL_SYNC);
- configureSyncMode(getSingleElementInCoreNS("sync", element));
- }
- configureBuddyReplication(getSingleElementInCoreNS("buddy", element));
- }
-
private void configureSyncMode(Element element)
{
String replTimeout = getAttributeValue(element, "replTimeout");
@@ -371,7 +397,6 @@
config.setLockParentForChildInsertRemove(getBoolean(lockParentForChildInsertRemove));
String lockAcquisitionTimeout = getAttributeValue(element, "lockAcquisitionTimeout");
if (existsAttribute(lockAcquisitionTimeout)) config.setLockAcquisitionTimeout(getLong(lockAcquisitionTimeout));
- String nodeLockingScheme = getAttributeValue(element, "nodeLockingScheme");
String writeSkewCheck = getAttributeValue(element, "writeSkewCheck");
if (existsAttribute(writeSkewCheck)) config.setWriteSkewCheck(getBoolean(writeSkewCheck));
String concurrencyLevel = getAttributeValue(element, "concurrencyLevel");
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/element/CustomInterceptorsElementParser.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/element/CustomInterceptorsElementParser.java 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/element/CustomInterceptorsElementParser.java 2008-11-13 18:30:28 UTC (rev 7134)
@@ -22,18 +22,18 @@
package org.jboss.starobrno.config.parsing.element;
-import org.jboss.starobrno.util.Util;
import org.jboss.starobrno.config.ConfigurationException;
import org.jboss.starobrno.config.CustomInterceptorConfig;
-import org.jboss.starobrno.config.parsing.ParsedAttributes;
import org.jboss.starobrno.config.parsing.XmlConfigHelper;
import org.jboss.starobrno.config.parsing.XmlParserBase;
import org.jboss.starobrno.interceptors.base.CommandInterceptor;
+import org.jboss.starobrno.util.Util;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
/**
* Utility class for parsing 'buddy' element in the .xml configuration file.
@@ -107,8 +107,9 @@
{
throw new ConfigurationException("CommandInterceptor class is not properly loaded in classloader", e);
}
- ParsedAttributes attributes = XmlConfigHelper.extractAttributes(element);
- XmlConfigHelper.setValues(result, attributes.stringAttribs, false, true);
+ Properties p = XmlConfigHelper.extractProperties(element);
+ XmlConfigHelper.setValues(result, p, false, true);
return result;
+
}
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/element/EvictionElementParser.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/element/EvictionElementParser.java 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/element/EvictionElementParser.java 2008-11-13 18:30:28 UTC (rev 7134)
@@ -21,18 +21,19 @@
*/
package org.jboss.starobrno.config.parsing.element;
-import org.jboss.starobrno.util.Util;
+import org.jboss.starobrno.config.ConfigurationException;
+import org.jboss.starobrno.config.EvictionAlgorithmConfig;
import org.jboss.starobrno.config.EvictionCacheConfig;
-import org.jboss.starobrno.config.*;
-import org.jboss.starobrno.config.parsing.ParsedAttributes;
+import org.jboss.starobrno.config.EvictionConfig;
+import org.jboss.starobrno.config.MissingPolicyException;
import org.jboss.starobrno.config.parsing.XmlConfigHelper;
import org.jboss.starobrno.config.parsing.XmlParserBase;
-import org.jboss.starobrno.eviction.EvictionAlgorithm;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import java.util.LinkedList;
import java.util.List;
+import java.util.Properties;
/**
* Knows how to parse the <b>eviction</b> xml element.
@@ -182,9 +183,8 @@
public static void parseEvictionPolicyConfig(Element element, EvictionAlgorithmConfig target)
{
- target.reset();
- ParsedAttributes attributes = XmlConfigHelper.extractAttributes(element);
- XmlConfigHelper.setValues(target, attributes.stringAttribs, false, true);
- XmlConfigHelper.setValues(target, attributes.xmlAttribs, true, true);
+// target.reset();
+ Properties p = XmlConfigHelper.extractProperties(element);
+ XmlConfigHelper.setValues(target, p, false, true);
}
}
Added: core/branches/flat/src/main/resources/config-samples/all.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/all.xml (rev 0)
+++ core/branches/flat/src/main/resources/config-samples/all.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
+
+
+ <!--
+ isolation levels supported: READ_COMMITTED and REPEATABLE_READ
+ nodeLockingSchemes: mvcc, pessimistic (deprecated), optimistic (deprecated)
+ -->
+ <locking
+ isolationLevel="REPEATABLE_READ"
+ lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000"
+ writeSkewCheck="false"
+ concurrencyLevel="500"/>
+
+ <!--
+ Used to register a transaction manager and participate in ongoing transactions.
+ -->
+ <transaction
+ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="false"
+ syncCommitPhase="false"/>
+
+ <!--
+ Used to register JMX statistics in any available MBean server
+ -->
+ <jmxStatistics
+ enabled="false"/>
+
+ <!--
+ If region based marshalling is used, defines whether new regions are inactive on startup.
+ -->
+ <startup
+ regionsInactiveOnStartup="true"/>
+
+ <!--
+ Used to register JVM shutdown hooks.
+ hookBehavior: DEFAULT, REGISTER, DONT_REGISTER
+ -->
+ <shutdown
+ hookBehavior="DEFAULT"/>
+
+ <!--
+ Used to define async listener notification thread pool size
+ -->
+ <listeners
+ asyncPoolSize="1"
+ asyncQueueSize="1000000"/>
+
+ <!--
+ Used to enable invocation batching and allow the use of Cache.startBatch()/endBatch() methods.
+ -->
+ <invocationBatching
+ enabled="false"/>
+
+ <!--
+ serialization related configuration, used for replication and cache loading
+ -->
+ <serialization
+ objectInputStreamPoolSize="12"
+ objectOutputStreamPoolSize="14"
+ version="3.0.0"
+ marshallerClass="org.jboss.cache.marshall.VersionAwareMarshaller"
+ useLazyDeserialization="false"
+ useRegionBasedMarshalling="false"/>
+
+ <!--
+ This element specifies that the cache is clustered.
+ modes supported: replication (r) or invalidation (i).
+ -->
+ <clustering mode="replication" clusterName="JBossCache-cluster">
+
+ <!--
+ Defines whether to retrieve state on startup
+ -->
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
+
+ <!--
+ Network calls are synchronous.
+ -->
+ <sync replTimeout="20000"/>
+ <!--
+ Uncomment this for async replication.
+ -->
+ <!--<async useReplQueue="true" replQueueInterval="10000" replQueueMaxElements="500" serializationExecutorPoolSize="20" serializationExecutorQueueSize="5000000"/>-->
+
+ <!-- Uncomment to use Buddy Replication -->
+ <!--
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ -->
+
+ <!--
+ Configures the JGroups channel. Looks up a JGroups config file on the classpath or filesystem. udp.xml
+ ships with jgroups.jar and will be picked up by the class loader.
+ -->
+ <jgroupsConfig>
+
+ <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2"
+ loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10"
+ mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true"
+ thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
+ tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true"
+ use_incoming_packet_handler="true"/>
+ <PING num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000"
+ view_bundling="true"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="0"/>
+
+ </jgroupsConfig>
+ </clustering>
+
+ <!--
+ Eviction configuration. WakeupInterval defines how often the eviction thread runs, in milliseconds. 0 means
+ the eviction thread will never run.
+ -->
+ <eviction wakeUpInterval="500">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000"/>
+ </default>
+ <region name="/org/jboss/data1">
+ <property name="timeToLive" value="2000"/>
+ </region>
+ <region name="/org/jboss/data2" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="100000">
+ <property name="maxNodes" value="3000"/>
+ <property name="minTimeToLive" value="4000"/>
+ </region>
+ </eviction>
+
+ <!--
+ Cache loaders.
+
+ If passivation is enabled, state is offloaded to the cache loaders ONLY when evicted. Similarly, when the state
+ is accessed again, it is removed from the cache loader and loaded into memory.
+
+ Otherwise, state is always maintained in the cache loader as well as in memory.
+
+ Set 'shared' to true if all instances in the cluster use the same cache loader instance, e.g., are talking to the
+ same database.
+ -->
+ <loaders passivation="false" shared="false">
+ <preload>
+ <node fqn="/org/jboss"/>
+ <node fqn="/org/tempdata"/>
+ </preload>
+
+ <!--
+ we can have multiple cache loaders, which get chained
+ -->
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="true" fetchPersistentState="true"
+ ignoreModifications="true" purgeOnStartup="true">
+
+ <properties>
+ cache.jdbc.table.name=jbosscache
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=true
+ cache.jdbc.table.primarykey=jbosscache_pk
+ cache.jdbc.fqn.column=fqn
+ cache.jdbc.fqn.type=varchar(255)
+ cache.jdbc.node.column=node
+ cache.jdbc.node.type=blob
+ cache.jdbc.parent.column=parent
+ cache.jdbc.sql-concat=1 || 2
+ cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver
+ cache.jdbc.url=jdbc:derby:jbossdb;create=true
+ cache.jdbc.user=user1
+ cache.jdbc.password=user1
+ </properties>
+ <!-- alternatively use a connection from a datasorce, as per the code sample below-->
+ <!--<properties>-->
+ <!--cache.jdbc.datasource=AllSampleDS-->
+ <!--cache.jdbc.table.name=jbosscache-->
+ <!--cache.jdbc.table.create=true-->
+ <!--cache.jdbc.table.drop=true-->
+ <!--</properties>-->
+ <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=20000
+ </properties>
+ </singletonStore>
+ </loader>
+ </loaders>
+
+ <!--
+ Define custom interceptors. All custom interceptors need to extend org.jboss.cache.interceptors.base.CommandInterceptor
+ -->
+ <!--
+ <customInterceptors>
+ <interceptor position="first" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor">
+ <property name="attrOne" value="value1" />
+ <property name="attrTwo" value="value2" />
+ </interceptor>
+ <interceptor position="last" class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/>
+ <interceptor index="3" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/>
+ <interceptor before="org.jboss.cache.interceptors.CallInterceptor"
+ class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/>
+ <interceptor after="org.jboss.cache.interceptors.CallInterceptor"
+ class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/>
+ </customInterceptors>
+ -->
+</jbosscache>
Modified: core/branches/flat/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/buddy-replication.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/config-samples/buddy-replication.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Added: core/branches/flat/src/main/resources/config-samples/external-jgroups-file.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/external-jgroups-file.xml (rev 0)
+++ core/branches/flat/src/main/resources/config-samples/external-jgroups-file.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+
+ <clustering>
+ <async/>
+ <!--
+ Here we specify a path to an external JGroups configuration file. First the classpath is scanned, and then
+ the filesystem for the file. In this case, "udp.xml" ships with jgroups.jar and will be picked up by the
+ classloader.
+ -->
+ <jgroupsConfig configFile="udp.xml"/>
+ </clustering>
+</jbosscache>
Modified: core/branches/flat/src/main/resources/config-samples/invalidation-async.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/invalidation-async.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/config-samples/invalidation-async.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/branches/flat/src/main/resources/config-samples/local.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/local.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/config-samples/local.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<!-- By not specifying the 'clustering' element, the cache runs in LOCAL mode. -->
<!-- Configure the TransactionManager -->
Modified: core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Added: core/branches/flat/src/main/resources/config-samples/string-property-replaced.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/string-property-replaced.xml (rev 0)
+++ core/branches/flat/src/main/resources/config-samples/string-property-replaced.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
+
+ <locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"/>
+
+ <transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/>
+
+ <serialization useRegionBasedMarshalling="true"/>
+ <clustering>
+ <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
+ <jgroupsConfig multiplexerStack="udp-sync"/>
+ <sync replTimeout="20000"/>
+ <buddy enabled="${test.property.BuddyReplicationConfig.enabled:true}"
+ poolName="${test.property.BuddyReplicationConfig.buddyPoolName:default}" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ ignoreColocatedBuddies = true
+ numBuddies = ${test.property.BuddyReplicationConfig.numBuddies:1}
+ </properties>
+ </locator>
+ </buddy>
+ </clustering>
+
+ <startup regionsInactiveOnStartup="true"/>
+ <eviction wakeUpInterval="5000">
+ <default
+ algorithmClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.cache.eviction.LRUAlgorithm}">
+ <property name="maxNodes" value="${test.property.EvictionPolicyConfig.maxNodes:5000}"/>
+ <property name="timeToLive" value="1000000"/>
+ </default>
+ </eviction>
+ <loaders passivation="true" shared="false">
+ <preload>
+ <node fqn="/"/>
+ </preload>
+ <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true"
+ ignoreModifications="false">
+ <properties>
+ location=${test.property.CacheLoaderConfiguration.location,java.io.tmpdir:/tmp}
+ </properties>
+ </loader>
+ </loaders>
+</jbosscache>
Modified: core/branches/flat/src/main/resources/config-samples/total-replication.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/total-replication.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/config-samples/total-replication.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Deleted: core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd
===================================================================
--- core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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>
-
Deleted: core/branches/flat/src/main/resources/schema/jbosscache-registry-3.0.xsd
===================================================================
--- core/branches/flat/src/main/resources/schema/jbosscache-registry-3.0.xsd 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/main/resources/schema/jbosscache-registry-3.0.xsd 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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/branches/flat/src/main/resources/schema/starobrno-config-1.0.xsd (from rev 7133, core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd)
===================================================================
--- core/branches/flat/src/main/resources/schema/starobrno-config-1.0.xsd (rev 0)
+++ core/branches/flat/src/main/resources/schema/starobrno-config-1.0.xsd 2008-11-13 18:30:28 UTC (rev 7134)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+ xmlns:tns="urn:jboss:starobrno-core:config:1.0" targetNamespace="urn:jboss:starobrno-core:config:1.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="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/branches/flat/src/main/resources/schema/starobrno-registry-1.0.xsd (from rev 7130, core/branches/flat/src/main/resources/schema/jbosscache-registry-3.0.xsd)
===================================================================
--- core/branches/flat/src/main/resources/schema/starobrno-registry-1.0.xsd (rev 0)
+++ core/branches/flat/src/main/resources/schema/starobrno-registry-1.0.xsd 2008-11-13 18:30:28 UTC (rev 7134)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
+ xmlns:tns="urn:jboss:starobrno-core:config:1.0"
+ xmlns:repo="urn:jboss:starobrno-core:cache-repo:1.0"
+ targetNamespace="urn:jboss:starobrno-core:cache-repo:1.0"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0">
+ <xs:import schemaLocation="starobrno-config-1.0.xsd" namespace="urn:jboss:starobrno-core:config:1.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>
Modified: core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering clusterName="JBossCache-Cluster">
Modified: core/branches/flat/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/clonable-config.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/clonable-config.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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">
- <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/>
+ xmlns="urn:jboss:starobrno-core:config:1.0">
+ <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering clusterName="CloneCluster">
<stateRetrieval fetchInMemoryState="false" timeout="3"/>
Modified: core/branches/flat/src/test/resources/configs/local-lru-eviction.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/local-lru-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/local-lru-eviction.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/branches/flat/src/test/resources/configs/local-passivation.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/local-passivation.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/local-passivation.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/branches/flat/src/test/resources/configs/local-tx.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/local-tx.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/local-tx.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/branches/flat/src/test/resources/configs/mux.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/mux.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/mux.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering>
<stateRetrieval timeout="20000"/>
Modified: core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns="urn:jboss:starobrno-core:config:1.0">
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering>
<stateRetrieval fetchInMemoryState="false"/>
Modified: core/branches/flat/src/test/resources/configs/parser-test-async.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/parser-test-async.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/parser-test-async.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -3,11 +3,11 @@
<!-- 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:starobrno-core:config:1.0">
<locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
- nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/>
+ writeSkewCheck="false" concurrencyLevel="21"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
syncRollbackPhase="true" syncCommitPhase="true"/>
Modified: core/branches/flat/src/test/resources/configs/parser-test.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/parser-test.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/parser-test.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -3,11 +3,11 @@
<!-- 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:starobrno-core:config:1.0">
<!-- perCache -> differrent EntryFactory-->
<locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
- nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/>
+ writeSkewCheck="false" concurrencyLevel="21"/>
<!-- perCM -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
Modified: core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<clustering clusterName="JBossCache-Cluster123"/>
<eviction wakeUpInterval="5000">
Modified: core/branches/flat/src/test/resources/configs/replSync.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/replSync.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/replSync.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -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:starobrno-core:config:1.0">
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<serialization useRegionBasedMarshalling="true"/>
Modified: core/branches/flat/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/string-property-replaced.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/configs/string-property-replaced.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -1,8 +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">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
- <locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"
- nodeLockingScheme="${test.property.NodeLockingScheme:MVCC}"/>
+ <locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"/>
<transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/>
Modified: core/branches/flat/src/test/resources/unit-test-cache-service.xml
===================================================================
--- core/branches/flat/src/test/resources/unit-test-cache-service.xml 2008-11-13 18:15:23 UTC (rev 7133)
+++ core/branches/flat/src/test/resources/unit-test-cache-service.xml 2008-11-13 18:30:28 UTC (rev 7134)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns="urn:jboss:starobrno-core:config:1.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<serialization useRegionBasedMarshalling="false"/>
More information about the jbosscache-commits
mailing list