Added schema location

infinispan · Feb 22, 2010 · ba64d08 · ba64d08
1 parent a6256ec
commit ba64d08
Show file tree

Hide file tree

Showing 21 changed files with 94 additions and 66 deletions.
diff --git a/cachestore/jdbc/src/test/resources/configs/binary.xml b/cachestore/jdbc/src/test/resources/configs/binary.xml
@@ -1,9 +1,10 @@
 <?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>
-
       <!-- 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>

diff --git a/cachestore/jdbc/src/test/resources/configs/illegal.xml b/cachestore/jdbc/src/test/resources/configs/illegal.xml
@@ -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!

diff --git a/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml b/cachestore/jdbc/src/test/resources/configs/jdbc-parsing-test.xml
@@ -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>
 

diff --git a/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml b/cachestore/jdbc/src/test/resources/configs/managed/binary-managed-connection-factory.xml
@@ -1,6 +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>
 

diff --git a/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml b/cachestore/jdbc/src/test/resources/configs/managed/mixed-managed-connection-factory.xml
@@ -1,6 +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>
 

diff --git a/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml b/cachestore/jdbc/src/test/resources/configs/managed/str-managed-connection-factory.xml
@@ -1,6 +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>
 

diff --git a/cachestore/jdbc/src/test/resources/configs/mixed.xml b/cachestore/jdbc/src/test/resources/configs/mixed.xml
@@ -1,6 +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>
 

diff --git a/cachestore/jdbc/src/test/resources/configs/string-based.xml b/cachestore/jdbc/src/test/resources/configs/string-based.xml
@@ -1,6 +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>
 

diff --git a/core/src/main/resources/config-samples/all.xml b/core/src/main/resources/config-samples/all.xml
@@ -1,6 +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">
 
    <!-- *************************** -->
    <!-- System-wide global settings -->

diff --git a/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java b/core/src/test/java/org/infinispan/config/CustomInterceptorConfigTest.java
@@ -20,7 +20,10 @@ public class CustomInterceptorConfigTest {
 
    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>";

diff --git a/core/src/test/java/org/infinispan/config/MinimalConfigurationParsingTest.java b/core/src/test/java/org/infinispan/config/MinimalConfigurationParsingTest.java
@@ -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);
    }
 

diff --git a/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java b/core/src/test/java/org/infinispan/config/parsing/XmlFileParsingTest.java
@@ -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 testConfigSampleAllValidation() throws Exception {
    }
 
    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 @@ public void testNoNamedCaches() throws Exception {
             "      <clustering mode=\"replication\">\n" +
             "      </clustering>\n" +
             "   </default>\n" +
-            "</infinispan>";
+            TestingUtil.INFINISPAN_END_TAG;
 
       InputStream is = new ByteArrayInputStream(config.getBytes());
       InfinispanConfiguration c = InfinispanConfiguration.newInfinispanConfiguration(is);

diff --git a/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java b/core/src/test/java/org/infinispan/manager/CacheManagerXmlConfigurationTest.java
@@ -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 testNamedCacheXML() throws IOException {
    }
 
    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 @@ public void testNamedCacheXMLClashingNames() throws IOException {
             "            <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 testNamedCacheXMLClashingNames() throws IOException {
    }
 
    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 @@ public void testNamedCacheXMLClashingNamesProgrammatic() throws IOException {
             "\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);

diff --git a/core/src/test/java/org/infinispan/test/TestingUtil.java b/core/src/test/java/org/infinispan/test/TestingUtil.java
@@ -53,6 +53,12 @@ public class TestingUtil {
    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

diff --git a/core/src/test/resources/configs/named-cache-test.xml b/core/src/test/resources/configs/named-cache-test.xml
@@ -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>
 

diff --git a/core/src/test/resources/configs/no-flush.xml b/core/src/test/resources/configs/no-flush.xml
@@ -1,6 +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">
 
    <!-- *************************** -->
    <!-- System-wide global settings -->

diff --git a/core/src/test/resources/configs/string-property-replaced.xml b/core/src/test/resources/configs/string-property-replaced.xml
@@ -1,6 +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">
 
    <!-- *************************** -->
    <!-- System-wide global settings -->

diff --git a/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml b/demos/ec2/src/main/resources/config-samples/ec2-demo/infinispan-ec2-config.xml
@@ -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>

diff --git a/demos/gui/src/main/resources/config-samples/gui-demo-cache-config.xml b/demos/gui/src/main/resources/config-samples/gui-demo-cache-config.xml
@@ -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>

diff --git a/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java b/query/src/test/java/org/infinispan/query/config/DeclarativeConfigTest.java
@@ -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 @@ public class DeclarativeConfigTest extends SingleCacheManagerTest {
 
    @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);

diff --git a/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java b/query/src/test/java/org/infinispan/query/config/QueryParsingTest.java
@@ -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 @@ public void testQueryConfig() throws Exception {
             "      </clustering>\n" +
             "      <indexing enabled=\"true\" indexLocalOnly=\"true\"/>\n" +
             "   </default>\n" +
-            "</infinispan>";
+            TestingUtil.INFINISPAN_END_TAG;
 
       System.out.println(config);