August 2008 - hibernate-commits - Jboss List Archives

Hibernate SVN: r15064 - in core/trunk/documentation/manual: old/ja-JP/src/main/docbook/content and 11 other directories.

by hibernate-commits＠lists.jboss.org

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çã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 "

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15063 - core/branches.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-08-14 09:58:04 -0400 (Thu, 14 Aug 2008) New Revision: 15063 Removed: core/branches/Branch_3_3/ Log: need to rebranch

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15062 - in search/trunk/src/java/org/hibernate/search: bridge and 1 other directory.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-08-14 09:50:56 -0400 (Thu, 14 Aug 2008) New Revision: 15062 Modified: search/trunk/src/java/org/hibernate/search/annotations/Indexed.java search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java Log: Rollback style mistakes Modified: search/trunk/src/java/org/hibernate/search/annotations/Indexed.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/Indexed.java 2008-08-14 10:54:34 UTC (rev 15061) +++ search/trunk/src/java/org/hibernate/search/annotations/Indexed.java 2008-08-14 13:50:56 UTC (rev 15062) @@ -1,7 +1,11 @@ //$Id$ package org.hibernate.search.annotations; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.TYPE ) Modified: search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java =================================================================== --- search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java 2008-08-14 10:54:34 UTC (rev 15061) +++ search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java 2008-08-14 13:50:56 UTC (rev 15062) @@ -40,208 +40,198 @@ * @author John Griffin */ public class BridgeFactory { - private static Map<String, FieldBridge> builtInBridges = new HashMap<String, FieldBridge>(); + private static Map<String, FieldBridge> builtInBridges = new HashMap<String, FieldBridge>(); - private BridgeFactory() { - } + private BridgeFactory() { + } - public static final TwoWayFieldBridge DOUBLE = new TwoWayString2FieldBridgeAdaptor(new DoubleBridge()); + public static final TwoWayFieldBridge DOUBLE = new TwoWayString2FieldBridgeAdaptor( new DoubleBridge() ); - public static final TwoWayFieldBridge FLOAT = new TwoWayString2FieldBridgeAdaptor(new FloatBridge()); + public static final TwoWayFieldBridge FLOAT = new TwoWayString2FieldBridgeAdaptor( new FloatBridge() ); - public static final TwoWayFieldBridge SHORT = new TwoWayString2FieldBridgeAdaptor(new ShortBridge()); + public static final TwoWayFieldBridge SHORT = new TwoWayString2FieldBridgeAdaptor( new ShortBridge() ); - public static final TwoWayFieldBridge INTEGER = new TwoWayString2FieldBridgeAdaptor(new IntegerBridge()); + public static final TwoWayFieldBridge INTEGER = new TwoWayString2FieldBridgeAdaptor( new IntegerBridge() ); - public static final TwoWayFieldBridge LONG = new TwoWayString2FieldBridgeAdaptor(new LongBridge()); + public static final TwoWayFieldBridge LONG = new TwoWayString2FieldBridgeAdaptor( new LongBridge() ); - public static final TwoWayFieldBridge BIG_INTEGER = new TwoWayString2FieldBridgeAdaptor(new BigIntegerBridge()); + public static final TwoWayFieldBridge BIG_INTEGER = new TwoWayString2FieldBridgeAdaptor( new BigIntegerBridge() ); - public static final TwoWayFieldBridge BIG_DECIMAL = new TwoWayString2FieldBridgeAdaptor(new BigDecimalBridge()); + public static final TwoWayFieldBridge BIG_DECIMAL = new TwoWayString2FieldBridgeAdaptor( new BigDecimalBridge() ); - public static final TwoWayFieldBridge STRING = new TwoWayString2FieldBridgeAdaptor(new StringBridge()); + public static final TwoWayFieldBridge STRING = new TwoWayString2FieldBridgeAdaptor( new StringBridge() ); - public static final TwoWayFieldBridge BOOLEAN = new TwoWayString2FieldBridgeAdaptor(new BooleanBridge()); + public static final TwoWayFieldBridge BOOLEAN = new TwoWayString2FieldBridgeAdaptor( new BooleanBridge() ); - public static final TwoWayFieldBridge CLAZZ = new TwoWayString2FieldBridgeAdaptor(new org.hibernate.search.bridge.builtin.ClassBridge()); + public static final TwoWayFieldBridge CLAZZ = new TwoWayString2FieldBridgeAdaptor( new org.hibernate.search.bridge.builtin.ClassBridge() ); - public static final TwoWayFieldBridge Url = new TwoWayString2FieldBridgeAdaptor(new UrlBridge()); + public static final TwoWayFieldBridge Url = new TwoWayString2FieldBridgeAdaptor( new UrlBridge() ); - public static final TwoWayFieldBridge Uri = new TwoWayString2FieldBridgeAdaptor(new UriBridge()); + public static final TwoWayFieldBridge Uri = new TwoWayString2FieldBridgeAdaptor( new UriBridge() ); - public static final FieldBridge DATE_YEAR = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_YEAR); - public static final FieldBridge DATE_MONTH = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_MONTH); - public static final FieldBridge DATE_DAY = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_DAY); - public static final FieldBridge DATE_HOUR = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_HOUR); - public static final FieldBridge DATE_MINUTE = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_MINUTE); - public static final FieldBridge DATE_SECOND = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_SECOND); - public static final TwoWayFieldBridge DATE_MILLISECOND = - new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_MILLISECOND); + public static final FieldBridge DATE_YEAR = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_YEAR ); + public static final FieldBridge DATE_MONTH = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_MONTH ); + public static final FieldBridge DATE_DAY = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_DAY ); + public static final FieldBridge DATE_HOUR = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_HOUR ); + public static final FieldBridge DATE_MINUTE = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_MINUTE ); + public static final FieldBridge DATE_SECOND = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_SECOND ); + public static final TwoWayFieldBridge DATE_MILLISECOND = + new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_MILLISECOND ); - static { - builtInBridges.put(Double.class.getName(), DOUBLE); - builtInBridges.put(double.class.getName(), DOUBLE); - builtInBridges.put(Float.class.getName(), FLOAT); - builtInBridges.put(float.class.getName(), FLOAT); - builtInBridges.put(Short.class.getName(), SHORT); - builtInBridges.put(short.class.getName(), SHORT); - builtInBridges.put(Integer.class.getName(), INTEGER); - builtInBridges.put(int.class.getName(), INTEGER); - builtInBridges.put(Long.class.getName(), LONG); - builtInBridges.put(long.class.getName(), LONG); - builtInBridges.put(BigInteger.class.getName(), BIG_INTEGER); - builtInBridges.put(BigDecimal.class.getName(), BIG_DECIMAL); - builtInBridges.put(String.class.getName(), STRING); - builtInBridges.put(Boolean.class.getName(), BOOLEAN); - builtInBridges.put(boolean.class.getName(), BOOLEAN); - builtInBridges.put(Class.class.getName(), CLAZZ); - builtInBridges.put(URL.class.getName(), Url); - builtInBridges.put(URI.class.getName(), Uri); + static { + builtInBridges.put( Double.class.getName(), DOUBLE ); + builtInBridges.put( double.class.getName(), DOUBLE ); + builtInBridges.put( Float.class.getName(), FLOAT ); + builtInBridges.put( float.class.getName(), FLOAT ); + builtInBridges.put( Short.class.getName(), SHORT ); + builtInBridges.put( short.class.getName(), SHORT ); + builtInBridges.put( Integer.class.getName(), INTEGER ); + builtInBridges.put( int.class.getName(), INTEGER ); + builtInBridges.put( Long.class.getName(), LONG ); + builtInBridges.put( long.class.getName(), LONG ); + builtInBridges.put( BigInteger.class.getName(), BIG_INTEGER ); + builtInBridges.put( BigDecimal.class.getName(), BIG_DECIMAL ); + builtInBridges.put( String.class.getName(), STRING ); + builtInBridges.put( Boolean.class.getName(), BOOLEAN ); + builtInBridges.put( boolean.class.getName(), BOOLEAN ); + builtInBridges.put( Class.class.getName(), CLAZZ ); + builtInBridges.put( URL.class.getName(), Url ); + builtInBridges.put( URI.class.getName(), Uri ); - builtInBridges.put(Date.class.getName(), DATE_MILLISECOND); - } + builtInBridges.put( Date.class.getName(), DATE_MILLISECOND ); + } - /** - * This extracts and instantiates the implementation class from a ClassBridge - * annotation. - * - * @param cb the ClassBridge - * @return FieldBridge - */ - public static FieldBridge extractType(ClassBridge cb) { - FieldBridge bridge = null; + /** + * This extracts and instantiates the implementation class from a ClassBridge + * annotation. + * + * @param cb the ClassBridge + * @return FieldBridge + */ + public static FieldBridge extractType(ClassBridge cb) + { + FieldBridge bridge = null; - if (cb != null) { - Class impl = cb.impl(); - //TODO better error information ( see guessType() ) - if (impl != null) { - try { - Object instance = impl.newInstance(); - if (FieldBridge.class.isAssignableFrom(impl)) { - bridge = (FieldBridge) instance; - } - else if (org.hibernate.search.bridge.TwoWayStringBridge.class.isAssignableFrom(impl)) { - bridge = new TwoWayString2FieldBridgeAdaptor( - (org.hibernate.search.bridge.TwoWayStringBridge) instance); - } - else if (org.hibernate.search.bridge.StringBridge.class.isAssignableFrom(impl)) { - bridge = new String2FieldBridgeAdaptor((org.hibernate.search.bridge.StringBridge) instance); - } - else { - throw new SearchException("@ClassBridge implementation implements none of the field bridge interfaces: " - + impl); - } - if (cb.params().length > 0 && ParameterizedBridge.class.isAssignableFrom(impl)) { - Map params = new HashMap(cb.params().length); - for (Parameter param : cb.params()) { - params.put(param.name(), param.value()); - } - ((ParameterizedBridge) instance).setParameterValues(params); - } - } - catch (Exception e) { - throw new HibernateException("Unable to instantiate FieldBridge for " + ClassBridge.class.getName(), e); - } - } - } - if (bridge == null) throw new SearchException("Unable to guess FieldBridge for " + ClassBridge.class.getName()); + if ( cb != null ) { + Class impl = cb.impl(); + //TODO better error information ( see guessType() ) + if (impl != null) { + try { + Object instance = impl.newInstance(); + if ( FieldBridge.class.isAssignableFrom( impl ) ) { + bridge = (FieldBridge) instance; + } + else if ( org.hibernate.search.bridge.TwoWayStringBridge.class.isAssignableFrom( impl ) ) { + bridge = new TwoWayString2FieldBridgeAdaptor( + (org.hibernate.search.bridge.TwoWayStringBridge) instance ); + } + else if ( org.hibernate.search.bridge.StringBridge.class.isAssignableFrom( impl ) ) { + bridge = new String2FieldBridgeAdaptor( (org.hibernate.search.bridge.StringBridge) instance ); + } + else { + throw new SearchException("@ClassBridge implementation implements none of the field bridge interfaces: " + + impl ); + } + if ( cb.params().length > 0 && ParameterizedBridge.class.isAssignableFrom( impl ) ) { + Map params = new HashMap( cb.params().length ); + for ( Parameter param : cb.params() ) { + params.put( param.name(), param.value() ); + } + ( (ParameterizedBridge) instance ).setParameterValues( params ); + } + } + catch (Exception e) { + throw new HibernateException( "Unable to instantiate FieldBridge for " + ClassBridge.class.getName(), e ); + } + } + } + if ( bridge == null ) throw new SearchException( "Unable to guess FieldBridge for " + ClassBridge.class.getName() ); - return bridge; - } + return bridge; + } - public static TwoWayFieldBridge extractTwoWayType(ClassBridge cb) { - FieldBridge fb = extractType(cb); - if (fb instanceof TwoWayFieldBridge) { - return (TwoWayFieldBridge) fb; - } - else { - throw new HibernateException("ClassBridge passed in is not an instance of " + TwoWayFieldBridge.class.getSimpleName()); - } - } + public static FieldBridge guessType(Field field, XMember member, ReflectionManager reflectionManager) { + FieldBridge bridge; + org.hibernate.search.annotations.FieldBridge bridgeAnn; + //@Field bridge has priority over @FieldBridge + if ( field != null && void.class != field.bridge().impl() ) { + bridgeAnn = field.bridge(); + } + else { + bridgeAnn = member.getAnnotation( org.hibernate.search.annotations.FieldBridge.class ); + } + if ( bridgeAnn != null ) { + Class impl = bridgeAnn.impl(); + if (impl == void.class) + throw new SearchException("@FieldBridge with no implementation class defined in: " + member.getName() ); + try { + Object instance = impl.newInstance(); + if ( FieldBridge.class.isAssignableFrom( impl ) ) { + bridge = (FieldBridge) instance; + } + else if ( org.hibernate.search.bridge.TwoWayStringBridge.class.isAssignableFrom( impl ) ) { + bridge = new TwoWayString2FieldBridgeAdaptor( + (org.hibernate.search.bridge.TwoWayStringBridge) instance ); + } + else if ( org.hibernate.search.bridge.StringBridge.class.isAssignableFrom( impl ) ) { + bridge = new String2FieldBridgeAdaptor( (org.hibernate.search.bridge.StringBridge) instance ); + } + else { + throw new SearchException("@FieldBridge implementation implements none of the field bridge interfaces: " + + impl + " in " + member.getName() ); + } + if ( bridgeAnn.params().length > 0 && ParameterizedBridge.class.isAssignableFrom( impl ) ) { + Map params = new HashMap( bridgeAnn.params().length ); + for ( Parameter param : bridgeAnn.params() ) { + params.put( param.name(), param.value() ); + } + ( (ParameterizedBridge) instance ).setParameterValues( params ); + } - public static FieldBridge guessType(Field field, XMember member, ReflectionManager reflectionManager) { - FieldBridge bridge; - org.hibernate.search.annotations.FieldBridge bridgeAnn; - //@Field bridge has priority over @FieldBridge - if (field != null && void.class != field.bridge().impl()) { - bridgeAnn = field.bridge(); - } - else { - bridgeAnn = member.getAnnotation(org.hibernate.search.annotations.FieldBridge.class); - } - if (bridgeAnn != null) { - Class impl = bridgeAnn.impl(); - if (impl == void.class) { - throw new SearchException("@FieldBridge with no implementation class defined in: " + member.getName()); - } - try { - Object instance = impl.newInstance(); - if (FieldBridge.class.isAssignableFrom(impl)) { - bridge = (FieldBridge) instance; - } - else if (org.hibernate.search.bridge.TwoWayStringBridge.class.isAssignableFrom(impl)) { - bridge = new TwoWayString2FieldBridgeAdaptor( - (org.hibernate.search.bridge.TwoWayStringBridge) instance); - } - else if (org.hibernate.search.bridge.StringBridge.class.isAssignableFrom(impl)) { - bridge = new String2FieldBridgeAdaptor((org.hibernate.search.bridge.StringBridge) instance); - } - else { - throw new SearchException("@FieldBridge implementation implements none of the field bridge interfaces: " - + impl + " in " + member.getName()); - } - if (bridgeAnn.params().length > 0 && ParameterizedBridge.class.isAssignableFrom(impl)) { - Map params = new HashMap(bridgeAnn.params().length); - for (Parameter param : bridgeAnn.params()) { - params.put(param.name(), param.value()); - } - ((ParameterizedBridge) instance).setParameterValues(params); - } + } + catch (Exception e) { + //TODO add classname + throw new HibernateException( "Unable to instanciate FieldBridge for " + member.getName(), e ); + } + } + else if ( member.isAnnotationPresent( org.hibernate.search.annotations.DateBridge.class ) ) { + Resolution resolution = + member.getAnnotation( org.hibernate.search.annotations.DateBridge.class ).resolution(); + bridge = getDateField( resolution ); + } + else { + //find in built-ins + XClass returnType = member.getType(); + bridge = builtInBridges.get( returnType.getName() ); + if ( bridge == null && returnType.isEnum() ) { + bridge = new TwoWayString2FieldBridgeAdaptor( + new EnumBridge( (Class<? extends Enum>) reflectionManager.toClass( returnType ) ) + ); + } + } + //TODO add classname + if ( bridge == null ) throw new SearchException( "Unable to guess FieldBridge for " + member.getName() ); + return bridge; + } - } - catch (Exception e) { - //TODO add classname - throw new HibernateException("Unable to instanciate FieldBridge for " + member.getName(), e); - } - } - else if (member.isAnnotationPresent(org.hibernate.search.annotations.DateBridge.class)) { - Resolution resolution = - member.getAnnotation(org.hibernate.search.annotations.DateBridge.class).resolution(); - bridge = getDateField(resolution); - } - else { - //find in built-ins - XClass returnType = member.getType(); - bridge = builtInBridges.get(returnType.getName()); - if (bridge == null && returnType.isEnum()) { - bridge = new TwoWayString2FieldBridgeAdaptor( - new EnumBridge((Class<? extends Enum>) reflectionManager.toClass(returnType)) - ); - } - } - //TODO add classname - if (bridge == null) throw new SearchException("Unable to guess FieldBridge for " + member.getName()); - return bridge; - } - - public static FieldBridge getDateField(Resolution resolution) { - switch (resolution) { - case YEAR: - return DATE_YEAR; - case MONTH: - return DATE_MONTH; - case DAY: - return DATE_DAY; - case HOUR: - return DATE_HOUR; - case MINUTE: - return DATE_MINUTE; - case SECOND: - return DATE_SECOND; - case MILLISECOND: - return DATE_MILLISECOND; - default: - throw new AssertionFailure("Unknown Resolution: " + resolution); - } - } + public static FieldBridge getDateField(Resolution resolution) { + switch (resolution) { + case YEAR: + return DATE_YEAR; + case MONTH: + return DATE_MONTH; + case DAY: + return DATE_DAY; + case HOUR: + return DATE_HOUR; + case MINUTE: + return DATE_MINUTE; + case SECOND: + return DATE_SECOND; + case MILLISECOND: + return DATE_MILLISECOND; + default: + throw new AssertionFailure( "Unknown Resolution: " + resolution ); + } + } }

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15061 - search/trunk.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2008-08-14 06:54:34 -0400 (Thu, 14 Aug 2008) New Revision: 15061 Modified: search/trunk/ivy.xml Log: fixed corrupted xml file Modified: search/trunk/ivy.xml =================================================================== --- search/trunk/ivy.xml 2008-08-14 08:15:28 UTC (rev 15060) +++ search/trunk/ivy.xml 2008-08-14 10:54:34 UTC (rev 15061) @@ -1,43 +1,43 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ivy-module version="1.3" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation= - "http://www.jayasoft.org/misc/ivy/ivy.xsd"> - <info organisation="org.hibernate" module="search"/> - <configurations> - <conf name="default" description="Core module dependencies"/> - <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/> - </configurations> - <publications> - <artifact name="hibernate-search" conf="default"/> - </publications> - <dependencies> - -  - <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/> - <dependency name="commons-annotations" rev="3.1.0.CR1" conf="default->default"/> - <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/> - <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR2" conf="default->default"/> - <dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/> - <dependency org="org.apache.lucene" name="lucene-core" rev="2.3.2" conf="default->default"/> - <dependency org="javax.jms" name="jms" rev="1.1" conf="default->default"/>  - <dependency org="javax.annotation" name="jsr250-api" rev="1.0" conf="default->default"/>  - <dependency org="org.hibernate.apache.lucene.solr" name="apache-solr-analyzer" rev="1.2.0" conf="default->default"/>  - -  - <dependency org="antlr" name="antlr" rev="2.7.6" conf="test->default"/> - <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="test->default"/> - <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="test->default"/> - -  - <dependency name="annotations" rev="3.4.0.CR2" conf="test->default"/> - <dependency name="entitymanager" rev="3.4.0.CR1" conf="test->default"/> - <dependency org="cglib" name="cglib" rev="2.1_3" conf="test->default"/> - <dependency org="asm" name="asm" rev="1.5.3" conf="test->default"/> - <dependency org="asm" name="asm-attrs" rev="1.5.3" conf="test->default"/> - <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/> - <dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/> - <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/> - - </dependencies> +<?xml version="1.0" encoding="UTF-8"?> +<ivy-module version="1.3" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation= + "http://www.jayasoft.org/misc/ivy/ivy.xsd"> + <info organisation="org.hibernate" module="search"/> + <configurations> + <conf name="default" description="Core module dependencies"/> + <conf name="test" visibility="private" description="Dependencies needed for testing purposes"/> + </configurations> + <publications> + <artifact name="hibernate-search" conf="default"/> + </publications> + <dependencies> + +  + <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/> + <dependency name="commons-annotations" rev="3.1.0.CR1" conf="default->default"/> + <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/> + <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR2" conf="default->default"/> + <dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/> + <dependency org="org.apache.lucene" name="lucene-core" rev="2.3.2" conf="default->default"/> + <dependency org="javax.jms" name="jms" rev="1.1" conf="default->default"/>  + <dependency org="javax.annotation" name="jsr250-api" rev="1.0" conf="default->default"/>  + <dependency org="org.hibernate.apache.lucene.solr" name="apache-solr-analyzer" rev="1.2.0" conf="default->default"/>  + +  + <dependency org="antlr" name="antlr" rev="2.7.6" conf="test->default"/> + <dependency org="commons-collections" name="commons-collections" rev="3.1" conf="test->default"/> + <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="test->default"/> + +  + <dependency name="annotations" rev="3.4.0.CR2" conf="test->default"/> + <dependency name="entitymanager" rev="3.4.0.CR1" conf="test->default"/> + <dependency org="cglib" name="cglib" rev="2.1_3" conf="test->default"/> + <dependency org="asm" name="asm" rev="1.5.3" conf="test->default"/> + <dependency org="asm" name="asm-attrs" rev="1.5.3" conf="test->default"/> + <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.4.2" conf="test->default"/> + <dependency org="log4j" name="log4j" rev="1.2.14" conf="test->default"/> + <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/> + + </dependencies> </ivy-module> \ No newline at end of file

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15060 - search/trunk.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2008-08-14 04:15:28 -0400 (Thu, 14 Aug 2008) New Revision: 15060 Modified: search/trunk/ivy.xml Log: Upgraded the Hibernate Core dependecy to CR2. Modified: search/trunk/ivy.xml =================================================================== --- search/trunk/ivy.xml 2008-08-14 07:54:53 UTC (rev 15059) +++ search/trunk/ivy.xml 2008-08-14 08:15:28 UTC (rev 15060) @@ -17,7 +17,7 @@ <dependency name="ejb3-persistence" rev="1.0.2.GA" conf="default->default"/> <dependency name="commons-annotations" rev="3.1.0.CR1" conf="default->default"/> <dependency org="org.slf4j" name="slf4j-api" rev="1.4.2" conf="default->default"/> - <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR1" conf="default->default"/> + <dependency org="org.hibernate" name="hibernate-core" rev="3.3.0.CR2" conf="default->default"/> <dependency org="javax.transaction" name="jta" rev="1.1" conf="default->default"/> <dependency org="org.apache.lucene" name="lucene-core" rev="2.3.2" conf="default->default"/> <dependency org="javax.jms" name="jms" rev="1.1" conf="default->default"/>

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15059 - search/trunk.

by hibernate-commits＠lists.jboss.org

Author: hardy.ferentschik Date: 2008-08-14 03:54:53 -0400 (Thu, 14 Aug 2008) New Revision: 15059 Modified: search/trunk/ivy.xml Log: Replaced 'latest' version for annotatons with explicit version number 3.4.0.CR2 Modified: search/trunk/ivy.xml =================================================================== --- search/trunk/ivy.xml 2008-08-14 06:17:05 UTC (rev 15058) +++ search/trunk/ivy.xml 2008-08-14 07:54:53 UTC (rev 15059) @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <ivy-module version="1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation= @@ -30,7 +30,7 @@ <dependency org="dom4j" name="dom4j" rev="1.6.1" conf="test->default"/>  - <dependency name="annotations" rev="latest" conf="test->default"/> + <dependency name="annotations" rev="3.4.0.CR2" conf="test->default"/> <dependency name="entitymanager" rev="3.4.0.CR1" conf="test->default"/> <dependency org="cglib" name="cglib" rev="2.1_3" conf="test->default"/> <dependency org="asm" name="asm" rev="1.5.3" conf="test->default"/>

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15058 - in search/trunk/src: java/org/hibernate/search/bridge and 2 other directories.

by hibernate-commits＠lists.jboss.org

Author: navssurtani Date: 2008-08-14 02:17:05 -0400 (Thu, 14 Aug 2008) New Revision: 15058 Modified: search/trunk/src/java/org/hibernate/search/annotations/Indexed.java search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java search/trunk/src/test/org/hibernate/search/test/SearchTestCase.java Log: navssurtani finished to-do in DocumentBuilder Modified: search/trunk/src/java/org/hibernate/search/annotations/Indexed.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/Indexed.java 2008-08-13 18:17:51 UTC (rev 15057) +++ search/trunk/src/java/org/hibernate/search/annotations/Indexed.java 2008-08-14 06:17:05 UTC (rev 15058) @@ -1,11 +1,7 @@ //$Id$ package org.hibernate.search.annotations; -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; +import java.lang.annotation.*; @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.TYPE ) Modified: search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java =================================================================== --- search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java 2008-08-13 18:17:51 UTC (rev 15057) +++ search/trunk/src/java/org/hibernate/search/annotations/ProvidedId.java 2008-08-14 06:17:05 UTC (rev 15058) @@ -8,6 +8,8 @@ import java.lang.annotation.Target; import org.hibernate.search.bridge.StringBridge; +import org.hibernate.search.bridge.TwoWayFieldBridge; +import org.hibernate.search.bridge.TwoWayString2FieldBridgeAdaptor; /** * Objects whose identifier is provided externally and not part of the object state @@ -17,12 +19,12 @@ * * @author Navin Surtani (<a href="mailto:nsurtani@redhat.com">nsurtani(a)redhat.com</a>) */ -@Retention( RetentionPolicy.RUNTIME ) -@Target( ElementType.TYPE ) +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target(ElementType.TYPE) @Documented public @interface ProvidedId { - String name() default "providedId"; + String name() default "providedId"; - Class<?> bridge() default StringBridge.class; + ClassBridge bridgeImpl() default @ClassBridge(impl = org.hibernate.search.bridge.builtin.StringBridge.class); } Modified: search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java =================================================================== --- search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java 2008-08-13 18:17:51 UTC (rev 15057) +++ search/trunk/src/java/org/hibernate/search/bridge/BridgeFactory.java 2008-08-14 06:17:05 UTC (rev 15058) @@ -35,203 +35,213 @@ /** * This factory is responsible for creating and initializing build-in and custom <i>FieldBridges</i>. - * + * * @author Emmanuel Bernard * @author John Griffin */ public class BridgeFactory { - private static Map<String, FieldBridge> builtInBridges = new HashMap<String, FieldBridge>(); + private static Map<String, FieldBridge> builtInBridges = new HashMap<String, FieldBridge>(); - private BridgeFactory() { - } + private BridgeFactory() { + } - public static final TwoWayFieldBridge DOUBLE = new TwoWayString2FieldBridgeAdaptor( new DoubleBridge() ); + public static final TwoWayFieldBridge DOUBLE = new TwoWayString2FieldBridgeAdaptor(new DoubleBridge()); - public static final TwoWayFieldBridge FLOAT = new TwoWayString2FieldBridgeAdaptor( new FloatBridge() ); + public static final TwoWayFieldBridge FLOAT = new TwoWayString2FieldBridgeAdaptor(new FloatBridge()); - public static final TwoWayFieldBridge SHORT = new TwoWayString2FieldBridgeAdaptor( new ShortBridge() ); + public static final TwoWayFieldBridge SHORT = new TwoWayString2FieldBridgeAdaptor(new ShortBridge()); - public static final TwoWayFieldBridge INTEGER = new TwoWayString2FieldBridgeAdaptor( new IntegerBridge() ); + public static final TwoWayFieldBridge INTEGER = new TwoWayString2FieldBridgeAdaptor(new IntegerBridge()); - public static final TwoWayFieldBridge LONG = new TwoWayString2FieldBridgeAdaptor( new LongBridge() ); + public static final TwoWayFieldBridge LONG = new TwoWayString2FieldBridgeAdaptor(new LongBridge()); - public static final TwoWayFieldBridge BIG_INTEGER = new TwoWayString2FieldBridgeAdaptor( new BigIntegerBridge() ); + public static final TwoWayFieldBridge BIG_INTEGER = new TwoWayString2FieldBridgeAdaptor(new BigIntegerBridge()); - public static final TwoWayFieldBridge BIG_DECIMAL = new TwoWayString2FieldBridgeAdaptor( new BigDecimalBridge() ); + public static final TwoWayFieldBridge BIG_DECIMAL = new TwoWayString2FieldBridgeAdaptor(new BigDecimalBridge()); - public static final TwoWayFieldBridge STRING = new TwoWayString2FieldBridgeAdaptor( new StringBridge() ); + public static final TwoWayFieldBridge STRING = new TwoWayString2FieldBridgeAdaptor(new StringBridge()); - public static final TwoWayFieldBridge BOOLEAN = new TwoWayString2FieldBridgeAdaptor( new BooleanBridge() ); + public static final TwoWayFieldBridge BOOLEAN = new TwoWayString2FieldBridgeAdaptor(new BooleanBridge()); - public static final TwoWayFieldBridge CLAZZ = new TwoWayString2FieldBridgeAdaptor( new org.hibernate.search.bridge.builtin.ClassBridge() ); + public static final TwoWayFieldBridge CLAZZ = new TwoWayString2FieldBridgeAdaptor(new org.hibernate.search.bridge.builtin.ClassBridge()); - public static final TwoWayFieldBridge Url = new TwoWayString2FieldBridgeAdaptor( new UrlBridge() ); + public static final TwoWayFieldBridge Url = new TwoWayString2FieldBridgeAdaptor(new UrlBridge()); - public static final TwoWayFieldBridge Uri = new TwoWayString2FieldBridgeAdaptor( new UriBridge() ); + public static final TwoWayFieldBridge Uri = new TwoWayString2FieldBridgeAdaptor(new UriBridge()); - public static final FieldBridge DATE_YEAR = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_YEAR ); - public static final FieldBridge DATE_MONTH = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_MONTH ); - public static final FieldBridge DATE_DAY = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_DAY ); - public static final FieldBridge DATE_HOUR = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_HOUR ); - public static final FieldBridge DATE_MINUTE = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_MINUTE ); - public static final FieldBridge DATE_SECOND = new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_SECOND ); - public static final TwoWayFieldBridge DATE_MILLISECOND = - new TwoWayString2FieldBridgeAdaptor( DateBridge.DATE_MILLISECOND ); + public static final FieldBridge DATE_YEAR = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_YEAR); + public static final FieldBridge DATE_MONTH = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_MONTH); + public static final FieldBridge DATE_DAY = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_DAY); + public static final FieldBridge DATE_HOUR = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_HOUR); + public static final FieldBridge DATE_MINUTE = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_MINUTE); + public static final FieldBridge DATE_SECOND = new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_SECOND); + public static final TwoWayFieldBridge DATE_MILLISECOND = + new TwoWayString2FieldBridgeAdaptor(DateBridge.DATE_MILLISECOND); - static { - builtInBridges.put( Double.class.getName(), DOUBLE ); - builtInBridges.put( double.class.getName(), DOUBLE ); - builtInBridges.put( Float.class.getName(), FLOAT ); - builtInBridges.put( float.class.getName(), FLOAT ); - builtInBridges.put( Short.class.getName(), SHORT ); - builtInBridges.put( short.class.getName(), SHORT ); - builtInBridges.put( Integer.class.getName(), INTEGER ); - builtInBridges.put( int.class.getName(), INTEGER ); - builtInBridges.put( Long.class.getName(), LONG ); - builtInBridges.put( long.class.getName(), LONG ); - builtInBridges.put( BigInteger.class.getName(), BIG_INTEGER ); - builtInBridges.put( BigDecimal.class.getName(), BIG_DECIMAL ); - builtInBridges.put( String.class.getName(), STRING ); - builtInBridges.put( Boolean.class.getName(), BOOLEAN ); - builtInBridges.put( boolean.class.getName(), BOOLEAN ); - builtInBridges.put( Class.class.getName(), CLAZZ ); - builtInBridges.put( URL.class.getName(), Url ); - builtInBridges.put( URI.class.getName(), Uri ); + static { + builtInBridges.put(Double.class.getName(), DOUBLE); + builtInBridges.put(double.class.getName(), DOUBLE); + builtInBridges.put(Float.class.getName(), FLOAT); + builtInBridges.put(float.class.getName(), FLOAT); + builtInBridges.put(Short.class.getName(), SHORT); + builtInBridges.put(short.class.getName(), SHORT); + builtInBridges.put(Integer.class.getName(), INTEGER); + builtInBridges.put(int.class.getName(), INTEGER); + builtInBridges.put(Long.class.getName(), LONG); + builtInBridges.put(long.class.getName(), LONG); + builtInBridges.put(BigInteger.class.getName(), BIG_INTEGER); + builtInBridges.put(BigDecimal.class.getName(), BIG_DECIMAL); + builtInBridges.put(String.class.getName(), STRING); + builtInBridges.put(Boolean.class.getName(), BOOLEAN); + builtInBridges.put(boolean.class.getName(), BOOLEAN); + builtInBridges.put(Class.class.getName(), CLAZZ); + builtInBridges.put(URL.class.getName(), Url); + builtInBridges.put(URI.class.getName(), Uri); - builtInBridges.put( Date.class.getName(), DATE_MILLISECOND ); - } - - /** - * This extracts and instantiates the implementation class from a ClassBridge - * annotation. - * - * @param cb the ClassBridge - * @return FieldBridge - */ - public static FieldBridge extractType(ClassBridge cb) - { - FieldBridge bridge = null; + builtInBridges.put(Date.class.getName(), DATE_MILLISECOND); + } - if ( cb != null ) { - Class impl = cb.impl(); - //TODO better error information ( see guessType() ) - if (impl != null) { - try { - Object instance = impl.newInstance(); - if ( FieldBridge.class.isAssignableFrom( impl ) ) { - bridge = (FieldBridge) instance; - } - else if ( org.hibernate.search.bridge.TwoWayStringBridge.class.isAssignableFrom( impl ) ) { - bridge = new TwoWayString2FieldBridgeAdaptor( - (org.hibernate.search.bridge.TwoWayStringBridge) instance ); - } - else if ( org.hibernate.search.bridge.StringBridge.class.isAssignableFrom( impl ) ) { - bridge = new String2FieldBridgeAdaptor( (org.hibernate.search.bridge.StringBridge) instance ); - } - else { - throw new SearchException("@ClassBridge implementation implements none of the field bridge interfaces: " - + impl ); - } - if ( cb.params().length > 0 && ParameterizedBridge.class.isAssignableFrom( impl ) ) { - Map params = new HashMap( cb.params().length ); - for ( Parameter param : cb.params() ) { - params.put( param.name(), param.value() ); - } - ( (ParameterizedBridge) instance ).setParameterValues( params ); - } - } - catch (Exception e) { - throw new HibernateException( "Unable to instantiate FieldBridge for " + ClassBridge.class.getName(), e ); - } - } - } - if ( bridge == null ) throw new SearchException( "Unable to guess FieldBridge for " + ClassBridge.class.getName() ); + /** + * This extracts and instantiates the implementation class from a ClassBridge + * annotation. + * + * @param cb the ClassBridge + * @return FieldBridge + */ + public static FieldBridge extractType(ClassBridge cb) { + FieldBridge bridge = null; - return bridge; - } + if (cb != null) { + Class impl = cb.impl(); + //TODO better error information ( see guessType() ) + if (impl != null) { + try { + Object instance = impl.newInstance(); + if (FieldBridge.class.isAssignableFrom(impl)) { + bridge = (FieldBridge) instance; + } + else if (org.hibernate.search.bridge.TwoWayStringBridge.class.isAssignableFrom(impl)) { + bridge = new TwoWayString2FieldBridgeAdaptor( + (org.hibernate.search.bridge.TwoWayStringBridge) instance); + } + else if (org.hibernate.search.bridge.StringBridge.class.isAssignableFrom(impl)) { + bridge = new String2FieldBridgeAdaptor((org.hibernate.search.bridge.StringBridge) instance); + } + else { + throw new SearchException("@ClassBridge implementation implements none of the field bridge interfaces: " + + impl); + } + if (cb.params().length > 0 && ParameterizedBridge.class.isAssignableFrom(impl)) { + Map params = new HashMap(cb.params().length); + for (Parameter param : cb.params()) { + params.put(param.name(), param.value()); + } + ((ParameterizedBridge) instance).setParameterValues(params); + } + } + catch (Exception e) { + throw new HibernateException("Unable to instantiate FieldBridge for " + ClassBridge.class.getName(), e); + } + } + } + if (bridge == null) throw new SearchException("Unable to guess FieldBridge for " + ClassBridge.class.getName()); - public static FieldBridge guessType(Field field, XMember member, ReflectionManager reflectionManager) { - FieldBridge bridge; - org.hibernate.search.annotations.FieldBridge bridgeAnn; - //@Field bridge has priority over @FieldBridge - if ( field != null && void.class != field.bridge().impl() ) { - bridgeAnn = field.bridge(); - } - else { - bridgeAnn = member.getAnnotation( org.hibernate.search.annotations.FieldBridge.class ); - } - if ( bridgeAnn != null ) { - Class impl = bridgeAnn.impl(); - if (impl == void.class) - throw new SearchException("@FieldBridge with no implementation class defined in: " + member.getName() ); - try { - Object instance = impl.newInstance(); - if ( FieldBridge.class.isAssignableFrom( impl ) ) { - bridge = (FieldBridge) instance; - } - else if ( org.hibernate.search.bridge.TwoWayStringBridge.class.isAssignableFrom( impl ) ) { - bridge = new TwoWayString2FieldBridgeAdaptor( - (org.hibernate.search.bridge.TwoWayStringBridge) instance ); - } - else if ( org.hibernate.search.bridge.StringBridge.class.isAssignableFrom( impl ) ) { - bridge = new String2FieldBridgeAdaptor( (org.hibernate.search.bridge.StringBridge) instance ); - } - else { - throw new SearchException("@FieldBridge implementation implements none of the field bridge interfaces: " - + impl + " in " + member.getName() ); - } - if ( bridgeAnn.params().length > 0 && ParameterizedBridge.class.isAssignableFrom( impl ) ) { - Map params = new HashMap( bridgeAnn.params().length ); - for ( Parameter param : bridgeAnn.params() ) { - params.put( param.name(), param.value() ); - } - ( (ParameterizedBridge) instance ).setParameterValues( params ); - } + return bridge; + } - } - catch (Exception e) { - //TODO add classname - throw new HibernateException( "Unable to instanciate FieldBridge for " + member.getName(), e ); - } - } - else if ( member.isAnnotationPresent( org.hibernate.search.annotations.DateBridge.class ) ) { - Resolution resolution = - member.getAnnotation( org.hibernate.search.annotations.DateBridge.class ).resolution(); - bridge = getDateField( resolution ); - } - else { - //find in built-ins - XClass returnType = member.getType(); - bridge = builtInBridges.get( returnType.getName() ); - if ( bridge == null && returnType.isEnum() ) { - bridge = new TwoWayString2FieldBridgeAdaptor( - new EnumBridge( (Class<? extends Enum>) reflectionManager.toClass( returnType ) ) - ); - } - } - //TODO add classname - if ( bridge == null ) throw new SearchException( "Unable to guess FieldBridge for " + member.getName() ); - return bridge; - } + public static TwoWayFieldBridge extractTwoWayType(ClassBridge cb) { + FieldBridge fb = extractType(cb); + if (fb instanceof TwoWayFieldBridge) { + return (TwoWayFieldBridge) fb; + } + else { + throw new HibernateException("ClassBridge passed in is not an instance of " + TwoWayFieldBridge.class.getSimpleName()); + } + } - public static FieldBridge getDateField(Resolution resolution) { - switch (resolution) { - case YEAR: - return DATE_YEAR; - case MONTH: - return DATE_MONTH; - case DAY: - return DATE_DAY; - case HOUR: - return DATE_HOUR; - case MINUTE: - return DATE_MINUTE; - case SECOND: - return DATE_SECOND; - case MILLISECOND: - return DATE_MILLISECOND; - default: - throw new AssertionFailure( "Unknown Resolution: " + resolution ); - } - } + public static FieldBridge guessType(Field field, XMember member, ReflectionManager reflectionManager) { + FieldBridge bridge; + org.hibernate.search.annotations.FieldBridge bridgeAnn; + //@Field bridge has priority over @FieldBridge + if (field != null && void.class != field.bridge().impl()) { + bridgeAnn = field.bridge(); + } + else { + bridgeAnn = member.getAnnotation(org.hibernate.search.annotations.FieldBridge.class); + } + if (bridgeAnn != null) { + Class impl = bridgeAnn.impl(); + if (impl == void.class) { + throw new SearchException("@FieldBridge with no implementation class defined in: " + member.getName()); + } + try { + Object instance = impl.newInstance(); + if (FieldBridge.class.isAssignableFrom(impl)) { + bridge = (FieldBridge) instance; + } + else if (org.hibernate.search.bridge.TwoWayStringBridge.class.isAssignableFrom(impl)) { + bridge = new TwoWayString2FieldBridgeAdaptor( + (org.hibernate.search.bridge.TwoWayStringBridge) instance); + } + else if (org.hibernate.search.bridge.StringBridge.class.isAssignableFrom(impl)) { + bridge = new String2FieldBridgeAdaptor((org.hibernate.search.bridge.StringBridge) instance); + } + else { + throw new SearchException("@FieldBridge implementation implements none of the field bridge interfaces: " + + impl + " in " + member.getName()); + } + if (bridgeAnn.params().length > 0 && ParameterizedBridge.class.isAssignableFrom(impl)) { + Map params = new HashMap(bridgeAnn.params().length); + for (Parameter param : bridgeAnn.params()) { + params.put(param.name(), param.value()); + } + ((ParameterizedBridge) instance).setParameterValues(params); + } + + } + catch (Exception e) { + //TODO add classname + throw new HibernateException("Unable to instanciate FieldBridge for " + member.getName(), e); + } + } + else if (member.isAnnotationPresent(org.hibernate.search.annotations.DateBridge.class)) { + Resolution resolution = + member.getAnnotation(org.hibernate.search.annotations.DateBridge.class).resolution(); + bridge = getDateField(resolution); + } + else { + //find in built-ins + XClass returnType = member.getType(); + bridge = builtInBridges.get(returnType.getName()); + if (bridge == null && returnType.isEnum()) { + bridge = new TwoWayString2FieldBridgeAdaptor( + new EnumBridge((Class<? extends Enum>) reflectionManager.toClass(returnType)) + ); + } + } + //TODO add classname + if (bridge == null) throw new SearchException("Unable to guess FieldBridge for " + member.getName()); + return bridge; + } + + public static FieldBridge getDateField(Resolution resolution) { + switch (resolution) { + case YEAR: + return DATE_YEAR; + case MONTH: + return DATE_MONTH; + case DAY: + return DATE_DAY; + case HOUR: + return DATE_HOUR; + case MINUTE: + return DATE_MINUTE; + case SECOND: + return DATE_SECOND; + case MILLISECOND: + return DATE_MILLISECOND; + default: + throw new AssertionFailure("Unknown Resolution: " + resolution); + } + } } Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java =================================================================== --- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-08-13 18:17:51 UTC (rev 15057) +++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2008-08-14 06:17:05 UTC (rev 15058) @@ -118,22 +118,14 @@ ProvidedId provided = clazz.getAnnotation( org.hibernate.search.annotations.ProvidedId.class ); if ( provided == null ) throw new SearchException( "No document id in: " + clazz.getName() ); - //TODO navssurtani use something similar to BridgeFactory.extractType(ClassBridge) - idBridge = getProvidedIdBridge(); + idBridge = BridgeFactory.extractTwoWayType(provided.bridgeImpl()); idKeywordName = provided.name(); - - } //if composite id, use of (a, b) in ((1,2)TwoWayString2FieldBridgeAdaptor, (3,4)) fails on most database //a TwoWayString2FieldBridgeAdaptor is never a composite id safeFromTupleId = TwoWayString2FieldBridgeAdaptor.class.isAssignableFrom( idBridge.getClass() ); } - private TwoWayFieldBridge getProvidedIdBridge() { - return new TwoWayString2FieldBridgeAdaptor( new StringBridge() ); - } - - private Analyzer getAnalyzer(XAnnotatedElement annotatedElement, InitContext context) { org.hibernate.search.annotations.Analyzer analyzerAnn = annotatedElement.getAnnotation( org.hibernate.search.annotations.Analyzer.class ); Modified: search/trunk/src/test/org/hibernate/search/test/SearchTestCase.java =================================================================== --- search/trunk/src/test/org/hibernate/search/test/SearchTestCase.java 2008-08-13 18:17:51 UTC (rev 15057) +++ search/trunk/src/test/org/hibernate/search/test/SearchTestCase.java 2008-08-14 06:17:05 UTC (rev 15058) @@ -36,7 +36,7 @@ } protected void setUp() throws Exception { - //super.setUp(); //we need a fresh session factory each time for index set up +// super.setUp(); //we need a fresh session factory each time for index set up buildSessionFactory( getMappings(), getAnnotatedPackages(), getXmlFiles() ); }

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15057 - core/branches/Branch_3_3/documentation/manual.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-08-13 14:17:51 -0400 (Wed, 13 Aug 2008) New Revision: 15057 Modified: core/branches/Branch_3_3/documentation/manual/pom.xml Log: prep 3.3.0.GA Modified: core/branches/Branch_3_3/documentation/manual/pom.xml =================================================================== --- core/branches/Branch_3_3/documentation/manual/pom.xml 2008-08-13 18:15:05 UTC (rev 15056) +++ core/branches/Branch_3_3/documentation/manual/pom.xml 2008-08-13 18:17:51 UTC (rev 15057) @@ -51,14 +51,12 @@ <translations>  <translation>fr-FR</translation> <translation>ja-JP</translation> <translation>ko-KR</translation> - <translation>zh-CN</translation> +--> </translations> <imageResource> <directory>${basedir}/src/main/docbook/en-US</directory> @@ -99,4 +97,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project>

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15056 - in annotations/trunk/src/test/org/hibernate/test/annotations: embedded and 3 other directories.

by hibernate-commits＠lists.jboss.org

Author: epbernard Date: 2008-08-13 14:15:05 -0400 (Wed, 13 Aug 2008) New Revision: 15056 Modified: annotations/trunk/src/test/org/hibernate/test/annotations/cascade/Mouth.java annotations/trunk/src/test/org/hibernate/test/annotations/embedded/Summary.java annotations/trunk/src/test/org/hibernate/test/annotations/inheritance/Tomato.java annotations/trunk/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java annotations/trunk/src/test/org/hibernate/test/annotations/query/Chaos.java Log: JBPAPP-1073 Oracle has "size" as a reserved keyword. Wondering what word in the dictionary is not reserved Modified: annotations/trunk/src/test/org/hibernate/test/annotations/cascade/Mouth.java =================================================================== --- annotations/trunk/src/test/org/hibernate/test/annotations/cascade/Mouth.java 2008-08-13 17:25:18 UTC (rev 15055) +++ annotations/trunk/src/test/org/hibernate/test/annotations/cascade/Mouth.java 2008-08-13 18:15:05 UTC (rev 15056) @@ -7,6 +7,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; +import javax.persistence.Column; /** * @author Emmanuel Bernard @@ -16,6 +17,7 @@ @Id @GeneratedValue public Integer id; + @Column(name="mouth_size") public int size; @OneToMany(mappedBy = "mouth", cascade = CascadeType.REMOVE) public Collection<Tooth> teeth; Modified: annotations/trunk/src/test/org/hibernate/test/annotations/embedded/Summary.java =================================================================== --- annotations/trunk/src/test/org/hibernate/test/annotations/embedded/Summary.java 2008-08-13 17:25:18 UTC (rev 15055) +++ annotations/trunk/src/test/org/hibernate/test/annotations/embedded/Summary.java 2008-08-13 18:15:05 UTC (rev 15056) @@ -2,6 +2,7 @@ package org.hibernate.test.annotations.embedded; import javax.persistence.Embeddable; +import javax.persistence.Column; import org.hibernate.annotations.Parent; @@ -14,6 +15,7 @@ private String text; private Book summarizedBook; + @Column(name="summary_size") public int getSize() { return size; } Modified: annotations/trunk/src/test/org/hibernate/test/annotations/inheritance/Tomato.java =================================================================== --- annotations/trunk/src/test/org/hibernate/test/annotations/inheritance/Tomato.java 2008-08-13 17:25:18 UTC (rev 15055) +++ annotations/trunk/src/test/org/hibernate/test/annotations/inheritance/Tomato.java 2008-08-13 18:15:05 UTC (rev 15056) @@ -4,6 +4,7 @@ import javax.persistence.Entity; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import javax.persistence.Column; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -21,6 +22,7 @@ public class Tomato extends Vegetable { private int size; + @Column(name="tom_size") public int getSize() { return size; } Modified: annotations/trunk/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java =================================================================== --- annotations/trunk/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java 2008-08-13 17:25:18 UTC (rev 15055) +++ annotations/trunk/src/test/org/hibernate/test/annotations/inheritance/mixed/Document.java 2008-08-13 18:15:05 UTC (rev 15056) @@ -25,7 +25,7 @@ this.size = size; } - @Column(table = "DocumentMixed", nullable = false) + @Column(table = "DocumentMixed", name="doc_size", nullable = false) public int getSize() { return size; } Modified: annotations/trunk/src/test/org/hibernate/test/annotations/query/Chaos.java =================================================================== --- annotations/trunk/src/test/org/hibernate/test/annotations/query/Chaos.java 2008-08-13 17:25:18 UTC (rev 15055) +++ annotations/trunk/src/test/org/hibernate/test/annotations/query/Chaos.java 2008-08-13 18:15:05 UTC (rev 15056) @@ -23,15 +23,16 @@ */ @Entity @Table(name="CHAOS") -@SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, size, id) VALUES(upper(?),?,?,?)") -@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, size = ? WHERE id = ?") +@SQLInsert( sql="INSERT INTO CHAOS(name, nick_name, chaos_size, id) VALUES(upper(?),?,?,?)") +@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nick_name = ?, cha0s_size = ? WHERE id = ?") @SQLDelete( sql="DELETE CHAOS WHERE id = ?") @SQLDeleteAll( sql="DELETE CHAOS") @Loader(namedQuery = "chaos") -@NamedNativeQuery(name="chaos", query="select id, size, name, lower( nick_name ) as nick_name from CHAOS where id= ?", resultClass = Chaos.class) +@NamedNativeQuery(name="chaos", query="select id, chaos_size, name, lower( nick_name ) as nick_name from CHAOS where id= ?", resultClass = Chaos.class) public class Chaos { @Id private Long id; + @Column(name="chaos_size") private Long size; private String name; @Column(name="nick_name")

16 years, 4 months

1
0
0 / 0

Hibernate SVN: r15055 - in core/trunk: cache-ehcache and 18 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2008-08-13 13:25:18 -0400 (Wed, 13 Aug 2008) New Revision: 15055 Modified: core/trunk/cache-ehcache/pom.xml core/trunk/cache-jbosscache/pom.xml core/trunk/cache-jbosscache2/pom.xml core/trunk/cache-oscache/pom.xml core/trunk/cache-swarmcache/pom.xml core/trunk/connection-c3p0/pom.xml core/trunk/connection-proxool/pom.xml core/trunk/core/pom.xml core/trunk/distribution/pom.xml core/trunk/documentation/manual/pom.xml core/trunk/documentation/pom.xml core/trunk/documentation/releasenotes/pom.xml core/trunk/jmx/pom.xml core/trunk/parent/pom.xml core/trunk/pom.xml core/trunk/testing/pom.xml core/trunk/testsuite/pom.xml core/trunk/tutorials/eg/pom.xml core/trunk/tutorials/pom.xml core/trunk/tutorials/web/pom.xml Log: [maven-release-plugin] prepare release Branch_3_3 Modified: core/trunk/cache-ehcache/pom.xml =================================================================== --- core/trunk/cache-ehcache/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/cache-ehcache/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-jbosscache/pom.xml =================================================================== --- core/trunk/cache-jbosscache/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/cache-jbosscache/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-jbosscache2/pom.xml =================================================================== --- core/trunk/cache-jbosscache2/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/cache-jbosscache2/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-oscache/pom.xml =================================================================== --- core/trunk/cache-oscache/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/cache-oscache/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/cache-swarmcache/pom.xml =================================================================== --- core/trunk/cache-swarmcache/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/cache-swarmcache/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/connection-c3p0/pom.xml =================================================================== --- core/trunk/connection-c3p0/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/connection-c3p0/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/connection-proxool/pom.xml =================================================================== --- core/trunk/connection-proxool/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/connection-proxool/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/core/pom.xml =================================================================== --- core/trunk/core/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/core/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/distribution/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -32,7 +32,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/manual/pom.xml =================================================================== --- core/trunk/documentation/manual/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/documentation/manual/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,13 +5,13 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-manual</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>Hibernate Manual</name> Modified: core/trunk/documentation/pom.xml =================================================================== --- core/trunk/documentation/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/documentation/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/documentation/releasenotes/pom.xml =================================================================== --- core/trunk/documentation/releasenotes/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/documentation/releasenotes/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,13 +5,13 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../../parent/pom.xml</relativePath> </parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-releasenotes</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>Hibernate Release Notes</name> Modified: core/trunk/jmx/pom.xml =================================================================== --- core/trunk/jmx/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/jmx/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/parent/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -32,7 +32,7 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> <packaging>pom</packaging> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <name>Hibernate Core Parent POM</name> <description>The base POM for all Hibernate Core modules.</description> @@ -53,9 +53,9 @@ </licenses> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_3</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_3</developerConnection> - <url>https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_3</url> + <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection> + <url>https://svn.jboss.org/repos/hibernate/core/trunk</url> </scm> <ciManagement> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -32,7 +32,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>parent/pom.xml</relativePath> </parent> Modified: core/trunk/testing/pom.xml =================================================================== --- core/trunk/testing/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/testing/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/testsuite/pom.xml =================================================================== --- core/trunk/testsuite/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/testsuite/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/tutorials/eg/pom.xml =================================================================== --- core/trunk/tutorials/eg/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/tutorials/eg/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -32,7 +32,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-tutorials</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: core/trunk/tutorials/pom.xml =================================================================== --- core/trunk/tutorials/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/tutorials/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -31,7 +31,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: core/trunk/tutorials/web/pom.xml =================================================================== --- core/trunk/tutorials/web/pom.xml 2008-08-13 17:25:05 UTC (rev 15054) +++ core/trunk/tutorials/web/pom.xml 2008-08-13 17:25:18 UTC (rev 15055) @@ -5,7 +5,7 @@ <parent> <groupId>org.hibernate</groupId> <artifactId>hibernate-tutorials</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.4.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>

16 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits August 2008