git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17847 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Hardy Ferentschik 2009-10-27 09:39:38 +00:00
parent d9c931eb2f
commit f8fef6c6c1
2 changed files with 64 additions and 71 deletions

View File

@ -1,27 +1,22 @@
<?xml version="1.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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId> <artifactId>hibernate-parent</artifactId>
<version>3.5.0-SNAPSHOT</version> <version>3.5.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath> <relativePath>../parent/pom.xml</relativePath>
</parent> </parent>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId> <artifactId>hibernate-entitymanager</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Hibernate Entitity Manager</name> <name>Hibernate Entitity Manager</name>
<description>Hibernate Entitity Manager</description> <description>Hibernate Entitity Manager</description>
<!-- Annotations and Commons-Annotations both use the ANN JIRA key --> <!-- Annotations and Commons-Annotations both use the ANN JIRA key -->
<issueManagement> <issueManagement>
<system>jira</system> <system>jira</system>
<url>http://opensource.atlassian.com/projects/hibernate/browse/ANN</url> <url>http://opensource.atlassian.com/projects/hibernate/browse/ANN</url>
</issueManagement> </issueManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
@ -50,9 +45,8 @@
<artifactId>hibernate-jpamodelgen</artifactId> <artifactId>hibernate-jpamodelgen</artifactId>
<version>1.0.0-Alpha1-SNAPSHOT</version> <version>1.0.0-Alpha1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
@ -67,7 +61,6 @@
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
<testResources> <testResources>
<testResource> <testResource>
@ -77,8 +70,8 @@
<testResource> <testResource>
<filtering>true</filtering> <filtering>true</filtering>
<directory>src/test/bundles</directory> <directory>src/test/bundles</directory>
<targetPath>../bundles</targetPath> <targetPath>../bundles</targetPath>
</testResource> </testResource>
</testResources> </testResources>
<plugins> <plugins>
<plugin> <plugin>
@ -93,8 +86,7 @@
<echo>processing JPA annotations</echo> <echo>processing JPA annotations</echo>
<property name="target.dir" value="target/generated-jpamodel-classes"/> <property name="target.dir" value="target/generated-jpamodel-classes"/>
<mkdir dir="${target.dir}"/> <mkdir dir="${target.dir}"/>
<javac srcdir="src/test/java" destdir="${target.dir}" <javac srcdir="src/test/java" destdir="${target.dir}" failonerror="false" excludes="test/**" fork="true" executable="${jdk16_home}/bin/javac" target="1.5">
failonerror="false" excludes="test/**" fork="true" executable="${jdk16_home}/bin/javac" target="1.5">
<compilerarg value="-proc:only"/> <compilerarg value="-proc:only"/>
<classpath> <classpath>
<path refid="maven.test.classpath"/> <path refid="maven.test.classpath"/>
@ -135,29 +127,29 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>package-tests</id> <id>package-tests</id>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<configuration> <configuration>
<tasks> <tasks>
<property name="package.dir" value="${basedir}/target/test-packages" /> <property name="package.dir" value="${basedir}/target/test-packages"/>
<property name="package.tmp.dir" value="${basedir}/target/tmp" /> <property name="package.tmp.dir" value="${basedir}/target/tmp"/>
<property name="classes.dir" value="${project.build.directory}/test-classes" /> <property name="classes.dir" value="${project.build.directory}/test-classes"/>
<property name="testresources.dir" value="${basedir}/target/bundles" /> <property name="testresources.dir" value="${basedir}/target/bundles"/>
<ant antfile="${basedir}/build.xml"> <ant antfile="${basedir}/build.xml">
<target name="package" /> <target name="package"/>
</ant> </ant>
</tasks> </tasks>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -178,77 +170,79 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<forkMode>pertest</forkMode> <forkMode>pertest</forkMode>
<additionalClasspathElements> <additionalClasspathElements>
<additionalClasspathElement>${basedir}/target/test-packages/cfgxmlpar.par</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/cfgxmlpar.par</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/defaultpar.par</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/defaultpar.par</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/excludehbmpar.par</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/excludehbmpar.par</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/explicitpar.par</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/explicitpar.par</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/explodedpar.par</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/explodedpar.par</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/externaljar.jar</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/externaljar.jar</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/nesteddir.ear</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/nesteddir.ear</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/nestedjar.ear</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/nestedjar.ear</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/overridenpar.jar</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/overridenpar.jar</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/space par.par</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/space par.par</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/test-packages/war.war</additionalClasspathElement> <additionalClasspathElement>${basedir}/target/test-packages/war.war</additionalClasspathElement>
</additionalClasspathElements> </additionalClasspathElements>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>doc</id> <id>doc</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.jboss.maven.plugins</groupId> <groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId> <artifactId>maven-jdocbook-plugin</artifactId>
<version>2.1.0</version> <version>2.2.0</version>
<extensions>true</extensions> <extensions>true</extensions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-jdocbook-style</artifactId> <artifactId>hibernate-jdocbook-style</artifactId>
<version>1.0.2</version> <version>2.0.0</version>
<type>jdocbook-style</type> <type>jdocbook-style</type>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
<sourceDocumentName>master.xml</sourceDocumentName> <sourceDocumentName>master.xml</sourceDocumentName>
<sourceDirectory>${basedir}/src/main/docbook/en</sourceDirectory> <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
<masterTranslation>en-US</masterTranslation> <masterTranslation>en</masterTranslation>
<imageResource> <imageResource>
<directory>${basedir}/src/main/docbook/en/images</directory> <directory>${basedir}/src/main/docbook/en/images</directory>
</imageResource> </imageResource>
<formats> <formats>
<format> <format>
<formatName>pdf</formatName> <formatName>pdf</formatName>
<stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource>
<finalName>hibernate-validator-legacy-guide.pdf</finalName> <finalName>hibernate_reference.pdf</finalName>
</format> </format>
<format> <format>
<formatName>html_single</formatName> <formatName>html_single</formatName>
<stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl
</stylesheetResource> </stylesheetResource>
<finalName>index.html</finalName> <finalName>index.html</finalName>
</format> </format>
<format> <format>
<formatName>html</formatName> <formatName>html</formatName>
<stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl
</stylesheetResource> </stylesheetResource>
<finalName>index.html</finalName> <finalName>index.html</finalName>
</format> </format>
</formats> </formats>
<options> <options>
<xincludeSupported>true</xincludeSupported> <xincludeSupported>true</xincludeSupported>
<xmlTransformerType>saxon</xmlTransformerType>
<!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
<!-- could also locate the docbook dependency and inspect its version... -->
<docbookVersion>1.72.0</docbookVersion>
<localeSeparator>-</localeSeparator> <localeSeparator>-</localeSeparator>
<useRelativeImageUris>true</useRelativeImageUris>
</options> </options>
</configuration> </configuration>
<executions> <executions>
@ -265,6 +259,5 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB