[jboss-cvs] JBossAS SVN: r107874 - in branches/infinispan-int: component-matrix and 1 other directory.

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

Author: pferraro
Date: 2010-08-27 19:27:23 -0400 (Fri, 27 Aug 2010)
New Revision: 107874

Modified:
   branches/infinispan-int/cluster/src/resources/infinispan/cache-container-registry-jboss-beans.xml
   branches/infinispan-int/cluster/src/resources/infinispan/infinispan-configs.xml
   branches/infinispan-int/component-matrix/pom.xml
Log:
Bump ha-server-ispn version.
Update infinispan config containing ha-server-ispn jndi-related changes.

Modified: branches/infinispan-int/cluster/src/resources/infinispan/cache-container-registry-jboss-beans.xml
===================================================================
--- branches/infinispan-int/cluster/src/resources/infinispan/cache-container-registry-jboss-beans.xml	2010-08-27 23:25:53 UTC (rev 107873)
+++ branches/infinispan-int/cluster/src/resources/infinispan/cache-container-registry-jboss-beans.xml	2010-08-27 23:27:23 UTC (rev 107874)
@@ -18,6 +18,7 @@
         </bean>
       </parameter>
     </constructor>
+    <!--property name="jndiNamePrefix">java:infinispan</property-->
   </bean>
   
 </deployment>
\ No newline at end of file

Modified: branches/infinispan-int/cluster/src/resources/infinispan/infinispan-configs.xml
===================================================================
--- branches/infinispan-int/cluster/src/resources/infinispan/infinispan-configs.xml	2010-08-27 23:25:53 UTC (rev 107873)
+++ branches/infinispan-int/cluster/src/resources/infinispan/infinispan-configs.xml	2010-08-27 23:27:23 UTC (rev 107874)
@@ -14,6 +14,7 @@
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
+        <globalJmxStatistics enabled="true" allowDuplicateDomains="true"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -38,6 +39,7 @@
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
+        <globalJmxStatistics enabled="true" allowDuplicateDomains="true"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -70,6 +72,7 @@
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
+        <globalJmxStatistics enabled="true" allowDuplicateDomains="true"/>
       </global>
       <default>
         <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>
@@ -93,7 +96,7 @@
   </infinispan-config>
 
   <!-- Hibernate second-level cache -->
-  <infinispan-config name="entity">
+  <infinispan-config name="entity" jndi-name="java:CacheManager/entity">
     <alias>jboss.cache:service=EJB3EntityTreeCache</alias>
     <alias>mvcc-shared</alias>
     <infinispan xmlns="urn:infinispan:config:4.0" xsi:schemaLocation="urn:infinispan:config:4.0 http://docs.jboss.org/infinispan/schemas/infinispan-config-4.1.xsd">
@@ -103,6 +106,7 @@
             <property name="stack" value="${jboss.default.jgroups.stack:udp}"/>
           </properties>
         </transport>
+        <globalJmxStatistics enabled="true" allowDuplicateDomains="true"/>
       </global>
       <default>
         <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="15000" useLockStriping="false" concurrencyLevel="1000"/>

Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml	2010-08-27 23:25:53 UTC (rev 107873)
+++ branches/infinispan-int/component-matrix/pom.xml	2010-08-27 23:27:23 UTC (rev 107874)
@@ -105,7 +105,7 @@
     <version.org.jboss.cluster.client>1.1.2.Beta1</version.org.jboss.cluster.client>
     <version.org.jboss.cluster.server.api>2.0.0.Alpha6</version.org.jboss.cluster.server.api>
     <version.org.jboss.cluster.server.core>1.0.0.Alpha5</version.org.jboss.cluster.server.core>
-    <version.org.jboss.cluster.server.ispn>1.0.0.Alpha9</version.org.jboss.cluster.server.ispn>
+    <version.org.jboss.cluster.server.ispn>1.0.0.Alpha10</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.Alpha6</version.org.jboss.deployers>
     <version.org.jboss.ejb3.depchain>1.0.0-SNAPSHOT</version.org.jboss.ejb3.depchain>