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

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

Author: pferraro
Date: 2010-08-05 14:03:35 -0400 (Thu, 05 Aug 2010)
New Revision: 107450

Modified:
   branches/infinispan-int/cluster/src/etc/hapartition-jboss-beans.xml
   branches/infinispan-int/component-matrix/pom.xml
Log:
Upgrade ha-server-cache-ispn to 1.0.0.Alpha3

Modified: branches/infinispan-int/cluster/src/etc/hapartition-jboss-beans.xml
===================================================================
--- branches/infinispan-int/cluster/src/etc/hapartition-jboss-beans.xml	2010-08-05 17:58:52 UTC (rev 107449)
+++ branches/infinispan-int/cluster/src/etc/hapartition-jboss-beans.xml	2010-08-05 18:03:35 UTC (rev 107450)
@@ -20,12 +20,21 @@
     </constructor>
     <property name="cacheContainerName">ha-partition</property>
   </bean>
-   
+  
+  <bean name="DistributedState" class="org.jboss.ha.framework.server.ispn.DistributedState">
+    <!--annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation-->
+    <constructor>
+      <parameter><inject bean="CacheContainerRegistry"/></parameter>
+    </constructor>
+    <property name="cacheContainerName">ha-partition</property>
+    <property name="cacheName">distributed-state</property>
+  </bean>
+  
   <bean name="HAPartition" class="org.jboss.ha.framework.server.ClusterPartition">     
     	 
     <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true)</annotation>
     
-    <property name="channelSource"><inject bean="HAPartitionCacheHandler"/></property>
+    <property name="channelSource"><inject bean="DistributedState"/></property>
       
     <!-- Name of the partition being built -->
     <property name="partitionName">${jboss.partition.name:DefaultPartition}</property>
@@ -39,16 +48,7 @@
     <!-- Optionally provide a thread source to allow async connect of our channel -->
     <property name="threadPool"><inject bean="LongRunningTasksThreadPool"/></property>
     
-    <property name="distributedStateImpl">
-      <bean name="DistributedState" class="org.jboss.ha.framework.server.ispn.DistributedState">
-        <!--annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation-->
-        <constructor>
-          <parameter><inject bean="CacheContainerRegistry"/></parameter>
-        </constructor>
-        <property name="cacheContainerName">ha-partition</property>
-        <property name="cacheName">distributed-state</property>
-      </bean>
-    </property>
+    <property name="distributedStateImpl"><inject bean="DistributedState"/></property>
 
     <!-- For legacy managed object interface support -->
     <property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>

Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml	2010-08-05 17:58:52 UTC (rev 107449)
+++ branches/infinispan-int/component-matrix/pom.xml	2010-08-05 18:03:35 UTC (rev 107450)
@@ -100,7 +100,7 @@
     <version.org.jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool>
     <version.org.jboss.cluster.cache.jbc>3.0.0.Alpha3</version.org.jboss.cluster.cache.jbc>
     <version.org.jboss.cluster.cache.spi>3.0.0.Alpha3</version.org.jboss.cluster.cache.spi>
-    <version.org.jboss.cluster.cache.ispn>1.0.0.Alpha2</version.org.jboss.cluster.cache.ispn>
+    <version.org.jboss.cluster.cache.ispn>1.0.0.Alpha3</version.org.jboss.cluster.cache.ispn>
     <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.Alpha2</version.org.jboss.cluster.server.core>