Skip to content

Commit 0dffbee

Browse files
brmeyerbrmeyer
committed
HHH-8112 Minor tweaks for 4.2 devguide
1 parent 76a06db commit 0dffbee

File tree

2 files changed

+17
-46
lines changed

2 files changed

+17
-46
lines changed

‎documentation/src/main/docbook/devguide/en-US/chapters/osgi/OSGi.xml

Lines changed: 17 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
<para>
7272
Quickstart tutorial project, demonstrating a container-managed JPA client bundle:
73-
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/master/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa">managed-jpa</link>
73+
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa">managed-jpa</link>
7474
</para>
7575

7676
<section>
@@ -91,26 +91,15 @@
9191
</para>
9292
</section>
9393

94-
<section>
95-
<title>JPA 2.1</title>
96-
97-
<para>
98-
No Enterprise OSGi JPA container currently supports JPA 2.1 (the spec is not yet released). For
99-
testing, the managed-jpa example makes use of
100-
<link xl:href="https://github.com/brmeyer/aries/tree/jpa21">Brett's fork of Aries</link>. To work
101-
with Hibernate 4.3, clone the fork and build Aries JPA.
102-
</para>
103-
</section>
104-
10594
<section>
10695
<title>DataSource</title>
10796
<para>
10897
Typical Enterprise OSGi JPA usage includes a DataSource installed in the container. The client
10998
bundle's <literal>persistence.xml</literal> uses the DataSource through JNDI. For an example,
11099
see the QuickStart's DataSource:
111-
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/datasource-h2.xml">datasource-h2.xml</link>
100+
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/datasource-h2.xml">datasource-h2.xml</link>
112101
The DataSource is then called out in
113-
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/META-INF/persistence.xml">
102+
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/META-INF/persistence.xml">
114103
persistence.xml's</link> <literal>jta-data-source</literal>.
115104
</para>
116105
</section>
@@ -120,7 +109,7 @@
120109
<para>
121110
Hibernate currently requires fairly specific bundle activation ordering. See the managed-jpa
122111
QuickStart's
123-
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml">features.xml</link>
112+
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml">features.xml</link>
124113
for the best supported sequence.
125114
</para>
126115
</section>
@@ -132,7 +121,7 @@
132121
<literal>blueprint.xml</literal>. The container takes the name of your persistence unit, then injects
133122
an <literal>EntityManager</literal> instance into your given bean attribute. See the
134123
<literal>dpService</literal> bean in the managed-jpa QuickStart's
135-
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml">blueprint.xml</link>
124+
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml">blueprint.xml</link>
136125
for an example.
137126
</para>
138127
</section>
@@ -148,7 +137,7 @@
148137

149138
<para>
150139
Quickstart tutorial project, demonstrating an unmanaged JPA client bundle:
151-
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa">unmanaged-jpa</link>
140+
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa">unmanaged-jpa</link>
152141
</para>
153142

154143
<section>
@@ -184,7 +173,7 @@
184173
<para>
185174
Hibernate currently requires fairly specific bundle activation ordering. See the unmanaged-jpa
186175
QuickStart's
187-
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml">features.xml</link>
176+
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml">features.xml</link>
188177
for the best supported sequence.
189178
</para>
190179
</section>
@@ -201,7 +190,7 @@
201190
<para>
202191
For an example on how to discover and use the service, see the unmanaged-jpa
203192
QuickStart's
204-
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java">HibernateUtil.java</link>.
193+
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java">HibernateUtil.java</link>.
205194
</para>
206195
</section>
207196
</section>
@@ -216,7 +205,7 @@
216205

217206
<para>
218207
Quickstart tutorial project, demonstrating an unmanaged native client bundle:
219-
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native">unmanaged-native</link>
208+
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native">unmanaged-native</link>
220209
</para>
221210

222211
<section>
@@ -257,7 +246,7 @@
257246
<para>
258247
Hibernate currently requires fairly specific bundle activation ordering. See the unmanaged-native
259248
QuickStart's
260-
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml">features.xml</link>
249+
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml">features.xml</link>
261250
for the best supported sequence.
262251
</para>
263252
</section>
@@ -274,7 +263,7 @@
274263
<para>
275264
For an example on how to discover and use the service, see the unmanaged-native
276265
QuickStart's
277-
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/HibernateUtil.java">HibernateUtil.java</link>.
266+
<link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/HibernateUtil.java">HibernateUtil.java</link>.
278267
</para>
279268
</section>
280269
</section>
@@ -283,11 +272,11 @@
283272
<title>Optional Modules</title>
284273

285274
<para>
286-
The <link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native">unmanaged-native</link>
275+
The <link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native">unmanaged-native</link>
287276
QuickStart project demonstrates the use of optional Hibernate modules. Each module adds additional
288277
dependency bundles that must first be activated
289-
(see <link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml">features.xml</link>).
290-
As of ORM 4.2, Envers is fully supported. Support for C3P0, Proxool, EhCache, and Infinispan were added in
278+
(see <link xl:href="https://github.com/hibernate/hibernate-orm/blob/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml">features.xml</link>).
279+
As of ORM 4.2, only Envers is fully supported. Support for C3P0, Proxool, EhCache, and Infinispan will be added in
291280
4.3, however none of their 3rd party libraries currently work in OSGi (lots of ClassLoader problems, etc.).
292281
We're tracking the issues in JIRA.
293282
</para>
@@ -305,17 +294,11 @@
305294

306295
<itemizedlist>
307296
<listitem>
308-
<literal>org.hibernate.integrator.spi.Integrator</literal> (as of 4.2)
309-
</listitem>
310-
<listitem>
311-
<literal>org.hibernate.boot.registry.selector.StrategyRegistrationProvider</literal> (as of 4.3)
312-
</listitem>
313-
<listitem>
314-
<literal>org.hibernate.metamodel.spi.TypeContributor</literal> (as of 4.3)
297+
<literal>org.hibernate.integrator.spi.Integrator</literal>
315298
</listitem>
316299
<listitem>
317300
JTA's <literal>javax.transaction.TransactionManager</literal> and
318-
<literal>javax.transaction.UserTransaction</literal> (as of 4.2), however these are typically
301+
<literal>javax.transaction.UserTransaction</literal>, however these are typically
319302
provided by the OSGi container.
320303
</listitem>
321304
</itemizedlist>
@@ -388,15 +371,7 @@
388371
Hibernate 5.
389372
</para>
390373
</listitem>
391-
<listitem>
392-
<para>
393-
No Enterprise OSGi JPA container currently supports JPA 2.1 (the spec is not yet released). For
394-
testing, the managed-jpa example makes use of
395-
<link xl:href="https://github.com/brmeyer/aries/tree/jpa21">Brett's fork of Aries</link>. To work
396-
with Hibernate 4.3, clone the fork and build Aries JPA.
397-
</para>
398-
</listitem>
399374
</itemizedlist>
400375
</section>
401376

402-
</chapter>
377+
</chapter>

‎documentation/src/main/docbook/devguide/en-US/chapters/osgi/extras/extension_point_blueprint.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,4 @@
44
<bean id="integrator" class="org.hibernate.envers.event.spi.EnversIntegrator" />
55
<service ref="integrator" interface="org.hibernate.integrator.spi.Integrator" />
66

7-
<bean id="typeContributor"
8-
class="org.hibernate.envers.internal.entities.TypeContributorImpl" />
9-
<service ref="typeContributor" interface="org.hibernate.metamodel.spi.TypeContributor" />
10-
117
</blueprint>

0 commit comments

Comments
 (0)