[hibernate-commits] Hibernate SVN: r18558 - in core/trunk: entitymanager and 1 other directories.

Author: hardy.ferentschik Date: 2010-01-14 14:30:04 -0500 (Thu, 14 Jan 2010) New Revision: 18558 Modified: core/trunk/annotations/pom.xml core/trunk/entitymanager/pom.xml core/trunk/parent/pom.xml Log: HHH-4789 Made sure that the plugins are configured in the parent pom. Made the em docbook generation work. xml formatting Modified: core/trunk/annotations/pom.xml =================================================================== --- core/trunk/annotations/pom.xml 2010-01-14 19:10:50 UTC (rev 18557) +++ core/trunk/annotations/pom.xml 2010-01-14 19:30:04 UTC (rev 18558) @@ -22,7 +22,9 @@ ~ 51 Franklin Street, Fifth Floor ~ Boston, MA 02110-1301 USA --> -<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> @@ -103,14 +105,6 @@ <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-test-ext-plugin</artifactId> - <version>1.1.0</version> - <executions> - <execution> - <goals> - <goal>extend</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.twdata.maven</groupId> @@ -145,19 +139,9 @@ <id>doc</id> <build> <plugins> - <plugin> + <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.2.0</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>2.0.0</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> <configuration> <sourceDocumentName>master.xml</sourceDocumentName> <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory> @@ -165,33 +149,6 @@ <imageResource> <directory>${basedir}/src/main/docbook/en/images</directory> </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource> - <finalName>hibernate_reference.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <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> - </options> </configuration> <executions> <execution> @@ -207,7 +164,5 @@ </plugins> </build> </profile> - </profiles> - </project> Modified: core/trunk/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2010-01-14 19:10:50 UTC (rev 18557) +++ core/trunk/entitymanager/pom.xml 2010-01-14 19:30:04 UTC (rev 18558) @@ -72,21 +72,6 @@ </dependency> </dependencies> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <build> <testResources> <testResource> @@ -158,14 +143,6 @@ <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-test-ext-plugin</artifactId> - <version>1.1.0</version> - <executions> - <execution> - <goals> - <goal>extend</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -210,47 +187,13 @@ <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.0</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>1.0.2</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> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-single.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <localeSeparator>-</localeSeparator> - <useRelativeImageUris>true</useRelativeImageUris> - </options> </configuration> <executions> <execution> @@ -267,5 +210,4 @@ </build> </profile> </profiles> - </project> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2010-01-14 19:10:50 UTC (rev 18557) +++ core/trunk/parent/pom.xml 2010-01-14 19:30:04 UTC (rev 18558) @@ -22,7 +22,9 @@ ~ 51 Franklin Street, Fifth Floor ~ Boston, MA 02110-1301 USA --> -<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> @@ -198,39 +200,42 @@ <version>2.2.0</version> <extensions>true</extensions> <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>2.0.0</version> - <type>jdocbook-style</type> - </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jdocbook-style</artifactId> + <version>2.0.0</version> + <type>jdocbook-style</type> + </dependency> </dependencies> <configuration> <formats> <format> <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl + </stylesheetResource> <finalName>hibernate_reference.pdf</finalName> </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <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> - </options> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <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> + </options> </configuration> </plugin> <plugin> @@ -306,6 +311,18 @@ <artifactId>maven-antrun-plugin</artifactId> <version>1.3</version> </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-test-ext-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <goals> + <goal>extend</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </pluginManagement> @@ -342,7 +359,7 @@ <artifactId>maven-surefire-report-plugin</artifactId> <version>2.4.3</version> </plugin> -<!-- + <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> @@ -529,7 +546,7 @@ <jdbc.url>jdbc:hsqldb:.</jdbc.url> <jdbc.user>sa</jdbc.user> <jdbc.pass/> - <jdbc.isolation/> + <jdbc.isolation/> </properties> </profile> @@ -551,7 +568,7 @@ <jdbc.url>jdbc:h2:mem:db1</jdbc.url> <jdbc.user>sa</jdbc.user> <jdbc.pass/> - <jdbc.isolation/> + <jdbc.isolation/> </properties> </profile> <!-- @@ -618,7 +635,8 @@ <properties> <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect> <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbrtru</jdbc.url> + <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbrtru + </jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> <jdbc.isolation/> @@ -830,7 +848,9 @@ <properties> <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url> + <jdbc.url> + jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss))) + </jdbc.url> <jdbc.user>hibbrtru</jdbc.user> <jdbc.pass>hibbrtru</jdbc.pass> <jdbc.isolation/>