Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

HHH-7153 - Update to newest jDocBook tool chain versions

  • Loading branch information...
commit 0e88fdd90991570262528182dc7eb29453c17d25 1 parent 05c3679
@sebersole sebersole authored
View
12 documentation/documentation.gradle
@@ -5,9 +5,7 @@ buildscript {
mavenRepo name: 'jboss-nexus', url: "https://repository.jboss.org/nexus/content/groups/public/"
}
dependencies {
- classpath 'org.jboss.jdocbook:gradle-jdocbook:1.1.3'
- classpath "org.jboss.pressgang:pressgang-xslt:2.0.1"
- classpath "org.jboss.pressgang:pressgang-fonts:2.0.1"
+ classpath "org.jboss.jdocbook:gradle-jdocbook:1.2.0"
}
}
@@ -15,10 +13,10 @@ apply plugin: "java"
apply plugin: "jdocbook"
dependencies {
- jdocbookStyles( "org.jboss.pressgang:pressgang-jdocbook-style:2.0.1" ) {
- exclude group: 'org.eclipse.wst.css'
- exclude group: 'org.eclipse.wst.sse'
- }
+ pressgangVersion = '3.0.0-SNAPSHOT'
+ jdocbookXsl "org.jboss.pressgang:pressgang-xslt-ns:${pressgangVersion}"
+ jdocbookXsl "org.jboss.pressgang:pressgang-fonts:${pressgangVersion}"
+ jdocbookStyles "org.jboss.pressgang:pressgang-jdocbook-style:${pressgangVersion}"
}
defaultTasks 'buildDocs'
View
3  documentation/src/main/docbook/devguide/en-US/Batch_Processing.xml
@@ -1,7 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
<chapter xmlns="http://docbook.org/ns/docbook"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xml:id="batch">
<title>Batch Processing</title>
<para>
View
9 documentation/src/main/docbook/devguide/en-US/Hibernate_Development_Guide.xml
@@ -24,7 +24,14 @@
<holder>&copyrightHolder;</holder>
</copyright>
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <authorgroup xmlns:xl="http://www.w3.org/1999/xlink">
+ <author>
+ <orgname><link xl:href="http://hibernate.org">The Hibernate Team</link></orgname>
+ </author>
+ <othercredit>
+ <orgname><link xl:href="http://design.jboss.org/">The JBoss Visual Design Team</link></orgname>
+ </othercredit>
+ </authorgroup>
</info>
View
13 documentation/src/main/docbook/manual/en-US/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.xml
@@ -7,8 +7,8 @@
<book>
<info>
<title>HIBERNATE - Relational Persistence for Idiomatic Java</title>
- <subtitle>Hibernate Reference Documentation</subtitle>
- <releaseinfo>&version;</releaseinfo>
+ <subtitle>Hibernate Reference Documentation</subtitle>
+ <releaseinfo>&version;</releaseinfo>
<edition>1.0</edition>
<productname>JBoss Hibernate Core</productname>
<productnumber>&version;</productnumber>
@@ -27,7 +27,14 @@
<holder>&copyrightHolder;</holder>
</copyright>
<xi:include href="legal_notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="author_group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <authorgroup xmlns:xl="http://www.w3.org/1999/xlink">
+ <author>
+ <orgname><link xl:href="http://hibernate.org">The Hibernate Team</link></orgname>
+ </author>
+ <othercredit>
+ <orgname><link xl:href="http://design.jboss.org/">The JBoss Visual Design Team</link></orgname>
+ </othercredit>
+ </authorgroup>
</info>
<xi:include href="content/preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
View
9 documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.xml
@@ -25,7 +25,14 @@
<year>&copyrightYear;</year>
<holder>&copyrightHolder;</holder>
</copyright>
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <authorgroup xmlns:xl="http://www.w3.org/1999/xlink">
+ <author>
+ <orgname><link xl:href="http://hibernate.org">The Hibernate Team</link></orgname>
+ </author>
+ <othercredit>
+ <orgname><link xl:href="http://design.jboss.org/">The JBoss Visual Design Team</link></orgname>
+ </othercredit>
+ </authorgroup>
</info>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/preface.xml" />
View
21 documentation/src/main/style/css/css/hibernate.css
@@ -69,9 +69,28 @@ h2,h3,h4,h5,h6{
div.note {
background-color:#849092;
color:white;
+ background-image: url(../images/org/hibernate/docbook/note.png);
}
-div.note h2 {color:white;}
+div.note h2 {
+ color:white;
+}
+
+div.tip {
+ background-image:url(../images/org/hibernate/docbook/tip.png);
+}
+
+div.important {
+ background-image:url(../images/org/hibernate/docbook/important.png);
+}
+
+div.caution {
+ background-image:url(../images/org/hibernate/docbook/caution.png);
+}
+
+div.warning {
+ background-image:url(../images/org/hibernate/docbook/warning.png);
+}
div.note a:visited, div.tip a:visited, div.important a:visited, div.caution a:visited, div.warning a:visited, div.note a:link, div.tip a:link, div.important a:link, div.caution a:link, div.warning a:link {
color: #f7f2d0;
View
17 ...style/xslt/org/hibernate/jdocbook/xslt/common.xsl → .../xslt/org/hibernate/jdocbook/xslt/common-base.xsl
@@ -3,10 +3,10 @@
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ Copyright (c) 2008-2012, Red Hat Inc. 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.
+ ~ distributed under license by Red Hat Inc.
~
~ 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
@@ -22,23 +22,12 @@
~ Free Software Foundation, Inc.
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
- ~
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <!-- copied largely from the work done by Mark Newton for the Seam documentation -->
-
- <xsl:param name="use.simplified.author.group" select="1"/>
-
- <xsl:param name="callout.graphics.path">
- <xsl:if test="$img.src.path != ''">
- <xsl:value-of select="$img.src.path"/>
- </xsl:if>
- <xsl:text>images/org/hibernate/docbook/callouts/</xsl:text>
- </xsl:param>
-
<xsl:param name="admon.graphics.path">
+ <!-- AFAICT, this only works with the PDF xslt because the html ones use css to style admon graphics -->
<xsl:if test="$img.src.path != ''">
<xsl:value-of select="$img.src.path"/>
</xsl:if>
View
27 ...xslt/org/hibernate/jdocbook/xslt/xhtml-common.xsl → ...xslt/org/hibernate/jdocbook/xslt/common-xhtml.xsl
@@ -2,10 +2,10 @@
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ Copyright (c) 2008-2012, Red Hat Inc. 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.
+ ~ distributed under license by Red Hat Inc.
~
~ 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
@@ -21,35 +21,34 @@
~ Free Software Foundation, Inc.
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
- ~
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:d="http://docbook.org/ns/docbook">
+
+ <xsl:import href="common-base.xsl"/>
<xsl:param name="siteHref" select="'http://www.hibernate.org'"/>
<xsl:param name="docHref" select="'http://hibernate.org/Documentation/DocumentationOverview'"/>
<xsl:param name="siteLinkText" select="'Hibernate.org'"/>
-<!--
- <xsl:param name="use.id.as.filename">1</xsl:param>
--->
+
<xsl:param name="legalnotice.filename">legalnotice.html</xsl:param>
- <xsl:template match="legalnotice" mode="chunk-filename">
+ <xsl:template match="d:legalnotice" mode="chunk-filename">
<xsl:value-of select="$legalnotice.filename"/>
</xsl:template>
<xsl:template name="user.footer.content">
- <HR/>
+ <hr/>
<a>
<xsl:attribute name="href">
- <xsl:apply-templates select="//legalnotice[1]" mode="chunk-filename"/>
+ <xsl:value-of select="$legalnotice.filename"/>
</xsl:attribute>
<xsl:choose>
- <xsl:when test="//book/bookinfo/copyright[1]">
- <xsl:apply-templates select="//book/bookinfo/copyright[1]" mode="titlepage.mode"/>
+ <xsl:when test="//d:book/d:bookinfo/d:copyright[1]">
+ <xsl:apply-templates select="//d:book/d:bookinfo/d:copyright[1]" mode="titlepage.mode"/>
</xsl:when>
- <xsl:when test="//legalnotice[1]">
- <xsl:apply-templates select="//legalnotice[1]" mode="titlepage.mode"/>
+ <xsl:when test="//d:legalnotice[1]">
+ <xsl:apply-templates select="//d:legalnotice[1]" mode="titlepage.mode"/>
</xsl:when>
</xsl:choose>
</a>
View
43 documentation/src/main/style/xslt/org/hibernate/jdocbook/xslt/eclipse.xsl
@@ -1,43 +0,0 @@
-<?xml version='1.0'?>
-
-<!--
- ~ 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
- ~
- -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
- <!-- copied largely from the work done by Mark Newton for the Seam documentation -->
-
- <xsl:import href="classpath:/xslt/org/jboss/eclipse.xsl"/>
- <xsl:import href="common.xsl"/>
- <xsl:import href="xhtml-common.xsl"/>
-
- <xsl:param name="html.stylesheet" select="'css/hibernate-eclipse.css'"/>
-
- <xsl:param name="eclipse.plugin.name">Hibernate Help</xsl:param>
- <xsl:param name="eclipse.plugin.id">org.hibernate.help</xsl:param>
- <xsl:param name="eclipse.plugin.provider">Hibernate.org</xsl:param>
-
-</xsl:stylesheet>
-
View
5 documentation/src/main/style/xslt/org/hibernate/jdocbook/xslt/fop1.xsl
@@ -3,10 +3,10 @@
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ Copyright (c) 2008-2012, Red Hat Inc. 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.
+ ~ distributed under license by Red Hat Inc.
~
~ 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
@@ -22,7 +22,6 @@
~ Free Software Foundation, Inc.
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
- ~
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
View
11 documentation/src/main/style/xslt/org/hibernate/jdocbook/xslt/pdf.xsl
@@ -3,10 +3,10 @@
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ Copyright (c) 2008-2012, Red Hat Inc. 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.
+ ~ distributed under license by Red Hat Inc.
~
~ 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
@@ -22,7 +22,6 @@
~ Free Software Foundation, Inc.
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
- ~
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -31,10 +30,8 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
exclude-result-prefixes="#default">
- <!-- copied largely from the work done by Mark Newton for the Seam documentation -->
-
- <xsl:import href="classpath:/xslt/org/jboss/pdf.xsl"/>
- <xsl:import href="common.xsl"/>
+ <xsl:import href="classpath:/xslt/org/jboss/pressgang/pdf.xsl"/>
+ <xsl:import href="common-base.xsl"/>
<xsl:import href="fop1.xsl" />
<xsl:import href="classpath:/xslt/org/jboss/xslt/fonts/pdf/fonts.xsl" />
View
12 documentation/src/main/style/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl
@@ -3,10 +3,10 @@
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ Copyright (c) 2008-2012, Red Hat Inc. 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.
+ ~ distributed under license by Red Hat Inc.
~
~ 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
@@ -22,16 +22,12 @@
~ Free Software Foundation, Inc.
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
- ~
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <!-- copied largely from the work done by Mark Newton for the Seam documentation -->
-
- <xsl:import href="classpath:/xslt/org/jboss/xhtml-single.xsl"/>
- <xsl:import href="common.xsl"/>
- <xsl:import href="xhtml-common.xsl"/>
+ <xsl:import href="classpath:/xslt/org/jboss/pressgang/xhtml-single.xsl"/>
+ <xsl:import href="common-xhtml.xsl"/>
<xsl:param name="html.stylesheet" select="'css/hibernate-single.css'"/>
View
12 documentation/src/main/style/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl
@@ -3,10 +3,10 @@
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ Copyright (c) 2008-2012, Red Hat Inc. 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.
+ ~ distributed under license by Red Hat Inc.
~
~ 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
@@ -22,16 +22,12 @@
~ Free Software Foundation, Inc.
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
- ~
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <!-- copied largely from the work done by Mark Newton for the Seam documentation -->
-
- <xsl:import href="classpath:/xslt/org/jboss/xhtml.xsl"/>
- <xsl:import href="common.xsl"/>
- <xsl:import href="xhtml-common.xsl"/>
+ <xsl:import href="classpath:/xslt/org/jboss/pressgang/xhtml.xsl"/>
+ <xsl:import href="common-xhtml.xsl"/>
<xsl:param name="html.stylesheet" select="'css/hibernate.css'"/>
Please sign in to comment.
Something went wrong with that request. Please try again.