[hibernate-commits] Hibernate SVN: r17847 - in core/trunk/entitymanager: src/main/docbook/en/images and 1 other directory.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Tue Oct 27 05:39:39 EDT 2009
Author: hardy.ferentschik
Date: 2009-10-27 05:39:38 -0400 (Tue, 27 Oct 2009)
New Revision: 17847
Removed:
core/trunk/entitymanager/src/main/docbook/en/images/hibernate_logo_a.png
Modified:
core/trunk/entitymanager/pom.xml
Log:
HHH-4530
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2009-10-27 09:36:55 UTC (rev 17846)
+++ core/trunk/entitymanager/pom.xml 2009-10-27 09:39:38 UTC (rev 17847)
@@ -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">
-
<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-entitymanager</artifactId>
<packaging>jar</packaging>
-
<name>Hibernate Entitity Manager</name>
<description>Hibernate Entitity Manager</description>
-
<!-- Annotations and Commons-Annotations both use the ANN JIRA key -->
<issueManagement>
<system>jira</system>
<url>http://opensource.atlassian.com/projects/hibernate/browse/ANN</url>
</issueManagement>
-
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
@@ -50,9 +45,8 @@
<artifactId>hibernate-jpamodelgen</artifactId>
<version>1.0.0-Alpha1-SNAPSHOT</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -67,7 +61,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<build>
<testResources>
<testResource>
@@ -77,8 +70,8 @@
<testResource>
<filtering>true</filtering>
<directory>src/test/bundles</directory>
- <targetPath>../bundles</targetPath>
- </testResource>
+ <targetPath>../bundles</targetPath>
+ </testResource>
</testResources>
<plugins>
<plugin>
@@ -93,8 +86,7 @@
<echo>processing JPA annotations</echo>
<property name="target.dir" value="target/generated-jpamodel-classes"/>
<mkdir dir="${target.dir}"/>
- <javac srcdir="src/test/java" destdir="${target.dir}"
- failonerror="false" excludes="test/**" fork="true" executable="${jdk16_home}/bin/javac" target="1.5">
+ <javac srcdir="src/test/java" destdir="${target.dir}" failonerror="false" excludes="test/**" fork="true" executable="${jdk16_home}/bin/javac" target="1.5">
<compilerarg value="-proc:only"/>
<classpath>
<path refid="maven.test.classpath"/>
@@ -135,30 +127,30 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>package-tests</id>
- <phase>process-test-classes</phase>
- <configuration>
- <tasks>
- <property name="package.dir" value="${basedir}/target/test-packages" />
- <property name="package.tmp.dir" value="${basedir}/target/tmp" />
- <property name="classes.dir" value="${project.build.directory}/test-classes" />
- <property name="testresources.dir" value="${basedir}/target/bundles" />
- <ant antfile="${basedir}/build.xml">
- <target name="package" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-tests</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <property name="package.dir" value="${basedir}/target/test-packages"/>
+ <property name="package.tmp.dir" value="${basedir}/target/tmp"/>
+ <property name="classes.dir" value="${project.build.directory}/test-classes"/>
+ <property name="testresources.dir" value="${basedir}/target/bundles"/>
+ <ant antfile="${basedir}/build.xml">
+ <target name="package"/>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -178,77 +170,79 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/target/test-packages/cfgxmlpar.par</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/defaultpar.par</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/excludehbmpar.par</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/explicitpar.par</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/explodedpar.par</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/externaljar.jar</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/nesteddir.ear</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/nestedjar.ear</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/overridenpar.jar</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/space par.par</additionalClasspathElement>
- <additionalClasspathElement>${basedir}/target/test-packages/war.war</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/target/test-packages/cfgxmlpar.par</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/defaultpar.par</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/excludehbmpar.par</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/explicitpar.par</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/explodedpar.par</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/externaljar.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/nesteddir.ear</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/nestedjar.ear</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/overridenpar.jar</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/space par.par</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/test-packages/war.war</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
<profiles>
- <profile>
+ <profile>
<id>doc</id>
<build>
<plugins>
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
<extensions>true</extensions>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-jdocbook-style</artifactId>
- <version>1.0.2</version>
+ <version>2.0.0</version>
<type>jdocbook-style</type>
</dependency>
</dependencies>
<configuration>
<sourceDocumentName>master.xml</sourceDocumentName>
- <sourceDirectory>${basedir}/src/main/docbook/en</sourceDirectory>
- <masterTranslation>en-US</masterTranslation>
+ <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory>
+ <masterTranslation>en</masterTranslation>
<imageResource>
<directory>${basedir}/src/main/docbook/en/images</directory>
</imageResource>
<formats>
<format>
<formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
- <finalName>hibernate-validator-legacy-guide.pdf</finalName>
+ <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource>
+ <finalName>hibernate_reference.pdf</finalName>
</format>
<format>
<formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl
- </stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl
+ </stylesheetResource>
<finalName>index.html</finalName>
</format>
<format>
<formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl
- </stylesheetResource>
+ <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl
+ </stylesheetResource>
<finalName>index.html</finalName>
</format>
</formats>
<options>
<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>
- <useRelativeImageUris>true</useRelativeImageUris>
</options>
</configuration>
<executions>
@@ -265,6 +259,5 @@
</plugins>
</build>
</profile>
- </profiles>
-
+ </profiles>
</project>
Deleted: core/trunk/entitymanager/src/main/docbook/en/images/hibernate_logo_a.png
===================================================================
(Binary files differ)
More information about the hibernate-commits
mailing list