Author: steve.ebersole(a)jboss.com Date: 2008-08-14 10:03:09 -0400 (Thu, 14 Aug 2008) New Revision: 15064 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/pt-BR/src/main/docbook/content/tutorial1.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/en-US/content/component_mapping.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.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/association_mapping.po core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.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/association_mapping.po core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.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/association_mapping.po core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.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/association_mapping.pot core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.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/association_mapping.po core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.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: undo fixes for HHH-3080,HHH-3190,HHH-2976,HHH-3397 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/old/fr-FR/src/main/docbook/content/association_mapping.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -585,7 +585,7 @@ </property> </properties> <property name="effectiveEndDate" type="date"/> -<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting> +<property name="effectiveStateDate" 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/old/ja-JP/src/main/docbook/content/association_mapping.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -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="effectiveStartDate" type="date" not-null="true"/>]]></programlisting> +<property name="effectiveStateDate" 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/old/ko-KR/src/main/docbook/content/association_mapping.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -560,7 +560,7 @@ </property> </properties> <property name="effectiveEndDate" type="date"/> -<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting> +<property name="effectiveStateDate" 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/association_mapping.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -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="effectiveStartDate" type="date" not-null="true"/>]]></programlisting> +<property name="effectiveStateDate" 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/pt-BR/src/main/docbook/content/tutorial1.xml =================================================================== --- core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/old/pt-BR/src/main/docbook/content/tutorial1.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -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&#x00E7;&#x00E3;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 - objects to the current thread of execution. This gives you the freedom to layer + ojects 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/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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/old/zh-CN/src/main/docbook/content/association_mapping.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -541,7 +541,7 @@ </property> </properties> <property name="effectiveEndDate" type="date"/> -<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting> +<property name="effectiveStateDate" 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/association_mapping.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -603,7 +603,7 @@ </property> </properties> <property name="effectiveEndDate" type="date"/> -<property name="effectiveStartDate" type="date" not-null="true"/>]]></programlisting> +<property name="effectiveStateDate" 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/en-US/content/component_mapping.xml =================================================================== --- core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/component_mapping.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects, only "the same" by value. The null value semantics of a component are + 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. 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/query_sql.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 {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"; + <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"; List loggedCats = sess.createSQLQuery(sql) .addEntity("cat", Cat.class) 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/en-US/content/tutorial.xml 2008-08-14 14:03:09 UTC (rev 15064) @@ -1566,9 +1566,8 @@ <para> Before you compile and deploy the web application, note that an additional library - 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 + 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 your library directory. However, it will be only used for compilation and excluded from the WAR package. </para> 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/association_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -1028,7 +1028,7 @@ " </property>\n" "</properties>\n" "<property name=\"effectiveEndDate\" type=\"date\"/>\n" -"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>" +"<property name=\"effectiveStateDate\" 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=\"effectiveStartDate\" type=\"date\" not-" +" <property name=\"effectiveStateDate\" type=\"date\" not-" "null=\"true\"/>]]>" #: index.docbook:266 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/component_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects, only \"the same\" by value. The " +"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 " 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/query_sql.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -439,21 +439,21 @@ #: index.docbook:192 msgid "" -"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n" -" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} " +"<![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 cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n" +" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.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 {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" +"<![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" " \n" " List loggedCats = sess." "createSQLQuery(sql)\n" 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/transactions.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects have to be checked. " +"instances, but complete graphs of modified ojects 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/es-ES/content/tutorial.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects to the current thread of execution. This " +"automatically bind these ojects 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 objects to the current thread of execution. This " +"automatically bind these ojects 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/association_mapping.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/association_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -838,7 +838,7 @@ " </property>\n" "</properties>\n" "<property name=\"effectiveEndDate\" type=\"date\"/>\n" -"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>" +"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>" msgstr "" #. Tag: para 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/component_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects, only \"the same\" by value. The " +"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 " 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/query_sql.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -476,10 +476,10 @@ #: query_sql.xml:192 #, no-c-format msgid "" -"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n" -" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} " +"<![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 cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n" +" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.ID\";\n" "\n" "List loggedCats = sess.createSQLQuery(sql)\n" " .addEntity(\"cat\", Cat.class)\n" 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/transactions.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects have to be checked. " +"instances, but complete graphs of modified ojects 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/fr-FR/content/tutorial.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects to the current thread of execution. This " +"automatically bind these ojects 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/association_mapping.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/association_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -801,7 +801,7 @@ " </property>\n" "</properties>\n" "<property name=\"effectiveEndDate\" type=\"date\"/>\n" -"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>" +"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>" msgstr "" #. Tag: para 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/component_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects, only \"the same\" by value. The " +"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 " 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/query_sql.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -465,10 +465,10 @@ #: query_sql.xml:192 #, no-c-format msgid "" -"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n" -" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} " +"<![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 cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n" +" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.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/transactions.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/transactions.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects have to be checked. " +"instances, but complete graphs of modified ojects 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ja-JP/content/tutorial.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects to the current thread of execution. This " +"automatically bind these ojects 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/association_mapping.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/association_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -811,7 +811,7 @@ " </property>\n" "</properties>\n" "<property name=\"effectiveEndDate\" type=\"date\"/>\n" -"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>" +"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>" msgstr "" #. Tag: para 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/component_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects, only \"the same\" by value. The " +"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 " 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/query_sql.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -466,10 +466,10 @@ #: query_sql.xml:192 #, no-c-format msgid "" -"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n" -" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} " +"<![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 cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n" +" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.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/transactions.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/transactions.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects have to be checked. " +"instances, but complete graphs of modified ojects 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/ko-KR/content/tutorial.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects to the current thread of execution. This " +"automatically bind these ojects 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/association_mapping.pot =================================================================== --- core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot 2008-08-14 14:03:09 UTC (rev 15064) @@ -685,7 +685,7 @@ " </property>\n" "</properties>\n" "<property name=\"effectiveEndDate\" type=\"date\"/>\n" - "<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>" + "<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>" msgstr "" #. Tag: para 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/pot/content/component_mapping.pot 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 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." +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." msgstr "" #. Tag: para 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/pot/content/query_sql.pot 2008-08-14 14:03:09 UTC (rev 15064) @@ -310,9 +310,9 @@ #: query_sql.xml:216 #, no-c-format msgid "" - "<![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" + "<![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" "\n" "List loggedCats = sess.createSQLQuery(sql)\n" " .addEntity(\"cat\", Cat.class)\n" 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/association_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -833,7 +833,7 @@ " </property>\n" "</properties>\n" "<property name=\"effectiveEndDate\" type=\"date\"/>\n" -"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>" +"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>" 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/component_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects, only \"the same\" by value. The " +"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 " 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/query_sql.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -474,10 +474,10 @@ #: query_sql.xml:192 #, no-c-format msgid "" -"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n" -" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} " +"<![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 cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n" +" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.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/transactions.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/transactions.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects have to be checked. " +"instances, but complete graphs of modified ojects 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/pt-BR/content/tutorial.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects to the current thread of execution. This " +"automatically bind these ojects 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/association_mapping.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/association_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -802,7 +802,7 @@ " </property>\n" "</properties>\n" "<property name=\"effectiveEndDate\" type=\"date\"/>\n" -"<property name=\"effectiveStartDate\" type=\"date\" not-null=\"true\"/>]]>" +"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>" msgstr "" #. Tag: para 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/component_mapping.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects, only \"the same\" by value. The " +"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 " 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/query_sql.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -452,10 +452,10 @@ #: query_sql.xml:192 #, no-c-format msgid "" -"<![CDATA[String sql = \"SELECT ID as {cat.id}, NAME as {cat.name}, \" + \n" -" \"BIRTHDATE as {cat.birthDate}, MOTHER_ID as {cat.mother}, {mother.*} " +"<![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 cat, CAT_LOG mother WHERE {cat.mother} = cat.ID\";\n" +" \"FROM CAT_LOG c, CAT_LOG m WHERE {c.mother} = c.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/transactions.po =================================================================== --- core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po 2008-08-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/transactions.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects have to be checked. " +"instances, but complete graphs of modified ojects 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-14 13:58:04 UTC (rev 15063) +++ core/trunk/documentation/manual/src/main/docbook/zh-CN/content/tutorial.po 2008-08-14 14:03:09 UTC (rev 15064) @@ -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 objects to the current thread of execution. This " +"automatically bind these ojects 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 "