JBoss Cache SVN: r7137 - core/trunk/src/test/java/org/jboss/cache/config/parsing.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-11-14 09:10:27 -0500 (Fri, 14 Nov 2008)
New Revision: 7137
Modified:
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
Log:
Changed default queue sizes
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-11-13 18:39:16 UTC (rev 7136)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-11-14 14:10:27 UTC (rev 7137)
@@ -285,7 +285,7 @@
public void testListenerAsyncThreads()
{
assert syncConfig.getListenerAsyncPoolSize() == 5;
- assert syncConfig.getListenerAsyncQueueSize() == 1000000; // the default
+ assert syncConfig.getListenerAsyncQueueSize() == 50000; // the default
assert asyncConfig.getListenerAsyncPoolSize() == 5;
assert asyncConfig.getListenerAsyncQueueSize() == 100000;
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7136 - in core/trunk/src/main: java/org/jboss/cache/config and 1 other directory.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-11-13 13:39:16 -0500 (Thu, 13 Nov 2008)
New Revision: 7136
Modified:
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
Log:
Changed default queue sizes
Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2008-11-13 18:37:16 UTC (rev 7135)
+++ core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2008-11-13 18:39:16 UTC (rev 7136)
@@ -57,7 +57,7 @@
-->
<listeners
asyncPoolSize="1"
- asyncQueueSize="1000000"/>
+ asyncQueueSize="100000"/>
<!--
Used to enable invocation batching and allow the use of Cache.startBatch()/endBatch() methods.
@@ -993,8 +993,8 @@
<row>
<entry><emphasis role="bold">asyncQueueSize</emphasis></entry>
<entry>listenerAsyncQueueSize</entry>
- <entry>integer</entry>
- <entry>1000000</entry>
+ <entry>positive integer</entry>
+ <entry>50000</entry>
<entry>
The size of the bounded queue used by the async listener threadpool. Only considered if
@@ -2781,7 +2781,7 @@
<entry><emphasis role="bold">serializationExecutorQueueSize</emphasis></entry>
<entry>serializationExecutorQueueSize</entry>
<entry>positive integer</entry>
- <entry>1000000</entry>
+ <entry>50000</entry>
<entry>
This is used to define the size of the bounded queue that holds tasks for the serialization executor.
This is ignored if a serialization executor is not used, such as when <literal>serializationExecutorPoolSize</literal>
Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-11-13 18:37:16 UTC (rev 7135)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-11-13 18:39:16 UTC (rev 7136)
@@ -224,9 +224,9 @@
private boolean writeSkewCheck = false;
private int concurrencyLevel = 500;
private int listenerAsyncPoolSize = 1;
- private int listenerAsyncQueueSize = 1000000;
+ private int listenerAsyncQueueSize = 50000;
private int serializationExecutorPoolSize = 0;
- private int serializationExecutorQueueSize = 1000000;
+ private int serializationExecutorQueueSize = 50000;
@Start(priority = 1)
void correctIsolationLevels()
@@ -462,7 +462,7 @@
}
/**
- * Sets the queue size of the bounded queue used to store async listener events on. This defaults to 1,000,000.
+ * Sets the queue size of the bounded queue used to store async listener events on. This defaults to 50,000.
*
* @param listenerAsyncQueueSize queue size to use
*/
@@ -473,7 +473,7 @@
}
/**
- * Sets the queue size of the bounded queue used to store async serialization events on. This defaults to 1,000,000.
+ * Sets the queue size of the bounded queue used to store async serialization events on. This defaults to 50,000.
*
* @param serializationExecutorQueueSize queue size to use
*/
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7135 - core/branches/flat/src/main/java/org/jboss/starobrno/config.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-11-13 13:37:16 -0500 (Thu, 13 Nov 2008)
New Revision: 7135
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/config/Configuration.java
Log:
reduced default bounded queue sizes
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/Configuration.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/config/Configuration.java 2008-11-13 18:30:28 UTC (rev 7134)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/config/Configuration.java 2008-11-13 18:37:16 UTC (rev 7135)
@@ -202,9 +202,9 @@
private boolean writeSkewCheck = false;
private int concurrencyLevel = 500;
private int listenerAsyncPoolSize = 1;
- private int listenerAsyncQueueSize = 1000000;
+ private int listenerAsyncQueueSize = 50000;
private int serializationExecutorPoolSize = 0;
- private int serializationExecutorQueueSize = 1000000;
+ private int serializationExecutorQueueSize = 50000;
private URL jgroupsConfigFile;
@Start(priority = 1)
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7134 - in core/branches/flat/src: main/java/org/jboss/starobrno/config/parsing and 5 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)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"/>
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7133 - in core/branches/flat/src: main/resources/config-samples and 4 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-11-13 13:15:23 -0500 (Thu, 13 Nov 2008)
New Revision: 7133
Removed:
core/branches/flat/src/main/resources/config2to3.bat
core/branches/flat/src/main/resources/config2to3.sh
core/branches/flat/src/main/resources/config2to3.xslt
core/branches/flat/src/test/resources/configs/conf2x/
core/branches/flat/src/test/resources/configs/repl-with-cl.xml
core/branches/flat/src/test/resources/configs/repl-with-cl2.xml
core/branches/flat/src/test/resources/jbc2-registry-configs.xml
Modified:
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/main/resources/schema/jbosscache-config-3.0.xsd
core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java
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/resources/config-samples/buddy-replication.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/buddy-replication.xml 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config-samples/buddy-replication.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,93 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
- <!--
- isolationLevel : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering mode="replication">
+ <!--
+ timeout: The max amount of time (in milliseconds) we wait until the state (i.e. the contents of the cache) is
+ retrieved from existing members in a clustered environment
+ -->
+ <stateRetrieval timeout="20000"/>
- <!--
- timeout: The max amount of time (in milliseconds) we wait until the state (i.e. the contents of the cache) is
- retrieved from existing members in a clustered environment
- -->
- <stateRetrieval timeout="20000"/>
- <transport clusterName="JBossCache-Cluster">
- <!-- JGroups protocol stack properties. -->
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="true"
- enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="8"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="10000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD max_tries="5" shun="true" timeout="10000"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- use_mcast_xmit="false"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="1000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
+ <!-- JGroups protocol stack properties. -->
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="true"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="8"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="10000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="1000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
- <!-- this is a replicated cache-->
- <replication>
- <!-- Number of milliseconds to wait until all responses for a synchronous call have been received -->
- <sync replTimeout="15000"/>
+ <!-- Number of milliseconds to wait until all responses for a synchronous call have been received -->
+ <sync replTimeout="15000"/>
- <!--
- poolName: A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
- the same pool name (falling back to other buddies if not available). This allows the sysdmin
- to hint at backup buddies are picked, so for example, nodes may be hinted to pick buddies
- on a different physical rack or power supply for added fault tolerance.
- communicationTimeout : communication timeout for inter-buddy group organisation messages (such as assigning
- to and removing from groups
- -->
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <!--
+poolName: A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
+ the same pool name (falling back to other buddies if not available). This allows the sysdmin
+ to hint at backup buddies are picked, so for example, nodes may be hinted to pick buddies
+ on a different physical rack or power supply for added fault tolerance.
+communicationTimeout : communication timeout for inter-buddy group organisation messages (such as assigning
+ to and removing from groups
+ -->
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <!--
- auto : Should data gravitation be attempted whenever there is a cache miss on finding a node?
- If false, data will only be gravitated if an Option is set enabling it
- removeOnFind: removes data on remote caches' trees and backup subtrees when gravitated to a
- new data owner
- searchBackupTrees: search backup subtrees as well for data when gravitating. Results in backup nodes
- being able to answer data gravitation requests.-->
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <!--
+auto : Should data gravitation be attempted whenever there is a cache miss on finding a node?
+If false, data will only be gravitated if an Option is set enabling it
+removeOnFind: removes data on remote caches' trees and backup subtrees when gravitated to a
+ new data owner
+searchBackupTrees: search backup subtrees as well for data when gravitating. Results in backup nodes
+ being able to answer data gravitation requests.-->
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
- each node will *try* to select a buddy on a different physical host. If not able to do so though,
- it will fall back to colocated nodes. -->
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
+ each node will *try* to select a buddy on a different physical host. If not able to do so though,
+ it will fall back to colocated nodes. -->
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </clustering>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,64 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
- <!--
- isolationLevel : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <!-- Specific eviction policy configurations -->
+ <eviction wakeUpInterval="5000">
+ <!-- Cache wide default -->
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="3000"/>
+ </default>
+ <region name="/org/jboss/test/data">
+ <property name="maxNodes" value="100"/>
+ <property name="timeToLive" value="3000"/>
+ </region>
+ </eviction>
- <!-- Specific eviction policy configurations -->
- <eviction wakeUpInterval="5000">
- <!-- Cache wide default -->
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">3000</attribute>
- </default>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">100</attribute>
- <attribute name="timeToLive">3000</attribute>
- </region>
- </eviction>
-
- <!-- Cache Passivation for Tree Cache
- On passivation, The objects are written to the backend store on eviction if passivation
- is true, otherwise the objects are persisted. On activation, the objects are restored in
- the memory cache and removed from the cache loader if 'passivation' attribute is true,
- otherwise the objects are only loaded from the cache loader -->
- <loaders passivation="false" shared="false">
- <preload>
- <node fqn="/"/>
- </preload>
- <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true"
- ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=jbosscache
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=true
- cache.jdbc.table.primarykey=jbosscache_pk
- cache.jdbc.fqn.column=fqn
- cache.jdbc.fqn.type=varchar(255)
- cache.jdbc.node.column=node
- cache.jdbc.node.type=blob
- cache.jdbc.parent.column=parent
- cache.jdbc.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>
- </loader>
- </loaders>
+ <!-- Cache Passivation for Tree Cache
+On passivation, The objects are written to the backend store on eviction if passivation
+is true, otherwise the objects are persisted. On activation, the objects are restored in
+the memory cache and removed from the cache loader if 'passivation' attribute is true,
+otherwise the objects are only loaded from the cache loader -->
+ <loaders passivation="false" shared="false">
+ <preload>
+ <node fqn="/"/>
+ </preload>
+ <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
+ <loader
+ class="org.jboss.cache.loader.JDBCCacheLoader"
+ async="false"
+ fetchPersistentState="true"
+ ignoreModifications="false"
+ purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=jbosscache
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=true
+ cache.jdbc.table.primarykey=jbosscache_pk
+ cache.jdbc.fqn.column=fqn
+ cache.jdbc.fqn.type=varchar(255)
+ cache.jdbc.node.column=node
+ cache.jdbc.node.type=blob
+ cache.jdbc.parent.column=parent
+ cache.jdbc.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>
+ </loader>
+ </loaders>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,52 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
- <!--
- isolationLevel : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <!--
+ wakeUpInterval: time interval (millis) when the eviction thread kicks in.
+ -->
+ <eviction wakeUpInterval="5000">
+ <!--
+ Cache wide defaults
+ default algorithmClass: if an algorithm class is not specified for a region, this one is used by default.
+ default eventQueueSize if an event queue size is not specified for a region, this one is used by default.
+ -->
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ </default>
- <!--
- wakeUpInterval: time interval (millis) when the eviction thread kicks in
- defaultPolicyClass: if policy class is not specified for a region, this one is considered as default
- defaultEventQueueSize if policy event queue size is not specified for a region, this one is considered as default
- -->
- <eviction wakeUpInterval="5000">
- <!-- Cache wide default -->
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000000</attribute>
- </default>
-
- <!-- configurations for various regions-->
- <region name="/org/jboss/data">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000000</attribute>
- </region>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">5</attribute>
- <attribute name="timeToLive">4000</attribute>
- </region>
- <region name="/test">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLive">4000</attribute>
- </region>
- <region name="/maxAgeTest">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLive">8000</attribute>
- <attribute name="maxAge">10000</attribute>
- </region>
- </eviction>
+ <!-- configurations for various regions-->
+ <region name="/org/jboss/data1">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ </region>
+ <region name="/org/jboss/data2" actionPolicyClass="org.jboss.cache.eviction.RemoveOnEvictActionPolicy">
+ <property name="maxNodes" value="5"/>
+ <property name="timeToLive" value="4000"/>
+ </region>
+ <region name="/org/jboss/data3" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm">
+ <property name="maxNodes" value="10000"/>
+ <property name="minTimeToLive" value="4000"/>
+ </region>
+ <region name="/org/jboss/data1/otherstuff" eventQueueSize="100000">
+ <property name="maxNodes" value="10000"/>
+ <property name="timeToLive" value="8000"/>
+ <property name="maxAge" value="10000"/>
+ </region>
+ <region name="/org/jboss/data1/inherit"/>
+ </eviction>
</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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config-samples/invalidation-async.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,65 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
- <!--
- isolationLevel : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering mode="invalidation">
+ <!--
+ timeout: The max amount of time (in milliseconds) we wait until the
+ state (i.e. the contents of the cache) are retrieved from
+ existing members in a clustered environment
+ -->
+ <stateRetrieval timeout="20000"/>
- <!--
- timeout: The max amount of time (in milliseconds) we wait until the
- state (i.e. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <stateRetrieval timeout="20000"/>
+ <!-- JGroups protocol stack properties. -->
+ <jgroupsConfig>
+ <UDP discard_incompatible_packets="true" enable_bundling="true" 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="100000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="20"
+ oob_thread_pool.min_threads="8" oob_thread_pool.queue_enabled="false"
+ 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="10000" thread_pool.max_threads="15" thread_pool.min_threads="8"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="100000"
+ thread_pool.rejection_policy="Discard"
+ 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="true"/>
+ <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"/>
+ <FC max_credits="500000" min_threshold="0.2"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
- <transport clusterName="JBossCache-Cluster">
- <!-- JGroups protocol stack properties. -->
- <jgroupsConfig>
- <UDP discard_incompatible_packets="true" enable_bundling="true" 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="100000000" mcast_send_buf_size="640000"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="20"
- oob_thread_pool.min_threads="8" oob_thread_pool.queue_enabled="false" 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="10000" thread_pool.max_threads="15" thread_pool.min_threads="8"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="100000" thread_pool.rejection_policy="Discard"
- 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="true"/>
- <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"/>
- <FC max_credits="500000" min_threshold="0.2"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
+ <async/>
+ <!-- Alternatively, to use sync replication, comment out the element above and uncomment the element below. -->
+ <!-- <sync /> -->
- <!-- this uses replication rather than invalidation -->
- <invalidation>
- <!-- invalidation messages are not being sent synchronously -->
- <async useReplQueue="false"/>
- </invalidation>
+ </clustering>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config-samples/local.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,24 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
- <!-- By not specifying neither an 'replication' nor an 'invalidation' element, the cache is defaulted to local -->
-
-
- <!--
- isolcationLevels : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
-
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <!-- By not specifying the 'clustering' element, the cache runs in LOCAL mode. -->
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,66 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
- <!--
- isolationLevel : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
-
- <!--
- timeout: The max amount of time (in milliseconds) we wait until the
- state (i.e. the contents of the cache) are retrieved from
- existing members in a clustered environment
- -->
- <stateRetrieval timeout="20000"/>
-
- <!-- here is where we specify the multiplexer stack -->
- <transport clusterName="JBossCache-Cluster" multiplexerStack="fc-fast-minimalthreads"/>
-
- <!-- this is replicated cache-->
- <replication>
- <!-- Number of milliseconds to wait until all responses for a
- synchronous call have been received -->
- <sync replTimeout="15000"/>
-
- <!-- poolName: A way to specify a preferred replication group. If specified, we try and pick a buddy why shares
- the same pool name (falling back to other buddies if not available). This allows the sysadmin
- to hint at backup buddies are picked, so for example, nodes may be hinted to pick buddies
- on a different physical rack or power supply for added fault tolerance.
- communicationTimeout : communication timeout for inter-buddy group organisation messages (such as assigning
- to and removing from groups
- -->
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
-
- <!-- auto : Should data gravitation be attempted whenever there is a cache miss on finding a node?
- If false, data will only be gravitated if an Option is set enabling it
- removeOnFind: removes data on remote caches' trees and backup subtrees when gravitated to a
- new data owner
- searchBackupTrees: search backup subtrees as well for data when gravitating. Results in backup nodes
- being able to answer data gravitation requests.-->
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
-
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that
- each node will *try* to select a buddy on a different physical host. If not able to do so though,
- it will fall back to colocated nodes. -->
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
-
+ <clustering>
+ <sync/>
+ <!-- Here is where we specify the multiplexer stack to use. -->
+ <jgroupsConfig multiplexerStack="fc-fast-minimalthreads"/>
+ </clustering>
</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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config-samples/total-replication.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,67 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
- <!--
- isolationLevel : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering mode="replication">
+ <!-- JGroups protocol stack properties. -->
+ <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"/>
- <!--
- timeout: The max amount of time (in milliseconds) we wait until the state (i.e. the contents of the cache) is
- retrieved from existing members in a clustered environment
- -->
- <stateRetrieval timeout="20000"/>
+ </jgroupsConfig>
- <transport clusterName="JBossCache-Cluster">
- <!-- JGroups protocol stack properties. -->
- <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 use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
-
- </jgroupsConfig>
- </transport>
+ <sync/>
+ <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. -->
+ <!-- <async /> -->
-
- <!-- this is a replicated cache-->
- <replication>
- <!-- Number of milliseconds to wait until all responses for a synchronous call have been received -->
- <sync replTimeout="15000"/>
-
- <!--<async useReplQueue="false" replQueueInterval="1500" replQueueMaxElements="30000"/>-->
- </replication>
+ </clustering>
</jbosscache>
Deleted: core/branches/flat/src/main/resources/config2to3.bat
===================================================================
--- core/branches/flat/src/main/resources/config2to3.bat 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config2to3.bat 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,24 +0,0 @@
-@echo off
-
-if "%1a" == "a" goto noParams
-if "%2a" == "a" goto noParams
-
-setlocal enabledelayedexpansion
-
-set LIB=
-for %%f in (..\lib\compile\*.jar) do set LIB=!LIB!;%%f
-for %%f in (..\lib\test\*.jar) do set LIB=!LIB!;%%f
-for %%f in (..\lib\*.jar) do set LIB=!LIB!;%%f
-rem echo libs: %LIB%
-
-set CP=%LIB%;..\jbosscache-core.jar;%CP%
-rem echo cp is %CP%
-
-java -classpath "%CP%" -Dsource=%1 -Ddestination=%2 org.jboss.cache.config.parsing.ConfigFilesConvertor
-
-goto fileEnd
-
-:noParams
-echo usage: "%0 <file_to_transform> <destination_file>"
-
-:fileEnd
\ No newline at end of file
Deleted: core/branches/flat/src/main/resources/config2to3.sh
===================================================================
--- core/branches/flat/src/main/resources/config2to3.sh 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config2to3.sh 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,28 +0,0 @@
-#!/bin/bash
-if [ -z $1 ]
-then
- echo Usage:
- echo $0 [source_file] [destination_file]
- exit 1;
-fi
-if [ -e ../lib/compile ]
-then
- for JAR in ../lib/compile/*
- do
- CLASSPATH=$CLASSPATH:$JAR
- done
-fi
-if [ -e ../lib/test ]
-then
- for JAR in ../lib/test/*
- do
- CLASSPATH=$CLASSPATH:$JAR
- done
-fi
-for JAR in ../lib/*
-do
- CLASSPATH=$CLASSPATH:$JAR
-done
-CLASSPATH=../jbosscache-core.jar:$CLASSPATH
-echo classpath is $CLASSPATH
-java -classpath $CLASSPATH -Dsource=$1 -Ddestination=$2 org.jboss.cache.config.parsing.ConfigFilesConvertor
\ No newline at end of file
Deleted: core/branches/flat/src/main/resources/config2to3.xslt
===================================================================
--- core/branches/flat/src/main/resources/config2to3.xslt 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/config2to3.xslt 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,499 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<xsl:stylesheet xmlns="urn:jboss:jbosscache-core:config:3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0">
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:template match="/">
- <xsl:element name="jbosscache">
- <xsl:call-template name="locking"/>
- <xsl:call-template name="transaction"/>
- <xsl:call-template name="serialization"/>
- <xsl:call-template name="startup"/>
- <xsl:call-template name="stateRetrieval"/>
- <xsl:call-template name="transport"/>
- <xsl:apply-templates select="//attribute"/>
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="//attribute"/>
-
- <xsl:template name="locking">
- <xsl:if
- test="//attribute[@name='IsolationLevel'] | //attribute[@name='LockAcquisitionTimeout'] | //attribute[@name='LockParentForChildInsertRemove']">
- <xsl:element name="locking">
- <xsl:if test="//attribute[@name='IsolationLevel']">
- <xsl:attribute name="isolationLevel">
- <xsl:value-of select="normalize-space(//attribute[@name='IsolationLevel'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='LockAcquisitionTimeout']">
- <xsl:attribute name="lockAcquisitionTimeout">
- <xsl:value-of select="normalize-space(//attribute[@name='LockAcquisitionTimeout'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='LockParentForChildInsertRemove']">
- <xsl:attribute name="lockParentForChildInsertRemove">
- <xsl:value-of select="normalize-space(//attribute[@name='LockParentForChildInsertRemove'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='NodeLockingScheme']">
- <xsl:attribute name="nodeLockingScheme">
- <xsl:value-of select="normalize-space(//attribute[@name='NodeLockingScheme'])"/>
- </xsl:attribute>
- </xsl:if>
- </xsl:element>
- </xsl:if>
- </xsl:template>
-
- <xsl:template name="transaction">
- <xsl:if
- test="//attribute[@name='TransactionManagerLookupClass'] | //attribute[@name='SyncRollbackPhase'] | //attribute[@name='SyncCommitPhase']">
- <xsl:element name="transaction">
- <xsl:if test="//attribute[@name='TransactionManagerLookupClass']">
- <xsl:attribute name="transactionManagerLookupClass">
- <xsl:value-of select="normalize-space(//attribute[@name='TransactionManagerLookupClass'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='SyncCommitPhase']">
- <xsl:attribute name="syncCommitPhase">
- <xsl:value-of select="normalize-space(//attribute[@name='SyncCommitPhase'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='SyncRollbackPhase']">
- <xsl:attribute name="syncRollbackPhase">
- <xsl:value-of select="normalize-space(//attribute[@name='SyncRollbackPhase'])"/>
- </xsl:attribute>
- </xsl:if>
- </xsl:element>
- </xsl:if>
- </xsl:template>
-
- <xsl:template name="serialization">
- <xsl:if
- test="//attribute[@name='ObjectInputStreamPoolSize'] | //attribute[@name='ObjectOutputStreamPoolSize'] | //attribute[@name='ReplicationVersion'] | //attribute[@name='MarshallerClass'] | //attribute[@name='UseLazyDeserialization'] | //attribute[@name='UseRegionBasedMarshalling']">
- <serialization>
- <xsl:if test="//attribute[@name='ObjectInputStreamPoolSize']">
- <xsl:attribute name="objectInputStreamPoolSize">
- <xsl:value-of select="normalize-space(//attribute[@name='ObjectInputStreamPoolSize'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='ObjectOutputStreamPoolSize']">
- <xsl:attribute name="objectOutputStreamPoolSize">
- <xsl:value-of select="normalize-space(//attribute[@name='ObjectOutputStreamPoolSize'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='ReplicationVersion']">
- <xsl:attribute name="version">
- <xsl:value-of select="normalize-space(//attribute[@name='ReplicationVersion'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='MarshallerClass']">
- <xsl:attribute name="marshallerClass">
- <xsl:value-of select="normalize-space(//attribute[@name='MarshallerClass'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='UseLazyDeserialization']">
- <xsl:attribute name="useLazyDeserialization">
- <xsl:value-of select="normalize-space(//attribute[@name='UseLazyDeserialization'])"/>
- </xsl:attribute>
- </xsl:if>
-
- <xsl:if test="//attribute[@name='UseRegionBasedMarshalling']">
- <xsl:attribute name="useRegionBasedMarshalling">
- <xsl:value-of select="normalize-space(//attribute[@name='UseRegionBasedMarshalling'])"/>
- </xsl:attribute>
- </xsl:if>
- </serialization>
- </xsl:if>
- </xsl:template>
-
- <xsl:template match="//attribute[@name='CacheMode']">
- <xsl:if test="(normalize-space(.) = 'INVALIDATION_ASYNC') or (normalize-space(.) = 'INVALIDATION_SYNC')">
- <invalidation>
- <xsl:if test="(normalize-space(.) = 'INVALIDATION_ASYNC')">
- <xsl:element name="async">
- <xsl:call-template name="asyncAttributes"/>
- </xsl:element>
- </xsl:if>
- <xsl:if test="(normalize-space(.) = 'INVALIDATION_SYNC')">
- <xsl:element name="sync">
- <xsl:call-template name="syncAttributes"/>
- </xsl:element>
- </xsl:if>
- </invalidation>
- </xsl:if>
- <xsl:if test="(normalize-space(.) = 'REPL_ASYNC') or (normalize-space(.) = 'REPL_SYNC')">
- <replication>
- <xsl:if test="(normalize-space(.) = 'REPL_ASYNC')">
- <xsl:element name="async">
- <xsl:call-template name="asyncAttributes"/>
- </xsl:element>
- </xsl:if>
- <xsl:if test="(normalize-space(.) = 'REPL_SYNC')">
- <xsl:element name="sync">
- <xsl:call-template name="syncAttributes"/>
- </xsl:element>
- </xsl:if>
- <xsl:call-template name="buddy"/>
- </replication>
- </xsl:if>
- </xsl:template>
-
- <xsl:template name="buddy">
- <xsl:if test="//attribute[@name='BuddyReplicationConfig']">
- <buddy>
- <xsl:if test="//buddyReplicationEnabled">
- <xsl:attribute name="enabled">
- <xsl:value-of select="//buddyReplicationEnabled"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//buddyPoolName">
- <xsl:attribute name="poolName">
- <xsl:value-of select="//buddyPoolName"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//buddyCommunicationTimeout">
- <xsl:attribute name="communicationTimeout">
- <xsl:value-of select="//buddyCommunicationTimeout"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//autoDataGravitation | //dataGravitationRemoveOnFind | //dataGravitationSearchBackupTrees">
- <dataGravitation>
- <xsl:if test="//autoDataGravitation">
- <xsl:attribute name="auto">
- <xsl:value-of select="//autoDataGravitation"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//dataGravitationRemoveOnFind">
- <xsl:attribute name="removeOnFind">
- <xsl:value-of select="//dataGravitationRemoveOnFind"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//dataGravitationSearchBackupTrees">
- <xsl:attribute name="searchBackupTrees">
- <xsl:value-of select="//dataGravitationSearchBackupTrees"/>
- </xsl:attribute>
- </xsl:if>
- </dataGravitation>
- </xsl:if>
- <xsl:if test="//buddyLocatorProperties">
- <locator>
- <xsl:if test="//buddyLocatorClass">
- <xsl:attribute name="class">
- <xsl:value-of select="//buddyLocatorClass"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//buddyLocatorProperties">
- <properties>
- <xsl:value-of select="//buddyLocatorProperties"/>
- </properties>
- </xsl:if>
- </locator>
- </xsl:if>
- </buddy>
- </xsl:if>
- </xsl:template>
-
- <xsl:template name="asyncAttributes">
- <xsl:if test="//attribute[@name='UseReplQueue']">
- <xsl:attribute name="useReplQueue">
- <xsl:value-of select="//attribute[@name='UseReplQueue']"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='ReplQueueInterval']">
- <xsl:attribute name="replQueueInterval">
- <xsl:value-of select="//attribute[@name='ReplQueueInterval']"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='ReplQueueMaxElements']">
- <xsl:attribute name="replQueueMaxElements">
- <xsl:value-of select="//attribute[@name='ReplQueueMaxElements']"/>
- </xsl:attribute>
- </xsl:if>
- </xsl:template>
-
- <xsl:template name="syncAttributes">
- <xsl:if test="//attribute[@name='SyncReplTimeout']">
- <xsl:attribute name="replTimeout">
- <xsl:value-of select="//attribute[@name='SyncReplTimeout']"/>
- </xsl:attribute>
- </xsl:if>
- </xsl:template>
-
- <xsl:template name="startup">
- <xsl:if test="//attribute[@name='InactiveOnStartup']">
- <xsl:element name="startup">
- <xsl:attribute name="regionsInactiveOnStartup">
- <xsl:value-of select="normalize-space(//attribute[@name='InactiveOnStartup'])"/>
- </xsl:attribute>
- </xsl:element>
- </xsl:if>
- </xsl:template>
-
- <xsl:template name="stateRetrieval">
- <xsl:if
- test="//attribute[@name='FetchInMemoryState'] | //attribute[@name='StateRetrievalTimeout']">
- <xsl:element name="stateRetrieval">
- <xsl:if test="//attribute[@name='FetchInMemoryState']">
- <xsl:attribute name="fetchInMemoryState">
- <xsl:value-of select="normalize-space(//attribute[@name='FetchInMemoryState'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='StateRetrievalTimeout']">
- <xsl:attribute name="timeout">
- <xsl:value-of select="normalize-space(//attribute[@name='StateRetrievalTimeout'])"/>
- </xsl:attribute>
- </xsl:if>
- </xsl:element>
- </xsl:if>
- </xsl:template>
-
- <xsl:template match="//attribute[@name='ShutdownHookBehavior']">
- <shutdown>
- <xsl:attribute name="hookBehavior">
- <xsl:value-of select="normalize-space(.)"/>
- </xsl:attribute>
- </shutdown>
- </xsl:template>
-
- <xsl:template match="//attribute[@name='ExposeManagementStatistics']">
- <jmxStatistics>
- <xsl:attribute name="enabled">
- <xsl:value-of select="normalize-space(.)"/>
- </xsl:attribute>
- </jmxStatistics>
- </xsl:template>
-
- <xsl:template match="//attribute[@name='EvictionPolicyConfig']">
- <eviction>
- <xsl:if test="./config/attribute[@name='wakeUpIntervalSeconds']">
- <xsl:attribute name="wakeUpInterval">
- <xsl:value-of
- select="concat(normalize-space(./config/attribute[@name='wakeUpIntervalSeconds']), '000')"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./config/region[@name='/_default_']">
- <default>
- <xsl:choose>
- <xsl:when test="./config/region[@name='/_default_' and @policyClass]">
- <xsl:if test="./config/region[@name='/_default_' and not(starts-with(@policyClass,'org.jboss.cache.eviction'))]">
- <xsl:message terminate="yes">A custom eviction policy is used for '/_default_' region. Starting with JBossCache 3.x the eviction API changed, so this config file will require manual transformation.</xsl:message>
- </xsl:if>
- <xsl:attribute name="algorithmClass">
- <xsl:value-of
- select="concat(substring-before(./config/region[@name='/_default_']/@policyClass,'Policy'), 'Algorithm')"/>
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:if
- test="./config/attribute[@name='policyClass' and starts-with(string(.), 'org.jboss.cache.eviction')]">
- <xsl:attribute name="algorithmClass">
- <xsl:value-of
- select="concat(substring-before(./config/attribute[@name='policyClass'],'Policy'), 'Algorithm')"/>
- </xsl:attribute>
- </xsl:if>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:if
- test="./config/attribute[@name='policyClass' and not(starts-with(string(.), 'org.jboss.cache.eviction'))]">
- <xsl:message terminate="yes">Custom eviction policies require manual transformation.</xsl:message>
- </xsl:if>
- <xsl:if test="./config/attribute[@name='eventQueueSize']">
- <xsl:attribute name="eventQueueSize">
- <xsl:value-of select="normalize-space(./config/attribute[@name='eventQueueSize'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:for-each select="./config/region[@name='/_default_']/attribute">
- <xsl:call-template name="attributesSecondsSubstitution">
- <xsl:with-param name="attr" select="."/>
- </xsl:call-template>
- </xsl:for-each>
- </default>
- </xsl:if>
- <xsl:for-each select="./config/region[@name!='/_default_']">
- <region>
- <xsl:if test="@name">
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="@policyClass and starts-with(string(@policyClass), 'org.jboss.cache.eviction')">
- <xsl:attribute name="algorithmClass">
- <xsl:value-of select="concat(substring-before(@policyClass,'Policy'), 'Algorithm')"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="@policyClass and not(starts-with(string(@policyClass), 'org.jboss.cache.eviction'))">
- <xsl:message terminate="yes">Custom eviction policies require manual transformation.</xsl:message>
- </xsl:if>
- <xsl:if test="not(@policyClass)">
- <xsl:attribute name="algorithmClass">
- <xsl:value-of
- select="concat(substring-before(../attribute[@name='policyClass'],'Policy'), 'Algorithm')"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="@eventQueueSize">
- <xsl:attribute name="eventQueueSize">
- <xsl:value-of select="normalize-space(@eventQueueSize)"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="not(@eventQueueSize)">
- <xsl:attribute name="eventQueueSize">
- <xsl:value-of select="normalize-space(../attribute[@name='eventQueueSize'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:for-each select="./*">
- <xsl:call-template name="attributesSecondsSubstitution">
- <xsl:with-param name="attr" select="."/>
- </xsl:call-template>
- </xsl:for-each>
- </region>
- </xsl:for-each>
- </eviction>
- </xsl:template>
-
- <xsl:template name="attributesSecondsSubstitution">
- <xsl:param name="attr"/>
- <attribute>
- <xsl:choose>
- <xsl:when test="contains($attr/@name,'Seconds')">
- <xsl:attribute name="name">
- <xsl:value-of select="substring-before($attr/@name,'Seconds')"/>
- </xsl:attribute>
- <xsl:value-of select="concat($attr,'000')"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="name">
- <xsl:value-of select="string($attr/@name)"/>
- </xsl:attribute>
- <xsl:value-of select="$attr"/>
- </xsl:otherwise>
- </xsl:choose>
- </attribute>
- </xsl:template>
-
- <xsl:template match="//attribute[@name='CacheLoaderConfig'] | //attribute[@name='CacheLoaderConfiguration']">
- <loaders>
- <xsl:if test="./config/passivation">
- <xsl:attribute name="passivation">
- <xsl:value-of select="./config/passivation"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./config/shared">
- <xsl:attribute name="shared">
- <xsl:value-of select="./config/shared"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./config/preload">
- <preload>
- <xsl:call-template name="preloadTokenizer">
- <xsl:with-param name="string" select="./config/preload"/>
- <xsl:with-param name="delimiter" select="','"/>
- </xsl:call-template>
- </preload>
- </xsl:if>
- <xsl:for-each select="./config/cacheloader">
- <loader>
- <xsl:if test="./class">
- <xsl:attribute name="class">
- <xsl:value-of select="./class"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./async">
- <xsl:attribute name="async">
- <xsl:value-of select="./async"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./fetchPersistentState">
- <xsl:attribute name="fetchPersistentState">
- <xsl:value-of select="./fetchPersistentState"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./ignoreModifications">
- <xsl:attribute name="ignoreModifications">
- <xsl:value-of select="./ignoreModifications"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./purgeOnStartup">
- <xsl:attribute name="purgeOnStartup">
- <xsl:value-of select="./purgeOnStartup"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./properties">
- <xsl:copy-of select="./properties"/>
- </xsl:if>
- <xsl:if test="./singletonStore">
- <singletonStore>
- <xsl:if test="./singletonStore/enabled">
- <xsl:attribute name="enabled">
- <xsl:value-of select="./singletonStore/enabled"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./singletonStore/enabled">
- <xsl:attribute name="enabled">
- <xsl:value-of select="./singletonStore/enabled"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./singletonStore/class">
- <xsl:attribute name="class">
- <xsl:value-of select="./singletonStore/class"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:copy-of select="./singletonStore/properties"/>
- </singletonStore>
- </xsl:if>
- </loader>
- </xsl:for-each>
- </loaders>
- </xsl:template>
-
-
- <xsl:template name="preloadTokenizer">
- <xsl:param name="string"/>
- <xsl:param name="delimiter" select="' '"/>
- <xsl:choose>
- <xsl:when test="$delimiter and contains($string, $delimiter)">
- <node>
- <xsl:attribute name="fqn">
- <xsl:value-of select="substring-before($string,$delimiter)"/>
- </xsl:attribute>
- </node>
- <xsl:call-template name="preloadTokenizer">
- <xsl:with-param name="string" select="substring-after($string,$delimiter)"/>
- <xsl:with-param name="delimiter" select="$delimiter"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <node>
- <xsl:attribute name="fqn">
- <xsl:value-of select="$string"/>
- </xsl:attribute>
- </node>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <xsl:template name="transport">
- <xsl:if
- test="//attribute[@name='ClusterName'] | //attribute[@name='MultiplexerStack'] | //attribute[@name='ClusterConfig']">
- <transport>
- <xsl:if test="//attribute[@name='ClusterName']">
- <xsl:attribute name="clusterName">
- <xsl:value-of select="normalize-space(//attribute[@name='ClusterName'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='MultiplexerStack']">
- <xsl:attribute name="multiplexerStack">
- <xsl:value-of select="normalize-space(//attribute[@name='MultiplexerStack'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="//attribute[@name='ClusterConfig']">
- <jgroupsConfig>
- <xsl:copy-of select="//attribute[@name='ClusterConfig']/config/*"/>
- </jgroupsConfig>
- </xsl:if>
- </transport>
- </xsl:if>
- </xsl:template>
-
-</xsl:stylesheet>
Modified: 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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd 2008-11-13 18:15:23 UTC (rev 7133)
@@ -3,255 +3,259 @@
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: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="stateRetrieval" type="tns:stateRetrievalType" 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="replication" type="tns:replicationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="invalidation" type="tns:invalidationType" 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="transport" type="tns:transportType" 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:all>
- </xs:complexType>
+ <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="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="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 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>
- <xs:complexType name="stateRetrievalType">
- <xs:attribute name="fetchInMemoryState" type="tns:booleanType"/>
- <xs:attribute name="timeout" type="tns:positiveInteger"/>
- </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="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="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="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:complexType name="startupType">
+ <xs:attribute name="regionsInactiveOnStartup" 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:complexType name="stateRetrievalType">
+ <xs:attribute name="fetchInMemoryState" type="tns:booleanType"/>
+ <xs:attribute name="timeout" type="tns:positiveInteger"/>
+ </xs:complexType>
- <xs:simpleType name="positiveInteger">
- <xs:restriction base="xs:string">
- <xs:pattern value="\$\{.*\}|\+?[0-9]*"/>
- </xs:restriction>
- </xs:simpleType>
+ <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="replicationType">
- <xs:sequence>
- <xs:choice>
- <xs:element name="sync" type="tns:syncType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="async" type="tns:asyncType" minOccurs="0" maxOccurs="1"/>
- </xs:choice>
- <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:sequence>
- </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:complexType name="invalidationType">
- <xs:choice>
- <xs:element name="sync" type="tns:syncType"/>
- <xs:element name="async" type="tns:asyncType"/>
- </xs:choice>
- </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:complexType name="jmxStatisticsType">
- <xs:attribute name="enabled" type="tns:booleanType"/>
- </xs:complexType>
+ <xs:simpleType name="positiveInteger">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="\$\{.*\}|\+?[0-9]*"/>
+ </xs:restriction>
+ </xs:simpleType>
- <xs:complexType name="listenersType">
- <xs:attribute name="asyncPoolSize" type="tns:positiveInteger"/>
- </xs:complexType>
+ <xs:complexType name="jmxStatisticsType">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ </xs:complexType>
- <xs:complexType name="invocationBatchingType">
- <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="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="invocationBatchingType">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ </xs:complexType>
- <xs:complexType name="syncType">
- <xs:attribute name="replTimeout" type="tns:positiveInteger"/>
- </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="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:complexType>
+ <xs:complexType name="syncType">
+ <xs:attribute name="replTimeout" 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="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="evictionRegionType">
- <xs:sequence>
- <xs:element name="attribute" maxOccurs="unbounded" type="tns:attributeType"/>
- </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="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="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="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="customInterceptorsType">
- <xs:sequence>
- <xs:element name="interceptor" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="attribute" maxOccurs="unbounded" type="tns:attributeType" 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="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="attributeType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </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>
Modified: core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java
===================================================================
--- core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java 2008-11-13 18:15:23 UTC (rev 7133)
@@ -21,9 +21,9 @@
*/
package org.jboss.starobrno.profiling;
+import org.jboss.cache.DefaultCacheFactory;
import org.jboss.starobrno.Cache;
import org.jboss.starobrno.CacheException;
-import org.jboss.starobrno.UnitTestCacheFactory;
import org.jboss.starobrno.util.TestingUtil;
import org.testng.annotations.Test;
@@ -37,7 +37,7 @@
{
// adjust the next 4 values
int numEntries = 1000000;
- int payloadSize = 20; // bytes
+ int payloadSize = 60; // bytes
int keySize = 10; // bytes
PayloadType payloadType = PayloadType.STRINGS;
@@ -55,7 +55,8 @@
int kBytesCached = (bytesPerCharacter * numEntries * (payloadSize + keySize)) / 1024;
System.out.println("Bytes to be cached: " + NumberFormat.getIntegerInstance().format(kBytesCached) + " kb");
- Cache c = new UnitTestCacheFactory().createCache(); // default LOCAL cache
+// Cache c = new UnitTestCacheFactory().createCache(false); // default LOCAL cache
+ Cache c = new DefaultCacheFactory().createCache();
for (int i = 0; i < numEntries; i++)
{
switch (payloadType)
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,47 +1,48 @@
<?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="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
- max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true"
- enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true"
- thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
- <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="15000"/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <sync replTimeout="15000"/>
+
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ <stateRetrieval timeout="20000"/>
+ <jgroupsConfig>
+ <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
+ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="true"
+ enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true"
+ thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true"
+ thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
+ <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </clustering>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/clonable-config.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,144 +1,144 @@
<?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"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval fetchInMemoryState="false" timeout="3"/>
- <transport clusterName="CloneCluster" multiplexerStack="udp">
- <jgroupsConfig>
- <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false"
- discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
- use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true"
- use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true"
- thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
- oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <sync replTimeout="2"/>
- <buddy enabled="true" poolName="cloneGroup" communicationTimeout="7">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="CloneCluster">
+ <stateRetrieval fetchInMemoryState="false" timeout="3"/>
+ <jgroupsConfig multiplexerStack="udp">
+ <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ loopback="false"
+ discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
+ use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true"
+ use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true"
+ thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
+ oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/>
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true"
+ view_ack_collection_timeout="5000"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ <sync replTimeout="2"/>
+ <buddy enabled="true" poolName="cloneGroup" communicationTimeout="7">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 11
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+
+ </clustering>
+ <eviction wakeUpInterval="45000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="4">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ <property name="maxAge" value="15000"/>
+ </default>
+ <region name="/fifo" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm">
+ <property name="maxNodes" value="5000"/>
+ </region>
+ <region name="/mru" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm">
+ <property name="maxNodes" value="10000"/>
+ </region>
+ <region name="/lfu" algorithmClass="org.jboss.cache.eviction.LFUAlgorithm">
+ <property name="maxNodes" value="5000"/>
+ <property name="minNodes" value="4000"/>
+ </region>
+ </eviction>
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/"/>
+ </preload>
+ <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true"
+ ignoreModifications="false">
<properties>
- numBuddies = 11
- ignoreColocatedBuddies = true
+ location=/tmp/FileCacheLoader
</properties>
- </locator>
- </buddy>
- </replication>
- <eviction wakeUpInterval="45000">
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="4">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000000</attribute>
- <attribute name="maxAge">15000</attribute>
- </default>
- <region name="/fifo" algorithmClass="org.jboss.starobrno.eviction.algorithms.fifo.FIFOAlgorithm">
- <attribute name="maxNodes">5000</attribute>
- </region>
- <region name="/mru" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm">
- <attribute name="maxNodes">10000</attribute>
- </region>
- <region name="/lfu" algorithmClass="org.jboss.starobrno.eviction.algorithms.lfu.LFUAlgorithm">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="minNodes">4000</attribute>
- </region>
- </eviction>
- <loaders passivation="false" shared="true">
- <preload>
- <node fqn="/"/>
- </preload>
- <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true"
- ignoreModifications="false">
- <properties>
- location=/tmp/FileCacheLoader
- </properties>
- <singletonStore enabled="false">
+ <singletonStore enabled="false">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=5000
+ </properties>
+ </singletonStore>
+ </loader>
+ <loader class="org.jboss.cache.loader.bdbje.BdbjeCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false">
<properties>
- pushStateWhenCoordinator=true
- pushStateWhenCoordinatorTimeout=5000
+ location=/tmp/BdbjeCacheLoader
</properties>
- </singletonStore>
- </loader>
- <loader class="org.jboss.cache.loader.bdbje.BdbjeCacheLoader" async="false" fetchPersistentState="false"
- ignoreModifications="false">
- <properties>
- location=/tmp/BdbjeCacheLoader
- </properties>
- <singletonStore enabled="false">
+ <singletonStore enabled="false">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=5000
+ </properties>
+ </singletonStore>
+ </loader>
+ <loader class="org.jboss.cache.loader.jdbm.JdbmCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false">
<properties>
- pushStateWhenCoordinator=true
- pushStateWhenCoordinatorTimeout=5000
+ location=/tmp/JdbmCacheLoader
</properties>
- </singletonStore>
- </loader>
- <loader class="org.jboss.cache.loader.jdbm.JdbmCacheLoader" async="false" fetchPersistentState="false"
- ignoreModifications="false">
- <properties>
- location=/tmp/JdbmCacheLoader
- </properties>
- <singletonStore enabled="false">
+ <singletonStore enabled="false">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=5000
+ </properties>
+ </singletonStore>
+ </loader>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false">
<properties>
- pushStateWhenCoordinator=true
- pushStateWhenCoordinatorTimeout=5000
+ cache.jdbc.driver=com.foo.jdbc.Driver
+ cache.jdbc.url=foo://driver
+ cache.jdbc.user=sa
+ cache.jdbc.password=secret
</properties>
- </singletonStore>
- </loader>
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false"
- ignoreModifications="false">
- <properties>
- cache.jdbc.driver=com.foo.jdbc.Driver
- cache.jdbc.url=foo://driver
- cache.jdbc.user=sa
- cache.jdbc.password=secret
- </properties>
- <singletonStore enabled="false">
+ <singletonStore enabled="false">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=5000
+ </properties>
+ </singletonStore>
+ </loader>
+ <loader class="org.jboss.cache.loader.TcpDelegatingCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false">
<properties>
- pushStateWhenCoordinator=true
- pushStateWhenCoordinatorTimeout=5000
+ host=127.0.0.1\nport=12121
</properties>
- </singletonStore>
- </loader>
- <loader class="org.jboss.cache.loader.TcpDelegatingCacheLoader" async="false" fetchPersistentState="false"
- ignoreModifications="false">
- <properties>
- host=127.0.0.1\nport=12121
- </properties>
- <singletonStore enabled="false">
+ <singletonStore enabled="false">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=5000
+ </properties>
+ </singletonStore>
+ </loader>
+ <loader class="org.jboss.cache.loader.ClusteredCacheLoader" async="false" fetchPersistentState="false"
+ ignoreModifications="false">
<properties>
- pushStateWhenCoordinator=true
- pushStateWhenCoordinatorTimeout=5000
+ timeout=500
</properties>
- </singletonStore>
- </loader>
- <loader class="org.jboss.cache.loader.ClusteredCacheLoader" async="false" fetchPersistentState="false"
- ignoreModifications="false">
- <properties>
- timeout=500
- </properties>
- <singletonStore enabled="false">
- <properties>
- pushStateWhenCoordinator=true
- pushStateWhenCoordinatorTimeout=5000
- </properties>
- </singletonStore>
- </loader>
- </loaders>
+ <singletonStore enabled="false">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=5000
+ </properties>
+ </singletonStore>
+ </loader>
+ </loaders>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/local-lru-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -2,31 +2,33 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000"/>
- <transport clusterName="JBossCache-Cluster"/>
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000000</attribute>
- </default>
- <region name="/org/jboss/data">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000000</attribute>
- </region>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">5</attribute>
- <attribute name="timeToLive">4000</attribute>
- </region>
- <region name="/test">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLive">4000</attribute>
- </region>
- <region name="/maxAgeTest">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLive">8000</attribute>
- <attribute name="maxAge">10000</attribute>
- </region>
- </eviction>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster">
+ <stateRetrieval timeout="20000"/>
+ </clustering>
+
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ </default>
+ <region name="/org/jboss/data">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ </region>
+ <region name="/org/jboss/test/data">
+ <property name="maxNodes" value="5"/>
+ <property name="timeToLive" value="4000"/>
+ </region>
+ <region name="/test">
+ <property name="maxNodes" value="10000"/>
+ <property name="timeToLive" value="4000"/>
+ </region>
+ <region name="/maxAgeTest">
+ <property name="maxNodes" value="10000"/>
+ <property name="timeToLive" value="8000"/>
+ <property name="maxAge" value="10000"/>
+ </region>
+ </eviction>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/local-passivation.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -2,28 +2,26 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000"/>
- <transport clusterName="JBossCache-Cluster"/>
- <eviction wakeUpInterval="1000">
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000</attribute>
- </default>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">100</attribute>
- <attribute name="timeToLive">1000</attribute>
- </region>
- </eviction>
- <loaders passivation="true" shared="false">
- <preload>
- <node fqn="/"/>
- </preload>
- <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true"
- ignoreModifications="false">
- <properties>
- </properties>
- </loader>
- </loaders>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <eviction wakeUpInterval="1000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000"/>
+ </default>
+ <region name="/org/jboss/test/data">
+ <property name="maxNodes" value="100"/>
+ <property name="timeToLive" value="1000"/>
+ </region>
+ </eviction>
+ <loaders passivation="true" shared="false">
+ <preload>
+ <node fqn="/"/>
+ </preload>
+ <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true"
+ ignoreModifications="false">
+ <properties>
+ </properties>
+ </loader>
+ </loaders>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/local-tx.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -2,9 +2,21 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <serialization useRegionBasedMarshalling="false"/>
- <stateRetrieval timeout="20000"/>
- <transport clusterName="JBossCache-Cluster"/>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <serialization useRegionBasedMarshalling="false"/>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ </default>
+ <region name="/org/jboss/data">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ </region>
+ <region name="/org/jboss/test/data">
+ <property name="maxNodes" value="5"/>
+ <property name="timeToLive" value="4000"/>
+ </region>
+ </eviction>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -2,53 +2,28 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false"
- discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
- use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true"
- use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true"
- thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
- oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="20000000" min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000000</attribute>
- </default>
- <region name="/org/jboss/data" algorithmClass="org.jboss.starobrno.eviction.algorithms.fifo.FIFOAlgorithm">
- <attribute name="maxNodes">5000</attribute>
- </region>
- <region name="/test/" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm">
- <attribute name="maxNodes">10000</attribute>
- </region>
- <region name="/maxAgeTest/">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLive">8000</attribute>
- <attribute name="maxAge">10000</attribute>
- </region>
- </eviction>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering>
+ <stateRetrieval timeout="20000"/>
+ <jgroupsConfig configFile="udp.xml"/>
+ </clustering>
+
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ </default>
+ <region name="/org/jboss/data" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm">
+ <property name="maxNodes" value="5000"/>
+ </region>
+ <region name="/test/" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm">
+ <property name="maxNodes" value="10000"/>
+ </region>
+ <region name="/maxAgeTest/">
+ <property name="maxNodes" value="10000"/>
+ <property name="timeToLive" value="8000"/>
+ <property name="maxAge" value="10000"/>
+ </region>
+ </eviction>
</jbosscache>
Modified: core/branches/flat/src/test/resources/configs/mux.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/mux.xml 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/mux.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="urn:jboss:jbosscache-core:config:3.0">
-
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000"/>
- <transport clusterName="JBossCache-Cluster" multiplexerStack="tcp"/>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering>
+ <stateRetrieval timeout="20000"/>
+ <jgroupsConfig multiplexerStack="tcp"/>
+ </clustering>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,45 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000" fetchInMemoryState="false"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
- enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
- oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
- oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
- thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
- thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
- thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
- use_send_queues="false"/>
- <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD max_tries="5" shun="true" timeout="10000"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- use_mcast_xmit="false"/>
- <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
- <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
- view_ack_collection_timeout="5000" view_bundling="true"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
- <replication>
- <async/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering>
+ <stateRetrieval fetchInMemoryState="false"/>
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ <async/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </clustering>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/parser-test-async.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -6,112 +6,107 @@
xmlns="urn:jboss:jbosscache-core:config:3.0">
- <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
- nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/>
+ <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
+ nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
- syncRollbackPhase="true" syncCommitPhase="true"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="true" syncCommitPhase="true"/>
- <!-- serialization related configuration, used for replication and cache loading -->
- <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4"
- marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/>
+ <jmxStatistics enabled="false"/>
- <replication>
- <async useReplQueue="false" serializationExecutorPoolSize="250"/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <startup regionsInactiveOnStartup="true"/>
+ <shutdown hookBehavior="REGISTER"/>
+ <listeners asyncPoolSize="5" asyncQueueSize="100000"/>
+ <invocationBatching enabled="true"/>
- <stateRetrieval timeout="15124" fetchInMemoryState="true"/>
- <startup regionsInactiveOnStartup="true"/>
- <shutdown hookBehavior="REGISTER"/>
+ <!-- serialization related configuration, used for replication and cache loading -->
+ <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4"
+ marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/>
- <transport clusterName="JBossCache-Cluster" multiplexerStack="file_name">
- <jgroupsConfig>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
+ <clustering mode="replication" clusterName="JBossCache-cluster">
+ <async useReplQueue="false" serializationExecutorPoolSize="250" serializationExecutorQueueSize="5000000"/>
+ <stateRetrieval timeout="15124" fetchInMemoryState="true"/>
+ <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>
+ <jgroupsConfig>
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD timeout="10000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="5000"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </clustering>
+ <eviction wakeUpInterval="5">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000"/>
+ </default>
+ <region name="/org/jboss/data">
+ <property name="timeToLive" value="1002"/>
+ </region>
+ <region name="/org/jboss/xyz" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm" eventQueueSize="21">
+ <property name="maxNodes" value="2103"/>
+ <property name="minTimeToLive" value="22"/>
+ </region>
+ </eviction>
- <jmxStatistics enabled="false"/>
+ <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig-->
+ <loaders passivation="true" shared="true">
+ <preload>
+ <node fqn="/a/b/c"/>
+ <node fqn="/f/r/s"/>
+ </preload>
- <eviction wakeUpInterval="5">
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000</attribute>
- </default>
- <region name="/org/jboss/data">
- <attribute name="timeToLive">1002</attribute>
- </region>
- <region name="/org/jboss/xyz" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm" eventQueueSize="21">
- <attribute name="maxNodes">2103</attribute>
- <attribute name="minTimeToLive">22</attribute>
- </region>
- </eviction>
-
- <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig-->
- <loaders passivation="true" shared="true">
- <preload>
- <node fqn="/a/b/c"/>
- <node fqn="/f/r/s"/>
- </preload>
-
- <!-- we can now have multiple cache loaders, which get chained -->
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="true" fetchPersistentState="true"
- ignoreModifications="true" purgeOnStartup="true">
- <properties>
- cache.jdbc.table.name=jbosscache
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=true
- </properties>
- <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader">
+ <!-- we can now have multiple cache loaders, which get chained -->
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="true" fetchPersistentState="true"
+ ignoreModifications="true" purgeOnStartup="true">
<properties>
- pushStateWhenCoordinator=true
- pushStateWhenCoordinatorTimeout=20000
+ cache.jdbc.table.name=jbosscache
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=true
</properties>
- </singletonStore>
- </loader>
- </loaders>
+ <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=20000
+ </properties>
+ </singletonStore>
+ </loader>
+ </loaders>
- <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations -->
- <customInterceptors>
- <interceptor position="first" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor">
- <attribute name="attrOne">value1</attribute>
- <attribute name="attrTwo">value2</attribute>
- <attribute name="attrThree">value3</attribute>
- </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>
+ <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations -->
+ <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>
- <!-- the number of threads to use for asynchronous cache listeners - defaults to 1 -->
- <listeners asyncPoolSize="5"/>
- <invocationBatching enabled="true"/>
+ <!-- the number of threads to use for asynchronous cache listeners - defaults to 1 -->
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/parser-test.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -5,113 +5,97 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.0">
+ <!-- perCache -> differrent EntryFactory-->
+ <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
+ nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/>
- <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
- nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/>
+ <!-- perCM -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
+ syncRollbackPhase="true" syncCommitPhase="true"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"
- syncRollbackPhase="true" syncCommitPhase="true"/>
+ <jmxStatistics enabled="false"/>
- <!-- serialization related configuration, used for replication and cache loading -->
- <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4"
- marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/>
+ <startup regionsInactiveOnStartup="true"/>
+ <shutdown hookBehavior="REGISTER"/>
+ <listeners asyncPoolSize="5"/>
+ <!-- perCache -->
+ <invocationBatching enabled="true"/>
- <replication>
- <sync replTimeout="15421"/>
- <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
- <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/>
- <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
- <properties>
- numBuddies = 1
- ignoreColocatedBuddies = true
- </properties>
- </locator>
- </buddy>
- </replication>
+ <!-- per CM-->
+ <!-- serialization related configuration, used for replication and cache loading -->
+ <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4"
+ marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/>
- <stateRetrieval timeout="15124" fetchInMemoryState="true"/>
- <startup regionsInactiveOnStartup="true"/>
- <shutdown hookBehavior="REGISTER"/>
+ <!-- per Cache -->
+ <clustering mode="replication" clusterName="JBossCache-cluster">
+ <stateRetrieval timeout="15124" fetchInMemoryState="true"/>
+ <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>
+ <sync replTimeout="15421"/>
+ <jgroupsConfig multiplexerStack="file_name"/>
+ </clustering>
- <transport clusterName="JBossCache-Cluster" multiplexerStack="file_name">
- <jgroupsConfig>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
+ <!-- per cache, 1) algo/cache 2) what/cache 3) collecting data 4) timer thread / per CM -->
+ <eviction wakeUpInterval="5">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000"/>
+ </default>
+ <region name="/org/jboss/data">
+ <property name="timeToLive" value="1002"/>
+ </region>
+ <region name="/org/jboss/xyz" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm" eventQueueSize="21">
+ <property name="maxNodes" value="2103"/>
+ <property name="minTimeToLive" value="22"/>
+ </region>
+ </eviction>
+ <!-- cacheLoaders/Cache; optimization - reusing CL through caches -->
+ <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig-->
+ <loaders passivation="true" shared="true">
+ <preload>
+ <node fqn="/a/b/c"/>
+ <node fqn="/f/r/s"/>
+ </preload>
- <jmxStatistics enabled="false"/>
-
- <eviction wakeUpInterval="5">
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000</attribute>
- </default>
- <region name="/org/jboss/data">
- <attribute name="timeToLive">1002</attribute>
- </region>
- <region name="/org/jboss/xyz" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm" eventQueueSize="21">
- <attribute name="maxNodes">2103</attribute>
- <attribute name="minTimeToLive">22</attribute>
- </region>
- </eviction>
-
- <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig-->
- <loaders passivation="true" shared="true">
- <preload>
- <node fqn="/a/b/c"/>
- <node fqn="/f/r/s"/>
- </preload>
-
- <!-- we can now have multiple cache loaders, which get chained -->
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="true" fetchPersistentState="true"
- ignoreModifications="true" purgeOnStartup="true">
- <properties>
- cache.jdbc.table.name=jbosscache
- cache.jdbc.table.create=true
- cache.jdbc.table.drop=true
- </properties>
- <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader">
+ <!-- we can now have multiple cache loaders, which get chained -->
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="true" fetchPersistentState="true"
+ ignoreModifications="true" purgeOnStartup="true">
<properties>
- pushStateWhenCoordinator=true
- pushStateWhenCoordinatorTimeout=20000
+ cache.jdbc.table.name=jbosscache
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=true
</properties>
- </singletonStore>
- </loader>
- </loaders>
+ <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader">
+ <properties>
+ pushStateWhenCoordinator=true
+ pushStateWhenCoordinatorTimeout=20000
+ </properties>
+ </singletonStore>
+ </loader>
+ </loaders>
- <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations -->
- <customInterceptors>
- <interceptor position="first" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor">
- <attribute name="attrOne">value1</attribute>
- <attribute name="attrTwo">value2</attribute>
- <attribute name="attrThree">value3</attribute>
- </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>
+ <!-- per CacheInstance -->
+ <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations -->
+ <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>
- <!-- the number of threads to use for asynchronous cache listeners - defaults to 1 -->
- <listeners asyncPoolSize="5"/>
- <invocationBatching enabled="true"/>
+ <!-- the number of threads to use for asynchronous cache listeners - defaults to 1 -->
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,58 +1,26 @@
<?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="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <stateRetrieval timeout="20000"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false"
- discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
- use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true"
- use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true"
- thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
- oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FC max_credits="20000000" min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
-
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000000</attribute>
- </default>
- <region name="/org/jboss/data" algorithmClass="org.jboss.starobrno.eviction.algorithms.lfu.LFUAlgorithm">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="minNodes">1000</attribute>
- </region>
- <region name="/org/jboss/test/data" algorithmClass="org.jboss.starobrno.eviction.algorithms.fifo.FIFOAlgorithm">
- <attribute name="maxNodes">5</attribute>
- </region>
- <region name="/test/" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm">
- <attribute name="maxNodes">10000</attribute>
- </region>
- <region name="/maxAgeTest/" algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm">
- <attribute name="maxNodes">10000</attribute>
- <attribute name="timeToLive">8000</attribute>
- <attribute name="maxAge">10000</attribute>
- </region>
- </eviction>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <clustering clusterName="JBossCache-Cluster123"/>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000000"/>
+ </default>
+ <region name="/org/jboss/data" algorithmClass="org.jboss.cache.eviction.LFUAlgorithm">
+ <property name="maxNodes" value="5000"/>
+ <property name="minNodes" value="1000"/>
+ </region>
+ <region name="/org/jboss/test/data" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm">
+ <property name="maxNodes" value="5"/>
+ </region>
+ <region name="/test/" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm">
+ <property name="maxNodes" value="10000"/>
+ </region>
+ <region name="/maxAgeTest/" algorithmClass="org.jboss.cache.eviction.LRUAlgorithm">
+ <property name="maxNodes" value="10000"/>
+ <property name="timeToLive" value="8000"/>
+ <property name="maxAge" value="10000"/>
+ </region>
+ </eviction>
</jbosscache>
Deleted: core/branches/flat/src/test/resources/configs/repl-with-cl.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/repl-with-cl.xml 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/repl-with-cl.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,83 +0,0 @@
-<?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">
-
- <!--
- isolationLevel : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
-
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
-
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
- max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true"
- enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true"
- thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
- <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
-
-
- <!-- Cache Passivation for Tree Cache
- On passivation, The objects are written to the backend store on eviction if passivation
- is true, otherwise the objects are persisted. On activation, the objects are restored in
- the memory cache and removed from the cache loader if 'passivation' attribute is true,
- otherwise the objects are only loaded from the cache loader -->
- <loaders passivation="false" shared="false">
- <preload>
- <node fqn="/"/>
- </preload>
- <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true"
- ignoreModifications="false" 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>
- </loader>
- </loaders>
- <replication>
- <sync replTimeout="30000"/>
- </replication>
-
-</jbosscache>
Deleted: core/branches/flat/src/test/resources/configs/repl-with-cl2.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/repl-with-cl2.xml 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/repl-with-cl2.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,87 +0,0 @@
-<?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">
-
- <!--
- isolationLevel : SERIALIZABLE - (not supported in mvcc)
- REPEATABLE_READ (default)
- READ_COMMITTED
- READ_UNCOMMITTED (not supported in mvcc)
- NONE
- lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition
- nodeLockingScheme : mvcc (default)
- optimistic
- pessimistic
- -->
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
-
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
-
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
- max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true"
- enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true"
- thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1"
- thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true"
- thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
- <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false"
- view_bundling="true" view_ack_collection_timeout="5000"/>
- <FC max_credits="5000000" min_threshold="0.20"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
-
- <stateRetrieval fetchInMemoryState="false" timeout="0"/>
-
-
- <!-- Cache Passivation for Tree Cache
- On passivation, The objects are written to the backend store on eviction if passivation
- is true, otherwise the objects are persisted. On activation, the objects are restored in
- the memory cache and removed from the cache loader if 'passivation' attribute is true,
- otherwise the objects are only loaded from the cache loader -->
- <loaders passivation="false" shared="false">
- <preload>
- <node fqn="/"/>
- </preload>
- <!-- if passivation is true, only the first cache loader is used; the rest are ignored -->
- <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true"
- ignoreModifications="false" 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:jbossdb2;create=true
- cache.jdbc.user=user1
- cache.jdbc.password=user1
- cache.jdbc.batch.enable=true
- cache.jdbc.batch.size=1000
- </properties>
- </loader>
- </loaders>
-
- <replication>
- <sync replTimeout="30000"/>
- </replication>
-</jbosscache>
Modified: core/branches/flat/src/test/resources/configs/replSync.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/replSync.xml 2008-11-13 18:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/replSync.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,40 +1,11 @@
<?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="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <serialization useRegionBasedMarshalling="true"/>
- <stateRetrieval fetchInMemoryState="true" timeout="15000"/>
- <transport clusterName="JBossCache-Cluster">
- <jgroupsConfig>
- <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false"
- discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
- use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true"
- use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true"
- thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
- oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true"
- oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <FD timeout="10000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,1200,2400,3600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/>
- <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true"
- view_ack_collection_timeout="5000"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
- <pbcast.FLUSH timeout="0"/>
- </jgroupsConfig>
- </transport>
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
- <replication>
- <sync replTimeout="15000"/>
- </replication>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <serialization useRegionBasedMarshalling="true"/>
+ <clustering>
+ <stateRetrieval fetchInMemoryState="true" timeout="15000"/>
+ <jgroupsConfig configFile="udp.xml"/>
+ <sync replTimeout="15000"/>
+ </clustering>
</jbosscache>
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/configs/string-property-replaced.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,44 +1,45 @@
<?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 lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"
- nodeLockingScheme="${test.property.NodeLockingScheme:OPTIMISTIC}"/>
- <transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/>
- <serialization useRegionBasedMarshalling="true"/>
- <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
- <startup regionsInactiveOnStartup="true"/>
- <transport clusterName="optimistic-entity" multiplexerStack="udp-sync">
- <jgroupsConfig/>
- </transport>
- <replication>
- <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">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0">
+
+ <locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"
+ nodeLockingScheme="${test.property.NodeLockingScheme:MVCC}"/>
+
+ <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>
- ignoreColocatedBuddies = true
- numBuddies = ${test.property.BuddyReplicationConfig.numBuddies:1}
+ location=${test.property.CacheLoaderConfiguration.location,java.io.tmpdir:/tmp}
</properties>
- </locator>
- </buddy>
- </replication>
- <eviction wakeUpInterval="5000">
- <default
- algorithmClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm}">
- <attribute name="maxNodes">${test.property.EvictionPolicyConfig.maxNodes:5000}</attribute>
- <attribute name="timeToLive">1000000</attribute>
- </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>
+ </loader>
+ </loaders>
</jbosscache>
Deleted: core/branches/flat/src/test/resources/jbc2-registry-configs.xml
===================================================================
(Binary files differ)
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:08:44 UTC (rev 7132)
+++ core/branches/flat/src/test/resources/unit-test-cache-service.xml 2008-11-13 18:15:23 UTC (rev 7133)
@@ -1,316 +1,316 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0">
- <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <serialization useRegionBasedMarshalling="false"/>
- <stateRetrieval fetchInMemoryState="true" timeout="15000"/>
- <transport clusterName="JBossCache-Cluster"/>
- <replication>
- <sync replTimeout="15000"/>
- </replication>
- <eviction wakeUpInterval="2000">
- <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000</attribute>
- </default>
- <region name="/org/jboss/data">
- <attribute name="maxNodes">5000</attribute>
- <attribute name="timeToLive">1000</attribute>
- </region>
- <region name="/org/jboss/test/data">
- <attribute name="maxNodes">5</attribute>
- <attribute name="timeToLive">4</attribute>
- </region>
- </eviction>
- <loaders passivation="true" shared="false">
- <preload>
- <node fqn="/"/>
- </preload>
- <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true"
- ignoreModifications="false">
- <properties/>
- </loader>
- </loaders>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <serialization useRegionBasedMarshalling="false"/>
+ <clustering>
+ <sync replTimeout="15000"/>
+ <stateRetrieval fetchInMemoryState="true" timeout="15000"/>
+ </clustering>
- <protocol_stacks>
- <stack name="udp"
- description="Default: IP multicast based stack, with flow control and message bundling">
- <config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="true"
- enable_diagnostics="true"
+ <eviction wakeUpInterval="2000">
+ <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000"/>
+ </default>
+ <region name="/org/jboss/data">
+ <property name="maxNodes" value="5000"/>
+ <property name="timeToLive" value="1000"/>
+ </region>
+ <region name="/org/jboss/test/data">
+ <property name="maxNodes" value="5"/>
+ <property name="timeToLive" value="4"/>
+ </region>
+ </eviction>
+ <loaders passivation="true" shared="false">
+ <preload>
+ <node fqn="/"/>
+ </preload>
+ <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true"
+ ignoreModifications="false">
+ <properties/>
+ </loader>
+ </loaders>
- use_concurrent_stack="true"
+ <protocol_stacks>
+ <stack name="udp"
+ description="Default: IP multicast based stack, with flow control and message bundling">
+ <config>
+ <UDP mcast_addr="228.10.10.10"
+ mcast_port="45588"
+ tos="8"
+ ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000"
+ mcast_send_buf_size="640000"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ ip_ttl="2"
+ enable_bundling="true"
+ enable_diagnostics="true"
- thread_naming_pattern="pl"
+ use_concurrent_stack="true"
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="10"
- thread_pool.rejection_policy="Run"
+ thread_naming_pattern="pl"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="10"
+ thread_pool.rejection_policy="Run"
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <!--
- Note that this is an atypically short timeout and a small number of retries
- configured this way to speed up unit testing, since we know all nodes run in the same JVM
- and hence failure detections will be very quick.
- -->
- <FD timeout="1000" max_tries="2" shun="true"/>
- <VERIFY_SUSPECT timeout="250"/>
- <!-- this is a more typical configuration of FD and VERIFY_SUSPECT-->
- <!--<FD timeout="10000" max_tries="5" shun="true"/>-->
- <!--<VERIFY_SUSPECT timeout="1500"/>-->
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="1000" shun="false"
- view_bundling="true" view_ack_collection_timeout="1000"/>
- <FC max_credits="20000000" min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </stack>
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
- <stack name="udp-sync"
- description="IP multicast based stack, without flow control and without message bundling. This should be used
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <!--
+ Note that this is an atypically short timeout and a small number of retries
+ configured this way to speed up unit testing, since we know all nodes run in the same JVM
+ and hence failure detections will be very quick.
+ -->
+ <FD timeout="1000" max_tries="2" shun="true"/>
+ <VERIFY_SUSPECT timeout="250"/>
+ <!-- this is a more typical configuration of FD and VERIFY_SUSPECT-->
+ <!--<FD timeout="10000" max_tries="5" shun="true"/>-->
+ <!--<VERIFY_SUSPECT timeout="1500"/>-->
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="false" join_timeout="1000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="1000"/>
+ <FC max_credits="20000000" min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </stack>
+
+ <stack name="udp-sync"
+ description="IP multicast based stack, without flow control and without message bundling. This should be used
instead of udp if (1) synchronous calls are used and (2) the message volume (rate and size)
is not that large. Don't use this configuration if you send messages at a high sustained rate, or you might
run out of memory">
- <config>
- <UDP mcast_addr="228.10.10.10"
- mcast_port="45588"
- tos="8"
- ucast_recv_buf_size="20000000"
- ucast_send_buf_size="640000"
- mcast_recv_buf_size="25000000"
- mcast_send_buf_size="640000"
- loopback="false"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- ip_ttl="2"
- enable_bundling="true"
- enable_diagnostics="true"
+ <config>
+ <UDP mcast_addr="228.10.10.10"
+ mcast_port="45588"
+ tos="8"
+ ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000"
+ mcast_send_buf_size="640000"
+ loopback="false"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ ip_ttl="2"
+ enable_bundling="true"
+ enable_diagnostics="true"
- use_concurrent_stack="true"
+ use_concurrent_stack="true"
- thread_naming_pattern="pl"
+ thread_naming_pattern="pl"
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="30000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="Run"
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="30000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="Run"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="4"
- oob_thread_pool.keep_alive_time="10000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="10"
- oob_thread_pool.rejection_policy="Run"/>
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="4"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run"/>
- <PING timeout="2000" num_initial_members="3"/>
- <MERGE2 max_interval="30000" min_interval="10000"/>
- <FD_SOCK/>
- <!--
- Note that this is an atypically short timeout and a small number of retries
- configured this way to speed up unit testing, since we know all nodes run in the same JVM
- and hence failure detections will be very quick.
- -->
- <FD timeout="1000" max_tries="2" shun="true"/>
- <VERIFY_SUSPECT timeout="250"/>
- <!-- this is a more typical configuration of FD and VERIFY_SUSPECT-->
- <!--<FD timeout="10000" max_tries="5" shun="true"/>-->
- <!--<VERIFY_SUSPECT timeout="1500"/>-->
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,900,1200"
- discard_delivered_msgs="true"/>
- <UNICAST timeout="300,600,900,1200"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="1000" shun="false"
- view_bundling="true" view_ack_collection_timeout="1000"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </stack>
+ <PING timeout="2000" num_initial_members="3"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <!--
+ Note that this is an atypically short timeout and a small number of retries
+ configured this way to speed up unit testing, since we know all nodes run in the same JVM
+ and hence failure detections will be very quick.
+ -->
+ <FD timeout="1000" max_tries="2" shun="true"/>
+ <VERIFY_SUSPECT timeout="250"/>
+ <!-- this is a more typical configuration of FD and VERIFY_SUSPECT-->
+ <!--<FD timeout="10000" max_tries="5" shun="true"/>-->
+ <!--<VERIFY_SUSPECT timeout="1500"/>-->
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,900,1200"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,900,1200"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="false" join_timeout="1000" shun="false"
+ view_bundling="true" view_ack_collection_timeout="1000"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </stack>
- <stack name="tcp"
- description="TCP based stack, with flow control and message bundling. This is usually used when IP
+ <stack name="tcp"
+ description="TCP based stack, with flow control and message bundling. This is usually used when IP
multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast).
Note that TCP.bind_addr and TCPPING.initial_hosts should be set, possibly via system properties, e.g.
-Djgroups.bind_addr=192.168.5.2 and -Djgroups.tcpping.initial_hosts=192.168.5.2[7800]">
- <config>
- <TCP start_port="7800"
- loopback="true"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="true"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
+ <config>
+ <TCP start_port="7800"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
- use_concurrent_stack="true"
+ use_concurrent_stack="true"
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
- <TCPPING timeout="3000"
- initial_hosts="127.0.0.1[7800],127.0.0.1[7801]"
- port_range="1"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- min_interval="20000"/>
- <FD_SOCK/>
- <!--
- Note that this is an atypically short timeout and a small number of retries
- configured this way to speed up unit testing, since we know all nodes run in the same JVM
- and hence failure detections will be very quick.
- -->
- <FD timeout="1000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <BARRIER/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="60000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="3000" shun="true"
- view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </stack>
+ <TCPPING timeout="3000"
+ initial_hosts="127.0.0.1[7800],127.0.0.1[7801]"
+ port_range="1"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ min_interval="20000"/>
+ <FD_SOCK/>
+ <!--
+ Note that this is an atypically short timeout and a small number of retries
+ configured this way to speed up unit testing, since we know all nodes run in the same JVM
+ and hence failure detections will be very quick.
+ -->
+ <FD timeout="1000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <BARRIER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="60000"/>
+ <pbcast.GMS print_local_addr="false" join_timeout="3000" shun="true"
+ view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </stack>
- <stack name="tcp-sync"
- description="TCP based stack, without flow control and without message bundling. This is usually used when IP
+ <stack name="tcp-sync"
+ description="TCP based stack, without flow control and without message bundling. This is usually used when IP
multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast). This
configuration should be used instead of tcp when (1) synchronous calls are used and (2) the message volume
(rate and size) is not that large">
- <config>
- <TCP start_port="7800"
- loopback="true"
- recv_buf_size="20000000"
- send_buf_size="640000"
- discard_incompatible_packets="true"
- max_bundle_size="64000"
- max_bundle_timeout="30"
- use_incoming_packet_handler="true"
- enable_bundling="true"
- use_send_queues="false"
- sock_conn_timeout="300"
- skip_suspected_members="true"
+ <config>
+ <TCP start_port="7800"
+ loopback="true"
+ recv_buf_size="20000000"
+ send_buf_size="640000"
+ discard_incompatible_packets="true"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ enable_bundling="true"
+ use_send_queues="false"
+ sock_conn_timeout="300"
+ skip_suspected_members="true"
- use_concurrent_stack="true"
+ use_concurrent_stack="true"
- thread_pool.enabled="true"
- thread_pool.min_threads="1"
- thread_pool.max_threads="25"
- thread_pool.keep_alive_time="5000"
- thread_pool.queue_enabled="false"
- thread_pool.queue_max_size="100"
- thread_pool.rejection_policy="run"
+ thread_pool.enabled="true"
+ thread_pool.min_threads="1"
+ thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false"
+ thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run"
- oob_thread_pool.enabled="true"
- oob_thread_pool.min_threads="1"
- oob_thread_pool.max_threads="8"
- oob_thread_pool.keep_alive_time="5000"
- oob_thread_pool.queue_enabled="false"
- oob_thread_pool.queue_max_size="100"
- oob_thread_pool.rejection_policy="run"/>
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1"
+ oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ oob_thread_pool.queue_enabled="false"
+ oob_thread_pool.queue_max_size="100"
+ oob_thread_pool.rejection_policy="run"/>
- <TCPPING timeout="3000"
- initial_hosts="127.0.0.1[7800],127.0.0.1[7801]"
- port_range="1"
- num_initial_members="3"/>
- <MERGE2 max_interval="100000"
- min_interval="20000"/>
- <FD_SOCK/>
- <!--
- Note that this is an atypically short timeout and a small number of retries
- configured this way to speed up unit testing, since we know all nodes run in the same JVM
- and hence failure detections will be very quick.
- -->
- <FD timeout="1000" max_tries="5" shun="true"/>
- <VERIFY_SUSPECT timeout="1500"/>
- <BARRIER/>
- <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
- retransmit_timeout="300,600,1200,2400,4800"
- discard_delivered_msgs="true"/>
- <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
- max_bytes="400000"/>
- <VIEW_SYNC avg_send_interval="60000"/>
- <pbcast.GMS print_local_addr="false" join_timeout="3000" shun="true"
- view_bundling="true"/>
- <FC max_credits="2000000"
- min_threshold="0.10"/>
- <FRAG2 frag_size="60000"/>
- <pbcast.STREAMING_STATE_TRANSFER/>
- <!-- <pbcast.STATE_TRANSFER/> -->
- <pbcast.FLUSH timeout="0"/>
- </config>
- </stack>
- </protocol_stacks>
+ <TCPPING timeout="3000"
+ initial_hosts="127.0.0.1[7800],127.0.0.1[7801]"
+ port_range="1"
+ num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ min_interval="20000"/>
+ <FD_SOCK/>
+ <!--
+ Note that this is an atypically short timeout and a small number of retries
+ configured this way to speed up unit testing, since we know all nodes run in the same JVM
+ and hence failure detections will be very quick.
+ -->
+ <FD timeout="1000" max_tries="5" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <BARRIER/>
+ <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ discard_delivered_msgs="true"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ max_bytes="400000"/>
+ <VIEW_SYNC avg_send_interval="60000"/>
+ <pbcast.GMS print_local_addr="false" join_timeout="3000" shun="true"
+ view_bundling="true"/>
+ <FC max_credits="2000000"
+ min_threshold="0.10"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER/>
+ <!-- <pbcast.STATE_TRANSFER/> -->
+ <pbcast.FLUSH timeout="0"/>
+ </config>
+ </stack>
+ </protocol_stacks>
</jbosscache>
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7132 - core/branches/flat/src/main/java/org/jboss/starobrno/config.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-11-13 13:08:44 -0500 (Thu, 13 Nov 2008)
New Revision: 7132
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/config/Configuration.java
Log:
JBCACHE-1443: Async marshalling, async cache loading and async notification handling use unbounded queues
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/config/Configuration.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/config/Configuration.java 2008-11-13 18:04:13 UTC (rev 7131)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/config/Configuration.java 2008-11-13 18:08:44 UTC (rev 7132)
@@ -31,7 +31,11 @@
import org.w3c.dom.Element;
import java.net.URL;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
/**
* Encapsulates the configuration of a Cache.
@@ -48,7 +52,7 @@
private transient JGroupsStackParser jGroupsStackParser = new JGroupsStackParser();
private boolean invocationBatchingEnabled;
- private Map<String, EvictionCacheConfig> evictionCacheConfigs = new HashMap<String, EvictionCacheConfig>(4);
+ private Map<String, EvictionCacheConfig> evictionCacheConfigs = new HashMap<String, EvictionCacheConfig>(4);
public EvictionCacheConfig getEvictionCacheConfig(String cacheName)
{
@@ -198,7 +202,10 @@
private boolean writeSkewCheck = false;
private int concurrencyLevel = 500;
private int listenerAsyncPoolSize = 1;
- private int serializationExecutorPoolSize = 25;
+ private int listenerAsyncQueueSize = 1000000;
+ private int serializationExecutorPoolSize = 0;
+ private int serializationExecutorQueueSize = 1000000;
+ private URL jgroupsConfigFile;
@Start(priority = 1)
private void correctIsolationLevels()
@@ -426,7 +433,7 @@
*/
public void setListenerAsyncPoolSize(int listenerAsyncPoolSize)
{
- testImmutability("asyncListenerPoolSize");
+ testImmutability("listenerAsyncPoolSize");
this.listenerAsyncPoolSize = listenerAsyncPoolSize;
}
@@ -572,6 +579,24 @@
this.serializationExecutorPoolSize = serializationExecutorPoolSize;
}
+ public void setListenerAsyncQueueSize(int listenerAsyncQueueSize)
+ {
+ testImmutability("listenerAsyncQueueSize");
+ this.listenerAsyncQueueSize = listenerAsyncQueueSize;
+ }
+
+ public void setSerializationExecutorQueueSize(int serializationExecutorQueueSize)
+ {
+ testImmutability("serializationExecutorQueueSize");
+ this.serializationExecutorQueueSize = serializationExecutorQueueSize;
+ }
+
+ public void setJgroupsConfigFile(URL jgroupsConfigFile)
+ {
+ testImmutability("jgroupsConfigFile");
+ this.jgroupsConfigFile = jgroupsConfigFile;
+ }
+
// ------------------------------------------------------------------------------------------------------------
// GETTERS
// ------------------------------------------------------------------------------------------------------------
@@ -811,6 +836,21 @@
return serializationExecutorPoolSize;
}
+ public int getListenerAsyncQueueSize()
+ {
+ return listenerAsyncQueueSize;
+ }
+
+ public int getSerializationExecutorQueueSize()
+ {
+ return serializationExecutorQueueSize;
+ }
+
+ public URL getJgroupsConfigFile()
+ {
+ return jgroupsConfigFile;
+ }
+
// ------------------------------------------------------------------------------------------------------------
// HELPERS
// ------------------------------------------------------------------------------------------------------------
@@ -865,6 +905,9 @@
return false;
if (listenerAsyncPoolSize != that.listenerAsyncPoolSize) return false;
if (serializationExecutorPoolSize != that.serializationExecutorPoolSize) return false;
+ if (jgroupsConfigFile != that.jgroupsConfigFile) return false;
+ if (listenerAsyncQueueSize != that.listenerAsyncQueueSize) return false;
+ if (serializationExecutorQueueSize != that.serializationExecutorQueueSize) return false;
return true;
}
@@ -905,6 +948,11 @@
result = 31 * result + objectInputStreamPoolSize;
result = 31 * result + objectOutputStreamPoolSize;
result = 31 * result + serializationExecutorPoolSize;
+ result = 31 * result + listenerAsyncPoolSize;
+ result = 31 * result + serializationExecutorQueueSize;
+ result = 31 * result + listenerAsyncQueueSize;
+ result = 31 * result + (jgroupsConfigFile != null ? jgroupsConfigFile.hashCode() : 0);
+
return result;
}
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7131 - in core/branches/flat/src/main/java/org/jboss: starobrno/config/parsing and 2 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-11-13 13:04:13 -0500 (Thu, 13 Nov 2008)
New Revision: 7131
Added:
core/branches/flat/src/main/java/org/jboss/cache/util/concurrent/BoundedExecutors.java
Modified:
core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java
core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CommandAwareRpcDispatcher.java
core/branches/flat/src/main/java/org/jboss/starobrno/notifications/NotifierImpl.java
Log:
JBCACHE-1443: Async marshalling, async cache loading and async notification handling use unbounded queues
Added: core/branches/flat/src/main/java/org/jboss/cache/util/concurrent/BoundedExecutors.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/cache/util/concurrent/BoundedExecutors.java (rev 0)
+++ core/branches/flat/src/main/java/org/jboss/cache/util/concurrent/BoundedExecutors.java 2008-11-13 18:04:13 UTC (rev 7131)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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.cache.util.concurrent;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Similar to JDK {@link java.util.concurrent.Executors} except that the factory methods here allow you to specify the
+ * size of the blocking queue that backs the executor.
+ *
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
+ * @since 3.0
+ */
+public class BoundedExecutors
+{
+ /**
+ * Creates a thread pool that reuses a fixed set of threads
+ * operating off a shared bounded queue. If any thread
+ * terminates due to a failure during execution prior to shutdown,
+ * a new one will take its place if needed to execute subsequent
+ * tasks.
+ *
+ * @param nThreads the number of threads in the pool
+ * @param boundedQueueSize size of the bounded queue
+ * @return the newly created thread pool
+ */
+ public static ExecutorService newFixedThreadPool(int nThreads, int boundedQueueSize)
+ {
+ return new ThreadPoolExecutor(nThreads, nThreads,
+ 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<Runnable>(boundedQueueSize));
+ }
+
+ /**
+ * Creates a thread pool that reuses a fixed set of threads
+ * operating off a shared bounded queue, using the provided
+ * ThreadFactory to create new threads when needed.
+ *
+ * @param nThreads the number of threads in the pool
+ * @param threadFactory the factory to use when creating new threads
+ * @param boundedQueueSize size of the bounded queue
+ * @return the newly created thread pool
+ */
+ public static ExecutorService newFixedThreadPool(int nThreads, ThreadFactory threadFactory, int boundedQueueSize)
+ {
+ return new ThreadPoolExecutor(nThreads, nThreads,
+ 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<Runnable>(boundedQueueSize),
+ threadFactory);
+ }
+}
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 17:50:09 UTC (rev 7130)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/config/parsing/XmlConfigurationParser.java 2008-11-13 18:04:13 UTC (rev 7131)
@@ -229,17 +229,10 @@
{
if (element == null) return; //this element is optional
String asyncPoolSizeStr = getAttributeValue(element, "asyncPoolSize");
- if (existsAttribute(asyncPoolSizeStr))
- {
- try
- {
- config.setListenerAsyncPoolSize(Integer.parseInt(asyncPoolSizeStr));
- }
- catch (NumberFormatException nfe)
- {
- throw new ConfigurationException("Unable to parse the asyncPoolSize attribute of the listeners element. Was [" + asyncPoolSizeStr + "]");
- }
- }
+ if (existsAttribute(asyncPoolSizeStr)) config.setListenerAsyncPoolSize(getInt(asyncPoolSizeStr));
+
+ String asyncQueueSizeStr = getAttributeValue(element, "asyncQueueSize");
+ if (existsAttribute(asyncQueueSizeStr)) config.setListenerAsyncQueueSize(getInt(asyncQueueSizeStr));
}
private void configureInvocationBatching(Element element)
@@ -358,10 +351,15 @@
String replQueueInterval = getAttributeValue(element, "replQueueInterval");
if (existsAttribute(replQueueInterval)) config.setReplQueueInterval(getLong(replQueueInterval));
String replQueueMaxElements = getAttributeValue(element, "replQueueMaxElements");
+
if (existsAttribute(replQueueMaxElements)) config.setReplQueueMaxElements(getInt(replQueueMaxElements));
String serializationExecutorPoolSize = getAttributeValue(element, "serializationExecutorPoolSize");
if (existsAttribute(serializationExecutorPoolSize))
config.setSerializationExecutorPoolSize(getInt(serializationExecutorPoolSize));
+
+ String serializationExecutorQueueSize = getAttributeValue(element, "serializationExecutorQueueSize");
+ if (existsAttribute(serializationExecutorQueueSize))
+ config.setSerializationExecutorQueueSize(getInt(serializationExecutorQueueSize));
}
private void configureLocking(Element element)
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CommandAwareRpcDispatcher.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CommandAwareRpcDispatcher.java 2008-11-13 17:50:09 UTC (rev 7130)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/marshall/CommandAwareRpcDispatcher.java 2008-11-13 18:04:13 UTC (rev 7131)
@@ -21,6 +21,7 @@
*/
package org.jboss.starobrno.marshall;
+import org.jboss.cache.util.concurrent.BoundedExecutors;
import org.jboss.cache.util.concurrent.WithinThreadExecutor;
import org.jboss.starobrno.commands.ReplicableCommand;
import org.jboss.starobrno.commands.VisitableCommand;
@@ -48,7 +49,6 @@
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
@@ -100,14 +100,14 @@
if (replicationProcessor == null)
{
replicationProcessorCount = new AtomicInteger(0);
- replicationProcessor = Executors.newFixedThreadPool(c.isUseReplQueue() ? 1 : c.getSerializationExecutorPoolSize(),
+ replicationProcessor = BoundedExecutors.newFixedThreadPool(c.isUseReplQueue() ? 1 : c.getSerializationExecutorPoolSize(),
new ThreadFactory()
{
public Thread newThread(Runnable r)
{
return new Thread(r, "AsyncReplicationProcessor-" + replicationProcessorCount.incrementAndGet());
}
- }
+ }, c.getSerializationExecutorQueueSize()
);
}
}
Modified: core/branches/flat/src/main/java/org/jboss/starobrno/notifications/NotifierImpl.java
===================================================================
--- core/branches/flat/src/main/java/org/jboss/starobrno/notifications/NotifierImpl.java 2008-11-13 17:50:09 UTC (rev 7130)
+++ core/branches/flat/src/main/java/org/jboss/starobrno/notifications/NotifierImpl.java 2008-11-13 18:04:13 UTC (rev 7131)
@@ -24,6 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.buddyreplication.BuddyGroup;
+import org.jboss.cache.util.concurrent.BoundedExecutors;
import org.jboss.cache.util.concurrent.WithinThreadExecutor;
import org.jboss.starobrno.Cache;
import org.jboss.starobrno.CacheException;
@@ -53,7 +54,6 @@
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
@@ -160,13 +160,13 @@
// create one if needed
if (config.getListenerAsyncPoolSize() > 0)
{
- asyncProcessor = Executors.newFixedThreadPool(config.getListenerAsyncPoolSize(), new ThreadFactory()
+ asyncProcessor = BoundedExecutors.newFixedThreadPool(config.getListenerAsyncPoolSize(), new ThreadFactory()
{
public Thread newThread(Runnable r)
{
return new Thread(r, "AsyncNotifier-" + asyncNotifierThreadNumber.getAndIncrement());
}
- });
+ }, config.getListenerAsyncQueueSize());
}
else
{
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7130 - in core/trunk/src: main/java/org/jboss/cache/config and 8 other directories.
by jbosscache-commits＠lists.jboss.org
Author: manik.surtani(a)jboss.com
Date: 2008-11-13 12:50:09 -0500 (Thu, 13 Nov 2008)
New Revision: 7130
Added:
core/trunk/src/main/java/org/jboss/cache/util/concurrent/BoundedExecutors.java
Modified:
core/trunk/src/main/docbook/userguide/en/modules/basic_api.xml
core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
core/trunk/src/main/java/org/jboss/cache/notifications/NotifierImpl.java
core/trunk/src/main/resources/config-samples/all.xml
core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
core/trunk/src/test/resources/configs/parser-test-async.xml
Log:
JBCACHE-1443: Async marshalling, async cache loading and async notification handling use unbounded queues
Modified: core/trunk/src/main/docbook/userguide/en/modules/basic_api.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/basic_api.xml 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/main/docbook/userguide/en/modules/basic_api.xml 2008-11-13 17:50:09 UTC (rev 7130)
@@ -552,7 +552,8 @@
the event. As such, it is good practise to ensure cache listener implementations don't hold up the thread in
long-running tasks. Alternatively, you could set the <literal>CacheListener.sync()</literal> attribute to
<literal>false</literal>, in which case you will not be notified in the caller's thread. See the
- <link linkend="element.listeners">configuration reference</link> on tuning this thread pool.
+ <link linkend="element.listeners">configuration reference</link> on tuning this thread pool and size of blocking
+ queue.
</para>
</section>
</section>
Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml
===================================================================
--- core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2008-11-13 17:50:09 UTC (rev 7130)
@@ -56,7 +56,8 @@
Used to define async listener notification thread pool size
-->
<listeners
- asyncPoolSize="1"/>
+ asyncPoolSize="1"
+ asyncQueueSize="1000000"/>
<!--
Used to enable invocation batching and allow the use of Cache.startBatch()/endBatch() methods.
@@ -93,7 +94,7 @@
<!--
Uncomment this for async replication.
-->
- <!-- <async useReplQueue="true" replQueueInterval="10000" replQueueMaxElements="500" serializationExecutorPoolSize="20" /> -->
+ <!--<async useReplQueue="true" replQueueInterval="10000" replQueueMaxElements="500" serializationExecutorPoolSize="20" serializationExecutorQueueSize="5000000"/>-->
<!-- Uncomment to use Buddy Replication -->
<!--
@@ -988,6 +989,19 @@
treated as synchronous listeners and notified synchronously.
</entry>
</row>
+
+ <row>
+ <entry><emphasis role="bold">asyncQueueSize</emphasis></entry>
+ <entry>listenerAsyncQueueSize</entry>
+ <entry>integer</entry>
+ <entry>1000000</entry>
+
+ <entry>
+ The size of the bounded queue used by the async listener threadpool. Only considered if
+ <literal>asyncPoolSize</literal> is greater than 0. Increase this if you see a lot of threads
+ blocking trying to add events to this queue.
+ </entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -2763,6 +2777,17 @@
serialization does not happen asynchronously.
</entry>
</row>
+ <row>
+ <entry><emphasis role="bold">serializationExecutorQueueSize</emphasis></entry>
+ <entry>serializationExecutorQueueSize</entry>
+ <entry>positive integer</entry>
+ <entry>1000000</entry>
+ <entry>
+ This is used to define the size of the bounded queue that holds tasks for the serialization executor.
+ This is ignored if a serialization executor is not used, such as when <literal>serializationExecutorPoolSize</literal>
+ is less than 1.
+ </entry>
+ </row>
<row>
<entry><emphasis role="bold">useReplQueue</emphasis></entry>
<entry>useReplQueue</entry>
Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-11-13 17:50:09 UTC (rev 7130)
@@ -224,7 +224,9 @@
private boolean writeSkewCheck = false;
private int concurrencyLevel = 500;
private int listenerAsyncPoolSize = 1;
- private int serializationExecutorPoolSize = 25;
+ private int listenerAsyncQueueSize = 1000000;
+ private int serializationExecutorPoolSize = 0;
+ private int serializationExecutorQueueSize = 1000000;
@Start(priority = 1)
void correctIsolationLevels()
@@ -455,10 +457,32 @@
*/
public void setListenerAsyncPoolSize(int listenerAsyncPoolSize)
{
- testImmutability("asyncListenerPoolSize");
+ testImmutability("listenerAsyncPoolSize");
this.listenerAsyncPoolSize = listenerAsyncPoolSize;
}
+ /**
+ * Sets the queue size of the bounded queue used to store async listener events on. This defaults to 1,000,000.
+ *
+ * @param listenerAsyncQueueSize queue size to use
+ */
+ public void setListenerAsyncQueueSize(int listenerAsyncQueueSize)
+ {
+ testImmutability("listenerAsyncQueueSize");
+ this.listenerAsyncQueueSize = listenerAsyncQueueSize;
+ }
+
+ /**
+ * Sets the queue size of the bounded queue used to store async serialization events on. This defaults to 1,000,000.
+ *
+ * @param serializationExecutorQueueSize queue size to use
+ */
+ public void setSerializationExecutorQueueSize(int serializationExecutorQueueSize)
+ {
+ testImmutability("serializationExecutorQueueSize");
+ this.serializationExecutorQueueSize = serializationExecutorQueueSize;
+ }
+
public void setBuddyReplicationConfig(BuddyReplicationConfig config)
{
testImmutability("buddyReplicationConfig");
@@ -921,6 +945,24 @@
return serializationExecutorPoolSize;
}
+ /**
+ *
+ * @return the bounded queue size for async listeners
+ */
+ public int getListenerAsyncQueueSize()
+ {
+ return listenerAsyncQueueSize;
+ }
+
+ /**
+ *
+ * @return the bounded queue size for async serializers
+ */
+ public int getSerializationExecutorQueueSize()
+ {
+ return serializationExecutorQueueSize;
+ }
+
// ------------------------------------------------------------------------------------------------------------
// HELPERS
// ------------------------------------------------------------------------------------------------------------
@@ -977,6 +1019,8 @@
if (listenerAsyncPoolSize != that.listenerAsyncPoolSize) return false;
if (serializationExecutorPoolSize != that.serializationExecutorPoolSize) return false;
if (jgroupsConfigFile != that.jgroupsConfigFile) return false;
+ if (listenerAsyncQueueSize != that.listenerAsyncQueueSize) return false;
+ if (serializationExecutorQueueSize != that.serializationExecutorQueueSize) return false;
return true;
}
@@ -1018,6 +1062,9 @@
result = 31 * result + objectInputStreamPoolSize;
result = 31 * result + objectOutputStreamPoolSize;
result = 31 * result + serializationExecutorPoolSize;
+ result = 31 * result + listenerAsyncPoolSize;
+ result = 31 * result + serializationExecutorQueueSize;
+ result = 31 * result + listenerAsyncQueueSize;
result = 31 * result + (jgroupsConfigFile != null ? jgroupsConfigFile.hashCode() : 0);
return result;
}
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-11-13 17:50:09 UTC (rev 7130)
@@ -257,17 +257,10 @@
{
if (element == null) return; //this element is optional
String asyncPoolSizeStr = getAttributeValue(element, "asyncPoolSize");
- if (existsAttribute(asyncPoolSizeStr))
- {
- try
- {
- config.setListenerAsyncPoolSize(Integer.parseInt(asyncPoolSizeStr));
- }
- catch (NumberFormatException nfe)
- {
- throw new ConfigurationException("Unable to parse the asyncPoolSize attribute of the listeners element. Was [" + asyncPoolSizeStr + "]");
- }
- }
+ if (existsAttribute(asyncPoolSizeStr)) config.setListenerAsyncPoolSize(getInt(asyncPoolSizeStr));
+
+ String asyncQueueSizeStr = getAttributeValue(element, "asyncQueueSize");
+ if (existsAttribute(asyncQueueSizeStr)) config.setListenerAsyncQueueSize(getInt(asyncQueueSizeStr));
}
private void configureInvocationBatching(Element element)
@@ -380,10 +373,15 @@
String replQueueInterval = getAttributeValue(element, "replQueueInterval");
if (existsAttribute(replQueueInterval)) config.setReplQueueInterval(getLong(replQueueInterval));
String replQueueMaxElements = getAttributeValue(element, "replQueueMaxElements");
+
if (existsAttribute(replQueueMaxElements)) config.setReplQueueMaxElements(getInt(replQueueMaxElements));
String serializationExecutorPoolSize = getAttributeValue(element, "serializationExecutorPoolSize");
if (existsAttribute(serializationExecutorPoolSize))
config.setSerializationExecutorPoolSize(getInt(serializationExecutorPoolSize));
+
+ String serializationExecutorQueueSize = getAttributeValue(element, "serializationExecutorQueueSize");
+ if (existsAttribute(serializationExecutorQueueSize))
+ config.setSerializationExecutorQueueSize(getInt(serializationExecutorQueueSize));
}
private void configureLocking(Element element)
Modified: core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/main/java/org/jboss/cache/marshall/CommandAwareRpcDispatcher.java 2008-11-13 17:50:09 UTC (rev 7130)
@@ -31,6 +31,7 @@
import org.jboss.cache.factories.ComponentRegistry;
import org.jboss.cache.interceptors.InterceptorChain;
import org.jboss.cache.invocation.InvocationContextContainer;
+import org.jboss.cache.util.concurrent.BoundedExecutors;
import org.jboss.cache.util.concurrent.WithinThreadExecutor;
import org.jgroups.Address;
import org.jgroups.Channel;
@@ -48,7 +49,6 @@
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
@@ -100,14 +100,15 @@
if (replicationProcessor == null)
{
replicationProcessorCount = new AtomicInteger(0);
- replicationProcessor = Executors.newFixedThreadPool(c.isUseReplQueue() ? 1 : c.getSerializationExecutorPoolSize(),
+
+ replicationProcessor = BoundedExecutors.newFixedThreadPool(c.isUseReplQueue() ? 1 : c.getSerializationExecutorPoolSize(),
new ThreadFactory()
{
public Thread newThread(Runnable r)
{
return new Thread(r, "AsyncReplicationProcessor-" + replicationProcessorCount.incrementAndGet());
}
- }
+ }, c.getSerializationExecutorQueueSize()
);
}
}
Modified: core/trunk/src/main/java/org/jboss/cache/notifications/NotifierImpl.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/notifications/NotifierImpl.java 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/main/java/org/jboss/cache/notifications/NotifierImpl.java 2008-11-13 17:50:09 UTC (rev 7130)
@@ -40,6 +40,7 @@
import org.jboss.cache.notifications.event.*;
import static org.jboss.cache.notifications.event.Event.Type.*;
import org.jboss.cache.util.Immutables;
+import org.jboss.cache.util.concurrent.BoundedExecutors;
import org.jboss.cache.util.concurrent.WithinThreadExecutor;
import org.jgroups.View;
@@ -56,7 +57,6 @@
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
@@ -169,13 +169,13 @@
// create one if needed
if (config.getListenerAsyncPoolSize() > 0)
{
- asyncProcessor = Executors.newFixedThreadPool(config.getListenerAsyncPoolSize(), new ThreadFactory()
+ asyncProcessor = BoundedExecutors.newFixedThreadPool(config.getListenerAsyncPoolSize(), new ThreadFactory()
{
public Thread newThread(Runnable r)
{
return new Thread(r, "AsyncNotifier-" + asyncNotifierThreadNumber.getAndIncrement());
}
- });
+ }, config.getListenerAsyncQueueSize());
}
else
{
Added: core/trunk/src/main/java/org/jboss/cache/util/concurrent/BoundedExecutors.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/concurrent/BoundedExecutors.java (rev 0)
+++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/BoundedExecutors.java 2008-11-13 17:50:09 UTC (rev 7130)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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.cache.util.concurrent;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * Similar to JDK {@link java.util.concurrent.Executors} except that the factory methods here allow you to specify the
+ * size of the blocking queue that backs the executor.
+ *
+ * @author Manik Surtani (<a href="mailto:manik AT jboss DOT org">manik AT jboss DOT org</a>)
+ * @since 3.0
+ */
+public class BoundedExecutors
+{
+ /**
+ * Creates a thread pool that reuses a fixed set of threads
+ * operating off a shared bounded queue. If any thread
+ * terminates due to a failure during execution prior to shutdown,
+ * a new one will take its place if needed to execute subsequent
+ * tasks.
+ *
+ * @param nThreads the number of threads in the pool
+ * @param boundedQueueSize size of the bounded queue
+ * @return the newly created thread pool
+ */
+ public static ExecutorService newFixedThreadPool(int nThreads, int boundedQueueSize)
+ {
+ return new ThreadPoolExecutor(nThreads, nThreads,
+ 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<Runnable>(boundedQueueSize));
+ }
+
+ /**
+ * Creates a thread pool that reuses a fixed set of threads
+ * operating off a shared bounded queue, using the provided
+ * ThreadFactory to create new threads when needed.
+ *
+ * @param nThreads the number of threads in the pool
+ * @param threadFactory the factory to use when creating new threads
+ * @param boundedQueueSize size of the bounded queue
+ * @return the newly created thread pool
+ */
+ public static ExecutorService newFixedThreadPool(int nThreads, ThreadFactory threadFactory, int boundedQueueSize)
+ {
+ return new ThreadPoolExecutor(nThreads, nThreads,
+ 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<Runnable>(boundedQueueSize),
+ threadFactory);
+ }
+}
Modified: core/trunk/src/main/resources/config-samples/all.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/all.xml 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/main/resources/config-samples/all.xml 2008-11-13 17:50:09 UTC (rev 7130)
@@ -46,7 +46,8 @@
Used to define async listener notification thread pool size
-->
<listeners
- asyncPoolSize="1"/>
+ asyncPoolSize="1"
+ asyncQueueSize="1000000"/>
<!--
Used to enable invocation batching and allow the use of Cache.startBatch()/endBatch() methods.
@@ -83,7 +84,7 @@
<!--
Uncomment this for async replication.
-->
- <!-- <async useReplQueue="true" replQueueInterval="10000" replQueueMaxElements="500" serializationExecutorPoolSize="20" /> -->
+ <!--<async useReplQueue="true" replQueueInterval="10000" replQueueMaxElements="500" serializationExecutorPoolSize="20" serializationExecutorQueueSize="5000000"/>-->
<!-- Uncomment to use Buddy Replication -->
<!--
Modified: core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd
===================================================================
--- core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd 2008-11-13 17:50:09 UTC (rev 7130)
@@ -142,6 +142,7 @@
<xs:complexType name="listenersType">
<xs:attribute name="asyncPoolSize" type="tns:positiveInteger"/>
+ <xs:attribute name="asyncQueueSize" type="tns:positiveInteger"/>
</xs:complexType>
<xs:complexType name="invocationBatchingType">
@@ -165,6 +166,7 @@
<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">
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-11-13 17:50:09 UTC (rev 7130)
@@ -74,6 +74,7 @@
public void testAsyncSerializationExecutorSize()
{
assert asyncConfig.getSerializationExecutorPoolSize() == 250;
+ assert asyncConfig.getSerializationExecutorQueueSize() == 5000000;
}
public void testUseReplQueue()
@@ -284,6 +285,10 @@
public void testListenerAsyncThreads()
{
assert syncConfig.getListenerAsyncPoolSize() == 5;
+ assert syncConfig.getListenerAsyncQueueSize() == 1000000; // the default
+
+ assert asyncConfig.getListenerAsyncPoolSize() == 5;
+ assert asyncConfig.getListenerAsyncQueueSize() == 100000;
}
public void testInvocationBatching()
Modified: core/trunk/src/test/resources/configs/parser-test-async.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test-async.xml 2008-11-13 05:21:36 UTC (rev 7129)
+++ core/trunk/src/test/resources/configs/parser-test-async.xml 2008-11-13 17:50:09 UTC (rev 7130)
@@ -16,7 +16,7 @@
<startup regionsInactiveOnStartup="true"/>
<shutdown hookBehavior="REGISTER"/>
- <listeners asyncPoolSize="5"/>
+ <listeners asyncPoolSize="5" asyncQueueSize="100000"/>
<invocationBatching enabled="true"/>
<!-- serialization related configuration, used for replication and cache loading -->
@@ -24,7 +24,7 @@
marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/>
<clustering mode="replication" clusterName="JBossCache-cluster">
- <async useReplQueue="false" serializationExecutorPoolSize="250"/>
+ <async useReplQueue="false" serializationExecutorPoolSize="250" serializationExecutorQueueSize="5000000"/>
<stateRetrieval timeout="15124" fetchInMemoryState="true"/>
<buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
<dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/>
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7129 - enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES.
by jbosscache-commits＠lists.jboss.org
Author: mospina
Date: 2008-11-13 00:21:36 -0500 (Thu, 13 Nov 2008)
New Revision: 7129
Modified:
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Api.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Appendix.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Architecture.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Book_Info.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Colophon.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Configuration.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Example.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Instrumentation.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Introduction.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Jbossaop.po
enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Term.po
Log:
translation for Pojo cache in progress
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Api.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Api.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Api.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,24 +1,26 @@
+# translation of Api.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Api\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 11:08+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Api.xml:5
#, no-c-format
msgid "<title>API</title>"
-msgstr ""
+msgstr "<title>API</title>"
#. Tag: para
#: Api.xml:6
@@ -31,7 +33,7 @@
"retrieve the POJO from the cache system. After that, a user should operate "
"on that POJO reference directly without worrying about replication and/or "
"persistency aspects."
-msgstr ""
+msgstr "En PojoCache, hay tres APIs centrales para la administración de pojo y una adicional para peticiones. Las abordaremos en profundidad en este documento. Observe que es muy importante notar el aspecto de administración de estas APIs. Esto se debe a que esperamos que la mayor parte del tiempo sólo utilice estas APIs para adjuntar, separar y recuperar el POJO del sistema caché. Después de esto un usuario debe operar en esa referencia POJO directamente sin preocuparse de los aspectos de la replicación y/o de la persistencia."
#. Tag: title
#: Api.xml:9
@@ -51,6 +53,13 @@
"*/\n"
"Object putObject(Fqn fqn, Object pojo) throws CacheException;"
msgstr ""
+"/*\n"
+" * @param fqn The fqn instance to associate with the object in the cache.\n"
+" * @param pojo aop-enabled object to be inserted into the cache. If null,\n"
+" * it will nullify the fqn node.\n"
+" * @throws CacheException\n"
+"*/\n"
+"Object putObject(Fqn fqn, Object pojo) throws CacheException;"
#. Tag: para
#: Api.xml:11
@@ -131,6 +140,16 @@
" */\n"
"Object removeObject(Fqn fqn) throws CacheException;"
msgstr ""
+"/**\n"
+" * Remove aop-enabled object from the cache. After successful call of this "
+"API, the returning\n"
+" * POJO is no longer managed by the cache.\n"
+" *\n"
+" * @param fqn Instance that associates with this node.\n"
+" * @return Original POJO stored under this node.\n"
+" * @throws CacheException\n"
+" */\n"
+"Object removeObject(Fqn fqn) throws CacheException;"
#. Tag: para
#: Api.xml:28
@@ -168,6 +187,15 @@
" */\n"
"Object getObject(Fqn fqn) throws CacheException;"
msgstr ""
+"/**\n"
+" * Retrieve the Pojo from the cache. Return null if object does not exist "
+"in the cache.\n"
+" *\n"
+" * @param fqn Instance that associates with this node.\n"
+" * @return Current POJO value. Null if does not exist.\n"
+" * @throws CacheException\n"
+" */\n"
+"Object getObject(Fqn fqn) throws CacheException;"
#. Tag: para
#: Api.xml:33
@@ -203,6 +231,22 @@
" */\n"
"public Map findObjects(Fqn fqn) throws CacheException;"
msgstr ""
+"/**\n"
+" * Query all managed pojo objects under the fqn recursively. Note that this "
+"will not return \n"
+" *the sub-object POJOs, e.g., if Person has a sub-object of Address, it "
+"won't return Address \n"
+" *pojo. Note also that this operation is not thread-safe now. In addition, "
+"it assumes \n"
+" *that once a pojo is found with a fqn, no more pojo is stored under the "
+"children of the fqn. \n"
+" *That is, we don't mixed the fqn with different POJOs.\n"
+" * @param fqn The starting place to find all POJOs.\n"
+" * @return Map of all POJOs found with (fqn, pojo) pair. Return size of 0, "
+"if not found.\n"
+" * @throws CacheException\n"
+" */\n"
+"public Map findObjects(Fqn fqn) throws CacheException;"
#. Tag: para
#: Api.xml:37
@@ -224,3 +268,4 @@
"the children of the fqn. That is, we don't mixed the fqn with different "
"POJOs."
msgstr ""
+
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Appendix.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Appendix.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Appendix.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,18 +1,20 @@
+# translation of Appendix.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Appendix\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 09:58+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Appendix.xml:5
@@ -67,6 +69,32 @@
" public void setLanguages(List languages) { this.languages = languages; }\n"
"}"
msgstr ""
+"public class Person {\n"
+" String name=null;\n"
+" int age=0;\n"
+" Map hobbies=null;\n"
+" Address address=null;\n"
+" Set skills;\n"
+" List languages;\n"
+"\n"
+" public String getName() { return name; }\n"
+" public void setName(String name) { this.name=name; }\n"
+"\n"
+" public int getAge() { return age; }\n"
+" public void setAge(int age) { this.age = age; }\n"
+"\n"
+" public Map getHobbies() { return hobbies; }\n"
+" public void setHobbies(Map hobbies) { this.hobbies = hobbies; }\n"
+"\n"
+" public Address getAddress() { return address; }\n"
+" public void setAddress(Address address) { this.address = address; }\n"
+"\n"
+" public Set getSkills() { return skills; }\n"
+" public void setSkills(Set skills) { this.skills = skills; }\n"
+"\n"
+" public List getLanguages() { return languages; }\n"
+" public void setLanguages(List languages) { this.languages = languages; }\n"
+"}"
#. Tag: programlisting
#: Appendix.xml:11
@@ -79,6 +107,12 @@
" public void setYear(String year) { this.year=year; }\n"
"}"
msgstr ""
+"public class Student extends Person {\n"
+" String year=null;\n"
+"\n"
+" public String getYear() { return year; }\n"
+" public void setYear(String year) { this.year=year; }\n"
+"}"
#. Tag: programlisting
#: Appendix.xml:12
@@ -94,6 +128,15 @@
" ...\n"
"}"
msgstr ""
+"public class Address {\n"
+" String street=null;\n"
+" String city=null;\n"
+" int zip=0;\n"
+"\n"
+" public String getStreet() { return street; }\n"
+" public void setStreet(String street) { this.street=street; }\n"
+" ...\n"
+"}"
#. Tag: title
#: Appendix.xml:13
@@ -220,3 +263,109 @@
"</mbean>\n"
"</server>"
msgstr ""
+"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+"\n"
+"<server>\n"
+"<mbean code=\"org.jboss.cache.aop.PojoCache\" name=\"jboss.cache:"
+"service=PojoCache\">\n"
+"<depends>jboss:service=TransactionManager</depends>\n"
+"\n"
+"<!-- Configure the TransactionManager -->\n"
+"<attribute name=\"TransactionManagerLookupClass\">\n"
+"org.jboss.cache.DummyTransactionManagerLookup</attribute>\n"
+"\n"
+"<!-- Isolation level : SERIALIZABLE\n"
+" REPEATABLE_READ (default)\n"
+" READ_COMMITTED\n"
+" READ_UNCOMMITTED\n"
+" NONE\n"
+"-->\n"
+"<attribute name=\"IsolationLevel\">REPEATABLE_READ</attribute>\n"
+"\n"
+"<!-- Valid modes are LOCAL, REPL_ASYNC and REPL_SYNC -->\n"
+"<attribute name=\"CacheMode\">REPL_SYNC</attribute>\n"
+"\n"
+"<!-- Just used for async repl: use a replication queue -->\n"
+"<attribute name=\"UseReplQueue\">false</attribute>\n"
+"\n"
+"<!-- Replication interval for replication queue (in ms) --"
+">\n"
+"<attribute name=\"ReplQueueInterval\">0</attribute>\n"
+"\n"
+"<!-- Max number of elements which trigger replication -->\n"
+"<attribute name=\"ReplQueueMaxElements\">0</attribute>\n"
+"\n"
+"<!-- Name of cluster. Needs to be the same for all clusters, in order\n"
+" to find each other\n"
+"-->\n"
+"<attribute name=\"ClusterName\">TreeCache-Cluster</attribute>\n"
+"\n"
+"<!-- JGroups protocol stack properties. Can also be a URL,\n"
+" e.g. file:/home/bela/default.xml\n"
+" <attribute name=\"ClusterProperties\"></attribute>\n"
+"-->\n"
+"<attribute name=\"ClusterConfig\">\n"
+"\n"
+"<config>\n"
+"<!-- UDP: if you have a multihomed machine,\n"
+" set the bind_addr attribute to the appropriate NIC IP "
+"address, \n"
+" e.g bind_addr=\"192.168.0.2\"\n"
+"-->\n"
+"<!-- UDP: On Windows machines, because of the media sense feature\n"
+" being broken with multicast (even after disabling media "
+"sense)\n"
+" set the loopback attribute to true\n"
+"-->\n"
+"<UDP mcast_addr=\"228.1.2.3\" mcast_port=\"48866\" ip_ttl=\"64\" ip_mcast="
+"\"true\" \n"
+"mcast_send_buf_size=\"150000\" mcast_recv_buf_size=\"80000\"\n"
+"ucast_send_buf_size=\"150000\" ucast_recv_buf_size=\"80000\" \n"
+"loopback=\"false\" />\n"
+"<PING timeout=\"2000\" num_initial_members=\"3\" up_thread=\"false\" "
+"down_thread=\"false\" />\n"
+"<MERGE2 min_interval=\"10000\" max_interval=\"20000\" />\n"
+"<FD_SOCK />\n"
+"<VERIFY_SUSPECT timeout=\"1500\" up_thread=\"false\" down_thread=\"false"
+"\" />\n"
+"<pbcast.NAKACK gc_lag=\"50\" retransmit_timeout=\"600,1200,2400,4800\" "
+"max_xmit_size=\"8192\" \n"
+"up_thread=\"false\" down_thread=\"false\" />\n"
+"<UNICAST timeout=\"600,1200,2400\" window_size=\"100\" min_threshold=\"10"
+"\" down_thread=\"false\" />\n"
+"<pbcast.STABLE desired_avg_gossip=\"20000\" up_thread=\"false\" "
+"down_thread=\"false\" />\n"
+"<FRAG frag_size=\"8192\" down_thread=\"false\" up_thread=\"false\" />\n"
+"<pbcast.GMS join_timeout=\"5000\" join_retry_timeout=\"2000\" shun=\"true"
+"\" print_local_addr=\"true\" />\n"
+"<pbcast.STATE_TRANSFER up_thread=\"true\" down_thread=\"true\" />\n"
+"</config>\n"
+"</attribute>\n"
+"\n"
+"<!-- Whether or not to fetch state on joining a cluster -->\n"
+"<attribute name=\"FetchStateOnStartup\">true</attribute>\n"
+"\n"
+"<!-- The max amount of time (in milliseconds) we wait until "
+"the\n"
+" initial state (ie. the contents of the cache) are retrieved "
+"from\n"
+" existing members in a clustered environment\n"
+"\n"
+"-->\n"
+"<attribute name=\"InitialStateRetrievalTimeout\">5000</"
+"attribute>\n"
+"\n"
+"<!-- Number of milliseconds to wait until all responses for "
+"a\n"
+" synchronous call have been received.\n"
+"-->\n"
+"<attribute name=\"SyncReplTimeout\">15000</attribute>\n"
+"\n"
+"<!-- Max number of milliseconds to wait for a lock acquisition -->\n"
+"<attribute name=\"LockAcquisitionTimeout\">10000</attribute>\n"
+"\n"
+"<!-- Name of the eviction policy class. -->\n"
+"<attribute name=\"EvictionPolicyClass\" />\n"
+"</mbean>\n"
+"</server>"
+
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Architecture.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Architecture.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Architecture.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -8,7 +8,7 @@
"Project-Id-Version: Architecture\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2008-11-12 11:30+1000\n"
+"PO-Revision-Date: 2008-11-13 10:00+1000\n"
"Last-Translator: Angela Garcia\n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -201,6 +201,15 @@
" putObject(new Fqn(fqn, field.getName()), value);\n"
"}"
msgstr ""
+"for (Iterator i = type.getFields().iterator(); i.hasNext();) {\n"
+" Field field = (Field) i.next();\n"
+" Object value = field.get(obj);\n"
+" CachedType fieldType = getCachedType(field.getType());\n"
+" if (fieldType.isImmediate()) {\n"
+" immediates.put(field.getName(), value);\n"
+"} else {\n"
+" putObject(new Fqn(fqn, field.getName()), value);\n"
+"}"
#. Tag: para
#: Architecture.xml:77
@@ -222,6 +231,10 @@
"\n"
"cache.putObject(\"/aop/joe\", joe);"
msgstr ""
+"Person joe = new Person();\n"
+"joe.setAddress(new Address());\n"
+"\n"
+"cache.putObject(\"/aop/joe\", joe);"
#. Tag: para
#: Architecture.xml:81
@@ -286,6 +299,32 @@
"// of cache contents automatically.\n"
"joe.setAge(41);"
msgstr ""
+"import org.jboss.cache.PropertyConfigurator;\n"
+"import org.jboss.cache.aop.PojoCache;\n"
+"import org.jboss.test.cache.test.standAloneAop.Person;\n"
+"import org.jboss.test.cache.test.standAloneAop.Address;\n"
+"\n"
+"PojoCache tree = new PojoCache();\n"
+"PropertyConfigurator config = new PropertyConfigurator(); // configure tree "
+"cache.\n"
+"config.configure(tree, \"META-INF/replSync-service.xml\");\n"
+"\n"
+"Person joe = new Person(); // instantiate a Person object named joe\n"
+"joe.setName(\"Joe Black\");\n"
+"joe.setAge(31);\n"
+"\n"
+"Address addr = new Address(); // instantiate a Address object named addr\n"
+"addr.setCity(\"Sunnyvale\");\n"
+"addr.setStreet(\"123 Albert Ave\");\n"
+"addr.setZip(94086);\n"
+"joe.setAddress(addr); // set the address reference\n"
+"\n"
+"tree.startService(); // kick start tree cache\n"
+"tree.putObject(\"/aop/joe\", joe); // add aop sanctioned object (and sub-"
+"objects) into cache.\n"
+"// since it is aspectized, use of plain get/set methods will take care\n"
+"// of cache contents automatically.\n"
+"joe.setAge(41);"
#. Tag: para
#: Architecture.xml:96
@@ -320,6 +359,10 @@
"lang.add(\"Mandarin\");\n"
"joe.setLanguages(lang);"
msgstr ""
+"ArrayList lang = new ArrayList();\n"
+"lang.add(\"Ensligh\");\n"
+"lang.add(\"Mandarin\");\n"
+"joe.setLanguages(lang);"
#. Tag: title
#: Architecture.xml:104
@@ -431,6 +474,44 @@
"tree.removeObject(\"/aop/joe\");\n"
"maryAddr = mary.getAddress(); // Should still have the address."
msgstr ""
+"import org.jboss.cache.PropertyConfigurator;\n"
+"import org.jboss.cache.aop.PojoCache;\n"
+"import org.jboss.test.cache.test.standAloneAop.Person;\n"
+"import org.jboss.test.cache.test.standAloneAop.Address;\n"
+"\n"
+"PojoCache tree = new PojoCache();\n"
+"PropertyConfigurator config = new PropertyConfigurator(); // configure tree "
+"cache.\n"
+"config.configure(tree, \"META-INF/replSync-service.xml\");\n"
+"\n"
+"Person joe = new Person(); // instantiate a Person object named joe\n"
+"joe.setName(\"Joe Black\");\n"
+"joe.setAge(31);\n"
+"\n"
+"Person mary = new Person(); // instantiate a Person object named mary\n"
+"mary.setName(\"Mary White\");\n"
+"mary.setAge(30);\n"
+"\n"
+"Address addr = new Address(); // instantiate a Address object named addr\n"
+"addr.setCity(\"Sunnyvale\");\n"
+"addr.setStreet(\"123 Albert Ave\");\n"
+"addr.setZip(94086);\n"
+"\n"
+"joe.setAddress(addr); // set the address reference\n"
+"mary.setAddress(addr); // set the address reference\n"
+"\n"
+"tree.startService(); // kick start tree\n"
+"tree.putObject(\"/aop/joe\", joe); // add aop sanctioned object (and sub-"
+"objects) into cache.\n"
+"tree.putObject(\"/aop/mary\", mary); // add aop sanctioned object (and sub-"
+"objects) into cache.\n"
+"\n"
+"Address joeAddr = joe.getAddress();\n"
+"Address maryAddr = mary.getAddress(); // joeAddr and maryAddr should be the "
+"same instance\n"
+"\n"
+"tree.removeObject(\"/aop/joe\");\n"
+"maryAddr = mary.getAddress(); // Should still have the address."
#. Tag: para
#: Architecture.xml:133
@@ -483,6 +564,31 @@
"int zip = joeAddr.getAddress().getZip(); // Should be 95123 as well instead "
"of 94086!"
msgstr ""
+"/**\n"
+" * Code snippet on cache2 during fail-over\n"
+" */\n"
+"import org.jboss.cache.PropertyConfigurator;\n"
+"import org.jboss.cache.aop.PojoCache;\n"
+"import org.jboss.test.cache.test.standAloneAop.Person;\n"
+"import org.jboss.test.cache.test.standAloneAop.Address;\n"
+"\n"
+"PojoCache tree = new PojoCache();\n"
+"PropertyConfigurator config = new PropertyConfigurator(); // configure tree "
+"cache.\n"
+"config.configure(tree, \"META-INF/replSync-service.xml\");\n"
+"\n"
+"tree.startService(); // kick start tree\n"
+"Person joe = tree.getObject(\"/aop/joe\"); // retrieve the POJO reference.\n"
+"Person mary = tree.getObject(\"/aop/mary\"); // retrieve the POJO "
+"reference.\n"
+"\n"
+"Address joeAddr = joe.getAddress();\n"
+"Address maryAddr = mary.getAddress(); // joeAddr and maryAddr should be the "
+"same instance!!!\n"
+"\n"
+"maryAddr = mary.getAddress().setZip(95123);\n"
+"int zip = joeAddr.getAddress().getZip(); // Should be 95123 as well instead "
+"of 94086!"
#. Tag: title
#: Architecture.xml:140
@@ -530,6 +636,21 @@
"joe.setYear(\"Junior\"); // will be intercepted by the cache\n"
"joe.setName(\"Joe Black II\"); // also intercepted by the cache"
msgstr ""
+"import org.jboss.test.cache.test.standAloneAop.Student;\n"
+"\n"
+"Student joe = new Student(); // Student extends Person class\n"
+"joe.setName(\"Joe Black\"); // This is base class attributes\n"
+"joe.setAge(22); // This is also base class attributes\n"
+"joe.setYear(\"Senior\"); // This is Student class attribute\n"
+"\n"
+"tree.putObject(\"/aop/student/joe\", joe);\n"
+"\n"
+"//...\n"
+"\n"
+"joe = (Student)tree.putObject(\"/aop/student/joe\");\n"
+"Person person = (Person)joe; // it will be correct here\n"
+"joe.setYear(\"Junior\"); // will be intercepted by the cache\n"
+"joe.setName(\"Joe Black II\"); // also intercepted by the cache"
#. Tag: title
#: Architecture.xml:148
@@ -581,6 +702,16 @@
"reference\n"
"proxyList.add(\"FOUR\"); // This will be intercepted by the cache"
msgstr ""
+"List list = new ArrayList();\n"
+"list.add(\"ONE\");\n"
+"list.add(\"TWO\");\n"
+"\n"
+"tree.putObject(\"/aop/list\", list);\n"
+"list.add(\"THREE\"); // This won't intercept by the cache!\n"
+"\n"
+"List proxyList = tree.getObject(\"/aop/list\"; // Note that list is a proxy "
+"reference\n"
+"proxyList.add(\"FOUR\"); // This will be intercepted by the cache"
#. Tag: para
#: Architecture.xml:164
@@ -606,6 +737,17 @@
"ArrayList lang = joe.getLanguages(); // Note that lang is a proxy reference\n"
"lang.add(\"French\"); // This will be intercepted by the cache"
msgstr ""
+"Person joe = new Person();\n"
+"joe.setName(\"Joe Black\"); // This is base class attributes\n"
+"ArrayList lang = new ArrayList();\n"
+"lang.add(\"English\");\n"
+"lang.add(\"Mandarin\");\n"
+"joe.setLanguages(lang);\n"
+"// This will map the languages List automatically and swap it out with the "
+"proxy reference.\n"
+"tree.putObject(\"/aop/student/joe\", joe);\n"
+"ArrayList lang = joe.getLanguages(); // Note that lang is a proxy reference\n"
+"lang.add(\"French\"); // This will be intercepted by the cache"
#. Tag: para
#: Architecture.xml:168
@@ -641,12 +783,23 @@
"tree.removeObject(\"/aop/list\"); // detach from the cache\n"
"proxyList.add(\"FOUR\"); // proxyList has 4 elements still."
msgstr ""
+"List list = new ArrayList();\n"
+"list.add(\"ONE\");\n"
+"list.add(\"TWO\");\n"
+"\n"
+"tree.putObject(\"/aop/list\", list);\n"
+"List proxyList = tree.getObject(\"/aop/list\"); // Note that list is a proxy "
+"reference\n"
+"proxyList.add(\"THREE\"); // This will be intercepted by the cache\n"
+"\n"
+"tree.removeObject(\"/aop/list\"); // detach from the cache\n"
+"proxyList.add(\"FOUR\"); // proxyList has 4 elements still."
#. Tag: title
#: Architecture.xml:175
#, no-c-format
msgid "Limitation"
-msgstr ""
+msgstr "Limitación"
#. Tag: para
#: Architecture.xml:176
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Book_Info.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Book_Info.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Book_Info.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,18 +1,20 @@
+# translation of Book_Info.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Book_Info\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 10:00+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Book_Info.xml:5
@@ -36,4 +38,5 @@
#: Book_Info.xml:26
#, no-c-format
msgid "&HOLDER;"
-msgstr ""
+msgstr "&HOLDER;"
+
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Colophon.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Colophon.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Colophon.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,26 +1,28 @@
+# translation of Colophon.po to
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Colophon\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2007-04-17 00:25-0500\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 10:02+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Colophon.xml:4
#, no-c-format
msgid "Bibliography"
-msgstr ""
+msgstr "Bibliografia"
#. Tag: title
#: Colophon.xml:5
#, no-c-format
msgid "Authors"
-msgstr ""
+msgstr "Autores"
#. Tag: author
#: Colophon.xml:6
@@ -43,16 +45,17 @@
#: Colophon.xml:11
#, no-c-format
msgid "Translator"
-msgstr ""
+msgstr "Angela Garcia - agarcia(a)redhat.com"
#. Tag: othercredit
#: Colophon.xml:12
#, no-c-format
msgid "<firstname>John</firstname> <surname>Doe</surname>"
-msgstr ""
+msgstr "<firstname>John</firstname> <surname>Doe</surname>"
#. Tag: contrib
#: Colophon.xml:14
#, no-c-format
msgid "Extensive review and rough drafts of Section 1.3, 1.4, and 1.5"
msgstr ""
+
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Configuration.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Configuration.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Configuration.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,24 +1,26 @@
+# translation of Configuration.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Configuration\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 10:03+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Configuration.xml:5
#, no-c-format
msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
#. Tag: para
#: Configuration.xml:6
@@ -94,3 +96,4 @@
"persistent all time unless a specific user-based <literal>removeObject</"
"literal> is called."
msgstr ""
+
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Example.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Example.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Example.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,21 +1,24 @@
+# translation of Example.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Example\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 10:07+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Example.xml:5
#, no-c-format
msgid "Example"
-msgstr ""
+msgstr "Ejemplo"
+
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Instrumentation.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Instrumentation.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Instrumentation.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,24 +1,26 @@
+# translation of Instrumentation.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Instrumentation\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 10:09+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Instrumentation.xml:5
#, no-c-format
msgid "Instrumentation"
-msgstr ""
+msgstr "Instrumentación"
#. Tag: para
#: Instrumentation.xml:6
@@ -55,7 +57,7 @@
#: Instrumentation.xml:15
#, no-c-format
msgid "XML descriptor"
-msgstr ""
+msgstr "Descriptor XML"
#. Tag: para
#: Instrumentation.xml:16
@@ -109,6 +111,12 @@
"standAloneAop.Person}->*)\" />\n"
"</aop>"
msgstr ""
+"<aop>\n"
+" <prepare expr=\"field(* org.jboss.test.cache.test.standAloneAop.Address-"
+">*)\" />\n"
+" <prepare expr=\"field(* $instanceof{org.jboss.test.cache.test."
+"standAloneAop.Person}->*)\" />\n"
+"</aop>"
#. Tag: para
#: Instrumentation.xml:26
@@ -123,8 +131,7 @@
#. Tag: para
#: Instrumentation.xml:31
#, no-c-format
-msgid ""
-"The wildcard at the end of the expression signifies all fields in the POJO"
+msgid "The wildcard at the end of the expression signifies all fields in the POJO"
msgstr ""
#. Tag: para
@@ -170,7 +177,7 @@
#: Instrumentation.xml:46
#, no-c-format
msgid "Annotation"
-msgstr ""
+msgstr "Anotación"
#. Tag: para
#: Instrumentation.xml:47
@@ -195,7 +202,7 @@
#: Instrumentation.xml:53
#, no-c-format
msgid "JDK1.4"
-msgstr ""
+msgstr "JDK1.4"
#. Tag: para
#: Instrumentation.xml:54
@@ -245,6 +252,10 @@
" */\n"
" public class Address {...}"
msgstr ""
+"/**\n"
+" * @(a)org.jboss.cache.aop.AopMarker\n"
+" */\n"
+" public class Address {...}"
#. Tag: para
#: Instrumentation.xml:68
@@ -263,6 +274,10 @@
" */\n"
" public class Person {...}"
msgstr ""
+"/**\n"
+" * @(a)org.jboss.cache.aop.InstanceOfAopMarker\n"
+" */\n"
+" public class Person {...}"
#. Tag: para
#: Instrumentation.xml:72
@@ -287,7 +302,7 @@
#: Instrumentation.xml:77
#, no-c-format
msgid "JDK5.0"
-msgstr ""
+msgstr "JDK5.0"
#. Tag: para
#: Instrumentation.xml:78
@@ -377,6 +392,27 @@
" ge.setSpecialAddress(d2); \n"
" // Now this will."
msgstr ""
+"Gadget gadget = new Gadget();\n"
+" Resource resource = new Resouce();\n"
+" SepcialAddress specialAddress = new SpecialAddress();\n"
+"\n"
+" // setters\n"
+" gadget.setResource(resource);\n"
+" gadget.setSpecialAddress(specialAddress);\n"
+"\n"
+" cache1.putObject(\"/gadget\", gadget); // put into PojoCache management\n"
+"\n"
+" Gadget g2 = (Gadget)cache2.getObject(\"/gadget\"); \n"
+" // retrieve it from another cache instance\n"
+" g2.getResource(); \n"
+" // This is should be null becuase of @Transient tag so it is not "
+"replicated.\n"
+"\n"
+" SepcialAddress d2 = g2.getSpecialAddress();\n"
+" d2.setName(\"inet\"); \n"
+" // This won't get replicated automatically because of @Serializable tag\n"
+" ge.setSpecialAddress(d2); \n"
+" // Now this will."
#. Tag: title
#: Instrumentation.xml:92
@@ -417,6 +453,14 @@
" </fileset/>\n"
" </path/>"
msgstr ""
+"<path id=\"aop.classpath\"/>\n"
+" <fileset dir=\"${lib}\"/>\n"
+" <include name=\"**/*.jar\" //>\n"
+" <exclude name=\"**/jboss-cache.jar\" //>\n"
+" <exclude name=\"**/j*unit.jar\" //>\n"
+" <exclude name=\"**/bsh*.jar\" //>\n"
+" </fileset/>\n"
+" </path/>"
#. Tag: title
#: Instrumentation.xml:99
@@ -484,6 +528,46 @@
" </junit>\n"
" </target>"
msgstr ""
+"<target name=\"generateClassLoader\" description=\n"
+" \"Generate a new modified class loader so we can perform load "
+"time instrumentation\">\n"
+" <property name=\"build.bootclasspath\" value=\"${output}/gen-"
+"bootclasspath\"/>\n"
+" <java classname=\"org.jboss.aop.hook.GenerateInstrumentedClassLoader"
+"\">\n"
+" <classpath>\n"
+" <path refid=\"aop.classpath\"/>\n"
+" </classpath>\n"
+" <arg value=\"${build.bootclasspath}\"/>\n"
+" </java>\n"
+" <path id=\"bootclasspath\">\n"
+" <pathelement location=\"${build.bootclasspath}\"/>\n"
+" <path refid=\"aop.classpath\"/>\n"
+" </path>\n"
+" <property name=\"bootclasspath\" refid=\"bootclasspath\"/>\n"
+" </target>\n"
+"\n"
+" <!-- eg. ant run.examples -Dtest=org.jboss.test.cache.test.local."
+"NoTxUnitTestCase -->\n"
+" <target name=\"one.test.aop\" depends=\"compile, generateClassLoader"
+"\" \n"
+" description=\"run one junit test case.\">\n"
+" <junit printsummary=\"yes\" timeout=\"${junit.timeout}\" fork="
+"\"yes\">\n"
+" <jvmarg value=\"-Djboss.aop.path=${output}/etc/META-INF/"
+"jboss-aop.xml\"/>\n"
+" <jvmarg value=\"-Xbootclasspath/p:${bootclasspath}\"/>\n"
+" <!-- jvmarg value=\"-Dbind.address=${bind.address}\"/ --"
+">\n"
+" <classpath path=\"${output}/etc\" />\n"
+" <sysproperty key=\"log4j.configuration\" value=\"file:$"
+"{output}/etc/log4j.xml\" />\n"
+" <classpath refid=\"lib.classpath\"/>\n"
+" <classpath path=\"${build}\"/>\n"
+" <formatter type=\"xml\" usefile=\"true\"/>\n"
+" <test name=\"${test}\" todir=\"${reports}\"/>\n"
+" </junit>\n"
+" </target>"
#. Tag: para
#: Instrumentation.xml:104
@@ -516,6 +600,23 @@
" </junit>\n"
" </target>"
msgstr ""
+"<target name=\"one.test.aop50\" depends=\"compile, generateClassLoader\"\n"
+" description=\"run one junit test case.\">\n"
+" <junit printsummary=\"yes\" timeout=\"${junit.timeout}\" fork="
+"\"yes\">\n"
+" <jvmarg value=\"-Djboss.aop.path=${output}/resources/jboss-"
+"aop.xml\"/>\n"
+" <jvmarg value=\"-javaagent:${lib-50}/jboss-aop-jdk50.jar\"/"
+">\n"
+" <classpath path=\"${output}/etc\" />\n"
+" <sysproperty key=\"log4j.configuration\" value=\"file:$"
+"{output}/etc/log4j.xml\" />\n"
+" <classpath refid=\"lib.classpath.50\"/>\n"
+" <classpath refid=\"build.classpath.50\"/>\n"
+" <formatter type=\"xml\" usefile=\"true\"/>\n"
+" <test name=\"${test}\" todir=\"${reports}\"/>\n"
+" </junit>\n"
+" </target>"
#. Tag: title
#: Instrumentation.xml:107
@@ -549,6 +650,18 @@
" </aopc>\n"
" </target>"
msgstr ""
+"<taskdef name=\"aopc\" classname=\"org.jboss.aop.ant.AopC\" classpathref="
+"\"aop.classpath\"/>\n"
+" <target name=\"aopc\" depends=\"compile\" description=\"Precompile aop "
+"class\">\n"
+" <aopc compilerclasspathref=\"aop.classpath\" verbose=\"true\">\n"
+" <src path=\"${build}\"/>\n"
+" <include name=\"org/jboss/cache/aop/test/**/*.class\"/>\n"
+" <aoppath path=\"${output}/etc/META-INF/jboss-aop.xml\"/>\n"
+" <classpath path=\"${build}\"/>\n"
+" <classpath refid=\"lib.classpath\"/>\n"
+" </aopc>\n"
+" </target>"
#. Tag: para
#: Instrumentation.xml:112
@@ -607,3 +720,25 @@
" </annotationc>\n"
" </target>"
msgstr ""
+"<!-- pre-compile directory with annotationc using jdk1.4 -->\n"
+" <target name=\"annoc\" depends=\"compile\" description=\"Annotation "
+"precompiler for aop class\">\n"
+" <!-- Define a new ant target. This is the 1.4 annotation pre-"
+"compiler. \n"
+" After running this step, you still need to run the aopc step again,\n"
+" if you are not using system class loader.\n"
+" -->\n"
+" <taskdef name=\"annotationc\" classname=\"org.jboss.aop.ant."
+"AnnotationC\" \n"
+" classpathref=\"aop.classpath\"/>\n"
+" <annotationc compilerclasspathref=\"aop.classpath\" bytecode=\"true"
+"\">\n"
+" <classpath refid=\"lib.classpath\"/>\n"
+" <classpath path=\"${build}\"/>\n"
+" <!--System wide jboss-aop.xml is located here. -->\n"
+" <classpath path=\"${output.resources.dir}\"/>\n"
+" <src path=\"${source}\"/>\n"
+" <include name=\"org/jboss/cache/aop/test/**/*.java\"/>\n"
+" </annotationc>\n"
+" </target>"
+
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Introduction.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Introduction.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Introduction.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -8,7 +8,7 @@
"Project-Id-Version: Introduction\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2008-11-12 15:01+1000\n"
+"PO-Revision-Date: 2008-11-13 10:11+1000\n"
"Last-Translator: Angela Garcia\n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -405,6 +405,14 @@
" ...\n"
" cache_.stop();"
msgstr ""
+"cache_ = new PojoCache();\n"
+" PropertyConfigurator config = new PropertyConfigurator(); // configure "
+"tree cache.\n"
+" config.configure(cache_, \"META-INF/replSync-service.xml\"); // Search "
+"under the classpath\n"
+" cache_.start();\n"
+" ...\n"
+" cache_.stop();"
#. Tag: title
#: Introduction.xml:142
@@ -425,7 +433,7 @@
#: Introduction.xml:148
#, no-c-format
msgid "Library:"
-msgstr ""
+msgstr "Biblioteca:"
#. Tag: para
#: Introduction.xml:153
@@ -443,7 +451,7 @@
#: Introduction.xml:159
#, no-c-format
msgid "trove.jar. High performance collections for Java."
-msgstr ""
+msgstr "trove.jar. Colecciones de alto rendimiento para Java."
#. Tag: para
#: Introduction.xml:162
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Jbossaop.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Jbossaop.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Jbossaop.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,24 +1,26 @@
+# translation of Jbossaop.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Jbossaop\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 10:13+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Jbossaop.xml:5
#, no-c-format
msgid "Introduction to JBossAop"
-msgstr ""
+msgstr "Introducción a JBossAop"
#. Tag: para
#: Jbossaop.xml:6
@@ -101,6 +103,22 @@
" }\n"
" }"
msgstr ""
+"public class BankAccountDAO\n"
+" {\n"
+" public void withdraw(double amount)\n"
+" {\n"
+" long startTime = System.currentTimeMillis();\n"
+" try\n"
+" {\n"
+" // Actual method body...\n"
+" }\n"
+" finally\n"
+" {\n"
+" long endTime = System.currentTimeMillis() - startTime;\n"
+" System.out.println(\"withdraw took: \" + endTime);\n"
+" }\n"
+" }\n"
+" }"
#. Tag: para
#: Jbossaop.xml:23
@@ -189,6 +207,25 @@
"16. }\n"
"17. }"
msgstr ""
+"01. public class Metrics implements org.jboss.aop.advice.Interceptor\n"
+"02. {\n"
+"03. public Object invoke(Invocation invocation) throws Throwable\n"
+"04. {\n"
+"05. long startTime = System.currentTimeMillis();\n"
+"06. try\n"
+"07. {\n"
+"08. return invocation.invokeNext();\n"
+"09. }\n"
+"10. finally\n"
+"11. {\n"
+"12. long endTime = System.currentTimeMillis() - startTime;\n"
+"13. java.lang.reflect.Method m = ((MethodInvocation)invocation)."
+"method;\n"
+"14. System.out.println(\"method \" + m.toString() + \" time: \" + "
+"endTime + \"ms\");\n"
+"15. }\n"
+"16. }\n"
+"17. }"
#. Tag: para
#: Jbossaop.xml:43
@@ -269,6 +306,14 @@
"5. <interceptor class=\"com.mc.Metrics\"/>\n"
"6. </bind >"
msgstr ""
+"1. <bind pointcut=\"public void com.mc.BankAccountDAO->withdraw(double "
+"amount)\">\n"
+"2. <interceptor class=\"com.mc.Metrics\"/>\n"
+"3. </bind >\n"
+"\n"
+"4. <bind pointcut=\"* com.mc.billing.*->*(..)\">\n"
+"5. <interceptor class=\"com.mc.Metrics\"/>\n"
+"6. </bind >"
#. Tag: para
#: Jbossaop.xml:63
@@ -325,6 +370,10 @@
"binding.addInterceptor(SimpleInterceptor.class);\n"
"AspectManager.instance().addBinding(binding);"
msgstr ""
+"AdviceBinding binding = new AdviceBinding(\"execution(POJO->new(..))\", "
+"null);\n"
+"binding.addInterceptor(SimpleInterceptor.class);\n"
+"AspectManager.instance().addBinding(binding);"
#. Tag: para
#: Jbossaop.xml:77
@@ -366,6 +415,16 @@
" public Advisor _getAdvisor();\n"
"}"
msgstr ""
+"public interface InstanceAdvised\n"
+"{\n"
+" public InstanceAdvisor _getInstanceAdvisor();\n"
+" public void _setInstanceAdvisor(InstanceAdvisor newAdvisor);\n"
+"}\n"
+"\n"
+"public interface Advised extends InstanceAdvised\n"
+"{\n"
+" public Advisor _getAdvisor();\n"
+"}"
#. Tag: para
#: Jbossaop.xml:85
@@ -394,6 +453,19 @@
"\n"
"}"
msgstr ""
+"public interface InstanceAdvisor\n"
+"{\n"
+" public void insertInterceptor(Interceptor interceptor);\n"
+" public void removeInterceptor(String name);\n"
+" public void appendInterceptor(Interceptor interceptor);\n"
+"\n"
+" public void insertInterceptorStack(String stackName);\n"
+" public void removeInterceptorStack(String name);\n"
+" public void appendInterceptorStack(String stackName);\n"
+"\n"
+" public SimpleMetaData getMetaData();\n"
+"\n"
+"}"
#. Tag: para
#: Jbossaop.xml:89
@@ -413,7 +485,7 @@
#: Jbossaop.xml:92
#, no-c-format
msgid "Preparation"
-msgstr ""
+msgstr "Preparación"
#. Tag: para
#: Jbossaop.xml:93
@@ -428,7 +500,7 @@
#: Jbossaop.xml:96
#, no-c-format
msgid "Annotations"
-msgstr ""
+msgstr "Anotaciones"
#. Tag: para
#: Jbossaop.xml:97
@@ -470,6 +542,13 @@
" int myInteger();\n"
" }"
msgstr ""
+"package com.mypackage;\n"
+"\n"
+" public interface MyAnnotation\n"
+" {\n"
+" String myString();\n"
+" int myInteger();\n"
+" }"
#. Tag: para
#: Jbossaop.xml:104
@@ -552,3 +631,31 @@
" }\n"
" }"
msgstr ""
+"package com.mypackage;\n"
+"\n"
+" /**\n"
+" * @(a)com.mypackage.MyAnnotation (myString=\"class\", myInteger=5)\n"
+" */\n"
+" public class MyClass\n"
+" {\n"
+" /**\n"
+" * @(a)com.mypackage.MyAnnotation (myString=\"field\", myInteger=4)\n"
+" */\n"
+" private String myField;\n"
+"\n"
+" /**\n"
+" * @(a)com.mypackage.MyAnnotation (myString=\"constructor\", "
+"myInteger=3)\n"
+" */\n"
+" public MyClass()\n"
+" {\n"
+" }\n"
+"\n"
+" /**\n"
+" * @(a)com.mypackage.MyAnnotation (myString=\"method\", myInteger=3)\n"
+" */\n"
+" public int myMethod()\n"
+" {\n"
+" }\n"
+" }"
+
Modified: enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Term.po
===================================================================
--- enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Term.po 2008-11-12 23:02:32 UTC (rev 7128)
+++ enterprise-docs/tags/JBoss_EAP_4_3/Cache_Pojo_Cache_Guide/es-ES/Term.po 2008-11-13 05:21:36 UTC (rev 7129)
@@ -1,30 +1,32 @@
+# translation of Term.po to
# Language /tmp/mike/JBEAP420/Cache translations for JBEAP package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
# Automatically generated, 2007.
#
msgid ""
msgstr ""
-"Project-Id-Version: JBEAP 420\n"
+"Project-Id-Version: Term\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-09-21 04:57+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2008-11-13 10:16+1000\n"
+"Last-Translator: Angela Garcia\n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: Term.xml:5
#, no-c-format
msgid "Terminology"
-msgstr ""
+msgstr "Terminologia"
#. Tag: title
#: Term.xml:6
#, no-c-format
msgid "Overview"
-msgstr ""
+msgstr "Sinopsis"
#. Tag: para
#: Term.xml:7
@@ -178,3 +180,4 @@
"classloader in the run script. This step is necessary for an Aop system to "
"intercept events that are interesting to users."
msgstr ""
+
15 years, 6 months
- 1
- 0
JBoss Cache SVN: r7128 - core/trunk.
by jbosscache-commits＠lists.jboss.org
Author: mircea.markus
Date: 2008-11-12 18:02:32 -0500 (Wed, 12 Nov 2008)
New Revision: 7128
Modified:
core/trunk/pom.xml
Log:
for now run all tests in one thread
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2008-11-12 21:48:08 UTC (rev 7127)
+++ core/trunk/pom.xml 2008-11-12 23:02:32 UTC (rev 7128)
@@ -132,7 +132,7 @@
<version>2.4.3-JBOSS</version>
<configuration>
<parallel>tests</parallel>
- <threadCount>10</threadCount>
+ <threadCount>1</threadCount>
<forkMode>none</forkMode>
<trimStackTrace>false</trimStackTrace>
<properties>
15 years, 6 months
- 1
- 0