[hibernate-commits] Hibernate SVN: r11594 - in trunk/Hibernate3: code/cache-ehcache and 21 other directories.

Author: steve.ebersole(a)jboss.com Date: 2007-05-29 11:40:22 -0400 (Tue, 29 May 2007) New Revision: 11594 Modified: trunk/Hibernate3/code/cache-ehcache/pom.xml trunk/Hibernate3/code/cache-jbosscache/pom.xml trunk/Hibernate3/code/cache-jbosscache2/pom.xml trunk/Hibernate3/code/cache-oscache/pom.xml trunk/Hibernate3/code/cache-swarmcache/pom.xml trunk/Hibernate3/code/connection-c3p0/pom.xml trunk/Hibernate3/code/connection-proxool/pom.xml trunk/Hibernate3/code/core/pom.xml trunk/Hibernate3/code/eg/pom.xml trunk/Hibernate3/code/jmx/pom.xml trunk/Hibernate3/code/testing/pom.xml trunk/Hibernate3/code/testsuite/pom.xml trunk/Hibernate3/documentation/manual/en-US/pom.xml trunk/Hibernate3/documentation/manual/es-ES/pom.xml trunk/Hibernate3/documentation/manual/fr-FR/pom.xml trunk/Hibernate3/documentation/manual/ja-JP/pom.xml trunk/Hibernate3/documentation/manual/ko-KR/pom.xml trunk/Hibernate3/documentation/manual/pom.xml trunk/Hibernate3/documentation/manual/pt-BR/pom.xml trunk/Hibernate3/documentation/manual/zh-CN/pom.xml trunk/Hibernate3/documentation/pom.xml trunk/Hibernate3/documentation/tutorial/pom.xml trunk/Hibernate3/pom.xml Log: split doc/code Modified: trunk/Hibernate3/code/cache-ehcache/pom.xml =================================================================== --- trunk/Hibernate3/code/cache-ehcache/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/cache-ehcache/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,21 +6,23 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate Ehcache integration</name> <description>Integration of Hibernate with Ehcache</description> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>net.sf.ehcache</groupId> @@ -29,4 +31,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/cache-jbosscache/pom.xml =================================================================== --- trunk/Hibernate3/code/cache-jbosscache/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/cache-jbosscache/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,21 +6,23 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-jbosscache</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate JBossCache integration</name> <description>Integration of Hibernate with JBossCache (based on JBossCache1.x APIs)</description> <dependencies> <dependency> <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>jboss</groupId> @@ -60,4 +62,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/cache-jbosscache2/pom.xml =================================================================== --- trunk/Hibernate3/code/cache-jbosscache2/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/cache-jbosscache2/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,21 +6,23 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-jbosscache2</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate JBossCache2.x integration</name> <description>Integration of Hibernate with JBossCache (based on JBossCache2.x APIs)</description> <dependencies> <dependency> <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>jboss</groupId> @@ -55,4 +57,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/cache-oscache/pom.xml =================================================================== --- trunk/Hibernate3/code/cache-oscache/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/cache-oscache/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,21 +6,23 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-oscache</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate OSCache integration</name> <description>Integration of Hibernate with OSCache</description> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>opensymphony</groupId> @@ -29,4 +31,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/cache-swarmcache/pom.xml =================================================================== --- trunk/Hibernate3/code/cache-swarmcache/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/cache-swarmcache/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,21 +6,23 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-swarmcache</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate SwarmCache integration</name> <description>Integration of Hibernate with SwarmCache</description> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>swarmcache</groupId> @@ -29,4 +31,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/connection-c3p0/pom.xml =================================================================== --- trunk/Hibernate3/code/connection-c3p0/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/connection-c3p0/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,21 +6,23 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate C3P0 ConnectionProvider</name> <description>C3P0-based implementation of the Hibernate ConnectionProvder contract</description> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>c3p0</groupId> @@ -29,4 +31,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/connection-proxool/pom.xml =================================================================== --- trunk/Hibernate3/code/connection-proxool/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/connection-proxool/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,21 +6,23 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-proxool</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate Proxool ConnectionProvider</name> <description>Proxool-based implementation of the Hibernate ConnectionProvder contract</description> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>proxool</groupId> @@ -29,4 +31,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/core/pom.xml =================================================================== --- trunk/Hibernate3/code/core/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/core/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -2,13 +2,13 @@ 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-core-project</artifactId> - <version>3.3.0.beta1</version> - <relativePath>../pom.xml</relativePath> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-code</artifactId> + <version>3.3.0.beta1</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> @@ -18,8 +18,6 @@ <name>Hibernate Core</name> <description>The core functionality of Hibernate</description> - <url>http://hibernate.org</url> - <dependencies> <dependency> <groupId>antlr</groupId> Modified: trunk/Hibernate3/code/eg/pom.xml =================================================================== --- trunk/Hibernate3/code/eg/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/eg/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,21 +6,23 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-eg</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate Example</name> <description>A simple example of Hibernate functionality</description> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> </dependencies> Modified: trunk/Hibernate3/code/jmx/pom.xml =================================================================== --- trunk/Hibernate3/code/jmx/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/jmx/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,22 +6,24 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-jmx</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate JMX Module</name> - <url>http://hibernate.org</url> + <description>Defines Hibernate JMX functionality</description> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/testing/pom.xml =================================================================== --- trunk/Hibernate3/code/testing/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/testing/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,27 +6,31 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-testing</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate Testing</name> + <description>Hibernate JUnit test utilities</description> <dependencies> <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>3.8.1</version> + <!-- here we need to pull JUnit deps into compile scope... --> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/code/testsuite/pom.xml =================================================================== --- trunk/Hibernate3/code/testsuite/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/code/testsuite/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,42 +6,48 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-code</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-testsuite</artifactId> - <packaging>jar</packaging> + <packaging>jar</packaging> + <name>Hibernate Testsuite</name> <description>The testsuite of Hibernate functionality</description> - <url>http://hibernate.org</url> <dependencies> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-testing</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-testing</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-ehcache</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-ehcache</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jbosscache</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-jbosscache</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-oscache</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-oscache</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-swarmcache</artifactId> + <groupId>${groupId}</groupId> + <artifactId>hibernate-swarmcache</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>log4j</groupId> @@ -66,7 +72,8 @@ <artifactId>asm-attrs</artifactId> <version>1.5.3</version> <optional>true</optional> - </dependency> + </dependency> + <!-- optional dom4j dependency; needed here for dom4j (de)serialization --> <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> @@ -128,4 +135,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: trunk/Hibernate3/documentation/manual/en-US/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/en-US/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/manual/en-US/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -8,7 +8,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-manual</artifactId> <version>3.3.0.beta1</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hibernate-manual-${translation}</artifactId> Modified: trunk/Hibernate3/documentation/manual/es-ES/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/es-ES/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/manual/es-ES/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -8,7 +8,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-manual</artifactId> <version>3.3.0.beta1</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hibernate-manual-${translation}</artifactId> Modified: trunk/Hibernate3/documentation/manual/fr-FR/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/fr-FR/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/manual/fr-FR/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -8,7 +8,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-manual</artifactId> <version>3.3.0.beta1</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hibernate-manual-${translation}</artifactId> Modified: trunk/Hibernate3/documentation/manual/ja-JP/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/ja-JP/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/manual/ja-JP/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -8,7 +8,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-manual</artifactId> <version>3.3.0.beta1</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hibernate-manual-${translation}</artifactId> Modified: trunk/Hibernate3/documentation/manual/ko-KR/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/ko-KR/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/manual/ko-KR/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -8,7 +8,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-manual</artifactId> <version>3.3.0.beta1</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hibernate-manual-${translation}</artifactId> Modified: trunk/Hibernate3/documentation/manual/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/manual/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,9 +6,9 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-documentation</artifactId> <version>3.3.0.beta1</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hibernate-manual</artifactId> Modified: trunk/Hibernate3/documentation/manual/pt-BR/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/pt-BR/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/manual/pt-BR/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -8,7 +8,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-manual</artifactId> <version>3.3.0.beta1</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>.../pom.xml</relativePath> </parent> <artifactId>hibernate-manual-${translation}</artifactId> Modified: trunk/Hibernate3/documentation/manual/zh-CN/pom.xml =================================================================== --- trunk/Hibernate3/documentation/manual/zh-CN/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/manual/zh-CN/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -8,7 +8,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-manual</artifactId> <version>3.3.0.beta1</version> - <relativePath>../../../pom.xml</relativePath> + <relativePath>../pom.xml</relativePath> </parent> <artifactId>hibernate-manual-${translation}</artifactId> Modified: trunk/Hibernate3/documentation/pom.xml =================================================================== --- trunk/Hibernate3/documentation/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,15 +6,16 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-parent</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>hibernate-documentation</artifactId> <packaging>pom</packaging> - <name>Hibernate Documentation Project</name> - <description>The grouping project for Hibernate documentation</description> + + <name>Hibernate Core - Documentation</name> + <description>Grouping of Hibernate Core Project documentation modules</description> <modules> <module>manual</module> Modified: trunk/Hibernate3/documentation/tutorial/pom.xml =================================================================== --- trunk/Hibernate3/documentation/tutorial/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/documentation/tutorial/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -6,7 +6,7 @@ <parent> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-documentation</artifactId> <version>3.3.0.beta1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -21,6 +21,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> + <version>${hibernate.core.version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: trunk/Hibernate3/pom.xml =================================================================== --- trunk/Hibernate3/pom.xml 2007-05-29 14:27:48 UTC (rev 11593) +++ trunk/Hibernate3/pom.xml 2007-05-29 15:40:22 UTC (rev 11594) @@ -5,12 +5,12 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.hibernate</groupId> - <artifactId>hibernate-core-project</artifactId> + <artifactId>hibernate-parent</artifactId> <packaging>pom</packaging> <version>3.3.0.beta1</version> - <name>Hibernate Core Project</name> - <description>The overall grouping Maven project for the Hibernate Core project, defining the individual modules</description> + <name>Hibernate Parent</name> + <description>The parent POM for all Hibernate Core modules.</description> <url>http://hibernate.org</url> <issueManagement> @@ -80,176 +80,12 @@ </scm> <modules> - <module>core</module> - <module>cache-ehcache</module> - <module>cache-jbosscache</module> - <module>cache-oscache</module> - <module>cache-swarmcache</module> - <module>connection-c3p0</module> - <module>connection-proxool</module> - <module>jmx</module> - <module>testing</module> + <module>code</module> <module>documentation</module> - <module>testsuite</module> - <module>eg</module> -<!-- Need to scope bytecode providers first - <module>bytecode-cglib</module> - <module>bytecode-javassist</module> ---> </modules> + + <properties> + <hibernate.core.version>${version}</hibernate.core.version> + </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-ehcache</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-jbosscache</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-oscache</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-swarmcache</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-c3p0</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-proxool</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-jmx</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testing</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testsuite</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-manual</artifactId> - <version>${version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <repositories> - <repository> - <id>jboss-maven-repo</id> - <name>JBoss maintained repo</name> - <url>http://repository.jboss.com/maven2</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - - <profiles> - <profile> - <id>jbosscache2-module</id> - <modules> - <module>cache-jbosscache2</module> - </modules> - <activation> - <jdk>1.5</jdk> - </activation> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - </build> - - <!-- Not really caring about reporting plugin versions; I think this is ok??? --> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://java.sun.com/j2se/1.4.2/docs/api/</link> - <link>http://java.sun.com/j2ee/1.4/docs/api/</link> - </links> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javancss-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <configuration> - <tags> - <tag>@FIXME</tag> - <tag>@fixme</tag> - <tag>FIXME</tag> - <tag>fixme</tag> - <tag>@TODO</tag> - <tag>@todo</tag> - <tag>TODO</tag> - <tag>todo</tag> - </tags> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <minimumTokens>100</minimumTokens> - <targetJdk>1.4</targetJdk> - </configuration> - </plugin> - </plugins> - </reporting> - </project>