Hibernate SVN: r15044 - annotations/trunk/doc/reference/en/modules.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2008-08-12 16:39:15 -0400 (Tue, 12 Aug 2008)
New Revision: 15044
Modified:
annotations/trunk/doc/reference/en/modules/entity.xml
Log:
Lazy options dup.
Modified: annotations/trunk/doc/reference/en/modules/entity.xml
===================================================================
--- annotations/trunk/doc/reference/en/modules/entity.xml 2008-08-12 17:50:46 UTC (rev 15043)
+++ annotations/trunk/doc/reference/en/modules/entity.xml 2008-08-12 20:39:15 UTC (rev 15044)
@@ -2866,8 +2866,7 @@
alter table Child add constraint FK_PARENT foreign key (parent_id) references Parent</programlisting>
- <sect3 id="entity-hibspec-singleassoc-fetching"
- label="Lazy options and fetching modes">
+ <sect3 id="entity-hibspec-singleassoc-fetching">
<title>Lazy options and fetching modes</title>
<para>EJB3 comes with the <literal>fetch</literal> option to define
16 years, 4 months
Hibernate SVN: r15043 - in core/trunk/core/src/main/java/org/hibernate: event and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2008-08-12 13:50:46 -0400 (Tue, 12 Aug 2008)
New Revision: 15043
Modified:
core/trunk/core/src/main/java/org/hibernate/action/EntityDeleteAction.java
core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java
core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java
core/trunk/core/src/main/java/org/hibernate/action/EntityUpdateAction.java
core/trunk/core/src/main/java/org/hibernate/event/PreDeleteEvent.java
core/trunk/core/src/main/java/org/hibernate/event/PreInsertEvent.java
core/trunk/core/src/main/java/org/hibernate/event/PreUpdateEvent.java
Log:
[HHH-2926] Pre*Event must inherit AbstractEvent
Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityDeleteAction.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/action/EntityDeleteAction.java 2008-08-12 17:21:04 UTC (rev 15042)
+++ core/trunk/core/src/main/java/org/hibernate/action/EntityDeleteAction.java 2008-08-12 17:50:46 UTC (rev 15043)
@@ -127,7 +127,7 @@
.getPreDeleteEventListeners();
boolean veto = false;
if (preListeners.length>0) {
- PreDeleteEvent preEvent = new PreDeleteEvent( getInstance(), getId(), state, getPersister() );
+ PreDeleteEvent preEvent = new PreDeleteEvent( getInstance(), getId(), state, getPersister() ,(EventSource) getSession() );
for ( int i = 0; i < preListeners.length; i++ ) {
veto = preListeners[i].onPreDelete(preEvent) || veto;
}
Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java 2008-08-12 17:21:04 UTC (rev 15042)
+++ core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java 2008-08-12 17:50:46 UTC (rev 15043)
@@ -137,7 +137,7 @@
.getPreInsertEventListeners();
boolean veto = false;
if (preListeners.length>0) {
- PreInsertEvent preEvent = new PreInsertEvent( getInstance(), null, state, getPersister(), getSession() );
+ PreInsertEvent preEvent = new PreInsertEvent( getInstance(), null, state, getPersister(), (EventSource)getSession() );
for ( int i = 0; i < preListeners.length; i++ ) {
veto = preListeners[i].onPreInsert(preEvent) || veto;
}
Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java 2008-08-12 17:21:04 UTC (rev 15042)
+++ core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java 2008-08-12 17:50:46 UTC (rev 15043)
@@ -173,7 +173,7 @@
.getPreInsertEventListeners();
boolean veto = false;
if (preListeners.length>0) {
- PreInsertEvent preEvent = new PreInsertEvent( getInstance(), getId(), state, getPersister(), getSession() );
+ PreInsertEvent preEvent = new PreInsertEvent( getInstance(), getId(), state, getPersister(), (EventSource)getSession() );
for ( int i = 0; i < preListeners.length; i++ ) {
veto = preListeners[i].onPreInsert(preEvent) || veto;
}
Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityUpdateAction.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/action/EntityUpdateAction.java 2008-08-12 17:21:04 UTC (rev 15042)
+++ core/trunk/core/src/main/java/org/hibernate/action/EntityUpdateAction.java 2008-08-12 17:50:46 UTC (rev 15043)
@@ -231,7 +231,7 @@
state,
previousState,
getPersister(),
- getSession()
+ (EventSource)getSession()
);
for ( int i = 0; i < preListeners.length; i++ ) {
veto = preListeners[i].onPreUpdate(preEvent) || veto;
Modified: core/trunk/core/src/main/java/org/hibernate/event/PreDeleteEvent.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/event/PreDeleteEvent.java 2008-08-12 17:21:04 UTC (rev 15042)
+++ core/trunk/core/src/main/java/org/hibernate/event/PreDeleteEvent.java 2008-08-12 17:50:46 UTC (rev 15043)
@@ -33,7 +33,7 @@
*
* @author Gavin King
*/
-public class PreDeleteEvent {
+public class PreDeleteEvent extends AbstractEvent {
private Object entity;
private EntityPersister persister;
private Serializable id;
@@ -56,8 +56,10 @@
Object entity,
Serializable id,
Object[] deletedState,
- EntityPersister persister
+ EntityPersister persister,
+ EventSource source
) {
+ super(source);
this.entity = entity;
this.persister = persister;
this.id = id;
Modified: core/trunk/core/src/main/java/org/hibernate/event/PreInsertEvent.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/event/PreInsertEvent.java 2008-08-12 17:21:04 UTC (rev 15042)
+++ core/trunk/core/src/main/java/org/hibernate/event/PreInsertEvent.java 2008-08-12 17:50:46 UTC (rev 15043)
@@ -27,28 +27,26 @@
import java.io.Serializable;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.engine.SessionImplementor;
/**
* Occurs before inserting an item in the datastore
*
* @author Gavin King
*/
-public class PreInsertEvent {
+public class PreInsertEvent extends AbstractEvent {
private Object entity;
private EntityPersister persister;
private Object[] state;
private Serializable id;
- private SessionImplementor source;
public PreInsertEvent(
Object entity,
Serializable id,
Object[] state,
EntityPersister persister,
- SessionImplementor source
+ EventSource source
) {
- this.source = source;
+ super(source);
this.entity = entity;
this.id = id;
this.state = state;
@@ -67,7 +65,4 @@
public Object[] getState() {
return state;
}
- public SessionImplementor getSource() {
- return source;
- }
}
Modified: core/trunk/core/src/main/java/org/hibernate/event/PreUpdateEvent.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/event/PreUpdateEvent.java 2008-08-12 17:21:04 UTC (rev 15042)
+++ core/trunk/core/src/main/java/org/hibernate/event/PreUpdateEvent.java 2008-08-12 17:50:46 UTC (rev 15043)
@@ -27,20 +27,18 @@
import java.io.Serializable;
import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.engine.SessionImplementor;
/**
* Occurs before updating the datastore
*
* @author Gavin King
*/
-public class PreUpdateEvent {
+public class PreUpdateEvent extends AbstractEvent {
private Object entity;
private EntityPersister persister;
private Object[] state;
private Object[] oldState;
private Serializable id;
- private SessionImplementor source;
public PreUpdateEvent(
Object entity,
@@ -48,9 +46,9 @@
Object[] state,
Object[] oldState,
EntityPersister persister,
- SessionImplementor source
+ EventSource source
) {
- this.source = source;
+ super(source);
this.entity = entity;
this.id = id;
this.state = state;
@@ -73,7 +71,4 @@
public Object[] getState() {
return state;
}
- public SessionImplementor getSource() {
- return source;
- }
}
16 years, 4 months
Hibernate SVN: r15042 - core/trunk/core/src/main/java/org/hibernate/event/def.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2008-08-12 13:21:04 -0400 (Tue, 12 Aug 2008)
New Revision: 15042
Modified:
core/trunk/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java
Log:
[HHH-3247] Provide more information in TypeMismatchException message
Modified: core/trunk/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java 2008-08-12 17:06:53 UTC (rev 15041)
+++ core/trunk/core/src/main/java/org/hibernate/event/def/DefaultLoadEventListener.java 2008-08-12 17:21:04 UTC (rev 15042)
@@ -107,7 +107,7 @@
Class idClass = persister.getIdentifierType().getReturnedClass();
if ( idClass != null && ! idClass.isInstance( event.getEntityId() ) ) {
throw new TypeMismatchException(
- "Provided id of the wrong type. Expected: " + idClass + ", got " + event.getEntityId().getClass()
+ "Provided id of the wrong type for class " + persister.getEntityName() + ". Expected: " + idClass + ", got " + event.getEntityId().getClass()
);
}
}
16 years, 4 months
Hibernate SVN: r15041 - in core/trunk/documentation/manual/src/main/docbook: es-ES/content and 6 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2008-08-12 13:06:53 -0400 (Tue, 12 Aug 2008)
New Revision: 15041
Modified:
core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml
core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po
core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po
core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po
core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po
core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot
core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po
core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po
Log:
[HHH-2976] Documentation of Native SQLQuery contains errors
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml 2008-08-12 16:36:23 UTC (rev 15040)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml 2008-08-12 17:06:53 UTC (rev 15041)
@@ -238,9 +238,9 @@
declared in the mapping metadata. Notice that we may even use the
property aliases in the where clause if we like.</para>
- <programlisting><![CDATA[String sql = "SELECT ID as {c.id}, NAME as {c.name}, " +
- "BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} " +
- "FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID";
+ <programlisting><![CDATA[String sql = "SELECT ID as {cat.id}, NAME as {cat.name}, " +
+ "BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} " +
+ "FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID";
List loggedCats = sess.createSQLQuery(sql)
.addEntity("cat", Cat.class)
Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po 2008-08-12 16:36:23 UTC (rev 15040)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po 2008-08-12 17:06:53 UTC (rev 15041)
@@ -439,21 +439,21 @@
#: index.docbook:192
msgid ""
-"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
-" \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
+" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
"\" +\n"
-" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
+" \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
"\n"
"List loggedCats = sess.createSQLQuery(sql)\n"
" .addEntity(\"cat\", Cat.class)\n"
" .addEntity(\"mother\", Cat.class).list()\n"
"]]>"
msgstr ""
-"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
-" \"BIRTHDATE as {c."
-"birthDate}, MOTHER_ID as {c.mother}, {mother.*} \" +\n"
-" \"FROM CAT_LOG c, "
-"CAT_LOG m WHERE {c.mother} = c.ID\";\n"
+"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
+" \"BIRTHDATE as {cat."
+"birthDate}, MOTHER_ID as {cat.mother}, {mother.*} \" +\n"
+" \"FROM CAT_LOG cat, "
+"CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
" \n"
" List loggedCats = sess."
"createSQLQuery(sql)\n"
Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po 2008-08-12 16:36:23 UTC (rev 15040)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po 2008-08-12 17:06:53 UTC (rev 15041)
@@ -476,10 +476,10 @@
#: query_sql.xml:192
#, no-c-format
msgid ""
-"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
-" \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
+" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
"\" +\n"
-" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
+" \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
"\n"
"List loggedCats = sess.createSQLQuery(sql)\n"
" .addEntity(\"cat\", Cat.class)\n"
Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po 2008-08-12 16:36:23 UTC (rev 15040)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po 2008-08-12 17:06:53 UTC (rev 15041)
@@ -465,10 +465,10 @@
#: query_sql.xml:192
#, no-c-format
msgid ""
-"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
-" \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
+" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
"\" +\n"
-" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
+" \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
"\n"
"List loggedCats = sess.createSQLQuery(sql)\n"
" .addEntity(\"cat\", Cat.class)\n"
Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po 2008-08-12 16:36:23 UTC (rev 15040)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po 2008-08-12 17:06:53 UTC (rev 15041)
@@ -466,10 +466,10 @@
#: query_sql.xml:192
#, no-c-format
msgid ""
-"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
-" \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
+" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
"\" +\n"
-" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
+" \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
"\n"
"List loggedCats = sess.createSQLQuery(sql)\n"
" .addEntity(\"cat\", Cat.class)\n"
Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot 2008-08-12 16:36:23 UTC (rev 15040)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot 2008-08-12 17:06:53 UTC (rev 15041)
@@ -310,9 +310,9 @@
#: query_sql.xml:216
#, no-c-format
msgid ""
- "<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
- " \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} \" +\n"
- " \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
+ "<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
+ " \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} \" +\n"
+ " \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
"\n"
"List loggedCats = sess.createSQLQuery(sql)\n"
" .addEntity(\"cat\", Cat.class)\n"
Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po 2008-08-12 16:36:23 UTC (rev 15040)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po 2008-08-12 17:06:53 UTC (rev 15041)
@@ -474,10 +474,10 @@
#: query_sql.xml:192
#, no-c-format
msgid ""
-"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
-" \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
+" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
"\" +\n"
-" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
+" \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
"\n"
"List loggedCats = sess.createSQLQuery(sql)\n"
" .addEntity(\"cat\", Cat.class)\n"
Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po 2008-08-12 16:36:23 UTC (rev 15040)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po 2008-08-12 17:06:53 UTC (rev 15041)
@@ -452,10 +452,10 @@
#: query_sql.xml:192
#, no-c-format
msgid ""
-"<![CDATA[String sql = \"SELECT ID as {c.id}, NAME as {c.name}, \" + \n"
-" \"BIRTHDATE as {c.birthDate}, MOTHER_ID as {c.mother}, {mother.*} "
+"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n"
+" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} "
"\" +\n"
-" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n"
+" \"FROM CAT_LOG cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n"
"\n"
"List loggedCats = sess.createSQLQuery(sql)\n"
" .addEntity(\"cat\", Cat.class)\n"
16 years, 4 months
Hibernate SVN: r15040 - in core/trunk/documentation/manual: old/ja-JP/src/main/docbook/content and 11 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2008-08-12 12:36:23 -0400 (Tue, 12 Aug 2008)
New Revision: 15040
Modified:
core/trunk/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml
core/trunk/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml
core/trunk/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml
core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml
core/trunk/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml
core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po
core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po
core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po
core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po
core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po
core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po
Log:
[HHH-3190] Typo in chapter 7.6
Modified: core/trunk/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml
===================================================================
--- core/trunk/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml 2008-08-12 16:36:23 UTC (rev 15040)
@@ -585,7 +585,7 @@
</property>
</properties>
<property name="effectiveEndDate" type="date"/>
-<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
<para>
alors nous pouvons mapper une association à l'instance <emphasis>courante</emphasis>
Modified: core/trunk/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml
===================================================================
--- core/trunk/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml 2008-08-12 16:36:23 UTC (rev 15040)
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="associations">
@@ -574,7 +574,7 @@
</property>
</properties>
<property name="effectiveEndDate" type="date"/>
-<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
<para>
そして、関連を <emphasis>現時点の</emphasis> インスタンス
Modified: core/trunk/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml
===================================================================
--- core/trunk/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml 2008-08-12 16:36:23 UTC (rev 15040)
@@ -560,7 +560,7 @@
</property>
</properties>
<property name="effectiveEndDate" type="date"/>
-<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
<para>
그때 우리는 다음을 사용하여 하나의 연관을 <emphasis>현재</emphasis> 인스턴스
Modified: core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml
===================================================================
--- core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml 2008-08-12 16:36:23 UTC (rev 15040)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
<chapter id="associations">
<title>Mapeamento de Associações</title>
@@ -588,7 +588,7 @@
</property>
</properties>
<property name="effectiveEndDate" type="date"/>
-<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
<para>
Then we can map an association to the <emphasis>current</emphasis> instance
Modified: core/trunk/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml
===================================================================
--- core/trunk/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml 2008-08-12 16:36:23 UTC (rev 15040)
@@ -541,7 +541,7 @@
</property>
</properties>
<property name="effectiveEndDate" type="date"/>
-<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
<para>
那么我们可以对<emphasis>目前(current)</emphasis>实例(其<literal>effectiveEndDate</literal>为null)使用这样的关联映射:
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml 2008-08-12 16:36:23 UTC (rev 15040)
@@ -603,7 +603,7 @@
</property>
</properties>
<property name="effectiveEndDate" type="date"/>
-<property name="effectiveStateDate" type="date" not-null="true"/>]]></programlisting>
+<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting>
<para>
Then we can map an association to the <emphasis>current</emphasis> instance
Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po 2008-08-12 16:36:23 UTC (rev 15040)
@@ -1028,7 +1028,7 @@
" </property>\n"
"</properties>\n"
"<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
msgstr ""
"<![CDATA[<properties name=\"currentAccountKey\">\n"
" <property name=\"accountNumber\" type=\"string\" "
@@ -1040,7 +1040,7 @@
" </property>\n"
" </properties>\n"
" <property name=\"effectiveEndDate\" type=\"date\"/>\n"
-" <property name=\"effectiveStateDate\" type=\"date\" not-"
+" <property name=\"effectiveStartDate\" type=\"date\" not-"
"null=\"true\"/>]]>"
#: index.docbook:266
Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po 2008-08-12 16:36:23 UTC (rev 15040)
@@ -838,7 +838,7 @@
" </property>\n"
"</properties>\n"
"<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
msgstr ""
#. Tag: para
Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po 2008-08-12 16:36:23 UTC (rev 15040)
@@ -801,7 +801,7 @@
" </property>\n"
"</properties>\n"
"<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
msgstr ""
#. Tag: para
Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po 2008-08-12 16:36:23 UTC (rev 15040)
@@ -811,7 +811,7 @@
" </property>\n"
"</properties>\n"
"<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
msgstr ""
#. Tag: para
Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot 2008-08-12 16:36:23 UTC (rev 15040)
@@ -685,7 +685,7 @@
" </property>\n"
"</properties>\n"
"<property name=\"effectiveEndDate\" type=\"date\"/>\n"
- "<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
+ "<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
msgstr ""
#. Tag: para
Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po 2008-08-12 16:36:23 UTC (rev 15040)
@@ -833,7 +833,7 @@
" </property>\n"
"</properties>\n"
"<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
msgstr ""
#. Tag: para
Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po 2008-08-12 15:56:15 UTC (rev 15039)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po 2008-08-12 16:36:23 UTC (rev 15040)
@@ -802,7 +802,7 @@
" </property>\n"
"</properties>\n"
"<property name=\"effectiveEndDate\" type=\"date\"/>\n"
-"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
+"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>"
msgstr ""
#. Tag: para
16 years, 4 months
Hibernate SVN: r15039 - core/trunk/documentation/manual/src/main/docbook/en-US/content.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2008-08-12 11:56:15 -0400 (Tue, 12 Aug 2008)
New Revision: 15039
Modified:
core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
Log:
[HHH-3397] Wrong "jsdk.jar" referenced in the tutorial
Yes, again.
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml 2008-08-12 15:42:10 UTC (rev 15038)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml 2008-08-12 15:56:15 UTC (rev 15039)
@@ -1566,8 +1566,9 @@
<para>
Before you compile and deploy the web application, note that an additional library
- is required: <literal>jsdk.jar</literal>. This is the Java servlet development kit,
- if you don't have this library already, get it from the Sun website and copy it to
+ is required: <literal>servlet.jar</literal>. This is the Java Servlet Development Kit,
+ if you don't have this library already, get it from the
+ <ulink url="http://java.sun.com/products/servlet/archive.html">Sun website</ulink> and copy it to
your library directory. However, it will be only used for compilation and excluded
from the WAR package.
</para>
16 years, 4 months
Hibernate SVN: r15038 - in core/trunk/documentation/manual: src/main/docbook/en-US/content and 7 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2008-08-12 11:42:10 -0400 (Tue, 12 Aug 2008)
New Revision: 15038
Modified:
core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml
core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po
core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po
core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po
core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po
core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po
core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po
core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po
core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po
core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po
core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po
core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po
core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po
core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot
core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po
core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po
core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po
core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po
core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po
core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po
Log:
[HHH-3080] Oject typo
Modified: core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml
===================================================================
--- core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml 2008-08-12 15:42:10 UTC (rev 15038)
@@ -1,6 +1,6 @@
-<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
+<?xml version='1.0' encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
<chapter id="tutorial">
<title>Introdução ao Hibernate</title>
@@ -1444,7 +1444,7 @@
That's it, the servlet is complete. A request to the servlet will be processed
in a single <literal>Session</literal> and <literal>Transaction</literal>. As
earlier in the standalone application, Hibernate can automatically bind these
- ojects to the current thread of execution. This gives you the freedom to layer
+ objects to the current thread of execution. This gives you the freedom to layer
your code and access the <literal>SessionFactory</literal> in any way you like.
Usually you'd use a more sophisticated design and move the data access code
into data access objects (the DAO pattern). See the Hibernate Wiki for more
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml 2008-08-12 15:42:10 UTC (rev 15038)
@@ -126,7 +126,7 @@
<para>
Like all value types, components do not support shared references. In other words, two
persons could have the same name, but the two person objects would contain two independent
- name ojects, only "the same" by value. The null value semantics of a component are
+ name objects, only "the same" by value. The null value semantics of a component are
<emphasis>ad hoc</emphasis>. When reloading the containing object, Hibernate will assume
that if all component columns are null, then the entire component is null. This should
be okay for most purposes.
Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -197,7 +197,7 @@
msgid ""
"Like all value types, components do not support shared references. In other "
"words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
+"would contain two independent name objects, only \"the same\" by value. The "
"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
"reloading the containing object, Hibernate will assume that if all component "
"columns are null, then the entire component is null. This should be okay for "
Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -1464,7 +1464,7 @@
msgid ""
"Clearly, manual version checking is only feasible in very trivial "
"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified ojects have to be checked. "
+"instances, but complete graphs of modified objects have to be checked. "
"Hibernate offers automatic version checking with either an extended "
"<literal>Session</literal> or detached instances as the design paradigm."
msgstr ""
Modified: core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -2936,7 +2936,7 @@
"That's it, the servlet is complete. A request to the servlet will be "
"processed in a single <literal>Session</literal> and <literal>Transaction</"
"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
+"automatically bind these objects to the current thread of execution. This "
"gives you the freedom to layer your code and access the "
"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
"more sophisticated design and move the data access code into data access "
@@ -2945,7 +2945,7 @@
"That's it, the servlet is complete. A request to the servlet will be "
"processed in a single <literal>Session</literal> and <literal>Transaction</"
"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
+"automatically bind these objects to the current thread of execution. This "
"gives you the freedom to layer your code and access the "
"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
"more sophisticated design and move the data access code into data access "
Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -164,7 +164,7 @@
msgid ""
"Like all value types, components do not support shared references. In other "
"words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
+"would contain two independent name objects, only \"the same\" by value. The "
"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
"reloading the containing object, Hibernate will assume that if all component "
"columns are null, then the entire component is null. This should be okay for "
Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -1494,7 +1494,7 @@
msgid ""
"Clearly, manual version checking is only feasible in very trivial "
"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified ojects have to be checked. "
+"instances, but complete graphs of modified objects have to be checked. "
"Hibernate offers automatic version checking with either an extended "
"<literal>Session</literal> or detached instances as the design paradigm."
msgstr ""
Modified: core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -2669,7 +2669,7 @@
"That's it, the servlet is complete. A request to the servlet will be "
"processed in a single <literal>Session</literal> and <literal>Transaction</"
"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
+"automatically bind these objects to the current thread of execution. This "
"gives you the freedom to layer your code and access the "
"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
"more sophisticated design and move the data access code into data access "
Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -162,7 +162,7 @@
msgid ""
"Like all value types, components do not support shared references. In other "
"words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
+"would contain two independent name objects, only \"the same\" by value. The "
"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
"reloading the containing object, Hibernate will assume that if all component "
"columns are null, then the entire component is null. This should be okay for "
Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -1418,7 +1418,7 @@
msgid ""
"Clearly, manual version checking is only feasible in very trivial "
"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified ojects have to be checked. "
+"instances, but complete graphs of modified objects have to be checked. "
"Hibernate offers automatic version checking with either an extended "
"<literal>Session</literal> or detached instances as the design paradigm."
msgstr ""
Modified: core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -2598,7 +2598,7 @@
"That's it, the servlet is complete. A request to the servlet will be "
"processed in a single <literal>Session</literal> and <literal>Transaction</"
"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
+"automatically bind these objects to the current thread of execution. This "
"gives you the freedom to layer your code and access the "
"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
"more sophisticated design and move the data access code into data access "
Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -162,7 +162,7 @@
msgid ""
"Like all value types, components do not support shared references. In other "
"words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
+"would contain two independent name objects, only \"the same\" by value. The "
"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
"reloading the containing object, Hibernate will assume that if all component "
"columns are null, then the entire component is null. This should be okay for "
Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -1413,7 +1413,7 @@
msgid ""
"Clearly, manual version checking is only feasible in very trivial "
"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified ojects have to be checked. "
+"instances, but complete graphs of modified objects have to be checked. "
"Hibernate offers automatic version checking with either an extended "
"<literal>Session</literal> or detached instances as the design paradigm."
msgstr ""
Modified: core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -2616,7 +2616,7 @@
"That's it, the servlet is complete. A request to the servlet will be "
"processed in a single <literal>Session</literal> and <literal>Transaction</"
"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
+"automatically bind these objects to the current thread of execution. This "
"gives you the freedom to layer your code and access the "
"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
"more sophisticated design and move the data access code into data access "
Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot 2008-08-12 15:42:10 UTC (rev 15038)
@@ -136,7 +136,7 @@
#. Tag: para
#: component_mapping.xml:70
#, no-c-format
-msgid "Like all value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent name ojects, only \"the same\" by value. The null value semantics of a component are <emphasis>ad hoc</emphasis>. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This should be okay for most purposes."
+msgid "Like all value types, components do not support shared references. In other words, two persons could have the same name, but the two person objects would contain two independent name objects, only \"the same\" by value. The null value semantics of a component are <emphasis>ad hoc</emphasis>. When reloading the containing object, Hibernate will assume that if all component columns are null, then the entire component is null. This should be okay for most purposes."
msgstr ""
#. Tag: para
Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -162,7 +162,7 @@
msgid ""
"Like all value types, components do not support shared references. In other "
"words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
+"would contain two independent name objects, only \"the same\" by value. The "
"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
"reloading the containing object, Hibernate will assume that if all component "
"columns are null, then the entire component is null. This should be okay for "
Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -1454,7 +1454,7 @@
msgid ""
"Clearly, manual version checking is only feasible in very trivial "
"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified ojects have to be checked. "
+"instances, but complete graphs of modified objects have to be checked. "
"Hibernate offers automatic version checking with either an extended "
"<literal>Session</literal> or detached instances as the design paradigm."
msgstr ""
Modified: core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -2652,7 +2652,7 @@
"That's it, the servlet is complete. A request to the servlet will be "
"processed in a single <literal>Session</literal> and <literal>Transaction</"
"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
+"automatically bind these objects to the current thread of execution. This "
"gives you the freedom to layer your code and access the "
"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
"more sophisticated design and move the data access code into data access "
Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -161,7 +161,7 @@
msgid ""
"Like all value types, components do not support shared references. In other "
"words, two persons could have the same name, but the two person objects "
-"would contain two independent name ojects, only \"the same\" by value. The "
+"would contain two independent name objects, only \"the same\" by value. The "
"null value semantics of a component are <emphasis>ad hoc</emphasis>. When "
"reloading the containing object, Hibernate will assume that if all component "
"columns are null, then the entire component is null. This should be okay for "
Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -1318,7 +1318,7 @@
msgid ""
"Clearly, manual version checking is only feasible in very trivial "
"circumstances and not practical for most applications. Often not only single "
-"instances, but complete graphs of modified ojects have to be checked. "
+"instances, but complete graphs of modified objects have to be checked. "
"Hibernate offers automatic version checking with either an extended "
"<literal>Session</literal> or detached instances as the design paradigm."
msgstr ""
Modified: core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po 2008-08-12 15:21:42 UTC (rev 15037)
+++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po 2008-08-12 15:42:10 UTC (rev 15038)
@@ -2496,7 +2496,7 @@
"That's it, the servlet is complete. A request to the servlet will be "
"processed in a single <literal>Session</literal> and <literal>Transaction</"
"literal>. As earlier in the standalone application, Hibernate can "
-"automatically bind these ojects to the current thread of execution. This "
+"automatically bind these objects to the current thread of execution. This "
"gives you the freedom to layer your code and access the "
"<literal>SessionFactory</literal> in any way you like. Usually you'd use a "
"more sophisticated design and move the data access code into data access "
16 years, 4 months
Hibernate SVN: r15037 - search/trunk/src/test/org/hibernate/search/test/bridge.
by hibernate-commits＠lists.jboss.org
Author: epbernard
Date: 2008-08-12 11:21:42 -0400 (Tue, 12 Aug 2008)
New Revision: 15037
Modified:
search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java
search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java
Log:
JBPAPP-1062 int1 and int2 are reserved keyword in MySQL
Modified: search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java 2008-08-12 10:15:33 UTC (rev 15036)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/BridgeTest.java 2008-08-12 15:21:42 UTC (rev 15037)
@@ -34,8 +34,8 @@
cloud.setDate( null );
cloud.setDouble1( null );
cloud.setDouble2( 2.1d );
- cloud.setInt1( null );
- cloud.setInt2( 2 );
+ cloud.setIntegerv1( null );
+ cloud.setIntegerv2( 2 );
cloud.setFloat1( null );
cloud.setFloat2( 2.1f );
cloud.setLong1( null );
@@ -59,12 +59,12 @@
List result;
query = parser.parse("double2:[2.1 TO 2.1] AND float2:[2.1 TO 2.1] " +
- "AND int2:[2 TO 2.1] AND long2:[2 TO 2.1] AND type:\"dog\" AND storm:false");
+ "AND integerv2:[2 TO 2.1] AND long2:[2 TO 2.1] AND type:\"dog\" AND storm:false");
result = session.createFullTextQuery(query).list();
assertEquals( "find primitives and do not fail on null", 1, result.size() );
- query = parser.parse("double1:[2.1 TO 2.1] OR float1:[2.1 TO 2.1] OR int1:[2 TO 2.1] OR long1:[2 TO 2.1]");
+ query = parser.parse("double1:[2.1 TO 2.1] OR float1:[2.1 TO 2.1] OR integerv1:[2 TO 2.1] OR long1:[2 TO 2.1]");
result = session.createFullTextQuery(query).list();
assertEquals( "null elements should not be stored", 0, result.size() ); //the query is dumb because restrictive
Modified: search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java 2008-08-12 10:15:33 UTC (rev 15036)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java 2008-08-12 15:21:42 UTC (rev 15037)
@@ -27,8 +27,8 @@
private int id;
private Long long1;
private long long2;
- private Integer int1;
- private int int2;
+ private Integer integerv1;
+ private int integerv2;
private Double double1;
private double double2;
private Float float1;
@@ -126,21 +126,21 @@
}
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
- public Integer getInt1() {
- return int1;
+ public Integer getIntegerv1() {
+ return integerv1;
}
- public void setInt1(Integer int1) {
- this.int1 = int1;
+ public void setIntegerv1(Integer integerv1) {
+ this.integerv1 = integerv1;
}
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
- public int getInt2() {
- return int2;
+ public int getIntegerv2() {
+ return integerv2;
}
- public void setInt2(int int2) {
- this.int2 = int2;
+ public void setIntegerv2(int integerv2) {
+ this.integerv2 = integerv2;
}
@Field(index=Index.UN_TOKENIZED, store=Store.YES)
16 years, 4 months
Hibernate SVN: r15036 - search/trunk.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2008-08-12 06:15:33 -0400 (Tue, 12 Aug 2008)
New Revision: 15036
Modified:
search/trunk/build.xml
Log:
Removed the exclusion of UnresolvedBridgeTest. With the new version of Core this test is passing again.
Modified: search/trunk/build.xml
===================================================================
--- search/trunk/build.xml 2008-08-12 10:07:46 UTC (rev 15035)
+++ search/trunk/build.xml 2008-08-12 10:15:33 UTC (rev 15036)
@@ -196,8 +196,6 @@
<fileset dir="${testclasses.dir}">
<include name="**/*Test.class"/>
<exclude name="**/JMSSlaveTest.class"/>
- <!-- Only temporary excluded here until the next release of core. Test should then pass again -->
- <exclude name="**/UnresolvedBridgeTest.class"/>
</fileset>
</batchtest>
<test fork="yes" todir="${testreports.dir}/@{db}" haltonfailure="no" name="org.hibernate.search.test.jms.slave.JMSSlaveTest"/>
16 years, 4 months
Hibernate SVN: r15035 - search/trunk/src/test/org/hibernate/search/test/embedded.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2008-08-12 06:07:46 -0400 (Tue, 12 Aug 2008)
New Revision: 15035
Modified:
search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java
search/trunk/src/test/org/hibernate/search/test/embedded/State.java
search/trunk/src/test/org/hibernate/search/test/embedded/StateCandidate.java
Log:
Updated test to be a proper test for HSEARCH-142
Modified: search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2008-08-11 17:02:47 UTC (rev 15034)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/EmbeddedTest.java 2008-08-12 10:07:46 UTC (rev 15035)
@@ -295,12 +295,8 @@
s.clear();
tx = s.beginTransaction();
- // remove the following line to see the test fails. It should not be necessary to
- // to also update the name of the candidate. Only updating the state should work
- // as well.
- //candiate.setName( "Beckstein" );
state.setName( "Hessen" );
- candiate = (StateCandidate) s.merge( candiate );
+ state = (State) s.merge( state );
tx.commit();
s.clear();
Modified: search/trunk/src/test/org/hibernate/search/test/embedded/State.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/embedded/State.java 2008-08-11 17:02:47 UTC (rev 15034)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/State.java 2008-08-12 10:07:46 UTC (rev 15035)
@@ -7,14 +7,18 @@
import javax.persistence.OneToOne;
import org.hibernate.search.annotations.ContainedIn;
+import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Indexed;
/**
* @author Hardy Ferentschik
*/
@Entity
+@Indexed // @indexed should not be needed, see HSEARCH-142 and testEmbeddedObjectUpdate()
public class State {
@Id
+ @DocumentId
@GeneratedValue
private Integer id;
Modified: search/trunk/src/test/org/hibernate/search/test/embedded/StateCandidate.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/embedded/StateCandidate.java 2008-08-11 17:02:47 UTC (rev 15034)
+++ search/trunk/src/test/org/hibernate/search/test/embedded/StateCandidate.java 2008-08-12 10:07:46 UTC (rev 15035)
@@ -1,6 +1,6 @@
+// $Id:$
package org.hibernate.search.test.embedded;
-// $Id:$
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
16 years, 4 months