[jbosscache-commits] JBoss Cache SVN: r6564 - in core/trunk/src: main/java/org/jboss/cache/config/parsing and 14 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Fri Aug 15 17:16:38 EDT 2008
Author: jason.greene at jboss.com
Date: 2008-08-15 17:16:37 -0400 (Fri, 15 Aug 2008)
New Revision: 6564
Added:
core/trunk/src/main/resources/schema/
core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd
Removed:
core/trunk/src/main/resources/jbosscache-config-3.0.xsd
Modified:
core/trunk/src/main/java/org/jboss/cache/Fqn.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/CacheConfigsXmlParser.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlParserBase.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/element/BuddyElementParser.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/element/LoadersElementParser.java
core/trunk/src/main/java/org/jboss/cache/util/FileLookup.java
core/trunk/src/main/resources/config-samples/buddy-replication.xml
core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
core/trunk/src/main/resources/config-samples/eviction-enabled.xml
core/trunk/src/main/resources/config-samples/invalidation-async.xml
core/trunk/src/main/resources/config-samples/local.xml
core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
core/trunk/src/main/resources/config-samples/total-replication.xml
core/trunk/src/main/resources/config2to3.xslt
core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java
core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheLoadersElementParserTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/CustomInterceptorsElementParserTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/MRUConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest.java
core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java
core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java
core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java
core/trunk/src/test/resources/configs/buddy-replication-cache.xml
core/trunk/src/test/resources/configs/clonable-config.xml
core/trunk/src/test/resources/configs/local-lru-eviction.xml
core/trunk/src/test/resources/configs/local-passivation.xml
core/trunk/src/test/resources/configs/local-tx.xml
core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
core/trunk/src/test/resources/configs/mux.xml
core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml
core/trunk/src/test/resources/configs/parser-test.xml
core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
core/trunk/src/test/resources/configs/replSync.xml
core/trunk/src/test/resources/configs/string-property-replaced.xml
core/trunk/src/test/resources/jbc2-registry-configs.xml
core/trunk/src/test/resources/unit-test-cache-service.xml
Log:
Use JBossEntityResolver to find schema
Modify schema to use a namespace
Correct simple type pattern for locking scheme
Modify parser to use the namespace
Update configuration files
Add root element checking to prevent NPEs
Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -110,12 +110,13 @@
size = 0;
}
- protected Fqn(List<Object> names, boolean safe)
+ @SuppressWarnings("unchecked")
+ protected Fqn(List<?> names, boolean safe)
{
if (names != null)
{
// if not safe make a defensive copy
- elements = safe ? names : Immutables.immutableListCopy(names);
+ elements = safe ? (List<Object>) names : Immutables.immutableListCopy(names);
size = elements.size();
}
else
@@ -141,9 +142,9 @@
* @since 2.2.0
*/
@SuppressWarnings("unchecked")
- public static Fqn fromList(List<?> names)
+ public static <T> Fqn fromList(List<T> names)
{
- return new Fqn((List<Object>)names, false);
+ return new Fqn(names, false);
}
/**
@@ -159,7 +160,7 @@
@SuppressWarnings("unchecked")
public static Fqn fromList(List<?> names, boolean safe)
{
- return new Fqn((List<Object>)names, safe);
+ return new Fqn(names, safe);
}
/**
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/CacheConfigsXmlParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/CacheConfigsXmlParser.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/CacheConfigsXmlParser.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -109,7 +109,8 @@
if (name == null || name.trim().length() == 0)
throw new ConfigurationException("Element " + element + " has no name attribute");
XmlConfigurationParser parser = new XmlConfigurationParser();
- Configuration c = parser.parseElement(element);
+ // FIXME - This should be using a valid schema!!!
+ Configuration c = parser.parseElementIgnoringRoot(element);
// Prove that we can successfully clone it
c = c.clone();
result.put(name.trim(), c);
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/JGroupsStackParser.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -54,8 +54,9 @@
continue;
}
+ // Ignore Namespace until JGroups defines one
Element tag = (Element) node;
- String protocol = tag.getTagName();
+ String protocol = tag.getLocalName();
buffer.append(protocol);
processAttributes(buffer, tag);
buffer.append(':');
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigHelper.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -364,16 +364,34 @@
* @return a DOM Element
* @throws Exception if unable to parse the String or if it doesn't contain valid XML.
*/
- public static Element stringToElement(String xml) throws Exception
+ public static Element stringToElementInCoreNS(String xml) throws Exception
{
+ xml = "<wrapper xmlns='" + XmlParserBase.JBOSSCACHE_CORE_NS + "'>" + xml + "</wrapper>";
ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes("utf8"));
- DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder = factory.newDocumentBuilder();
Document d = builder.parse(bais);
bais.close();
- return d.getDocumentElement();
+ return getFirstChildElement(d.getDocumentElement());
}
/**
+ * Gets the first child element of an element
+ *
+ * @param element the parent
+ * @return the first child element or null if there isn't one
+ */
+ public static Element getFirstChildElement(Element element)
+ {
+ Node child = element.getFirstChild();
+ while (child != null && child.getNodeType() != Node.ELEMENT_NODE)
+ child = child.getNextSibling();
+
+ return (Element)child;
+ }
+
+ /**
* Returns the root element of a given input stream
*
* @param is stream to parse
@@ -387,6 +405,7 @@
InputSource xmlInp = new InputSource(is);
DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ docBuilderFactory.setNamespaceAware(true);
DocumentBuilder parser = docBuilderFactory.newDocumentBuilder();
doc = parser.parse(xmlInp);
Element root = doc.getDocumentElement();
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-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -35,6 +35,7 @@
import org.jboss.cache.config.parsing.element.LoadersElementParser;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.util.FileLookup;
+import org.jboss.util.xml.JBossEntityResolver;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.ErrorHandler;
@@ -62,11 +63,19 @@
*/
public class XmlConfigurationParser extends XmlParserBase
{
+
private static final Log log = LogFactory.getLog(XmlConfigurationParser.class);
+ private static final JBossEntityResolver resolver = new JBossEntityResolver();
+
public static final String VALIDATING_SYSTEM_PROPERTY = "jbosscache.config.validate";
- public static final String SCHEMA_LOCATION_SYSTEM_PROPERTY = "jbosscache.config.schemaLocation";
+ static
+ {
+ // Globally register this namespace
+ JBossEntityResolver.registerEntity(JBOSSCACHE_CORE_NS, "jbosscache-config-3.0.xsd");
+ }
+
/**
* the resulting configuration.
*/
@@ -74,7 +83,6 @@
private Element root;
private ErrorHandler errorHandler;
private boolean isValidating;
- private String schemaLocation;
/**
* If validation is on (default) one can specify an error handler for handling validation errors.
@@ -84,7 +92,6 @@
{
this.errorHandler = errorHandler;
isValidating = System.getProperty(VALIDATING_SYSTEM_PROPERTY) == null || Boolean.getBoolean(VALIDATING_SYSTEM_PROPERTY);
- schemaLocation = System.getProperty(SCHEMA_LOCATION_SYSTEM_PROPERTY);
}
/**
@@ -131,7 +138,7 @@
public Configuration parseStream(InputStream configStream)
{
readRoot(configStream);
- return processElements();
+ return processElements(false);
}
/**
@@ -143,20 +150,36 @@
{
this.root = root;
this.root.normalize();
- return processElements();
+ return processElements(false);
}
+ // FIXME: CacheConfigsXmlParser should be using a valid schema!
+ @Deprecated
+ public Configuration parseElementIgnoringRoot(Element root)
+ {
+ this.root = root;
+ this.root.normalize();
+ return processElements(true);
+ }
+
public boolean isValidating()
{
return isValidating;
}
- private Configuration processElements()
+ private Configuration processElements(boolean ignoreRoot)
{
- if ("server".equalsIgnoreCase(root.getNodeName()))
+ if (!ignoreRoot)
{
- throw new OldFileFormatException();
+ if ("server".equalsIgnoreCase(root.getNodeName()))
+ {
+ throw new OldFileFormatException();
+ }
+
+ if (! "jbosscache".equals(root.getLocalName()) || ! JBOSSCACHE_CORE_NS.equals(root.getNamespaceURI()))
+ throw new ConfigurationException("Expected root element {" + JBOSSCACHE_CORE_NS + "}" + "jbosscache");
}
+
try
{
configureLocking(getSingleElement("locking"));
@@ -300,7 +323,7 @@
config.setClusterName(clusterName);
String multiplexerStack = getAttributeValue(element, "multiplexerStack");
if (existsAttribute(multiplexerStack)) config.setMultiplexerStack(multiplexerStack);
- Element clusterConfig = getSingleElement("jgroupsConfig", element);
+ Element clusterConfig = getSingleElementInCoreNS("jgroupsConfig", element);
if (clusterConfig != null)
{
JGroupsStackParser stackParser = new JGroupsStackParser();
@@ -324,13 +347,13 @@
if (async != null)
{
config.setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
- configureAsyncMode(getSingleElement("async", element));
+ configureAsyncMode(getSingleElementInCoreNS("async", element));
}
Element sync = getSingleElement("sync");
if (sync != null)
{
config.setCacheMode(Configuration.CacheMode.INVALIDATION_SYNC);
- configureSyncMode(getSingleElement("sync", element));
+ configureSyncMode(getSingleElementInCoreNS("sync", element));
}
}
@@ -341,15 +364,15 @@
if (async != null)
{
config.setCacheMode(Configuration.CacheMode.REPL_ASYNC);
- configureAsyncMode(getSingleElement("async", element));
+ configureAsyncMode(getSingleElementInCoreNS("async", element));
}
Element sync = getSingleElement("sync");
if (sync != null)
{
config.setCacheMode(Configuration.CacheMode.REPL_SYNC);
- configureSyncMode(getSingleElement("sync", element));
+ configureSyncMode(getSingleElementInCoreNS("sync", element));
}
- configureBuddyReplication(getSingleElement("buddy", element));
+ configureBuddyReplication(getSingleElementInCoreNS("buddy", element));
}
private void configureSyncMode(Element element)
@@ -387,7 +410,7 @@
private Element getSingleElement(String elementName)
{
- return getSingleElement(elementName, root);
+ return getSingleElementInCoreNS(elementName, root);
}
private void readRoot(InputStream config)
@@ -395,22 +418,16 @@
try
{
DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+ docBuilderFactory.setNamespaceAware(true);
if (isValidating)
{
docBuilderFactory.setValidating(true);
- docBuilderFactory.setNamespaceAware(true);
docBuilderFactory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage", "http://www.w3.org/2001/XMLSchema");
- if (schemaLocation != null)
- {
- if (log.isTraceEnabled()) log.trace("Using the schema location set to: '" + schemaLocation + '\'');
- docBuilderFactory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", schemaLocation);
- }
- else if (log.isTraceEnabled())
- {
- log.trace("Validation is enabled, using the schema decalred in the .xml configuration file");
- }
+ docBuilderFactory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaSource", JBOSSCACHE_CORE_NS);
}
+
DocumentBuilder parser = docBuilderFactory.newDocumentBuilder();
+ parser.setEntityResolver(resolver);
parser.setErrorHandler(errorHandler);
Document doc = parser.parse(config);
root = doc.getDocumentElement();
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlParserBase.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlParserBase.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlParserBase.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -33,6 +33,8 @@
*/
public abstract class XmlParserBase
{
+ public static final String JBOSSCACHE_CORE_NS = "urn:jboss:jbosscache-core:config:3.0";
+
/**
* @see Integer#parseInt(String)
*/
@@ -68,9 +70,9 @@
/**
* Convenient method for retrieving a single element with the give name.
*/
- protected Element getSingleElement(String elementName, Element parent)
+ protected Element getSingleElement(String namespace, String elementName, Element parent)
{
- NodeList nodeList = parent.getElementsByTagName(elementName);
+ NodeList nodeList = parent.getElementsByTagNameNS(namespace, elementName);
if (nodeList.getLength() == 0)
{
return null;
@@ -79,6 +81,14 @@
}
/**
+ * Convenient method for retrieving a single element with the give name.
+ */
+ protected Element getSingleElementInCoreNS(String elementName, Element parent)
+ {
+ return getSingleElement(JBOSSCACHE_CORE_NS, elementName, parent);
+ }
+
+ /**
* Beside querying the element for it's attribute value, it will look into the value, if any, and replace the
* jboss properties(e.g. ${someValue:defaultValue}.
* @see StringPropertyReplacer#replaceProperties(value);
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/BuddyElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/BuddyElementParser.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/BuddyElementParser.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -31,8 +31,8 @@
if (existsAttribute(buddyCommunicationTimeout))
brc.setBuddyCommunicationTimeout(getInt(buddyCommunicationTimeout));
- parseDataGravitationElement(getSingleElement("dataGravitation", element), brc);
- BuddyReplicationConfig.BuddyLocatorConfig blc = parseBuddyLocatorConfig(getSingleElement("locator", element));
+ parseDataGravitationElement(getSingleElementInCoreNS("dataGravitation", element), brc);
+ BuddyReplicationConfig.BuddyLocatorConfig blc = parseBuddyLocatorConfig(getSingleElementInCoreNS("locator", element));
brc.setBuddyLocatorConfig(blc);
return brc;
}
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -52,7 +52,7 @@
// if (existsAttribute(defaultEventQueueSize)) evictionConfig.setDefaultEventQueueSize(getInt(defaultEventQueueSize));
List<EvictionRegionConfig> evictionRegionConfigs = new LinkedList<EvictionRegionConfig>();
- Element defaultRegion = getSingleElement("default", evictionElement);
+ Element defaultRegion = getSingleElementInCoreNS("default", evictionElement);
if (defaultRegion != null)
{
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/LoadersElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/LoadersElementParser.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/LoadersElementParser.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -28,7 +28,7 @@
if (existsAttribute(passivation)) cacheLoaderConfig.setPassivation(getBoolean(passivation));
String shared = getAttributeValue(element, "shared");
if (existsAttribute(shared)) cacheLoaderConfig.setShared(getBoolean(shared));
- String preload = getPreloadString(getSingleElement("preload", element));
+ String preload = getPreloadString(getSingleElementInCoreNS("preload", element));
if (preload != null) cacheLoaderConfig.setPreload(preload);
NodeList cacheLoaderNodes = element.getElementsByTagName("loader");
@@ -58,7 +58,7 @@
throw new ConfigurationException("Missing 'class' attribute for cache loader configuration");
iclc.setClassName(clClass);
iclc.setProperties(XmlConfigHelper.readPropertiesContents(indivElement, "properties"));
- CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig ssc = parseSingletonStoreConfig(getSingleElement("singletonStore", indivElement));
+ CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig ssc = parseSingletonStoreConfig(getSingleElementInCoreNS("singletonStore", indivElement));
if (ssc != null)
{
iclc.setSingletonStoreConfig(ssc);
Modified: core/trunk/src/main/java/org/jboss/cache/util/FileLookup.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/util/FileLookup.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/java/org/jboss/cache/util/FileLookup.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -27,6 +27,7 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
+import java.net.URL;
/**
* Holds the logic of looking up a file, in the following sequence:
Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/eviction-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/invalidation-async.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/invalidation-async.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/config-samples/invalidation-async.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/local.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/local.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/config-samples/local.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<!-- By not specifying neither an 'replication' nor an 'invalidation' element, the cache is defaulted to local -->
Modified: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config-samples/total-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/total-replication.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/config-samples/total-replication.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<!--
isolationLevel : SERIALIZABLE - (not supported in mvcc)
Modified: core/trunk/src/main/resources/config2to3.xslt
===================================================================
--- core/trunk/src/main/resources/config2to3.xslt 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/config2to3.xslt 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<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="/">
@@ -435,4 +435,4 @@
</xsl:if>
</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
Deleted: core/trunk/src/main/resources/jbosscache-config-3.0.xsd
===================================================================
--- core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="jbosscache">
- <xs:complexType>
- <xs:all>
- <xs:element name="locking" type="lockingType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="transaction" type="transactionType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="startup" type="startupType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="stateRetrieval" type="stateRetrievalType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="shutdown" type="shutdownType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="serialization" type="serializationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="replication" type="replicationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="invalidation" type="invalidationType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="jmxStatistics" type="jmxStatisticsType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="listeners" type="listenersType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="invocationBatching" type="invocationBatchingType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="transport" type="transportType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="eviction" type="evictionType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="loaders" type="loadersType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="customInterceptors" type="customInterceptorsType" minOccurs="0" maxOccurs="1"/>
- </xs:all>
- </xs:complexType>
- </xs:element>
-
- <xs:complexType name="lockingType">
- <xs:attribute name="isolationLevel">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="SERIALIZABLE|REPEATABLE_READ|READ_COMMITTED|NONE|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="lockParentForChildInsertRemove" type="booleanType"/>
- <xs:attribute name="lockAcquisitionTimeout" type="positiveInteger"/>
- <xs:attribute name="nodeLockingScheme">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="mvcc|optimistic|pessimistic|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="writeSkewCheck" type="booleanType"/>
- <xs:attribute name="concurrencyLevel" type="xs:integer"/>
- </xs:complexType>
-
- <xs:complexType name="transactionType">
- <xs:attribute name="transactionManagerLookupClass" type="xs:string"/>
- <xs:attribute name="syncRollbackPhase" type="booleanType"/>
- <xs:attribute name="syncCommitPhase" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="startupType">
- <xs:attribute name="regionsInactiveOnStartup" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="stateRetrievalType">
- <xs:attribute name="fetchInMemoryState" type="booleanType"/>
- <xs:attribute name="timeout" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="shutdownType">
- <xs:attribute name="hookBehavior">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:pattern value="DEFAULT|REGISTER|DONT_REGISTER|\$\{.*\}"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:complexType>
-
- <xs:complexType name="serializationType">
- <xs:attribute name="objectInputStreamPoolSize" type="positiveInteger"/>
- <xs:attribute name="objectOutputStreamPoolSize" type="positiveInteger"/>
- <xs:attribute name="version" type="xs:string"/>
- <xs:attribute name="marshallerClass" type="xs:string"/>
- <xs:attribute name="useLazyDeserialization" type="booleanType"/>
- <xs:attribute name="useRegionBasedMarshalling" type="booleanType"/>
- </xs:complexType>
-
- <xs:simpleType name="booleanType">
- <xs:restriction base="xs:string">
- <xs:pattern value="\$\{.*\}|true|false"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="positiveInteger">
- <xs:restriction base="xs:string">
- <xs:pattern value="\$\{.*\}|\+?[0-9]*"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="replicationType">
- <xs:sequence>
- <xs:choice>
- <xs:element name="sync" type="syncType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="async" type="asyncType" minOccurs="0" maxOccurs="1"/>
- </xs:choice>
- <xs:element name="buddy" minOccurs="0" maxOccurs="1">
- <xs:complexType>
- <xs:all minOccurs="0">
- <xs:element name="dataGravitation" maxOccurs="1">
- <xs:complexType>
- <xs:attribute name="auto" type="booleanType"/>
- <xs:attribute name="removeOnFind" type="booleanType"/>
- <xs:attribute name="searchBackupTrees" type="booleanType"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="locator" 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="booleanType"/>
- <xs:attribute name="poolName" type="xs:string"/>
- <xs:attribute name="communicationTimeout" type="xs:integer"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="invalidationType">
- <xs:choice>
- <xs:element name="sync" type="syncType"/>
- <xs:element name="async" type="asyncType"/>
- </xs:choice>
- </xs:complexType>
-
- <xs:complexType name="jmxStatisticsType">
- <xs:attribute name="enabled" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="listenersType">
- <xs:attribute name="asyncPoolSize" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="invocationBatchingType">
- <xs:attribute name="enabled" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="transportType">
- <xs:sequence>
- <xs:element name="jgroupsConfig" type="xs:anyType" minOccurs="0" maxOccurs="1"/>
- </xs:sequence>
- <xs:attribute name="clusterName" type="xs:string"/>
- <xs:attribute name="multiplexerStack" type="xs:string"/>
- </xs:complexType>
-
- <xs:complexType name="syncType">
- <xs:attribute name="replTimeout" type="positiveInteger"/>
- </xs:complexType>
-
-
- <xs:complexType name="asyncType">
- <xs:attribute name="useReplQueue" type="booleanType"/>
- <xs:attribute name="replQueueInterval" type="positiveInteger"/>
- <xs:attribute name="replQueueMaxElements" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="evictionType">
- <xs:sequence>
- <xs:element name="default" type="evictionRegionType" minOccurs="0" maxOccurs="1"/>
- <xs:element name="region" minOccurs="0" maxOccurs="unbounded" type="evictionRegionType"/>
- </xs:sequence>
- <xs:attribute name="wakeUpInterval" type="positiveInteger" use="required"/>
- <xs:attribute name="defaultPolicyClass" type="xs:string"/>
- <xs:attribute name="defaultEventQueueSize" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="evictionRegionType">
- <xs:sequence>
- <xs:element name="attribute" maxOccurs="unbounded" type="attributeType"/>
- </xs:sequence>
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="policyClass" type="xs:string"/>
- <xs:attribute name="eventQueueSize" type="positiveInteger"/>
- </xs:complexType>
-
- <xs:complexType name="loadersType">
- <xs:sequence>
- <xs:element name="preload" 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="booleanType"/>
- <xs:attribute name="class" type="xs:string"/>
- </xs:complexType>
- </xs:element>
- </xs:all>
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="async" type="booleanType"/>
- <xs:attribute name="fetchPersistentState" type="booleanType"/>
- <xs:attribute name="ignoreModifications" type="booleanType"/>
- <xs:attribute name="purgeOnStartup" type="booleanType"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:attribute name="passivation" type="booleanType"/>
- <xs:attribute name="shared" type="booleanType"/>
- </xs:complexType>
-
- <xs:complexType name="customInterceptorsType">
- <xs:sequence>
- <xs:element name="interceptor" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="attribute" maxOccurs="unbounded" type="attributeType" minOccurs="0"/>
- </xs:sequence>
- <xs:attribute name="class" type="xs:string"/>
- <xs:attribute name="position">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="first"/>
- <xs:enumeration value="last"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="before" type="xs:string"/>
- <xs:attribute name="after" type="xs:string"/>
- <xs:attribute name="index" type="positiveInteger"/>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="attributeType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute name="name" type="xs:string"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-</xs:schema>
-
Copied: core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd (from rev 6561, core/trunk/src/main/resources/jbosscache-config-3.0.xsd)
===================================================================
--- core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd (rev 0)
+++ core/trunk/src/main/resources/schema/jbosscache-config-3.0.xsd 2008-08-15 21:16:37 UTC (rev 6564)
@@ -0,0 +1,255 @@
+<?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">
+ <xs:complexType>
+ <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:element>
+
+ <xs:complexType name="lockingType">
+ <xs:attribute name="isolationLevel">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="SERIALIZABLE|REPEATABLE_READ|READ_COMMITTED|NONE|\$\{.*\}"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="lockParentForChildInsertRemove" type="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="DEFAULT|REGISTER|DONT_REGISTER|\$\{.*\}"/>
+ </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="\$\{.*\}|true|false"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="positiveInteger">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="\$\{.*\}|\+?[0-9]*"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="replicationType">
+ <xs:sequence>
+ <xs:choice>
+ <xs:element name="sync" type="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="invalidationType">
+ <xs:choice>
+ <xs:element name="sync" type="tns:syncType"/>
+ <xs:element name="async" type="tns:asyncType"/>
+ </xs:choice>
+ </xs:complexType>
+
+ <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:complexType>
+
+ <xs:complexType name="invocationBatchingType">
+ <xs:attribute name="enabled" type="tns:booleanType"/>
+ </xs:complexType>
+
+ <xs:complexType name="transportType">
+ <xs:sequence>
+ <xs:element name="jgroupsConfig" type="xs:anyType" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ <xs:attribute name="clusterName" type="xs:string"/>
+ <xs:attribute name="multiplexerStack" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="syncType">
+ <xs:attribute name="replTimeout" type="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: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:attribute name="defaultPolicyClass" type="xs:string"/>
+ <xs:attribute name="defaultEventQueueSize" 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="policyClass" 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="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:enumeration value="first"/>
+ <xs:enumeration value="last"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="before" type="xs:string"/>
+ <xs:attribute name="after" type="xs:string"/>
+ <xs:attribute name="index" type="tns:positiveInteger"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="attributeType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+</xs:schema>
+
Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -554,7 +554,7 @@
" </properties>\n" +
" </loader>\n" +
" </loaders>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
LoadersElementParser elementParser = new LoadersElementParser();
return elementParser.parseLoadersElement(element);
}
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyManagerTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -61,7 +61,7 @@
private BuddyReplicationConfig getBuddyReplicationConfig(String xmlConfig)
throws Exception
{
- Element element = XmlConfigHelper.stringToElement(xmlConfig);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig);
BuddyElementParser replicationElementParser = new BuddyElementParser();
return replicationElementParser.parseBuddyElement(element);
}
Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -76,7 +76,7 @@
private BuddyReplicationConfig getBuddyReplicationConfig(String xmlConfig)
throws Exception
{
- Element element = XmlConfigHelper.stringToElement(xmlConfig);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig);
BuddyElementParser elementParser = new BuddyElementParser();
BuddyReplicationConfig config = elementParser.parseBuddyElement(element);
return config;
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -26,7 +26,7 @@
public void testDefaultValues() throws Exception
{
String xmlConfig = "<buddyReplication enabled=\"true\"/>";
- Element element = XmlConfigHelper.stringToElement(xmlConfig);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig);
BuddyReplicationConfig brConfig = parser.parseBuddyElement(element);
assert brConfig.getBuddyLocatorConfig().getClassName().equals(NextMemberBuddyLocator.class.getName()) : "default buddy locator class is NextMemberBuddyLocator";
assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().isEmpty();
@@ -49,7 +49,7 @@
" </properties>\n" +
" </locator>\n" +
" </buddyReplication>";
- Element element = XmlConfigHelper.stringToElement(xmlConfig);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig);
BuddyReplicationConfig brConfig = parser.parseBuddyElement(element);
assert brConfig.getBuddyLocatorConfig().getClassName().equals(NextMemberBuddyLocator.class.getName()) : "default buddy locator class is NextMemberBuddyLocator";
assert brConfig.getBuddyLocatorConfig().getBuddyLocatorProperties().get("numBuddies").equals("3");
@@ -66,7 +66,7 @@
" </properties>\n" +
" </locator>\n" +
" </buddyReplication>";
- Element element = XmlConfigHelper.stringToElement(xmlConfig);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xmlConfig);
BuddyReplicationConfig brConfig = parser.parseBuddyElement(element);
assert brConfig.isEnabled();
assert brConfig.getBuddyPoolName().equals("groupOne");
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheLoadersElementParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheLoadersElementParserTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/CacheLoadersElementParserTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -139,7 +139,7 @@
private CacheLoaderConfig getCacheLoaderConfig(String xmlStr)
throws Exception
{
- Element element = XmlConfigHelper.stringToElement(xmlStr);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xmlStr);
return parser.parseLoadersElement(element);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/CustomInterceptorsElementParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/CustomInterceptorsElementParserTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/CustomInterceptorsElementParserTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -62,7 +62,7 @@
" <interceptor after=\"org.jboss.cache.interceptors.CallInterceptor\"\n" +
" class=\"org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor\"/>\n" +
" </customInterceptors>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
List<CustomInterceptorConfig> configs = parser.parseCustomInterceptors(element);
assert configs.size() == 5;
CustomInterceptorConfig one = configs.get(0);
@@ -104,7 +104,7 @@
" <attribute name=\"nonexistenAttribute\">value3</attribute>\n" +
" </interceptor>\n" +
" </customInterceptors>";
- Element el = XmlConfigHelper.stringToElement(xml);
+ Element el = XmlConfigHelper.stringToElementInCoreNS(xml);
try
{
parser.parseCustomInterceptors(el);
@@ -126,7 +126,7 @@
" <attribute name=\"notExists\">value1</attribute>\n" +
" </interceptor>\n" +
" </customInterceptors>";
- Element el = XmlConfigHelper.stringToElement(xml);
+ Element el = XmlConfigHelper.stringToElementInCoreNS(xml);
try
{
parser.parseCustomInterceptors(el);
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -222,7 +222,7 @@
Element el;
try
{
- el = XmlConfigHelper.stringToElement(xml);
+ el = XmlConfigHelper.stringToElementInCoreNS(xml);
}
catch (Exception e)
{
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/JGroupsStackParserTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -68,7 +68,7 @@
" <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=\"true\"/>\n" +
" <pbcast.FLUSH timeout=\"0\"/>\n" +
"</jgroupsConfig>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
String result = parser.parseClusterConfigXml(element);
assert result.indexOf("ucast_recv_buf_size=20000000") > 0;
assert result.indexOf("num_initial_members=3") > 0;
@@ -78,7 +78,7 @@
public void testParsingEmptyConfig() throws Exception
{
String xml = "<jgroupsConfig/>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
String result = parser.parseClusterConfigXml(element);
}
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -28,7 +28,7 @@
"<attribute name=\"maxElementsPerNode\">100</attribute>" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
assertEquals(100, config.getMaxElementsPerNode());
@@ -43,7 +43,7 @@
"<attribute name=\"maxNodes\">1000</attribute>" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
try
{
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
@@ -65,7 +65,7 @@
"<attribute name=\"maxElementsPerNode\">100</attribute>" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -29,7 +29,7 @@
"<attribute name=\"maxNodes\">1000</attribute>" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
@@ -43,7 +43,7 @@
String xml = "<region name=\"abc\">" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
try
{
@@ -64,7 +64,7 @@
"<attribute name=\"maxNodes\">1000</attribute>" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
try
{
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -31,7 +31,7 @@
"<attribute name=\"maxNodes\">20</attribute>" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
@@ -46,7 +46,7 @@
"<region name=\"abc\">" +
"<attribute name=\"minNodes\">10</attribute>" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
@@ -61,7 +61,7 @@
"<region name=\"abc\">" +
"<attribute name=\"maxNodes\">20</attribute>" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUConfigurationTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -33,7 +33,7 @@
"<attribute name=\"timeToLiveSeconds\">1000</attribute>\n" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
@@ -49,7 +49,7 @@
"<attribute name=\"timeToLiveSeconds\">8</attribute>\n" +
"<attribute name=\"maxAgeSeconds\">10</attribute>\n" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
@@ -65,7 +65,7 @@
"<attribute name=\"maxNodes\">10000</attribute>\n" +
"<attribute name=\"maxAgeSeconds\">10</attribute>\n" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
boolean caught = false;
try
{
@@ -82,7 +82,7 @@
"<attribute name=\"maxAgeSeconds\">10</attribute>\n" +
"</region>";
- element = XmlConfigHelper.stringToElement(xml);
+ element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/MRUConfigurationTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUConfigurationTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -38,7 +38,7 @@
"<region name=\"/org/jboss/data\">\n" +
"<attribute name=\"maxNodes\">5000</attribute>\n" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
@@ -50,7 +50,7 @@
String xml = "<region name=\"/Test/\">\n" +
"<attribute name=\"maxNodes\">10000</attribute>\n" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
@@ -61,7 +61,7 @@
{
String xml = "<region name=\"/Test/\">\n" +
"</region>";
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
boolean caught = false;
try
{
@@ -77,7 +77,7 @@
"<attribute name=\"maxNodes\">10000</attribute>\n" +
"</region>";
- element = XmlConfigHelper.stringToElement(xml);
+ element = XmlConfigHelper.stringToElementInCoreNS(xml);
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/NullEvictionConfigTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -41,7 +41,7 @@
private void testConfigBlock(String xml) throws Exception
{
- Element element = XmlConfigHelper.stringToElement(xml);
+ Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
NullEvictionAlgorithmConfig config = new NullEvictionAlgorithmConfig();
EvictionElementParser.parseEvictionPolicyConfig(element, config, true);
}
Modified: core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/factories/UnitTestCacheConfigurationFactory.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -175,8 +175,8 @@
XmlConfigurationParser parser = new UnitTestXmlConfigurationParser();
Configuration conf = parser.parseElement(root);
- Element list = (Element) root.getElementsByTagName("protocol_stacks").item(0);
- NodeList stacks = list.getElementsByTagName("stack");
+ Element list = (Element) root.getElementsByTagNameNS("*","protocol_stacks").item(0);
+ NodeList stacks = list.getElementsByTagNameNS("*", "stack");
for (int i = 0; i < stacks.getLength(); i++)
{
@@ -184,7 +184,7 @@
String stackName = stack.getAttribute("name");
if (stackName.startsWith(JGROUPS_CHANNEL))
{
- Element jgroupsStack = (Element) stack.getElementsByTagName("config").item(0);
+ Element jgroupsStack = (Element) stack.getElementsByTagNameNS("*", "config").item(0);
if (mode == CacheMode.REPL_ASYNC && !stackName.contains("-"))
{
conf.setClusterConfig(jgroupsStack);
Modified: core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/jmx/deprecated/LegacyConfigurationTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -277,7 +277,7 @@
" </properties>\n" +
" </locator>\n" +
" </buddy>";
- return XmlConfigHelper.stringToElement(xmlStr);
+ return XmlConfigHelper.stringToElementInCoreNS(xmlStr);
}
protected static Element getCacheLoaderConfig() throws Exception
@@ -302,7 +302,7 @@
" <singletonStore enabled=\"false\" /> \n" +
" </loader>\n" +
" </loaders>";
- return XmlConfigHelper.stringToElement(xmlStr);
+ return XmlConfigHelper.stringToElementInCoreNS(xmlStr);
}
protected static Element getEvictionPolicyConfig() throws Exception
@@ -326,7 +326,7 @@
" <attribute name=\"maxAgeSeconds\">10</attribute>\n" +
"</region>\n" +
" </eviction>";
- return XmlConfigHelper.stringToElement(xmlStr);
+ return XmlConfigHelper.stringToElementInCoreNS(xmlStr);
}
protected static Element getClusterConfig() throws Exception
@@ -383,7 +383,7 @@
" <pbcast.STREAMING_STATE_TRANSFER use_reading_thread=\"true\"/>\n" +
" <pbcast.FLUSH timeout=\"0\"/>\n" +
"</jgroupsConfig>";
- return XmlConfigHelper.stringToElement(xml);
+ return XmlConfigHelper.stringToElementInCoreNS(xml);
}
protected String getDefaultProperties()
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderManagerTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -59,7 +59,7 @@
private static Element strToElement(String s) throws Exception
{
- return XmlConfigHelper.stringToElement(s);
+ return XmlConfigHelper.stringToElementInCoreNS(s);
}
public void testSingleCacheLoader() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderPurgingTest.java 2008-08-15 21:16:37 UTC (rev 6564)
@@ -104,7 +104,7 @@
" </loader>" +
" </loaders>";
LoadersElementParser parser = new LoadersElementParser();
- CacheLoaderConfig cacheLoaderConfig = parser.parseLoadersElement(XmlConfigHelper.stringToElement(xml));
+ CacheLoaderConfig cacheLoaderConfig = parser.parseLoadersElement(XmlConfigHelper.stringToElementInCoreNS(xml));
Configuration c = cache.getConfiguration();
c.setCacheLoaderConfig(cacheLoaderConfig);
cache.start();
Modified: core/trunk/src/test/resources/configs/buddy-replication-cache.xml
===================================================================
--- core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
Modified: core/trunk/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/trunk/src/test/resources/configs/clonable-config.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/clonable-config.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ 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"/>
Modified: core/trunk/src/test/resources/configs/local-lru-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/local-passivation.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-passivation.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/local-passivation.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/local-tx.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-tx.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/local-tx.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/mux.xml
===================================================================
--- core/trunk/src/test/resources/configs/mux.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/mux.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
Modified: core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml
===================================================================
--- core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache>
+<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"/>
Modified: core/trunk/src/test/resources/configs/parser-test.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/parser-test.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -3,7 +3,7 @@
<!-- file used for functional test of the xml parser -->
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
Modified: core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
Modified: core/trunk/src/test/resources/configs/replSync.xml
===================================================================
--- core/trunk/src/test/resources/configs/replSync.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/replSync.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ xmlns="urn:jboss:jbosscache-core:config:3.0">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<serialization useRegionBasedMarshalling="true"/>
Modified: core/trunk/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+ 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"/>
Modified: core/trunk/src/test/resources/jbc2-registry-configs.xml
===================================================================
(Binary files differ)
Modified: core/trunk/src/test/resources/unit-test-cache-service.xml
===================================================================
--- core/trunk/src/test/resources/unit-test-cache-service.xml 2008-08-15 12:14:09 UTC (rev 6563)
+++ core/trunk/src/test/resources/unit-test-cache-service.xml 2008-08-15 21:16:37 UTC (rev 6564)
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<jbosscache>
-
+<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"/>
More information about the jbosscache-commits
mailing list