Hibernate SVN: r19149 - in core/trunk: annotations and 31 other directories.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-03-31 13:39:24 -0400 (Wed, 31 Mar 2010)
New Revision: 19149
Modified:
core/trunk/annotations/pom.xml
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-infinispan/pom.xml
core/trunk/cache-jbosscache/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/envers/pom.xml
core/trunk/documentation/jbosscache2/pom.xml
core/trunk/documentation/manual/old/es-ES/pom.xml
core/trunk/documentation/manual/old/fr-FR/pom.xml
core/trunk/documentation/manual/old/ja-JP/pom.xml
core/trunk/documentation/manual/old/ko-KR/pom.xml
core/trunk/documentation/manual/old/pt-BR/pom.xml
core/trunk/documentation/manual/old/zh-CN/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/envers/pom.xml
core/trunk/hibernate-maven-plugin/pom.xml
core/trunk/jdbc3-testing/pom.xml
core/trunk/jdbc4-testing/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:
Updating pom versions to 3.5.1-SNAPSHOT for release tagging
Modified: core/trunk/annotations/pom.xml
===================================================================
--- core/trunk/annotations/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/annotations/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/cache-ehcache/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/cache-infinispan/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/cache-jbosscache/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/cache-oscache/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/cache-swarmcache/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/connection-c3p0/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/connection-proxool/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/core/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/distribution/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/envers/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/jbosscache2/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/manual/old/es-ES/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/es-ES/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/manual/old/es-ES/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/fr-FR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/fr-FR/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/manual/old/fr-FR/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/ja-JP/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/ja-JP/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/manual/old/ja-JP/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/ko-KR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/ko-KR/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/manual/old/ko-KR/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/pt-BR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/pt-BR/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/manual/old/pt-BR/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/zh-CN/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/zh-CN/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/manual/old/zh-CN/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/manual/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/documentation/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/entitymanager/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/envers/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/hibernate-maven-plugin/pom.xml
===================================================================
--- core/trunk/hibernate-maven-plugin/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/hibernate-maven-plugin/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -27,7 +27,7 @@
<parent>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/jdbc3-testing/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/jdbc4-testing/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/jmx/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/parent/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/testing/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/testsuite/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/tutorials/eg/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/tutorials/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2010-03-31 17:38:55 UTC (rev 19148)
+++ core/trunk/tutorials/web/pom.xml 2010-03-31 17:39:24 UTC (rev 19149)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0-Final</version>
+ <version>3.5.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years, 8 months
Hibernate SVN: r19148 - core/tags.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-03-31 13:38:55 -0400 (Wed, 31 Mar 2010)
New Revision: 19148
Added:
core/tags/hibernate-3.5.0-Final/
Log:
Tagging 3.5.0-Final release
Copied: core/tags/hibernate-3.5.0-Final (from rev 19147, core/trunk)
14 years, 8 months
Hibernate SVN: r19147 - in core/trunk: annotations and 31 other directories.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-03-31 13:38:40 -0400 (Wed, 31 Mar 2010)
New Revision: 19147
Modified:
core/trunk/annotations/pom.xml
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-infinispan/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/changelog.txt
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/envers/pom.xml
core/trunk/documentation/jbosscache2/pom.xml
core/trunk/documentation/manual/old/es-ES/pom.xml
core/trunk/documentation/manual/old/fr-FR/pom.xml
core/trunk/documentation/manual/old/ja-JP/pom.xml
core/trunk/documentation/manual/old/ko-KR/pom.xml
core/trunk/documentation/manual/old/pt-BR/pom.xml
core/trunk/documentation/manual/old/zh-CN/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/envers/pom.xml
core/trunk/hibernate-maven-plugin/pom.xml
core/trunk/jdbc3-testing/pom.xml
core/trunk/jdbc4-testing/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:
Updating pom versions to 3.5.0-Final for release tagging
Modified: core/trunk/annotations/pom.xml
===================================================================
--- core/trunk/annotations/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/annotations/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/cache-ehcache/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/cache-infinispan/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/cache-jbosscache/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/cache-oscache/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/cache-swarmcache/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/changelog.txt
===================================================================
--- core/trunk/changelog.txt 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/changelog.txt 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,6 +6,59 @@
more about each case.
+Changes in version 3.5.0-Final (2010.03.31)
+-------------------------------------------
+http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversion/11022
+
+** Sub-task
+ * [HHH-4599] - An embeddable class may contain ToOne or ToMany associations
+ * [HHH-4666] - Implement the clarified rules for resource discovery (esp for <mapping-file> and co)
+ * [HHH-4691] - Validate all new concepts are supported in orm.xml
+
+** Bug
+ * [HHH-2088] - TypeMismatchException on object equality expression from one-to-one relationship
+ * [HHH-2997] - LikeExpression case sensitive not working properly
+ * [HHH-4784] - JDBCTransaction -> commit() -> notifyLocalSynchsBeforeTransactionCompletion()
+ * [HHH-4870] - Cannot determine java-type from given member [null]
+ * [HHH-4919] - DefaultMergeEventListener does not call Interceptor.instantiate() for a new persistent entity (Francesco Degrassi)
+ * [HHH-4931] - two tests in org.hibernate.test.legacy.MultiTableTest fail on Ingres
+ * [HHH-4946] - org.hibernate.test.legacy.FooBarTests testLimit failure with Ingres
+ * [HHH-4958] - Immutable entity snapshot is retained after insert
+ * [HHH-4972] - javax.persistence.query.timeout and javax.persistence.lock.timeout can be passed when creating an EMF
+ * [HHH-4993] - Updates to read-only entity associations made while in persistent state are ignored by flush
+ * [HHH-4998] - org.hibernate.test.hql.ASTParserLoadingTest failure running testStr with Ingres
+ * [HHH-5000] - duplicate words in the documents
+ * [HHH-5010] - org.hibernate.test.hql.CriteriaHQLAlignmentTest.testCriteriaAggregationReturnType() needs call flush before do the query
+ * [HHH-5013] - the previous select query should not to hold locks in TypeParameterTest#testSave
+
+** Improvement
+ * [HHH-1088] - Add support for projections using composite keys and components
+ * [HHH-4374] - @Subselect
+ * [HHH-4907] - Support for tuple syntax in HQL/Criteria on databases which do not support tuple syntax
+ * [HHH-4940] - Document immutable/read-only entity and immutable collection functionality
+ * [HHH-4989] - Make Statistics concurrent safe when Java 5 is present (Alex Snaps)
+ * [HHH-5008] - Log query lock mode in EntityLoader constructor
+ * [HHH-5022] - Small documentation improvements in chapter 6
+
+** New Feature
+ * [HHH-4812] - Add fetch profile support in annotations
+ * [HHH-4994] - find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) and refresh(Object entity, Map<String, Object> properties) do not honor properties
+ * [HHH-5026] - Ability to customize Scanner strategies
+
+** Patch
+ * [HHH-4419] - <synchronize table="table_name"/> is missed using annotations
+ * [HHH-5049] - org.hibernate.test.legacy.ParentChildTest error running testLoadAfterNonExists with Ingres
+
+** Task
+ * [HHH-4933] - Write documentation on JPA 2
+ * [HHH-4990] - Move to commons-annotations 3.2.0.Final
+ * [HHH-4995] - Update dependency versions for JPA 2 and Metamodel Generator
+ * [HHH-4996] - Use monospace fonts in docbook programlistings
+ * [HHH-5035] - upgrade to jdocbook 2.2.3
+ * [HHH-5047] - Remove column coordinates from areaspecs
+ * [HHH-5058] - Include hibernate-jpa-2.0-api (JPA 2 API) in release bundle
+
+
Changes in version 3.5.0-CR-2 (2010.02.24)
-------------------------------------------
http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversi...
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/connection-c3p0/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/connection-proxool/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/core/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/distribution/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/envers/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/jbosscache2/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/manual/old/es-ES/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/es-ES/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/manual/old/es-ES/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/fr-FR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/fr-FR/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/manual/old/fr-FR/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/ja-JP/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/ja-JP/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/manual/old/ja-JP/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/ko-KR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/ko-KR/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/manual/old/ko-KR/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/pt-BR/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/pt-BR/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/manual/old/pt-BR/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/old/zh-CN/pom.xml
===================================================================
--- core/trunk/documentation/manual/old/zh-CN/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/manual/old/zh-CN/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,12 +6,12 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
</parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-manual-${translation}</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<packaging>jdocbook</packaging>
<name>Hibernate Manual (${translation})</name>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/manual/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/documentation/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/entitymanager/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/envers/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/hibernate-maven-plugin/pom.xml
===================================================================
--- core/trunk/hibernate-maven-plugin/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/hibernate-maven-plugin/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -27,7 +27,7 @@
<parent>
<artifactId>hibernate-parent</artifactId>
<groupId>org.hibernate</groupId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/jdbc3-testing/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/jdbc4-testing/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jmx/pom.xml
===================================================================
--- core/trunk/jmx/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/jmx/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/parent/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/testing/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/testsuite/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/tutorials/eg/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/tutorials/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2010-03-31 16:42:52 UTC (rev 19146)
+++ core/trunk/tutorials/web/pom.xml 2010-03-31 17:38:40 UTC (rev 19147)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.5.0-SNAPSHOT</version>
+ <version>3.5.0-Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years, 8 months
Hibernate SVN: r19146 - core/trunk/distribution/src/assembly.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-03-31 12:42:52 -0400 (Wed, 31 Mar 2010)
New Revision: 19146
Modified:
core/trunk/distribution/src/assembly/dist.xml
Log:
HHH-5058 - Include hibernate-jpa-2.0-api (JPA 2 API) in release bundle
Modified: core/trunk/distribution/src/assembly/dist.xml
===================================================================
--- core/trunk/distribution/src/assembly/dist.xml 2010-03-31 07:52:25 UTC (rev 19145)
+++ core/trunk/distribution/src/assembly/dist.xml 2010-03-31 16:42:52 UTC (rev 19146)
@@ -91,6 +91,14 @@
</dependencySet>
<dependencySet>
+ <!-- The lib/jpa dependencySet -->
+ <outputDirectory>lib/jpa</outputDirectory>
+ <includes>
+ <include>org.hibernate.javax.persistence:hibernate-jpa-2.0-api</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
<outputDirectory>lib/optional/c3p0</outputDirectory>
<includes>
<include>c3p0:c3p0</include>
14 years, 8 months
Online order for airplane ticket N648365
by Rosa Perkins
Good afternoon,
Thank you for using our new service "Buy airplane ticket Online" on our website.
Your account has been created:
Your login: hibernate-commits(a)lists.jboss.org
Your password: G6vFjbdp
Your credit card has been charged for $998.63.
We would like to remind you that whenever you order tickets on our website you get a discount of 10%!
Attached to this message is the purchase Invoice and the airplane ticket.
To use your ticket, simply print it on a color printed, and you are set to take off for the journey!
Kind regards,
Delta Air Lines
14 years, 8 months
Hibernate SVN: r19145 - in core/branches/hibernate-3.3.2.GA_JBPAPP-4038: testsuite/src/test/java/org/hibernate/test/hql and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-03-31 03:52:25 -0400 (Wed, 31 Mar 2010)
New Revision: 19145
Modified:
core/branches/hibernate-3.3.2.GA_JBPAPP-4038/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java
core/branches/hibernate-3.3.2.GA_JBPAPP-4038/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
Log:
JBPAPP-4038 HHH-2088 TypeMismatchException on object equality expression from one-to-one relationship
Modified: core/branches/hibernate-3.3.2.GA_JBPAPP-4038/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java
===================================================================
--- core/branches/hibernate-3.3.2.GA_JBPAPP-4038/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java 2010-03-31 07:34:02 UTC (rev 19144)
+++ core/branches/hibernate-3.3.2.GA_JBPAPP-4038/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java 2010-03-31 07:52:25 UTC (rev 19145)
@@ -23,6 +23,7 @@
*/
package org.hibernate.hql.ast.tree;
+import org.hibernate.type.OneToOneType;
import org.hibernate.type.Type;
import org.hibernate.Hibernate;
import org.hibernate.TypeMismatchException;
@@ -80,8 +81,8 @@
// resolve an expected type
SessionFactoryImplementor sessionFactory = getSessionFactoryHelper().getFactory();
if ( lhsType != null && rhsType != null ) {
- int lhsColumnSpan = lhsType.getColumnSpan( sessionFactory );
- if ( lhsColumnSpan != rhsType.getColumnSpan( sessionFactory ) ) {
+ int lhsColumnSpan = getColumnSpan( lhsType, sessionFactory );
+ if ( lhsColumnSpan != getColumnSpan( rhsType, sessionFactory ) ) {
throw new TypeMismatchException(
"left and right hand sides of a binary logic operator were incompatibile [" +
lhsType.getName() + " : "+ rhsType.getName() + "]"
@@ -97,6 +98,15 @@
}
}
+ private int getColumnSpan( Type type, SessionFactoryImplementor sfi ) {
+ int columnSpan = type.getColumnSpan( sfi );
+ if ( columnSpan == 0 && type instanceof OneToOneType ) {
+ columnSpan = ( (OneToOneType) type ).getIdentifierOrUniqueKeyType( sfi ).getColumnSpan(
+ sfi );
+ }
+ return columnSpan;
+ }
+
/**
* Mutate the subtree relating to a row-value-constructor to instead use
* a series of ANDed predicates. This allows multi-column type comparisons
Modified: core/branches/hibernate-3.3.2.GA_JBPAPP-4038/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
===================================================================
--- core/branches/hibernate-3.3.2.GA_JBPAPP-4038/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2010-03-31 07:34:02 UTC (rev 19144)
+++ core/branches/hibernate-3.3.2.GA_JBPAPP-4038/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2010-03-31 07:52:25 UTC (rev 19145)
@@ -391,6 +391,31 @@
return count;
}
+ public void testEntityAndOneToOneReturnedByQuery() {
+ Session s = openSession();
+ s.beginTransaction();
+ Human h = new Human();
+ h.setName( new Name( "Gail", null, "Badner" ) );
+ s.save( h );
+ User u = new User();
+ u.setUserName( "gbadner" );
+ u.setHuman( h );
+ s.save( u );
+ s.getTransaction().commit();
+ s.close();
+
+ s = openSession();
+ s.beginTransaction();
+ Object [] result = ( Object [] ) s.createQuery( "from User u, Human h where u.human = h" ).uniqueResult();
+ assertNotNull( result );
+ assertEquals( u.getUserName(), ( ( User ) result[ 0 ] ).getUserName() );
+ assertEquals( h.getName().getFirst(), ( ( Human ) result[ 1 ] ).getName().getFirst() );
+ assertSame( ( ( User ) result[ 0 ] ).getHuman(), result[ 1 ] );
+ s.createQuery( "delete User" ).executeUpdate();
+ s.createQuery( "delete Human" ).executeUpdate();
+ s.getTransaction().commit();
+ s.close();
+ }
public void testNestedComponentIsNull() {
// (1) From MapTest originally...
// (2) Was then moved into HQLTest...
14 years, 8 months
Hibernate SVN: r19144 - core/branches.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-03-31 03:34:02 -0400 (Wed, 31 Mar 2010)
New Revision: 19144
Added:
core/branches/hibernate-3.3.2.GA_JBPAPP-4038/
Log:
JBPAPP-3048 create one-off branch
Copied: core/branches/hibernate-3.3.2.GA_JBPAPP-4038 (from rev 19143, core/tags/hibernate-3.3.2.GA)
14 years, 8 months
Hibernate SVN: r19143 - in core/branches/Branch_3_3_2_GA_CP: testsuite/src/test/java/org/hibernate/test/hql and 1 other directory.
by hibernate-commits@lists.jboss.org
Author: stliu
Date: 2010-03-31 03:21:41 -0400 (Wed, 31 Mar 2010)
New Revision: 19143
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java
core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
Log:
JBPAPP-4022 HHH-2088 TypeMismatchException on object equality expression from one-to-one relationship
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java 2010-03-31 00:52:35 UTC (rev 19142)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/hql/ast/tree/BinaryLogicOperatorNode.java 2010-03-31 07:21:41 UTC (rev 19143)
@@ -23,6 +23,7 @@
*/
package org.hibernate.hql.ast.tree;
+import org.hibernate.type.OneToOneType;
import org.hibernate.type.Type;
import org.hibernate.Hibernate;
import org.hibernate.TypeMismatchException;
@@ -80,8 +81,8 @@
// resolve an expected type
SessionFactoryImplementor sessionFactory = getSessionFactoryHelper().getFactory();
if ( lhsType != null && rhsType != null ) {
- int lhsColumnSpan = lhsType.getColumnSpan( sessionFactory );
- if ( lhsColumnSpan != rhsType.getColumnSpan( sessionFactory ) ) {
+ int lhsColumnSpan = getColumnSpan( lhsType, sessionFactory );
+ if ( lhsColumnSpan != getColumnSpan( rhsType, sessionFactory ) ) {
throw new TypeMismatchException(
"left and right hand sides of a binary logic operator were incompatibile [" +
lhsType.getName() + " : "+ rhsType.getName() + "]"
@@ -97,6 +98,15 @@
}
}
+ private int getColumnSpan( Type type, SessionFactoryImplementor sfi ) {
+ int columnSpan = type.getColumnSpan( sfi );
+ if ( columnSpan == 0 && type instanceof OneToOneType ) {
+ columnSpan = ( (OneToOneType) type ).getIdentifierOrUniqueKeyType( sfi ).getColumnSpan(
+ sfi );
+ }
+ return columnSpan;
+ }
+
/**
* Mutate the subtree relating to a row-value-constructor to instead use
* a series of ANDed predicates. This allows multi-column type comparisons
Modified: core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2010-03-31 00:52:35 UTC (rev 19142)
+++ core/branches/Branch_3_3_2_GA_CP/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java 2010-03-31 07:21:41 UTC (rev 19143)
@@ -389,7 +389,33 @@
}
return count;
}
+
+ public void testEntityAndOneToOneReturnedByQuery() {
+ Session s = openSession();
+ s.beginTransaction();
+ Human h = new Human();
+ h.setName( new Name( "Gail", null, "Badner" ) );
+ s.save( h );
+ User u = new User();
+ u.setUserName( "gbadner" );
+ u.setHuman( h );
+ s.save( u );
+ s.getTransaction().commit();
+ s.close();
+ s = openSession();
+ s.beginTransaction();
+ Object [] result = ( Object [] ) s.createQuery( "from User u, Human h where u.human = h" ).uniqueResult();
+ assertNotNull( result );
+ assertEquals( u.getUserName(), ( ( User ) result[ 0 ] ).getUserName() );
+ assertEquals( h.getName().getFirst(), ( ( Human ) result[ 1 ] ).getName().getFirst() );
+ assertSame( ( ( User ) result[ 0 ] ).getHuman(), result[ 1 ] );
+ s.createQuery( "delete User" ).executeUpdate();
+ s.createQuery( "delete Human" ).executeUpdate();
+ s.getTransaction().commit();
+ s.close();
+ }
+
public void testNestedComponentIsNull() {
// (1) From MapTest originally...
// (2) Was then moved into HQLTest...
14 years, 8 months
Hibernate SVN: r19142 - in core/trunk: annotations/src/main/docbook/fr/modules and 6 other directories.
by hibernate-commits@lists.jboss.org
Author: misty(a)redhat.com
Date: 2010-03-30 20:52:35 -0400 (Tue, 30 Mar 2010)
New Revision: 19142
Modified:
core/trunk/annotations/src/main/docbook/en/modules/entity.xml
core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml
core/trunk/annotations/src/main/docbook/fr/modules/entity.xml
core/trunk/annotations/src/main/docbook/fr/modules/xml-overriding.xml
core/trunk/annotations/src/main/docbook/zh_cn/modules/entity.xml
core/trunk/annotations/src/main/docbook/zh_cn/modules/xml-overriding.xml
core/trunk/documentation/manual/src/main/docbook/de-DE/content/performance.po
core/trunk/documentation/manual/src/main/docbook/de-DE/content/query_sql.po
core/trunk/documentation/manual/src/main/docbook/de-DE/content/session_api.po
core/trunk/documentation/manual/src/main/docbook/de-DE/fallback_content/Feedback.po
core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml
core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml
core/trunk/documentation/manual/src/main/docbook/pot/Book_Info.pot
core/trunk/documentation/manual/src/main/docbook/pot/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.pot
core/trunk/documentation/manual/src/main/docbook/pot/author_group.pot
core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot
core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
Log:
Propagaged changes for JIRA HHH-5047
Modified: core/trunk/annotations/src/main/docbook/en/modules/entity.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/modules/entity.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/annotations/src/main/docbook/en/modules/entity.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -427,25 +427,25 @@
<programlistingco>
<areaspec>
- <area coords="2 55" id="hm1" />
+ <area coords="2" id="hm1" />
- <area coords="3 55" id="hm2" />
+ <area coords="3" id="hm2" />
- <area coords="4 55" id="hm3" />
+ <area coords="4" id="hm3" />
- <area coords="5 55" id="hm4" />
+ <area coords="5" id="hm4" />
- <area coords="6 55" id="hm5" />
+ <area coords="6" id="hm5" />
- <area coords="7 55" id="hm6" />
+ <area coords="7" id="hm6" />
- <area coords="8 55" id="hm7" />
+ <area coords="8" id="hm7" />
- <area coords="9 55" id="hm8" />
+ <area coords="9" id="hm8" />
- <area coords="10 55" id="hm9" />
+ <area coords="10" id="hm9" />
- <area coords="11 55" id="hm10" />
+ <area coords="11" id="hm10" />
</areaspec>
<programlisting language="JAVA" role="JAVA">@Column(
@@ -2645,11 +2645,11 @@
<programlistingco>
<areaspec>
- <area coords="2 55" id="cache-hm1" />
+ <area coords="2" id="cache-hm1" />
- <area coords="3 55" id="cache-hm2" />
+ <area coords="3" id="cache-hm2" />
- <area coords="4 55" id="cache-hm3" />
+ <area coords="4" id="cache-hm3" />
</areaspec>
<programlisting language="JAVA" role="JAVA">@Cache(
Modified: core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/annotations/src/main/docbook/en/modules/xml-overriding.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -91,25 +91,25 @@
<programlistingco>
<areaspec>
- <area coords="3 85" id="aa1" />
+ <area coords="3" id="aa1" />
- <area coords="9 85" id="aa2" />
+ <area coords="9" id="aa2" />
- <area coords="10 85" id="aa3" />
+ <area coords="10" id="aa3" />
- <area coords="11 85" id="aa4" />
+ <area coords="11" id="aa4" />
- <area coords="17 85" id="aa5" />
+ <area coords="17" id="aa5" />
- <area coords="23 85" id="aa6" />
+ <area coords="23" id="aa6" />
- <area coords="24 85" id="aa7" />
+ <area coords="24" id="aa7" />
- <area coords="25 85" id="aa8" />
+ <area coords="25" id="aa8" />
- <area coords="26 85" id="aa9" />
+ <area coords="26" id="aa9" />
- <area coords="31 85" id="aa10" />
+ <area coords="31" id="aa10" />
</areaspec>
<programlisting><?xml version="1.0" encoding="UTF-8"?>
@@ -238,15 +238,15 @@
<programlistingco>
<areaspec>
- <area coords="11 85" id="ab1" />
+ <area coords="11" id="ab1" />
- <area coords="18 85" id="ab2" />
+ <area coords="18" id="ab2" />
- <area coords="22 85" id="ab3" />
+ <area coords="22" id="ab3" />
- <area coords="28 85" id="ab4" />
+ <area coords="28" id="ab4" />
- <area coords="34 85" id="ab5" />
+ <area coords="34" id="ab5" />
</areaspec>
<programlisting><?xml version="1.0" encoding="UTF-8"?>
Modified: core/trunk/annotations/src/main/docbook/fr/modules/entity.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/fr/modules/entity.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/annotations/src/main/docbook/fr/modules/entity.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -307,25 +307,25 @@
<programlistingco>
<areaspec>
- <area coords="2 55" id="hm1" />
+ <area coords="2" id="hm1" />
- <area coords="3 55" id="hm2" />
+ <area coords="3" id="hm2" />
- <area coords="4 55" id="hm3" />
+ <area coords="4" id="hm3" />
- <area coords="5 55" id="hm4" />
+ <area coords="5" id="hm4" />
- <area coords="6 55" id="hm5" />
+ <area coords="6" id="hm5" />
- <area coords="7 55" id="hm6" />
+ <area coords="7" id="hm6" />
- <area coords="8 55" id="hm7" />
+ <area coords="8" id="hm7" />
- <area coords="9 55" id="hm8" />
+ <area coords="9" id="hm8" />
- <area coords="10 55" id="hm9" />
+ <area coords="10" id="hm9" />
- <area coords="11 55" id="hm10" />
+ <area coords="11" id="hm10" />
</areaspec>
<programlisting>@Column(
@@ -3305,11 +3305,11 @@
<programlistingco>
<areaspec>
- <area coords="2 55" id="hm1" />
+ <area coords="2" id="hm1" />
- <area coords="3 55" id="hm2" />
+ <area coords="3" id="hm2" />
- <area coords="4 55" id="hm3" />
+ <area coords="4" id="hm3" />
</areaspec>
<programlisting>@Cache(
Modified: core/trunk/annotations/src/main/docbook/fr/modules/xml-overriding.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/fr/modules/xml-overriding.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/annotations/src/main/docbook/fr/modules/xml-overriding.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -70,25 +70,25 @@
<programlistingco>
<areaspec>
- <area coords="3 85" id="aa1" />
+ <area coords="3" id="aa1" />
- <area coords="9 85" id="aa2" />
+ <area coords="9" id="aa2" />
- <area coords="10 85" id="aa3" />
+ <area coords="10" id="aa3" />
- <area coords="11 85" id="aa4" />
+ <area coords="11" id="aa4" />
- <area coords="17 85" id="aa5" />
+ <area coords="17" id="aa5" />
- <area coords="23 85" id="aa6" />
+ <area coords="23" id="aa6" />
- <area coords="24 85" id="aa7" />
+ <area coords="24" id="aa7" />
- <area coords="25 85" id="aa8" />
+ <area coords="25" id="aa8" />
- <area coords="26 85" id="aa9" />
+ <area coords="26" id="aa9" />
- <area coords="31 85" id="aa10" />
+ <area coords="31" id="aa10" />
</areaspec>
<programlisting><?xml version="1.0" encoding="UTF-8"?>
@@ -221,15 +221,15 @@
<programlistingco>
<areaspec>
- <area coords="11 85" id="ab1" />
+ <area coords="11" id="ab1" />
- <area coords="18 85" id="ab2" />
+ <area coords="18" id="ab2" />
- <area coords="22 85" id="ab3" />
+ <area coords="22" id="ab3" />
- <area coords="28 85" id="ab4" />
+ <area coords="28" id="ab4" />
- <area coords="34 85" id="ab5" />
+ <area coords="34" id="ab5" />
</areaspec>
<programlisting><?xml version="1.0" encoding="UTF-8"?>
Modified: core/trunk/annotations/src/main/docbook/zh_cn/modules/entity.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/zh_cn/modules/entity.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/annotations/src/main/docbook/zh_cn/modules/entity.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -263,25 +263,25 @@
<programlistingco>
<areaspec>
- <area coords="2 55" id="hm1" />
+ <area coords="2" id="hm1" />
- <area coords="3 55" id="hm2" />
+ <area coords="3" id="hm2" />
- <area coords="4 55" id="hm3" />
+ <area coords="4" id="hm3" />
- <area coords="5 55" id="hm4" />
+ <area coords="5" id="hm4" />
- <area coords="6 55" id="hm5" />
+ <area coords="6" id="hm5" />
- <area coords="7 55" id="hm6" />
+ <area coords="7" id="hm6" />
- <area coords="8 55" id="hm7" />
+ <area coords="8" id="hm7" />
- <area coords="9 55" id="hm8" />
+ <area coords="9" id="hm8" />
- <area coords="10 55" id="hm9" />
+ <area coords="10" id="hm9" />
- <area coords="11 55" id="hm10" />
+ <area coords="11" id="hm10" />
</areaspec>
<programlisting>@Column(
@@ -2744,11 +2744,11 @@
<programlistingco>
<areaspec>
- <area coords="2 55" id="hm1" />
+ <area coords="2" id="hm1" />
- <area coords="3 55" id="hm2" />
+ <area coords="3" id="hm2" />
- <area coords="4 55" id="hm3" />
+ <area coords="4" id="hm3" />
</areaspec>
<programlisting>@Cache(
Modified: core/trunk/annotations/src/main/docbook/zh_cn/modules/xml-overriding.xml
===================================================================
--- core/trunk/annotations/src/main/docbook/zh_cn/modules/xml-overriding.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/annotations/src/main/docbook/zh_cn/modules/xml-overriding.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -53,25 +53,25 @@
<programlistingco>
<areaspec>
- <area coords="3 85" id="aa1" />
+ <area coords="3" id="aa1" />
- <area coords="9 85" id="aa2" />
+ <area coords="9" id="aa2" />
- <area coords="10 85" id="aa3" />
+ <area coords="10" id="aa3" />
- <area coords="11 85" id="aa4" />
+ <area coords="11" id="aa4" />
- <area coords="17 85" id="aa5" />
+ <area coords="17" id="aa5" />
- <area coords="23 85" id="aa6" />
+ <area coords="23" id="aa6" />
- <area coords="24 85" id="aa7" />
+ <area coords="24" id="aa7" />
- <area coords="25 85" id="aa8" />
+ <area coords="25" id="aa8" />
- <area coords="26 85" id="aa9" />
+ <area coords="26" id="aa9" />
- <area coords="31 85" id="aa10" />
+ <area coords="31" id="aa10" />
</areaspec>
<programlisting><?xml version="1.0" encoding="UTF-8"?>
@@ -173,15 +173,15 @@
<programlistingco>
<areaspec>
- <area coords="11 85" id="ab1" />
+ <area coords="11" id="ab1" />
- <area coords="18 85" id="ab2" />
+ <area coords="18" id="ab2" />
- <area coords="22 85" id="ab3" />
+ <area coords="22" id="ab3" />
- <area coords="28 85" id="ab4" />
+ <area coords="28" id="ab4" />
- <area coords="34 85" id="ab5" />
+ <area coords="34" id="ab5" />
</areaspec>
<programlisting><?xml version="1.0" encoding="UTF-8"?>
Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/content/performance.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/de-DE/content/performance.po 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/de-DE/content/performance.po 2010-03-31 00:52:35 UTC (rev 19142)
@@ -275,7 +275,7 @@
msgstr ""
"Project-Id-Version: Collection_Mapping\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:47\n"
+"POT-Creation-Date: 2010-02-11T05:38:15\n"
"PO-Revision-Date: 2007-02-26 10:27+1000\n"
"Last-Translator: \n"
"Language-Team: <de(a)li.org>\n"
@@ -1892,7 +1892,7 @@
#, no-c-format
msgid ""
"If you configure your underlying cache implementation to use expiry or "
-"timeouts is very important that the cache timeout of the underlying cache "
+"timeouts is is very important that the cache timeout of the underlying cache "
"region for the UpdateTimestampsCache be set to a higher value than the "
"timeouts of any of the query caches. In fact, we recommend that the the "
"UpdateTimestampsCache region not be configured for expiry at all. Note, in "
Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/content/query_sql.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/de-DE/content/query_sql.po 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/de-DE/content/query_sql.po 2010-03-31 00:52:35 UTC (rev 19142)
@@ -275,7 +275,7 @@
msgstr ""
"Project-Id-Version: Collection_Mapping\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:47\n"
+"POT-Creation-Date: 2010-02-11T05:38:15\n"
"PO-Revision-Date: 2007-02-26 10:27+1000\n"
"Last-Translator: \n"
"Language-Team: <de(a)li.org>\n"
@@ -819,7 +819,7 @@
#. Tag: entry
#, fuzzy, no-c-format
-msgid "All properties of the collection"
+msgid "All properties of the the collection"
msgstr "Alle Properties der Collection"
#. Tag: entry
Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/content/session_api.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/de-DE/content/session_api.po 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/de-DE/content/session_api.po 2010-03-31 00:52:35 UTC (rev 19142)
@@ -275,7 +275,7 @@
msgstr ""
"Project-Id-Version: Collection_Mapping\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2010-03-12T00:03:48\n"
+"POT-Creation-Date: 2010-02-11T05:38:15\n"
"PO-Revision-Date: 2007-02-26 10:27+1000\n"
"Last-Translator: \n"
"Language-Team: <de(a)li.org>\n"
@@ -421,7 +421,7 @@
#. Tag: para
#, fuzzy, no-c-format
msgid ""
-"Newly instantiated instances of a persistent class are considered "
+"Newly instantiated instances of a a persistent class are considered "
"<emphasis>transient</emphasis> by Hibernate. We can make a transient "
"instance <emphasis>persistent</emphasis> by associating it with a session:"
msgstr ""
Modified: core/trunk/documentation/manual/src/main/docbook/de-DE/fallback_content/Feedback.po
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/de-DE/fallback_content/Feedback.po 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/de-DE/fallback_content/Feedback.po 2010-03-31 00:52:35 UTC (rev 19142)
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Feedback\n"
-"POT-Creation-Date: 2010-03-12T00:03:48\n"
+"POT-Creation-Date: 2010-02-11T05:38:16\n"
"PO-Revision-Date: 2010-01-11 17:47+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
@@ -19,15 +19,19 @@
msgid "We Need Feedback!"
msgstr "Wir brauchen Feedback!"
+#. Tag: primary
+#, no-c-format
+msgid "feedback"
+msgstr "Feedback"
+
+#. Tag: secondary
+#, no-c-format
+msgid "contact information for this manual"
+msgstr "Kontaktinformationen für dieses Handbuch"
+
#. Tag: para
#, no-c-format
msgid "You should over ride this by creating your own local Feedback.xml file."
msgstr ""
"Sie sollte dies außer Kraft setzen, indem Sie Ihre eigene lokale Feedback."
"xml-Datei erstellen."
-
-#~ msgid "feedback"
-#~ msgstr "Feedback"
-
-#~ msgid "contact information for this manual"
-#~ msgstr "Kontaktinformationen für dieses Handbuch"
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/basic_mapping.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -197,13 +197,13 @@
<programlistingco role="XML">
<areaspec>
- <area id="hm1" coords="2 55"/>
- <area id="hm2" coords="3 55"/>
- <area id="hm3" coords="4 55"/>
- <area id="hm4" coords="5 55"/>
- <area id="hm5" coords="6 55"/>
- <area id="hm6" coords="7 55"/>
- <area id="hm7" coords="8 55"/>
+ <area id="hm1" coords="2"/>
+ <area id="hm2" coords="3"/>
+ <area id="hm3" coords="4"/>
+ <area id="hm4" coords="5"/>
+ <area id="hm5" coords="6"/>
+ <area id="hm6" coords="7"/>
+ <area id="hm7" coords="8"/>
</areaspec>
<programlisting role="XML"><![CDATA[<hibernate-mapping
schema="schemaName"
@@ -288,27 +288,27 @@
<programlistingco role="XML">
<areaspec>
- <area id="class1" coords="2 55"/>
- <area id="class2" coords="3 55" />
- <area id="class3" coords="4 55"/>
- <area id="class4" coords="5 55" />
- <area id="class5" coords="6 55"/>
- <area id="class6" coords="7 55" />
- <area id="class7" coords="8 55"/>
- <area id="class8" coords="9 55" />
- <area id="class9" coords="10 55" />
- <area id="class10" coords="11 55"/>
- <area id="class11" coords="12 55"/>
- <area id="class12" coords="13 55"/>
- <area id="class13" coords="14 55"/>
- <area id="class14" coords="15 55"/>
- <area id="class15" coords="16 55"/>
- <area id="class16" coords="17 55"/>
- <area id="class17" coords="18 55"/>
- <area id="class18" coords="19 55"/>
- <area id="class19" coords="20 55"/>
- <area id="class20" coords="21 55"/>
- <area id="class21" coords="22 55"/>
+ <area id="class1" coords="2"/>
+ <area id="class2" coords="3" />
+ <area id="class3" coords="4"/>
+ <area id="class4" coords="5" />
+ <area id="class5" coords="6"/>
+ <area id="class6" coords="7" />
+ <area id="class7" coords="8"/>
+ <area id="class8" coords="9" />
+ <area id="class9" coords="10" />
+ <area id="class10" coords="11"/>
+ <area id="class11" coords="12"/>
+ <area id="class12" coords="13"/>
+ <area id="class13" coords="14"/>
+ <area id="class14" coords="15"/>
+ <area id="class15" coords="16"/>
+ <area id="class16" coords="17"/>
+ <area id="class17" coords="18"/>
+ <area id="class18" coords="19"/>
+ <area id="class19" coords="20"/>
+ <area id="class20" coords="21"/>
+ <area id="class21" coords="22"/>
</areaspec>
<programlisting role="XML"><![CDATA[<class
name="ClassName"
@@ -608,11 +608,11 @@
<programlistingco role="XML">
<areaspec>
- <area id="id1" coords="2 70"/>
- <area id="id2" coords="3 70" />
- <area id="id3" coords="4 70"/>
- <area id="id4" coords="5 70" />
- <area id="id5" coords="6 70" />
+ <area id="id1" coords="2"/>
+ <area id="id2" coords="3" />
+ <area id="id3" coords="4"/>
+ <area id="id4" coords="5" />
+ <area id="id5" coords="6" />
</areaspec>
<programlisting role="XML"><![CDATA[<id
name="propertyName"
@@ -1234,11 +1234,11 @@
<programlistingco role="XML">
<areaspec>
- <area id="discriminator1" coords="2 60"/>
- <area id="discriminator2" coords="3 60" />
- <area id="discriminator3" coords="4 60" />
- <area id="discriminator4" coords="5 60" />
- <area id="discriminator5" coords="6 60" />
+ <area id="discriminator1" coords="2"/>
+ <area id="discriminator2" coords="3" />
+ <area id="discriminator3" coords="4" />
+ <area id="discriminator4" coords="5" />
+ <area id="discriminator5" coords="6" />
</areaspec>
<programlisting role="XML"><![CDATA[<discriminator
column="discriminator_column"
@@ -1318,13 +1318,13 @@
<programlistingco role="XML">
<areaspec>
- <area id="version1" coords="2 70"/>
- <area id="version2" coords="3 70"/>
- <area id="version3" coords="4 70"/>
- <area id="version4" coords="5 70"/>
- <area id="version5" coords="6 70"/>
- <area id="version6" coords="7 70"/>
- <area id="version7" coords="8 70"/>
+ <area id="version1" coords="2"/>
+ <area id="version2" coords="3"/>
+ <area id="version3" coords="4"/>
+ <area id="version4" coords="5"/>
+ <area id="version5" coords="6"/>
+ <area id="version6" coords="7"/>
+ <area id="version7" coords="8"/>
</areaspec>
<programlisting role="XML"><![CDATA[<version
column="version_column"
@@ -1414,12 +1414,12 @@
<programlistingco role="XML">
<areaspec>
- <area id="timestamp1" coords="2 70"/>
- <area id="timestamp2" coords="3 70" />
- <area id="timestamp3" coords="4 70" />
- <area id="timestamp4" coords="5 70" />
- <area id="timestamp5" coords="6 70" />
- <area id="timestamp6" coords="7 70" />
+ <area id="timestamp1" coords="2"/>
+ <area id="timestamp2" coords="3" />
+ <area id="timestamp3" coords="4" />
+ <area id="timestamp4" coords="5" />
+ <area id="timestamp5" coords="6" />
+ <area id="timestamp6" coords="7" />
</areaspec>
<programlisting role="XML"><![CDATA[<timestamp
column="timestamp_column"
@@ -1505,20 +1505,20 @@
<programlistingco role="XML">
<areaspec>
- <area id="property1" coords="2 70"/>
- <area id="property2" coords="3 70"/>
- <area id="property3" coords="4 70"/>
+ <area id="property1" coords="2"/>
+ <area id="property2" coords="3"/>
+ <area id="property3" coords="4"/>
<areaset id="property4-5" coords="">
- <area id="property4" coords='5 70'/>
- <area id="property5" coords='6 70'/>
+ <area id="property4" coords='5'/>
+ <area id="property5" coords='6'/>
</areaset>
- <area id="property6" coords="7 70"/>
- <area id="property7" coords="8 70"/>
- <area id="property8" coords="9 70"/>
- <area id="property9" coords="10 70"/>
- <area id="property10" coords="11 70"/>
- <area id="property11" coords="12 70"/>
- <area id="property12" coords="13 70"/>
+ <area id="property6" coords="7"/>
+ <area id="property7" coords="8"/>
+ <area id="property8" coords="9"/>
+ <area id="property9" coords="10"/>
+ <area id="property10" coords="11"/>
+ <area id="property11" coords="12"/>
+ <area id="property12" coords="13"/>
</areaspec>
<programlisting role="XML"><![CDATA[<property
name="propertyName"
@@ -1702,24 +1702,24 @@
<programlistingco role="XML">
<areaspec>
- <area id="manytoone1" coords="2 70"/>
- <area id="manytoone2" coords="3 70"/>
- <area id="manytoone3" coords="4 70"/>
- <area id="manytoone4" coords="5 70"/>
- <area id="manytoone5" coords="6 70"/>
+ <area id="manytoone1" coords="2"/>
+ <area id="manytoone2" coords="3"/>
+ <area id="manytoone3" coords="4"/>
+ <area id="manytoone4" coords="5"/>
+ <area id="manytoone5" coords="6"/>
<areaset id="manytoone6-7" coords="">
- <area id="manytoone6" coords='7 70'/>
- <area id="manytoone7" coords='8 70'/>
+ <area id="manytoone6" coords='7'/>
+ <area id="manytoone7" coords='8'/>
</areaset>
- <area id="manytoone8" coords="9 70"/>
- <area id="manytoone9" coords="10 70"/>
- <area id="manytoone10" coords="11 70"/>
- <area id="manytoone11" coords="12 70"/>
- <area id="manytoone12" coords="13 70"/>
- <area id="manytoone13" coords="14 70"/>
- <area id="manytoone14" coords="15 70"/>
- <area id="manytoone15" coords="16 70"/>
- <area id="manytoone16" coords="17 70"/>
+ <area id="manytoone8" coords="9"/>
+ <area id="manytoone9" coords="10"/>
+ <area id="manytoone10" coords="11"/>
+ <area id="manytoone11" coords="12"/>
+ <area id="manytoone12" coords="13"/>
+ <area id="manytoone13" coords="14"/>
+ <area id="manytoone14" coords="15"/>
+ <area id="manytoone15" coords="16"/>
+ <area id="manytoone16" coords="17"/>
</areaspec>
<programlisting role="XML"><![CDATA[<many-to-one
name="propertyName"
@@ -1913,16 +1913,16 @@
<programlistingco role="XML">
<areaspec>
- <area id="onetoone1" coords="2 70"/>
- <area id="onetoone2" coords="3 70"/>
- <area id="onetoone3" coords="4 70"/>
- <area id="onetoone4" coords="5 70"/>
- <area id="onetoone5" coords="6 70"/>
- <area id="onetoone6" coords="7 70"/>
- <area id="onetoone7" coords="8 70"/>
- <area id="onetoone8" coords="9 70"/>
- <area id="onetoone9" coords="10 70"/>
- <area id="onetoone10" coords="11 70"/>
+ <area id="onetoone1" coords="2"/>
+ <area id="onetoone2" coords="3"/>
+ <area id="onetoone3" coords="4"/>
+ <area id="onetoone4" coords="5"/>
+ <area id="onetoone5" coords="6"/>
+ <area id="onetoone6" coords="7"/>
+ <area id="onetoone7" coords="8"/>
+ <area id="onetoone8" coords="9"/>
+ <area id="onetoone9" coords="10"/>
+ <area id="onetoone10" coords="11"/>
</areaspec>
<programlisting role="XML"><![CDATA[<one-to-one
name="propertyName"
@@ -2129,14 +2129,14 @@
<programlistingco role="XML">
<areaspec>
- <area id="component1" coords="2 45"/>
- <area id="component2" coords="3 45"/>
- <area id="component3" coords="4 45"/>
- <area id="component4" coords="5 45"/>
- <area id="component5" coords="6 45"/>
- <area id="component6" coords="7 45"/>
- <area id="component7" coords="8 45"/>
- <area id="component8" coords="9 45"/>
+ <area id="component1" coords="2"/>
+ <area id="component2" coords="3"/>
+ <area id="component3" coords="4"/>
+ <area id="component4" coords="5"/>
+ <area id="component5" coords="6"/>
+ <area id="component6" coords="7"/>
+ <area id="component7" coords="8"/>
+ <area id="component8" coords="9"/>
</areaspec>
<programlisting role="XML"><![CDATA[<component
name="propertyName"
@@ -2241,11 +2241,11 @@
<programlistingco role="XML">
<areaspec>
- <area id="properties1" coords="2 45"/>
- <area id="properties2" coords="3 45"/>
- <area id="properties3" coords="4 45"/>
- <area id="properties4" coords="5 45"/>
- <area id="properties5" coords="6 45"/>
+ <area id="properties1" coords="2"/>
+ <area id="properties2" coords="3"/>
+ <area id="properties3" coords="4"/>
+ <area id="properties4" coords="5"/>
+ <area id="properties5" coords="6"/>
</areaspec>
<programlisting role="XML"><![CDATA[<properties
name="logicalName"
@@ -2342,10 +2342,10 @@
<programlistingco role="XML">
<areaspec>
- <area id="subclass1" coords="2 55"/>
- <area id="subclass2" coords="3 55"/>
- <area id="subclass3" coords="4 55"/>
- <area id="subclass4" coords="5 55"/>
+ <area id="subclass1" coords="2"/>
+ <area id="subclass2" coords="3"/>
+ <area id="subclass3" coords="4"/>
+ <area id="subclass4" coords="5"/>
</areaspec>
<programlisting role="XML"><![CDATA[<subclass
name="ClassName"
@@ -2413,10 +2413,10 @@
<programlistingco role="XML">
<areaspec>
- <area id="joinedsubclass1" coords="2 45"/>
- <area id="joinedsubclass2" coords="3 45"/>
- <area id="joinedsubclass3" coords="4 45"/>
- <area id="joinedsubclass4" coords="5 45"/>
+ <area id="joinedsubclass1" coords="2"/>
+ <area id="joinedsubclass2" coords="3"/>
+ <area id="joinedsubclass3" coords="4"/>
+ <area id="joinedsubclass4" coords="5"/>
</areaspec>
<programlisting role="XML"><![CDATA[<joined-subclass
name="ClassName"
@@ -2525,10 +2525,10 @@
<programlistingco role="XML">
<areaspec>
- <area id="unionsubclass1" coords="2 45"/>
- <area id="unionsubclass2" coords="3 45"/>
- <area id="unionsubclass3" coords="4 45"/>
- <area id="unionsubclass4" coords="5 45"/>
+ <area id="unionsubclass1" coords="2"/>
+ <area id="unionsubclass2" coords="3"/>
+ <area id="unionsubclass3" coords="4"/>
+ <area id="unionsubclass4" coords="5"/>
</areaspec>
<programlisting role="XML"><![CDATA[<union-subclass
name="ClassName"
@@ -2595,12 +2595,12 @@
<programlistingco role="XML">
<areaspec>
- <area id="join1" coords="2 50"/>
- <area id="join2" coords="3 50"/>
- <area id="join3" coords="4 50"/>
- <area id="join4" coords="5 50"/>
- <area id="join5" coords="6 50"/>
- <area id="join6" coords="7 50"/>
+ <area id="join1" coords="2"/>
+ <area id="join2" coords="3"/>
+ <area id="join3" coords="4"/>
+ <area id="join4" coords="5"/>
+ <area id="join5" coords="6"/>
+ <area id="join6" coords="7"/>
</areaspec>
<programlisting role="XML"><![CDATA[<join
table="tablename"
@@ -2703,12 +2703,12 @@
<programlistingco role="XML">
<areaspec>
- <area id="key1" coords="2 50"/>
- <area id="key2" coords="3 50"/>
- <area id="key3" coords="4 50"/>
- <area id="key4" coords="5 50"/>
- <area id="key5" coords="6 50"/>
- <area id="key6" coords="7 50"/>
+ <area id="key1" coords="2"/>
+ <area id="key2" coords="3"/>
+ <area id="key3" coords="4"/>
+ <area id="key4" coords="5"/>
+ <area id="key5" coords="6"/>
+ <area id="key6" coords="7"/>
</areaspec>
<programlisting role="XML"><![CDATA[<key
column="columnname"
@@ -2842,8 +2842,8 @@
<programlistingco role="XML">
<areaspec>
- <area id="import1" coords="2 40"/>
- <area id="import2" coords="3 40"/>
+ <area id="import1" coords="2"/>
+ <area id="import2" coords="3"/>
</areaspec>
<programlisting role="XML"><![CDATA[<import
class="ClassName"
@@ -2896,12 +2896,12 @@
<programlistingco role="XML">
<areaspec>
- <area id="any1" coords="2 50"/>
- <area id="any2" coords="3 50"/>
- <area id="any3" coords="4 50"/>
- <area id="any4" coords="5 50"/>
- <area id="any5" coords="6 50"/>
- <area id="any6" coords="7 50"/>
+ <area id="any1" coords="2"/>
+ <area id="any2" coords="3"/>
+ <area id="any3" coords="4"/>
+ <area id="any4" coords="5"/>
+ <area id="any5" coords="6"/>
+ <area id="any6" coords="7"/>
</areaspec>
<programlisting role="XML"><![CDATA[<any
name="propertyName"
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/collection_mapping.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -140,20 +140,20 @@
<programlistingco role="XML">
<areaspec>
- <area id="mappingcollection1" coords="2 65"/>
- <area id="mappingcollection2" coords="3 65"/>
- <area id="mappingcollection3" coords="4 65"/>
- <area id="mappingcollection4" coords="5 65"/>
- <area id="mappingcollection5" coords="6 65"/>
- <area id="mappingcollection6" coords="7 65"/>
- <area id="mappingcollection7" coords="8 65"/>
- <area id="mappingcollection8" coords="9 65"/>
- <area id="mappingcollection9" coords="10 65"/>
- <area id="mappingcollection10" coords="11 65"/>
- <area id="mappingcollection11" coords="12 65"/>
- <area id="mappingcollection12" coords="13 65"/>
- <area id="mappingcollection13" coords="14 65"/>
- <area id="mappingcollection14" coords="15 65"/>
+ <area id="mappingcollection1" coords="2"/>
+ <area id="mappingcollection2" coords="3"/>
+ <area id="mappingcollection3" coords="4"/>
+ <area id="mappingcollection4" coords="5"/>
+ <area id="mappingcollection5" coords="6"/>
+ <area id="mappingcollection6" coords="7"/>
+ <area id="mappingcollection7" coords="8"/>
+ <area id="mappingcollection8" coords="9"/>
+ <area id="mappingcollection9" coords="10"/>
+ <area id="mappingcollection10" coords="11"/>
+ <area id="mappingcollection11" coords="12"/>
+ <area id="mappingcollection12" coords="13"/>
+ <area id="mappingcollection13" coords="14"/>
+ <area id="mappingcollection14" coords="15"/>
</areaspec>
<programlisting role="XML"><![CDATA[<map
name="propertyName"
@@ -348,8 +348,8 @@
<programlistingco role="XML">
<areaspec>
- <area id="index1" coords="2 45"/>
- <area id="index2" coords="3 45"/>
+ <area id="index1" coords="2"/>
+ <area id="index2" coords="3"/>
</areaspec>
<programlisting role="XML"><![CDATA[<list-index
column="column_name"
@@ -372,9 +372,9 @@
<programlistingco role="XML">
<areaspec>
- <area id="mapkey1" coords="2 45"/>
- <area id="mapkey2" coords="3 45"/>
- <area id="mapkey3" coords="4 45"/>
+ <area id="mapkey1" coords="2"/>
+ <area id="mapkey2" coords="3"/>
+ <area id="mapkey3" coords="4"/>
</areaspec>
<programlisting role="XML"><![CDATA[<map-key
column="column_name"
@@ -405,9 +405,9 @@
<programlistingco role="XML">
<areaspec>
- <area id="indexmanytomany1" coords="2 45"/>
- <area id="indexmanytomany2" coords="3 45"/>
- <area id="indexmanytomany3" coords="3 45"/>
+ <area id="indexmanytomany1" coords="2"/>
+ <area id="indexmanytomany2" coords="3"/>
+ <area id="indexmanytomany3" coords="3"/>
</areaspec>
<programlisting role="XML"><![CDATA[<map-key-many-to-many
column="column_name"
@@ -461,9 +461,9 @@
<programlistingco role="XML">
<areaspec>
- <area id="element1b" coords="2 50"/>
- <area id="element2b" coords="3 50"/>
- <area id="element3b" coords="4 50"/>
+ <area id="element1b" coords="2"/>
+ <area id="element2b" coords="3"/>
+ <area id="element3b" coords="4"/>
</areaspec>
<programlisting role="XML"><![CDATA[<element
column="column_name"
@@ -504,14 +504,14 @@
<programlistingco role="XML">
<areaspec>
- <area id="manytomany1" coords="2 60"/>
- <area id="manytomany2" coords="3 60"/>
- <area id="manytomany3" coords="4 60"/>
- <area id="manytomany4" coords="5 60"/>
- <area id="manytomany5" coords="6 60"/>
- <area id="manytomany6" coords="7 60"/>
- <area id="manytomany7" coords="8 60"/>
- <area id="manytomany8" coords="9 60"/>
+ <area id="manytomany1" coords="2"/>
+ <area id="manytomany2" coords="3"/>
+ <area id="manytomany3" coords="4"/>
+ <area id="manytomany4" coords="5"/>
+ <area id="manytomany5" coords="6"/>
+ <area id="manytomany6" coords="7"/>
+ <area id="manytomany7" coords="8"/>
+ <area id="manytomany8" coords="9"/>
</areaspec>
<programlisting role="XML"><![CDATA[<many-to-many
column="column_name"
@@ -682,9 +682,9 @@
<programlistingco role="XML">
<areaspec>
- <area id="onetomany1" coords="2 60"/>
- <area id="onetomany2" coords="3 60"/>
- <area id="onetomany3" coords="4 60"/>
+ <area id="onetomany1" coords="2"/>
+ <area id="onetomany2" coords="3"/>
+ <area id="onetomany3" coords="4"/>
</areaspec>
<programlisting role="XML"><![CDATA[<one-to-many
class="ClassName"
Modified: core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/en-US/content/performance.xml 2010-03-31 00:52:35 UTC (rev 19142)
@@ -823,9 +823,9 @@
<programlistingco>
<areaspec>
- <area id="cache1" coords="2 70"/>
- <area id="cache2" coords="3 70"/>
- <area id="cache3" coords="4 70"/>
+ <area id="cache1" coords="2"/>
+ <area id="cache2" coords="3"/>
+ <area id="cache3" coords="4"/>
</areaspec>
<programlisting role="XML"><![CDATA[<cache
usage="transactional|read-write|nonstrict-read-write|read-only"
Modified: core/trunk/documentation/manual/src/main/docbook/pot/Book_Info.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/Book_Info.pot 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/pot/Book_Info.pot 2010-03-31 00:52:35 UTC (rev 19142)
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-02-11T05:38:14\n"
-"PO-Revision-Date: 2010-02-11T05:38:14\n"
+"POT-Creation-Date: 2010-03-31T00:33:04\n"
+"PO-Revision-Date: 2010-03-31T00:33:04\n"
"Last-Translator: Automatically generated\n"
"Language-Team: None\n"
"MIME-Version: 1.0\n"
@@ -24,6 +24,6 @@
#. Tag: releaseinfo
#, no-c-format
-msgid "&versionNumber;"
+msgid "&version;"
msgstr ""
Modified: core/trunk/documentation/manual/src/main/docbook/pot/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.pot 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/pot/HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.pot 2010-03-31 00:52:35 UTC (rev 19142)
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-02-11T05:38:14\n"
-"PO-Revision-Date: 2010-02-11T05:38:14\n"
+"POT-Creation-Date: 2010-03-31T00:33:04\n"
+"PO-Revision-Date: 2010-03-31T00:33:04\n"
"Last-Translator: Automatically generated\n"
"Language-Team: None\n"
"MIME-Version: 1.0\n"
Modified: core/trunk/documentation/manual/src/main/docbook/pot/author_group.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/author_group.pot 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/pot/author_group.pot 2010-03-31 00:52:35 UTC (rev 19142)
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-02-11T05:38:14\n"
-"PO-Revision-Date: 2010-02-11T05:38:14\n"
+"POT-Creation-Date: 2010-03-31T00:33:04\n"
+"PO-Revision-Date: 2010-03-31T00:33:04\n"
"Last-Translator: Automatically generated\n"
"Language-Team: None\n"
"MIME-Version: 1.0\n"
Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/architecture.pot 2010-03-31 00:52:35 UTC (rev 19142)
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-02-11T05:38:14\n"
-"PO-Revision-Date: 2010-02-11T05:38:14\n"
+"POT-Creation-Date: 2010-03-31T00:33:04\n"
+"PO-Revision-Date: 2010-03-31T00:33:04\n"
"Last-Translator: Automatically generated\n"
"Language-Team: None\n"
"MIME-Version: 1.0\n"
@@ -264,7 +264,7 @@
#. Tag: para
#, no-c-format
-msgid "The first two implementations provide a \"one session - one database transaction\" programming model. This is also also known and used as <emphasis>session-per-request</emphasis>. The beginning and end of a Hibernate session is defined by the duration of a database transaction. If you use programmatic transaction demarcation in plain JSE without JTA, you are advised to use the Hibernate <literal>Transaction</literal> API to hide the underlying transaction system from your code. If you use JTA, you can utilize the JTA interfaces to demarcate transactions. If you execute in an EJB container that supports CMT, transaction boundaries are defined declaratively and you do not need any transaction or session demarcation operations in your code. Refer to <xref linkend=\"transactions\" /> for more information and code examples."
+msgid "The first two implementations provide a \"one session - one database transaction\" programming model. This is also known and used as <emphasis>session-per-request</emphasis>. The beginning and end of a Hibernate session is defined by the duration of a database transaction. If you use programmatic transaction demarcation in plain JSE without JTA, you are advised to use the Hibernate <literal>Transaction</literal> API to hide the underlying transaction system from your code. If you use JTA, you can utilize the JTA interfaces to demarcate transactions. If you execute in an EJB container that supports CMT, transaction boundaries are defined declaratively and you do not need any transaction or session demarcation operations in your code. Refer to <xref linkend=\"transactions\" /> for more information and code examples."
msgstr ""
#. Tag: para
Modified: core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot
===================================================================
--- core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot 2010-03-30 19:36:43 UTC (rev 19141)
+++ core/trunk/documentation/manual/src/main/docbook/pot/content/association_mapping.pot 2010-03-31 00:52:35 UTC (rev 19142)
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: 0\n"
-"POT-Creation-Date: 2010-02-11T05:38:14\n"
-"PO-Revision-Date: 2010-02-11T05:38:14\n"
+"POT-Creation-Date: 2010-03-31T00:33:04\n"
+"PO-Revision-Date: 2010-03-31T00:33:04\n"
"Last-Translator: Automatically generated\n"
"Language-Team: None\n"
"MIME-Version: 1.0\n"
14 years, 8 months
Hibernate SVN: r19141 - in core/trunk: annotations/src/main/java/org/hibernate/mapping and 2 other directories.
by hibernate-commits@lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-03-30 15:36:43 -0400 (Tue, 30 Mar 2010)
New Revision: 19141
Added:
core/trunk/annotations/src/main/java/org/hibernate/mapping/SyntheticProperty.java
Modified:
core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java
core/trunk/core/src/main/java/org/hibernate/mapping/Backref.java
core/trunk/core/src/main/java/org/hibernate/mapping/IndexBackref.java
core/trunk/core/src/main/java/org/hibernate/mapping/Property.java
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java
Log:
HHH-4870 - Cannot determine java-type from given member [null]
Modified: core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java 2010-03-30 13:15:29 UTC (rev 19140)
+++ core/trunk/annotations/src/main/java/org/hibernate/cfg/BinderHelper.java 2010-03-30 19:36:43 UTC (rev 19141)
@@ -57,6 +57,7 @@
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.SimpleValue;
+import org.hibernate.mapping.SyntheticProperty;
import org.hibernate.mapping.Table;
import org.hibernate.mapping.ToOne;
import org.hibernate.mapping.Value;
@@ -156,9 +157,10 @@
clone.setInsertable( false );
clone.setUpdateable( false );
clone.setNaturalIdentifier( false );
+ clone.setGeneration( property.getGeneration() );
embeddedComp.addProperty( clone );
}
- synthProp = new Property();
+ synthProp = new SyntheticProperty();
synthProp.setName( syntheticPropertyName );
synthProp.setNodeName( syntheticPropertyName );
synthProp.setPersistentClass( ownerEntity );
Added: core/trunk/annotations/src/main/java/org/hibernate/mapping/SyntheticProperty.java
===================================================================
--- core/trunk/annotations/src/main/java/org/hibernate/mapping/SyntheticProperty.java (rev 0)
+++ core/trunk/annotations/src/main/java/org/hibernate/mapping/SyntheticProperty.java 2010-03-30 19:36:43 UTC (rev 19141)
@@ -0,0 +1,37 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.mapping;
+
+/**
+ * Models a property which does not actually exist in the model. It is created by Hibernate during
+ * the metamodel binding process.
+ *
+ * @author Steve Ebersole
+ */
+public class SyntheticProperty extends Property {
+ @Override
+ public boolean isSynthetic() {
+ return true;
+ }
+}
Modified: core/trunk/core/src/main/java/org/hibernate/mapping/Backref.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/mapping/Backref.java 2010-03-30 13:15:29 UTC (rev 19140)
+++ core/trunk/core/src/main/java/org/hibernate/mapping/Backref.java 2010-03-30 19:36:43 UTC (rev 19141)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
+ * distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
@@ -20,7 +20,6 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.mapping;
@@ -33,13 +32,25 @@
public class Backref extends Property {
private String collectionRole;
private String entityName;
-
+
+ /**
+ * {@inheritDoc}
+ */
public boolean isBackRef() {
return true;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isSynthetic() {
+ return true;
+ }
+
public String getCollectionRole() {
return collectionRole;
}
+
public void setCollectionRole(String collectionRole) {
this.collectionRole = collectionRole;
}
Modified: core/trunk/core/src/main/java/org/hibernate/mapping/IndexBackref.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/mapping/IndexBackref.java 2010-03-30 13:15:29 UTC (rev 19140)
+++ core/trunk/core/src/main/java/org/hibernate/mapping/IndexBackref.java 2010-03-30 19:36:43 UTC (rev 19141)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
+ * distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
@@ -20,7 +20,6 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.mapping;
@@ -37,9 +36,18 @@
public boolean isBackRef() {
return true;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean isSynthetic() {
+ return true;
+ }
+
public String getCollectionRole() {
return collectionRole;
}
+
public void setCollectionRole(String collectionRole) {
this.collectionRole = collectionRole;
}
@@ -55,6 +63,7 @@
public String getEntityName() {
return entityName;
}
+
public void setEntityName(String entityName) {
this.entityName = entityName;
}
Modified: core/trunk/core/src/main/java/org/hibernate/mapping/Property.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/mapping/Property.java 2010-03-30 13:15:29 UTC (rev 19140)
+++ core/trunk/core/src/main/java/org/hibernate/mapping/Property.java 2010-03-30 19:36:43 UTC (rev 19141)
@@ -1,10 +1,10 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
- * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
- * distributed under license by Red Hat Middleware LLC.
+ * distributed under license by Red Hat Inc.
*
* This copyrighted material is made available to anyone wishing to use, modify,
* copy, or redistribute it subject to the terms and conditions of the GNU
@@ -20,7 +20,6 @@
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
- *
*/
package org.hibernate.mapping;
@@ -63,11 +62,22 @@
private java.util.Map metaAttributes;
private PersistentClass persistentClass;
private boolean naturalIdentifier;
-
+
public boolean isBackRef() {
return false;
}
+ /**
+ * Does this property represent a synthetic property? A synthetic property is one we create during
+ * metamodel binding to represent a collection of columns but which does not represent a property
+ * physically available on the entity.
+ *
+ * @return True if synthetic; false otherwise.
+ */
+ public boolean isSynthetic() {
+ return false;
+ }
+
public Type getType() throws MappingException {
return value.getType();
}
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java 2010-03-30 13:15:29 UTC (rev 19140)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/metamodel/AttributeFactory.java 2010-03-30 19:36:43 UTC (rev 19141)
@@ -83,9 +83,9 @@
*/
@SuppressWarnings({ "unchecked" })
public <X, Y> AttributeImplementor<X, Y> buildAttribute(AbstractManagedType<X> ownerType, Property property) {
- if ( isVirtual( property, ownerType ) ) {
- // hide virtual properties (fabricated by Hibernate) from the JPA metamodel.
- log.trace( "Skipping virtual property {}({})", ownerType.getJavaType().getName(), property.getName() );
+ if ( property.isSynthetic() ) {
+ // hide synthetic/virtual properties (fabricated by Hibernate) from the JPA metamodel.
+ log.trace( "Skipping synthetic property {}({})", ownerType.getJavaType().getName(), property.getName() );
return null;
}
log.trace( "Building attribute [{}.{}]", ownerType.getJavaType().getName(), property.getName() );
@@ -114,12 +114,6 @@
}
}
- private <X> boolean isVirtual(Property property, AbstractManagedType<X> ownerType) {
- // back-refs and embedded components are considered virtual
- return property.isBackRef()
- || ( property.isComposite() && ( (Component) property.getValue() ).isEmbedded() );
- }
-
private <X> AttributeContext<X> wrap(final AbstractManagedType<X> ownerType, final Property property) {
return new AttributeContext<X>() {
public AbstractManagedType<X> getOwnerType() {
14 years, 8 months