[infinispan-commits] Infinispan SVN: r1531 - in trunk: cachestore/jdbc/src/test/resources/configs/managed and 9 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Feb 22 11:38:54 EST 2010
Author: manik.surtani at jboss.com
Date: 2010-02-22 11:38:53 -0500 (Mon, 22 Feb 2010)
New Revision: 1531
Modified:
trunk/cachestore/jdbc/src/test/resources/configs/binary.xml
trunk/cachestore/jdbc/src/test/resources/configs/illegal.xml
trunk/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml
trunk/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml
trunk/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml
trunk/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml
trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml
trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml
trunk/core/src/main/resources/config-samples/all.xml
trunk/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java
trunk/core/src/test/java/org/infinispan/config/MinimalConfigurationParsingTest.java
trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
trunk/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java
trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
trunk/core/src/test/resources/configs/named-cache-test.xml
trunk/core/src/test/resources/configs/no-flush.xml
trunk/core/src/test/resources/configs/string-property-replaced.xml
trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml
trunk/demos/gui/src/main/resources/config-samples/gui-demo-cache-config.xml
trunk/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java
trunk/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java
Log:
Added schema location
Modified: trunk/cachestore/jdbc/src/test/resources/configs/binary.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/binary.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/cachestore/jdbc/src/test/resources/configs/binary.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<global>
-
<!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
<asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
<properties>
Modified: trunk/cachestore/jdbc/src/test/resources/configs/illegal.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/illegal.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/cachestore/jdbc/src/test/resources/configs/illegal.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
<!--
This configuration is illegal on purpose for testing, don't reuse!
Modified: trunk/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
<global>
Modified: trunk/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<global>
<!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
Modified: trunk/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<global>
<!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
Modified: trunk/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<global>
<!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
Modified: trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/cachestore/jdbc/src/test/resources/configs/mixed.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<global>
<!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
Modified: trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml
===================================================================
--- trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/cachestore/jdbc/src/test/resources/configs/string-based.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<global>
<!-- Note that if these are left blank, defaults are used. See the user guide for what these defaults are -->
Modified: trunk/core/src/main/resources/config-samples/all.xml
===================================================================
--- trunk/core/src/main/resources/config-samples/all.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/main/resources/config-samples/all.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<!-- *************************** -->
<!-- System-wide global settings -->
<!-- *************************** -->
Modified: trunk/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java 2010-02-22 16:38:53 UTC (rev 1531)
@@ -20,7 +20,10 @@
public void testCustomInterceptors() throws IOException {
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">" +
+ "<infinispan\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd\"\n" +
+ " xmlns=\"urn:infinispan:config:4.0\">" +
"<default><customInterceptors> \n" +
"<interceptor after=\""+ InvocationContextInterceptor.class.getName()+"\" class=\""+DummyInterceptor.class.getName()+"\"/> \n" +
"</customInterceptors> </default></infinispan>";
Modified: trunk/core/src/test/java/org/infinispan/config/MinimalConfigurationParsingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/MinimalConfigurationParsingTest.java 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/test/java/org/infinispan/config/MinimalConfigurationParsingTest.java 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,51 +1,45 @@
package org.infinispan.config;
+import org.infinispan.test.TestingUtil;
import org.testng.annotations.Test;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import static org.infinispan.test.TestingUtil.INFINISPAN_END_TAG;
+import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
+
@Test(groups = "unit", testName = "config.MinimalConfigurationParsingTest")
public class MinimalConfigurationParsingTest {
-
public void testGlobalAndDefaultSection() throws IOException {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
+ String xml = INFINISPAN_START_TAG +
" <global />\n" +
" <default>\n" +
" <locking concurrencyLevel=\"10000\" isolationLevel=\"READ_COMMITTED\" />\n" +
" </default>\n" +
- "</infinispan>";
+ INFINISPAN_END_TAG;
testXml(xml);
}
public void testNoGlobalSection() throws IOException {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
+ String xml = INFINISPAN_START_TAG +
" <default>\n" +
" <locking concurrencyLevel=\"10000\" isolationLevel=\"READ_COMMITTED\" />\n" +
" </default>\n" +
- "</infinispan>";
+ INFINISPAN_END_TAG;
testXml(xml);
}
public void testNoDefaultSection() throws IOException {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
+ String xml = INFINISPAN_START_TAG +
" <global />\n" +
- "</infinispan>";
+ INFINISPAN_END_TAG;
testXml(xml);
}
public void testNoSections() throws IOException {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
- "</infinispan>";
+ String xml = INFINISPAN_START_TAG + INFINISPAN_END_TAG;
testXml(xml);
}
Modified: trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java 2010-02-22 16:38:53 UTC (rev 1531)
@@ -12,6 +12,7 @@
import org.infinispan.loaders.file.FileCacheStoreConfig;
import org.infinispan.remoting.transport.jgroups.JGroupsTransport;
import org.infinispan.test.AbstractInfinispanTest;
+import org.infinispan.test.TestingUtil;
import org.infinispan.util.concurrent.IsolationLevel;
import org.testng.annotations.Test;
@@ -40,9 +41,7 @@
}
public void testNoNamedCaches() throws Exception {
- String config = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
+ String config = TestingUtil.INFINISPAN_START_TAG +
" <global>\n" +
" <transport clusterName=\"demoCluster\"/>\n" +
" </global>\n" +
@@ -51,7 +50,7 @@
" <clustering mode=\"replication\">\n" +
" </clustering>\n" +
" </default>\n" +
- "</infinispan>";
+ TestingUtil.INFINISPAN_END_TAG;
InputStream is = new ByteArrayInputStream(config.getBytes());
InfinispanConfiguration c = InfinispanConfiguration.newInfinispanConfiguration(is);
Modified: trunk/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java 2010-02-22 16:38:53 UTC (rev 1531)
@@ -13,6 +13,9 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import static org.infinispan.test.TestingUtil.INFINISPAN_END_TAG;
+import static org.infinispan.test.TestingUtil.INFINISPAN_START_TAG;
+
/**
* @author Manik Surtani
* @since 4.0
@@ -60,8 +63,7 @@
}
public void testNamedCacheXMLClashingNames() throws IOException {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
+ String xml = INFINISPAN_START_TAG +
"\n" +
" <default>\n" +
" <locking concurrencyLevel=\"100\" lockAcquisitionTimeout=\"1000\" />\n" +
@@ -76,8 +78,7 @@
" <sync replTimeout=\"15000\"/>\n" +
" </clustering>\n" +
" </namedCache>\n" +
- " \n" +
- "</infinispan>";
+ INFINISPAN_END_TAG;
ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
try {
@@ -91,8 +92,7 @@
}
public void testNamedCacheXMLClashingNamesProgrammatic() throws IOException {
- String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\">\n" +
+ String xml = INFINISPAN_START_TAG +
"\n" +
"<global/>\n" +
" <default>\n" +
@@ -101,10 +101,7 @@
"\n" +
" <namedCache name=\"c1\">\n" +
" <transaction transactionManagerLookupClass=\"org.infinispan.transaction.lookup.GenericTransactionManagerLookup\"/>\n" +
- " </namedCache>\n" +
- "\n" +
- "\n" +
- "</infinispan>";
+ " </namedCache>\n" + INFINISPAN_END_TAG;
ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
cm = TestCacheManagerFactory.fromStream(bais);
Modified: trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2010-02-22 16:38:53 UTC (rev 1531)
@@ -53,7 +53,13 @@
private static final Log log = LogFactory.getLog(TestingUtil.class);
private static final Random random = new Random();
public static final String TEST_PATH = "target" + separator + "tempFiles";
+ public static final String INFINISPAN_START_TAG = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<infinispan\n" +
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xsi:schemaLocation=\"urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd\"\n" +
+ " xmlns=\"urn:infinispan:config:4.0\">";
+ public static final String INFINISPAN_END_TAG="</infinispan>";
+
/**
* Extracts the value of a field in a given target instance using reflection, able to extract private fields as
* well.
Modified: trunk/core/src/test/resources/configs/named-cache-test.xml
===================================================================
--- trunk/core/src/test/resources/configs/named-cache-test.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/test/resources/configs/named-cache-test.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
<global>
Modified: trunk/core/src/test/resources/configs/no-flush.xml
===================================================================
--- trunk/core/src/test/resources/configs/no-flush.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/test/resources/configs/no-flush.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<!-- *************************** -->
<!-- System-wide global settings -->
<!-- *************************** -->
Modified: trunk/core/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- trunk/core/src/test/resources/configs/string-property-replaced.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/core/src/test/resources/configs/string-property-replaced.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
-
<!-- *************************** -->
<!-- System-wide global settings -->
<!-- *************************** -->
Modified: trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml
===================================================================
--- trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
+
<global>
<asyncListenerExecutor factory="org.infinispan.executors.DefaultExecutorFactory">
<properties>
Modified: trunk/demos/gui/src/main/resources/config-samples/gui-demo-cache-config.xml
===================================================================
--- trunk/demos/gui/src/main/resources/config-samples/gui-demo-cache-config.xml 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/demos/gui/src/main/resources/config-samples/gui-demo-cache-config.xml 2010-02-22 16:38:53 UTC (rev 1531)
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:infinispan:config:4.0">
+<infinispan
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0 http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
+
<global>
<transport clusterName="demoCluster"/>
</global>
Modified: trunk/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java
===================================================================
--- trunk/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java 2010-02-22 16:38:53 UTC (rev 1531)
@@ -29,6 +29,7 @@
import org.infinispan.query.helper.TestQueryHelperFactory;
import org.infinispan.query.test.Person;
import org.infinispan.test.SingleCacheManagerTest;
+import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.testng.annotations.Test;
@@ -43,13 +44,10 @@
@Override
protected CacheManager createCacheManager() throws Exception {
- String config = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\" xmlns:query=\"urn:infinispan:config:query:4.0\">\n" +
+ String config = TestingUtil.INFINISPAN_START_TAG +
" <default>\n" +
" <indexing enabled=\"true\" indexLocalOnly=\"true\"/>\n" +
- " </default>\n" +
- "</infinispan>";
+ " </default>\n" + TestingUtil.INFINISPAN_END_TAG;
InputStream is = new ByteArrayInputStream(config.getBytes());
cacheManager = TestCacheManagerFactory.fromStream(is);
Modified: trunk/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java
===================================================================
--- trunk/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java 2010-02-22 15:24:38 UTC (rev 1530)
+++ trunk/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java 2010-02-22 16:38:53 UTC (rev 1531)
@@ -39,9 +39,7 @@
public class QueryParsingTest extends AbstractInfinispanTest {
public void testQueryConfig() throws Exception {
- String config = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "\n" +
- "<infinispan xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:infinispan:config:4.0\" xmlns:query=\"urn:infinispan:config:query:4.0\">\n" +
+ String config = TestingUtil.INFINISPAN_START_TAG +
" <global>\n" +
" <transport clusterName=\"demoCluster\"/>\n" +
" </global>\n" +
@@ -51,7 +49,7 @@
" </clustering>\n" +
" <indexing enabled=\"true\" indexLocalOnly=\"true\"/>\n" +
" </default>\n" +
- "</infinispan>";
+ TestingUtil.INFINISPAN_END_TAG;
System.out.println(config);
More information about the infinispan-commits
mailing list