Author: andygumbrecht
Date: Mon Jun 2 08:34:00 2014
New Revision: 1599126
URL: http://svn.apache.org/r1599126
Log:
Inline with rev. 1598334
Modified:
tomee/deps/tags/openjpa-2.4.0-1591689/openjpa-project/src/doc/manual/ref_guide_pc.xml
Modified:
tomee/deps/tags/openjpa-2.4.0-1591689/openjpa-project/src/doc/manual/ref_guide_pc.xml
URL:
http://svn.apache.org/viewvc/tomee/deps/tags/openjpa-2.4.0-1591689/openjpa-project/src/doc/manual/ref_guide_pc.xml?rev=1599126&r1=1599125&r2=1599126&view=diff
==============================================================================
---
tomee/deps/tags/openjpa-2.4.0-1591689/openjpa-project/src/doc/manual/ref_guide_pc.xml
(original)
+++
tomee/deps/tags/openjpa-2.4.0-1591689/openjpa-project/src/doc/manual/ref_guide_pc.xml
Mon Jun 2 08:34:00 2014
@@ -729,7 +729,7 @@ entity identity fields should be of the
identity. If an embedded identity object is used, you must annotate the
relation field with both the <literal>@ManyToOne</literal> or
<literal>@OneToOne</literal> relation annotation and the
-<literal>@MappedById</literal> annotation.
+<literal>@MapsId</literal> annotation.
</para>
@@ -805,7 +805,7 @@ public class LineItem {
@EmbeddedId LineItemId id;
@ManyToOne
- @MappedById("orderId") // The value element of the MappedById annotation
+ @MapsId("orderId") // The value element of the MapsId annotation
// must be used to specify the name of the primary
// key attribute to which the relationship
// corresponds. If the primary key referenced by
@@ -831,7 +831,7 @@ In the example above, the <classname>Lin
represent its primary key. The primary key attribute corresponding to the
relationship in the <classname>LineItemId</classname> must be of the same
type as the primary key of the <classname>Order</classname>. The
-<literal>MappedById</literal> annotation must be applied to the relationship
+<literal>MapsId</literal> annotation must be applied to the relationship
field <literal>LineItem.order</literal>.
</para>
