Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8112 Minor tweaks for 4.2 devguide

This commit is contained in:
Brett Meyer 2013-06-03 16:33:03 -04:00
parent 76a06dbb33
commit 0dffbee80c
2 changed files with 17 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
documentation/src/main/docbook/devguide/en-US/chapters/osgi/OSGi.xml
View File

@ -70,7 +70,7 @@
<para> <para>
Quickstart tutorial project, demonstrating a container-managed JPA client bundle: Quickstart tutorial project, demonstrating a container-managed JPA client bundle:
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/master/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa">managed-jpa</link> <link xl:href="https://github.com/hibernate/hibernate-orm/tree/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa">managed-jpa</link>
</para> </para>
<section> <section>
@ -91,26 +91,15 @@
</para> </para>
</section> </section>
<section>
<title>JPA 2.1</title>
<para>
No Enterprise OSGi JPA container currently supports JPA 2.1 (the spec is not yet released). For
testing, the managed-jpa example makes use of
<link xl:href="https://github.com/brmeyer/aries/tree/jpa21">Brett's fork of Aries</link>. To work
with Hibernate 4.3, clone the fork and build Aries JPA.
</para>
</section>
<section> <section>
<title>DataSource</title> <title>DataSource</title>
<para> <para>
Typical Enterprise OSGi JPA usage includes a DataSource installed in the container. The client Typical Enterprise OSGi JPA usage includes a DataSource installed in the container. The client
bundle's <literal>persistence.xml</literal> uses the DataSource through JNDI. For an example, bundle's <literal>persistence.xml</literal> uses the DataSource through JNDI. For an example,
see the QuickStart's DataSource: see the QuickStart's DataSource:
<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> <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>
The DataSource is then called out in The DataSource is then called out in
<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"> <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">
persistence.xml's</link> <literal>jta-data-source</literal>. persistence.xml's</link> <literal>jta-data-source</literal>.
</para> </para>
</section> </section>
@ -120,7 +109,7 @@
<para> <para>
Hibernate currently requires fairly specific bundle activation ordering. See the managed-jpa Hibernate currently requires fairly specific bundle activation ordering. See the managed-jpa
QuickStart's QuickStart's
<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> <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>
for the best supported sequence. for the best supported sequence.
</para> </para>
</section> </section>
@ -132,7 +121,7 @@
<literal>blueprint.xml</literal>. The container takes the name of your persistence unit, then injects <literal>blueprint.xml</literal>. The container takes the name of your persistence unit, then injects
an <literal>EntityManager</literal> instance into your given bean attribute. See the an <literal>EntityManager</literal> instance into your given bean attribute. See the
<literal>dpService</literal> bean in the managed-jpa QuickStart's <literal>dpService</literal> bean in the managed-jpa QuickStart's
<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> <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>
for an example. for an example.
</para> </para>
</section> </section>
@ -148,7 +137,7 @@
<para> <para>
Quickstart tutorial project, demonstrating an unmanaged JPA client bundle: Quickstart tutorial project, demonstrating an unmanaged JPA client bundle:
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa">unmanaged-jpa</link> <link xl:href="https://github.com/hibernate/hibernate-orm/tree/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa">unmanaged-jpa</link>
</para> </para>
<section> <section>
@ -184,7 +173,7 @@
<para> <para>
Hibernate currently requires fairly specific bundle activation ordering. See the unmanaged-jpa Hibernate currently requires fairly specific bundle activation ordering. See the unmanaged-jpa
QuickStart's QuickStart's
<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> <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>
for the best supported sequence. for the best supported sequence.
</para> </para>
</section> </section>
@ -201,7 +190,7 @@
<para> <para>
For an example on how to discover and use the service, see the unmanaged-jpa For an example on how to discover and use the service, see the unmanaged-jpa
QuickStart's QuickStart's
<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>. <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>.
</para> </para>
</section> </section>
</section> </section>
@ -216,7 +205,7 @@
<para> <para>
Quickstart tutorial project, demonstrating an unmanaged native client bundle: Quickstart tutorial project, demonstrating an unmanaged native client bundle:
<link xl:href="https://github.com/hibernate/hibernate-orm/tree/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native">unmanaged-native</link> <link xl:href="https://github.com/hibernate/hibernate-orm/tree/4.2/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native">unmanaged-native</link>
</para> </para>
<section> <section>
@ -257,7 +246,7 @@
<para> <para>
Hibernate currently requires fairly specific bundle activation ordering. See the unmanaged-native Hibernate currently requires fairly specific bundle activation ordering. See the unmanaged-native
QuickStart's QuickStart's
<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> <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>
for the best supported sequence. for the best supported sequence.
</para> </para>
</section> </section>
@ -274,7 +263,7 @@
<para> <para>
For an example on how to discover and use the service, see the unmanaged-native For an example on how to discover and use the service, see the unmanaged-native
QuickStart's QuickStart's
<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>. <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>.
</para> </para>
</section> </section>
</section> </section>
@ -283,11 +272,11 @@
<title>Optional Modules</title> <title>Optional Modules</title>
<para> <para>
The <link xl:href="https://github.com/hibernate/hibernate-orm/blob/master/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native">unmanaged-native</link> 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>
QuickStart project demonstrates the use of optional Hibernate modules. Each module adds additional QuickStart project demonstrates the use of optional Hibernate modules. Each module adds additional
dependency bundles that must first be activated dependency bundles that must first be activated
(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>). (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>).
As of ORM 4.2, Envers is fully supported. Support for C3P0, Proxool, EhCache, and Infinispan were added in As of ORM 4.2, only Envers is fully supported. Support for C3P0, Proxool, EhCache, and Infinispan will be added in
4.3, however none of their 3rd party libraries currently work in OSGi (lots of ClassLoader problems, etc.). 4.3, however none of their 3rd party libraries currently work in OSGi (lots of ClassLoader problems, etc.).
We're tracking the issues in JIRA. We're tracking the issues in JIRA.
</para> </para>
@ -305,17 +294,11 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<literal>org.hibernate.integrator.spi.Integrator</literal> (as of 4.2) <literal>org.hibernate.integrator.spi.Integrator</literal>
</listitem>
<listitem>
<literal>org.hibernate.boot.registry.selector.StrategyRegistrationProvider</literal> (as of 4.3)
</listitem>
<listitem>
<literal>org.hibernate.metamodel.spi.TypeContributor</literal> (as of 4.3)
</listitem> </listitem>
<listitem> <listitem>
JTA's <literal>javax.transaction.TransactionManager</literal> and JTA's <literal>javax.transaction.TransactionManager</literal> and
<literal>javax.transaction.UserTransaction</literal> (as of 4.2), however these are typically <literal>javax.transaction.UserTransaction</literal>, however these are typically
provided by the OSGi container. provided by the OSGi container.
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@ -388,15 +371,7 @@
Hibernate 5. Hibernate 5.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
No Enterprise OSGi JPA container currently supports JPA 2.1 (the spec is not yet released). For
testing, the managed-jpa example makes use of
<link xl:href="https://github.com/brmeyer/aries/tree/jpa21">Brett's fork of Aries</link>. To work
with Hibernate 4.3, clone the fork and build Aries JPA.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
</chapter> </chapter>

4
documentation/src/main/docbook/devguide/en-US/chapters/osgi/extras/extension_point_blueprint.xml
View File

@ -4,8 +4,4 @@
<bean id="integrator" class="org.hibernate.envers.event.spi.EnversIntegrator" /> <bean id="integrator" class="org.hibernate.envers.event.spi.EnversIntegrator" />
<service ref="integrator" interface="org.hibernate.integrator.spi.Integrator" /> <service ref="integrator" interface="org.hibernate.integrator.spi.Integrator" />
<bean id="typeContributor"
class="org.hibernate.envers.internal.entities.TypeContributorImpl" />
<service ref="typeContributor" interface="org.hibernate.metamodel.spi.TypeContributor" />
</blueprint> </blueprint>