[jboss-cvs] JBossAS SVN: r109131 - in trunk: component-matrix and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-11-04 11:39:53 -0400 (Thu, 04 Nov 2010)
New Revision: 109131

Modified:
   trunk/cluster/src/resources/infinispan/infinispan-configs.xml
   trunk/component-matrix/pom.xml
Log:
Upgrade infinispan to 4.2.0.BETA1, ha-server-ispn to 1.0.0.CR3.  Adds support for better JMX object names.

Modified: trunk/cluster/src/resources/infinispan/infinispan-configs.xml
===================================================================
--- trunk/cluster/src/resources/infinispan/infinispan-configs.xml	2010-11-04 15:29:33 UTC (rev 109130)
+++ trunk/cluster/src/resources/infinispan/infinispan-configs.xml	2010-11-04 15:39:53 UTC (rev 109131)
@@ -14,7 +14,7 @@
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
-        <globalJmxStatistics enabled="true" jmxDomain="infinispan.ha-partition" allowDuplicateDomains="true"/>
+        <globalJmxStatistics enabled="true"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -39,7 +39,7 @@
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
-        <globalJmxStatistics enabled="true" jmxDomain="infinispan.web" allowDuplicateDomains="true"/>
+        <globalJmxStatistics enabled="true"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -85,7 +85,7 @@
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
-        <globalJmxStatistics enabled="true" jmxDomain="infinispan.sfsb" allowDuplicateDomains="true"/>
+        <globalJmxStatistics enabled="true"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -131,7 +131,7 @@
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
-        <globalJmxStatistics enabled="true" jmxDomain="infinispan.hibernate" allowDuplicateDomains="true"/>
+        <globalJmxStatistics enabled="true"/>
       </global>
       <default>
         <!-- Used to register JMX statistics in any available MBean server -->

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-11-04 15:29:33 UTC (rev 109130)
+++ trunk/component-matrix/pom.xml	2010-11-04 15:39:53 UTC (rev 109131)
@@ -67,7 +67,7 @@
     <version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
     <version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
     <version.org.hibernate.validator>4.0.2.GA</version.org.hibernate.validator>
-    <version.org.infinispan>4.2.0.ALPHA5</version.org.infinispan>
+    <version.org.infinispan>4.2.0.BETA1</version.org.infinispan>
     <version.org.jboss.aop>2.2.1.Alpha3</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
     <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
@@ -81,7 +81,7 @@
     <version.org.jboss.cluster.client>1.1.2.Final</version.org.jboss.cluster.client>
     <version.org.jboss.cluster.server.api>2.0.0.CR1</version.org.jboss.cluster.server.api>
     <version.org.jboss.cluster.server.core>1.0.0.CR1</version.org.jboss.cluster.server.core>
-    <version.org.jboss.cluster.server.ispn>1.0.0.CR2</version.org.jboss.cluster.server.ispn>
+    <version.org.jboss.cluster.server.ispn>1.0.0.CR3</version.org.jboss.cluster.server.ispn>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
     <version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
     <version.org.jboss.ejb3.depchain>1.0.0-alpha-15</version.org.jboss.ejb3.depchain>