[jboss-cvs] JBossAS SVN: r79759 - in trunk: component-matrix and 3 other directories.

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

Author: bstansberry at jboss.com
Date: 2008-10-20 14:55:22 -0400 (Mon, 20 Oct 2008)
New Revision: 79759

Modified:
   trunk/cluster/src/etc/hajndi-jboss-beans.xml
   trunk/component-matrix/pom.xml
   trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
   trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
   trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
Log:
[JBAS-6083] re-apply r79488 commit

Modified: trunk/cluster/src/etc/hajndi-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/hajndi-jboss-beans.xml	2008-10-20 17:30:45 UTC (rev 79758)
+++ trunk/cluster/src/etc/hajndi-jboss-beans.xml	2008-10-20 18:55:22 UTC (rev 79759)
@@ -22,7 +22,7 @@
       <!-- Handler for the replicated tree -->
       <property name="distributedTreeManager">
          <bean class="org.jboss.ha.jndi.impl.jbc.JBossCacheDistributedTreeManager">
-            <property name="clusteredCache"><inject bean="HAPartitionCacheHandler" property="cache"/></property>
+            <property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
          </bean>
       </property>
       

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-10-20 17:30:45 UTC (rev 79758)
+++ trunk/component-matrix/pom.xml	2008-10-20 18:55:22 UTC (rev 79759)
@@ -63,7 +63,8 @@
     <version.org.jboss.cache.core>2.2.0.GA</version.org.jboss.cache.core>
     <version.org.jboss.cache.pojo>2.2.0.CR5</version.org.jboss.cache.pojo>
     <version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
-    <version.org.jboss.cluster.cache>1.0.0.GA</version.org.jboss.cluster.cache>
+    <version.org.jboss.cluster.cache.spi>1.0.0.GA</version.org.jboss.cluster.cache.spi>
+    <version.org.jboss.cluster.cache.jbc>1.0.1.CR1</version.org.jboss.cluster.cache.jbc>
     <version.org.jboss.integration>5.0.0.CR2</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.0.CR15</version.org.jboss.jbossxb>
     <version.org.jboss.metadata>1.0.0.CR1</version.org.jboss.metadata>
@@ -1326,7 +1327,7 @@
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-cache-spi</artifactId>
-        <version>${version.org.jboss.cluster.cache}</version>
+        <version>${version.org.jboss.cluster.cache.spi}</version>
         <exclusions>
           <exclusion>
             <groupId>org.jboss.naming</groupId>
@@ -1342,7 +1343,7 @@
       <dependency>
         <groupId>org.jboss.cluster</groupId>
         <artifactId>jboss-ha-server-cache-jbc</artifactId>
-        <version>${version.org.jboss.cluster.cache}</version>
+        <version>${version.org.jboss.cluster.cache.jbc}</version>
         <exclusions>
           <exclusion>
             <groupId>org.jboss</groupId>

Modified: trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2008-10-20 17:30:45 UTC (rev 79758)
+++ trunk/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml	2008-10-20 18:55:22 UTC (rev 79759)
@@ -186,7 +186,7 @@
       <!-- Handler for the replicated tree -->
       <property name="distributedTreeManager">
          <bean class="org.jboss.ha.jndi.impl.jbc.JBossCacheDistributedTreeManager">
-            <property name="clusteredCache"><inject bean="PassExpCacheHandler" property="cache"/></property>
+            <property name="cacheHandler"><inject bean="PassExpCacheHandler"/></property>
          </bean>
       </property>
       

Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2008-10-20 17:30:45 UTC (rev 79758)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml	2008-10-20 18:55:22 UTC (rev 79759)
@@ -175,7 +175,7 @@
       <!-- Handler for the replicated tree -->
       <property name="distributedTreeManager">
          <bean class="org.jboss.ha.jndi.impl.jbc.JBossCacheDistributedTreeManager">
-            <property name="clusteredCache"><inject bean="RestartCacheHandler" property="cache"/></property>
+            <property name="cacheHandler"><inject bean="RestartCacheHandler"/></property>
          </bean>
       </property>
       

Modified: trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml	2008-10-20 17:30:45 UTC (rev 79758)
+++ trunk/testsuite/src/resources/naming/restart/naming-restart-jboss-beans.xml	2008-10-20 18:55:22 UTC (rev 79759)
@@ -54,7 +54,7 @@
       <!-- Handler for the replicated tree -->
       <property name="distributedTreeManager">
          <bean class="org.jboss.ha.jndi.impl.jbc.JBossCacheDistributedTreeManager">
-            <property name="clusteredCache"><inject bean="HAPartitionCacheHandler" property="cache"/></property>
+            <property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
          </bean>
       </property>