Author: steve.ebersole(a)jboss.com Date: 2009-06-23 02:16:45 -0400 (Tue, 23 Jun 2009) New Revision: 16889 Added: core/trunk/documentation/manual/src/main/docbook/en-US/author_group.xml Removed: core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml Modified: core/trunk/documentation/manual/pom.xml core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Reference.xml Log: HHH-3981 - Upgrade to jDocBook 2.2.0 Modified: core/trunk/documentation/manual/pom.xml =================================================================== --- core/trunk/documentation/manual/pom.xml 2009-06-23 06:16:25 UTC (rev 16888) +++ core/trunk/documentation/manual/pom.xml 2009-06-23 06:16:45 UTC (rev 16889) @@ -19,11 +19,27 @@ <build> <plugins> <plugin> + <!-- Needed in order to load the proper 'artifact handler' for the 'jdocbook-style' packaging --> <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-style-plugin</artifactId> + <version>2.0.0</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.1.2</version> + <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> + <executions> <execution> <!-- @@ -37,49 +53,16 @@ </goals> </execution> </executions> -<!-- - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>1.0.2</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> ---> - <dependencies> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-docbook-xslt</artifactId> - <version>1.1.0</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>1.1.0</version> - <type>jdocbook-style</type> - </dependency> - <dependency> - <groupId>org.jboss.tools</groupId> - <artifactId>jbosstools-docbook-xslt</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - <configuration> <sourceDocumentName>Hibernate_Reference.xml</sourceDocumentName> <masterTranslation>en-US</masterTranslation> <translations> -<!-- <translation>es-ES</translation> ---> <translation>fr-FR</translation> <translation>ja-JP</translation> <translation>ko-KR</translation> -<!-- <translation>pt-BR</translation> ---> <translation>zh-CN</translation> </translations> <imageResource> @@ -91,30 +74,33 @@ <exclude>**/*.zargo</exclude> </excludes> </imageResource> + <profiling> + <enabled>true</enabled> + </profiling> <formats> <format> <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl</stylesheetResource> <finalName>hibernate_reference.pdf</finalName> - <profilingTypeName>two_pass</profilingTypeName> </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> - <profilingTypeName>two_pass</profilingTypeName> </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> - <profilingTypeName>two_pass</profilingTypeName> </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>false</useRelativeImageUris> </options> </configuration> </plugin> Modified: core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Reference.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Reference.xml 2009-06-23 06:16:25 UTC (rev 16888) +++ core/trunk/documentation/manual/src/main/docbook/en-US/Hibernate_Reference.xml 2009-06-23 06:16:45 UTC (rev 16889) @@ -23,7 +23,8 @@ ~ Boston, MA 02110-1301 USA --> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ - <!ENTITY versionNumber "3.3.0.GA"> + <!ENTITY versionNumber "WORKING"> + <!ENTITY today "TODAY"> <!ENTITY copyrightYear "2004"> <!ENTITY copyrightHolder "Red Hat Middleware, LLC."> ]> @@ -35,6 +36,7 @@ <subtitle>Hibernate Reference Documentation</subtitle> <releaseinfo>&versionNumber;</releaseinfo> <productnumber>&versionNumber;</productnumber> + <pubdate>&today;</pubdate> <issuenum>1</issuenum> <mediaobject> <imageobject role="fo"> @@ -49,7 +51,7 @@ <holder>&copyrightHolder;</holder> </copyright> <xi:include href="legal_notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <!-- include translators... --> + <xi:include href="author_group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> </bookinfo> <toc/> @@ -94,6 +96,5 @@ <xi:include href="content/portability.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="content/bibliography.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - </book> Added: core/trunk/documentation/manual/src/main/docbook/en-US/author_group.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/author_group.xml (rev 0) +++ core/trunk/documentation/manual/src/main/docbook/en-US/author_group.xml 2009-06-23 06:16:45 UTC (rev 16889) @@ -0,0 +1,188 @@ +<!-- + ~ Hibernate, Relational Persistence for Idiomatic Java + ~ + ~ Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as + ~ indicated by the @author tags or express copyright attribution + ~ statements applied by the authors. All third-party contributions are + ~ distributed under license by Red Hat Middleware LLC. + ~ + ~ This copyrighted material is made available to anyone wishing to use, modify, + ~ copy, or redistribute it subject to the terms and conditions of the GNU + ~ Lesser General Public License, as published by the Free Software Foundation. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + ~ for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public License + ~ along with this distribution; if not, write to: + ~ Free Software Foundation, Inc. + ~ 51 Franklin Street, Fifth Floor + ~ Boston, MA 02110-1301 USA + --> +<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> + +<authorgroup> + <author> + <firstname>Gavin</firstname> + <surname>King</surname> + </author> + <author> + <firstname>Christian</firstname> + <surname>Bauer</surname> + </author> + <author> + <firstname>Max</firstname> + <othername>Rydahl</othername> + <surname>Andersen</surname> + </author> + <author> + <firstname>Emmanuel</firstname> + <surname>Bernard</surname> + </author> + <author> + <firstname>Steve</firstname> + <surname>Ebersole</surname> + </author> + + <othercredit> + <firstname>James</firstname> + <surname>Cobb</surname> + <affiliation> + <shortaffil>Graphic Design</shortaffil> + </affiliation> + </othercredit> + <othercredit> + <firstname>Cheyenne</firstname> + <surname>Weaver</surname> + <affiliation> + <shortaffil>Graphic Design</shortaffil> + </affiliation> + </othercredit> + + <!-- + ####################################################################### + # Spanish + ####################################################################### + --> + <othercredit class="translator" lang="es-ES"> + <othername><![CDATA[Bernardo Antonio Buffa Colom&#x00e9]]></othername> + <email&gt;kreimer(a)bbs.frc.utn.edu.ar&lt;/email&gt; + </othercredit> + + <!-- + ####################################################################### + # French + ####################################################################### + --> + <othercredit class="translator" lang="fr-FR"> + <firstname>Vincent</firstname> + <surname>Ricard</surname> + </othercredit> + <othercredit class="translator" lang="fr-FR"> + <firstname>Sebastien</firstname> + <surname>Cesbron</surname> + </othercredit> + <othercredit class="translator" lang="fr-FR"> + <firstname>Michael</firstname> + <surname>Courcy</surname> + </othercredit> + <othercredit class="translator" lang="fr-FR"> + <firstname>Vincent</firstname> + <surname>Giguère</surname> + </othercredit> + <othercredit class="translator" lang="fr-FR"> + <firstname>Baptiste</firstname> + <surname>Mathus</surname> + </othercredit> + <othercredit class="translator" lang="fr-FR"> + <firstname>Emmanuel</firstname> + <surname>Bernard</surname> + </othercredit> + <othercredit class="translator" lang="fr-FR"> + <firstname>Anthony</firstname> + <surname>Patricio</surname> + </othercredit> + + <!-- + ####################################################################### + # Portugese + ####################################################################### + --> + <othercredit class="translator" lang="pt-BR"> + <firstname>Alvaro</firstname> + <surname>Netto</surname> + <email&gt;alvaronetto(a)cetip.com.br&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Anderson</firstname> + <surname>Braulio</surname> + <email&gt;andersonbraulio(a)gmail.com&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Daniel Vieira</firstname> + <surname>Costa</surname> + <email&gt;danielvc(a)gmail.com&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Francisco</firstname> + <surname>gamarra</surname> + <email&gt;francisco.gamarra(a)gmail.com&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Gamarra</firstname> + <email&gt;mauricio.gamarra(a)gmail.com&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Luiz Carlos</firstname> + <surname>Rodrigues</surname> + <email&gt;luizcarlos_rodrigues(a)yahoo.com.br&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Marcel</firstname> + <surname>Castelo</surname> + <email&gt;marcel.castelo(a)gmail.com&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Paulo</firstname> + <surname>César</surname> + <email&gt;paulocol(a)gmail.com&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Pablo L.</firstname> + <surname>de Miranda</surname> + <email&gt;pablolmiranda(a)gmail.com&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Renato</firstname> + <surname>Deggau</surname> + <email&gt;rdeggau(a)gmail.com&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Rogério</firstname> + <surname>Araújo</surname> + <email&gt;rgildoaraujo(a)yahoo.com.br&lt;/email&gt; + </othercredit> + <othercredit class="translator" lang="pt-BR"> + <firstname>Wanderson</firstname> + <surname>Siqueira</surname> + <email&gt;wandersonxs(a)gmail.com&lt;/email&gt; + </othercredit> + + <!-- + ####################################################################### + # Chinese + ####################################################################### + --> + <othercredit class="translator" lang="zh-CN"> + <firstname>Cao</firstname> + <surname>Xiaogang</surname> + <affiliation> + <orgname>RedSaga</orgname> + </affiliation> + <contrib>Translation Lead</contrib> + <email&gt;caoxg(a)yahoo.com&lt;/email&gt; + </othercredit> + +</authorgroup> Deleted: core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml 2009-06-23 06:16:25 UTC (rev 16888) +++ core/trunk/documentation/manual/src/main/docbook/en-US/translators.xml 2009-06-23 06:16:45 UTC (rev 16889) @@ -1,154 +0,0 @@ -<?xml version='1.0' encoding="UTF-8"?> -<!-- - ~ Hibernate, Relational Persistence for Idiomatic Java - ~ - ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - ~ indicated by the @author tags or express copyright attribution - ~ statements applied by the authors. All third-party contributions are - ~ distributed under license by Red Hat Middleware LLC. - ~ - ~ This copyrighted material is made available to anyone wishing to use, modify, - ~ copy, or redistribute it subject to the terms and conditions of the GNU - ~ Lesser General Public License, as published by the Free Software Foundation. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - ~ for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public License - ~ along with this distribution; if not, write to: - ~ Free Software Foundation, Inc. - ~ 51 Franklin Street, Fifth Floor - ~ Boston, MA 02110-1301 USA - --> - -<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> - -<authorgroup id="AuthorGroup"> - - <!-- - ####################################################################### - # Spanish - ####################################################################### - --> - <othercredit class="translator" lang="es-ES"> - <othername><![CDATA[Bernardo Antonio Buffa Colom&#x00e9]]></othername> - <email&gt;kreimer(a)bbs.frc.utn.edu.ar&lt;/email&gt; - </othercredit> - - <!-- - ####################################################################### - # French - ####################################################################### - --> - <othercredit class="translator" lang="fr-FR"> - <firstname>Vincent</firstname> - <surname>Ricard</surname> - </othercredit> - <othercredit class="translator" lang="fr-FR"> - <firstname>Sebastien</firstname> - <surname>Cesbron</surname> - </othercredit> - <othercredit class="translator" lang="fr-FR"> - <firstname>Michael</firstname> - <surname>Courcy</surname> - </othercredit> - <othercredit class="translator" lang="fr-FR"> - <firstname>Vincent</firstname> - <surname>Giguère</surname> - </othercredit> - <othercredit class="translator" lang="fr-FR"> - <firstname>Baptiste</firstname> - <surname>Mathus</surname> - </othercredit> - <othercredit class="translator" lang="fr-FR"> - <firstname>Emmanuel</firstname> - <surname>Bernard</surname> - </othercredit> - <othercredit class="translator" lang="fr-FR"> - <firstname>Anthony</firstname> - <surname>Patricio</surname> - </othercredit> - - <!-- - ####################################################################### - # Portugese - ####################################################################### - --> - <othercredit class="translator" lang="pt-BR"> - <firstname>Alvaro</firstname> - <surname>Netto</surname> - <email&gt;alvaronetto(a)cetip.com.br&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Anderson</firstname> - <surname>Braulio</surname> - <email&gt;andersonbraulio(a)gmail.com&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Daniel Vieira</firstname> - <surname>Costa</surname> - <email&gt;danielvc(a)gmail.com&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Francisco</firstname> - <surname>gamarra</surname> - <email&gt;francisco.gamarra(a)gmail.com&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Gamarra</firstname> - <email&gt;mauricio.gamarra(a)gmail.com&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Luiz Carlos</firstname> - <surname>Rodrigues</surname> - <email&gt;luizcarlos_rodrigues(a)yahoo.com.br&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Marcel</firstname> - <surname>Castelo</surname> - <email&gt;marcel.castelo(a)gmail.com&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Paulo</firstname> - <surname>César</surname> - <email&gt;paulocol(a)gmail.com&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Pablo L.</firstname> - <surname>de Miranda</surname> - <email&gt;pablolmiranda(a)gmail.com&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Renato</firstname> - <surname>Deggau</surname> - <email&gt;rdeggau(a)gmail.com&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Rogério</firstname> - <surname>Araújo</surname> - <email&gt;rgildoaraujo(a)yahoo.com.br&lt;/email&gt; - </othercredit> - <othercredit class="translator" lang="pt-BR"> - <firstname>Wanderson</firstname> - <surname>Siqueira</surname> - <email&gt;wandersonxs(a)gmail.com&lt;/email&gt; - </othercredit> - - <!-- - ####################################################################### - # Chinese - ####################################################################### - --> - <othercredit class="translator" lang="zh-CN"> - <firstname>Cao</firstname> - <surname>Xiaogang</surname> - <affiliation> - <orgname>RedSaga</orgname> - </affiliation> - <contrib>Translation Lead</contrib> - <email&gt;caoxg(a)yahoo.com&lt;/email&gt; - </othercredit> - -</authorgroup>