[jboss-cvs] JBossAS SVN: r107969 - in projects/cluster/ha-server-ispn/trunk/src: main/resources/META-INF and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Sep 2 21:55:29 EDT 2010 

Author: pferraro
Date: 2010-09-02 21:55:29 -0400 (Thu, 02 Sep 2010)
New Revision: 107969

Modified:
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java
   projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd
   projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml
   projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml
   projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs.xml
Log:
Fix infinispan schema namespace for 4.1.0.FINAL.

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java	2010-09-02 21:54:28 UTC (rev 107968)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/config/xml/XMLCacheContainerRegistryConfigurationSource.java	2010-09-03 01:55:29 UTC (rev 107969)
@@ -50,7 +50,7 @@
    private static final String SCHEMA = "META-INF/infinispan-configs.xsd";
    private static final String DEFAULT_XML = "infinispan-configs.xml";
    
-   private static final String INFINISPAN_NAMESPACE = "urn:infinispan:config:4.0";   
+   private static final String INFINISPAN_NAMESPACE = "urn:infinispan:config:4.1";
    private static final String INFINISPAN_SCHEMA = InfinispanConfiguration.resolveSchemaPath();
 
    private final URL infinispanSchemaURL;

Modified: projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd	2010-09-02 21:54:28 UTC (rev 107968)
+++ projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd	2010-09-03 01:55:29 UTC (rev 107969)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<xs:schema targetNamespace="urn:jboss:infinispan-configs:1.0" xmlns:tns="urn:jboss:infinispan-configs:1.0" xmlns:ispn="urn:infinispan:config:4.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0">
+<xs:schema targetNamespace="urn:jboss:infinispan-configs:1.0" xmlns:tns="urn:jboss:infinispan-configs:1.0" xmlns:ispn="urn:infinispan:config:4.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0">
   
-  <xs:import namespace="urn:infinispan:config:4.0" schemaLocation="http://docs.jboss.org/infinispan/schemas/infinispan-config-4.1.xsd"/>
+  <xs:import namespace="urn:infinispan:config:4.1" schemaLocation="http://docs.jboss.org/infinispan/schemas/infinispan-config-4.1.xsd"/>
   
   <xs:element name="infinispan-configs" type="tns:cacheContainerRegistryConfiguration"/>
   

Modified: projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml	2010-09-02 21:54:28 UTC (rev 107968)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml	2010-09-03 01:55:29 UTC (rev 107969)
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <infinispan-configs default="manager1" xmlns="urn:jboss:infinispan-configs:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:infinispan-configs:1.0 ../../src/main/resources/infinispan-configs.xsd">
   <infinispan-config name="manager0">
-    <infinispan xmlns="urn:infinispan:config:4.0"/>
+    <infinispan xmlns="urn:infinispan:config:4.1"/>
   </infinispan-config>
   <infinispan-config name="manager1">
     <alias>manager1.alias1</alias>
     <alias>manager1.alias2</alias>
-    <infinispan xmlns="urn:infinispan:config:4.0"/>
+    <infinispan xmlns="urn:infinispan:config:4.1"/>
   </infinispan-config>
   <infinispan-config name="manager2" jndi-name="java:CacheManager">
     <alias>manager2.alias1</alias>
     <alias>manager2.alias2</alias>
-    <infinispan xmlns="urn:infinispan:config:4.0"/>
+    <infinispan xmlns="urn:infinispan:config:4.1"/>
   </infinispan-config>
 </infinispan-configs>
\ No newline at end of file

Modified: projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml	2010-09-02 21:54:28 UTC (rev 107968)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml	2010-09-03 01:55:29 UTC (rev 107969)
@@ -3,6 +3,6 @@
   <infinispan-config name="manager">
     <alias>${known:unexpected}</alias>
     <alias>${unknown:expected}</alias>
-    <infinispan xmlns="urn:infinispan:config:4.0"/>
+    <infinispan xmlns="urn:infinispan:config:4.1"/>
   </infinispan-config>
 </infinispan-configs>
\ No newline at end of file

Modified: projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs.xml	2010-09-02 21:54:28 UTC (rev 107968)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs.xml	2010-09-03 01:55:29 UTC (rev 107969)
@@ -4,7 +4,7 @@
      <!-- *************************** -->
      <!-- System-wide global settings -->
      <!-- *************************** -->
-     <infinispan xmlns="urn:infinispan:config:4.0">
+     <infinispan xmlns="urn:infinispan:config:4.1">
 
        <global>
 
@@ -60,7 +60,7 @@
        <!-- Default "template" settings -->
        <!-- *************************** -->
        <!-- this is used as a "template" configuration for all caches in the system. -->
-       <default xmlns="urn:infinispan:config:4.0">
+       <default>
           <!--
              isolation levels supported: READ_COMMITTED and REPEATABLE_READ
           -->

More information about the jboss-cvs-commits mailing list