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

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

Author: bstansberry at jboss.com
Date: 2008-06-05 18:04:02 -0400 (Thu, 05 Jun 2008)
New Revision: 74196

Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
   trunk/component-matrix/pom.xml
   trunk/thirdparty/pom.xml
Log:
[JBAS-5588] Include hibernate-jbosscache2.jar in server/all/lib

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-06-05 22:03:22 UTC (rev 74195)
+++ trunk/build/build-distr.xml	2008-06-05 22:04:02 UTC (rev 74196)
@@ -1622,6 +1622,7 @@
     <!-- The hibernate jar -->
     <copy todir="${install.all.lib}" filtering="no">
       <fileset dir="${hibernate.lib}" includes="*.jar"/>
+      <fileset dir="${org.hibernate.lib}" includes="*.jar"/>
     </copy>
 
     <copy todir="${install.server}/all/deployers" filtering="no">

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-06-05 22:03:22 UTC (rev 74195)
+++ trunk/build/build.xml	2008-06-05 22:04:02 UTC (rev 74196)
@@ -713,6 +713,7 @@
         <exclude name="lib/jaxr-client.jar" />
         <exclude name="lib/jbosscache-core.jar"/>
         <exclude name="lib/jbosscache-pojo.jar"/>
+        <exclude name="lib/hibernate-jbosscache2.jar"/>
         <exclude name="lib/jbossmqha.jar"/>
         <exclude name="deploy/cluster/**"/>
         <exclude name="deploy/iiop-service.xml"/>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-06-05 22:03:22 UTC (rev 74195)
+++ trunk/component-matrix/pom.xml	2008-06-05 22:04:02 UTC (rev 74196)
@@ -1013,6 +1013,18 @@
       </dependency>
       
       <dependency>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-jbosscache2</artifactId>
+        <version>3.3.0.CR1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.cache</groupId>
+            <artifactId>jbosscache-core</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      
+      <dependency>
         <groupId>javassist</groupId>
         <artifactId>javassist</artifactId>
         <version>3.7.1.GA</version>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-06-05 22:03:22 UTC (rev 74195)
+++ trunk/thirdparty/pom.xml	2008-06-05 22:04:02 UTC (rev 74196)
@@ -1176,6 +1176,10 @@
       <artifactId>hibernate-validator</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-jbosscache2</artifactId>
+    </dependency>
+    <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
     </dependency>