9:20 p.m.
Author: steve.ebersole(a)jboss.com
Date: 2010-02-24 22:20:01 -0500 (Wed, 24 Feb 2010)
New Revision: 18876
Modified:
core/trunk/annotations/src/main/docbook/en/master.xml
core/trunk/annotations/src/main/docbook/fr/master.xml
core/trunk/annotations/src/main/docbook/zh_cn/master.xml
core/trunk/documentation/envers/src/main/docbook/en-US/Book_Info.xml
core/trunk/documentation/envers/src/main/docbook/en-US/Hibernate_Envers_-_Easy_Entity_Auditing.ent
core/trunk/documentation/manual/src/main/docbook/en-US/Book_Info.xml
core/trunk/documentation/manual/src/main/docbook/en-US/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.ent
core/trunk/entitymanager/src/main/docbook/en/master.xml
core/trunk/entitymanager/src/main/docbook/en/modules/metamodel.xml
core/trunk/entitymanager/src/main/docbook/en/modules/query_criteria.xml
Log:
HHH-4951 - Correct DTD entities for injecting version and date into docs
Modified: core/trunk/annotations/src/main/docbook/en/master.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/master.xml 2010-02-24 21:40:58 UTC (rev
18875)
+++ core/trunk/annotations/src/main/docbook/en/master.xml 2010-02-25 03:20:01 UTC (rev
18876)
@@ -2,10 +2,10 @@
<!--
~ Hibernate, Relational Persistence for Idiomatic Java
~
- ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ ~ Copyright (c) 2010, 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
@@ -23,17 +23,18 @@
~ 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.5.0.GA">
+ <!ENTITY version "WORKING">
+ <!ENTITY today "TODAY">
<!ENTITY copyrightYear "2004">
<!ENTITY copyrightHolder "Red Hat Inc. and the various authors">
]>
<book lang="en">
<bookinfo>
<title>Hibernate Annotations</title>
-
<subtitle>Reference Guide</subtitle>
- <releaseinfo>&versionNumber;</releaseinfo>
+ <releaseinfo>&version;</releaseinfo>
+ <pubdate>&today;</pubdate>
<mediaobject>
<imageobject>
Modified: core/trunk/annotations/src/main/docbook/fr/master.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/fr/master.xml 2010-02-24 21:40:58 UTC (rev
18875)
+++ core/trunk/annotations/src/main/docbook/fr/master.xml 2010-02-25 03:20:01 UTC (rev
18876)
@@ -6,6 +6,8 @@
<!ENTITY xml-overriding SYSTEM "modules/xml-overriding.xml">
<!ENTITY validator SYSTEM "modules/validator.xml">
<!ENTITY lucene SYSTEM "modules/lucene.xml">
+<!ENTITY version "WORKING">
+<!ENTITY today "TODAY">
]>
<book lang="fr">
<bookinfo>
@@ -13,7 +15,8 @@
<subtitle>Guide de r�f�rence</subtitle>
- <releaseinfo>3.2.0.GA</releaseinfo>
+ <releaseinfo>&version;</releaseinfo>
+ <pubdate>&today;</pubdate>
<mediaobject>
<imageobject>
Modified: core/trunk/annotations/src/main/docbook/zh_cn/master.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/zh_cn/master.xml 2010-02-24 21:40:58 UTC (rev
18875)
+++ core/trunk/annotations/src/main/docbook/zh_cn/master.xml 2010-02-25 03:20:01 UTC (rev
18876)
@@ -6,6 +6,8 @@
<!ENTITY xml-overriding SYSTEM "modules/xml-overriding.xml">
<!ENTITY validator SYSTEM "modules/validator.xml">
<!ENTITY lucene SYSTEM "modules/lucene.xml">
+<!ENTITY version "WORKING">
+<!ENTITY today "TODAY">
]>
<book lang="zh_cn">
<bookinfo>
@@ -13,7 +15,8 @@
<subtitle>参考文档</subtitle>
- <releaseinfo>3.2.0 CR1</releaseinfo>
+ <releaseinfo>&version;</releaseinfo>
+ <pubdate>&today;</pubdate>
<mediaobject>
<imageobject>
Modified: core/trunk/documentation/envers/src/main/docbook/en-US/Book_Info.xml
===================================================================
--- core/trunk/documentation/envers/src/main/docbook/en-US/Book_Info.xml 2010-02-24
21:40:58 UTC (rev 18875)
+++ core/trunk/documentation/envers/src/main/docbook/en-US/Book_Info.xml 2010-02-25
03:20:01 UTC (rev 18876)
@@ -1,4 +1,4 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM
"Hibernate_Envers_-_Easy_Entity_Auditing.ent">
%BOOK_ENTITIES;
]>
@@ -7,11 +7,12 @@
<bookinfo id="Hibernate_Envers_-_Easy_Entity_Auditing.xml">
<title>Hibernate Envers - Easy Entity Auditing</title>
<subtitle>Hibernate Envers Reference Documentation</subtitle>
- <releaseinfo>&versionNumber;</releaseinfo>
- <edition>1.0</edition>
- <pubsnumber>1</pubsnumber>
+ <releaseinfo>&version;</releaseinfo>
+ <pubdate>&today;</pubdate>
+ <edition>1.0</edition>
+ <pubsnumber>1</pubsnumber>
<productname>JBoss Hibernate Envers</productname>
- <productnumber>&versionNumber;</productnumber>
+ <productnumber>&version;</productnumber>
<issuenum>1</issuenum>
<copyright>
<year>©rightYear;</year>
Modified:
core/trunk/documentation/envers/src/main/docbook/en-US/Hibernate_Envers_-_Easy_Entity_Auditing.ent
===================================================================
---
core/trunk/documentation/envers/src/main/docbook/en-US/Hibernate_Envers_-_Easy_Entity_Auditing.ent 2010-02-24
21:40:58 UTC (rev 18875)
+++
core/trunk/documentation/envers/src/main/docbook/en-US/Hibernate_Envers_-_Easy_Entity_Auditing.ent 2010-02-25
03:20:01 UTC (rev 18876)
@@ -1,5 +1,5 @@
-<!ENTITY versionNumber "3.3.0.GA">
+<!ENTITY version "WORKING">
<!ENTITY today "TODAY">
<!ENTITY copyrightYear "2004">
-<!ENTITY copyrightHolder "Red Hat Middleware, LLC.">
+<!ENTITY copyrightHolder "Red Hat Inc.">
<!ENTITY semi ";">
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/Book_Info.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/Book_Info.xml 2010-02-24
21:40:58 UTC (rev 18875)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/Book_Info.xml 2010-02-25
03:20:01 UTC (rev 18876)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM
"HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.ent">
%BOOK_ENTITIES;
]>
@@ -7,11 +7,11 @@
<bookinfo id="HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java">
<title>HIBERNATE - Relational Persistence for Idiomatic Java</title>
<subtitle>Hibernate Reference Documentation</subtitle>
- <releaseinfo>&versionNumber;</releaseinfo>
+ <releaseinfo>&version;</releaseinfo>
<edition>1.0</edition>
<pubsnumber>1</pubsnumber>
<productname>JBoss Hibernate Core</productname>
- <productnumber>&versionNumber;</productnumber>
+ <productnumber>&version;</productnumber>
<pubdate>&today;</pubdate>
<issuenum>1</issuenum>
<mediaobject>
Modified:
core/trunk/documentation/manual/src/main/docbook/en-US/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.ent
===================================================================
---
core/trunk/documentation/manual/src/main/docbook/en-US/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.ent 2010-02-24
21:40:58 UTC (rev 18875)
+++
core/trunk/documentation/manual/src/main/docbook/en-US/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.ent 2010-02-25
03:20:01 UTC (rev 18876)
@@ -1,4 +1,4 @@
-<!ENTITY versionNumber "WORKING">
+<!ENTITY version "WORKING">
<!ENTITY today "TODAY">
<!ENTITY copyrightYear "2004">
<!ENTITY copyrightHolder "Red Hat, Inc.">
Modified: core/trunk/entitymanager/src/main/docbook/en/master.xml
===================================================================
--- core/trunk/entitymanager/src/main/docbook/en/master.xml 2010-02-24 21:40:58 UTC (rev
18875)
+++ core/trunk/entitymanager/src/main/docbook/en/master.xml 2010-02-25 03:20:01 UTC (rev
18876)
@@ -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 "WORKING">
+<!ENTITY version "WORKING">
+<!ENTITY today "TODAY">
]>
<book>
@@ -31,11 +32,11 @@
<bookinfo>
<title>Hibernate EntityManager</title>
<subtitle>User guide</subtitle>
- <releaseinfo>&versionNumber;</releaseinfo>
+ <releaseinfo>&version;</releaseinfo>
<edition>1.0</edition>
<pubsnumber>1</pubsnumber>
<pubdate>&today;</pubdate>
- <productnumber>&versionNumber;</productnumber>
+ <productnumber>&version;</productnumber>
<issuenum>1</issuenum>
<mediaobject>
<imageobject>
Modified: core/trunk/entitymanager/src/main/docbook/en/modules/metamodel.xml
===================================================================
--- core/trunk/entitymanager/src/main/docbook/en/modules/metamodel.xml 2010-02-24 21:40:58
UTC (rev 18875)
+++ core/trunk/entitymanager/src/main/docbook/en/modules/metamodel.xml 2010-02-25 03:20:01
UTC (rev 18876)
@@ -23,10 +23,7 @@
~ Boston, MA 02110-1301 USA
-->
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY jpa2Ref '<xref linkend="JPA2"/>'>
-<!ENTITY jpa2Cite '<citation>&jpa2Ref;</citation>'>
-<!ENTITY criteriaRef '<xref linkend="querycriteria"/>'>
-<!ENTITY apt '<ulink
url="http://java.sun.com/javase/6/docs/technotes/tools/solaris/javac...
processor</ulink>'>
+<!ENTITY aptUrl
'http://java.sun.com/javase/6/docs/technotes/tools/solaris/javac.html#processing'>
]>
<chapter id="metamodel">
@@ -35,8 +32,9 @@
<note>
<para>
The Metamodel itself is described in <citetitle
pubwork="chapter">Chapter 5 Metamodel API</citetitle>
- of the &jpa2Cite;. <citetitle pubwork="chapter">Chapter
6 Criteria API</citetitle> of the &jpa2Cite;
- describes and shows uses of the metamodel in criteria queries, as does
&criteriaRef;.
+ of the <citation><xref
linkend="JPA2"/></citation>. <citetitle
pubwork="chapter">Chapter 6 Criteria API</citetitle>
+ of the <citation><xref
linkend="JPA2"/></citation> describes and shows uses of the metamodel
in criteria
+ queries, as does <xref linkend="querycriteria"/>.
</para>
</note>
@@ -68,11 +66,12 @@
<para>
Second, from an application writer's perspective, it allows very fluent
expression of completely type-safe
- criteria queries, especially the <emphasis>Static
Metamodel</emphasis> approach. The &jpa2Cite; defines a
- number of ways the metamodel can be accessed and used, including the
<emphasis>Static Metamodel</emphasis>
- approach, which we will look at later. The <emphasis>Static
Metamodel</emphasis> approach is wonderful
- when the code has <ulink
url="http://en.wikipedia.org/wiki/A_priori_and_a_posteriori">a priori
knowledge</ulink>
- of the domain model. &criteriaRef; uses this approach exclusively in its
examples.
+ criteria queries, especially the <emphasis>Static
Metamodel</emphasis> approach. The
+ <citation><xref linkend="JPA2"/></citation> defines a
number of ways the metamodel can be accessed and used,
+ including the <emphasis>Static Metamodel</emphasis> approach, which
we will look at later.
+ The <emphasis>Static Metamodel</emphasis> approach is wonderful when
the code has
+ <ulink
url="http://en.wikipedia.org/wiki/A_priori_and_a_posteriori">a priori
knowledge</ulink> of the domain
+ model. <xref linkend="querycriteria"/> uses this approach
exclusively in its examples.
</para>
<section id="metamodel-static">
@@ -80,12 +79,13 @@
<para>
A <emphasis>static metamodel</emphasis> is a series of classes
that "mirror" the entities and embeddables
in the domain model and provide static access to the metadata about the
mirrored class's attributes. We
- will exclusively discuss what the &jpa2Cite; terms a
<emphasis>Canonical Metamodel</emphasis>:
+ will exclusively discuss what the <citation><xref
linkend="JPA2"/></citation> terms a
+ <emphasis>Canonical Metamodel</emphasis>:
</para>
<blockquote>
<attribution>
- <citation>&jpa2Ref;, section 6.2.1.1, pp
198-199</citation>
+ <citation><xref linkend="JPA2"/>, section 6.2.1.1,
pp 198-199</citation>
</attribution>
<para>
<itemizedlist>
@@ -222,9 +222,10 @@
<note>
<para>
These canonical metamodel classes can be generated manually if you wish
though it is expected
- that most developers will prefer use of an &apt;. Although
annotation processors themselves are
- beyond the scope of this document, the Hibernate team does develop an
annotation processor tool for
- generating a canonical metamodel. See <citetitle>Hibernate
Metamodel Generator</citetitle>.
+ that most developers will prefer use of an <ulink
url="&aptUrl;">annotation processor</ulink>.
+ Annotation processors themselves are beyond the scope of this document.
However, the Hibernate team
+ does develop an annotation processor tool for generating a canonical
metamodel.
+ See <citetitle>Hibernate Metamodel Generator</citetitle>.
</para>
</note>
@@ -232,7 +233,7 @@
When the Hibernate
<interfacename>EntityManagerFactory</interfacename> is being built, it will
look for a canonical metamodel class for each of the managed typed is knows
about and if it finds
any it will inject the appropriate metamodel information into them, as
outlined in
- <citation>&jpa2Ref;, section 6.2.2, pg 200</citation>
+ <citation><xref linkend="JPA2"/>, section 6.2.2, pg
200</citation>
</para>
</section>
Modified: core/trunk/entitymanager/src/main/docbook/en/modules/query_criteria.xml
===================================================================
--- core/trunk/entitymanager/src/main/docbook/en/modules/query_criteria.xml 2010-02-24
21:40:58 UTC (rev 18875)
+++ core/trunk/entitymanager/src/main/docbook/en/modules/query_criteria.xml 2010-02-25
03:20:01 UTC (rev 18876)
@@ -22,11 +22,7 @@
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
-->
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY jpa2Ref '<xref linkend="JPA2"/>'>
-<!ENTITY jpa2Cite '<citation>&jpa2Ref;</citation>'>
-<!ENTITY staticMetamodelRef '<xref
linkend="metamodel-static"/>'>
-]>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" []>
<chapter id="querycriteria">
<title>Criteria Queries</title>
@@ -70,10 +66,10 @@
<note>
<para>
- <citetitle pubwork="chapter">Chapter 6 Criteria
API</citetitle> of the &jpa2Cite; already contains a
- decent amount of reference material pertaining to the various parts of a
criteria query. So rather
- than duplicate all that content here, lets instead look at some of the more
widely anticipated usages
- of the API.
+ <citetitle pubwork="chapter">Chapter 6 Criteria
API</citetitle> of the <citation><xref
linkend="JPA2"/></citation>
+ already contains a decent amount of reference material pertaining to the
various parts of a criteria query.
+ So rather than duplicate all that content here, lets instead look at some of
the more widely anticipated
+ usages of the API.
</para>
</note>
@@ -129,7 +125,7 @@
<para>
<emphasis>Person_.eyeColor</emphasis> is an
example of the static form of metamodel
reference. We will use that form exclusively in this
chapter.
- See &staticMetamodelRef; for details.
+ See <xref linkend="metamodel-static"/> for
details.
</para>
</callout>
</calloutlist>
@@ -491,7 +487,7 @@
<title>FROM clause</title>
<blockquote>
<attribution>
- <citation>&jpa2Ref;, section 6.5.2 Query Roots, pg
262</citation>
+ <citation><xref linkend="JPA2"/>, section 6.5.2
Query Roots, pg 262</citation>
</attribution>
<para>
A CriteriaQuery object defines a query over one or more entity,
embeddable, or basic abstract