Skip to content

Commit c1af643

Browse files
committed
HHH-10006 - Document configuration of JndiService
1 parent 8f4c2d5 commit c1af643

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

documentation/src/main/docbook/manual/en-US/chapters/jdbc/Database_Access.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,8 @@
7878
Hibernate can integrate with a <interfacename>javax.sql.DataSource</interfacename> for obtaining
7979
JDBC Connections. Applications would tell Hibernate about the DataSource via the (required)
8080
<literal>hibernate.connection.datasource</literal> setting which can either specify a JNDI name
81-
or would reference the actual DataSource instance.
82-
83-
<!-- todo : pointer to JndiService
84-
For cases where a JNDI namespace is specified, be
85-
sure to read <xref linkend="bootstrap-jndi"/>.-->
81+
or would reference the actual DataSource instance. For cases where a JNDI name is given, be sure
82+
to read <xref linkend="jndi"/>
8683
</para>
8784

8885
<note>

documentation/src/main/docbook/manual/en-US/chapters/jndi/JNDI.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
66
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
77
-->
8-
<chapter xml:id="JNDI.xml"
8+
<chapter xml:id="jndi"
99
xml:lang="en"
1010
xmlns="http://docbook.org/ns/docbook">
1111
<title>JNDI</title>

documentation/src/main/docbook/manual/en-US/chapters/transactions/Transactions.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@
100100
<section xml:id="transactions-physical-jtaplatform">
101101
<title>JTA configuration</title>
102102

103-
<!-- todo : pointer to JndiService -->
104-
105103
<para>
106104
Interaction with a JTA system is consolidated behind a single contract named
107105
<interfacename>org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform</interfacename> which
@@ -111,6 +109,14 @@
111109
check transaction status, etc.
112110
</para>
113111

112+
<note>
113+
<para>
114+
Generally JtaPlatform will need access to JNDI to resolve the JTA TransactionManager,
115+
UserTransaction, etc. See <xref linkend="jndi"/> for details on configuring access
116+
to JNDI
117+
</para>
118+
</note>
119+
114120
<para>
115121
Hibernate tries to discover the JtaPlatform it should use through the use of another service named
116122
<interfacename>org.hibernate.engine.transaction.jta.platform.spi.JtaPlatformResolver</interfacename>.

0 commit comments

Comments
 (0)