September 2007 - hibernate-commits

Hibernate SVN: r14007 - core/branches/Branch_3_2/src/org/hibernate/criterion.

by hibernate-commits＠lists.jboss.org

Author: d.plentz Date: 2007-09-08 17:24:35 -0400 (Sat, 08 Sep 2007) New Revision: 14007 Modified: core/branches/Branch_3_2/src/org/hibernate/criterion/DetachedCriteria.java Log: [HHH-925] DetachedCriteria.createCriteria not working with alias Modified: core/branches/Branch_3_2/src/org/hibernate/criterion/DetachedCriteria.java =================================================================== --- core/branches/Branch_3_2/src/org/hibernate/criterion/DetachedCriteria.java 2007-09-08 21:24:22 UTC (rev 14006) +++ core/branches/Branch_3_2/src/org/hibernate/criterion/DetachedCriteria.java 2007-09-08 21:24:35 UTC (rev 14007) @@ -87,7 +87,7 @@ public DetachedCriteria createCriteria(String associationPath, String alias) throws HibernateException { - return new DetachedCriteria( impl, criteria.createCriteria(associationPath) ); + return new DetachedCriteria( impl, criteria.createCriteria(associationPath, alias) ); } public DetachedCriteria createCriteria(String associationPath)

17 years, 4 months

1
0
0 / 0

Hibernate SVN: r14006 - core/trunk/core/src/main/java/org/hibernate/criterion.

by hibernate-commits＠lists.jboss.org

Author: d.plentz Date: 2007-09-08 17:24:22 -0400 (Sat, 08 Sep 2007) New Revision: 14006 Modified: core/trunk/core/src/main/java/org/hibernate/criterion/DetachedCriteria.java Log: [HHH-925] DetachedCriteria.createCriteria not working with alias Modified: core/trunk/core/src/main/java/org/hibernate/criterion/DetachedCriteria.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/criterion/DetachedCriteria.java 2007-09-07 18:51:29 UTC (rev 14005) +++ core/trunk/core/src/main/java/org/hibernate/criterion/DetachedCriteria.java 2007-09-08 21:24:22 UTC (rev 14006) @@ -87,7 +87,7 @@ public DetachedCriteria createCriteria(String associationPath, String alias) throws HibernateException { - return new DetachedCriteria( impl, criteria.createCriteria(associationPath) ); + return new DetachedCriteria( impl, criteria.createCriteria(associationPath, alias) ); } public DetachedCriteria createCriteria(String associationPath)

17 years, 4 months

1
0
0 / 0

Hibernate SVN: r14005 - in documentation-style/trunk/src/main/xslt/hibernate: pdf and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-09-07 14:51:29 -0400 (Fri, 07 Sep 2007) New Revision: 14005 Modified: documentation-style/trunk/src/main/xslt/hibernate/html/coverpages.xsl documentation-style/trunk/src/main/xslt/hibernate/pdf/borders.xsl Log: minor cleanup Modified: documentation-style/trunk/src/main/xslt/hibernate/html/coverpages.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/html/coverpages.xsl 2007-09-07 18:49:45 UTC (rev 14004) +++ documentation-style/trunk/src/main/xslt/hibernate/html/coverpages.xsl 2007-09-07 18:51:29 UTC (rev 14005) @@ -22,7 +22,7 @@  <xsl:import href="basic.xsl"/> @@ -99,54 +99,6 @@ </xsl:template> - - <xsl:template match="authorgroup" mode="titlepage.mode"> <div> <xsl:apply-templates select="." mode="class.attribute"/> Modified: documentation-style/trunk/src/main/xslt/hibernate/pdf/borders.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/pdf/borders.xsl 2007-09-07 18:49:45 UTC (rev 14004) +++ documentation-style/trunk/src/main/xslt/hibernate/pdf/borders.xsl 2007-09-07 18:51:29 UTC (rev 14005) @@ -211,70 +211,6 @@ </xsl:otherwise> </xsl:choose> </fo:block> - </xsl:template> <xsl:template name="foot.sep.rule">

17 years, 4 months

1
0
0 / 0

Hibernate SVN: r14004 - documentation-style/trunk.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-09-07 14:49:45 -0400 (Fri, 07 Sep 2007) New Revision: 14004 Modified: documentation-style/trunk/ Log: svn:ignore Property changes on: documentation-style/trunk ___________________________________________________________________ Name: svn:ignore + target local *.ipr *.iws *.iml .classpath .project .nbattrs *.log *.properties .clover

17 years, 4 months

1
0
0 / 0

Hibernate SVN: r14003 - in documentation-style/trunk/src/main: css/css and 5 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-09-07 14:47:49 -0400 (Fri, 07 Sep 2007) New Revision: 14003 Added: documentation-style/trunk/src/main/css/css/ documentation-style/trunk/src/main/css/css/html.css documentation-style/trunk/src/main/xslt/hibernate/ documentation-style/trunk/src/main/xslt/hibernate/common/ documentation-style/trunk/src/main/xslt/hibernate/common/basic.xsl documentation-style/trunk/src/main/xslt/hibernate/html/ documentation-style/trunk/src/main/xslt/hibernate/html/basic.xsl documentation-style/trunk/src/main/xslt/hibernate/html/coverpages.xsl documentation-style/trunk/src/main/xslt/hibernate/html/main-chunk.xsl documentation-style/trunk/src/main/xslt/hibernate/html/main-single.xsl documentation-style/trunk/src/main/xslt/hibernate/pdf/ documentation-style/trunk/src/main/xslt/hibernate/pdf/borders.xsl documentation-style/trunk/src/main/xslt/hibernate/pdf/coverpages.xsl documentation-style/trunk/src/main/xslt/hibernate/pdf/main-pdf.xsl Removed: documentation-style/trunk/src/main/css/shared/ documentation-style/trunk/src/main/xslt/standard/ Log: redesigned LnF etc Copied: documentation-style/trunk/src/main/css/css/html.css (from rev 13987, documentation-style/trunk/src/main/css/shared/html.css) =================================================================== --- documentation-style/trunk/src/main/css/css/html.css (rev 0) +++ documentation-style/trunk/src/main/css/css/html.css 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,97 @@ +A { + color: #003399; +} + +A:active { + color: #003399; +} + +A:visited { + color: #888888; +} + +P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE { + color: #000000; +} + +TD, TH, SPAN { + color: #000000; +} + +BLOCKQUOTE { + margin-right: 0px; +} + + +H1, H2, H3, H4, H5, H6 { + color: #000000; + font-weight:500; + margin-top:10px; + padding-top:15px; +} + +TABLE { + border-collapse: collapse; + border-spacing:0; + border: 1px thin black; + empty-cells: hide; +} + +TD { + padding: 4pt; +} + +H1 { font-size: 150%; } +H2 { font-size: 140%; } +H3 { font-size: 110%; font-weight: bold; } +H4 { font-size: 110%; font-weight: bold;} +H5 { font-size: 100%; font-style: italic; } +H6 { font-size: 100%; font-style: italic; } + +TT { +font-size: 90%; + font-family: "Courier New", Courier, monospace; + color: #000000; +} + +PRE { +font-size: 100%; + padding: 5px; + border-style: solid; + border-width: 1px; + border-color: #CCCCCC; + background-color: #F4F4F4; +} + +UL, OL, LI { + list-style: disc; +} + +HR { + width: 100%; + height: 1px; + background-color: #CCCCCC; + border-width: 0px; + padding: 0px; + color: #CCCCCC; +} + +.variablelist { + padding-top: 10; + padding-bottom:10; + margin:0; +} + +.itemizedlist, UL { + padding-top: 0; + padding-bottom:0; + margin:0; +} + +.term { + font-weight:bold; +} + + + + Added: documentation-style/trunk/src/main/xslt/hibernate/common/basic.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/common/basic.xsl (rev 0) +++ documentation-style/trunk/src/main/xslt/hibernate/common/basic.xsl 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,126 @@ +<?xml version="1.0"?> + + +<xsl:stylesheet version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + exclude-result-prefixes="#default"> + +  + <xsl:param name="l10n.gentext.default.language" select="'en'"/> + + + <xsl:variable name="logo.color.gray">#59666c</xsl:variable> + <xsl:variable name="logo.color.brown">#aea477</xsl:variable> + + +  +  +  + <xsl:param name="use.extensions">1</xsl:param> + <xsl:param name="tablecolumns.extension">0</xsl:param> + + +  +  +  + <xsl:param name="generate.toc"> + book toc + </xsl:param> + <xsl:param name="toc.section.depth">3</xsl:param> + <xsl:param name="autotoc.label.separator" select="'. '"/> + + +  +  +  +  + <xsl:param name="chapter.autolabel">1</xsl:param> + <xsl:param name="section.autolabel">1</xsl:param> + <xsl:param name="section.label.includes.component.label">1</xsl:param> + + +  +  +  + <xsl:param name="title.margin.left">0pc</xsl:param> + <xsl:param name="formal.title.placement"> + figure after + example before + equation before + table before + procedure before + </xsl:param> + + +  +  +  +  + <xsl:attribute-set name="verbatim.properties"> + <xsl:attribute name="space-before.minimum">1em</xsl:attribute> + <xsl:attribute name="space-before.optimum">1em</xsl:attribute> + <xsl:attribute name="space-before.maximum">1em</xsl:attribute> + <xsl:attribute name="space-after.minimum">0.1em</xsl:attribute> + <xsl:attribute name="space-after.optimum">0.1em</xsl:attribute> + <xsl:attribute name="space-after.maximum">0.1em</xsl:attribute> + <xsl:attribute name="border-color">#444444</xsl:attribute> + <xsl:attribute name="border-style">solid</xsl:attribute> + <xsl:attribute name="border-width">0.1pt</xsl:attribute> + <xsl:attribute name="padding-top">0.5em</xsl:attribute> + <xsl:attribute name="padding-left">0.5em</xsl:attribute> + <xsl:attribute name="padding-right">0.5em</xsl:attribute> + <xsl:attribute name="padding-bottom">0.5em</xsl:attribute> + <xsl:attribute name="margin-left">0.5em</xsl:attribute> + <xsl:attribute name="margin-right">0.5em</xsl:attribute> + </xsl:attribute-set> + + +  + <xsl:param name="shade.verbatim">1</xsl:param> + <xsl:attribute-set name="shade.verbatim.style"> + <xsl:attribute name="wrap-option">wrap</xsl:attribute> + <xsl:attribute name="background-color">#f0f0f0</xsl:attribute> + </xsl:attribute-set> + + +  +  +  + <xsl:param name="callout.extensions">1</xsl:param> + <xsl:param name="callout.defaultcolumn">90</xsl:param> + <xsl:param name="callout.graphics">0</xsl:param> + <xsl:param name="callout.unicode.number.limit" select="'0'"/> + <xsl:template name="callout-bug"> + <xsl:param name="conum" select='1'/> + <fo:inline + color="black" + padding-top="0.1em" + padding-bottom="0.1em" + padding-start="0.2em" + padding-end="0.2em" + baseline-shift="0.1em" + font-weight="bold" + font-size="75%"> + <xsl:text>(</xsl:text> + <xsl:value-of select="$conum"/> + <xsl:text>)</xsl:text> + </fo:inline> + </xsl:template> + +</xsl:stylesheet> \ No newline at end of file Added: documentation-style/trunk/src/main/xslt/hibernate/html/basic.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/html/basic.xsl (rev 0) +++ documentation-style/trunk/src/main/xslt/hibernate/html/basic.xsl 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,38 @@ +<?xml version="1.0"?> + + +<xsl:stylesheet version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:exsl="http://exslt.org/common" + exclude-result-prefixes="exsl"> + + <xsl:import href="../common/basic.xsl"/> + + +  +  +  + <xsl:param name="html.stylesheet">css/html.css</xsl:param> + + <xsl:output method="html" indent="yes"/> + +  + <xsl:param name="use.id.as.filename">1</xsl:param> + <xsl:param name="chunker.output.indent">yes</xsl:param> + +</xsl:stylesheet> \ No newline at end of file Added: documentation-style/trunk/src/main/xslt/hibernate/html/coverpages.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/html/coverpages.xsl (rev 0) +++ documentation-style/trunk/src/main/xslt/hibernate/html/coverpages.xsl 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,219 @@ + + +<xsl:stylesheet version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:exsl="http://exslt.org/common" + exclude-result-prefixes="exsl"> + +  + + <xsl:import href="basic.xsl"/> + +  +  +  + <xsl:template name="book.titlepage.recto"> + <xsl:choose> + <xsl:when test="bookinfo/graphic"> + <xsl:apply-templates select="bookinfo/graphic"/> + </xsl:when> + <xsl:when test="info/graphic"> + <xsl:apply-templates select="info/graphic"/> + </xsl:when> + <xsl:when test="bookinfo/mediaobject"> + <xsl:apply-templates select="bookinfo/mediaobject"/> + </xsl:when> + <xsl:when test="info/mediaobject"> + <xsl:apply-templates select="info/mediaobject"/> + </xsl:when> + </xsl:choose> + + <xsl:choose> + <xsl:when test="bookinfo/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> + </xsl:when> + <xsl:when test="info/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> + </xsl:when> + <xsl:when test="title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> + </xsl:when> + </xsl:choose> + + <xsl:choose> + <xsl:when test="bookinfo/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> + </xsl:when> + <xsl:when test="info/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> + </xsl:when> + <xsl:when test="subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="releaseinfo"/> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/> + + <xsl:choose> + <xsl:when test="bookinfo/abstract"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> + </xsl:when> + <xsl:when test="info/abstract"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/publisher"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/publisher"/> + + </xsl:template> + + + + <xsl:template match="authorgroup" mode="titlepage.mode"> + <div> + <xsl:apply-templates select="." mode="class.attribute"/> + <table border="0" summary="Credits"> + <tr> + <th align="left" valign="top" colspan="3"> + <b> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Authors'"/> + </xsl:call-template> + </b> + </th> + </tr> + <xsl:apply-templates select="author" mode="tablerow.titlepage.mode"/> + <xsl:apply-templates select="editor" mode="tablerow.titlepage.mode"/> + <xsl:apply-templates select="othercredit" mode="tablerow.titlepage.mode"/> + </table> + </div> + </xsl:template> + + <xsl:template match="author" mode="tablerow.titlepage.mode"> + <xsl:call-template name="titlecredit"> + <xsl:with-param name="contrib"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Author'"/> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> + </xsl:template> + + <xsl:param name="editedby.enabled">0</xsl:param> + + <xsl:template match="editor" mode="tablerow.titlepage.mode"> + <xsl:call-template name="titlecredit"> + <xsl:with-param name="contrib"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Editor'"/> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> + </xsl:template> + + <xsl:template match="othercredit" mode="tablerow.titlepage.mode"> + <xsl:call-template name="titlecredit"> + <xsl:with-param name="contrib"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'translator'"/> + </xsl:call-template> + </xsl:with-param> + </xsl:call-template> + </xsl:template> + + <xsl:template name="titlecredit"> + <xsl:param name="contrib"/> + <tr> + <td> + <xsl:value-of select="$contrib"/> + </td> + <td> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </td> + <td> + <xsl:apply-templates select="email"/> + </td> + </tr> + </xsl:template> + +</xsl:stylesheet> \ No newline at end of file Added: documentation-style/trunk/src/main/xslt/hibernate/html/main-chunk.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/html/main-chunk.xsl (rev 0) +++ documentation-style/trunk/src/main/xslt/hibernate/html/main-chunk.xsl 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> + + +<xsl:stylesheet version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:exsl="http://exslt.org/common" + exclude-result-prefixes="exsl"> + + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" /> + <xsl:import href="basic.xsl" /> + <xsl:import href="coverpages.xsl"/> + +</xsl:stylesheet> \ No newline at end of file Added: documentation-style/trunk/src/main/xslt/hibernate/html/main-single.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/html/main-single.xsl (rev 0) +++ documentation-style/trunk/src/main/xslt/hibernate/html/main-single.xsl 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,27 @@ +<?xml version="1.0"?> + + +<xsl:stylesheet version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:exsl="http://exslt.org/common" + exclude-result-prefixes="exsl"> + + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" /> + <xsl:import href="basic.xsl" /> + +</xsl:stylesheet> \ No newline at end of file Added: documentation-style/trunk/src/main/xslt/hibernate/pdf/borders.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/pdf/borders.xsl (rev 0) +++ documentation-style/trunk/src/main/xslt/hibernate/pdf/borders.xsl 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,294 @@ +<?xml version="1.0"?> + + +<xsl:stylesheet version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + exclude-result-prefixes="#default"> + + <xsl:include href="../common/basic.xsl"/> + + <xsl:variable name="border.text.limit">37</xsl:variable> + + <xsl:param name="double.sided">1</xsl:param> + <xsl:param name="header.rule">1</xsl:param> + <xsl:param name="headers.on.blank.pages">1</xsl:param> + <xsl:param name="footers.on.blank.pages">1</xsl:param> + <xsl:param name="header.column.widths" select="'1 0 1'"/> + <xsl:param name="footer.column.widths" select="'1 0 1'"/> + + <xsl:template name="component.title.nomarkup"> + <xsl:param name="node" select="."/> + + <xsl:variable name="id"> + <xsl:call-template name="object.id"> + <xsl:with-param name="object" select="$node"/> + </xsl:call-template> + </xsl:variable> + + <xsl:variable name="title"> + <xsl:apply-templates select="$node" mode="object.title.markup"> + <xsl:with-param name="allow-anchors" select="1"/> + </xsl:apply-templates> + </xsl:variable> + <xsl:copy-of select="$title"/> + </xsl:template> + + +  +  +  + <xsl:template name="header.content"> + <xsl:param name="pageclass" select="''"/> + <xsl:param name="sequence" select="''"/> + <xsl:param name="position" select="''"/> + <xsl:param name="gentext-key" select="''"/> +  +  + + <fo:block> + <xsl:choose> + <xsl:when test="($sequence = 'first' or $pageclass != 'body')"> +  + </xsl:when> + <xsl:when test="($sequence='even' and $position='left')"> + <xsl:variable name="text"> + <xsl:call-template name="component.title.nomarkup"/> + </xsl:variable> + <fo:inline keep-together.within-line="always" font-weight="bold"> + <xsl:choose> + <xsl:when test="string-length($text) > ($border.text.limit + 3)"> + <xsl:value-of select="concat(substring($text, 0, $border.text.limit), '...')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$text"/> + </xsl:otherwise> + </xsl:choose> + </fo:inline> + </xsl:when> + <xsl:when test="($sequence='odd' and $position='right')"> + <fo:inline keep-together.within-line="always"> +  + <fo:retrieve-marker retrieve-class-name="section.head.marker" + retrieve-position="first-including-carryover" + retrieve-boundary="page-sequence"/> + </fo:inline> + </xsl:when> + <xsl:when test="$position='left'"> + <xsl:call-template name="draft.text"/> + </xsl:when> + <xsl:when test="$position='center'"> + </xsl:when> + <xsl:when test="$position='right'"> + <xsl:call-template name="draft.text"/> + </xsl:when> + <xsl:when test="$sequence = 'first'"> + </xsl:when> + <xsl:when test="$sequence = 'blank'"> + </xsl:when> + </xsl:choose> + </fo:block> + </xsl:template> + + <xsl:template name="head.sep.rule"> + <xsl:param name="pageclass"/> + <xsl:param name="sequence"/> + <xsl:param name="gentext-key"/> + <xsl:if test="$header.rule != 0"> + <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute> + <xsl:attribute name="border-bottom-style">solid</xsl:attribute> + <xsl:attribute name="border-bottom-color"> + <xsl:value-of select="$logo.color.brown"/> + </xsl:attribute> + </xsl:if> + </xsl:template> + + +  +  +  + <xsl:template name="footer.content"> + <xsl:param name="pageclass" select="''"/> + <xsl:param name="sequence" select="''"/> + <xsl:param name="position" select="''"/> + <xsl:param name="gentext-key" select="''"/> + +  +  +  + + <xsl:variable name="version"> + <xsl:choose> + <xsl:when test="//releaseinfo"> + <xsl:text>Hibernate </xsl:text> + <xsl:value-of select="//releaseinfo"/> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <fo:block> + <xsl:choose> + <xsl:when test="$pageclass = 'titlepage'"> + </xsl:when> + <xsl:when test="$double.sided = 0"> + <xsl:choose> + <xsl:when test="$position = 'left'"> + <xsl:value-of select="$version"/> + </xsl:when> + <xsl:when test="$position = 'right'"> + <fo:page-number/> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:when test="$double.sided != 0"> + <xsl:choose> + <xsl:when test="($sequence = 'odd' or $sequence = 'first') and $position='right'"> + <fo:page-number/> + </xsl:when> + <xsl:when test="($sequence = 'odd' or $sequence = 'first') and $position='left'"> + <xsl:value-of select="$version"/> + </xsl:when> + <xsl:when test="$sequence = 'even' and $position='left'"> + <fo:page-number/> + </xsl:when> + <xsl:when test="$sequence = 'even' and $position='right'"> + <xsl:value-of select="$version"/> + </xsl:when> + <xsl:when test="$sequence='blank' and $position='left'"> + <fo:page-number/> + </xsl:when> + <xsl:when test="$sequence='blank' and $position='right'"> + <xsl:value-of select="$version"/> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + </xsl:otherwise> + </xsl:choose> + </fo:block> + + </xsl:template> + + <xsl:template name="foot.sep.rule"> + <xsl:param name="pageclass"/> + <xsl:param name="sequence"/> + <xsl:param name="gentext-key"/> + + <xsl:if test="$footer.rule != 0"> + <xsl:attribute name="border-top-width">0.5pt</xsl:attribute> + <xsl:attribute name="border-top-style">solid</xsl:attribute> + <xsl:attribute name="border-top-color"> + <xsl:value-of select="$logo.color.brown"/> + </xsl:attribute> + </xsl:if> + </xsl:template> + +</xsl:stylesheet> \ No newline at end of file Added: documentation-style/trunk/src/main/xslt/hibernate/pdf/coverpages.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/pdf/coverpages.xsl (rev 0) +++ documentation-style/trunk/src/main/xslt/hibernate/pdf/coverpages.xsl 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,278 @@ + + +<xsl:stylesheet version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + exclude-result-prefixes="#default"> + + <xsl:include href="../common/basic.xsl"/> + + +  +  +  + <xsl:template name="book.titlepage.recto"> + <xsl:choose> + <xsl:when test="bookinfo/graphic"> + <xsl:apply-templates select="bookinfo/graphic"/> + </xsl:when> + <xsl:when test="info/graphic"> + <xsl:apply-templates select="info/graphic"/> + </xsl:when> + <xsl:when test="bookinfo/mediaobject"> + <xsl:apply-templates select="bookinfo/mediaobject"/> + </xsl:when> + <xsl:when test="info/mediaobject"> + <xsl:apply-templates select="info/mediaobject"/> + </xsl:when> + </xsl:choose> + + <xsl:choose> + <xsl:when test="bookinfo/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/> + </xsl:when> + <xsl:when test="info/title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/> + </xsl:when> + <xsl:when test="title"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/> + </xsl:when> + </xsl:choose> + + <xsl:choose> + <xsl:when test="bookinfo/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/> + </xsl:when> + <xsl:when test="info/subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/> + </xsl:when> + <xsl:when test="subtitle"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="releaseinfo"/> + + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/> + </xsl:template> + + <xsl:template match="title" mode="book.titlepage.recto.auto.mode"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" + xsl:use-attribute-sets="book.titlepage.recto.style" + text-align="center" + font-size="24pt" + space-before="18.6624pt" + font-weight="bold" + font-family="{$title.fontset}"> + <xsl:call-template name="division.title"> + <xsl:with-param name="node" select="ancestor-or-self::book[1]"/> + </xsl:call-template> + </fo:block> + </xsl:template> + + <xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" + xsl:use-attribute-sets="book.titlepage.recto.style" + text-align="center" + font-size="16pt" + space-before="30pt" + font-weight="bold" + font-style="italic" + font-family="{$title.fontset}"> + <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> + </fo:block> + </xsl:template> + + <xsl:template match="releaseinfo" mode="book.titlepage.recto.auto.mode"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" + xsl:use-attribute-sets="book.titlepage.recto.style" + text-align="center" + font-size="16pt" + space-before="15.552pt" + font-family="{$title.fontset}"> + <xsl:apply-templates select="." mode="book.titlepage.recto.mode"/> + </fo:block> + </xsl:template> + + <xsl:template match="author" mode="book.titlepage.recto.auto.mode"> + <fo:block xsl:use-attribute-sets="book.titlepage.recto.style" font-size="14pt" space-before="15.552pt"> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> + </xsl:template> + + +  +  +  + <xsl:template name="book.titlepage.verso"> + + <xsl:choose> + <xsl:when test="bookinfo/title"> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/> + </xsl:when> + <xsl:when test="info/title"> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/title"/> + </xsl:when> + <xsl:when test="title"> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/> + </xsl:when> + </xsl:choose> + + <xsl:choose> + <xsl:when test="bookinfo/abstract"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/> + </xsl:when> + <xsl:when test="info/abstract"> + <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/> + </xsl:when> + </xsl:choose> + + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/authorgroup"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/author"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/othercredit"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/copyright"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/legalnotice"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/publisher"/> + <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/publisher"/> + </xsl:template> + + <xsl:template name="book.verso.title"> + <fo:block> + <xsl:apply-templates mode="titlepage.mode"/> + </fo:block> + </xsl:template> + + <xsl:template name="verso.authorgroup"> + <fo:table table-layout="fixed" width="100%"> + <fo:table-column column-number="1" column-width="proportional-column-width(1)"/> + <fo:table-column column-number="2" column-width="proportional-column-width(1)"/> + <fo:table-column column-number="3" column-width="proportional-column-width(1)"/> + <fo:table-body> + <xsl:apply-templates select="author" mode="tablerow.titlepage.mode"/> + <xsl:apply-templates select="editor" mode="tablerow.titlepage.mode"/> + <xsl:apply-templates select="othercredit" mode="tablerow.titlepage.mode"/> + </fo:table-body> + </fo:table> + </xsl:template> + + <xsl:template name="book.titlepage.separator"> + </xsl:template> + + <xsl:template name="book.titlepage.before.recto"> + </xsl:template> + + <xsl:template name="book.titlepage.before.verso"> + <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/> + </xsl:template> + + <xsl:template match="author" mode="tablerow.titlepage.mode"> + <fo:table-row> + <fo:table-cell> + <fo:block> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Author'"/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:apply-templates select="email"/> + </fo:block> + </fo:table-cell> + </fo:table-row> + </xsl:template> + + <xsl:template match="author" mode="titlepage.mode"> + <fo:block> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> + </xsl:template> + + <xsl:param name="editedby.enabled">0</xsl:param> + + <xsl:template match="editor" mode="tablerow.titlepage.mode"> + <fo:table-row> + <fo:table-cell> + <fo:block> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'Editor'"/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:apply-templates select="email"/> + </fo:block> + </fo:table-cell> + </fo:table-row> + </xsl:template> + + <xsl:template match="othercredit" mode="tablerow.titlepage.mode"> + <fo:table-row> + <fo:table-cell> + <fo:block> + <xsl:call-template name="gentext"> + <xsl:with-param name="key" select="'translator'"/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:call-template name="person.name"> + <xsl:with-param name="node" select="."/> + </xsl:call-template> + </fo:block> + </fo:table-cell> + <fo:table-cell> + <fo:block> + <xsl:apply-templates select="email"/> + </fo:block> + </fo:table-cell> + </fo:table-row> + </xsl:template> + + +</xsl:stylesheet> \ No newline at end of file Added: documentation-style/trunk/src/main/xslt/hibernate/pdf/main-pdf.xsl =================================================================== --- documentation-style/trunk/src/main/xslt/hibernate/pdf/main-pdf.xsl (rev 0) +++ documentation-style/trunk/src/main/xslt/hibernate/pdf/main-pdf.xsl 2007-09-07 18:47:49 UTC (rev 14003) @@ -0,0 +1,398 @@ +<?xml version="1.0"?> + + +<xsl:stylesheet version='1.0' + xmlns="http://www.w3.org/TR/xhtml1/transitional" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + exclude-result-prefixes="#default"> + + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" /> + <xsl:import href="../common/basic.xsl" /> + <xsl:import href="coverpages.xsl" /> + <xsl:import href="borders.xsl" /> + + +  +  +  + <xsl:param name="hyphenate">false</xsl:param> + <xsl:param name="hyphenation-character">-</xsl:param> + + +  +  +  + <xsl:param name="alignment">left</xsl:param> + <xsl:param name="line-height">1.4</xsl:param> + + <xsl:param name="paper.type" select="'A4'"/> + + <xsl:param name="page.margin.top">15mm</xsl:param> + <xsl:param name="region.before.extent">10mm</xsl:param> + <xsl:param name="body.margin.top">15mm</xsl:param> + + <xsl:param name="body.margin.bottom">15mm</xsl:param> + <xsl:param name="region.after.extent">10mm</xsl:param> + <xsl:param name="page.margin.bottom">15mm</xsl:param> + + <xsl:param name="page.margin.outer">30mm</xsl:param> + <xsl:param name="page.margin.inner">30mm</xsl:param> + + +  +  +  + <xsl:template name="toc.line"> + <xsl:variable name="id"> + <xsl:call-template name="object.id"/> + </xsl:variable> + + <xsl:variable name="label"> + <xsl:apply-templates select="." mode="label.markup"/> + </xsl:variable> + + <fo:block text-align-last="justify" end-indent="{$toc.indent.width}pt" last-line-end-indent="-{$toc.indent.width}pt"> + <fo:inline keep-with-next.within-line="always"> + <fo:basic-link internal-destination="{$id}"> +  + <xsl:choose> + <xsl:when test="local-name(.) = 'chapter'"> + <xsl:attribute name="font-weight">bold</xsl:attribute> + </xsl:when> + </xsl:choose> + + <xsl:if test="$label != ''"> + <xsl:copy-of select="$label"/> + <xsl:value-of select="$autotoc.label.separator"/> + </xsl:if> + <xsl:apply-templates select="." mode="titleabbrev.markup"/> + </fo:basic-link> + </fo:inline> + <fo:inline keep-together.within-line="always"> + <xsl:text> </xsl:text> + <fo:leader leader-pattern="dots" + leader-pattern-width="3pt" + leader-alignment="reference-area" + keep-with-next.within-line="always"/> + <xsl:text> </xsl:text> + <fo:basic-link internal-destination="{$id}"> + <fo:page-number-citation ref-id="{$id}"/> + </fo:basic-link> + </fo:inline> + </fo:block> + </xsl:template> + + +  +  +  + <xsl:param name="title.color">#59666c</xsl:param> + + <xsl:attribute-set name="book.titlepage.recto.style"> + <xsl:attribute name="font-family"> + <xsl:value-of select="$title.fontset"/> + </xsl:attribute> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="font-size">12pt</xsl:attribute> + <xsl:attribute name="text-align">center</xsl:attribute> + </xsl:attribute-set> + + <xsl:attribute-set name="chapter.titlepage.recto.style"> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="background-color">white</xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:choose> + <xsl:when test="$l10n.gentext.language = 'ja-JP'"> + <xsl:value-of select="$body.font.master * 1.7"/> + <xsl:text>pt</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>24pt</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="text-align">left</xsl:attribute> + <xsl:attribute name="padding-left">1em</xsl:attribute> + <xsl:attribute name="padding-right">1em</xsl:attribute> + </xsl:attribute-set> + + <xsl:attribute-set name="preface.titlepage.recto.style"> + <xsl:attribute name="font-family"> + <xsl:value-of select="$title.fontset"/> + </xsl:attribute> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="font-size">12pt</xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + </xsl:attribute-set> + + <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode"> + <fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style"> + <xsl:call-template name="component.title"> + <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/> + </xsl:call-template> + </fo:block> + </xsl:template> + + <xsl:attribute-set name="section.title.properties"> + <xsl:attribute name="font-family"> + <xsl:value-of select="$title.font.family"/> + </xsl:attribute> + <xsl:attribute name="font-weight">bold</xsl:attribute> + <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> + <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute> + <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute> + <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute> + <xsl:attribute name="text-align">left</xsl:attribute> + <xsl:attribute name="start-indent"> + <xsl:value-of select="$title.margin.left"/> + </xsl:attribute> + </xsl:attribute-set> + + <xsl:attribute-set name="section.title.level1.properties"> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.6"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> + </xsl:attribute-set> + <xsl:attribute-set name="section.title.level2.properties"> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.4"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> + </xsl:attribute-set> + <xsl:attribute-set name="section.title.level3.properties"> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.3"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> + </xsl:attribute-set> + <xsl:attribute-set name="section.title.level4.properties"> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.2"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> + </xsl:attribute-set> + <xsl:attribute-set name="section.title.level5.properties"> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master * 1.1"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> + </xsl:attribute-set> + <xsl:attribute-set name="section.title.level6.properties"> + <xsl:attribute name="color"> + <xsl:value-of select="$title.color"/> + </xsl:attribute> + <xsl:attribute name="font-size"> + <xsl:value-of select="$body.font.master"/> + <xsl:text>pt</xsl:text> + </xsl:attribute> + </xsl:attribute-set> + + +  +  +  + +  + <xsl:param name="variablelist.as.blocks">1</xsl:param> + + +  +  +  + <xsl:param name="body.font.master">11</xsl:param> + + <xsl:attribute-set name="monospace.properties"> + <xsl:attribute name="font-family"> + <xsl:value-of select="$monospace.font.family"/> + </xsl:attribute> + <xsl:attribute name="font-size">0.8em</xsl:attribute> + </xsl:attribute-set> + + <xsl:template name="pickfont-sans"> + <xsl:variable name="font"> + <xsl:choose> + <xsl:when test="$l10n.gentext.language = 'ja-JP'"> + <xsl:text>KochiMincho,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ko-KR'"> + <xsl:text>BaekmukBatang,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-CN'"> + <xsl:text>ARPLKaitiMGB,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'bn-IN'"> + <xsl:text>LohitBengali,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ta-IN'"> + <xsl:text>LohitTamil,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'pa-IN'"> + <xsl:text>LohitPunjabi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'hi-IN'"> + <xsl:text>LohitHindi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'gu-IN'"> + <xsl:text>LohitGujarati,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-TW'"> + <xsl:text>ARPLMingti2LBig5,</xsl:text> + </xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:choose> + <xsl:when test="$fop1.extensions != 0"> + <xsl:copy-of select="$font"/> + <xsl:text>LiberationSans,sans-serif</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$font"/> + <xsl:text>sans-serif</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="pickfont-serif"> + <xsl:variable name="font"> + <xsl:choose> + <xsl:when test="$l10n.gentext.language = 'ja-JP'"> + <xsl:text>KochiMincho,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ko-KR'"> + <xsl:text>BaekmukBatang,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-CN'"> + <xsl:text>ARPLKaitiMGB,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'bn-IN'"> + <xsl:text>LohitBengali,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ta-IN'"> + <xsl:text>LohitTamil,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'pa-IN'"> + <xsl:text>LohitPunjabi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'hi-IN'"> + <xsl:text>LohitHindi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'gu-IN'"> + <xsl:text>LohitGujarati,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-TW'"> + <xsl:text>ARPLMingti2LBig5,</xsl:text> + </xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:choose> + <xsl:when test="$fop1.extensions != 0"> + <xsl:copy-of select="$font"/> + <xsl:text>LiberationSerif,serif</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$font"/> + <xsl:text>serif</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="pickfont-mono"> + <xsl:variable name="font"> + <xsl:choose> + <xsl:when test="$l10n.gentext.language = 'ja-JP'"> + <xsl:text>KochiMincho,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ko-KR'"> + <xsl:text>BaekmukBatang,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-CN'"> + <xsl:text>ARPLKaitiMGB,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'bn-IN'"> + <xsl:text>LohitBengali,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'ta-IN'"> + <xsl:text>LohitTamil,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'pa-IN'"> + <xsl:text>LohitPunjabi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'hi-IN'"> + <xsl:text>LohitHindi,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'gu-IN'"> + <xsl:text>LohitGujarati,</xsl:text> + </xsl:when> + <xsl:when test="$l10n.gentext.language = 'zh-TW'"> + <xsl:text>ARPLMingti2LBig5,</xsl:text> + </xsl:when> + </xsl:choose> + </xsl:variable> + <xsl:choose> + <xsl:when test="$fop1.extensions != 0"> + <xsl:copy-of select="$font"/> + <xsl:text>LiberationMono,monospace</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$font"/> + <xsl:text>monospace</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:param name="title.font.family"> + <xsl:call-template name="pickfont-sans"/> + </xsl:param> + + <xsl:param name="body.font.family"> + <xsl:call-template name="pickfont-sans"/> + </xsl:param> + + <xsl:param name="monospace.font.family"> + <xsl:call-template name="pickfont-mono"/> + </xsl:param> + + <xsl:param name="sans.font.family"> + <xsl:call-template name="pickfont-sans"/> + </xsl:param> + +</xsl:stylesheet>

17 years, 4 months

1
0
0 / 0

Hibernate SVN: r14002 - search/trunk/src/java/org/hibernate/search/engine.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-09-07 12:44:25 -0400 (Fri, 07 Sep 2007) New Revision: 14002 Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java Log: HSEARCH-113 remove old annotations leftover Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java =================================================================== --- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2007-09-06 18:44:30 UTC (rev 14001) +++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2007-09-07 16:44:25 UTC (rev 14002) @@ -487,30 +487,6 @@ if ( instance == null ) return; //needed for field access: I cannot work in the proxied version Object unproxiedInstance = unproxy( instance ); - for (int i = 0; i < propertiesMetadata.keywordNames.size(); i++) { - XMember member = propertiesMetadata.keywordGetters.get( i ); - Object value = getMemberValue( unproxiedInstance, member ); - propertiesMetadata.keywordBridges.get( i ).set( - propertiesMetadata.keywordNames.get( i ), value, doc, Field.Store.YES, - Field.Index.UN_TOKENIZED, getBoost( member ) - ); - } - for (int i = 0; i < propertiesMetadata.textNames.size(); i++) { - XMember member = propertiesMetadata.textGetters.get( i ); - Object value = getMemberValue( unproxiedInstance, member ); - propertiesMetadata.textBridges.get( i ).set( - propertiesMetadata.textNames.get( i ), value, doc, Field.Store.YES, - Field.Index.TOKENIZED, getBoost( member ) - ); - } - for (int i = 0; i < propertiesMetadata.unstoredNames.size(); i++) { - XMember member = propertiesMetadata.unstoredGetters.get( i ); - Object value = getMemberValue( unproxiedInstance, member ); - propertiesMetadata.unstoredBridges.get( i ).set( - propertiesMetadata.unstoredNames.get( i ), value, doc, Field.Store.NO, - Field.Index.TOKENIZED, getBoost( member ) - ); - } for (int i = 0; i < propertiesMetadata.fieldNames.size(); i++) { XMember member = propertiesMetadata.fieldGetters.get( i ); Object value = getMemberValue( unproxiedInstance, member ); @@ -692,15 +668,6 @@ private static class PropertiesMetadata { public Float boost; public Analyzer analyzer; - public final List<XMember> keywordGetters = new ArrayList<XMember>(); - public final List<String> keywordNames = new ArrayList<String>(); - public final List<FieldBridge> keywordBridges = new ArrayList<FieldBridge>(); - public final List<XMember> unstoredGetters = new ArrayList<XMember>(); - public final List<String> unstoredNames = new ArrayList<String>(); - public final List<FieldBridge> unstoredBridges = new ArrayList<FieldBridge>(); - public final List<XMember> textGetters = new ArrayList<XMember>(); - public final List<String> textNames = new ArrayList<String>(); - public final List<FieldBridge> textBridges = new ArrayList<FieldBridge>(); public final List<String> fieldNames = new ArrayList<String>(); public final List<XMember> fieldGetters = new ArrayList<XMember>(); public final List<FieldBridge> fieldBridges = new ArrayList<FieldBridge>();

17 years, 4 months

1
0
0 / 0

Hibernate SVN: r14001 - search/trunk/src/java/org/hibernate/search/jpa/impl.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-09-06 14:44:30 -0400 (Thu, 06 Sep 2007) New Revision: 14001 Modified: search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java Log: HSEARCH-116 workaround a JBoss AS bug Modified: search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java =================================================================== --- search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java 2007-09-04 22:34:13 UTC (rev 14000) +++ search/trunk/src/java/org/hibernate/search/jpa/impl/FullTextEntityManagerImpl.java 2007-09-06 18:44:30 UTC (rev 14001) @@ -25,49 +25,56 @@ public FullTextEntityManagerImpl(EntityManager em) { this.em = em; - Object delegate = em.getDelegate(); - if ( delegate == null ) { - throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager (no delegate)"); - } - else if ( Session.class.isAssignableFrom( delegate.getClass() ) ) { - ftSession = Search.createFullTextSession( (Session) delegate ); - } - else if ( EntityManager.class.isAssignableFrom( delegate.getClass() ) ) { - //Some app servers wrap the EM twice - delegate = ( (EntityManager) delegate).getDelegate(); + } + + private FullTextSession getFullTextSession() { + if ( ftSession == null ) { + Object delegate = em.getDelegate(); if ( delegate == null ) { throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager (no delegate)"); } else if ( Session.class.isAssignableFrom( delegate.getClass() ) ) { ftSession = Search.createFullTextSession( (Session) delegate ); } + else if ( EntityManager.class.isAssignableFrom( delegate.getClass() ) ) { + //Some app servers wrap the EM twice + delegate = ( (EntityManager) delegate).getDelegate(); + if ( delegate == null ) { + throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager (no delegate)"); + } + else if ( Session.class.isAssignableFrom( delegate.getClass() ) ) { + ftSession = Search.createFullTextSession( (Session) delegate ); + } + else { + throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager: " + delegate.getClass() ); + } + } else { throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager: " + delegate.getClass() ); } } - else { - throw new SearchException("Trying to use Hibernate Search without an Hibernate EntityManager: " + delegate.getClass() ); - } + return ftSession; } public FullTextQuery createFullTextQuery(org.apache.lucene.search.Query luceneQuery, Class... entities) { + FullTextSession ftSession = getFullTextSession(); return new FullTextQueryImpl( ftSession.createFullTextQuery( luceneQuery, entities ), ftSession ); } public void index(Object entity) { - ftSession.index( entity ); + getFullTextSession().index( entity ); } public SearchFactory getSearchFactory() { - return ftSession.getSearchFactory(); + return getFullTextSession().getSearchFactory(); } public void purge(Class entityType, Serializable id) { - ftSession.purge( entityType, id ); + getFullTextSession().purge( entityType, id ); } public void purgeAll(Class entityType) { - ftSession.purgeAll( entityType ); + getFullTextSession().purgeAll( entityType ); }

17 years, 4 months

1
0
0 / 0

Hibernate SVN: r14000 - in shards/trunk/src: test/org/hibernate/shards/integration/model and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: max.ross Date: 2007-09-04 18:34:13 -0400 (Tue, 04 Sep 2007) New Revision: 14000 Modified: shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java shards/trunk/src/test/org/hibernate/shards/integration/model/ModelCriteriaPermutedIntegrationTest.java shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java Log: HSHARDS-46 ShardedSessionImpl.isOpen() now behaves the same way SessionImpl.isOpen() does Modified: shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java =================================================================== --- shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-09-04 11:52:01 UTC (rev 13999) +++ shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-09-04 22:34:13 UTC (rev 14000) @@ -456,13 +456,7 @@ } public boolean isOpen() { - // one open session means the sharded session is open - for (Shard shard : shards) { - if (shard.getSession() != null && shard.getSession().isOpen()) { - return true; - } - } - return false; + return !closed; } public boolean isConnected() { Modified: shards/trunk/src/test/org/hibernate/shards/integration/model/ModelCriteriaPermutedIntegrationTest.java =================================================================== --- shards/trunk/src/test/org/hibernate/shards/integration/model/ModelCriteriaPermutedIntegrationTest.java 2007-09-04 11:52:01 UTC (rev 13999) +++ shards/trunk/src/test/org/hibernate/shards/integration/model/ModelCriteriaPermutedIntegrationTest.java 2007-09-04 22:34:13 UTC (rev 14000) @@ -229,10 +229,10 @@ Criteria officeCrit = floorCrit.createCriteria("offices"); officeCrit.add(Restrictions.eq("label", "LAHGE")); // now how we execute the query via the floorcrit - List<Integer> l = list(officeCrit); - assertEquals(1, l.size()); + List<Integer> list = list(officeCrit); + assertEquals(1, list.size()); int total = 0; - for(int shardTotal : l) { + for(int shardTotal : list) { total += shardTotal; } assertEquals(2, total); Modified: shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java =================================================================== --- shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java 2007-09-04 11:52:01 UTC (rev 13999) +++ shards/trunk/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java 2007-09-04 22:34:13 UTC (rev 14000) @@ -667,4 +667,20 @@ } } + public void testIsOpen() { + ShardedSessionFactoryImplementor ssf = new ShardedSessionFactoryDefaultMock() { + @Override + public Map<SessionFactoryImplementor, Set<ShardId>> getSessionFactoryShardIdMap() { + return Collections.emptyMap(); + } + }; + + ShardStrategy shardStrategy = new ShardStrategyDefaultMock(); + Set<Class<?>> classesRequiringShardLocks = Sets.newHashSet(); + ShardedSessionImpl ssi = + new ShardedSessionImpl(ssf, shardStrategy, classesRequiringShardLocks, true); + assertTrue(ssi.isOpen()); + ssi.close(); + assertFalse(ssi.isOpen()); + } }

17 years, 5 months

1
0
0 / 0

Hibernate SVN: r13999 - search/tags.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-09-04 07:52:01 -0400 (Tue, 04 Sep 2007) New Revision: 13999 Added: search/tags/v3_0_0_CR1/ Log: Release Search 3.0.0.CR1 Copied: search/tags/v3_0_0_CR1 (from rev 13998, search/trunk)

17 years, 5 months

1
0
0 / 0

Hibernate SVN: r13998 - search/trunk.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2007-09-04 07:44:58 -0400 (Tue, 04 Sep 2007) New Revision: 13998 Modified: search/trunk/build.xml Log: Release Modified: search/trunk/build.xml =================================================================== --- search/trunk/build.xml 2007-09-04 11:38:16 UTC (rev 13997) +++ search/trunk/build.xml 2007-09-04 11:44:58 UTC (rev 13998) @@ -327,6 +327,11 @@ <include name="**/*.*"/> </fileset> </copy> + <copy todir="${dist.dir}/ivy" failonerror="false"> + <fileset dir="${ivy.jar.dir}"> + <include name="**/*.*"/> + </fileset> + </copy>  <copy todir="${dist.lib.dir}" failonerror="false">

17 years, 5 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits September 2007