[jboss-cvs] JBossAS SVN: r108549 - in projects/cluster/ha-server-ispn/trunk: src/main/resources/META-INF and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 13 11:53:56 EDT 2010
Author: pferraro
Date: 2010-10-13 11:53:56 -0400 (Wed, 13 Oct 2010)
New Revision: 108549
Modified:
projects/cluster/ha-server-ispn/trunk/pom.xml
projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd
projects/cluster/ha-server-ispn/trunk/src/main/resources/schema/infinispan-config-4.2.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:
Upgrade infinispan to 4.2.0.ALPHA3
Modified: projects/cluster/ha-server-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/pom.xml 2010-10-13 15:16:13 UTC (rev 108548)
+++ projects/cluster/ha-server-ispn/trunk/pom.xml 2010-10-13 15:53:56 UTC (rev 108549)
@@ -32,9 +32,9 @@
</scm>
<properties>
- <version.infinispan>4.2.0.ALPHA2</version.infinispan>
+ <version.infinispan>4.2.0.ALPHA3</version.infinispan>
<version.jta>1.0.1.GA</version.jta>
- <version.junit>4.8.1</version.junit>
+ <version.junit>4.8.2</version.junit>
<version.easymock>3.0</version.easymock>
</properties>
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-10-13 15:16:13 UTC (rev 108548)
+++ projects/cluster/ha-server-ispn/trunk/src/main/resources/META-INF/infinispan-configs.xsd 2010-10-13 15:53:56 UTC (rev 108549)
@@ -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.1" 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.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0">
- <xs:import namespace="urn:infinispan:config:4.1" schemaLocation="http://docs.jboss.org/infinispan/schemas/infinispan-config-4.1.xsd"/>
+ <xs:import namespace="urn:infinispan:config:4.2" schemaLocation="http://docs.jboss.org/infinispan/schemas/infinispan-config-4.2.xsd"/>
<xs:element name="infinispan-configs" type="tns:cacheContainerRegistryConfiguration"/>
Modified: projects/cluster/ha-server-ispn/trunk/src/main/resources/schema/infinispan-config-4.2.xsd
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/resources/schema/infinispan-config-4.2.xsd 2010-10-13 15:16:13 UTC (rev 108548)
+++ projects/cluster/ha-server-ispn/trunk/src/main/resources/schema/infinispan-config-4.2.xsd 2010-10-13 15:53:56 UTC (rev 108549)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:4.1" xmlns:tns="urn:infinispan:config:4.1" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:4.2" xmlns:tns="urn:infinispan:config:4.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="infinispan" type="tns:infinispanConfiguration"/>
@@ -341,6 +341,8 @@
<xs:attribute name="alwaysProvideInMemoryState" type="xs:boolean"/>
<xs:attribute name="fetchInMemoryState" type="xs:boolean"/>
<xs:attribute name="initialRetryWaitTime" type="xs:long"/>
+ <xs:attribute name="logFlushTimeout" type="xs:long"/>
+ <xs:attribute name="maxNonProgressingLogWrites" type="xs:int"/>
<xs:attribute name="numRetries" type="xs:int"/>
<xs:attribute name="retryWaitTimeIncreaseFactor" type="xs:int"/>
<xs:attribute name="timeout" type="xs:long"/>
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-10-13 15:16:13 UTC (rev 108548)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-multiple.xml 2010-10-13 15:53:56 UTC (rev 108549)
@@ -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.1"/>
+ <infinispan xmlns="urn:infinispan:config:4.2"/>
</infinispan-config>
<infinispan-config name="manager1">
<alias>manager1.alias1</alias>
<alias>manager1.alias2</alias>
- <infinispan xmlns="urn:infinispan:config:4.1"/>
+ <infinispan xmlns="urn:infinispan:config:4.2"/>
</infinispan-config>
<infinispan-config name="manager2" jndi-name="java:CacheManager">
<alias>manager2.alias1</alias>
<alias>manager2.alias2</alias>
- <infinispan xmlns="urn:infinispan:config:4.1"/>
+ <infinispan xmlns="urn:infinispan:config:4.2"/>
</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-10-13 15:16:13 UTC (rev 108548)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs-property-replacement.xml 2010-10-13 15:53:56 UTC (rev 108549)
@@ -3,6 +3,6 @@
<infinispan-config name="manager">
<alias>${known:unexpected}</alias>
<alias>${unknown:expected}</alias>
- <infinispan xmlns="urn:infinispan:config:4.1"/>
+ <infinispan xmlns="urn:infinispan:config:4.2"/>
</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-10-13 15:16:13 UTC (rev 108548)
+++ projects/cluster/ha-server-ispn/trunk/src/test/resources/infinispan-configs.xml 2010-10-13 15:53:56 UTC (rev 108549)
@@ -4,7 +4,7 @@
<!-- *************************** -->
<!-- System-wide global settings -->
<!-- *************************** -->
- <infinispan xmlns="urn:infinispan:config:4.1">
+ <infinispan xmlns="urn:infinispan:config:4.2">
<global>
More information about the jboss-cvs-commits
mailing list