[jboss-cvs] JBossAS SVN: r107454 - in branches/infinispan-int: component-matrix and 2 other directories.

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

Author: pferraro
Date: 2010-08-05 15:07:38 -0400 (Thu, 05 Aug 2010)
New Revision: 107454

Modified:
   branches/infinispan-int/build/build.xml
   branches/infinispan-int/component-matrix/pom.xml
   branches/infinispan-int/depchain/pom.xml
   branches/infinispan-int/hibernate-int/pom.xml
Log:
Fix build issues.

Modified: branches/infinispan-int/build/build.xml
===================================================================
--- branches/infinispan-int/build/build.xml	2010-08-05 18:22:18 UTC (rev 107453)
+++ branches/infinispan-int/build/build.xml	2010-08-05 19:07:38 UTC (rev 107454)
@@ -2063,8 +2063,9 @@
       <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
       <fileset refid="org.jboss.cluster:jboss-ha-server-api:jar"/>
       <fileset refid="org.jboss.cluster:jboss-ha-server-core:jar"/>
+      <fileset refid="org.jboss.cluster:jboss-ha-server-ispn:jar"/>
       <fileset refid="org.jboss.cluster:jboss-ha-server-cache-spi:jar"/>
-      <fileset refid="org.jboss.cluster:jboss-ha-server-cache-jbc:jar"/>
+      <fileset refid="org.jboss.cluster:jboss-ha-server-cache-ispn:jar"/>
       <fileset refid="org.jboss.integration:jboss-integration:jar"/>
       <fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
       <fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
@@ -2219,11 +2220,10 @@
     <mkdir dir="${install.all.lib}"/>
     <copy todir="${install.all.lib}" filtering="no">
       <fileset refid="jacorb:jacorb:jar"/>
-      <fileset refid="jgroups:jgroups:jar"/>
+      <fileset refid="org.jgroups:jgroups:jar"/>
       <fileset refid="net.jcip:jcip-annotations:jar"/>
-      <fileset refid="org.hibernate:hibernate-jbosscache:jar"/>
-      <fileset refid="org.jboss.cache:jbosscache-core:jar"/>
-      <fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
+      <fileset refid="org.hibernate:hibernate-infinispan:jar"/>
+      <fileset refid="org.infinispan:infinispan-core:jar"/>
       <mapper refid="remove-versions" />
     </copy>
 

Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml	2010-08-05 18:22:18 UTC (rev 107453)
+++ branches/infinispan-int/component-matrix/pom.xml	2010-08-05 19:07:38 UTC (rev 107454)
@@ -1744,12 +1744,12 @@
 
       <dependency>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-jbosscache</artifactId>
+        <artifactId>hibernate-infinispan</artifactId>
         <version>${version.org.hibernate}</version>
         <exclusions>
           <exclusion>
-            <groupId>org.jboss.cache</groupId>
-            <artifactId>jbosscache-core</artifactId>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-core</artifactId>
           </exclusion>
         </exclusions>
       </dependency>

Modified: branches/infinispan-int/depchain/pom.xml
===================================================================
--- branches/infinispan-int/depchain/pom.xml	2010-08-05 18:22:18 UTC (rev 107453)
+++ branches/infinispan-int/depchain/pom.xml	2010-08-05 19:07:38 UTC (rev 107454)
@@ -1099,7 +1099,10 @@
       <groupId>org.jboss.classpool</groupId>
       <artifactId>jboss-classpool-jbosscl</artifactId>
     </dependency>
-    
+    <dependency>
+      <groupId>org.jboss.cluster</groupId>
+      <artifactId>jboss-ha-server-cache-ispn</artifactId>
+    </dependency>
     <!-- End dist dependencies -->
     
   </dependencies>

Modified: branches/infinispan-int/hibernate-int/pom.xml
===================================================================
--- branches/infinispan-int/hibernate-int/pom.xml	2010-08-05 18:22:18 UTC (rev 107453)
+++ branches/infinispan-int/hibernate-int/pom.xml	2010-08-05 19:07:38 UTC (rev 107454)
@@ -78,7 +78,7 @@
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-jbosscache</artifactId>
+      <artifactId>hibernate-infinispan</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>