[jboss-cvs] JBossAS SVN: r99352 - in branches/JBPAPP_5_0: component-matrix and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 13 12:25:17 EST 2010
Author: bstansberry at jboss.com
Date: 2010-01-13 12:25:16 -0500 (Wed, 13 Jan 2010)
New Revision: 99352
Modified:
branches/JBPAPP_5_0/build/build.xml
branches/JBPAPP_5_0/component-matrix/pom.xml
branches/JBPAPP_5_0/testsuite/build.xml
Log:
[JBPAPP-3180] Add missing hibernate jars
Modified: branches/JBPAPP_5_0/build/build.xml
===================================================================
--- branches/JBPAPP_5_0/build/build.xml 2010-01-13 17:19:55 UTC (rev 99351)
+++ branches/JBPAPP_5_0/build/build.xml 2010-01-13 17:25:16 UTC (rev 99352)
@@ -851,12 +851,25 @@
-->
<move todir="${install.common.lib}">
<fileset dir="${install.all.lib}">
- <exclude name="hibernate-jbosscache2.jar"/>
<exclude name="jacorb.jar"/>
<exclude name="jbosscache-core.jar"/>
<exclude name="jbosscache-pojo.jar"/>
<exclude name="jgroups.jar"/>
<exclude name="jcip-annotations.jar"/>
+ <!-- We only include the hibernate-jbosscache integration jar
+ in 'all' (later copied to 'production'), because it doesn't work
+ without JBC and JGroups, which are only in 'all'. Also, this is
+ how it was packaged in EAP 5.0.0.GA. -->
+ <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"/>
+ -->
</fileset>
</move>
@@ -1046,6 +1059,9 @@
<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>
@@ -1063,6 +1079,9 @@
<move todir="${install.common.lib}">
<fileset dir="${install.all.lib}">
<exclude name="hibernate-jbosscache2.jar"/>
+ <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"/>
@@ -1140,6 +1159,9 @@
<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"/>
Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml 2010-01-13 17:19:55 UTC (rev 99351)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml 2010-01-13 17:25:16 UTC (rev 99352)
@@ -1118,6 +1118,106 @@
<dependency>
<groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>${version.org.hibernate}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-oscache</artifactId>
+ <version>${version.org.hibernate}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>opensymphony</groupId>
+ <artifactId>oscache</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-swarmcache</artifactId>
+ <version>${version.org.hibernate}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>swarmcache</groupId>
+ <artifactId>swarmcache</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>${version.org.hibernate}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-proxool</artifactId>
+ <version>${version.org.hibernate}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>proxool</groupId>
+ <artifactId>proxool</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
<artifactId>hibernate-jbosscache2</artifactId>
<version>${version.org.hibernate}</version>
<exclusions>
Modified: branches/JBPAPP_5_0/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/build.xml 2010-01-13 17:19:55 UTC (rev 99351)
+++ branches/JBPAPP_5_0/testsuite/build.xml 2010-01-13 17:25:16 UTC (rev 99352)
@@ -372,6 +372,11 @@
<!-- path refid="hibernate3.classpath"/ -->
<pathelement path="${jboss.dist.common.lib}/hibernate-core.jar" />
<pathelement path="${jboss.dist.common.lib}/hibernate-jmx.jar" />
+ <pathelement path="${jboss.dist.common.lib}/hibernate-ehcache.jar" />
+ <pathelement path="${jboss.dist.common.lib}/hibernate-oscache.jar" />
+ <pathelement path="${jboss.dist.common.lib}/hibernate-swarmcache.jar" />
+ <pathelement path="${jboss.dist.common.lib}/hibernate-c3p0.jar" />
+ <pathelement path="${jboss.dist.common.lib}/hibernate-proxool.jar" />
<!-- path refid="odmg.classpath"/ -->
<pathelement path="${odmg.odmg.lib}/odmg-3.0.jar" />
<!-- path refid="cglib.classpath"/ -->
More information about the jboss-cvs-commits
mailing list