From 83196b1099a057f7414c66ecaa9f71b606758f4e Mon Sep 17 00:00:00 2001 From: Hardy Ferentschik Date: Mon, 8 Mar 2010 16:40:44 +0000 Subject: [PATCH] HHH-4933 fixed some minor typos git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@18932 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- .../src/main/docbook/en/modules/entity.xml | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/annotations/src/main/docbook/en/modules/entity.xml b/annotations/src/main/docbook/en/modules/entity.xml index 8df8983a75..e895df40d3 100644 --- a/annotations/src/main/docbook/en/modules/entity.xml +++ b/annotations/src/main/docbook/en/modules/entity.xml @@ -617,34 +617,32 @@ public class Country implements Serializable { Non-annotated property defaults If a property is not annotated, the following rules - apply: + apply: + + If the property is of a single type, it is mapped as + @Basic + - - - If the property is of a single type, it is mapped as - @Basic - + + Otherwise, if the type of the property is annotated as + @Embeddable, it is mapped as @Embedded + - - Otherwise, if the type of the property is annotated as - @Embeddable, it is mapped as @Embedded - + + Otherwise, if the type of the property is + Serializable, it is mapped as + @Basic in a column holding the object in + its serialized version + - - Otherwise, if the type of the property is - Serializable, it is mapped as - @Basic in a column holding the object in - its serialized version - - - - Otherwise, if the type of the property is - java.sql.Clob or - java.sql.Blob, it is mapped as - @Lob with the appropriate - LobType - - + + Otherwise, if the type of the property is + java.sql.Clob or + java.sql.Blob, it is mapped as + @Lob with the appropriate + LobType + + @@ -746,7 +744,7 @@ public Long getId() { ... } If JPA XML (like META-INF/orm.xml) is used - to define thegenerators, EMP_GEN and + to define the generators, EMP_GEN and SEQ_GEN are application level generators. EMP_GEN defines a table based id generator using the hilo algorithm with a max_lo of 20. The hi @@ -1005,7 +1003,7 @@ class UserId implements Serializable {
Multiple @Id properties - Another arguably more natural) approach is to place + Another, arguably more natural, approach is to place @Id on multiple properties of my entity. This approach is only supported by Hibernate but does not require an extra embeddable component.