[hibernate-commits] Hibernate SVN: r17018 - in core/trunk: cache-jbosscache2 and 1 other directory.

Author: steve.ebersole(a)jboss.com Date: 2009-07-07 12:33:04 -0400 (Tue, 07 Jul 2009) New Revision: 17018 Added: core/trunk/cache-jbosscache/pom.xml Removed: core/trunk/cache-jbosscache2/pom.xml Log: HHH-4028 - Move current cache-jbosscache2 module content to cache-jbosscache Copied: core/trunk/cache-jbosscache/pom.xml (from rev 17017, core/trunk/cache-jbosscache2/pom.xml) =================================================================== --- core/trunk/cache-jbosscache/pom.xml (rev 0) +++ core/trunk/cache-jbosscache/pom.xml 2009-07-07 16:33:04 UTC (rev 17018) @@ -0,0 +1,161 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.5.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jbosscache2</artifactId> + <packaging>jar</packaging> + + <name>Hibernate JBossCache3.x Integration</name> + <description>Integration of Hibernate with JBossCache 3 (based on JBossCache2.x+ APIs)</description> + + <dependencies> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>3.1.0.GA</version> + </dependency> + + <!-- test dependencies --> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-testing</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + <scope>test</scope> + </dependency> + <!-- this is optional on core :( and needed for testing --> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <filtering>false</filtering> + <directory>src/test/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <!-- Skip a long-running test of a prototype class --> + <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude> + </excludes> + <systemProperties> + <property> + <name>hibernate.test.validatefailureexpected</name> + <value>true</value> + </property> + <property> + <name>jgroups.bind_addr</name> + <value>${jgroups.bind_addr}</value> + </property> + <!-- There are problems with multicast and IPv6 on some + OS/JDK combos, so we tell Java to use IPv4. If you + have problems with multicast when running the tests + you can try setting this to 'false', although typically + that won't be helpful. + --> + <property> + <name>java.net.preferIPv4Stack</name> + <value>true</value> + </property> + <!-- Tell JGroups to only wait a short time for PING + responses before determining coordinator. Speeds cluster + formation during integration tests. (This is too + low a value for a real system; only use for tests.) + --> + <property> + <name>jgroups.ping.timeout</name> + <value>500</value> + </property> + <!-- Tell JGroups to only require one PING response + before determining coordinator. Speeds cluster + formation during integration tests. (This is too + low a value for a real system; only use for tests.) + --> + <property> + <name>jgroups.ping.num_initial_members</name> + <value>1</value> + </property> + <!-- Disable the JGroups message bundling feature + to speed tests and avoid FLUSH issue --> + <property> + <name>jgroups.udp.enable_bundling</name> + <value>false</value> + </property> + </systemProperties> + <skipExec>${skipUnitTests}</skipExec> + </configuration> + </plugin> + </plugins> + </build> + + <properties> + <skipUnitTests>true</skipUnitTests> + <!-- + Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there + may be problems with multicast on the interface JGroups uses by default on your machine. You can + try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and + setting the value to an interface where you know multicast works + --> + <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr> + </properties> + + <profiles> + <profile> + <id>test</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <skipUnitTests>false</skipUnitTests> + </properties> + </profile> + </profiles> +</project> Deleted: core/trunk/cache-jbosscache2/pom.xml =================================================================== --- core/trunk/cache-jbosscache2/pom.xml 2009-07-07 16:32:02 UTC (rev 17017) +++ core/trunk/cache-jbosscache2/pom.xml 2009-07-07 16:33:04 UTC (rev 17018) @@ -1,161 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-parent</artifactId> - <version>3.5.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jbosscache2</artifactId> - <packaging>jar</packaging> - - <name>Hibernate JBossCache3.x Integration</name> - <description>Integration of Hibernate with JBossCache 3 (based on JBossCache2.x+ APIs)</description> - - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>3.1.0.GA</version> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testing</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.2</version> - <scope>test</scope> - </dependency> - <!-- this is optional on core :( and needed for testing --> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <filtering>false</filtering> - <directory>src/test/java</directory> - <includes> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - </testResources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <!-- Skip a long-running test of a prototype class --> - <exclude>**/ClusteredConcurrentTimestampRegionTestCase.java</exclude> - </excludes> - <systemProperties> - <property> - <name>hibernate.test.validatefailureexpected</name> - <value>true</value> - </property> - <property> - <name>jgroups.bind_addr</name> - <value>${jgroups.bind_addr}</value> - </property> - <!-- There are problems with multicast and IPv6 on some - OS/JDK combos, so we tell Java to use IPv4. If you - have problems with multicast when running the tests - you can try setting this to 'false', although typically - that won't be helpful. - --> - <property> - <name>java.net.preferIPv4Stack</name> - <value>true</value> - </property> - <!-- Tell JGroups to only wait a short time for PING - responses before determining coordinator. Speeds cluster - formation during integration tests. (This is too - low a value for a real system; only use for tests.) - --> - <property> - <name>jgroups.ping.timeout</name> - <value>500</value> - </property> - <!-- Tell JGroups to only require one PING response - before determining coordinator. Speeds cluster - formation during integration tests. (This is too - low a value for a real system; only use for tests.) - --> - <property> - <name>jgroups.ping.num_initial_members</name> - <value>1</value> - </property> - <!-- Disable the JGroups message bundling feature - to speed tests and avoid FLUSH issue --> - <property> - <name>jgroups.udp.enable_bundling</name> - <value>false</value> - </property> - </systemProperties> - <skipExec>${skipUnitTests}</skipExec> - </configuration> - </plugin> - </plugins> - </build> - - <properties> - <skipUnitTests>true</skipUnitTests> - <!-- - Following is the default jgroups mcast address. If you find the testsuite runs very slowly, there - may be problems with multicast on the interface JGroups uses by default on your machine. You can - try to resolve setting 'jgroups.bind_addr' as a system-property to the jvm launching maven and - setting the value to an interface where you know multicast works - --> - <jgroups.bind_addr>127.0.0.1</jgroups.bind_addr> - </properties> - - <profiles> - <profile> - <id>test</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <properties> - <skipUnitTests>false</skipUnitTests> - </properties> - </profile> - </profiles> -</project>