[jboss-cvs] JBossAS SVN: r106607 - branches/JBPAPP_5_1/build.

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

Author: fnasser at redhat.com
Date: 2010-07-12 15:15:22 -0400 (Mon, 12 Jul 2010)
New Revision: 106607

Modified:
   branches/JBPAPP_5_1/build/build.xml
Log:
JBPAPP-3180 - Extend changes to move hibernate second-level cache integration to EWP builds, and remove include lines no longer needed

Modified: branches/JBPAPP_5_1/build/build.xml
===================================================================
--- branches/JBPAPP_5_1/build/build.xml	2010-07-12 18:52:03 UTC (rev 106606)
+++ branches/JBPAPP_5_1/build/build.xml	2010-07-12 19:15:22 UTC (rev 106607)
@@ -1091,9 +1091,6 @@
         <include name="deploy/cluster/jboss-cache-manager.sar/**"/>
         <include name="lib/jbosscache-*"/>
         <include name="lib/hibernate-jbosscache2.jar"/>
-		<include name="lib/hibernate-ehcache.jar"/>
-		<include name="lib/hibernate-oscache.jar"/>
-		<include name="lib/hibernate-swarmcache.jar"/>
         <include name="lib/jgroups.jar"/>
       </fileset>
     </copy>
@@ -1111,9 +1108,15 @@
     <move todir="${install.common.lib}">
       <fileset dir="${install.all.lib}">
         <exclude name="hibernate-jbosscache2.jar"/>
+        <!-- JBPAPP-3180. The other hibernate 2nd Level Cache integration
+             jars are allowed to move to commmon/lib because their classes 
+             were available in 'default' in EAP 4.x. Having them only in
+             'all' is an incompatibility. -->
+        <!--
 		<exclude name="hibernate-ehcache.jar"/>
 		<exclude name="hibernate-oscache.jar"/>
 		<exclude name="hibernate-swarmcache.jar"/>
+        -->
         <exclude name="jacorb.jar"/>
         <exclude name="jbosscache-core.jar"/>
         <exclude name="jbosscache-pojo.jar"/>
@@ -1191,9 +1194,6 @@
         <include name="deploy/cluster/jboss-cache-manager.sar/**"/>
         <include name="lib/jbosscache-*"/>
         <include name="lib/hibernate-jbosscache2.jar"/>
-		<include name="lib/hibernate-ehcache.jar"/>
-		<include name="lib/hibernate-oscache.jar"/>
-		<include name="lib/hibernate-swarmcache.jar"/>
         <include name="lib/jgroups.jar"/>
         <exclude name="lib/bsf.jar"/>
         <exclude name="lib/bsh.jar"/>