Hibernate SVN: r12744 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-08 04:29:28 -0400 (Sun, 08 Jul 2007)
New Revision: 12744
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
Log:
[ANN-616] Mistakes in 2.4.6.2.3 of Manual
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-08 07:53:52 UTC (rev 12743)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-08 08:29:28 UTC (rev 12744)
@@ -3059,7 +3059,7 @@
}
@Entity
-public class Parent {
+public class Child {
...
@Basic
private String name;
@@ -3087,7 +3087,7 @@
}
@Entity
-public class Parent {
+public class Child {
...
@ManyToOne
@JoinColumn(name="parent_id", insertable=false, updatable=false, nullable=false)
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-08 07:53:52 UTC (rev 12743)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-08 08:29:28 UTC (rev 12744)
@@ -3059,7 +3059,7 @@
}
@Entity
-public class Parent {
+public class Child {
...
@Basic
private String name;
@@ -3087,7 +3087,7 @@
}
@Entity
-public class Parent {
+public class Child {
...
@ManyToOne
@JoinColumn(name="parent_id", insertable=false, updatable=false, nullable=false)
16 years, 10 months
Hibernate SVN: r12743 - in core/trunk/documentation/manual: pt-BR/src/main/docbook/modules and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-08 03:53:52 -0400 (Sun, 08 Jul 2007)
New Revision: 12743
Modified:
core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml
Log:
[HHH-2713] duplicated phrase in docs "of the of the"
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml 2007-07-08 01:20:59 UTC (rev 12742)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/session_api.xml 2007-07-08 07:53:52 UTC (rev 12743)
@@ -1122,7 +1122,7 @@
</listitem>
<listitem>
<para>
- If the child object's lifespan is bounded by the lifespan of the of the parent
+ If the child object's lifespan is bounded by the lifespan of the parent
object make it a <emphasis>life cycle object</emphasis> by specifying
<literal>cascade="all,delete-orphan"</literal>.
</para>
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml 2007-07-08 01:20:59 UTC (rev 12742)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/session_api.xml 2007-07-08 07:53:52 UTC (rev 12743)
@@ -1130,7 +1130,7 @@
</listitem>
<listitem>
<para>
- If the child object's lifespan is bounded by the lifespan of the of the parent
+ If the child object's lifespan is bounded by the lifespan of the parent
object make it a <emphasis>life cycle object</emphasis> by specifying
<literal>cascade="all,delete-orphan"</literal>.
</para>
16 years, 10 months
Hibernate SVN: r12742 - core/trunk/code/core/src/main/java/org/hibernate/mapping.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 21:20:59 -0400 (Sat, 07 Jul 2007)
New Revision: 12742
Modified:
core/trunk/code/core/src/main/java/org/hibernate/mapping/SimpleValue.java
Log:
[HHH-2048] Incomplete MappingException at org.hibernate.mapping.SimpleValue
Modified: core/trunk/code/core/src/main/java/org/hibernate/mapping/SimpleValue.java
===================================================================
--- core/trunk/code/core/src/main/java/org/hibernate/mapping/SimpleValue.java 2007-07-08 01:04:24 UTC (rev 12741)
+++ core/trunk/code/core/src/main/java/org/hibernate/mapping/SimpleValue.java 2007-07-08 01:20:59 UTC (rev 12742)
@@ -260,6 +260,9 @@
Type result = TypeFactory.heuristicType(typeName, typeParameters);
if (result==null) {
String msg = "Could not determine type for: " + typeName;
+ if(table != null){
+ msg += ", at table: " + table.getName();
+ }
if(columns!=null && columns.size()>0) {
msg += ", for columns: " + columns;
}
16 years, 10 months
Hibernate SVN: r12741 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 21:04:24 -0400 (Sat, 07 Jul 2007)
New Revision: 12741
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-631] Mistake in "2.2.5.2. Many-to-one"
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-08 01:00:29 UTC (rev 12740)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-08 01:04:24 UTC (rev 12741)
@@ -1182,7 +1182,7 @@
@ManyToOne( cascade = {CascadeType.PERSIST, CascadeType.MERGE} )
<emphasis role="bold">@JoinTable(name="Flight_Company",
joinColumns = @JoinColumn(name="FLIGHT_ID"),
- inverseJoinColumns = @JoinColumns(name="COMP_ID")
+ inverseJoinColumns = @JoinColumn(name="COMP_ID")
)</emphasis>
public Company getCompany() {
return company;
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-08 01:00:29 UTC (rev 12740)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-08 01:04:24 UTC (rev 12741)
@@ -1226,7 +1226,7 @@
@ManyToOne( cascade = {CascadeType.PERSIST, CascadeType.MERGE} )
<emphasis role="bold">@JoinTable(name="Flight_Company",
joinColumns = @JoinColumn(name="FLIGHT_ID"),
- inverseJoinColumns = @JoinColumns(name="COMP_ID")
+ inverseJoinColumns = @JoinColumn(name="COMP_ID")
)</emphasis>
public Company getCompany() {
return company;
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-08 01:00:29 UTC (rev 12740)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-08 01:04:24 UTC (rev 12741)
@@ -1063,7 +1063,7 @@
@ManyToOne( cascade = {CascadeType.PERSIST, CascadeType.MERGE} )
<emphasis role="bold">@JoinTable(name="Flight_Company",
joinColumns = @JoinColumn(name="FLIGHT_ID"),
- inverseJoinColumns = @JoinColumns(name="COMP_ID")
+ inverseJoinColumns = @JoinColumn(name="COMP_ID")
)</emphasis>
public Company getCompany() {
return company;
16 years, 10 months
Hibernate SVN: r12740 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 21:00:29 -0400 (Sat, 07 Jul 2007)
New Revision: 12740
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-575] Mistakes in "2.2.5.1. One-to-one"
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 23:01:11 UTC (rev 12739)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-08 01:00:29 UTC (rev 12740)
@@ -1089,9 +1089,9 @@
@Entity
public class Customer implements Serializable {
@OneToOne(cascade = CascadeType.ALL)
- <emphasis role="bold">@JoinTable(name = "CustomerPassports"
+ <emphasis role="bold">@JoinTable(name = "CustomerPassports",
joinColumns = @JoinColumn(name="customer_fk"),
- inverseJoinColumns = @JoinColumns(name="passport_fk")</emphasis>
+ inverseJoinColumns = @JoinColumn(name="passport_fk")</emphasis>
)
public Passport getPassport() {
...
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 23:01:11 UTC (rev 12739)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-08 01:00:29 UTC (rev 12740)
@@ -1132,9 +1132,9 @@
@Entity
public class Customer implements Serializable {
@OneToOne(cascade = CascadeType.ALL)
- <emphasis role="bold">@JoinTable(name = "CustomerPassports"
+ <emphasis role="bold">@JoinTable(name = "CustomerPassports",
joinColumns = @JoinColumn(name="customer_fk"),
- inverseJoinColumns = @JoinColumns(name="passport_fk")</emphasis>
+ inverseJoinColumns = @JoinColumn(name="passport_fk")</emphasis>
)
public Passport getPassport() {
...
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 23:01:11 UTC (rev 12739)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-08 01:00:29 UTC (rev 12740)
@@ -974,9 +974,9 @@
@Entity
public class Customer implements Serializable {
@OneToOne(cascade = CascadeType.ALL)
- <emphasis role="bold">@JoinTable(name = "CustomerPassports"
+ <emphasis role="bold">@JoinTable(name = "CustomerPassports",
joinColumns = @JoinColumn(name="customer_fk"),
- inverseJoinColumns = @JoinColumns(name="passport_fk")</emphasis>
+ inverseJoinColumns = @JoinColumn(name="passport_fk")</emphasis>
)
public Passport getPassport() {
...
16 years, 10 months
Hibernate SVN: r12739 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 19:01:11 -0400 (Sat, 07 Jul 2007)
New Revision: 12739
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-578] Improvement in "2.2.5.3.3.1. Definition"
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 22:41:22 UTC (rev 12738)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 23:01:11 UTC (rev 12739)
@@ -1556,8 +1556,8 @@
)
@JoinTable(
name="EMPLOYER_EMPLOYEE",
- joinColumns={@JoinColumn(name="EMPER_ID")},
- inverseJoinColumns={@JoinColumn(name="EMPEE_ID")}
+ joinColumns=@JoinColumn(name="EMPER_ID"),
+ inverseJoinColumns=@JoinColumn(name="EMPEE_ID")
)
public Collection getEmployees() {
return employees;
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 22:41:22 UTC (rev 12738)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 23:01:11 UTC (rev 12739)
@@ -1616,8 +1616,8 @@
)
@JoinTable(
name="EMPLOYER_EMPLOYEE",
- joinColumns={@JoinColumn(name="EMPER_ID")},
- inverseJoinColumns={@JoinColumn(name="EMPEE_ID")}
+ joinColumns=@JoinColumn(name="EMPER_ID"),
+ inverseJoinColumns=@JoinColumn(name="EMPEE_ID")
)
public Collection getEmployees() {
return employees;
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 22:41:22 UTC (rev 12738)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 23:01:11 UTC (rev 12739)
@@ -1403,8 +1403,8 @@
)
@JoinTable(
name="EMPLOYER_EMPLOYEE",
- joinColumns={@JoinColumn(name="EMPER_ID")},
- inverseJoinColumns={@JoinColumn(name="EMPEE_ID")}
+ joinColumns=@JoinColumn(name="EMPER_ID"),
+ inverseJoinColumns=@JoinColumn(name="EMPEE_ID")
)
public Collection getEmployees() {
return employees;
16 years, 10 months
Hibernate SVN: r12738 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 18:41:22 -0400 (Sat, 07 Jul 2007)
New Revision: 12738
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-577] Improvement in "2.2.5.3.2.3. Unidirectional with join table"
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 22:38:01 UTC (rev 12737)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 22:41:22 UTC (rev 12738)
@@ -1470,7 +1470,7 @@
@OneToMany
@JoinTable(
name="TrainedMonkeys",
- joinColumns = { @JoinColumn( name="trainer_id") },
+ joinColumns = @JoinColumn( name="trainer_id"),
inverseJoinColumns = @JoinColumn( name="monkey_id")
)
public Set<Monkey> getTrainedMonkeys() {
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 22:38:01 UTC (rev 12737)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 22:41:22 UTC (rev 12738)
@@ -1524,7 +1524,7 @@
@OneToMany
@JoinTable(
name="TrainedMonkeys",
- joinColumns = { @JoinColumn( name="trainer_id") },
+ joinColumns = @JoinColumn( name="trainer_id"),
inverseJoinColumns = @JoinColumn( name="monkey_id")
)
public Set<Monkey> getTrainedMonkeys() {
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 22:38:01 UTC (rev 12737)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 22:41:22 UTC (rev 12738)
@@ -1329,7 +1329,7 @@
@OneToMany
@JoinTable(
name="TrainedMonkeys",
- joinColumns = { @JoinColumn( name="trainer_id") },
+ joinColumns = @JoinColumn( name="trainer_id"),
inverseJoinColumns = @JoinColumn( name="monkey_id")
)
public Set<Monkey> getTrainedMonkeys() {
16 years, 10 months
Hibernate SVN: r12737 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 18:38:01 -0400 (Sat, 07 Jul 2007)
New Revision: 12737
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-581] Improvement in "2.4.8. Filters"
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 22:17:37 UTC (rev 12736)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 22:38:01 UTC (rev 12737)
@@ -3429,7 +3429,7 @@
and placed either on the entity or the collection element</para>
<para><programlisting>@Entity
-@FilterDef(name="minLength", parameters={ @ParamDef( name="minLength", type="integer" ) } )
+@FilterDef(name="minLength", parameters=@ParamDef( name="minLength", type="integer" ) )
@Filters( {
@Filter(name="betweenLength", condition=":minLength <= length and :maxLength >= length"),
@Filter(name="minLength", condition=":minLength <= length")
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 22:17:37 UTC (rev 12736)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 22:38:01 UTC (rev 12737)
@@ -3366,7 +3366,7 @@
l'�l�ment de la collection.</para>
<para><programlisting>@Entity
-@FilterDef(name="minLength", parameters={ @ParamDef( name="minLength", type="integer" ) } )
+@FilterDef(name="minLength", parameters=@ParamDef( name="minLength", type="integer" ) )
@Filters( {
@Filter(name="betweenLength", condition=":minLength <= length and :maxLength >= length"),
@Filter(name="minLength", condition=":minLength <= length")
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 22:17:37 UTC (rev 12736)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 22:38:01 UTC (rev 12737)
@@ -2791,7 +2791,7 @@
<para>现在我们来定义应用于实体或集合加载时的SQL过滤器子句.我们使用<literal>@Filter</literal>,并将其置于实体或集合元素上.</para>
<para><programlisting>@Entity
-@FilterDef(name="minLength", parameters={ @ParamDef( name="minLength", type="integer" ) } )
+@FilterDef(name="minLength", parameters=@ParamDef( name="minLength", type="integer" ) )
@Filters( {
@Filter(name="betweenLength", condition=":minLength <= length and :maxLength >= length"),
@Filter(name="minLength", condition=":minLength <= length")
16 years, 10 months
Hibernate SVN: r12736 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 18:17:37 -0400 (Sat, 07 Jul 2007)
New Revision: 12736
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-580] Mistake in "2.2.2.3. Embedded objects (aka components)"
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 22:08:36 UTC (rev 12735)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 22:17:37 UTC (rev 12736)
@@ -461,7 +461,7 @@
<para><programlisting> @Embedded
@AttributeOverrides( {
- @AttributeOverride(name="city", column = @Column(name="fld_city") )
+ @AttributeOverride(name="city", column = @Column(name="fld_city") ),
@AttributeOverride(name="<emphasis role="bold">nationality.iso2</emphasis>", column = @Column(name="nat_Iso2") ),
@AttributeOverride(name="<emphasis role="bold">nationality.name</emphasis>", column = @Column(name="nat_CountryName") )
//nationality columns in homeAddress are overridden
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 22:08:36 UTC (rev 12735)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 22:17:37 UTC (rev 12736)
@@ -474,7 +474,7 @@
<para><programlisting> @Embedded
@AttributeOverrides( {
- @AttributeOverride(name="city", column = @Column(name="fld_city") )
+ @AttributeOverride(name="city", column = @Column(name="fld_city") ),
@AttributeOverride(name="<emphasis role="bold">nationality.iso2</emphasis>", column = @Column(name="nat_Iso2") ),
@AttributeOverride(name="<emphasis role="bold">nationality.name</emphasis>", column = @Column(name="nat_CountryName") )
// les colonnes de nationality dans homeAddress sont surcharg�es
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 22:08:36 UTC (rev 12735)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 22:17:37 UTC (rev 12736)
@@ -410,7 +410,7 @@
<para><programlisting> @Embedded
@AttributeOverrides( {
- @AttributeOverride(name="city", column = @Column(name="fld_city") )
+ @AttributeOverride(name="city", column = @Column(name="fld_city") ),
@AttributeOverride(name="<emphasis role="bold">nationality.iso2</emphasis>", column = @Column(name="nat_Iso2") ),
@AttributeOverride(name="<emphasis role="bold">nationality.name</emphasis>", column = @Column(name="nat_CountryName") )
//nationality columns in homeAddress are overridden
16 years, 10 months
Hibernate SVN: r12735 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 18:08:36 -0400 (Sat, 07 Jul 2007)
New Revision: 12735
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-579] Mistake in "2.2.5.3.3.1. Definition"
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 21:50:53 UTC (rev 12734)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 22:08:36 UTC (rev 12735)
@@ -1570,9 +1570,9 @@
@Entity
public class Employee implements Serializable {
@ManyToMany(
- cascade={CascadeType.PERSIST, CascadeType.MERGE},
- mappedBy="employees"
- targetEntity=Employer.class
+ cascade = {CascadeType.PERSIST, CascadeType.MERGE},
+ mappedBy = "employees",
+ targetEntity = Employer.class
)
public Collection getEmployers() {
return employers;
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 21:50:53 UTC (rev 12734)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 22:08:36 UTC (rev 12735)
@@ -1630,9 +1630,9 @@
@Entity
public class Employee implements Serializable {
@ManyToMany(
- cascade={CascadeType.PERSIST, CascadeType.MERGE},
- mappedBy="employees"
- targetEntity=Employer.class
+ cascade = {CascadeType.PERSIST, CascadeType.MERGE},
+ mappedBy = "employees",
+ targetEntity = Employer.class
)
public Collection getEmployers() {
return employers;
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 21:50:53 UTC (rev 12734)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 22:08:36 UTC (rev 12735)
@@ -1417,9 +1417,9 @@
@Entity
public class Employee implements Serializable {
@ManyToMany(
- cascade={CascadeType.PERSIST, CascadeType.MERGE},
- mappedBy="employees"
- targetEntity=Employer.class
+ cascade = {CascadeType.PERSIST, CascadeType.MERGE},
+ mappedBy = "employees",
+ targetEntity = Employer.class
)
public Collection getEmployers() {
return employers;
16 years, 10 months