Skip to content

Commit 9a097e1

Browse files
sebersolebeikov
authored andcommitted
HHH-16962 - General documentation improvements
https://hibernate.atlassian.net/browse/HHH-16962 (cherry picked from commit e753da1)
1 parent 82e66d0 commit 9a097e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+369
-202
lines changed
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
= Hibernate ORM {majorMinorVersion} Integration Guide
2-
Steve Ebersole, Vlad Mihalcea
1+
= Hibernate ORM Integration Guide
32
:toc:
43
:toclevels: 3
54

6-
include::Preface.adoc[]
5+
include::preface.adoc[]
76

87
:numbered:
98

109
include::chapters/services/Services.adoc[]
1110

11+
include::credits.adoc[]
12+

documentation/src/main/asciidoc/integrationguide/Preface.adoc

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[[credits]]
2+
== Credits
3+
4+
The full list of contributors to Hibernate ORM can be found on the
5+
https://github.com/hibernate/hibernate-orm/graphs/contributors[GitHub repository].
6+
7+
The following contributors were involved in this documentation:
8+
9+
* Steve Ebersole
10+
* Vlad Mihalcea
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[[preface]]
2+
== Preface
3+
4+
Hibernate provides many integration points that allow integration new capabilities or supplying custom behavior for standard capabilities. This guide covers these integration points and is intended for software developers and architects who will be
5+
6+
- integrating Hibernate with Java EE application servers, Spring framework, caching solutions (e.g. Infinispan, Ehcache, Hazelcast).
7+
- supplying custom integrations
8+
- want to override standard capabilities

documentation/src/main/asciidoc/introduction/Advanced.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ This is completely by design and is not in any way a bug.
119119
More than one filter may be enabled in a given session.
120120

121121
:envers: https://hibernate.org/orm/envers/
122-
:envers-doc: {userGuideBase}#envers
122+
:envers-doc: {doc-user-guide-url}#envers
123123

124124
We've mentioned that a filter can be used to implement versioning, and to provide _historical_ views of the data.
125125
Being such a general-purpose construct, filters provide a lot of flexibility here.
@@ -592,7 +592,7 @@ Point event =
592592
.getSingleResult();
593593
----
594594

595-
:matrix: {userGuideBase}#spatial-configuration-dialect-features
595+
:matrix: {doc-user-guide-url}#spatial-configuration-dialect-features
596596

597597
Here, `within()` is one of the functions for testing spatial relations defined by the OpenGIS specification.
598598
Other such functions include `touches()`, `intersects()`, `distance()`, `boundary()`, etc.
@@ -806,7 +806,7 @@ Check constraints and foreign key constraints can help ensure that a row never c
806806
[[bytecode-enhancer]]
807807
=== Using the bytecode enhancer
808808

809-
:enhancer: {userGuideBase}#BytecodeEnhancement
809+
:enhancer: {doc-user-guide-url}#BytecodeEnhancement
810810

811811
Hibernate's {enhancer}[bytecode enhancer] enables the following features:
812812

documentation/src/main/asciidoc/introduction/Configuration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Where `{version}` is the latest version of the JDBC driver for your databse.
7777
=== Optional dependencies
7878

7979
:slf4j: http://www.slf4j.org/
80-
:enhancer: {userGuideBase}#tooling-gradle
80+
:enhancer: {doc-user-guide-url}#tooling-gradle
8181
:agroal: https://agroal.github.io
8282
:jackson: https://github.com/FasterXML/jackson
8383
:yasson: https://projects.eclipse.org/projects/ee4j.yasson
@@ -231,7 +231,7 @@ SessionFactory sessionFactory =
231231
The `Configuration` class has survived almost unchanged since the very earliest (pre-1.0) versions of Hibernate, and so it doesn't look particularly modern.
232232
On the other hand, it's very easy to use, and exposes some options that `persistence.xml` doesn't support.
233233

234-
:native-bootstrap: {userGuideBase}#bootstrap-native
234+
:native-bootstrap: {doc-user-guide-url}#bootstrap-native
235235
:boot: {versionDocBase}/javadocs/org/hibernate/boot/package-summary.html
236236

237237
.Advanced configuration options

documentation/src/main/asciidoc/introduction/Entities.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ We won't have much more to say about XML-based mappings in this Introduction, si
7575

7676
."Dynamic" models
7777
****
78-
:maps: {userGuideBase}#dynamic-model
78+
:maps: {doc-user-guide-url}#dynamic-model
7979
:envers: https://hibernate.org/orm/envers/
8080
We love representing entities as classes because the classes give us a _type-safe_ model of our data.
8181
But Hibernate also has the ability to represent entities as detyped instances of `java.util.Map`.
Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
1-
:pdf-theme: ../pdf/theme.yml
2-
:source-highlighter: rouge
3-
:icons: font
4-
:doctype: book
5-
:pdf-fontsdir: ../pdf/fonts
6-
:docsBase: https://docs.jboss.org/hibernate/orm
7-
:versionDocBase: {docsBase}/6.2
8-
:userGuideBase: {versionDocBase}/userguide/html_single/Hibernate_User_Guide.html
1+
:shared-attributes-dir: ../shared/
92

10-
= An introduction to Hibernate 6
11-
Gavin King and the Hibernate team
3+
include::{shared-attributes-dir}/common-attributes.adoc[]
4+
include::{shared-attributes-dir}/url-attributes.adoc[]
5+
include::{shared-attributes-dir}/filesystem-attributes.adoc[]
6+
include::{shared-attributes-dir}/renderer-attributes.adoc[]
7+
8+
9+
= An Introduction to Hibernate 6
1210
:title-logo-image: image:../../style/asciidoctor/images/org/hibernate/logo.png[]
1311
:toc:
1412
:toclevels: 3
1513

16-
<<<
17-
1814
include::Preface.adoc[]
1915

20-
<<<
21-
2216
:numbered:
2317

2418
include::Introduction.adoc[]
@@ -28,3 +22,4 @@ include::Mapping.adoc[]
2822
include::Interacting.adoc[]
2923
include::Tuning.adoc[]
3024
include::Advanced.adoc[]
25+
include::Credits.adoc[]

documentation/src/main/asciidoc/introduction/Interacting.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ It's not necessary to dirty-check on entity instance in read-only mode.
512512
[[queries]]
513513
=== Queries
514514

515-
:hql: {userGuideBase}#query-language
515+
:hql: {doc-user-guide-url}#query-language
516516

517517
Hibernate features three complementary ways to write queries:
518518

@@ -523,7 +523,7 @@ Hibernate features three complementary ways to write queries:
523523
[[hql-queries]]
524524
=== HQL queries
525525

526-
:hql: {userGuideBase}#query-language
526+
:hql: {doc-user-guide-url}#query-language
527527

528528
A full discussion of the query language would require just as much text as the rest of this Introduction.
529529
Fortunately, HQL is already described in exhaustive (and exhausting) detail in _A guide to Hibernate Query Language 6_.

documentation/src/main/asciidoc/introduction/Preface.adoc

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
[[preface]]
22
== Preface
33

4-
:user-guide: {userGuideBase}
5-
:java-doc: {versionDocBase}/javadocs
6-
74
Hibernate 6 is a major redesign of the world's most popular and feature-rich ORM solution.
85
The redesign has touched almost every subsystem of Hibernate, including the APIs, mapping annotations, and the query language.
96
This new Hibernate is more powerful, more robust, and more typesafe.
@@ -23,9 +20,18 @@ Hibernate 6 and Hibernate Reactive are now core components of Quarkus 3, the mos
2320

2421
Unfortunately, the changes in Hibernate 6 have obsoleted much of the information about Hibernate that's available in books, in blog posts, and on stackoverflow.
2522

26-
On the other hand, the Hibernate {user-guide}[User Guide] provides a great deal of detail about many aspects of Hibernate, but with so much information to cover, readability is difficult to achieve.
2723

28-
This is therefore the new canonical guide to Hibernate.
29-
We don't attempt to cover every detail of Hibernate here, and so this guide should be used in conjunction with the {java-doc}[extensive Javadoc] available for Hibernate 6.
30-
Nor do we discuss the query language of Hibernate.
31-
And so this introduction should be used in conjunction with its sister document, _A guide to Hibernate Query Language 6_.
24+
This guide is an up-to-date, high-level discussion of the current set of Hibernate features. It does not attempt
25+
to cover every feature and should be used in conjunction with other documentation -
26+
27+
- Hibernate's extensive link:{doc-javadoc-url}[Javadoc]
28+
- The link:{doc-query-language-url}[Hibernate Query Language Guide]
29+
- The Hibernate link:{doc-user-guide-url}[User Guide].
30+
31+
[NOTE]
32+
====
33+
The Hibernate User Guide provides detailed discussion about most aspects of Hibernate.
34+
But with so much information to cover, readability is difficult to achieve - it should be considered more of a reference guide.
35+
36+
Where applicable, this guide will provide links to detailed User Guide content within its covered topics.
37+
====

0 commit comments

Comments
 (0)